mod_posix: Some (perhaps temporary) changes to re-lock the pidfile after truncating...

[prosody.git] / plugins / mod_legacyauth.lua

diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua
index 648aa01aa90355a92030947099f6e5ac050a4a9f..50566fa661b66ba0b98b7ba74493d1d51869679b 100644 (file)
--- a/plugins/mod_legacyauth.lua
+++ b/plugins/mod_legacyauth.lua
@@ -1,6 +1,6 @@
--- Prosody IM v0.4
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -11,13 +11,31 @@
 local st = require "util.stanza";
 local t_concat = table.concat;
 
+local secure_auth_only = module:get_option("c2s_require_encryption") or module:get_option("require_encryption");
+
+local sessionmanager = require "core.sessionmanager";
+local usermanager = require "core.usermanager";
+local nodeprep = require "util.encodings".stringprep.nodeprep;
+local resourceprep = require "util.encodings".stringprep.resourceprep;
+
 module:add_feature("jabber:iq:auth");
-module:add_event_hook("stream-features", function (session, features)
-       if not session.username then features:tag("auth", {xmlns='http://jabber.org/features/iq-auth'}):up(); end
+module:hook("stream-features", function(event)
+       local origin, features = event.origin, event.features;
+       if secure_auth_only and not origin.secure then
+               -- Sorry, not offering to insecure streams!
+               return;
+       elseif not origin.username then
+               features:tag("auth", {xmlns='http://jabber.org/features/iq-auth'}):up();
+       end
 end);
 
 module:add_iq_handler("c2s_unauthed", "jabber:iq:auth", 
                function (session, stanza)
+                       if secure_auth_only and not session.secure then
+                               session.send(st.error_reply(stanza, "modify", "not-acceptable", "Encryption (SSL or TLS) is required to connect to this server"));
+                               return true;
+                       end
+                       
                        local username = stanza.tags[1]:child_with_name("username");
                        local password = stanza.tags[1]:child_with_name("password");
                        local resource = stanza.tags[1]:child_with_name("resource");
@@ -27,12 +45,12 @@ module:add_iq_handler("c2s_unauthed", "jabber:iq:auth",
                                        :tag("username"):up()
                                        :tag("password"):up()
                                        :tag("resource"):up());
-                               return true;                    
                        else
                                username, password, resource = t_concat(username), t_concat(password), t_concat(resource);
+                               username = nodeprep(username);
+                               resource = resourceprep(resource)
                                local reply = st.reply(stanza);
-                               require "core.usermanager"
-                               if usermanager.validate_credentials(session.host, username, password) then
+                               if usermanager.test_password(username, password, session.host) then
                                        -- Authentication successful!
                                        local success, err = sessionmanager.make_authenticated(session, username);
                                        if success then
@@ -40,19 +58,18 @@ module:add_iq_handler("c2s_unauthed", "jabber:iq:auth",
                                                success, err_type, err, err_msg = sessionmanager.bind_resource(session, resource);
                                                if not success then
                                                        session.send(st.error_reply(stanza, err_type, err, err_msg));
+                                                       session.username, session.type = nil, "c2s_unauthed"; -- FIXME should this be placed in sessionmanager?
+                                                       return true;
+                                               elseif resource ~= session.resource then -- server changed resource, not supported by legacy auth
+                                                       session.send(st.error_reply(stanza, "cancel", "conflict", "The requested resource could not be assigned to this session."));
+                                                       session:close(); -- FIXME undo resource bind and auth instead of closing the session?
                                                        return true;
                                                end
                                        end
                                        session.send(st.reply(stanza));
-                                       return true;
                                else
-                                       local reply = st.reply(stanza);
-                                       reply.attr.type = "error";
-                                       reply:tag("error", { code = "401", type = "auth" })
-                                               :tag("not-authorized", { xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas" });
-                                       session.send(reply);
-                                       return true;
+                                       session.send(st.error_reply(stanza, "auth", "not-authorized"));
                                end
                        end
-                       
+                       return true;
                end);