author | Waqas Hussain <waqas20@gmail.com> |
Fri, 07 Nov 2008 02:38:44 +0500 | |
changeset 221 | 641dbdf3b751 |
parent 215 | ec90acc13ba3 |
child 222 | 6153462397d8 |
permissions | -rw-r--r-- |
30 | 1 |
|
2 |
-- The code in this file should be self-explanatory, though the logic is horrible |
|
3 |
-- for more info on that, see doc/stanza_routing.txt, which attempts to condense |
|
4 |
-- the rules from the RFCs (mainly 3921) |
|
5 |
||
6 |
require "core.servermanager" |
|
7 |
||
8 |
local log = require "util.logger".init("stanzarouter") |
|
9 |
||
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
10 |
local st = require "util.stanza"; |
187
2e16e5077d8f
Was a bit hasty to remove send_s2s() from stanza_router. We still use it, and there is no problem with it.
Matthew Wild <mwild1@gmail.com>
parents:
186
diff
changeset
|
11 |
local send_s2s = require "core.s2smanager".send_to_host; |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
12 |
local user_exists = require "core.usermanager".user_exists; |
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
13 |
|
171
28f420d057a0
Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents:
170
diff
changeset
|
14 |
local rostermanager = require "core.rostermanager"; |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
15 |
local sessionmanager = require "core.sessionmanager"; |
171
28f420d057a0
Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents:
170
diff
changeset
|
16 |
|
145 | 17 |
local s2s_verify_dialback = require "core.s2smanager".verify_dialback; |
146 | 18 |
local s2s_make_authenticated = require "core.s2smanager".make_authenticated; |
191 | 19 |
|
20 |
local modules_handle_stanza = require "core.modulemanager".handle_stanza; |
|
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
21 |
local component_handle_stanza = require "core.componentmanager".handle_stanza; |
191 | 22 |
|
145 | 23 |
local format = string.format; |
24 |
local tostring = tostring; |
|
199
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
25 |
local t_concat = table.concat; |
200
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
26 |
local t_insert = table.insert; |
199
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
27 |
local tonumber = tonumber; |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
28 |
local s_find = string.find; |
145 | 29 |
|
105
b099f0f80775
Removed an unnecessary line
Waqas Hussain <waqas20@gmail.com>
parents:
83
diff
changeset
|
30 |
local jid_split = require "util.jid".split; |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
31 |
local print = print; |
30 | 32 |
|
33 |
function core_process_stanza(origin, stanza) |
|
221
641dbdf3b751
Shortened log output for incoming stanzas and an added check.
Waqas Hussain <waqas20@gmail.com>
parents:
215
diff
changeset
|
34 |
log("debug", "Received["..origin.type.."]: "..tostring(st.reply(st.reply(stanza)))) |
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
35 |
|
73 | 36 |
-- TODO verify validity of stanza (as well as JID validity) |
83
79608fc8f98d
Fixed routing for IQs to bare JIDs, and added a simple IQ validity check
Waqas Hussain <waqas20@gmail.com>
parents:
78
diff
changeset
|
37 |
if stanza.name == "iq" and not(#stanza.tags == 1 and stanza.tags[1].attr.xmlns) then |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
38 |
if stanza.attr.type == "set" or stanza.attr.type == "get" then |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
39 |
error("Invalid IQ"); |
148 | 40 |
elseif #stanza.tags > 1 and not(stanza.attr.type == "error" or stanza.attr.type == "result") then |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
41 |
error("Invalid IQ"); |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
42 |
end |
83
79608fc8f98d
Fixed routing for IQs to bare JIDs, and added a simple IQ validity check
Waqas Hussain <waqas20@gmail.com>
parents:
78
diff
changeset
|
43 |
end |
78
972e31cc91e8
Fized: Added check to ensure that resource binding is done after auth.
Waqas Hussain <waqas20@gmail.com>
parents:
73
diff
changeset
|
44 |
|
972e31cc91e8
Fized: Added check to ensure that resource binding is done after auth.
Waqas Hussain <waqas20@gmail.com>
parents:
73
diff
changeset
|
45 |
if origin.type == "c2s" and not origin.full_jid |
83
79608fc8f98d
Fixed routing for IQs to bare JIDs, and added a simple IQ validity check
Waqas Hussain <waqas20@gmail.com>
parents:
78
diff
changeset
|
46 |
and not(stanza.name == "iq" and stanza.tags[1].name == "bind" |
78
972e31cc91e8
Fized: Added check to ensure that resource binding is done after auth.
Waqas Hussain <waqas20@gmail.com>
parents:
73
diff
changeset
|
47 |
and stanza.tags[1].attr.xmlns == "urn:ietf:params:xml:ns:xmpp-bind") then |
972e31cc91e8
Fized: Added check to ensure that resource binding is done after auth.
Waqas Hussain <waqas20@gmail.com>
parents:
73
diff
changeset
|
48 |
error("Client MUST bind resource after auth"); |
972e31cc91e8
Fized: Added check to ensure that resource binding is done after auth.
Waqas Hussain <waqas20@gmail.com>
parents:
73
diff
changeset
|
49 |
end |
972e31cc91e8
Fized: Added check to ensure that resource binding is done after auth.
Waqas Hussain <waqas20@gmail.com>
parents:
73
diff
changeset
|
50 |
|
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
51 |
-- TODO also, stazas should be returned to their original state before the function ends |
145 | 52 |
if origin.type == "c2s" then |
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
53 |
stanza.attr.from = origin.full_jid; |
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
54 |
end |
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
55 |
local to = stanza.attr.to; |
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
56 |
local node, host, resource = jid_split(to); |
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
57 |
local to_bare = node and (node.."@"..host) or host; -- bare JID |
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
58 |
local from = stanza.attr.from; |
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
59 |
local from_node, from_host, from_resource = jid_split(from); |
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
60 |
local from_bare = from_node and (from_node.."@"..from_host) or from_host; -- bare JID |
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
61 |
|
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
62 |
if origin.type == "s2sin" then |
209
e9de0803676d
Part one of internal component support
Matthew Wild <mwild1@gmail.com>
parents:
207
diff
changeset
|
63 |
if origin.from_host ~= from_host then -- remote server trying to impersonate some other server? |
e9de0803676d
Part one of internal component support
Matthew Wild <mwild1@gmail.com>
parents:
207
diff
changeset
|
64 |
log("warn", "Received a stanza claiming to be from %s, over a conn authed for %s!", from, origin.from_host); |
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
65 |
return; -- FIXME what should we do here? does this work with subdomains? |
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
66 |
end |
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
67 |
end |
213 | 68 |
--[[if to and not(hosts[to]) and not(hosts[to_bare]) and (hosts[host] and hosts[host].type ~= "local") then -- not for us? |
69 |
log("warn", "stanza recieved for a non-local server"); |
|
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
70 |
return; -- FIXME what should we do here? |
213 | 71 |
end]] -- FIXME |
207 | 72 |
|
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
73 |
-- FIXME do stanzas not of jabber:client get handled by components? |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
74 |
if not to then |
170 | 75 |
core_handle_stanza(origin, stanza); |
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
76 |
elseif hosts[to] and hosts[to].type == "local" then -- directed at a local server |
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
77 |
core_handle_stanza(origin, stanza); |
210
e679487e2fa4
Part 2 of internal components. Should have mentioned that the previous commit was from waqas, this one from me.
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
78 |
elseif stanza.attr.xmlns and stanza.attr.xmlns ~= "jabber:client" and stanza.attr.xmlns ~= "jabber:server" then |
e679487e2fa4
Part 2 of internal components. Should have mentioned that the previous commit was from waqas, this one from me.
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
79 |
modules_handle_stanza(origin, stanza); |
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
80 |
elseif hosts[to_bare] and hosts[to_bare].type == "component" then -- hack to allow components to handle node@server |
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
81 |
component_handle_stanza(origin, stanza); |
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
82 |
elseif hosts[to] and hosts[to].type == "component" then -- hack to allow components to handle node@server/resource and server/resource |
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
83 |
component_handle_stanza(origin, stanza); |
221
641dbdf3b751
Shortened log output for incoming stanzas and an added check.
Waqas Hussain <waqas20@gmail.com>
parents:
215
diff
changeset
|
84 |
elseif hosts[host] and hosts[host].type == "component" then -- directed at a component |
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
85 |
component_handle_stanza(origin, stanza); |
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
86 |
elseif origin.type == "c2s" and stanza.name == "presence" and stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then |
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
87 |
handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare); |
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
88 |
elseif stanza.name == "iq" and not resource then -- directed at bare JID |
119
b48a573608e8
Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents:
113
diff
changeset
|
89 |
core_handle_stanza(origin, stanza); |
148 | 90 |
elseif origin.type == "c2s" or origin.type == "s2sin" then |
119
b48a573608e8
Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents:
113
diff
changeset
|
91 |
core_route_stanza(origin, stanza); |
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
92 |
else |
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
93 |
log("warn", "stanza not processed"); |
119
b48a573608e8
Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents:
113
diff
changeset
|
94 |
end |
b48a573608e8
Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents:
113
diff
changeset
|
95 |
end |
b48a573608e8
Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents:
113
diff
changeset
|
96 |
|
121
74e5919e4737
Added a comment, removed all the old code
Matthew Wild <mwild1@gmail.com>
parents:
119
diff
changeset
|
97 |
-- This function handles stanzas which are not routed any further, |
74e5919e4737
Added a comment, removed all the old code
Matthew Wild <mwild1@gmail.com>
parents:
119
diff
changeset
|
98 |
-- that is, they are handled by this server |
119
b48a573608e8
Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents:
113
diff
changeset
|
99 |
function core_handle_stanza(origin, stanza) |
b48a573608e8
Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents:
113
diff
changeset
|
100 |
-- Handlers |
191 | 101 |
if modules_handle_stanza(origin, stanza) then return; end |
119
b48a573608e8
Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents:
113
diff
changeset
|
102 |
if origin.type == "c2s" or origin.type == "c2s_unauthed" then |
b48a573608e8
Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents:
113
diff
changeset
|
103 |
local session = origin; |
207 | 104 |
|
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
105 |
if stanza.name == "presence" and origin.roster then |
152
6b8e2bd82ac5
Moved some code and removed unnecessary checks.
Waqas Hussain <waqas20@gmail.com>
parents:
151
diff
changeset
|
106 |
if stanza.attr.type == nil or stanza.attr.type == "unavailable" then |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
107 |
for jid in pairs(origin.roster) do -- broadcast to all interested contacts |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
108 |
local subscription = origin.roster[jid].subscription; |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
109 |
if subscription == "both" or subscription == "from" then |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
110 |
stanza.attr.to = jid; |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
111 |
core_route_stanza(origin, stanza); |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
112 |
end |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
113 |
end |
151 | 114 |
local node, host = jid_split(stanza.attr.from); |
152
6b8e2bd82ac5
Moved some code and removed unnecessary checks.
Waqas Hussain <waqas20@gmail.com>
parents:
151
diff
changeset
|
115 |
for _, res in pairs(hosts[host].sessions[node].sessions) do -- broadcast to all resources |
6b8e2bd82ac5
Moved some code and removed unnecessary checks.
Waqas Hussain <waqas20@gmail.com>
parents:
151
diff
changeset
|
116 |
if res ~= origin and res.full_jid then -- to resource. FIXME is res.full_jid the correct check? Maybe it should be res.presence |
6b8e2bd82ac5
Moved some code and removed unnecessary checks.
Waqas Hussain <waqas20@gmail.com>
parents:
151
diff
changeset
|
117 |
stanza.attr.to = res.full_jid; |
6b8e2bd82ac5
Moved some code and removed unnecessary checks.
Waqas Hussain <waqas20@gmail.com>
parents:
151
diff
changeset
|
118 |
core_route_stanza(origin, stanza); |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
119 |
end |
151 | 120 |
end |
199
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
121 |
if stanza.attr.type == nil and not origin.presence then -- initial presence |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
122 |
local probe = st.presence({from = origin.full_jid, type = "probe"}); |
152
6b8e2bd82ac5
Moved some code and removed unnecessary checks.
Waqas Hussain <waqas20@gmail.com>
parents:
151
diff
changeset
|
123 |
for jid in pairs(origin.roster) do -- probe all contacts we are subscribed to |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
124 |
local subscription = origin.roster[jid].subscription; |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
125 |
if subscription == "both" or subscription == "to" then |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
126 |
probe.attr.to = jid; |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
127 |
core_route_stanza(origin, probe); |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
128 |
end |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
129 |
end |
199
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
130 |
for _, res in pairs(hosts[host].sessions[node].sessions) do -- broadcast from all available resources |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
131 |
if res ~= origin and res.presence then |
152
6b8e2bd82ac5
Moved some code and removed unnecessary checks.
Waqas Hussain <waqas20@gmail.com>
parents:
151
diff
changeset
|
132 |
res.presence.attr.to = origin.full_jid; |
6b8e2bd82ac5
Moved some code and removed unnecessary checks.
Waqas Hussain <waqas20@gmail.com>
parents:
151
diff
changeset
|
133 |
core_route_stanza(res, res.presence); |
6b8e2bd82ac5
Moved some code and removed unnecessary checks.
Waqas Hussain <waqas20@gmail.com>
parents:
151
diff
changeset
|
134 |
res.presence.attr.to = nil; |
6b8e2bd82ac5
Moved some code and removed unnecessary checks.
Waqas Hussain <waqas20@gmail.com>
parents:
151
diff
changeset
|
135 |
end |
6b8e2bd82ac5
Moved some code and removed unnecessary checks.
Waqas Hussain <waqas20@gmail.com>
parents:
151
diff
changeset
|
136 |
end |
199
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
137 |
if origin.roster.pending then -- resend incoming subscription requests |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
138 |
for jid in pairs(origin.roster.pending) do |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
139 |
origin.send(st.presence({type="subscribe", from=jid})); -- TODO add to attribute? Use original? |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
140 |
end |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
141 |
end |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
142 |
local request = st.presence({type="subscribe", from=origin.username.."@"..origin.host}); |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
143 |
for jid, item in pairs(origin.roster) do -- resend outgoing subscription requests |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
144 |
if item.ask then |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
145 |
request.attr.to = jid; |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
146 |
core_route_stanza(origin, request); |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
147 |
end |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
148 |
end |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
149 |
end |
199
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
150 |
origin.priority = 0; |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
151 |
if stanza.attr.type == "unavailable" then |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
152 |
origin.presence = nil; |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
153 |
else |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
154 |
origin.presence = stanza; |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
155 |
local priority = stanza:child_with_name("priority"); |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
156 |
if priority and #priority > 0 then |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
157 |
priority = t_concat(priority); |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
158 |
if s_find(priority, "^[+-]?[0-9]+$") then |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
159 |
priority = tonumber(priority); |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
160 |
if priority < -128 then priority = -128 end |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
161 |
if priority > 127 then priority = 127 end |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
162 |
origin.priority = priority; |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
163 |
end |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
164 |
end |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
165 |
end |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
166 |
stanza.attr.to = nil; -- reset it |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
167 |
else |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
168 |
-- TODO error, bad type |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
169 |
end |
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
170 |
end -- TODO handle other stanzas |
145 | 171 |
else |
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
172 |
log("warn", "Unhandled origin: %s", origin.type); -- FIXME reply with error |
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
173 |
end |
30 | 174 |
end |
175 |
||
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
176 |
function send_presence_of_available_resources(user, host, jid, recipient_session) |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
177 |
local h = hosts[host]; |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
178 |
local count = 0; |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
179 |
if h and h.type == "local" then |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
180 |
local u = h.sessions[user]; |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
181 |
if u then |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
182 |
for k, session in pairs(u.sessions) do |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
183 |
local pres = session.presence; |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
184 |
if pres then |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
185 |
pres.attr.to = jid; |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
186 |
pres.attr.from = session.full_jid; |
186
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
178
diff
changeset
|
187 |
recipient_session.send(pres); |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
188 |
pres.attr.to = nil; |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
189 |
pres.attr.from = nil; |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
190 |
count = count + 1; |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
191 |
end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
192 |
end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
193 |
end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
194 |
end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
195 |
return count; |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
196 |
end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
197 |
|
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
198 |
function handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare) |
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
199 |
local node, host = jid_split(from_bare); |
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
200 |
local st_from, st_to = stanza.attr.from, stanza.attr.to; |
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
201 |
stanza.attr.from, stanza.attr.to = from_bare, to_bare; |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
202 |
if stanza.attr.type == "subscribe" then |
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
203 |
log("debug", "outbound subscribe from "..from_bare.." for "..to_bare); |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
204 |
-- 1. route stanza |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
205 |
-- 2. roster push (subscription = none, ask = subscribe) |
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
206 |
if rostermanager.set_contact_pending_out(node, host, to_bare) then |
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
207 |
rostermanager.roster_push(node, host, to_bare); |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
208 |
end -- else file error |
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
209 |
core_route_stanza(origin, stanza); |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
210 |
elseif stanza.attr.type == "unsubscribe" then |
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
211 |
log("debug", "outbound unsubscribe from "..from_bare.." for "..to_bare); |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
212 |
-- 1. route stanza |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
213 |
-- 2. roster push (subscription = none or from) |
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
214 |
if rostermanager.unsubscribe(node, host, to_bare) then |
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
215 |
rostermanager.roster_push(node, host, to_bare); -- FIXME do roster push when roster has in fact not changed? |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
216 |
end -- else file error |
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
217 |
core_route_stanza(origin, stanza); |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
218 |
elseif stanza.attr.type == "subscribed" then |
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
219 |
log("debug", "outbound subscribed from "..from_bare.." for "..to_bare); |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
220 |
-- 1. route stanza |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
221 |
-- 2. roster_push () |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
222 |
-- 3. send_presence_of_available_resources |
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
223 |
if rostermanager.subscribed(node, host, to_bare) then |
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
224 |
rostermanager.roster_push(node, host, to_bare); |
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
225 |
core_route_stanza(origin, stanza); |
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
226 |
send_presence_of_available_resources(node, host, to_bare, origin); |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
227 |
end |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
228 |
elseif stanza.attr.type == "unsubscribed" then |
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
229 |
log("debug", "outbound unsubscribed from "..from_bare.." for "..to_bare); |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
230 |
-- 1. route stanza |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
231 |
-- 2. roster push (subscription = none or to) |
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
232 |
if rostermanager.unsubscribed(node, host, to_bare) then |
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
233 |
rostermanager.roster_push(node, host, to_bare); |
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
234 |
core_route_stanza(origin, stanza); |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
235 |
end |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
236 |
end |
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
237 |
stanza.attr.from, stanza.attr.to = st_from, st_to; |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
238 |
end |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
239 |
|
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
240 |
function handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare) |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
241 |
local node, host = jid_split(to_bare); |
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
242 |
local st_from, st_to = stanza.attr.from, stanza.attr.to; |
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
243 |
stanza.attr.from, stanza.attr.to = from_bare, to_bare; |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
244 |
if stanza.attr.type == "probe" then |
200
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
245 |
log("debug", "inbound probe from "..from_bare.." for "..to_bare); |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
246 |
if rostermanager.is_contact_subscribed(node, host, from_bare) then |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
247 |
if 0 == send_presence_of_available_resources(node, host, from_bare, origin) then |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
248 |
-- TODO send last recieved unavailable presence (or we MAY do nothing, which is fine too) |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
249 |
end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
250 |
else |
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
251 |
core_route_stanza(origin, st.presence({from=to_bare, to=from_bare, type="unsubscribed"})); |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
252 |
end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
253 |
elseif stanza.attr.type == "subscribe" then |
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
254 |
log("debug", "inbound subscribe from "..from_bare.." for "..to_bare); |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
255 |
if rostermanager.is_contact_subscribed(node, host, from_bare) then |
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
256 |
core_route_stanza(origin, st.presence({from=to_bare, to=from_bare, type="subscribed"})); -- already subscribed |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
257 |
else |
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
258 |
if not rostermanager.is_contact_pending_in(node, host, from_bare) then |
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
259 |
if rostermanager.set_contact_pending_in(node, host, from_bare) then |
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
260 |
sessionmanager.send_to_available_resources(node, host, stanza); |
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
261 |
end -- TODO else return error, unable to save |
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
262 |
end |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
263 |
end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
264 |
elseif stanza.attr.type == "unsubscribe" then |
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
265 |
log("debug", "inbound unsubscribe from "..from_bare.." for "..to_bare); |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
266 |
if rostermanager.process_inbound_unsubscribe(node, host, from_bare) then |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
267 |
rostermanager.roster_push(node, host, from_bare); |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
268 |
end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
269 |
elseif stanza.attr.type == "subscribed" then |
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
270 |
log("debug", "inbound subscribed from "..from_bare.." for "..to_bare); |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
271 |
if rostermanager.process_inbound_subscription_approval(node, host, from_bare) then |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
272 |
rostermanager.roster_push(node, host, from_bare); |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
273 |
end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
274 |
elseif stanza.attr.type == "unsubscribed" then |
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
275 |
log("debug", "inbound unsubscribed from "..from_bare.." for "..to_bare); |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
276 |
if rostermanager.process_inbound_subscription_approval(node, host, from_bare) then |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
277 |
rostermanager.roster_push(node, host, from_bare); |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
278 |
end |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
279 |
end -- discard any other type |
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
280 |
stanza.attr.from, stanza.attr.to = st_from, st_to; |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
281 |
end |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
282 |
|
30 | 283 |
function core_route_stanza(origin, stanza) |
284 |
-- Hooks |
|
68
ceb7a55676a4
Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
285 |
--- ...later |
207 | 286 |
|
30 | 287 |
-- Deliver |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
288 |
local to = stanza.attr.to; |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
289 |
local node, host, resource = jid_split(to); |
170 | 290 |
local to_bare = node and (node.."@"..host) or host; -- bare JID |
291 |
local from = stanza.attr.from; |
|
292 |
local from_node, from_host, from_resource = jid_split(from); |
|
293 |
local from_bare = from_node and (from_node.."@"..from_host) or from_host; -- bare JID |
|
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
294 |
|
151 | 295 |
if stanza.name == "presence" and (stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable") then resource = nil; end |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
296 |
|
68
ceb7a55676a4
Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
297 |
local host_session = hosts[host] |
ceb7a55676a4
Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
298 |
if host_session and host_session.type == "local" then |
ceb7a55676a4
Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
299 |
-- Local host |
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
300 |
local user = host_session.sessions[node]; |
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
301 |
if user then |
72 | 302 |
local res = user.sessions[resource]; |
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
303 |
if not res then |
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
304 |
-- if we get here, resource was not specified or was unavailable |
106
f2a3d204a76a
Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents:
105
diff
changeset
|
305 |
if stanza.name == "presence" then |
151 | 306 |
if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
307 |
handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare); |
151 | 308 |
else -- sender is available or unavailable |
200
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
309 |
for _, session in pairs(user.sessions) do -- presence broadcast to all user resources. |
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
310 |
if session.full_jid then -- FIXME should this be just for available resources? Do we need to check subscription? |
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
311 |
stanza.attr.to = session.full_jid; -- reset at the end of function |
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
312 |
session.send(stanza); |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
313 |
end |
106
f2a3d204a76a
Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents:
105
diff
changeset
|
314 |
end |
f2a3d204a76a
Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents:
105
diff
changeset
|
315 |
end |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
316 |
elseif stanza.name == "message" then -- select a resource to recieve message |
200
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
317 |
local priority = 0; |
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
318 |
local recipients = {}; |
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
319 |
for _, session in pairs(user.sessions) do -- find resource with greatest priority |
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
320 |
local p = session.priority; |
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
321 |
if p > priority then |
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
322 |
priority = p; |
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
323 |
recipients = {session}; |
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
324 |
elseif p == priority then |
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
325 |
t_insert(recipients, session); |
106
f2a3d204a76a
Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents:
105
diff
changeset
|
326 |
end |
f2a3d204a76a
Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents:
105
diff
changeset
|
327 |
end |
200
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
328 |
for _, session in pairs(recipient) do |
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
329 |
session.send(stanza); |
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
330 |
end |
106
f2a3d204a76a
Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents:
105
diff
changeset
|
331 |
else |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
332 |
-- TODO send IQ error |
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
333 |
end |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
334 |
else |
121
74e5919e4737
Added a comment, removed all the old code
Matthew Wild <mwild1@gmail.com>
parents:
119
diff
changeset
|
335 |
-- User + resource is online... |
170 | 336 |
stanza.attr.to = res.full_jid; -- reset at the end of function |
186
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
178
diff
changeset
|
337 |
res.send(stanza); -- Yay \o/ |
106
f2a3d204a76a
Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents:
105
diff
changeset
|
338 |
end |
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
339 |
else |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
340 |
-- user not online |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
341 |
if user_exists(node, host) then |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
342 |
if stanza.name == "presence" then |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
343 |
if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then |
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
344 |
handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare); |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
345 |
else |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
346 |
-- TODO send unavailable presence or unsubscribed |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
347 |
end |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
348 |
elseif stanza.name == "message" then |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
349 |
-- TODO send message error, or store offline messages |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
350 |
elseif stanza.name == "iq" then |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
351 |
-- TODO send IQ error |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
352 |
end |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
353 |
else -- user does not exist |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
354 |
-- TODO we would get here for nodeless JIDs too. Do something fun maybe? Echo service? Let plugins use xmpp:server/resource addresses? |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
355 |
if stanza.name == "presence" then |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
356 |
if stanza.attr.type == "probe" then |
186
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
178
diff
changeset
|
357 |
origin.send(st.presence({from = to_bare, to = from_bare, type = "unsubscribed"})); |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
358 |
end |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
359 |
-- else ignore |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
360 |
else |
186
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
178
diff
changeset
|
361 |
origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
362 |
end |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
363 |
end |
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
364 |
end |
148 | 365 |
elseif origin.type == "c2s" then |
68
ceb7a55676a4
Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
366 |
-- Remote host |
170 | 367 |
local xmlns = stanza.attr.xmlns; |
148 | 368 |
--stanza.attr.xmlns = "jabber:server"; |
369 |
stanza.attr.xmlns = nil; |
|
146 | 370 |
log("debug", "sending s2s stanza: %s", tostring(stanza)); |
170 | 371 |
send_s2s(origin.host, host, stanza); -- TODO handle remote routing errors |
372 |
stanza.attr.xmlns = xmlns; -- reset |
|
210
e679487e2fa4
Part 2 of internal components. Should have mentioned that the previous commit was from waqas, this one from me.
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
373 |
elseif origin.type == "component" or origin.type == "local" then |
e679487e2fa4
Part 2 of internal components. Should have mentioned that the previous commit was from waqas, this one from me.
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
374 |
-- Route via s2s for components and modules |
e679487e2fa4
Part 2 of internal components. Should have mentioned that the previous commit was from waqas, this one from me.
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
375 |
log("debug", "Routing outgoing stanza for %s to %s", origin.host, host); |
e679487e2fa4
Part 2 of internal components. Should have mentioned that the previous commit was from waqas, this one from me.
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
376 |
for k,v in pairs(origin) do print("origin:", tostring(k), tostring(v)); end |
e679487e2fa4
Part 2 of internal components. Should have mentioned that the previous commit was from waqas, this one from me.
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
377 |
print(tostring(host), tostring(from_host)) |
e679487e2fa4
Part 2 of internal components. Should have mentioned that the previous commit was from waqas, this one from me.
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
378 |
send_s2s(origin.host, host, stanza); |
148 | 379 |
else |
380 |
log("warn", "received stanza from unhandled connection type: %s", origin.type); |
|
68
ceb7a55676a4
Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
381 |
end |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
382 |
stanza.attr.to = to; -- reset |
30 | 383 |
end |
384 |
||
385 |
function handle_stanza_toremote(stanza) |
|
386 |
log("error", "Stanza bound for remote host, but s2s is not implemented"); |
|
387 |
end |
|
210
e679487e2fa4
Part 2 of internal components. Should have mentioned that the previous commit was from waqas, this one from me.
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
388 |
|
e679487e2fa4
Part 2 of internal components. Should have mentioned that the previous commit was from waqas, this one from me.
Matthew Wild <mwild1@gmail.com>
parents:
209
diff
changeset
|
389 |