Merge

[prosody.git] / plugins / mod_saslauth.lua

diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index 7fe843046a1156646d7c19ffeb353f12582b9915..d3f32be3d5d1357b776cd735a4fd218275a7495e 100644 (file)
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -1,14 +1,23 @@
+-- Prosody IM v0.4
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
+
 
 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 base64 = require "util.encodings".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 md5 = require "util.hashes".md5;
+local config = require "core.configmanager";
 
 local log = require "util.logger".init("mod_saslauth");
 
@@ -21,11 +30,13 @@ 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 "");
                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 "");
                reply:text(base64.encode(ret or ""));
        else
                error("Unknown sasl status: "..status);
@@ -44,20 +55,21 @@ local function handle_status(session, status)
        end
 end
 
-local function password_callback(node, host, mechanism)
+local function password_callback(node, host, mechanism, decoder)
        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);
+                       if decoder then node, host, password = decoder(node), decoder(host), decoder(password); end
+                       return func, md5(node..":"..host..":"..password);
                end
        end
        return func, nil;
 end
 
-function sasl_handler(session, stanza)
+local 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);
@@ -67,6 +79,7 @@ function sasl_handler(session, stanza)
        local text = stanza[1];
        if text then
                text = base64.decode(text);
+               log("debug", text);
                if not text then
                        session.sasl_handler = nil;
                        session.send(build_reply("failure", "incorrect-encoding"));
@@ -80,26 +93,31 @@ function sasl_handler(session, stanza)
        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);
+module:add_handler("c2s_unauthed", "auth", xmlns_sasl, sasl_handler);
+module:add_handler("c2s_unauthed", "abort", xmlns_sasl, sasl_handler);
+module: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>");
-                                                       t_insert(features, "<session xmlns='urn:ietf:params:xml:ns:xmpp-session'/>");
-                                               end
-                                               --send [[<register xmlns="http://jabber.org/features/iq-register"/> ]]
-                                       end);
+local mechanisms_attr = { xmlns='urn:ietf:params:xml:ns:xmpp-sasl' };
+local bind_attr = { xmlns='urn:ietf:params:xml:ns:xmpp-bind' };
+local xmpp_session_attr = { xmlns='urn:ietf:params:xml:ns:xmpp-session' };
+module:add_event_hook("stream-features", 
+               function (session, features)                                                                                            
+                       if not session.username then
+                               features:tag("mechanisms", mechanisms_attr);
+                               -- 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.
+                                       features:tag("mechanism"):text("PLAIN"):up();
+                                       features:tag("mechanism"):text("DIGEST-MD5"):up();
+                                       if config.get(session.host or "*", "core", "sasl_anonymous") then
+                                               features:tag("mechanism"):text("ANONYMOUS"):up();
+                                       end
+                               features:up();
+                       else
+                               features:tag("bind", bind_attr):tag("required"):up():up();
+                               features:tag("session", xmpp_session_attr):up();
+                       end
+               end);
                                        
-add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-bind", 
+module:add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-bind", 
                function (session, stanza)
                        log("debug", "Client tried to bind to a resource");
                        local resource;
@@ -122,8 +140,8 @@ add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-bind",
                        end
                end);
                
-add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-session", 
+module:add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-session", 
                function (session, stanza)
                        log("debug", "Client tried to bind to a resource");
-                       send(session, st.reply(stanza));
+                       session.send(st.reply(stanza));
                end);