modulemanager: Fixed: Stanza modules were being auto-loaded for components (regressio...

[prosody.git] / core / modulemanager.lua

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index b756b327c752a0489e2b235760da63e07a3be1ba..f703889f4d512a3ef67f309a8455389e930c00b8 100644 (file)
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -6,13 +6,10 @@
 -- COPYING file in the source package for more information.
 --
 
-
-
 local plugin_dir = CFG_PLUGINDIR or "./plugins/";
 
 local logger = require "util.logger";
 local log = logger.init("modulemanager");
-local addDiscoInfoHandler = require "core.discomanager".addDiscoInfoHandler;
 local eventmanager = require "core.eventmanager";
 local config = require "core.configmanager";
 local multitable_new = require "util.multitable".new;
@@ -50,8 +47,6 @@ local handler_info = {};
 
 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();
@@ -61,22 +56,27 @@ local NULL = {};
 
 -- Load modules when a host is activated
 function load_modules_for_host(host)
+       local disabled_set = {};
+       local modules_disabled = config.get(host, "core", "modules_disabled");
+       if modules_disabled then
+               for _, module in ipairs(modules_disabled) do
+                       disabled_set[module] = true;
+               end
+       end
+
+       -- Load auto-loaded modules for this host
+       if hosts[host].type == "local" then
+               for _, module in ipairs(autoload_modules) do
+                       if not disabled_set[module] then
+                               load(host, module);
+                       end
+               end
+       end
+
+       -- Load modules from global section
        if config.get(host, "core", "load_global_modules") ~= false then
-               -- Load modules from global section
                local modules_enabled = config.get("*", "core", "modules_enabled");
-               local modules_disabled = config.get(host, "core", "modules_disabled");
-               local disabled_set = {};
                if modules_enabled then
-                       if modules_disabled then
-                               for _, module in ipairs(modules_disabled) do
-                                       disabled_set[module] = true;
-                               end
-                       end
-                       for _, module in ipairs(autoload_modules) 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);
@@ -96,6 +96,7 @@ function load_modules_for_host(host)
        end
 end
 eventmanager.add_event_hook("host-activated", load_modules_for_host);
+eventmanager.add_event_hook("component-activated", load_modules_for_host);
 --
 
 function load(host, module_name, config)
@@ -128,6 +129,7 @@ function load(host, module_name, config)
        
        setfenv(mod, pluginenv);
        if not hosts[host] then hosts[host] = { type = "component", host = host, connected = false, s2sout = {} }; end
+       hosts[host].modules = modulemap[host];
        
        local success, ret = pcall(mod);
        if not success then
@@ -170,9 +172,6 @@ function unload(host, name, ...)
                        log("warn", "Non-fatal error unloading module '%s' on '%s': %s", name, host, err);
                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]);
@@ -189,6 +188,7 @@ function unload(host, name, ...)
                end
        end
        hooks:remove(host, name);
+       modulemap[host][name] = nil;
        return true;
 end
 
@@ -235,7 +235,7 @@ function reload(host, name, ...)
 end
 
 function handle_stanza(host, origin, stanza)
-       local name, xmlns, origin_type = stanza.name, stanza.attr.xmlns, origin.type;
+       local name, xmlns, origin_type = stanza.name, stanza.attr.xmlns or "jabber:client", 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 or "jabber:client";
@@ -252,12 +252,13 @@ function handle_stanza(host, origin, stanza)
                (handlers[1])(origin, stanza);
                return true;
        else
-               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
+                       log("debug", "Unhandled %s stanza: %s; xmlns=%s", origin.type, stanza.name, xmlns); -- we didn't handle it
                        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" or name == "error") and xmlns == "http://etherx.jabber.org/streams") then -- FIXME remove check once we handle S2S features
+                       log("warn", "Unhandled %s stream element: %s; xmlns=%s: %s", origin.type, stanza.name, xmlns, tostring(stanza)); -- we didn't handle it
                        origin:close("unsupported-stanza-type");
                end
        end
@@ -412,6 +413,14 @@ function api:get_host_items(key)
                        end
                end
        end
+       for mod_name, module in pairs(modulemap["*"]) do
+               module = module.module;
+               if module.items then
+                       for _, item in ipairs(module.items[key] or NULL) do
+                               t_insert(result, item);
+                       end
+               end
+       end
        return result;
 end