Merge 0.6->0.7

[prosody.git] / core / componentmanager.lua

diff --git a/core/componentmanager.lua b/core/componentmanager.lua
index f2f64a7da3a7f458bc1e44e3650e9e73f3d57615..48e279846ce2d800a6726337bcb84f3336cf7ccc 100644 (file)
--- a/core/componentmanager.lua
+++ b/core/componentmanager.lua
@@ -12,10 +12,11 @@ local certmanager = require "core.certmanager";
 local configmanager = require "core.configmanager";
 local modulemanager = require "core.modulemanager";
 local jid_split = require "util.jid".split;
-local fire_event = prosody.events.fire_event;
+local fire_event = require "core.eventmanager".fire_event;
 local events_new = require "util.events".new;
 local st = require "util.stanza";
 local prosody, hosts = prosody, prosody.hosts;
+local ssl = ssl;
 local uuid_gen = require "util.uuid".generate;
 
 local pairs, setmetatable, type, tostring = pairs, setmetatable, type, tostring;
@@ -57,20 +58,51 @@ 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);
+       local component = nil;
+       if host then
+               if node then component = components[node.."@"..host]; end -- hack to allow hooking node@server
+               if not component then component = components[host]; end
+       end
+       if component then
+               log("debug", "%s stanza being handled by component: %s", stanza.name, host);
+               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
-       return { type = "component", host = host, connected = true, s2sout = {},
-                       events = events or events_new(),
-                       dialback_secret = configmanager.get(host, "core", "dialback_secret") or uuid_gen(),
-                       disallow_s2s = configmanager.get(host, "core", "disallow_s2s"); };
+       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("^[^%.]+%.", "");
+               if hosts[base_host] then
+                       ssl_ctx = hosts[base_host].ssl_ctx;
+                       ssl_ctx_in = hosts[base_host].ssl_ctx_in;
+               else
+                       -- We have no cert, and no parent host to borrow a cert from
+                       -- Use global/default cert if there is one
+                       ssl_ctx = certmanager.create_context(host, "client");
+                       ssl_ctx_in = certmanager.create_context(host, "server");
+               end
+       end
+       return { type = "component", host = host, connected = true, s2sout = {}, 
+                       ssl_ctx = ssl_ctx, ssl_ctx_in = ssl_ctx_in, events = events or events_new(),
+                       dialback_secret = configmanager.get(host, "core", "dialback_secret") or uuid_gen() };
 end
 
-function register_component(host, component)
+function register_component(host, component, session)
        if not hosts[host] or (hosts[host].type == 'component' and not hosts[host].connected) then
                local old_events = hosts[host] and hosts[host].events;
 
                components[host] = component;
-               hosts[host] = create_component(host, component, old_events);
+               hosts[host] = session or create_component(host, component, old_events);
 
                -- Add events object if not already one
                if not hosts[host].events then
@@ -88,7 +120,7 @@ function register_component(host, component)
                modulemanager.load(host, "dialback");
                modulemanager.load(host, "tls");
                log("debug", "component added: "..host);
-               return hosts[host];
+               return session or hosts[host];
        else
                log("error", "Attempt to set component for existing host: "..host);
        end
@@ -119,6 +151,10 @@ function deregister_component(host)
        end
 end
 
+function set_component_handler(host, handler)
+       components[host] = handler;
+end
+
 function get_children(host)
        return disco_items:get(host) or NULL;
 end