X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_legacyauth.lua;h=5fb664415682661f6fb30fac87152e72b703b3fc;hb=99b003b1917a8ab0b561f7fb98d28d1fad8f8dc8;hp=3e3924704d1cd35aef4b1554c193fef4f86a31df;hpb=ce30d543330e423952342c08e62d1b30d5618a28;p=prosody.git

diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua
index 3e392470..5fb66441 100644
--- a/plugins/mod_legacyauth.lua
+++ b/plugins/mod_legacyauth.lua
@@ -1,6 +1,6 @@
--- Prosody IM v0.3
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -11,48 +11,76 @@
 local st = require "util.stanza";
 local t_concat = table.concat;
 
+local secure_auth_only = module:get_option("c2s_require_encryption")
+	or module:get_option("require_encryption")
+	or not(module:get_option("allow_unencrypted_plain_auth"));
+
+local sessionmanager = require "core.sessionmanager";
+local usermanager = require "core.usermanager";
+local nodeprep = require "util.encodings".stringprep.nodeprep;
+local resourceprep = require "util.encodings".stringprep.resourceprep;
+
 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
+module:hook("stream-features", function(event)
+	local origin, features = event.origin, event.features;
+	if secure_auth_only and not origin.secure then
+		-- Sorry, not offering to insecure streams!
+		return;
+	elseif not origin.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)
-			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");
-			if not (username and password and resource) then
-				local reply = st.reply(stanza);
-				session.send(reply:query("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);
-					if success then
-						local err_type, err_msg;
-						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;
-						end
-					end
-					session.send(st.reply(stanza));
+module:hook("stanza/iq/jabber:iq:auth:query", function(event)
+	local session, stanza = event.origin, event.stanza;
+
+	if session.type ~= "c2s_unauthed" then
+		(session.sends2s or session.send)(st.error_reply(stanza, "cancel", "service-unavailable", "Legacy authentication is only allowed for unauthenticated client connections."));
+		return true;
+	end
+
+	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");
+	if not (username and password and resource) then
+		local reply = st.reply(stanza);
+		session.send(reply:query("jabber:iq:auth")
+			:tag("username"):up()
+			:tag("password"):up()
+			:tag("resource"):up());
+	else
+		username, password, resource = t_concat(username), t_concat(password), t_concat(resource);
+		username = nodeprep(username);
+		resource = resourceprep(resource)
+		if not (username and resource) then
+			session.send(st.error_reply(stanza, "modify", "bad-request"));
+			return true;
+		end
+		if usermanager.test_password(username, session.host, password) then
+			-- Authentication successful!
+			local success, err = sessionmanager.make_authenticated(session, username);
+			if success then
+				local err_type, err_msg;
+				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));
+					session.username, session.type = nil, "c2s_unauthed"; -- FIXME should this be placed in sessionmanager?
 					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);
+				elseif resource ~= session.resource then -- server changed resource, not supported by legacy auth
+					session.send(st.error_reply(stanza, "cancel", "conflict", "The requested resource could not be assigned to this session."));
+					session:close(); -- FIXME undo resource bind and auth instead of closing the session?
 					return true;
 				end
 			end
-			
-		end);
+			session.send(st.reply(stanza));
+		else
+			session.send(st.error_reply(stanza, "auth", "not-authorized"));
+		end
+	end
+	return true;
+end);