TLS/SASL no longer should include the connhandler module

[prosody.git] / plugins / mod_tls.lua

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index 22df4b28cfaf64948426399f70c179541b8b6fa3..fe787942fbc15d3453f344eef06a601b6e108d82 100644 (file)
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -3,6 +3,8 @@ local st = require "util.stanza";
 local send = require "core.sessionmanager".send_to_session;
 local sm_bind_resource = require "core.sessionmanager".bind_resource;
 
+local sessions = sessions;
+
 local usermanager_validate_credentials = require "core.usermanager".validate_credentials;
 local t_concat, t_insert = table.concat, table.insert;
 local tostring = tostring;
@@ -11,21 +13,18 @@ local log = require "util.logger".init("mod_starttls");
 
 local xmlns_starttls ='urn:ietf:params:xml:ns:xmpp-tls';
 
-local new_connhandler = require "net.connhandlers".new;
-
 add_handler("c2s_unauthed", "starttls", xmlns_starttls,
                function (session, stanza)
                        if session.conn.starttls then
-                               print("Wants to do TLS...");
                                send(session, st.stanza("proceed", { xmlns = xmlns_starttls }));
-                               session.connhandler = new_connhandler("xmpp-client", session);
-                               session.notopen = true;
-                               if session.conn.starttls() then
-                                       print("Done");
-                               else
-                                       print("Failed");
-                               end
-                               
+                               -- FIXME: I'm commenting the below, not sure why it was necessary
+                               -- sessions[session.conn] = nil;
+                               session:reset_stream();
+                               session.conn.starttls();
+                               session.log("info", "TLS negotiation started...");
+                       else
+                               -- FIXME: What reply?
+                               session.log("warn", "Attempt to start TLS, but TLS is not available on this connection");
                        end
                end);
                
@@ -34,4 +33,4 @@ add_event_hook("stream-features",
                                                if session.conn.starttls then
                                                        t_insert(features, "<starttls xmlns='"..xmlns_starttls.."'/>");
                                                end
-                                       end);
\ No newline at end of file
+                                       end);