Merge 0.9->0.10
[prosody.git] / plugins / mod_c2s.lua
index 67156f55298539fd6e99b5a8b3460e4be9c601a6..2829d5fdb61fe221d59f22d65d618abcf8c5ee68 100644 (file)
@@ -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.
 --
@@ -11,14 +11,12 @@ module:set_global();
 local add_task = require "util.timer".add_task;
 local new_xmpp_stream = require "util.xmppstream".new;
 local nameprep = require "util.encodings".stringprep.nameprep;
-local portmanager = require "core.portmanager";
 local sessionmanager = require "core.sessionmanager";
 local st = require "util.stanza";
 local sm_new_session, sm_destroy_session = sessionmanager.new_session, sessionmanager.destroy_session;
 local uuid_generate = require "util.uuid".generate;
 
 local xpcall, tostring, type = xpcall, tostring, type;
-local format = string.format;
 local traceback = debug.traceback;
 
 local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
@@ -26,16 +24,20 @@ local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
 local log = module._log;
 
 local c2s_timeout = module:get_option_number("c2s_timeout");
-local opt_keepalives = module:get_option_boolean("tcp_keepalives", false);
+local stream_close_timeout = module:get_option_number("c2s_close_timeout", 5);
+local opt_keepalives = module:get_option_boolean("c2s_tcp_keepalives", module:get_option_boolean("tcp_keepalives", true));
+
+local measure_connections = module:measure("connections", "counter");
 
 local sessions = module:shared("sessions");
+local core_process_stanza = prosody.core_process_stanza;
+local hosts = prosody.hosts;
 
-local stream_callbacks = { default_ns = "jabber:client", handlestanza = core_process_stanza };
-local listener = { default_port = 5222, default_mode = "*a" };
+local stream_callbacks = { default_ns = "jabber:client" };
+local listener = {};
 
 --- Stream events handlers
 local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
-local default_stream_attr = { ["xmlns:stream"] = "http://etherx.jabber.org/streams", xmlns = stream_callbacks.default_ns, version = "1.0", id = "" };
 
 function stream_callbacks.streamopened(session, attr)
        local send = session.send;
@@ -49,14 +51,13 @@ function stream_callbacks.streamopened(session, attr)
        session.streamid = uuid_generate();
        (session.log or session)("debug", "Client sent opening <stream:stream> to %s", session.host);
 
-       if not hosts[session.host] then
+       if not hosts[session.host] or not hosts[session.host].modules.c2s then
                -- We don't serve this host...
                session:close{ condition = "host-unknown", text = "This server does not serve "..tostring(session.host)};
                return;
        end
 
-       send("<?xml version='1.0'?>");
-       send(format("<stream:stream xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' id='%s' from='%s' version='1.0' xml:lang='en'>", session.streamid, session.host));
+       session:open_stream();
 
        (session.log or log)("debug", "Sent reply <stream:stream> to client");
        session.notopen = nil;
@@ -65,23 +66,37 @@ function stream_callbacks.streamopened(session, attr)
        -- since we now have a new stream header, session is secured
        if session.secure == false then
                session.secure = true;
+               session.encrypted = true;
+
+               local sock = session.conn:socket();
+               if sock.info then
+                       local info = sock:info();
+                       (session.log or log)("info", "Stream encrypted (%s with %s)", info.protocol, info.cipher);
+                       session.compressed = info.compression;
+               else
+                       (session.log or log)("info", "Stream encrypted");
+                       session.compressed = sock.compression and sock:compression(); --COMPAT mw/luasec-hg
+               end
        end
 
        local features = st.stanza("stream:features");
        hosts[session.host].events.fire_event("stream-features", { origin = session, features = features });
-       module:fire_event("stream-features", session, features);
-
-       send(features);
+       if features.tags[1] or session.full_jid then
+               send(features);
+       else
+               (session.log or log)("warn", "No features to offer");
+               session:close{ condition = "undefined-condition", text = "No features to proceed with" };
+       end
 end
 
 function stream_callbacks.streamclosed(session)
        session.log("debug", "Received </stream:stream>");
