diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-09-27 12:10:50 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-09-27 12:10:50 +0100 |
| commit | 0adb8201b5befee459eed2c0388d3c035a831ca1 (patch) | |
| tree | 26c1e748b8a6d656dbf08e60a88abe729d9d1988 | |
| parent | 1a4378dc767cf399e0f6a77f80fbda44e9c617be (diff) | |
| parent | be102693fa0d29f5b09635a36ef34083bb7c74d3 (diff) | |
| download | prosody-vault/0.5.2.tar.gz prosody-vault/0.5.2.zip | |
Merge with waqasvault/0.5.20.5.2
| -rw-r--r-- | plugins/mod_legacyauth.lua | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua index de94411e..25967b33 100644 --- a/plugins/mod_legacyauth.lua +++ b/plugins/mod_legacyauth.lua @@ -16,6 +16,8 @@ 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) @@ -46,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 @@ -56,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 |