X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_tls.lua;h=8926edfc33293fa295fc790c2e4079f21979cc89;hb=58bf4369711eed604ab2a485f7f957e522a05796;hp=b5ca5015fe23162599b5379ccf5d6449827bcac5;hpb=3fc57224531d56171f8478a5b6b6bac678b04645;p=prosody.git

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index b5ca5015..8926edfc 100644
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -1,32 +1,43 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
 
-local st = require "util.stanza";
-
---local sessions = sessions;
 
-local t_insert = table.insert;
 
-local log = require "util.logger".init("mod_starttls");
+local st = require "util.stanza";
 
 local xmlns_starttls ='urn:ietf:params:xml:ns:xmpp-tls';
 
-add_handler("c2s_unauthed", "starttls", xmlns_starttls,
+local config = require "core.configmanager";
+local secure_auth_only = config.get("*", "core", "require_encryption");
+
+module:add_handler("c2s_unauthed", "starttls", xmlns_starttls,
 		function (session, stanza)
 			if session.conn.starttls then
 				session.send(st.stanza("proceed", { xmlns = xmlns_starttls }));
-				-- 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...");
+				session.secure = false;
 			else
 				-- FIXME: What reply?
 				session.log("warn", "Attempt to start TLS, but TLS is not available on this connection");
 			end
 		end);
 		
-add_event_hook("stream-features", 
-					function (session, features)												
-						if session.conn.starttls then
-							t_insert(features, "<starttls xmlns='"..xmlns_starttls.."'/>");
-						end
-					end);
+local starttls_attr = { xmlns = xmlns_starttls };
+module:add_event_hook("stream-features", 
+		function (session, features)												
+			if session.conn.starttls then
+				features:tag("starttls", starttls_attr);
+				if secure_auth_only then
+					features:tag("required"):up():up();
+				else
+					features:up();
+				end
+			end
+		end);