-       session:close();
+       session:close(false);
 end
 
 function stream_callbacks.error(session, error, data)
        if error == "no-stream" then
-               session.log("debug", "Invalid opening stream header");
+               session.log("debug", "Invalid opening stream header (%s)", (data:gsub("^([^\1]+)\1", "{%1}")));
                session:close("invalid-namespace");
        elseif error == "parse-error" then
                (session.log or log)("debug", "Client XML parse error: %s", tostring(data));
@@ -106,7 +121,7 @@ function stream_callbacks.error(session, error, data)
        end
 end
 
-local function handleerr(err) log("error", "Traceback[c2s]: %s: %s", tostring(err), traceback()); end
+local function handleerr(err) log("error", "Traceback[c2s]: %s", traceback(tostring(err), 2)); end
 function stream_callbacks.handlestanza(session, stanza)
        stanza = session.filter("stanzas/in", stanza);
        if stanza then
@@ -119,75 +134,119 @@ local function session_close(session, reason)
        local log = session.log or log;
        if session.conn then
                if session.notopen then
-                       session.send("<?xml version='1.0'?>");
-                       session.send(st.stanza("stream:stream", default_stream_attr):top_tag());
+                       session:open_stream();
                end
-               if reason then
+               if reason then -- nil == no err, initiated by us, false == initiated by client
+                       local stream_error = st.stanza("stream:error");
                        if type(reason) == "string" then -- assume stream error
-                               log("info", "Disconnecting client, <stream:error> is: %s", reason);
-                               session.send(st.stanza("stream:error"):tag(reason, {xmlns = 'urn:ietf:params:xml:ns:xmpp-streams' }));
+                               stream_error:tag(reason, {xmlns = 'urn:ietf:params:xml:ns:xmpp-streams' });
                        elseif type(reason) == "table" then
                                if reason.condition then
-                                       local stanza = st.stanza("stream:error"):tag(reason.condition, stream_xmlns_attr):up();
+                                       stream_error:tag(reason.condition, stream_xmlns_attr):up();
                                        if reason.text then
-                                               stanza:tag("text", stream_xmlns_attr):text(reason.text):up();
+                                               stream_error:tag("text", stream_xmlns_attr):text(reason.text):up();
                                        end
                                        if reason.extra then
-                                               stanza:add_child(reason.extra);
+                                               stream_error:add_child(reason.extra);
                                        end
-                                       log("info", "Disconnecting client, <stream:error> is: %s", tostring(stanza));
-                                       session.send(stanza);
                                elseif reason.name then -- a stanza
-                                       log("info", "Disconnecting client, <stream:error> is: %s", tostring(reason));
-                                       session.send(reason);
+                                       stream_error = reason;
                                end
                        end
+                       stream_error = tostring(stream_error);
+                       log("debug", "Disconnecting client, <stream:error> is: %s", stream_error);
+                       session.send(stream_error);
                end
+
                session.send("</stream:stream>");
-               session.conn:close();
-               listener.ondisconnect(session.conn, (reason and (reason.text or reason.condition)) or reason or "session closed");
+               function session.send() return false; end
+
+               local reason = (reason and (reason.name or reason.text or reason.condition)) or reason;
+               session.log("debug", "c2s stream for %s closed: %s", session.full_jid or ("<"..session.ip..">"), reason or "session closed");
+
+               -- Authenticated incoming stream may still be sending us stanzas, so wait for </stream:stream> from remote
+               local conn = session.conn;
+               if reason == nil and not session.notopen and session.type == "c2s" then
+                       -- Grace time to process data from authenticated cleanly-closed stream
+                       add_task(stream_close_timeout, function ()
+                               if not session.destroyed then
+                                       session.log("warn", "Failed to receive a stream close response, closing connection anyway...");
+                                       sm_destroy_session(session, reason);
+                                       conn:close();
+                               end
+                       end);
+               else
+                       sm_destroy_session(session, reason);
+                       conn:close();
+               end
+       else
+               local reason = (reason and (reason.name or reason.text or reason.condition)) or reason;
+               sm_destroy_session(session, reason);
        end
 end
 
