diff options
Diffstat (limited to 'core/componentmanager.lua')
| -rw-r--r-- | core/componentmanager.lua | 61 |
1 files changed, 34 insertions, 27 deletions
diff --git a/core/componentmanager.lua b/core/componentmanager.lua index 08868236..a16c01d2 100644 --- a/core/componentmanager.lua +++ b/core/componentmanager.lua @@ -6,18 +6,15 @@ -- 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"; -local core_route_stanza = core_route_stanza; 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 serialize = require "util.serialization".serialize local pairs, type, tostring = pairs, type, tostring; @@ -25,45 +22,38 @@ local components = {}; local disco_items = require "util.multitable".new(); local NULL = {}; -require "core.discomanager".addDiscoItemsHandler("*host", function(reply, to, from, node) - if #node == 0 and hosts[to] then - for jid in pairs(disco_items:get(to) or NULL) do - reply:tag("item", {jid = jid}):up(); - end - return true; - end -end); - -prosody.events.add_handler("server-starting", function () core_route_stanza = _G.core_route_stanza; end); module "componentmanager" local function default_component_handler(origin, stanza) - log("warn", "Stanza being handled by default component, bouncing error"); - if stanza.attr.type ~= "error" then - core_route_stanza(nil, st.error_reply(stanza, "wait", "service-unavailable", "Component unavailable")); + 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 end -local components_loaded_once; 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] = { type = "component", host = host, connected = false, s2sout = {}, events = events_new() }; + 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 -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); @@ -76,13 +66,25 @@ function handle_stanza(origin, stanza) 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: " .. (stanza.attr.to or serialize(stanza))); + 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) +function create_component(host, component, events) -- TODO check for host well-formedness - return { type = "component", host = host, connected = true, s2sout = {}, events = events_new() }; + local ssl_ctx; + if host 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; + end + end + return { type = "component", host = host, connected = true, s2sout = {}, + ssl_ctx = ssl_ctx, events = events or events_new() }; end function register_component(host, component, session) @@ -90,7 +92,7 @@ function register_component(host, component, session) local old_events = hosts[host] and hosts[host].events; components[host] = component; - hosts[host] = session or create_component(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 @@ -101,8 +103,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 @@ -112,6 +114,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]; @@ -120,7 +123,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 @@ -138,4 +141,8 @@ function set_component_handler(host, handler) components[host] = handler; end +function get_children(host) + return disco_items:get(host) or NULL; +end + return _M; |