Merge 0.10->trunk

[prosody.git] / plugins / mod_c2s.lua

diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua
index 7a8af406acdd6b3fe2a5710bea28338365c08d36..c638cd039897fc3866eacca4df17c41597182bdb 100644 (file)
--- a/plugins/mod_c2s.lua
+++ b/plugins/mod_c2s.lua
@@ -28,6 +28,8 @@ local c2s_timeout = module:get_option_number("c2s_timeout");
 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;
@@ -81,7 +83,12 @@ function stream_callbacks.streamopened(session, attr)
 
        local features = st.stanza("stream:features");
        hosts[session.host].events.fire_event("stream-features", { origin = session, features = 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)
@@ -91,7 +98,7 @@ 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));
@@ -174,19 +181,6 @@ local function session_close(session, reason)
        end
 end
 
-local function session_open_stream(session)
-       local attr = {
-               ["xmlns:stream"] = 'http://etherx.jabber.org/streams',
-               xmlns = stream_callbacks.default_ns,
-               version = "1.0",
-               ["xml:lang"] = 'en',
-               id = session.streamid or "",
-               from = session.host
-       };
-       session.send("<?xml version='1.0'?>");
-       session.send(st.stanza("stream:stream", attr):top_tag());
-end
-
 module:hook_global("user-deleted", function(event)
        local username, host = event.username, event.host;
        local user = hosts[host].sessions[username];
@@ -211,6 +205,7 @@ end
 
 --- Port listener
 function listener.onconnect(conn)
+       measure_connections(1);
        local session = sm_new_session(conn);
        sessions[conn] = session;
 
@@ -234,7 +229,6 @@ function listener.onconnect(conn)
                conn:setoption("keepalive", opt_keepalives);
        end
 
-       session.open_stream = session_open_stream;
        session.close = session_close;
 
        local stream = new_xmpp_stream(session, stream_callbacks);
@@ -254,9 +248,9 @@ function listener.onconnect(conn)
        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);
+               data = filter("bytes/in", data);
+               if data then
+                       local ok, err = stream:feed(data);
                                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");
@@ -284,6 +278,7 @@ 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 or "connection closed");
@@ -318,7 +313,7 @@ module:hook("server-stopping", function(event)
        for _, session in pairs(sessions) do
                session:close{ condition = "system-shutdown", text = reason };
        end
-end, 1000);
+end, -100);