X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_legacyauth.lua;h=47a8c0abb007edc8dc74f64702172b4583e8e502;hb=b5de954ba80a4f56777b3650585103864bb96ba5;hp=50566fa661b66ba0b98b7ba74493d1d51869679b;hpb=28767c1c6e26ac35bb198875ed3c9614c0fcc12f;p=prosody.git

diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua
index 50566fa6..47a8c0ab 100644
--- a/plugins/mod_legacyauth.lua
+++ b/plugins/mod_legacyauth.lua
@@ -29,47 +29,53 @@ module:hook("stream-features", function(event)
 	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");
-			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)
-				local reply = st.reply(stanza);
-				if usermanager.test_password(username, password, session.host) 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;
-						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
-					session.send(st.reply(stanza));
-				else
-					session.send(st.error_reply(stanza, "auth", "not-authorized"));
+module:hook("stanza/iq/jabber:iq:auth:query", function(event)
+	local session, stanza = event.origin, event.stanza;
+
+	if session.type ~= "c2s_unauthed" then
+		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)
+		local reply = st.reply(stanza);
+		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;
+				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
-			return true;
-		end);
+			session.send(st.reply(stanza));
+		else
+			session.send(st.error_reply(stanza, "auth", "not-authorized"));
+		end
+	end
+	return true;
+end);