util.sasl_cyrus: Automatically initialize Cyrus SASL with the first used service...

[prosody.git] / core / componentmanager.lua

diff --git a/core/componentmanager.lua b/core/componentmanager.lua
index e4799790d8addca86f01a06c3799806e548cf842..c701c4d739ef4570e3c2cfc29d95bb58a5228978 100644 (file)
--- a/core/componentmanager.lua
+++ b/core/componentmanager.lua
@@ -6,7 +6,7 @@
 -- COPYING file in the source package for more information.
 --
 
-local prosody = prosody;
+local prosody = _G.prosody;
 local log = require "util.logger".init("componentmanager");
 local configmanager = require "core.configmanager";
 local modulemanager = require "core.modulemanager";
@@ -14,9 +14,10 @@ local jid_split = require "util.jid".split;
 local fire_event = require "core.eventmanager".fire_event;
 local events_new = require "util.events".new;
 local st = require "util.stanza";
-local hosts = hosts;
+local prosody, hosts = prosody, prosody.hosts;
+local ssl = ssl;
 
-local pairs, type, tostring = pairs, type, tostring;
+local pairs, setmetatable, type, tostring = pairs, setmetatable, type, tostring;
 
 local components = {};
 
@@ -26,7 +27,7 @@ local NULL = {};
 module "componentmanager"
 
 local function default_component_handler(origin, stanza)
-       log("warn", "Stanza being handled by default component, bouncing error");
+       log("warn", "Stanza being handled by default component; bouncing error for: %s", stanza:top_tag());
        if stanza.attr.type ~= "error" and stanza.attr.type ~= "result" then
                origin.send(st.error_reply(stanza, "wait", "service-unavailable", "Component unavailable"));
        end
@@ -51,7 +52,9 @@ function load_enabled_components(config)
        end
 end
 
-prosody.events.add_handler("server-starting", load_enabled_components);
+if prosody and prosody.events then
+       prosody.events.add_handler("server-starting", load_enabled_components);
+end
 
 function handle_stanza(origin, stanza)
        local node, host = jid_split(stanza.attr.to);
@@ -65,23 +68,30 @@ function handle_stanza(origin, stanza)
                component(origin, stanza, hosts[host]);
        else
                log("error", "Component manager recieved a stanza for a non-existing component: "..tostring(stanza));
+               default_component_handler(origin, stanza);
        end
 end
 
 function create_component(host, component, events)
        -- TODO check for host well-formedness
-       local ssl_ctx;
-       if host then
+       local ssl_ctx, ssl_ctx_in;
+       if host and ssl then
                -- We need to find SSL context to use...
                -- Discussion in prosody@ concluded that
                -- 1 level back is usually enough by default
-               local base_host = host:gsub("^[^%.]+", "");
+               local base_host = host:gsub("^[^%.]+%.", "");
                if hosts[base_host] then
                        ssl_ctx = hosts[base_host].ssl_ctx;
+                       ssl_ctx_in = hosts[base_host].ssl_ctx_in;
+               elseif prosody.global_ssl_ctx then
+                       -- We have no cert, and no parent host to borrow a cert from
+                       -- Use global/default cert if there is one
+                       ssl_ctx = ssl.newcontext(prosody.global_ssl_ctx);
+                       ssl_ctx_in = ssl.newcontext(setmetatable({ mode = "server" }, { __index = prosody.global_ssl_ctx }));
                end
        end
        return { type = "component", host = host, connected = true, s2sout = {}, 
-                       ssl_ctx = ssl_ctx, events = events or events_new() };
+                       ssl_ctx = ssl_ctx, ssl_ctx_in = ssl_ctx_in, events = events or events_new() };
 end
 
 function register_component(host, component, session)
@@ -100,8 +110,8 @@ function register_component(host, component, session)
                if not(host:find("@", 1, true) or host:find("/", 1, true)) and host:find(".", 1, true) then
                        disco_items:set(host:sub(host:find(".", 1, true)+1), host, true);
                end
-               -- FIXME only load for a.b.c if b.c has dialback, and/or check in config
                modulemanager.load(host, "dialback");
+               modulemanager.load(host, "tls");
                log("debug", "component added: "..host);
                return session or hosts[host];
        else
@@ -111,6 +121,7 @@ end
 
 function deregister_component(host)
        if components[host] then
+               modulemanager.unload(host, "tls");
                modulemanager.unload(host, "dialback");
                hosts[host].connected = nil;
                local host_config = configmanager.getconfig()[host];
@@ -119,7 +130,7 @@ function deregister_component(host)
                        components[host] = default_component_handler;
                else
                        -- Component not in config, or disabled, remove
-                       hosts[host] = nil;
+                       hosts[host] = nil; -- FIXME do proper unload of all modules and other cleanup before removing
                        components[host] = nil;
                end
                -- remove from disco_items