mod_bosh: Add option consider_bosh_secure to treat BOSH sessions as encrypted even...

[prosody.git] / net / xmppserver_listener.lua

diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua
index 3def46b5e362a010004076a2af5e5cafbf1c86c8..d1272edb117917270c8c02ef550d2a5d61da8f6f 100644 (file)
--- a/net/xmppserver_listener.lua
+++ b/net/xmppserver_listener.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- 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.
@@ -20,17 +20,39 @@ local s2s_attempt_connect = require "core.s2smanager".attempt_connection;
 local stream_callbacks = { default_ns = "jabber:server",
                streamopened = s2s_streamopened, streamclosed = s2s_streamclosed, handlestanza =  core_process_stanza };
 
+local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
+
 function stream_callbacks.error(session, error, data)
        if error == "no-stream" then
                session:close("invalid-namespace");
-       else
+       elseif error == "parse-error" then
                session.log("debug", "Server-to-server XML parse error: %s", tostring(error));
                session:close("xml-not-well-formed");
+       elseif error == "stream-error" then
+               local condition, text = "undefined-condition";
+               for child in data:children() do
+                       if child.attr.xmlns == xmlns_xmpp_streams then
+                               if child.name ~= "text" then
+                                       condition = child.name;
+                               else
+                                       text = child:get_text();
+                               end
+                               if condition ~= "undefined-condition" and text then
+                                       break;
+                               end
+                       end
+               end
+               text = condition .. (text and (" ("..text..")") or "");
+               session.log("info", "Session closed by remote with error: %s", text);
+               session:close(nil, text);
        end
 end
 
 local function handleerr(err) log("error", "Traceback[s2s]: %s: %s", tostring(err), debug.traceback()); end
 function stream_callbacks.handlestanza(a, b)
+       if b.attr.xmlns == "jabber:client" then --COMPAT: Prosody pre-0.6.2 may send jabber:client
+               b.attr.xmlns = nil;
+       end
        xpcall(function () core_process_stanza(a, b) end, handleerr);
 end
 
@@ -136,7 +158,7 @@ function xmppserver.onincoming(conn, data)
        end
 end
        
-function xmppserver.status(conn, status)
+function xmppserver.onstatus(conn, status)
        if status == "ssl-handshake-complete" then
                local session = sessions[conn];
                if session and session.direction == "outgoing" then
@@ -157,7 +179,7 @@ function xmppserver.ondisconnect(conn, err)
                                return; -- Session lives for now
                        end
                end
-               (session.log or log)("info", "s2s disconnected: %s->%s (%s)", tostring(session.from_host), tostring(session.to_host), tostring(err));
+               (session.log or log)("info", "s2s disconnected: %s->%s (%s)", tostring(session.from_host), tostring(session.to_host), tostring(err or "closed"));
                s2s_destroy_session(session, err);
                sessions[conn]  = nil;
                session = nil;