mirror of
https://github.com/bjc/prosody.git
synced 2025-04-03 21:27:38 +03:00
Merged from Matthew
This commit is contained in:
Waqas Hussain
commit
98a409f8b4
3 changed files with 236 additions and 230 deletions
|
|
@ -19,30 +19,27 @@ local getmetatable = getmetatable;
|
|||
|
||||
module "sessionmanager"
|
||||
|
||||
local open_sessions = 0;
|
||||
|
||||
function new_session(conn)
|
||||
local session = { conn = conn, priority = 0, type = "c2s_unauthed" };
|
||||
if true then
|
||||
session.trace = newproxy(true);
|
||||
getmetatable(session.trace).__gc = function () print("Session got collected") end;
|
||||
getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; print("Session got collected, now "..open_sessions.." sessions are allocated") end;
|
||||
end
|
||||
open_sessions = open_sessions + 1;
|
||||
local w = conn.write;
|
||||
session.send = function (t) w(tostring(t)); end
|
||||
return session;
|
||||
end
|
||||
|
||||
function destroy_session(session)
|
||||
if not (session and session.disconnect) then return; end
|
||||
log("debug", "Destroying session...");
|
||||
session.disconnect();
|
||||
session.log("info", "Destroying session");
|
||||
if session.username then
|
||||
if session.resource then
|
||||
hosts[session.host].sessions[session.username].sessions[session.resource] = nil;
|
||||
end
|
||||
local nomore = true;
|
||||
for res, ssn in pairs(hosts[session.host].sessions[session.username]) do
|
||||
nomore = false;
|
||||
end
|
||||
if nomore then
|
||||
if not next(hosts[session.host].sessions[session.username], nil) then
|
||||
hosts[session.host].sessions[session.username] = nil;
|
||||
end
|
||||
end
|
||||
|
|
@ -53,11 +50,6 @@ function destroy_session(session)
|
|||
session[k] = nil;
|
||||
end
|
||||
end
|
||||
collectgarbage("collect");
|
||||
collectgarbage("collect");
|
||||
collectgarbage("collect");
|
||||
collectgarbage("collect");
|
||||
collectgarbage("collect");
|
||||
end
|
||||
|
||||
function send_to_session(session, data)
|
||||
|
|
|
|||
|
|
@ -1,216 +1,217 @@
|
|||
|
||||
-- The code in this file should be self-explanatory, though the logic is horrible
|
||||
-- for more info on that, see doc/stanza_routing.txt, which attempts to condense
|
||||
-- the rules from the RFCs (mainly 3921)
|
||||
|
||||
require "core.servermanager"
|
||||
|
||||
local log = require "util.logger".init("stanzarouter")
|
||||
|
||||
local st = require "util.stanza";
|
||||
local send = require "core.sessionmanager".send_to_session;
|
||||
local user_exists = require "core.usermanager".user_exists;
|
||||
|
||||
local jid_split = require "util.jid".split;
|
||||
local print, debug = print, debug;
|
||||
|
||||
function core_process_stanza(origin, stanza)
|
||||
log("debug", "Received: "..tostring(stanza))
|
||||
-- TODO verify validity of stanza (as well as JID validity)
|
||||
if stanza.name == "iq" and not(#stanza.tags == 1 and stanza.tags[1].attr.xmlns) then
|
||||
if stanza.attr.type == "set" or stanza.attr.type == "get" then
|
||||
error("Invalid IQ");
|
||||
elseif #stanza.tags > 1 or not(stanza.attr.type == "error" or stanza.attr.type == "result") then
|
||||
error("Invalid IQ");
|
||||
end
|
||||
end
|
||||
|
||||
if origin.type == "c2s" and not origin.full_jid
|
||||
and not(stanza.name == "iq" 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 (FIXME this would be incorrect when the origin is not c2s)
|
||||
-- TODO also, stazas should be returned to their original state before the function ends
|
||||
|
||||
-- TODO presence subscriptions
|
||||
if not to then
|
||||
core_handle_stanza(origin, stanza);
|
||||
elseif hosts[to] and hosts[to].type == "local" then
|
||||
core_handle_stanza(origin, stanza);
|
||||
elseif stanza.name == "iq" and not select(3, jid_split(to)) then
|
||||
core_handle_stanza(origin, stanza);
|
||||
elseif origin.type == "c2s" then
|
||||
core_route_stanza(origin, stanza);
|
||||
end
|
||||
end
|
||||
|
||||
-- This function handles stanzas which are not routed any further,
|
||||
-- that is, they are handled by this server
|
||||
function core_handle_stanza(origin, stanza)
|
||||
-- Handlers
|
||||
if origin.type == "c2s" or origin.type == "c2s_unauthed" then
|
||||
local session = origin;
|
||||
|
||||
if stanza.name == "presence" and origin.roster then
|
||||
if stanza.attr.type == nil or stanza.attr.type == "available" or stanza.attr.type == "unavailable" then
|
||||
for jid in pairs(origin.roster) do -- broadcast to all interested contacts
|
||||
local subscription = origin.roster[jid].subscription;
|
||||
if subscription == "both" or subscription == "from" then
|
||||
stanza.attr.to = jid;
|
||||
core_route_stanza(origin, stanza);
|
||||
end
|
||||
end
|
||||
local node, host = jid_split(stanza.attr.from);
|
||||
for _, res in pairs(hosts[host].sessions[node].sessions) do -- broadcast to all resources and from resources
|
||||
if res ~= origin then
|
||||
if res.full_jid then -- to resource. FIXME is this check correct? Maybe it should be res.presence
|
||||
stanza.attr.to = res.full_jid;
|
||||
core_route_stanza(origin, stanza);
|
||||
end
|
||||
if res.presence then -- from all resources for which we have presence
|
||||
res.presence.attr.to = origin.full_jid;
|
||||
core_route_stanza(res, res.presence);
|
||||
res.presence.attr.to = nil;
|
||||
end
|
||||
end
|
||||
end
|
||||
if not origin.presence then -- presence probes on initial presence
|
||||
local probe = st.presence({from = origin.full_jid, type = "probe"});
|
||||
for jid in pairs(origin.roster) do
|
||||
local subscription = origin.roster[jid].subscription;
|
||||
if subscription == "both" or subscription == "to" then
|
||||
probe.attr.to = jid;
|
||||
core_route_stanza(origin, probe);
|
||||
end
|
||||
end
|
||||
end
|
||||
origin.presence = stanza;
|
||||
stanza.attr.to = nil; -- reset it
|
||||
else
|
||||
-- TODO error, bad type
|
||||
end
|
||||
else
|
||||
log("debug", "Routing stanza to local");
|
||||
handle_stanza(session, stanza);
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function is_authorized_to_see_presence(origin, username, host)
|
||||
local roster = datamanager.load(username, host, "roster") or {};
|
||||
local item = roster[origin.username.."@"..origin.host];
|
||||
return item and (item.subscription == "both" or item.subscription == "from");
|
||||
end
|
||||
|
||||
function core_route_stanza(origin, stanza)
|
||||
-- Hooks
|
||||
--- ...later
|
||||
|
||||
-- Deliver
|
||||
local to = stanza.attr.to;
|
||||
local node, host, resource = jid_split(to);
|
||||
|
||||
if stanza.name == "presence" and (stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable") then resource = nil; end
|
||||
|
||||
local host_session = hosts[host]
|
||||
if host_session and host_session.type == "local" then
|
||||
-- Local host
|
||||
local user = host_session.sessions[node];
|
||||
if user then
|
||||
local res = user.sessions[resource];
|
||||
if not res then
|
||||
-- if we get here, resource was not specified or was unavailable
|
||||
if stanza.name == "presence" then
|
||||
if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then
|
||||
if stanza.attr.type == "probe" then
|
||||
if is_authorized_to_see_presence(origin, node, host) then
|
||||
for k in pairs(user.sessions) do -- return presence for all resources
|
||||
if user.sessions[k].presence then
|
||||
local pres = user.sessions[k].presence;
|
||||
pres.attr.to = origin.full_jid;
|
||||
pres.attr.from = user.sessions[k].full_jid;
|
||||
send(origin, pres);
|
||||
pres.attr.to = nil;
|
||||
pres.attr.from = nil;
|
||||
end
|
||||
end
|
||||
else
|
||||
send(origin, st.presence({from=user.."@"..host, to=origin.username.."@"..origin.host, type="unsubscribed"}));
|
||||
end
|
||||
elseif stanza.attr.type == "subscribe" then
|
||||
-- TODO
|
||||
elseif stanza.attr.type == "unsubscribe" then
|
||||
-- TODO
|
||||
elseif stanza.attr.type == "subscribed" then
|
||||
-- TODO
|
||||
elseif stanza.attr.type == "unsubscribed" then
|
||||
-- TODO
|
||||
end -- discard any other type
|
||||
else -- sender is available or unavailable
|
||||
for k in pairs(user.sessions) do -- presence broadcast to all user resources
|
||||
if user.sessions[k].full_jid then
|
||||
stanza.attr.to = user.sessions[k].full_jid;
|
||||
send(user.sessions[k], stanza);
|
||||
end
|
||||
end
|
||||
end
|
||||
elseif stanza.name == "message" then -- select a resource to recieve message
|
||||
for k in pairs(user.sessions) do
|
||||
if user.sessions[k].full_jid then
|
||||
res = user.sessions[k];
|
||||
break;
|
||||
end
|
||||
end
|
||||
-- TODO find resource with greatest priority
|
||||
send(res, stanza);
|
||||
else
|
||||
-- TODO send IQ error
|
||||
end
|
||||
else
|
||||
-- User + resource is online...
|
||||
stanza.attr.to = res.full_jid;
|
||||
send(res, stanza); -- Yay \o/
|
||||
end
|
||||
else
|
||||
-- user not online
|
||||
if user_exists(node, host) then
|
||||
if stanza.name == "presence" then
|
||||
if stanza.attr.type == "probe" and is_authorized_to_see_presence(origin, node, host) then -- FIXME what to do for not c2s?
|
||||
-- TODO send last recieved unavailable presence
|
||||
else
|
||||
-- TODO send unavailable presence
|
||||
end
|
||||
elseif stanza.name == "message" then
|
||||
-- TODO send message error, or store offline messages
|
||||
elseif stanza.name == "iq" then
|
||||
-- TODO send IQ error
|
||||
end
|
||||
else -- user does not exist
|
||||
-- TODO we would get here for nodeless JIDs too. Do something fun maybe? Echo service? Let plugins use xmpp:server/resource addresses?
|
||||
if stanza.name == "presence" then
|
||||
if stanza.attr.type == "probe" then
|
||||
send(origin, st.presence({from = user.."@"..host, to = origin.username.."@"..origin.host, type = "unsubscribed"}));
|
||||
end
|
||||
-- else ignore
|
||||
else
|
||||
send(origin, st.error_reply(stanza, "cancel", "service-unavailable"));
|
||||
end
|
||||
end
|
||||
end
|
||||
else
|
||||
-- Remote host
|
||||
if host_session then
|
||||
-- Send to session
|
||||
else
|
||||
-- Need to establish the connection
|
||||
end
|
||||
end
|
||||
stanza.attr.to = to; -- reset
|
||||
end
|
||||
|
||||
function handle_stanza_toremote(stanza)
|
||||
log("error", "Stanza bound for remote host, but s2s is not implemented");
|
||||
end
|
||||
|
||||
-- The code in this file should be self-explanatory, though the logic is horrible
|
||||
-- for more info on that, see doc/stanza_routing.txt, which attempts to condense
|
||||
-- the rules from the RFCs (mainly 3921)
|
||||
|
||||
require "core.servermanager"
|
||||
|
||||
local log = require "util.logger".init("stanzarouter")
|
||||
|
||||
local st = require "util.stanza";
|
||||
local send = require "core.sessionmanager".send_to_session;
|
||||
-- local send_s2s = require "core.s2smanager".send_to_host;
|
||||
local user_exists = require "core.usermanager".user_exists;
|
||||
|
||||
local jid_split = require "util.jid".split;
|
||||
local print, debug = print, debug;
|
||||
|
||||
function core_process_stanza(origin, stanza)
|
||||
log("debug", "Received: "..tostring(stanza))
|
||||
-- TODO verify validity of stanza (as well as JID validity)
|
||||
if stanza.name == "iq" and not(#stanza.tags == 1 and stanza.tags[1].attr.xmlns) then
|
||||
if stanza.attr.type == "set" or stanza.attr.type == "get" then
|
||||
error("Invalid IQ");
|
||||
elseif #stanza.tags > 1 or not(stanza.attr.type == "error" or stanza.attr.type == "result") then
|
||||
error("Invalid IQ");
|
||||
end
|
||||
end
|
||||
|
||||
if origin.type == "c2s" and not origin.full_jid
|
||||
and not(stanza.name == "iq" 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 (FIXME this would be incorrect when the origin is not c2s)
|
||||
-- TODO also, stazas should be returned to their original state before the function ends
|
||||
|
||||
-- TODO presence subscriptions
|
||||
if not to then
|
||||
core_handle_stanza(origin, stanza);
|
||||
elseif hosts[to] and hosts[to].type == "local" then
|
||||
core_handle_stanza(origin, stanza);
|
||||
elseif stanza.name == "iq" and not select(3, jid_split(to)) then
|
||||
core_handle_stanza(origin, stanza);
|
||||
elseif origin.type == "c2s" then
|
||||
core_route_stanza(origin, stanza);
|
||||
end
|
||||
end
|
||||
|
||||
-- This function handles stanzas which are not routed any further,
|
||||
-- that is, they are handled by this server
|
||||
function core_handle_stanza(origin, stanza)
|
||||
-- Handlers
|
||||
if origin.type == "c2s" or origin.type == "c2s_unauthed" then
|
||||
local session = origin;
|
||||
|
||||
if stanza.name == "presence" and origin.roster then
|
||||
if stanza.attr.type == nil or stanza.attr.type == "available" or stanza.attr.type == "unavailable" then
|
||||
for jid in pairs(origin.roster) do -- broadcast to all interested contacts
|
||||
local subscription = origin.roster[jid].subscription;
|
||||
if subscription == "both" or subscription == "from" then
|
||||
stanza.attr.to = jid;
|
||||
core_route_stanza(origin, stanza);
|
||||
end
|
||||
end
|
||||
local node, host = jid_split(stanza.attr.from);
|
||||
for _, res in pairs(hosts[host].sessions[node].sessions) do -- broadcast to all resources and from resources
|
||||
if res ~= origin then
|
||||
if res.full_jid then -- to resource. FIXME is this check correct? Maybe it should be res.presence
|
||||
stanza.attr.to = res.full_jid;
|
||||
core_route_stanza(origin, stanza);
|
||||
end
|
||||
if res.presence then -- from all resources for which we have presence
|
||||
res.presence.attr.to = origin.full_jid;
|
||||
core_route_stanza(res, res.presence);
|
||||
res.presence.attr.to = nil;
|
||||
end
|
||||
end
|
||||
end
|
||||
if not origin.presence then -- presence probes on initial presence
|
||||
local probe = st.presence({from = origin.full_jid, type = "probe"});
|
||||
for jid in pairs(origin.roster) do
|
||||
local subscription = origin.roster[jid].subscription;
|
||||
if subscription == "both" or subscription == "to" then
|
||||
probe.attr.to = jid;
|
||||
core_route_stanza(origin, probe);
|
||||
end
|
||||
end
|
||||
end
|
||||
origin.presence = stanza;
|
||||
stanza.attr.to = nil; -- reset it
|
||||
else
|
||||
-- TODO error, bad type
|
||||
end
|
||||
else
|
||||
log("debug", "Routing stanza to local");
|
||||
handle_stanza(session, stanza);
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function is_authorized_to_see_presence(origin, username, host)
|
||||
local roster = datamanager.load(username, host, "roster") or {};
|
||||
local item = roster[origin.username.."@"..origin.host];
|
||||
return item and (item.subscription == "both" or item.subscription == "from");
|
||||
end
|
||||
|
||||
function core_route_stanza(origin, stanza)
|
||||
-- Hooks
|
||||
--- ...later
|
||||
|
||||
-- Deliver
|
||||
local to = stanza.attr.to;
|
||||
local node, host, resource = jid_split(to);
|
||||
|
||||
if stanza.name == "presence" and (stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable") then resource = nil; end
|
||||
|
||||
local host_session = hosts[host]
|
||||
if host_session and host_session.type == "local" then
|
||||
-- Local host
|
||||
local user = host_session.sessions[node];
|
||||
if user then
|
||||
local res = user.sessions[resource];
|
||||
if not res then
|
||||
-- if we get here, resource was not specified or was unavailable
|
||||
if stanza.name == "presence" then
|
||||
if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then
|
||||
if stanza.attr.type == "probe" then
|
||||
if is_authorized_to_see_presence(origin, node, host) then
|
||||
for k in pairs(user.sessions) do -- return presence for all resources
|
||||
if user.sessions[k].presence then
|
||||
local pres = user.sessions[k].presence;
|
||||
pres.attr.to = origin.full_jid;
|
||||
pres.attr.from = user.sessions[k].full_jid;
|
||||
send(origin, pres);
|
||||
pres.attr.to = nil;
|
||||
pres.attr.from = nil;
|
||||
end
|
||||
end
|
||||
else
|
||||
send(origin, st.presence({from=user.."@"..host, to=origin.username.."@"..origin.host, type="unsubscribed"}));
|
||||
end
|
||||
elseif stanza.attr.type == "subscribe" then
|
||||
-- TODO
|
||||
elseif stanza.attr.type == "unsubscribe" then
|
||||
-- TODO
|
||||
elseif stanza.attr.type == "subscribed" then
|
||||
-- TODO
|
||||
elseif stanza.attr.type == "unsubscribed" then
|
||||
-- TODO
|
||||
end -- discard any other type
|
||||
else -- sender is available or unavailable
|
||||
for k in pairs(user.sessions) do -- presence broadcast to all user resources
|
||||
if user.sessions[k].full_jid then
|
||||
stanza.attr.to = user.sessions[k].full_jid;
|
||||
send(user.sessions[k], stanza);
|
||||
end
|
||||
end
|
||||
end
|
||||
elseif stanza.name == "message" then -- select a resource to recieve message
|
||||
for k in pairs(user.sessions) do
|
||||
if user.sessions[k].full_jid then
|
||||
res = user.sessions[k];
|
||||
break;
|
||||
end
|
||||
end
|
||||
-- TODO find resource with greatest priority
|
||||
send(res, stanza);
|
||||
else
|
||||
-- TODO send IQ error
|
||||
end
|
||||
else
|
||||
-- User + resource is online...
|
||||
stanza.attr.to = res.full_jid;
|
||||
send(res, stanza); -- Yay \o/
|
||||
end
|
||||
else
|
||||
-- user not online
|
||||
if user_exists(node, host) then
|
||||
if stanza.name == "presence" then
|
||||
if stanza.attr.type == "probe" and is_authorized_to_see_presence(origin, node, host) then -- FIXME what to do for not c2s?
|
||||
-- TODO send last recieved unavailable presence
|
||||
else
|
||||
-- TODO send unavailable presence
|
||||
end
|
||||
elseif stanza.name == "message" then
|
||||
-- TODO send message error, or store offline messages
|
||||
elseif stanza.name == "iq" then
|
||||
-- TODO send IQ error
|
||||
end
|
||||
else -- user does not exist
|
||||
-- TODO we would get here for nodeless JIDs too. Do something fun maybe? Echo service? Let plugins use xmpp:server/resource addresses?
|
||||
if stanza.name == "presence" then
|
||||
if stanza.attr.type == "probe" then
|
||||
send(origin, st.presence({from = user.."@"..host, to = origin.username.."@"..origin.host, type = "unsubscribed"}));
|
||||
end
|
||||
-- else ignore
|
||||
else
|
||||
send(origin, st.error_reply(stanza, "cancel", "service-unavailable"));
|
||||
end
|
||||
end
|
||||
end
|
||||
else
|
||||
-- Remote host
|
||||
if host_session then
|
||||
-- Send to session
|
||||
else
|
||||
-- Need to establish the connection
|
||||
end
|
||||
end
|
||||
stanza.attr.to = to; -- reset
|
||||
end
|
||||
|
||||
function handle_stanza_toremote(stanza)
|
||||
log("error", "Stanza bound for remote host, but s2s is not implemented");
|
||||
end
|
||||
|
|
|
|||
|
|
@ -69,6 +69,19 @@ function xmppclient.listener(conn, data)
|
|||
end
|
||||
|
||||
function xmppclient.disconnect(conn)
|
||||
local session = sessions[conn];
|
||||
if session then
|
||||
if session.last_presence and session.last_presence.attr.type ~= "unavailable" then
|
||||
local pres = st.presence{ type = "unavailable" };
|
||||
if err == "closed" then err = "connection closed"; end
|
||||
pres:tag("status"):text("Disconnected: "..err);
|
||||
session.stanza_dispatch(pres);
|
||||
end
|
||||
sm_destroy_session(session);
|
||||
sessions[conn] = nil;
|
||||
session = nil;
|
||||
collectgarbage("collect");
|
||||
end
|
||||
end
|
||||
|
||||
connlisteners_register("xmppclient", xmppclient);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue