componentmanager: Support the 'disallow_s2s' option for components too (thanks darkho...

[prosody.git] / core / componentmanager.lua

diff --git a/core/componentmanager.lua b/core/componentmanager.lua
index a7c246176fd8bc2f8ad041198a6177d45c1a3ca2..1f0fa81f3d9afcd9bb101a03e3c82a65b7413f20 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,10 +8,11 @@
 
 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 fire_event = prosody.events.fire_event;
 local events_new = require "util.events".new;
 local st = require "util.stanza";
 local prosody, hosts = prosody, prosody.hosts;
@@ -41,6 +42,7 @@ function load_enabled_components(config)
                if host ~= "*" and ((host_config.core.enabled == nil or host_config.core.enabled) and type(host_config.core.component_module) == "string") then
                        hosts[host] = create_component(host);
                        hosts[host].connected = false;
+                       disallow_s2s = configmanager.get(host, "core", "disallow_s2s");
                        components[host] = default_component_handler;
                        local ok, err = modulemanager.load(host, host_config.core.component_module);
                        if not ok then
@@ -84,11 +86,11 @@ function create_component(host, component, events)
                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
+               else
                        -- 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 }));
+                       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 = {},