--- Prosody IM v0.3
+-- Prosody IM v0.4
-- Copyright (C) 2008-2009 Matthew Wild
-- Copyright (C) 2008-2009 Waqas Hussain
--
local config = require "core.configmanager";
local multitable_new = require "util.multitable".new;
local register_actions = require "core.actions".register;
+local st = require "util.stanza";
local hosts = hosts;
+local prosody = prosody;
local loadfile, pcall = loadfile, pcall;
local setmetatable, setfenv, getfenv = setmetatable, setfenv, getfenv;
local next = next;
local rawget = rawget;
-local tostring, print = tostring, print;
+local tostring = tostring;
-- We need this to let modules access the real global namespace
local _G = _G;
local modulehelpers = setmetatable({}, { __index = _G });
local features_table = multitable_new();
+local identities_table = multitable_new();
local handler_table = multitable_new();
local hooked = multitable_new();
+local hooks = multitable_new();
local event_hooks = multitable_new();
local NULL = {};
-- Load modules when a host is activated
function load_modules_for_host(host)
+ if config.get(host, "core", "modules_enable") == false then
+ return; -- Only load for hosts, not components, etc.
+ end
+
-- Load modules from global section
local modules_enabled = config.get("*", "core", "modules_enabled");
local modules_disabled = config.get(host, "core", "modules_disabled");
disabled_set[module] = true;
end
end
- for _, module in ipairs(modules_enabled) do
+ for _, module in ipairs({"presence", "message", "iq"}) do
if not disabled_set[module] then
load(host, module);
end
end
+ for _, module in ipairs(modules_enabled) do
+ if not disabled_set[module] and not is_loaded(host, module) then
+ load(host, module);
+ end
+ end
end
-- Load modules from just this host
local pluginenv = setmetatable({ module = api_instance }, { __index = _G });
setfenv(mod, pluginenv);
+ if not hosts[host] then hosts[host] = { type = "component", host = host, connected = false, s2sout = {} }; end
local success, ret = pcall(mod);
if not success then
- log("error", "Error initialising module '%s': %s", name or "nil", ret or "nil");
+ log("error", "Error initialising module '%s': %s", module_name or "nil", ret or "nil");
return nil, ret;
end
-- Use modified host, if the module set one
modulemap[api_instance.host][module_name] = pluginenv;
+ if api_instance.host == "*" and host ~= "*" then
+ api_instance:set_global();
+ end
+
return true;
end
end
modulemap[host][name] = nil;
features_table:remove(host, name);
+ identities_table:remove(host, name);
local params = handler_table:get(host, name); -- , {module.host, origin_type, tag, xmlns}
for _, param in pairs(params or NULL) do
local handlers = stanza_handlers:get(param[1], param[2], param[3], param[4]);
end
end
event_hooks:remove(host, name);
+ -- unhook event handlers hooked by module:hook
+ for event, handlers in pairs(hooks:get(host, name) or NULL) do
+ for handler in pairs(handlers or NULL) do
+ (hosts[host] or prosody).events.remove_handler(event, handler);
+ end
+ end
+ hooks:remove(host, name);
return true;
end
local name, xmlns, origin_type = stanza.name, stanza.attr.xmlns, origin.type;
if name == "iq" and xmlns == "jabber:client" then
if stanza.attr.type == "get" or stanza.attr.type == "set" then
- xmlns = stanza.tags[1].attr.xmlns;
+ xmlns = stanza.tags[1].attr.xmlns or "jabber:client";
log("debug", "Stanza of type %s from %s has xmlns: %s", name, origin_type, xmlns);
else
log("debug", "Discarding %s from %s of type: %s", name, origin_type, stanza.attr.type);
end
end
local handlers = stanza_handlers:get(host, origin_type, name, xmlns);
+ if not handlers then handlers = stanza_handlers:get("*", origin_type, name, xmlns); end
if handlers then
log("debug", "Passing stanza to mod_%s", handler_info[handlers[1]].name);
(handlers[1])(origin, stanza);
return true;
else
- log("debug", "Stanza unhandled by any modules, xmlns: %s", stanza.attr.xmlns); -- we didn't handle it
+ log("debug", "Unhandled %s stanza: %s; xmlns=%s", origin.type, stanza.name, xmlns); -- we didn't handle it
+ if stanza.attr.xmlns == "jabber:client" then
+ if stanza.attr.type ~= "error" and stanza.attr.type ~= "result" then
+ origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
+ end
+ elseif not(name == "features" and xmlns == "http://etherx.jabber.org/streams") then -- FIXME remove check once we handle S2S features
+ origin:close("unsupported-stanza-type");
+ end
end
end
function api:set_global()
self.host = "*";
+ -- Update the logger
+ local _log = logger.init("mod_"..self.name);
+ self.log = function (self, ...) return _log(...); end;
+ self._log = _log;
end
local function _add_handler(module, origin_type, tag, xmlns, handler)
addDiscoInfoHandler("*host", function(reply, to, from, node)
if #node == 0 then
local done = {};
+ for module, identities in pairs(identities_table:get(to) or NULL) do -- for each module
+ for identity, attr in pairs(identities) do
+ if not done[identity] then
+ reply:tag("identity", attr):up(); -- TODO cache
+ done[identity] = true;
+ end
+ end
+ end
+ for module, identities in pairs(identities_table:get("*") or NULL) do -- for each module
+ for identity, attr in pairs(identities) do
+ if not done[identity] then
+ reply:tag("identity", attr):up(); -- TODO cache
+ done[identity] = true;
+ end
+ end
+ end
for module, features in pairs(features_table:get(to) or NULL) do -- for each module
for feature in pairs(features) do
if not done[feature] then
end
end
end
+ for module, features in pairs(features_table:get("*") or NULL) do -- for each module
+ for feature in pairs(features) do
+ if not done[feature] then
+ reply:tag("feature", {var = feature}):up(); -- TODO cache
+ done[feature] = true;
+ end
+ end
+ end
return next(done) ~= nil;
end
end);
function api:add_feature(xmlns)
features_table:set(self.host, self.name, xmlns, true);
end
+function api:add_identity(category, type)
+ identities_table:set(self.host, self.name, category.."\0"..type, {category = category, type = type});
+end
local event_hook = function(host, mod_name, event_name, ...)
if type((...)) == "table" and (...).host and (...).host ~= host then return; end
event_hooks:set(self.host, self.name, name, handler, true);
end
+function api:fire_event(...)
+ return (hosts[self.host] or prosody).events.fire_event(...);
+end
+
+function api:hook(event, handler, priority)
+ hooks:set(self.host, self.name, event, handler, true);
+ (hosts[self.host] or prosody).events.add_handler(event, handler, priority);
+end
+
+function api:hook_stanza(xmlns, name, handler, priority)
+ if not handler and type(name) == "function" then
+ -- If only 2 options then they specified no xmlns
+ xmlns, name, handler, priority = nil, xmlns, name, handler;
+ elseif not (handler and name) then
+ self:log("warn", "Error: Insufficient parameters to module:hook_stanza()");
+ return;
+ end
+ return api.hook(self, "stanza/"..(xmlns and (xmlns..":") or "")..name, function (data) return handler(data.origin, data.stanza, data); end, priority);
+end
+
--------------------------------------------------------------------
local actions = {};
projects / prosody.git / blobdiff