Software / code / prosody
Annotate
core/stanza_router.lua @ 262:8c73fb2ff4a2
A treat for Linux users ;)
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 14 Nov 2008 16:03:33 +0000 |
| parent | 257:762274c98040 |
| child | 264:a296b61baad8 |
| rev | line source |
|---|---|
| 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"; |
|
249
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
16 local offlinemanager = require "core.offlinemanager"; |
|
171
28f420d057a0
Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents:
170
diff
changeset
|
17 |
| 145 | 18 local s2s_verify_dialback = require "core.s2smanager".verify_dialback; |
| 146 | 19 local s2s_make_authenticated = require "core.s2smanager".make_authenticated; |
| 191 | 20 |
| 21 local modules_handle_stanza = require "core.modulemanager".handle_stanza; | |
|
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
22 local component_handle_stanza = require "core.componentmanager".handle_stanza; |
| 191 | 23 |
| 145 | 24 local format = string.format; |
| 25 local tostring = tostring; | |
|
199
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
26 local t_concat = table.concat; |
|
200
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
27 local t_insert = table.insert; |
|
199
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
28 local tonumber = tonumber; |
|
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
29 local s_find = string.find; |
| 145 | 30 |
|
105
b099f0f80775
Removed an unnecessary line
Waqas Hussain <waqas20@gmail.com>
parents:
83
diff
changeset
|
31 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
|
32 local print = print; |
| 30 | 33 |
| 34 function core_process_stanza(origin, stanza) | |
| 262 | 35 log("debug", "Received[%s]: %s", origin.type, stanza:pretty_top_tag()) |
|
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
36 |
|
234
7c8313e055fb
Hack to allow s2s stanzas to work until we do proper namespace handling
Waqas Hussain <waqas20@gmail.com>
parents:
223
diff
changeset
|
37 if not stanza.attr.xmlns then stanza.attr.xmlns = "jabber:client"; end -- FIXME Hack. This should be removed when we fix namespace handling. |
| 73 | 38 -- 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
|
39 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
|
40 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
|
41 error("Invalid IQ"); |
| 148 | 42 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
|
43 error("Invalid IQ"); |
|
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
44 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
|
45 end |
|
78
972e31cc91e8
Fized: Added check to ensure that resource binding is done after auth.
Waqas Hussain <waqas20@gmail.com>
parents:
73
diff
changeset
|
46 |
|
972e31cc91e8
Fized: Added check to ensure that resource binding is done after auth.
Waqas Hussain <waqas20@gmail.com>
parents:
73
diff
changeset
|
47 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
|
48 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
|
49 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
|
50 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
|
51 end |
|
972e31cc91e8
Fized: Added check to ensure that resource binding is done after auth.
Waqas Hussain <waqas20@gmail.com>
parents:
73
diff
changeset
|
52 |
|
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
53 -- TODO also, stazas should be returned to their original state before the function ends |
| 145 | 54 if origin.type == "c2s" then |
|
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
55 stanza.attr.from = origin.full_jid; |
|
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
56 end |
|
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
57 local to = stanza.attr.to; |
|
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
58 local node, host, resource = jid_split(to); |
|
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
59 local to_bare = node and (node.."@"..host) or host; -- bare JID |
|
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
60 local from = stanza.attr.from; |
|
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
61 local from_node, from_host, from_resource = jid_split(from); |
|
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
62 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
|
63 |
|
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
64 if origin.type == "s2sin" then |
|
209
e9de0803676d
Part one of internal component support
Matthew Wild <mwild1@gmail.com>
parents:
207
diff
changeset
|
65 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
|
66 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
|
67 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
|
68 end |
|
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
69 end |
| 213 | 70 --[[if to and not(hosts[to]) and not(hosts[to_bare]) and (hosts[host] and hosts[host].type ~= "local") then -- not for us? |
| 71 log("warn", "stanza recieved for a non-local server"); | |
|
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
72 return; -- FIXME what should we do here? |
| 213 | 73 end]] -- FIXME |
| 207 | 74 |
|
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
75 -- FIXME do stanzas not of jabber:client get handled by components? |
|
222
6153462397d8
Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
221
diff
changeset
|
76 if origin.type == "s2sin" or origin.type == "c2s" then |
|
6153462397d8
Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
221
diff
changeset
|
77 if not to then |
|
6153462397d8
Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
221
diff
changeset
|
78 core_handle_stanza(origin, stanza); |
|
6153462397d8
Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
221
diff
changeset
|
79 elseif hosts[to] and hosts[to].type == "local" then -- directed at a local server |
|
6153462397d8
Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
221
diff
changeset
|
80 core_handle_stanza(origin, stanza); |
|
6153462397d8
Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
221
diff
changeset
|
81 elseif stanza.attr.xmlns and stanza.attr.xmlns ~= "jabber:client" and stanza.attr.xmlns ~= "jabber:server" then |
|
6153462397d8
Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
221
diff
changeset
|
82 modules_handle_stanza(origin, stanza); |
|
6153462397d8
Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
221
diff
changeset
|
83 elseif hosts[to_bare] and hosts[to_bare].type == "component" then -- hack to allow components to handle node@server |
|
6153462397d8
Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
221
diff
changeset
|
84 component_handle_stanza(origin, stanza); |
|
6153462397d8
Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
221
diff
changeset
|
85 elseif hosts[to] and hosts[to].type == "component" then -- hack to allow components to handle node@server/resource and server/resource |
|
6153462397d8
Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
221
diff
changeset
|
86 component_handle_stanza(origin, stanza); |
|
6153462397d8
Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
221
diff
changeset
|
87 elseif hosts[host] and hosts[host].type == "component" then -- directed at a component |
|
6153462397d8
Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
221
diff
changeset
|
88 component_handle_stanza(origin, stanza); |
|
6153462397d8
Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
221
diff
changeset
|
89 elseif origin.type == "c2s" and stanza.name == "presence" and stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then |
|
6153462397d8
Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
221
diff
changeset
|
90 handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare); |
|
6153462397d8
Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
221
diff
changeset
|
91 elseif stanza.name == "iq" and not resource then -- directed at bare JID |
|
6153462397d8
Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
221
diff
changeset
|
92 core_handle_stanza(origin, stanza); |
|
6153462397d8
Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
221
diff
changeset
|
93 else |
|
6153462397d8
Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
221
diff
changeset
|
94 core_route_stanza(origin, stanza); |
|
6153462397d8
Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
221
diff
changeset
|
95 end |
|
6153462397d8
Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
221
diff
changeset
|
96 else |
|
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
97 core_handle_stanza(origin, stanza); |
|
119
b48a573608e8
Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents:
113
diff
changeset
|
98 end |
|
b48a573608e8
Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents:
113
diff
changeset
|
99 end |
|
b48a573608e8
Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents:
113
diff
changeset
|
100 |
|
121
74e5919e4737
Added a comment, removed all the old code
Matthew Wild <mwild1@gmail.com>
parents:
119
diff
changeset
|
101 -- 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
|
102 -- 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
|
103 function core_handle_stanza(origin, stanza) |
|
b48a573608e8
Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents:
113
diff
changeset
|
104 -- Handlers |
| 191 | 105 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
|
106 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
|
107 local session = origin; |
| 207 | 108 |
|
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
109 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
|
110 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
|
111 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
|
112 local subscription = origin.roster[jid].subscription; |
|
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
113 if subscription == "both" or subscription == "from" then |
|
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
114 stanza.attr.to = jid; |
|
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
115 core_route_stanza(origin, stanza); |
|
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
116 end |
|
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
117 end |
| 151 | 118 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
|
119 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
|
120 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
|
121 stanza.attr.to = res.full_jid; |
|
6b8e2bd82ac5
Moved some code and removed unnecessary checks.
Waqas Hussain <waqas20@gmail.com>
parents:
151
diff
changeset
|
122 core_route_stanza(origin, stanza); |
|
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
123 end |
| 151 | 124 end |
|
199
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
125 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
|
126 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
|
127 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
|
128 local subscription = origin.roster[jid].subscription; |
|
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
129 if subscription == "both" or subscription == "to" then |
|
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
130 probe.attr.to = jid; |
|
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
131 core_route_stanza(origin, probe); |
|
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
132 end |
|
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
133 end |
|
199
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
134 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
|
135 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
|
136 res.presence.attr.to = origin.full_jid; |
|
6b8e2bd82ac5
Moved some code and removed unnecessary checks.
Waqas Hussain <waqas20@gmail.com>
parents:
151
diff
changeset
|
137 core_route_stanza(res, res.presence); |
|
6b8e2bd82ac5
Moved some code and removed unnecessary checks.
Waqas Hussain <waqas20@gmail.com>
parents:
151
diff
changeset
|
138 res.presence.attr.to = nil; |
|
6b8e2bd82ac5
Moved some code and removed unnecessary checks.
Waqas Hussain <waqas20@gmail.com>
parents:
151
diff
changeset
|
139 end |
|
6b8e2bd82ac5
Moved some code and removed unnecessary checks.
Waqas Hussain <waqas20@gmail.com>
parents:
151
diff
changeset
|
140 end |
|
199
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
141 if origin.roster.pending then -- resend incoming subscription requests |
|
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
142 for jid in pairs(origin.roster.pending) do |
|
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
143 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
|
144 end |
|
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
145 end |
|
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
146 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
|
147 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
|
148 if item.ask then |
|
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
149 request.attr.to = jid; |
|
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
150 core_route_stanza(origin, request); |
|
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
151 end |
|
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
152 end |
|
249
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
153 for _, msg in ipairs(offlinemanager.load(node, host) or {}) do |
|
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
154 origin.send(msg); -- FIXME do we need to modify to/from in any way? |
|
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
155 end |
|
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
156 offlinemanager.deleteAll(node, host); |
|
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
157 end |
|
199
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
158 origin.priority = 0; |
|
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
159 if stanza.attr.type == "unavailable" then |
|
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
160 origin.presence = nil; |
|
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
161 else |
|
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
162 origin.presence = stanza; |
|
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
163 local priority = stanza:child_with_name("priority"); |
|
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
164 if priority and #priority > 0 then |
|
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
165 priority = t_concat(priority); |
|
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
166 if s_find(priority, "^[+-]?[0-9]+$") then |
|
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
167 priority = tonumber(priority); |
|
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
168 if priority < -128 then priority = -128 end |
|
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
169 if priority > 127 then priority = 127 end |
|
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
170 origin.priority = priority; |
|
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
171 end |
|
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
172 end |
|
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
173 end |
|
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
174 stanza.attr.to = nil; -- reset it |
|
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
175 else |
|
250
9f66ede8deeb
Added error replies for unhandled stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
249
diff
changeset
|
176 log("warn", "Unhandled c2s presence: %s", tostring(stanza)); |
|
9f66ede8deeb
Added error replies for unhandled stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
249
diff
changeset
|
177 origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); -- FIXME correct error? |
|
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
178 end |
|
250
9f66ede8deeb
Added error replies for unhandled stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
249
diff
changeset
|
179 else |
|
9f66ede8deeb
Added error replies for unhandled stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
249
diff
changeset
|
180 log("warn", "Unhandled c2s stanza: %s", tostring(stanza)); |
|
9f66ede8deeb
Added error replies for unhandled stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
249
diff
changeset
|
181 origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); -- FIXME correct error? |
|
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
182 end -- TODO handle other stanzas |
| 145 | 183 else |
|
250
9f66ede8deeb
Added error replies for unhandled stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
249
diff
changeset
|
184 log("warn", "Unhandled origin: %s", origin.type); |
|
257
762274c98040
I knew it ;) Fix sending error replies over s2s (though we shouldn't be error'ing on stream:features anyway)
Matthew Wild <mwild1@gmail.com>
parents:
250
diff
changeset
|
185 -- s2s stanzas can get here |
|
762274c98040
I knew it ;) Fix sending error replies over s2s (though we shouldn't be error'ing on stream:features anyway)
Matthew Wild <mwild1@gmail.com>
parents:
250
diff
changeset
|
186 (origin.sends2s or origin.send)(st.error_reply(stanza, "cancel", "service-unavailable")); -- FIXME correct error? |
|
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
187 end |
| 30 | 188 end |
| 189 | |
|
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
190 function send_presence_of_available_resources(user, host, jid, recipient_session) |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
191 local h = hosts[host]; |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
192 local count = 0; |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
193 if h and h.type == "local" then |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
194 local u = h.sessions[user]; |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
195 if u then |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
196 for k, session in pairs(u.sessions) do |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
197 local pres = session.presence; |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
198 if pres then |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
199 pres.attr.to = jid; |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
200 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
|
201 recipient_session.send(pres); |
|
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
202 pres.attr.to = nil; |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
203 pres.attr.from = nil; |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
204 count = count + 1; |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
205 end |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
206 end |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
207 end |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
208 end |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
209 return count; |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
210 end |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
211 |
|
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
212 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
|
213 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
|
214 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
|
215 stanza.attr.from, stanza.attr.to = from_bare, to_bare; |
|
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
216 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
|
217 log("debug", "outbound subscribe from "..from_bare.." for "..to_bare); |
|
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
218 -- 1. route stanza |
|
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
219 -- 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
|
220 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
|
221 rostermanager.roster_push(node, host, to_bare); |
|
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
222 end -- else file error |
|
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
223 core_route_stanza(origin, stanza); |
|
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
224 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
|
225 log("debug", "outbound unsubscribe from "..from_bare.." for "..to_bare); |
|
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
226 -- 1. route stanza |
|
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
227 -- 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
|
228 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
|
229 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
|
230 end -- else file error |
|
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
231 core_route_stanza(origin, stanza); |
|
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
232 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
|
233 log("debug", "outbound subscribed from "..from_bare.." for "..to_bare); |
|
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
234 -- 1. route stanza |
|
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
235 -- 2. roster_push () |
|
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
236 -- 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
|
237 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
|
238 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
|
239 core_route_stanza(origin, stanza); |
|
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
240 send_presence_of_available_resources(node, host, to_bare, origin); |
|
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
241 end |
|
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
242 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
|
243 log("debug", "outbound unsubscribed from "..from_bare.." for "..to_bare); |
|
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
244 -- 1. route stanza |
|
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
245 -- 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
|
246 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
|
247 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
|
248 core_route_stanza(origin, stanza); |
|
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
249 end |
|
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
250 end |
|
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
251 stanza.attr.from, stanza.attr.to = st_from, st_to; |
|
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
252 end |
|
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
253 |
|
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
254 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
|
255 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
|
256 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
|
257 stanza.attr.from, stanza.attr.to = from_bare, to_bare; |
|
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
258 if stanza.attr.type == "probe" then |
|
200
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
259 log("debug", "inbound probe from "..from_bare.." for "..to_bare); |
|
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
260 if rostermanager.is_contact_subscribed(node, host, from_bare) then |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
261 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
|
262 -- 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
|
263 end |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
264 else |
|
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
265 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
|
266 end |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
267 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
|
268 log("debug", "inbound subscribe from "..from_bare.." for "..to_bare); |
|
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
269 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
|
270 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
|
271 else |
|
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
272 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
|
273 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
|
274 sessionmanager.send_to_available_resources(node, host, stanza); |
|
176
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
275 end -- TODO else return error, unable to save |
|
e5cd2a03891d
Outbound presence subscription
Waqas Hussain <waqas20@gmail.com>
parents:
175
diff
changeset
|
276 end |
|
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
277 end |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
278 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
|
279 log("debug", "inbound unsubscribe from "..from_bare.." for "..to_bare); |
|
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
280 if rostermanager.process_inbound_unsubscribe(node, host, from_bare) then |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
281 rostermanager.roster_push(node, host, from_bare); |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
282 end |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
283 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
|
284 log("debug", "inbound subscribed from "..from_bare.." for "..to_bare); |
|
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
285 if rostermanager.process_inbound_subscription_approval(node, host, from_bare) then |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
286 rostermanager.roster_push(node, host, from_bare); |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
287 end |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
288 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
|
289 log("debug", "inbound unsubscribed from "..from_bare.." for "..to_bare); |
|
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
290 if rostermanager.process_inbound_subscription_approval(node, host, from_bare) then |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
291 rostermanager.roster_push(node, host, from_bare); |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
292 end |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
293 end -- discard any other type |
|
177
606c433955e7
Bug fixes and checks for presence subscriptions, etc
Waqas Hussain <waqas20@gmail.com>
parents:
176
diff
changeset
|
294 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
|
295 end |
|
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
296 |
| 30 | 297 function core_route_stanza(origin, stanza) |
| 298 -- Hooks | |
|
68
ceb7a55676a4
Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
299 --- ...later |
| 207 | 300 |
| 30 | 301 -- Deliver |
|
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
302 local to = stanza.attr.to; |
|
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
303 local node, host, resource = jid_split(to); |
| 170 | 304 local to_bare = node and (node.."@"..host) or host; -- bare JID |
| 305 local from = stanza.attr.from; | |
| 306 local from_node, from_host, from_resource = jid_split(from); | |
| 307 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
|
308 |
| 151 | 309 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
|
310 |
|
68
ceb7a55676a4
Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
311 local host_session = hosts[host] |
|
ceb7a55676a4
Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
312 if host_session and host_session.type == "local" then |
|
ceb7a55676a4
Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
313 -- Local host |
|
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
314 local user = host_session.sessions[node]; |
|
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
315 if user then |
| 72 | 316 local res = user.sessions[resource]; |
|
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
317 if not res then |
|
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
318 -- 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
|
319 if stanza.name == "presence" then |
| 151 | 320 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
|
321 handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare); |
| 151 | 322 else -- sender is available or unavailable |
|
200
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
323 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
|
324 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
|
325 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
|
326 session.send(stanza); |
|
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
327 end |
|
106
f2a3d204a76a
Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents:
105
diff
changeset
|
328 end |
|
f2a3d204a76a
Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents:
105
diff
changeset
|
329 end |
|
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
330 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
|
331 local priority = 0; |
|
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
332 local recipients = {}; |
|
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
333 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
|
334 local p = session.priority; |
|
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
335 if p > priority then |
|
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
336 priority = p; |
|
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
337 recipients = {session}; |
|
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
338 elseif p == priority then |
|
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
339 t_insert(recipients, session); |
|
106
f2a3d204a76a
Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents:
105
diff
changeset
|
340 end |
|
f2a3d204a76a
Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents:
105
diff
changeset
|
341 end |
|
249
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
342 local count = 0; |
| 237 | 343 for _, session in pairs(recipients) do |
|
200
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
344 session.send(stanza); |
|
249
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
345 count = count + 1; |
|
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
346 end |
|
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
347 if count == 0 then |
|
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
348 offlinemanager.store(node, host, stanza); |
|
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
349 -- TODO deal with storage errors |
|
200
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
350 end |
|
106
f2a3d204a76a
Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents:
105
diff
changeset
|
351 else |
|
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
352 -- TODO send IQ error |
|
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
353 end |
|
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
354 else |
|
121
74e5919e4737
Added a comment, removed all the old code
Matthew Wild <mwild1@gmail.com>
parents:
119
diff
changeset
|
355 -- User + resource is online... |
| 170 | 356 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
|
357 res.send(stanza); -- Yay \o/ |
|
106
f2a3d204a76a
Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents:
105
diff
changeset
|
358 end |
|
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
359 else |
|
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
360 -- user not online |
|
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
361 if user_exists(node, host) then |
|
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
362 if stanza.name == "presence" then |
|
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
363 if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then |
|
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
364 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
|
365 else |
|
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
366 -- TODO send unavailable presence or unsubscribed |
|
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
367 end |
|
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
368 elseif stanza.name == "message" then |
|
249
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
369 if stanza.attr.type == "chat" or stanza.attr.type == "normal" or not stanza.attr.type then |
|
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
370 offlinemanager.store(node, host, stanza); |
|
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
371 -- FIXME don't store messages with only chat state notifications |
|
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
372 end |
|
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
373 -- TODO allow configuration of offline storage |
|
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
374 -- TODO send error if not storing offline |
|
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
375 elseif stanza.name == "iq" then |
|
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
376 -- TODO send IQ error |
|
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
377 end |
|
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
378 else -- user does not exist |
|
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
379 -- 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
|
380 if stanza.name == "presence" then |
|
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
381 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
|
382 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
|
383 end |
|
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
384 -- else ignore |
|
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
385 else |
|
186
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
178
diff
changeset
|
386 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
|
387 end |
|
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
388 end |
|
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
389 end |
| 148 | 390 elseif origin.type == "c2s" then |
|
68
ceb7a55676a4
Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
391 -- Remote host |
| 170 | 392 local xmlns = stanza.attr.xmlns; |
| 148 | 393 --stanza.attr.xmlns = "jabber:server"; |
| 394 stanza.attr.xmlns = nil; | |
| 146 | 395 log("debug", "sending s2s stanza: %s", tostring(stanza)); |
| 170 | 396 send_s2s(origin.host, host, stanza); -- TODO handle remote routing errors |
| 397 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
|
398 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
|
399 -- 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
|
400 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
|
401 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
|
402 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
|
403 send_s2s(origin.host, host, stanza); |
| 148 | 404 else |
| 405 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
|
406 end |
|
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
407 stanza.attr.to = to; -- reset |
| 30 | 408 end |
| 409 | |
| 410 function handle_stanza_toremote(stanza) | |
| 411 log("error", "Stanza bound for remote host, but s2s is not implemented"); | |
| 412 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
|
413 |
|
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
|
414 |
