Merge 0.9->0.10

[prosody.git] / plugins / mod_component.lua

diff --git a/plugins/mod_component.lua b/plugins/mod_component.lua
index 871a20e4a28f27a1f01507d5829c29c850d7f7ba..1497b12fc6a0096661aae5e1345cab9f25c4be52 100644 (file)
--- a/plugins/mod_component.lua
+++ b/plugins/mod_component.lua
@@ -1,7 +1,7 @@
 -- Prosody IM
 -- 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.
 --
@@ -9,6 +9,8 @@
 module:set_global();
 
 local t_concat = table.concat;
+local xpcall, tostring, type = xpcall, tostring, type;
+local traceback = debug.traceback;
 
 local logger = require "util.logger";
 local sha1 = require "util.hashes".sha1;
@@ -23,13 +25,15 @@ local hosts = prosody.hosts;
 
 local log = module._log;
 
+local opt_keepalives = module:get_option_boolean("component_tcp_keepalives", module:get_option_boolean("tcp_keepalives", true));
+
 local sessions = module:shared("sessions");
 
 function module.add_host(module)
        if module:get_host_type() ~= "component" then
                error("Don't load mod_component manually, it should be for a component, please see http://prosody.im/doc/components", 0);
        end
-       
+
        local env = module.environment;
        env.connected = false;
 
@@ -40,26 +44,26 @@ function module.add_host(module)
                send = nil;
                session.on_destroy = nil;
        end
-       
+
        -- Handle authentication attempts by component
        local function handle_component_auth(event)
                local session, stanza = event.origin, event.stanza;
-               
+
                if session.type ~= "component_unauthed" then return; end
-       
+
                if (not session.host) or #stanza.tags > 0 then
                        (session.log or log)("warn", "Invalid component handshake for host: %s", session.host);
                        session:close("not-authorized");
                        return true;
                end
-               
+
                local secret = module:get_option("component_secret");
                if not secret then
                        (session.log or log)("warn", "Component attempted to identify as %s, but component_secret is not set", session.host);
                        session:close("not-authorized");
                        return true;
                end
-               
+
                local supplied_token = t_concat(stanza);
                local calculated_token = sha1(session.streamid..secret, true);
                if supplied_token:lower() ~= calculated_token:lower() then
@@ -67,13 +71,13 @@ function module.add_host(module)
                        session:close{ condition = "not-authorized", text = "Given token does not match calculated token" };
                        return true;
                end
-               
+
                if env.connected then
                        module:log("error", "Second component attempted to connect, denying connection");
                        session:close{ condition = "conflict", text = "Component already connected" };
                        return true;
                end
-               
+
                env.connected = true;
                send = session.send;
                session.on_destroy = on_destroy;
@@ -81,10 +85,10 @@ function module.add_host(module)
                session.type = "component";
                module:log("info", "External component successfully authenticated");
                session.send(st.stanza("handshake"));
-       
+
                return true;
        end
-       module:hook("stanza/jabber:component:accept:handshake", handle_component_auth);
+       module:hook("stanza/jabber:component:accept:handshake", handle_component_auth, -1);
 
        -- Handle stanzas addressed to this component
        local function handle_stanza(event)
@@ -112,7 +116,7 @@ function module.add_host(module)
                end
                return true;
        end
-       
+
        module:hook("iq/bare", handle_stanza, -1);
        module:hook("message/bare", handle_stanza, -1);
        module:hook("presence/bare", handle_stanza, -1);
@@ -183,6 +187,7 @@ function stream_callbacks.streamclosed(session)
        session:close();
 end
 
+local function handleerr(err) log("error", "Traceback[component]: %s", traceback(tostring(err), 2)); end
 function stream_callbacks.handlestanza(session, stanza)
        -- Namespaces are icky.
        if not stanza.attr.xmlns and stanza.name == "handshake" then
@@ -213,7 +218,10 @@ function stream_callbacks.handlestanza(session, stanza)
                        return;
                end
        end
-       return core_process_stanza(session, stanza);
+
+       if stanza then
+               return xpcall(function () return core_process_stanza(session, stanza) end, handleerr);
+       end
 end
 
 --- Closing a component connection
@@ -263,14 +271,18 @@ function listener.onconnect(conn)
        local conn_name = "jcp"..tostring(session):match("[a-f0-9]+$");
        session.log = logger.init(conn_name);
        session.close = session_close;
-       
+
+       if opt_keepalives then
+               conn:setoption("keepalive", opt_keepalives);
+       end
+
        session.log("info", "Incoming Jabber component connection");
-       
+
        local stream = new_xmpp_stream(session, stream_callbacks);
        session.stream = stream;
-       
+
        session.notopen = true;
-       
+
        function session.reset_stream()
                session.notopen = true;
                session.stream:reset();
@@ -282,7 +294,7 @@ function listener.onconnect(conn)
                module:log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_"));
                session:close("not-well-formed");
        end
-       
+
        session.dispatch_stanza = stream_callbacks.handlestanza;
 
        sessions[conn] = session;