aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-09-27 12:26:51 +0100
committerMatthew Wild <mwild1@gmail.com>2009-09-27 12:26:51 +0100
commitadca883cc39dee260fa778406a16e42169929157 (patch)
tree6ee31eed4313315570c0313efa6fc664e02c3aea /plugins
parent23d676ee18f898b0db00358a1679bf8e56ef043b (diff)
parent0adb8201b5befee459eed2c0388d3c035a831ca1 (diff)
downloadprosody-adca883cc39dee260fa778406a16e42169929157.tar.gz
prosody-adca883cc39dee260fa778406a16e42169929157.zip
Merge with 0.5
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_legacyauth.lua11
1 files changed, 10 insertions, 1 deletions
diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua
index 9a9c3902..4d0d7ca1 100644
--- a/plugins/mod_legacyauth.lua
+++ b/plugins/mod_legacyauth.lua
@@ -15,6 +15,8 @@ local secure_auth_only = 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)
@@ -44,6 +46,8 @@ module:add_iq_handler("c2s_unauthed", "jabber:iq:auth",
:tag("resource"):up());
else
username, password, resource = t_concat(username), t_concat(password), t_concat(resource);
+ username = nodeprep(username);
+ resource = resourceprep(resource)
local reply = st.reply(stanza);
if usermanager.validate_credentials(session.host, username, password) then
-- Authentication successful!
@@ -53,7 +57,12 @@ 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));
- return true; -- FIXME need to unauthenticate here
+ 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));