--- Prosody IM v0.4
+-- Prosody IM
-- Copyright (C) 2008-2009 Matthew Wild
-- Copyright (C) 2008-2009 Waqas Hussain
--
-- COPYING file in the source package for more information.
--
-
-
local log = require "util.logger".init("stanzarouter")
local hosts = _G.hosts;
-
+local tostring = tostring;
local st = require "util.stanza";
local send_s2s = require "core.s2smanager".send_to_host;
-local user_exists = require "core.usermanager".user_exists;
-
-local rostermanager = require "core.rostermanager";
-local offlinemanager = require "core.offlinemanager";
-
local modules_handle_stanza = require "core.modulemanager".handle_stanza;
local component_handle_stanza = require "core.componentmanager".handle_stanza;
-
-local tostring = tostring;
-local t_insert = table.insert;
-local pairs = pairs;
-local ipairs = ipairs;
-
local jid_split = require "util.jid".split;
local jid_prepped_split = require "util.jid".prepped_split;
-local fire_event = prosody.events.fire_event;
function core_process_stanza(origin, stanza)
(origin.log or log)("debug", "Received[%s]: %s", origin.type, stanza:top_tag())
-- TODO verify validity of stanza (as well as JID validity)
if stanza.attr.type == "error" and #stanza.tags == 0 then return; end -- TODO invalid stanza, log
if stanza.name == "iq" then
- if (stanza.attr.type == "set" or stanza.attr.type == "get") and #stanza.tags ~= 1 then
+ local can_reply = stanza.attr.type == "set" or stanza.attr.type == "get"
+ local missing_id = not stanza.attr.id;
+ if can_reply and (#stanza.tags ~= 1 or missing_id) then
origin.send(st.error_reply(stanza, "modify", "bad-request"));
return;
+ elseif missing_id then
+ return;
end
end
end
if h.events.fire_event(event, {origin = origin, stanza = stanza}) then return; end
end
- if host and not hosts[host] then host = nil; end -- workaround for a Pidgin bug which sets 'to' to the SRV result
+ if host and not hosts[host] then host = nil; end -- COMPAT: workaround for a Pidgin bug which sets 'to' to the SRV result
modules_handle_stanza(host or origin.host or origin.to_host, origin, stanza);
end
end
end
local event_data = {origin=origin, stanza=stanza};
- if origin.full_jid then -- c2s connection
+ if origin.full_jid == stanza.attr.from then -- c2s connection
if hosts[origin.host].events.fire_event('pre-'..stanza.name..to_type, event_data) then return; end -- do preprocessing
end
local h = hosts[to_bare] or hosts[host or origin.host];
if h then
+ if h.events.fire_event(stanza.name..to_type, event_data) then return; end -- do processing
+
if h.type == "component" then
component_handle_stanza(origin, stanza);
return;
- else
- if h.events.fire_event(stanza.name..to_type, event_data) then return; end -- do processing
- end
- if not modules_handle_stanza(h.host, origin, stanza) then
- if stanza.attr.xmlns == "jabber:client" and stanza.attr.type ~= "result" and stanza.attr.type ~= "error" then
- origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
- end
end
+ modules_handle_stanza(h.host, origin, stanza);
else
core_route_stanza(origin, stanza);
end
origin = origin or hosts[from_host];
if not origin then return false; end
- local host_session = hosts[host]
- if host_session and host_session.type == "local" then
+ if hosts[host] then
-- old stanza routing code removed
core_post_stanza(origin, stanza);
elseif origin.type == "c2s" then
-- Remote host
- local xmlns = stanza.attr.xmlns;
- --stanza.attr.xmlns = "jabber:server";
- stanza.attr.xmlns = nil;
- log("debug", "sending s2s stanza: %s", tostring(stanza));
- send_s2s(origin.host, host, stanza); -- TODO handle remote routing errors
- stanza.attr.xmlns = xmlns; -- reset
+ if not hosts[from_host] then
+ log("error", "No hosts[from_host] (please report): %s", tostring(stanza));
+ end
+ if (not hosts[from_host]) or (not hosts[from_host].disallow_s2s) then
+ local xmlns = stanza.attr.xmlns;
+ --stanza.attr.xmlns = "jabber:server";
+ stanza.attr.xmlns = nil;
+ log("debug", "sending s2s stanza: %s", tostring(stanza));
+ send_s2s(origin.host, host, stanza); -- TODO handle remote routing errors
+ stanza.attr.xmlns = xmlns; -- reset
+ else
+ core_route_stanza(hosts[from_host], st.error_reply(stanza, "cancel", "not-allowed", "Communication with remote servers is not allowed"));
+ end
elseif origin.type == "component" or origin.type == "local" then
-- Route via s2s for components and modules
log("debug", "Routing outgoing stanza for %s to %s", from_host, host);
else
log("warn", "received stanza from unhandled connection type: %s", origin.type);
end
- stanza.attr.to = to; -- reset
end