X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_saslauth.lua;h=f6abd3b88838f34371ba7524cab26b378e07a63b;hb=99b003b1917a8ab0b561f7fb98d28d1fad8f8dc8;hp=7f9a27ad2a714d40853d04558cc08321952cf671;hpb=70281db08732799bcd1ff4dcc3ca51b1388f1375;p=prosody.git

diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index 7f9a27ad..f6abd3b8 100644
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -16,28 +16,16 @@ local base64 = require "util.encodings".base64;
 
 local cert_verify_identity = require "util.x509".verify_identity;
 
-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;
 
 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});
@@ -58,16 +46,17 @@ end
 
 local function handle_status(session, status, ret, err_msg)
 	if status == "failure" then
+		module:fire_event("authentication-failure", { session = session, condition = ret, text = err_msg });
 		session.sasl_handler = session.sasl_handler:clean_clone();
 	elseif status == "success" then
-		local username = nodeprep(session.sasl_handler.username);
-
 		local ok, err = sm_make_authenticated(session, session.sasl_handler.username);
 		if ok then
+			module:fire_event("authentication-success", { session = session });
 			session.sasl_handler = nil;
 			session:reset_stream();
 		else
 			module:log("warn", "SASL succeeded but username was invalid");
+			module:fire_event("authentication-failure", { session = session, condition = "not-authorized", text = err });
 			session.sasl_handler = session.sasl_handler:clean_clone();
 			return "failure", "not-authorized", "User authenticated successfully, but username was invalid";
 		end
@@ -199,8 +188,10 @@ local function s2s_external_auth(session, stanza)
 		session.from_host = text;
 	end
 	session.sends2s(build_reply("success"))
-	module:log("info", "Accepting SASL EXTERNAL identity from %s", text or session.from_host);
-	s2s_make_authenticated(session, text or session.from_host)
+
+	local domain = text ~= "" and text or session.from_host;
+	module:log("info", "Accepting SASL EXTERNAL identity from %s", domain);
+	s2s_make_authenticated(session, domain);
 	session:reset_stream();
 	return true
 end
@@ -217,22 +208,9 @@ module:hook("stanza/urn:ietf:params:xml:ns:xmpp-sasl:auth", function(event)
 		session.sasl_handler = nil; -- allow starting a new SASL negotiation before completing an old one
 	end
 	if not session.sasl_handler then
-		if anonymous_login then
-			session.sasl_handler = new_sasl(module.host, anonymous_authentication_profile);
-		else
-			session.sasl_handler = usermanager_get_sasl_handler(module.host);
-		end
+		session.sasl_handler = usermanager_get_sasl_handler(module.host, session);
 	end
 	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;
@@ -268,18 +246,14 @@ 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
-		features:tag("mechanisms", mechanisms_attr);
+		origin.sasl_handler = usermanager_get_sasl_handler(module.host, origin);
+		local mechanisms = st.stanza("mechanisms", mechanisms_attr);
 		for mechanism in pairs(origin.sasl_handler:mechanisms()) do
 			if mechanism ~= "PLAIN" or origin.secure or allow_unencrypted_plain_auth then
-				features:tag("mechanism"):text(mechanism):up();
+				mechanisms:tag("mechanism"):text(mechanism):up();
 			end
 		end
-		features:up();
+		if mechanisms[1] then features:add_child(mechanisms); end
 	else
 		features:tag("bind", bind_attr):tag("required"):up():up();
 		features:tag("session", xmpp_session_attr):tag("optional"):up():up();
@@ -321,7 +295,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);