diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-04-30 03:05:56 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-04-30 03:05:56 +0100 |
| commit | 0188e331a5f9e8cd99c9872e9580f5b7811a5ccc (patch) | |
| tree | 169a549af80682e0effdff00a5c0414ff734b300 /plugins/mod_saslauth.lua | |
| parent | 5553cf3c48dbcbdc66fa734ce9371793d42d48bc (diff) | |
| parent | a1a1fd2213c069994ddbb9b03e8ae39281deb6d5 (diff) | |
| download | prosody-0188e331a5f9e8cd99c9872e9580f5b7811a5ccc.tar.gz prosody-0188e331a5f9e8cd99c9872e9580f5b7811a5ccc.zip | |
Merge with 0.4
Diffstat (limited to 'plugins/mod_saslauth.lua')
| -rw-r--r-- | plugins/mod_saslauth.lua | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua index f7b30aab..f27d8060 100644 --- a/plugins/mod_saslauth.lua +++ b/plugins/mod_saslauth.lua @@ -21,7 +21,7 @@ local jid_split = require "util.jid".split local md5 = require "util.hashes".md5; local config = require "core.configmanager"; -local log = require "util.logger".init("mod_saslauth"); +local log = module._log; local xmlns_sasl ='urn:ietf:params:xml:ns:xmpp-sasl'; local xmlns_bind ='urn:ietf:params:xml:ns:xmpp-bind'; @@ -32,16 +32,16 @@ local new_sasl = require "util.sasl".new; local function build_reply(status, ret, err_msg) local reply = st.stanza(status, {xmlns = xmlns_sasl}); if status == "challenge" then - log("debug", ret or ""); + log("debug", "%s", ret or ""); reply:text(base64.encode(ret or "")); elseif status == "failure" then reply:tag(ret):up(); if err_msg then reply:tag("text"):text(err_msg); end elseif status == "success" then - log("debug", ret or ""); + 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 @@ local function handle_status(session, status) 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(); @@ -89,7 +94,7 @@ local function sasl_handler(session, stanza) local text = stanza[1]; if text then text = base64.decode(text); - log("debug", text); + log("debug", "%s", text); if not text then session.sasl_handler = nil; session.send(build_reply("failure", "incorrect-encoding")); @@ -99,7 +104,7 @@ local function sasl_handler(session, stanza) local status, ret, err_msg = session.sasl_handler:feed(text); handle_status(session, status); local s = build_reply(status, ret, err_msg); - log("debug", "sasl reply: "..tostring(s)); + log("debug", "sasl reply: %s", tostring(s)); session.send(s); end @@ -130,7 +135,7 @@ module:add_event_hook("stream-features", module:add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-bind", function (session, stanza) - log("debug", "Client tried to bind to a resource"); + log("debug", "Client requesting a resource bind"); local resource; if stanza.attr.type == "set" then local bind = stanza.tags[1]; @@ -153,6 +158,6 @@ module:add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-bind", module:add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-session", function (session, stanza) - log("debug", "Client tried to bind to a resource"); + log("debug", "Client requesting a session"); session.send(st.reply(stanza)); end); |