X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_saslauth.lua;h=4906d01f6fa9f6d52ad7f3448268c13615b879cf;hb=6d7a9cba5240a142b1a1e397e6248cf13c261cca;hp=94dc8808d6c98261706e920840ff16c24d85a816;hpb=c2f21f72ce3632f8abd848851715e1abb79aeee1;p=prosody.git

diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index 94dc8808..4906d01f 100644
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -15,11 +15,9 @@ local base64 = require "util.encodings".base64;
 
 local nodeprep = require "util.encodings".stringprep.nodeprep;
 local usermanager_get_sasl_handler = require "core.usermanager".get_sasl_handler;
-local t_concat, t_insert = table.concat, table.insert;
 local tostring = tostring;
 
 local secure_auth_only = module:get_option("c2s_require_encryption") or module:get_option("require_encryption");
-local anonymous_login = module:get_option("anonymous_login");
 local allow_unencrypted_plain_auth = module:get_option("allow_unencrypted_plain_auth")
 
 local log = module._log;
@@ -28,14 +26,6 @@ local xmlns_sasl ='urn:ietf:params:xml:ns:xmpp-sasl';
 local xmlns_bind ='urn:ietf:params:xml:ns:xmpp-bind';
 local xmlns_stanzas ='urn:ietf:params:xml:ns:xmpp-stanzas';
 
-local new_sasl = require "util.sasl".new;
-
-local anonymous_authentication_profile = {
-	anonymous = function(username, realm)
-		return true; -- for normal usage you should always return true here
-	end
-};
-
 local function build_reply(status, ret, err_msg)
 	local reply = st.stanza(status, {xmlns = xmlns_sasl});
 	if status == "challenge" then
@@ -72,34 +62,7 @@ local function handle_status(session, status, ret, err_msg)
 	return status, ret, err_msg;
 end
 
-local function sasl_handler(event)
-	local session, stanza = event.origin, event.stanza;
-	if session.type ~= "c2s_unauthed" then return; end
-
-	if stanza.name == "auth" then
-		-- FIXME ignoring duplicates because ejabberd does
-		local mechanism = stanza.attr.mechanism;
-		if anonymous_login then
-			if mechanism ~= "ANONYMOUS" then
-				session.send(build_reply("failure", "invalid-mechanism"));
-				return true;
-			end
-		elseif mechanism == "ANONYMOUS" then
-			session.send(build_reply("failure", "mechanism-too-weak"));
-			return true;
-		end
-		if not session.secure and (secure_auth_only or (mechanism == "PLAIN" and not allow_unencrypted_plain_auth)) then
-			session.send(build_reply("failure", "encryption-required"));
-			return true;
-		end
-		local valid_mechanism = session.sasl_handler:select(mechanism);
-		if not valid_mechanism then
-			session.send(build_reply("failure", "invalid-mechanism"));
-			return true;
-		end
-	elseif not session.sasl_handler then
-		return true; -- FIXME ignoring out of order stanzas because ejabberd does
-	end
+local function sasl_process_cdata(session, stanza)
 	local text = stanza[1];
 	if text then
 		text = base64.decode(text);
@@ -118,9 +81,42 @@ local function sasl_handler(event)
 	return true;
 end
 
-module:hook("stanza/urn:ietf:params:xml:ns:xmpp-sasl:auth", sasl_handler);
-module:hook("stanza/urn:ietf:params:xml:ns:xmpp-sasl:abort", sasl_handler);
-module:hook("stanza/urn:ietf:params:xml:ns:xmpp-sasl:response", sasl_handler);
+module:hook("stanza/urn:ietf:params:xml:ns:xmpp-sasl:auth", function(event)
+	local session, stanza = event.origin, event.stanza;
+	if session.type ~= "c2s_unauthed" then return; end
+
+	if session.sasl_handler and session.sasl_handler.selected then
+		session.sasl_handler = nil; -- allow starting a new SASL negotiation before completing an old one
+	end
+	if not session.sasl_handler then
+		session.sasl_handler = usermanager_get_sasl_handler(module.host);
+	end
+	local mechanism = stanza.attr.mechanism;
+	if not session.secure and (secure_auth_only or (mechanism == "PLAIN" and not allow_unencrypted_plain_auth)) then
+		session.send(build_reply("failure", "encryption-required"));
+		return true;
+	end
+	local valid_mechanism = session.sasl_handler:select(mechanism);
+	if not valid_mechanism then
+		session.send(build_reply("failure", "invalid-mechanism"));
+		return true;
+	end
+	return sasl_process_cdata(session, stanza);
+end);
+module:hook("stanza/urn:ietf:params:xml:ns:xmpp-sasl:response", function(event)
+	local session = event.origin;
+	if not(session.sasl_handler and session.sasl_handler.selected) then
+		session.send(build_reply("failure", "not-authorized", "Out of order SASL element"));
+		return true;
+	end
+	return sasl_process_cdata(session, event.stanza);
+end);
+module:hook("stanza/urn:ietf:params:xml:ns:xmpp-sasl:abort", function(event)
+	local session = event.origin;
+	session.sasl_handler = nil;
+	session.send(build_reply("failure", "aborted"));
+	return true;
+end);
 
 local mechanisms_attr = { xmlns='urn:ietf:params:xml:ns:xmpp-sasl' };
 local bind_attr = { xmlns='urn:ietf:params:xml:ns:xmpp-bind' };
@@ -131,11 +127,7 @@ module:hook("stream-features", function(event)
 		if secure_auth_only and not origin.secure then
 			return;
 		end
-		if anonymous_login then
-			origin.sasl_handler = new_sasl(module.host, anonymous_authentication_profile);
-		else
-			origin.sasl_handler = usermanager_get_sasl_handler(module.host);
-		end
+		origin.sasl_handler = usermanager_get_sasl_handler(module.host);
 		features:tag("mechanisms", mechanisms_attr);
 		for mechanism in pairs(origin.sasl_handler:mechanisms()) do
 			if mechanism ~= "PLAIN" or origin.secure or allow_unencrypted_plain_auth then
@@ -170,7 +162,10 @@ module:hook("iq/self/urn:ietf:params:xml:ns:xmpp-bind:bind", function(event)
 	return true;
 end);
 
-module:hook("iq/self/urn:ietf:params:xml:ns:xmpp-session:session", function(event)
+local function handle_legacy_session(event)
 	event.origin.send(st.reply(event.stanza));
 	return true;
-end);
+end
+
+module:hook("iq/self/urn:ietf:params:xml:ns:xmpp-session:session", handle_legacy_session);
+module:hook("iq/host/urn:ietf:params:xml:ns:xmpp-session:session", handle_legacy_session);