X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_tls.lua;h=9b7bc41518e1699e091c7f5c6fec16827d418ffa;hb=3704ffb23b6ffd8d248f9c7ad26d7f19a0cc6824;hp=d5f3157b8250c926da5dedbaa7317c131508029f;hpb=ad90ce045af05bf847949e9bf6577b03c619ec8e;p=prosody.git

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index d5f3157b..9b7bc415 100644
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -1,33 +1,91 @@
+-- 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 xmlns_stream = 'http://etherx.jabber.org/streams';
+local xmlns_starttls = 'urn:ietf:params:xml:ns:xmpp-tls';
 
-local t_insert = table.insert;
+local secure_auth_only = module:get_option("c2s_require_encryption") or module:get_option("require_encryption");
+local secure_s2s_only = module:get_option("s2s_require_encryption");
 
-local log = require "util.logger".init("mod_starttls");
+local global_ssl_ctx = prosody.global_ssl_ctx;
 
-local xmlns_starttls ='urn:ietf:params:xml:ns:xmpp-tls';
+function starttls_handler(session, stanza)
+	if session.conn.starttls then
+		(session.sends2s or session.send)(st.stanza("proceed", { xmlns = xmlns_starttls }));
+		session:reset_stream();
+		local host = session.to_host or session.host;
+		local ssl_ctx = host and hosts[host].ssl_ctx_in or global_ssl_ctx;
+		session.conn:starttls(ssl_ctx);
+		session.log("info", "TLS negotiation started for %s...", session.type);
+		session.secure = false;
+	else
+		-- FIXME: What reply?
+		session.log("warn", "Attempt to start TLS, but TLS is not available on this %s connection", session.type);
+	end
+end
 
-module:add_handler("c2s_unauthed", "starttls", xmlns_starttls,
+module:hook("stanza/urn:ietf:params:xml:ns:xmpp-tls:starttls", function(event)
+	local origin, stanza = event.origin, event.stanza;
+	if origin.type == "c2s_unauthed" or origin.type == "s2sin_unauthed" then
+		starttls_handler(origin, stanza);
+	else
+		-- FIXME: What reply?
+		origin.log("warn", "Attempt to start TLS, but TLS is not available on this %s connection", origin.type);
+	end
+	return true;
+end);
+
+
+local starttls_attr = { xmlns = xmlns_starttls };
+module:add_event_hook("stream-features", 
+		function (session, features)
+			if not session.username and 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);
+
+module:hook("s2s-stream-features", 
+		function (data)
+			local session, features = data.session, data.features;
+			if session.to_host and session.type ~= "s2sin" and session.conn.starttls then
+				features:tag("starttls", starttls_attr):up();
+				if secure_s2s_only then
+					features:tag("required"):up():up();
+				else
+					features:up();
+				end
+			end
+		end);
+
+-- For s2sout connections, start TLS if we can
+module:hook_stanza(xmlns_stream, "features",
 		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...");
-			else
-				-- FIXME: What reply?
-				session.log("warn", "Attempt to start TLS, but TLS is not available on this connection");
+			module:log("debug", "Received features element");
+			if session.conn.starttls and stanza:child_with_ns(xmlns_starttls) then
+				module:log("%s is offering TLS, taking up the offer...", session.to_host);
+				session.sends2s("<starttls xmlns='"..xmlns_starttls.."'/>");
+				return true;
 			end
+		end, 500);
+
+module:hook_stanza(xmlns_starttls, "proceed",
+		function (session, stanza)
+			module:log("debug", "Proceeding with TLS on s2sout...");
+			session:reset_stream();
+			local ssl_ctx = session.from_host and hosts[session.from_host].ssl_ctx or global_ssl_ctx;
+			session.conn:starttls(ssl_ctx, true);
+			session.secure = false;
+			return true;
 		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):up();
-						end
-					end);