+module:hook_global("user-deleted", function(event)
+       local username, host = event.username, event.host;
+       local user = hosts[host].sessions[username];
+       if user and user.sessions then
+               for jid, session in pairs(user.sessions) do
+                       session:close{ condition = "not-authorized", text = "Account deleted" };
+               end
+       end
+end, 200);
+
 --- Port listener
 function listener.onconnect(conn)
+       measure_connections(1);
        local session = sm_new_session(conn);
        sessions[conn] = session;
-       
+
        session.log("info", "Client connected");
-       
+
        -- Client is using legacy SSL (otherwise mod_tls sets this flag)
        if conn:ssl() then
                session.secure = true;
+               session.encrypted = true;
+
+               -- Check if TLS compression is used
+               local sock = conn:socket();
+               if sock.info then
+                       session.compressed = sock:info"compression";
+               elseif sock.compression then
+                       session.compressed = sock:compression(); --COMPAT mw/luasec-hg
+               end
        end
-       
+
        if opt_keepalives then
                conn:setoption("keepalive", opt_keepalives);
        end
-       
+
        session.close = session_close;
-       
+
        local stream = new_xmpp_stream(session, stream_callbacks);
        session.stream = stream;
        session.notopen = true;
-       
+
        function session.reset_stream()
                session.notopen = true;
                session.stream:reset();
        end
-       
+
        local filter = session.filter;
        function session.data(data)
+               -- Parse the data, which will store stanzas in session.pending_stanzas
+               if data then
                data = filter("bytes/in", data);
                if data then
                        local ok, err = stream:feed(data);
-                       if ok then return; end
-                       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");
+                               if not ok then
+                                       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
+                       end
                end
        end
 
-       
        if c2s_timeout then
                add_task(c2s_timeout, function ()
                        if session.type == "c2s_unauthed" then
@@ -207,27 +266,57 @@ function listener.onincoming(conn, data)
 end
 
 function listener.ondisconnect(conn, err)
+       measure_connections(-1);
        local session = sessions[conn];
        if session then
-               (session.log or log)("info", "Client disconnected: %s", err);
+               (session.log or log)("info", "Client disconnected: %s", err or "connection closed");
                sm_destroy_session(session, err);
+               session.conn = nil;
                sessions[conn]  = nil;
-               session = nil;
        end
 end
 
+function listener.onreadtimeout(conn)
+       local session = sessions[conn];
+       if session then
+               return (hosts[session.host] or prosody).events.fire_event("c2s-read-timeout", { session = session });
+       end
+end
+
+local function keepalive(event)
+       return event.session.send(' ');
+end
+
 function listener.associate_session(conn, session)
        sessions[conn] = session;
 end
 
-module:add_item("net-provider", {
+function module.add_host(module)
+       module:hook("c2s-read-timeout", keepalive, -1);
+end
+
+module:hook("c2s-read-timeout", keepalive, -1);
+
+module:hook("server-stopping", function(event)
+       local reason = event.reason;
+       for _, session in pairs(sessions) do
+               session:close{ condition = "system-shutdown", text = reason };
+       end
+end, -100);
+
+
+
+module:provides("net", {
        name = "c2s";
        listener = listener;
        default_port = 5222;
        encryption = "starttls";
+       multiplex = {
+               pattern = "^<.*:stream.*%sxmlns%s*=%s*(['\"])jabber:client%1.*>";
+       };
 });
 
-module:add_item("net-provider", {
+module:provides("net", {
        name = "legacy_ssl";
        listener = listener;
        encryption = "ssl";