Fixed mod_register to use session.send for sending stanzas

[prosody.git] / plugins / mod_saslauth.lua

diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index 2a1485d0d6bb5b45ea2f248938259e97229171c2..7fe843046a1156646d7c19ffeb353f12582b9915 100644 (file)
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -3,6 +3,7 @@ local st = require "util.stanza";
 local send = require "core.sessionmanager".send_to_session;
 local sm_bind_resource = require "core.sessionmanager".bind_resource;
 local jid
+local base64 = require "base64"
 
 local usermanager_validate_credentials = require "core.usermanager".validate_credentials;
 local t_concat, t_insert = table.concat, table.insert;
@@ -17,14 +18,15 @@ local xmlns_stanzas ='urn:ietf:params:xml:ns:xmpp-stanzas';
 
 local new_sasl = require "util.sasl".new;
 
-local function build_reply(status, ret)
+local function build_reply(status, ret, err_msg)
        local reply = st.stanza(status, {xmlns = xmlns_sasl});
        if status == "challenge" then
-               reply:text(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
-               reply:text(ret or "");
+               reply:text(base64.encode(ret or ""));
        else
                error("Unknown sasl status: "..status);
        end
@@ -42,21 +44,26 @@ local function handle_status(session, status)
        end
 end
 
-local function password_callback(jid, mechanism)
-       local node, host = jid_split(jid);
+local function password_callback(node, host, mechanism)
        local password = (datamanager.load(node, host, "accounts") or {}).password; -- FIXME handle hashed passwords
        local func = function(x) return x; end;
        if password then
                if mechanism == "PLAIN" then
                        return func, password;
                elseif mechanism == "DIGEST-MD5" then
-                       return func, require "hashes".md5(node.."::"..password);
+                       return func, require "md5".sum(node..":"..host..":"..password);
                end
        end
        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);
@@ -66,34 +73,16 @@ function do_sasl(session, stanza)
                        return;
                end
        end
-       local status, ret = session.sasl_handler:feed(text);
+       local status, ret, err_msg = session.sasl_handler:feed(text);
        handle_status(session, status);
-       local s = build_reply(status, ret); 
+       local s = build_reply(status, ret, err_msg); 
        log("debug", "sasl reply: "..tostring(s));
        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)                                                                                            
@@ -116,7 +105,6 @@ add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-bind",
                        local resource;
                        if stanza.attr.type == "set" then
                                local bind = stanza.tags[1];
-                               
                                if bind and bind.attr.xmlns == xmlns_bind then
                                        resource = bind:child_with_name("resource");
                                        if resource then
@@ -124,26 +112,13 @@ add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-bind",
                                        end
                                end
                        end
-                       local success, err = sm_bind_resource(session, resource);
+                       local success, err_type, err, err_msg = sm_bind_resource(session, resource);
                        if not success then
-                               local reply = st.reply(stanza);
-                               reply.attr.type = "error";
-                               if err == "conflict" then
-                                       reply:tag("error", { type = "modify" })
-                                               :tag("conflict", { xmlns = xmlns_stanzas });
-                               elseif err == "constraint" then
-                                       reply:tag("error", { type = "cancel" })
-                                               :tag("resource-constraint", { xmlns = xmlns_stanzas });
-                               elseif err == "auth" then
-                                       reply:tag("error", { type = "cancel" })
-                                               :tag("not-allowed", { xmlns = xmlns_stanzas });
-                               end
-                               send(session, reply);
+                               session.send(st.error_reply(stanza, err_type, err, err_msg));
                        else
-                               local reply = st.reply(stanza);
-                               reply:tag("bind", { xmlns = xmlns_bind})
-                                       :tag("jid"):text(session.full_jid);
-                               send(session, reply);
+                               session.send(st.reply(stanza)
+                                       :tag("bind", { xmlns = xmlns_bind})
+                                       :tag("jid"):text(session.full_jid));
                        end
                end);