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 c323440981126c891b4b7e9d34658ba8bc862f64..831f7c3caacc0e6cb3d330270b1badee9c79aeec 100644 (file)
--- a/net/xmppserver_listener.lua
+++ b/net/xmppserver_listener.lua
@@ -69,7 +69,6 @@ local function session_reset_stream(session)
                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)
@@ -115,6 +114,12 @@ function xmppserver.listener(conn, data)
                session = s2s_new_incoming(conn);
                sessions[conn] = session;
 
+               -- Logging functions --
+
+               
+               local conn_name = "s2sin"..tostring(conn):match("[a-f0-9]+$");
+               session.log = logger.init(conn_name);
+               
                session.log("info", "Incoming s2s connection");
                
                session.reset_stream = session_reset_stream;
@@ -129,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