Software / code / prosody
Changeset
1073:7c20373d4451
mod_saslauth: Remove 2 instances of raising errors and replacing with more graceful handling
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 30 Apr 2009 01:46:36 +0100 |
| parents | 1072:c7967004b5d0 |
| children | 1074:7798735be42b |
| files | plugins/mod_saslauth.lua |
| diffstat | 1 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_saslauth.lua Thu Apr 30 01:39:39 2009 +0100 +++ b/plugins/mod_saslauth.lua Thu Apr 30 01:46:36 2009 +0100 @@ -41,7 +41,7 @@ log("debug", "%s", ret or ""); reply:text(base64.encode(ret or "")); else - error("Unknown sasl status: "..status); + module:log("error", "Unknown sasl status: %s", status); end return reply; end @@ -50,7 +50,12 @@ if status == "failure" then session.sasl_handler = nil; elseif status == "success" then - if not session.sasl_handler.username then error("SASL succeeded but we didn't get a username!"); end -- TODO move this to sessionmanager + if not session.sasl_handler.username then -- TODO move this to sessionmanager + module:log("warn", "SASL succeeded but we didn't get a username!"); + session.sasl_handler = nil; + session:reset_stream(); + return; + end sm_make_authenticated(session, session.sasl_handler.username); session.sasl_handler = nil; session:reset_stream();
