aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-02-12 14:21:09 +0000
committerMatthew Wild <mwild1@gmail.com>2012-02-12 14:21:09 +0000
commitbe5998772498c982f5dd192787ca12c4aad6b0dd (patch)
tree3f902ac2e0b60c993929ada10eb9f44e1d04eec4
parent6bc6d030fd128c75492a467968a0f400bc54f1ca (diff)
parent621f44b14645b7f47fb7b422de4407bd04f9661a (diff)
downloadprosody-be5998772498c982f5dd192787ca12c4aad6b0dd.tar.gz
prosody-be5998772498c982f5dd192787ca12c4aad6b0dd.zip
Merge with 0.9
-rw-r--r--plugins/mod_saslauth.lua6
1 files changed, 2 insertions, 4 deletions
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index 58655a24..7708572a 100644
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -16,7 +16,6 @@ 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 tostring = tostring;
@@ -51,15 +50,14 @@ local function handle_status(session, status, ret, err_msg)
module:fire_event("authentication-failure", { session = session, condition = ret, text = err_msg });
session.sasl_handler = session.sasl_handler:clean_clone();
elseif status == "success" then
- module:fire_event("authentication-success", { session = session });
- 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