X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_legacyauth.lua;h=9a9c3902f0dfe242ce3b435056fb06787edd21ca;hb=058af4c1b420e745269641da2e079894f5b6060f;hp=648aa01aa90355a92030947099f6e5ac050a4a9f;hpb=740d4f647339acbc871004de3970c46aeeeab759;p=prosody.git

diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua
index 648aa01a..9a9c3902 100644
--- a/plugins/mod_legacyauth.lua
+++ b/plugins/mod_legacyauth.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.4
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -11,13 +11,28 @@
 local st = require "util.stanza";
 local t_concat = table.concat;
 
+local secure_auth_only = module:get_option("require_encryption");
+
+local sessionmanager = require "core.sessionmanager";
+local usermanager = require "core.usermanager";
+
 module:add_feature("jabber:iq:auth");
 module:add_event_hook("stream-features", function (session, features)
-	if not session.username then features:tag("auth", {xmlns='http://jabber.org/features/iq-auth'}):up(); end
+	if secure_auth_only and not session.secure then
+		-- Sorry, not offering to insecure streams!
+		return;
+	elseif not session.username then
+		features:tag("auth", {xmlns='http://jabber.org/features/iq-auth'}):up();
+	end
 end);
 
 module:add_iq_handler("c2s_unauthed", "jabber:iq:auth", 
 		function (session, stanza)
+			if secure_auth_only and not session.secure then
+				session.send(st.error_reply(stanza, "modify", "not-acceptable", "Encryption (SSL or TLS) is required to connect to this server"));
+				return true;
+			end
+			
 			local username = stanza.tags[1]:child_with_name("username");
 			local password = stanza.tags[1]:child_with_name("password");
 			local resource = stanza.tags[1]:child_with_name("resource");
@@ -27,11 +42,9 @@ module:add_iq_handler("c2s_unauthed", "jabber:iq:auth",
 					:tag("username"):up()
 					:tag("password"):up()
 					:tag("resource"):up());
-				return true;			
 			else
 				username, password, resource = t_concat(username), t_concat(password), t_concat(resource);
 				local reply = st.reply(stanza);
-				require "core.usermanager"
 				if usermanager.validate_credentials(session.host, username, password) then
 					-- Authentication successful!
 					local success, err = sessionmanager.make_authenticated(session, username);
@@ -40,19 +53,13 @@ module:add_iq_handler("c2s_unauthed", "jabber:iq:auth",
 						success, err_type, err, err_msg = sessionmanager.bind_resource(session, resource);
 						if not success then
 							session.send(st.error_reply(stanza, err_type, err, err_msg));
-							return true;
+							return true; -- FIXME need to unauthenticate here
 						end
 					end
 					session.send(st.reply(stanza));
-					return true;
 				else
-					local reply = st.reply(stanza);
-					reply.attr.type = "error";
-					reply:tag("error", { code = "401", type = "auth" })
-						:tag("not-authorized", { xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas" });
-					session.send(reply);
-					return true;
+					session.send(st.error_reply(stanza, "auth", "not-authorized"));
 				end
 			end
-			
+			return true;
 		end);