mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 06:07:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with 0.5

Browse source
This commit is contained in:
Matthew Wild 2009-09-27 12:26:51 +01:00
commit adca883cc3
5 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plugins/mod_legacyauth.lua
View file

@ -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));