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

Merge roster fixes from waqas

Browse source
This commit is contained in:
Matthew Wild 2008-10-08 17:27:20 +01:00
commit 584b40a682
4 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/rostermanager.lua
View file

@ -24,3 +24,5 @@ function getroster(username, host)
}
-- return datamanager.load(username, host, "roster") or {};
end
return _M;

3
core/sessionmanager.lua
View file

@ -12,6 +12,7 @@ local modulemanager = require "core.modulemanager";
local log = require "util.logger".init("sessionmanager");
local error = error;
local uuid_generate = require "util.uuid".uuid_generate;
local rm_getroster = require "core.rostermanager".getroster
local newproxy = newproxy;
local getmetatable = getmetatable;
@ -91,6 +92,8 @@ function bind_resource(session, resource)
session.full_jid = session.username .. '@' .. session.host .. '/' .. resource;
hosts[session.host].sessions[session.username].sessions[resource] = session;
session.roster = rm_getroster(session.username, session.host);
return true;
end

7
core/stanza_router.lua
View file

@ -16,6 +16,13 @@ local jid_split = jid.split;
function core_process_stanza(origin, stanza)
log("debug", "Received: "..tostring(stanza))
-- TODO verify validity of stanza (as well as JID validity)
if origin.type == "c2s" and not origin.full_jid
and not(stanza.name == "iq" and stanza.tags[1] and stanza.tags[1].name == "bind"
and stanza.tags[1].attr.xmlns == "urn:ietf:params:xml:ns:xmpp-bind") then
error("Client MUST bind resource after auth");
end
local to = stanza.attr.to;
stanza.attr.from = origin.full_jid -- quick fix to prevent impersonation

8
plugins/mod_roster.lua
View file

@ -5,14 +5,6 @@ local send = require "core.sessionmanager".send_to_session
add_iq_handler("c2s", "jabber:iq:roster",
function (session, stanza)
if stanza.attr.type == "get" then
session.roster = session.roster or rostermanager.getroster(session.username, session.host);
if session.roster == false then
send(session, st.reply(stanza)
:tag("error", { type = "wait" })
:tag("internal-server-error", { xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}));
return true;
else session.roster = session.roster or {};
end
local roster = st.reply(stanza)
:query("jabber:iq:roster");
for jid in pairs(session.roster) do