mod_legacyauth: Don't allow server-generated resource identifiers, as these are not...

[prosody.git] / plugins / mod_legacyauth.lua

diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua
index f1ffef349ea8a2b5cc3b27ea9576a33fab88f969..25967b33950a870e7c2eaa7683153c6837007c58 100644 (file)
--- a/plugins/mod_legacyauth.lua
+++ b/plugins/mod_legacyauth.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.4
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -16,10 +16,17 @@ local secure_auth_only = config.get(module:get_host(), "core", "require_encrypti
 
 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
+       if secure_auth_only and not session.secure then
+               -- Sorry, not offering to insecure streams!
+               return;
+       elseif not session.username then
+               features:tag("auth", {xmlns='http://jabber.org/features/iq-auth'}):up();
+       end
 end);
 
 module:add_iq_handler("c2s_unauthed", "jabber:iq:auth", 
@@ -41,9 +48,11 @@ module:add_iq_handler("c2s_unauthed", "jabber:iq:auth",
                                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 username and resource and usermanager.validate_credentials(session.host, username, password) then
                                        -- Authentication successful!
                                        local success, err = sessionmanager.make_authenticated(session, username);
                                        if success then
@@ -51,6 +60,11 @@ 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