X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fstanza_router.lua;h=b7b57754486d281b8be2331c072f736fb5bcf63f;hb=bd184547202aeb60ce10ac5a629c101a9d643309;hp=02e0871f953fd6f9e548a1885cfe1451ec7a5e46;hpb=99a72144addb448f0da25f5f16858e186bb0fa92;p=prosody.git diff --git a/core/stanza_router.lua b/core/stanza_router.lua index 02e0871f..b7b57754 100644 --- a/core/stanza_router.lua +++ b/core/stanza_router.lua @@ -9,25 +9,38 @@ 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; -require "util.jid" -local jid_split = jid.split; +local jid_split = require "util.jid".split; +local print = print; 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] and stanza.tags[1].name == "bind" + 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 + 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 - if not to or (hosts[to] and hosts[to].type == "local") then + -- 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); @@ -38,45 +51,134 @@ function core_handle_stanza(origin, stanza) -- Handlers if origin.type == "c2s" or origin.type == "c2s_unauthed" then local session = origin; - stanza.attr.from = session.full_jid; - - log("debug", "Routing stanza"); - -- Stanza has no to attribute - --local to_node, to_host, to_resource = jid_split(stanza.attr.to); - --if not to_host then error("Invalid destination JID: "..string.format("{ %q, %q, %q } == %q", to_node or "", to_host or "", to_resource or "", stanza.attr.to or "nil")); end - -- Stanza is to this server, or a user on this server - log("debug", "Routing stanza to local"); - handle_stanza(session, stanza); + 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 + if res.full_jid then + res = user.sessions[k]; + break; + 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 node, host, resource = jid_split(stanza.attr.to); + local to = stanza.attr.to; + local node, host, resource = jid_split(to); + + if stanza.name == "presence" and stanza.attr.type == "probe" 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]; - -- TODO do something about presence broadcast if not res then -- if we get here, resource was not specified or was unavailable - for k in pairs(user.sessions) do - res = user.sessions[k]; - break; + if stanza.name == "presence" 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 + else + 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 - -- TODO find resource with greatest priority + else + stanza.attr.to = res.full_jid; + send(res, stanza); -- Yay \o/ end - stanza.attr.to = res.full_jid; - send(res, stanza); -- Yay \o/ else - -- user not found - send(origin, st.error_reply(stanza, "cancel", "service-unavailable")); + -- 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 @@ -86,6 +188,7 @@ function core_route_stanza(origin, stanza) -- Need to establish the connection end end + stanza.attr.to = to; -- reset end function handle_stanza_nodest(stanza)