mod_tls: Mark session as not secure before negotiating TLS

[prosody.git] / net / xmppserver_listener.lua

diff --git a/net/xmppserver_listener.lua b/net/xmppserver_listener.lua
index ddfb185e5562a79eae7643228094688df1bdef66..831f7c3caacc0e6cb3d330270b1badee9c79aeec 100644 (file)
--- a/net/xmppserver_listener.lua
+++ b/net/xmppserver_listener.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.4
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -61,17 +61,23 @@ local function session_reset_stream(session)
                function session.data(conn, data)
                        local ok, err = parser:parse(data);
                        if ok then return; end
+                       session.log("warn", "Received invalid XML: %s", data);
+                       session.log("warn", "Problem was: %s", err);
                        session:close("xml-not-well-formed");
                end
                
                return true;
 end
 
-
 local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
+local default_stream_attr = { ["xmlns:stream"] = stream_callbacks.stream_tag:gsub("%|[^|]+$", ""), xmlns = stream_callbacks.default_ns, version = "1.0", id = "" };
 local function session_close(session, reason)
        local log = session.log or log;
        if session.conn then
+               if session.notopen then
+                       session.sends2s("<?xml version='1.0'?>");
+                       session.sends2s(st.stanza("stream:stream", default_stream_attr):top_tag());
+               end
                if reason then
                        if type(reason) == "string" then -- assume stream error
                                log("info", "Disconnecting %s[%s], <stream:error> is: %s", session.host or "(unknown host)", session.type, reason);
@@ -128,6 +134,17 @@ function xmppserver.listener(conn, data)
        end
 end
        
+function xmppserver.status(conn, status)
+       if status == "ssl-handshake-complete" then
+               local session = sessions[conn];
+               if session and session.direction == "outgoing" then
+                       local format, to_host, from_host = string.format, session.to_host, session.from_host;
+                       session.log("debug", "Sending stream header...");
+                       session.sends2s(format([[<stream:stream xmlns='jabber:server' xmlns:db='jabber:server:dialback' xmlns:stream='http://etherx.jabber.org/streams' from='%s' to='%s' version='1.0'>]], from_host, to_host));
+               end
+       end
+end
+
 function xmppserver.disconnect(conn, err)
        local session = sessions[conn];
        if session then