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;
-function send(session, stanza)
- if session.type == "c2s" then
- _send(session, stanza);
- else
- local xmlns = stanza.attr.xmlns;
- --stanza.attr.xmlns = "jabber:server";
- stanza.attr.xmlns = nil;
- log("debug", "sending s2s stanza: %s", tostring(stanza));
- send_s2s(session.host, host, stanza); -- TODO handle remote routing errors
- stanza.attr.xmlns = xmlns; -- reset
- end
-end
local user_exists = require "core.usermanager".user_exists;
local rostermanager = require "core.rostermanager";
local s2s_verify_dialback = require "core.s2smanager".verify_dialback;
local s2s_make_authenticated = require "core.s2smanager".make_authenticated;
+
+local modules_handle_stanza = require "core.modulemanager".handle_stanza;
+
local format = string.format;
local tostring = tostring;
+local t_concat = table.concat;
+local t_insert = table.insert;
+local tonumber = tonumber;
+local s_find = string.find;
local jid_split = require "util.jid".split;
local print = print;
function core_process_stanza(origin, stanza)
- log("debug", "Received: "..tostring(stanza))
+ log("debug", "Received["..origin.type.."]: "..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
if origin.type == "c2s" then
stanza.attr.from = origin.full_jid; -- quick fix to prevent impersonation (FIXME this would be incorrect when the origin is not c2s)
end
-
+
if not to then
core_handle_stanza(origin, stanza);
elseif origin.type == "c2s" and stanza.name == "presence" and stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then
core_handle_stanza(origin, stanza);
elseif stanza.name == "iq" and not select(3, jid_split(to)) then
core_handle_stanza(origin, stanza);
+ elseif stanza.attr.xmlns and stanza.attr.xmlns ~= "jabber:client" and stanza.attr.xmlns ~= "jabber:server" then
+ modules_handle_stanza(origin, stanza);
elseif origin.type == "c2s" or origin.type == "s2sin" then
core_route_stanza(origin, stanza);
end
-- that is, they are handled by this server
function core_handle_stanza(origin, stanza)
-- Handlers
+ if modules_handle_stanza(origin, stanza) then return; end
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 == "unavailable" then
for jid in pairs(origin.roster) do -- broadcast to all interested contacts
core_route_stanza(origin, stanza);
end
end
- if not origin.presence then -- presence probes on initial presence -- FIXME does unavailable qualify as initial presence?
+ if stanza.attr.type == nil and not origin.presence then -- initial presence
local probe = st.presence({from = origin.full_jid, type = "probe"});
for jid in pairs(origin.roster) do -- probe all contacts we are subscribed to
local subscription = origin.roster[jid].subscription;
core_route_stanza(origin, probe);
end
end
- for _, res in pairs(hosts[host].sessions[node].sessions) do -- broadcast from all resources
- if res ~= origin and stanza.attr.type ~= "unavailable" and res.presence then -- FIXME does unavailable qualify as initial presence?
+ for _, res in pairs(hosts[host].sessions[node].sessions) do -- broadcast from all available resources
+ if res ~= origin and res.presence then
res.presence.attr.to = origin.full_jid;
core_route_stanza(res, res.presence);
res.presence.attr.to = nil;
end
end
- -- TODO resend subscription requests
+ if origin.roster.pending then -- resend incoming subscription requests
+ for jid in pairs(origin.roster.pending) do
+ origin.send(st.presence({type="subscribe", from=jid})); -- TODO add to attribute? Use original?
+ end
+ end
+ local request = st.presence({type="subscribe", from=origin.username.."@"..origin.host});
+ for jid, item in pairs(origin.roster) do -- resend outgoing subscription requests
+ if item.ask then
+ request.attr.to = jid;
+ core_route_stanza(origin, request);
+ end
+ end
+ end
+ origin.priority = 0;
+ if stanza.attr.type == "unavailable" then
+ origin.presence = nil;
+ else
+ origin.presence = stanza;
+ local priority = stanza:child_with_name("priority");
+ if priority and #priority > 0 then
+ priority = t_concat(priority);
+ if s_find(priority, "^[+-]?[0-9]+$") then
+ priority = tonumber(priority);
+ if priority < -128 then priority = -128 end
+ if priority > 127 then priority = 127 end
+ origin.priority = priority;
+ 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
- elseif origin.type == "s2sin_unauthed" or origin.type == "s2sin" then
- if stanza.attr.xmlns == "jabber:server:dialback" then
- if stanza.name == "verify" then
- -- We are being asked to verify the key, to ensure it was generated by us
- log("debug", "verifying dialback key...");
- local attr = stanza.attr;
- print(tostring(attr.to), tostring(attr.from))
- print(tostring(origin.to_host), tostring(origin.from_host))
- -- FIXME: Grr, ejabberd breaks this one too?? it is black and white in XEP-220 example 34
- --if attr.from ~= origin.to_host then error("invalid-from"); end
- local type = "invalid";
- if s2s_verify_dialback(attr.id, attr.from, attr.to, stanza[1]) then
- type = "valid"
- end
- origin.send(format("<db:verify from='%s' to='%s' id='%s' type='%s'>%s</db:verify>", attr.to, attr.from, attr.id, type, stanza[1]));
- elseif stanza.name == "result" and origin.type == "s2sin_unauthed" then
- -- he wants to be identified through dialback
- -- We need to check the key with the Authoritative server
- local attr = stanza.attr;
- origin.from_host = attr.from;
- origin.to_host = attr.to;
- origin.dialback_key = stanza[1];
- log("debug", "asking %s if key %s belongs to them", attr.from, stanza[1]);
- send_s2s(attr.to, attr.from, format("<db:verify from='%s' to='%s' id='%s'>%s</db:verify>", attr.to, attr.from, origin.streamid, stanza[1]));
- hosts[attr.from].dialback_verifying = origin;
- end
- end
- elseif origin.type == "s2sout_unauthed" or origin.type == "s2sout" then
- if stanza.attr.xmlns == "jabber:server:dialback" then
- if stanza.name == "result" then
- if stanza.attr.type == "valid" then
- s2s_make_authenticated(origin);
- else
- -- FIXME
- error("dialback failed!");
- end
- elseif stanza.name == "verify" and origin.dialback_verifying then
- local valid;
- local attr = stanza.attr;
- if attr.type == "valid" then
- s2s_make_authenticated(origin.dialback_verifying);
- valid = "valid";
- else
- -- Warn the original connection that is was not verified successfully
- log("warn", "dialback for "..(origin.dialback_verifying.from_host or "(unknown)").." failed");
- valid = "invalid";
- end
- origin.dialback_verifying.send(format("<db:result from='%s' to='%s' id='%s' type='%s'>%s</db:result>", attr.from, attr.to, attr.id, valid, origin.dialback_verifying.dialback_key));
- end
end
else
log("warn", "Unhandled origin: %s", origin.type);
if pres then
pres.attr.to = jid;
pres.attr.from = session.full_jid;
- send(recipient_session, pres);
+ recipient_session.send(pres);
pres.attr.to = nil;
pres.attr.from = nil;
count = count + 1;
local st_from, st_to = stanza.attr.from, stanza.attr.to;
stanza.attr.from, stanza.attr.to = from_bare, to_bare;
if stanza.attr.type == "probe" then
+ log("debug", "inbound probe from "..from_bare.." for "..to_bare);
if rostermanager.is_contact_subscribed(node, host, from_bare) then
if 0 == send_presence_of_available_resources(node, host, from_bare, origin) then
-- TODO send last recieved unavailable presence (or we MAY do nothing, which is fine too)
function core_route_stanza(origin, stanza)
-- Hooks
--- ...later
-
+
-- Deliver
local to = stanza.attr.to;
local node, host, resource = jid_split(to);
if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then
handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare);
else -- sender is available or unavailable
- for k in pairs(user.sessions) do -- presence broadcast to all user resources. FIXME should this be just for available resources? Do we need to check subscription?
- if user.sessions[k].full_jid then
- stanza.attr.to = user.sessions[k].full_jid; -- reset at the end of function
- send(user.sessions[k], stanza);
+ for _, session in pairs(user.sessions) do -- presence broadcast to all user resources.
+ if session.full_jid then -- FIXME should this be just for available resources? Do we need to check subscription?
+ stanza.attr.to = session.full_jid; -- reset at the end of function
+ session.send(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;
+ local priority = 0;
+ local recipients = {};
+ for _, session in pairs(user.sessions) do -- find resource with greatest priority
+ local p = session.priority;
+ if p > priority then
+ priority = p;
+ recipients = {session};
+ elseif p == priority then
+ t_insert(recipients, session);
end
end
- -- TODO find resource with greatest priority
- send(res, stanza);
+ for _, session in pairs(recipient) do
+ session.send(stanza);
+ end
else
-- TODO send IQ error
end
else
-- User + resource is online...
stanza.attr.to = res.full_jid; -- reset at the end of function
- send(res, stanza); -- Yay \o/
+ res.send(stanza); -- Yay \o/
end
else
-- user not online
-- 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 = to_bare, to = from_bare, type = "unsubscribed"}));
+ origin.send(st.presence({from = to_bare, to = from_bare, type = "unsubscribed"}));
end
-- else ignore
else
- send(origin, st.error_reply(stanza, "cancel", "service-unavailable"));
+ origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
end
end
end
projects / prosody.git / blobdiff