From fba5b67403ef2ff8290d8b3068aa3740e6259209 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sun, 27 Sep 2009 15:21:08 +0500 Subject: mod_legacyauth: Added node and resource prepping. --- plugins/mod_legacyauth.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'plugins/mod_legacyauth.lua') diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua index de94411e..23f1043c 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 usermanager.validate_credentials(session.host, username, password) then -- Authentication successful! local success, err = sessionmanager.make_authenticated(session, username); if success then -- cgit v1.2.3 From aa65ea57bd188ba7360e62a3b77298b136ffd0d7 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sun, 27 Sep 2009 15:30:01 +0500 Subject: mod_legacyauth: Undo auth on bind fail. Legacy auth is atomic. --- plugins/mod_legacyauth.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'plugins/mod_legacyauth.lua') diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua index 23f1043c..0e0170df 100644 --- a/plugins/mod_legacyauth.lua +++ b/plugins/mod_legacyauth.lua @@ -60,6 +60,7 @@ 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; end end -- cgit v1.2.3 From be102693fa0d29f5b09635a36ef34083bb7c74d3 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sun, 27 Sep 2009 15:50:41 +0500 Subject: mod_legacyauth: Don't allow server-generated resource identifiers, as these are not support by legacy auth. --- plugins/mod_legacyauth.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'plugins/mod_legacyauth.lua') diff --git a/plugins/mod_legacyauth.lua b/plugins/mod_legacyauth.lua index 0e0170df..25967b33 100644 --- a/plugins/mod_legacyauth.lua +++ b/plugins/mod_legacyauth.lua @@ -52,7 +52,7 @@ module:add_iq_handler("c2s_unauthed", "jabber:iq:auth", resource = resourceprep(resource) local reply = st.reply(stanza); require "core.usermanager" - if username and 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 @@ -62,6 +62,10 @@ module:add_iq_handler("c2s_unauthed", "jabber:iq:auth", 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)); -- cgit v1.2.3