Providing some human readable error messages and some fixes.
[prosody.git] / plugins / mod_saslauth.lua
index 7eed8f35244fe493552550974416132694f7d70e..2094867f0f8f4222d1bcf0133ed30880d07df17d 100644 (file)
@@ -2,10 +2,13 @@
 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;
 local tostring = tostring;
+local jid_split = require "util.jid".split
 
 local log = require "util.logger".init("mod_saslauth");
 
@@ -13,53 +16,81 @@ local xmlns_sasl ='urn:ietf:params:xml:ns:xmpp-sasl';
 local xmlns_bind ='urn:ietf:params:xml:ns:xmpp-bind';
 local xmlns_stanzas ='urn:ietf:params:xml:ns:xmpp-stanzas';
 
-local new_connhandler = require "net.connhandlers".new;
 local new_sasl = require "util.sasl".new;
 
-add_handler("c2s_unauthed", "auth",
-               function (session, stanza)
-                       if not session.sasl_handler then
-                               session.sasl_handler = new_sasl(stanza.attr.mechanism, 
-                                       function (username, password)
-                                               -- onAuth
-                                               require "core.usermanager"
-                                               if usermanager_validate_credentials(session.host, username, password) then
-                                                       return true;
-                                               end
-                                               return false;
-                                       end,
-                                       function (username)
-                                               -- onSuccess
-                                               local success, err = sessionmanager.make_authenticated(session, username);
-                                               if not success then
-                                                       sessionmanager.destroy_session(session);
-                                               end
-                                               session.sasl_handler = nil;
-                                               session.connhandler = new_connhandler("xmpp-client", session);
-                                               session.notopen = true;
-                                       end,
-                                       function (reason)
-                                               -- onFail
-                                               log("debug", "SASL failure, reason: %s", reason);
-                                       end,
-                                       function (stanza)
-                                               -- onWrite
-                                               log("debug", "SASL writes: %s", tostring(stanza));
-                                               send(session, stanza);
-                                       end
-                               );
-                               session.sasl_handler:feed(stanza);      
-                       else
-                               error("Client tried to negotiate SASL again", 0);
-                       end
-                       
-               end);
-               
+local function build_reply(status, ret, err_msg)
+       local reply = st.stanza(status, {xmlns = xmlns_sasl});
+       if status == "challenge" then
+               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(base64.encode(ret or ""));
+       else
+               error("Unknown sasl status: "..status);
+       end
+       return reply;
+end
+
+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
+               sessionmanager.make_authenticated(session, session.sasl_handler.username);
+               session.sasl_handler = nil;
+               session:reset_stream();
+       end
+end
+
+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 "md5".sum(node..":"..host..":"..password);
+               end
+       end
+       return func, nil;
+end
+
+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);
+               if not text then
+                       session.sasl_handler = nil;
+                       session.send(build_reply("failure", "incorrect-encoding"));
+                       return;
+               end
+       end
+       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));
+       session.send(s);
+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)                                                                                            
                                                if not session.username then
                                                        t_insert(features, "<mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>");
+                                                       -- TODO: Provide PLAIN only if TLS is active, this is a SHOULD from the introduction of RFC 4616. This behavior could be overridden via configuration but will issuing a warning or so.
                                                                t_insert(features, "<mechanism>PLAIN</mechanism>");
+                                                               t_insert(features, "<mechanism>DIGEST-MD5</mechanism>");
                                                        t_insert(features, "</mechanisms>");
                                                else
                                                        t_insert(features, "<bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'><required/></bind>");