certmanager: Remove debug logging accidentally committed

[prosody.git] / core / componentmanager.lua

diff --git a/core/componentmanager.lua b/core/componentmanager.lua
index c6d1af9ee1123ed7d00bdf4552a20024da755068..48e279846ce2d800a6726337bcb84f3336cf7ccc 100644 (file)
--- a/core/componentmanager.lua
+++ b/core/componentmanager.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -8,15 +8,18 @@
 
 local prosody = _G.prosody;
 local log = require "util.logger".init("componentmanager");
+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 = 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 uuid_gen = require "util.uuid".generate;
 
-local pairs, type, tostring = pairs, type, tostring;
+local pairs, setmetatable, type, tostring = pairs, setmetatable, type, tostring;
 
 local components = {};
 
@@ -26,7 +29,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
@@ -73,18 +76,25 @@ 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("^[^%.]+%.", "");
                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, events = events or events_new() };
+                       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, session)
@@ -93,12 +103,16 @@ function register_component(host, component, session)
 
                components[host] = component;
                hosts[host] = session or create_component(host, component, old_events);
-               
+
                -- Add events object if not already one
                if not hosts[host].events then
                        hosts[host].events = old_events or events_new();
                end
-               
+
+               if not hosts[host].dialback_secret then
+                       hosts[host].dialback_secret = configmanager.get(host, "core", "dialback_secret") or uuid_gen();
+               end
+
                -- add to disco_items
                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);
@@ -123,7 +137,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