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

Code cleanup for resource binding

Browse source
This commit is contained in:
Waqas Hussain 2008-11-16 03:16:53 +05:00
parent 803c3e4a90
commit 49ab3af442
3 changed files with 15 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/sessionmanager.lua
View file

@ -68,9 +68,13 @@ function make_authenticated(session, username)
return true; return true;
end end
-- returns true, nil on success
-- returns nil, err_type, err, err_message on failure
function bind_resource(session, resource) function bind_resource(session, resource)
if not session.username then return false, "auth"; end if not session.username then return nil, "auth", "not-authorized", "Cannot bind resource before authentication"; end
if session.resource then return false, "constraint"; end -- We don't support binding multiple resources if session.resource then return nil, "cancel", "already-bound", "Cannot bind multiple resources on a single connection"; end
-- We don't support binding multiple resources
resource = resource or uuid_generate(); resource = resource or uuid_generate();
--FIXME: Randomly-generated resources must be unique per-user, and never conflict with existing --FIXME: Randomly-generated resources must be unique per-user, and never conflict with existing
@ -79,7 +83,7 @@ function bind_resource(session, resource)
else else
if hosts[session.host].sessions[session.username].sessions[resource] then if hosts[session.host].sessions[session.username].sessions[resource] then
-- Resource conflict -- Resource conflict
return false, "conflict"; -- TODO kick old resource return nil, "cancel", "conflict", "Resource already exists"; -- TODO kick old resource
end end
end end

18
plugins/mod_legacyauth.lua
View file

@ -23,22 +23,10 @@ add_iq_handler("c2s_unauthed", "jabber:iq:auth",
-- Authentication successful! -- Authentication successful!
local success, err = sessionmanager.make_authenticated(session, username); local success, err = sessionmanager.make_authenticated(session, username);
if success then if success then
success, err = sessionmanager.bind_resource(session, resource); local err_type, err_msg;
--FIXME: Reply with error success, err_type, err, err_msg = sessionmanager.bind_resource(session, resource);
if not success then if not success then
local reply = st.reply(stanza); session.send(st.error_reply(stanza, err_type, err, err_msg));
reply.attr.type = "error";
if err == "conflict" then
reply:tag("error", { code = "409", type = "cancel" })
:tag("conflict", { xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas" });
elseif err == "constraint" then
reply:tag("error", { code = "409", type = "cancel" })
:tag("already-bound", { xmlns = "x-lxmppd:extensions:legacyauth" });
elseif err == "auth" then
reply:tag("error", { code = "401", type = "auth" })
:tag("not-authorized", { xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas" });
end
send(session, reply);
return true; return true;
end end
end end

24
plugins/mod_saslauth.lua
View file

@ -105,7 +105,6 @@ add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-bind",
local resource; local resource;
if stanza.attr.type == "set" then if stanza.attr.type == "set" then
local bind = stanza.tags[1]; local bind = stanza.tags[1];
if bind and bind.attr.xmlns == xmlns_bind then if bind and bind.attr.xmlns == xmlns_bind then
resource = bind:child_with_name("resource"); resource = bind:child_with_name("resource");
if resource then if resource then
@ -113,26 +112,13 @@ add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-bind",
end end
end end
end end
local success, err = sm_bind_resource(session, resource); local success, err_type, err, err_msg = sm_bind_resource(session, resource);
if not success then if not success then
local reply = st.reply(stanza); session.send(st.error_reply(stanza, err_type, err, err_msg));
reply.attr.type = "error";
if err == "conflict" then
reply:tag("error", { type = "modify" })
:tag("conflict", { xmlns = xmlns_stanzas });
elseif err == "constraint" then
reply:tag("error", { type = "cancel" })
:tag("resource-constraint", { xmlns = xmlns_stanzas });
elseif err == "auth" then
reply:tag("error", { type = "cancel" })
:tag("not-allowed", { xmlns = xmlns_stanzas });
end
send(session, reply);
else else
local reply = st.reply(stanza); session.send(st.reply(stanza)
reply:tag("bind", { xmlns = xmlns_bind}) :tag("bind", { xmlns = xmlns_bind})
:tag("jid"):text(session.full_jid); :tag("jid"):text(session.full_jid));
send(session, reply);
end end
end); end);