X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fcomponentmanager.lua;h=48e279846ce2d800a6726337bcb84f3336cf7ccc;hb=1881612f6e77c771984d73b85704e89818a82977;hp=dfc2cd783bd89a60b251897402ae41bd768c883b;hpb=bf323fdaf027671af614586e14b8ecab43da1922;p=prosody.git

diff --git a/core/componentmanager.lua b/core/componentmanager.lua
index dfc2cd78..48e27984 100644
--- a/core/componentmanager.lua
+++ b/core/componentmanager.lua
@@ -12,16 +12,20 @@ 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;
 
 local components = {};
 
+local disco_items = require "util.multitable".new();
+local NULL = {};
+
 module "componentmanager"
 
 local function default_component_handler(origin, stanza)
@@ -31,20 +35,74 @@ local function default_component_handler(origin, stanza)
 	end
 end
 
+function load_enabled_components(config)
+	local defined_hosts = config or configmanager.getconfig();
+		
+	for host, host_config in pairs(defined_hosts) do
+		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;
+			components[host] = default_component_handler;
+			local ok, err = modulemanager.load(host, host_config.core.component_module);
+			if not ok then
+				log("error", "Error loading %s component %s: %s", tostring(host_config.core.component_module), tostring(host), tostring(err));
+			else
+				fire_event("component-activated", host, host_config);
+				log("debug", "Activated %s component: %s", host_config.core.component_module, host);
+			end
+		end
+	end
+end
+
+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, 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)
-	if not hosts[host] or hosts[host].type == 'component' then
+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
@@ -55,10 +113,14 @@ function register_component(host, component)
 			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);
+		end
 		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
@@ -68,6 +130,7 @@ 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];
 		if host_config and ((host_config.core.enabled == nil or host_config.core.enabled) and type(host_config.core.component_module) == "string") then
 			-- Set default handler
@@ -77,6 +140,10 @@ function deregister_component(host)
 			hosts[host] = nil; -- FIXME do proper unload of all modules and other cleanup before removing
 			components[host] = nil;
 		end
+		-- remove from disco_items
+		if not(host:find("@", 1, true) or host:find("/", 1, true)) and host:find(".", 1, true) then
+			disco_items:remove(host:sub(host:find(".", 1, true)+1), host);
+		end
 		log("debug", "component removed: "..host);
 		return true;
 	else
@@ -84,4 +151,12 @@ 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
+
 return _M;