Software / code / prosody
Changeset
295:bb078eb1f1de
mod_saslauth: Code cleanup
| author | Waqas Hussain <waqas20@gmail.com> |
|---|---|
| date | Sun, 16 Nov 2008 02:27:22 +0500 |
| parents | 293:b446de4e258e |
| children | 296:21835c4fc34f |
| files | plugins/mod_saslauth.lua |
| diffstat | 1 files changed, 10 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_saslauth.lua Sun Nov 16 02:10:01 2008 +0500 +++ b/plugins/mod_saslauth.lua Sun Nov 16 02:27:22 2008 +0500 @@ -56,7 +56,13 @@ return func, nil; end -function do_sasl(session, stanza) +function sasl_handler(session, stanza) + if stanza.name == "auth" then + -- FIXME ignoring duplicates because ejabberd does + session.sasl_handler = new_sasl(stanza.attr.mechanism, session.host, password_callback); + elseif not session.sasl_handler then + return; -- FIXME ignoring out of order stanzas because ejabberd does + end local text = stanza[1]; if text then text = base64.decode(text); @@ -73,27 +79,9 @@ session.send(s); end -add_handler("c2s_unauthed", "auth", xmlns_sasl, - function (session, stanza) - if not session.sasl_handler then - session.sasl_handler = new_sasl(stanza.attr.mechanism, session.host, password_callback); - do_sasl(session, stanza); - else - error("Client tried to negotiate SASL again", 0); - end - end); - -add_handler("c2s_unauthed", "abort", xmlns_sasl, - function(session, stanza) - if not session.sasl_handler then error("Attempt to abort when sasl has not started"); end - do_sasl(session, stanza); - end); - -add_handler("c2s_unauthed", "response", xmlns_sasl, - function(session, stanza) - if not session.sasl_handler then error("Attempt to respond when sasl has not started"); end - do_sasl(session, stanza); - end); +add_handler("c2s_unauthed", "auth", xmlns_sasl, sasl_handler); +add_handler("c2s_unauthed", "abort", xmlns_sasl, sasl_handler); +add_handler("c2s_unauthed", "response", xmlns_sasl, sasl_handler); add_event_hook("stream-features", function (session, features)
