Software /
code /
prosody
Annotate
core/stanza_router.lua @ 1167:5620ea24be94
stanza_router: Removed global function core_handle_stanza
author | Waqas Hussain <waqas20@gmail.com> |
---|---|
date | Sat, 16 May 2009 01:41:45 +0500 |
parent | 1165:ec69bcc7ceb5 |
child | 1168:dd523bfc9ea9 |
rev | line source |
---|---|
896 | 1 -- Prosody IM v0.4 |
760
90ce865eebd8
Update copyright notices for 2009
Matthew Wild <mwild1@gmail.com>
parents:
759
diff
changeset
|
2 -- Copyright (C) 2008-2009 Matthew Wild |
90ce865eebd8
Update copyright notices for 2009
Matthew Wild <mwild1@gmail.com>
parents:
759
diff
changeset
|
3 -- Copyright (C) 2008-2009 Waqas Hussain |
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
468
diff
changeset
|
4 -- |
758 | 5 -- This project is MIT/X11 licensed. Please see the |
6 -- COPYING file in the source package for more information. | |
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
468
diff
changeset
|
7 -- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
468
diff
changeset
|
8 |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
468
diff
changeset
|
9 |
30 | 10 |
11 local log = require "util.logger".init("stanzarouter") | |
12 | |
1043
ad87f555b484
stanzarouter: Make _G.hosts local
Matthew Wild <mwild1@gmail.com>
parents:
1011
diff
changeset
|
13 local hosts = _G.hosts; |
ad87f555b484
stanzarouter: Make _G.hosts local
Matthew Wild <mwild1@gmail.com>
parents:
1011
diff
changeset
|
14 |
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
15 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
|
16 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
|
17 local user_exists = require "core.usermanager".user_exists; |
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
18 |
171
28f420d057a0
Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents:
170
diff
changeset
|
19 local rostermanager = require "core.rostermanager"; |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
20 local sessionmanager = require "core.sessionmanager"; |
249
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
21 local offlinemanager = require "core.offlinemanager"; |
171
28f420d057a0
Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents:
170
diff
changeset
|
22 |
145 | 23 local s2s_verify_dialback = require "core.s2smanager".verify_dialback; |
146 | 24 local s2s_make_authenticated = require "core.s2smanager".make_authenticated; |
191 | 25 |
26 local modules_handle_stanza = require "core.modulemanager".handle_stanza; | |
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
27 local component_handle_stanza = require "core.componentmanager".handle_stanza; |
191 | 28 |
1011
beb039827c9f
Stopped using presencemanager in stanza_router
Waqas Hussain <waqas20@gmail.com>
parents:
1008
diff
changeset
|
29 local handle_outbound_presence_subscriptions_and_probes = function()end;--require "core.presencemanager".handle_outbound_presence_subscriptions_and_probes; |
beb039827c9f
Stopped using presencemanager in stanza_router
Waqas Hussain <waqas20@gmail.com>
parents:
1008
diff
changeset
|
30 local handle_inbound_presence_subscriptions_and_probes = function()end;--require "core.presencemanager".handle_inbound_presence_subscriptions_and_probes; |
beb039827c9f
Stopped using presencemanager in stanza_router
Waqas Hussain <waqas20@gmail.com>
parents:
1008
diff
changeset
|
31 local handle_normal_presence = function()end;--require "core.presencemanager".handle_normal_presence; |
321
31fe15ce6fac
Moved presence subscription code from stanza_router to presencemanager
Waqas Hussain <waqas20@gmail.com>
parents:
274
diff
changeset
|
32 |
145 | 33 local format = string.format; |
34 local tostring = tostring; | |
199
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
35 local t_concat = table.concat; |
200
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
36 local t_insert = table.insert; |
199
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
37 local tonumber = tonumber; |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
38 local s_find = string.find; |
783
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
39 local pairs = pairs; |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
40 local ipairs = ipairs; |
145 | 41 |
105
b099f0f80775
Removed an unnecessary line
Waqas Hussain <waqas20@gmail.com>
parents:
83
diff
changeset
|
42 local jid_split = require "util.jid".split; |
718 | 43 local jid_prepped_split = require "util.jid".prepped_split; |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
44 local print = print; |
1008
da7691ebec9c
core/eventmanager2 - new event manager
Waqas Hussain <waqas20@gmail.com>
parents:
967
diff
changeset
|
45 local fire_event = require "core.eventmanager2".fire_event; |
30 | 46 |
47 function core_process_stanza(origin, stanza) | |
726
68a776711ba9
stanza_router: That'll teach me to not commit at this time of night. Or not.
Matthew Wild <mwild1@gmail.com>
parents:
725
diff
changeset
|
48 (origin.log or log)("debug", "Received[%s]: %s", origin.type, stanza:top_tag()) |
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
49 |
234
7c8313e055fb
Hack to allow s2s stanzas to work until we do proper namespace handling
Waqas Hussain <waqas20@gmail.com>
parents:
223
diff
changeset
|
50 if not stanza.attr.xmlns then stanza.attr.xmlns = "jabber:client"; end -- FIXME Hack. This should be removed when we fix namespace handling. |
73 | 51 -- TODO verify validity of stanza (as well as JID validity) |
1152
4d95e8078405
stanza_router: Fixed an invalid stanza check
Waqas Hussain <waqas20@gmail.com>
parents:
1149
diff
changeset
|
52 if stanza.attr.type == "error" and #stanza.tags == 0 then return; end -- TODO invalid stanza, log |
924
db022135aed4
Fixed: stanza_router: Respond with correct stanza error on malformed stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
898
diff
changeset
|
53 if stanza.name == "iq" then |
db022135aed4
Fixed: stanza_router: Respond with correct stanza error on malformed stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
898
diff
changeset
|
54 if (stanza.attr.type == "set" or stanza.attr.type == "get") and #stanza.tags ~= 1 then |
db022135aed4
Fixed: stanza_router: Respond with correct stanza error on malformed stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
898
diff
changeset
|
55 origin.send(st.error_reply(stanza, "modify", "bad-request")); |
db022135aed4
Fixed: stanza_router: Respond with correct stanza error on malformed stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
898
diff
changeset
|
56 return; |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
57 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
|
58 end |
78
972e31cc91e8
Fized: Added check to ensure that resource binding is done after auth.
Waqas Hussain <waqas20@gmail.com>
parents:
73
diff
changeset
|
59 |
972e31cc91e8
Fized: Added check to ensure that resource binding is done after auth.
Waqas Hussain <waqas20@gmail.com>
parents:
73
diff
changeset
|
60 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
|
61 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
|
62 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
|
63 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
|
64 end |
972e31cc91e8
Fized: Added check to ensure that resource binding is done after auth.
Waqas Hussain <waqas20@gmail.com>
parents:
73
diff
changeset
|
65 |
274
9e68a697435d
Fix routing of outbound iq stanzas
Matthew Wild <mwild1@gmail.com>
parents:
264
diff
changeset
|
66 -- TODO also, stanzas should be returned to their original state before the function ends |
145 | 67 if origin.type == "c2s" then |
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
68 stanza.attr.from = origin.full_jid; |
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
69 end |
621
cd2cab5400fc
Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :)
Matthew Wild <mwild1@gmail.com>
parents:
615
diff
changeset
|
70 local to, xmlns = stanza.attr.to, stanza.attr.xmlns; |
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
71 local from = stanza.attr.from; |
718 | 72 local node, host, resource; |
73 local from_node, from_host, from_resource; | |
74 local to_bare, from_bare; | |
75 if to then | |
76 node, host, resource = jid_prepped_split(to); | |
77 if not host then | |
1143
5bab3eb566ad
stanza_router: Bounce stanzas to/from invalid JIDs with a jid-malformed error
Matthew Wild <mwild1@gmail.com>
parents:
967
diff
changeset
|
78 log("warn", "Received stanza with invalid destination JID: %s", to); |
5bab3eb566ad
stanza_router: Bounce stanzas to/from invalid JIDs with a jid-malformed error
Matthew Wild <mwild1@gmail.com>
parents:
967
diff
changeset
|
79 origin.send(st.error_reply(stanza, "modify", "jid-malformed", "The destination address is invalid: "..to)); |
5bab3eb566ad
stanza_router: Bounce stanzas to/from invalid JIDs with a jid-malformed error
Matthew Wild <mwild1@gmail.com>
parents:
967
diff
changeset
|
80 return; |
718 | 81 end |
82 to_bare = node and (node.."@"..host) or host; -- bare JID | |
83 if resource then to = to_bare.."/"..resource; else to = to_bare; end | |
84 stanza.attr.to = to; | |
85 end | |
86 if from then | |
1143
5bab3eb566ad
stanza_router: Bounce stanzas to/from invalid JIDs with a jid-malformed error
Matthew Wild <mwild1@gmail.com>
parents:
967
diff
changeset
|
87 -- We only stamp the 'from' on c2s stanzas, so we still need to check validity |
718 | 88 from_node, from_host, from_resource = jid_prepped_split(from); |
89 if not from_host then | |
1143
5bab3eb566ad
stanza_router: Bounce stanzas to/from invalid JIDs with a jid-malformed error
Matthew Wild <mwild1@gmail.com>
parents:
967
diff
changeset
|
90 log("warn", "Received stanza with invalid source JID: %s", from); |
5bab3eb566ad
stanza_router: Bounce stanzas to/from invalid JIDs with a jid-malformed error
Matthew Wild <mwild1@gmail.com>
parents:
967
diff
changeset
|
91 origin.send(st.error_reply(stanza, "modify", "jid-malformed", "The source address is invalid: "..from)); |
5bab3eb566ad
stanza_router: Bounce stanzas to/from invalid JIDs with a jid-malformed error
Matthew Wild <mwild1@gmail.com>
parents:
967
diff
changeset
|
92 return; |
718 | 93 end |
94 from_bare = from_node and (from_node.."@"..from_host) or from_host; -- bare JID | |
95 if from_resource then from = from_bare.."/"..from_resource; else from = from_bare; end | |
96 stanza.attr.from = from; | |
97 end | |
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
98 |
213 | 99 --[[if to and not(hosts[to]) and not(hosts[to_bare]) and (hosts[host] and hosts[host].type ~= "local") then -- not for us? |
100 log("warn", "stanza recieved for a non-local server"); | |
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
101 return; -- FIXME what should we do here? |
213 | 102 end]] -- FIXME |
207 | 103 |
1165
ec69bcc7ceb5
stanza_router: Cleaner namespace handling
Waqas Hussain <waqas20@gmail.com>
parents:
1164
diff
changeset
|
104 if (origin.type == "s2sin" or origin.type == "c2s" or origin.type == "component") and xmlns == "jabber:client" then |
631
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
105 if origin.type == "s2sin" and not origin.dummy then |
621
cd2cab5400fc
Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :)
Matthew Wild <mwild1@gmail.com>
parents:
615
diff
changeset
|
106 local host_status = origin.hosts[from_host]; |
cd2cab5400fc
Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :)
Matthew Wild <mwild1@gmail.com>
parents:
615
diff
changeset
|
107 if not host_status or not host_status.authed then -- remote server trying to impersonate some other server? |
cd2cab5400fc
Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :)
Matthew Wild <mwild1@gmail.com>
parents:
615
diff
changeset
|
108 log("warn", "Received a stanza claiming to be from %s, over a conn authed for %s!", from_host, origin.from_host); |
cd2cab5400fc
Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :)
Matthew Wild <mwild1@gmail.com>
parents:
615
diff
changeset
|
109 return; -- FIXME what should we do here? does this work with subdomains? |
cd2cab5400fc
Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :)
Matthew Wild <mwild1@gmail.com>
parents:
615
diff
changeset
|
110 end |
cd2cab5400fc
Add support for dialback piggy-backing. Fixes #37. Thanks to CShadowRun for helping me test :)
Matthew Wild <mwild1@gmail.com>
parents:
615
diff
changeset
|
111 end |
1163
8b4a57765b04
stanza_router: Fire events after all checks
Waqas Hussain <waqas20@gmail.com>
parents:
1157
diff
changeset
|
112 local event_data = {origin=origin, stanza=stanza}; |
8b4a57765b04
stanza_router: Fire events after all checks
Waqas Hussain <waqas20@gmail.com>
parents:
1157
diff
changeset
|
113 if fire_event(tostring(host or origin.host).."/"..stanza.name, event_data) then |
8b4a57765b04
stanza_router: Fire events after all checks
Waqas Hussain <waqas20@gmail.com>
parents:
1157
diff
changeset
|
114 -- event handled |
8b4a57765b04
stanza_router: Fire events after all checks
Waqas Hussain <waqas20@gmail.com>
parents:
1157
diff
changeset
|
115 elseif not to then |
1167
5620ea24be94
stanza_router: Removed global function core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1165
diff
changeset
|
116 modules_handle_stanza(host or origin.host or origin.to_host, origin, stanza); |
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
|
117 elseif hosts[to] and hosts[to].type == "local" then -- directed at a local server |
1167
5620ea24be94
stanza_router: Removed global function core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1165
diff
changeset
|
118 modules_handle_stanza(host or origin.host or origin.to_host, origin, stanza); |
640
068130563311
Changed order of checking for component hosts to check the full and bare JIDs before the hostname (at another place)
Waqas Hussain <waqas20@gmail.com>
parents:
631
diff
changeset
|
119 elseif hosts[to] and hosts[to].type == "component" then -- hack to allow components to handle node@server/resource and server/resource |
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
|
120 component_handle_stanza(origin, stanza); |
640
068130563311
Changed order of checking for component hosts to check the full and bare JIDs before the hostname (at another place)
Waqas Hussain <waqas20@gmail.com>
parents:
631
diff
changeset
|
121 elseif hosts[to_bare] and hosts[to_bare].type == "component" then -- hack to allow components to handle node@server |
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
|
122 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
|
123 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
|
124 component_handle_stanza(origin, stanza); |
789
ced87939984e
stanza_router: Fix handling of iq from c2s to bare JIDs, thanks to jaharkes for spotting
Matthew Wild <mwild1@gmail.com>
parents:
785
diff
changeset
|
125 elseif hosts[host] and hosts[host].type == "local" and stanza.name == "iq" and not resource then -- directed at bare JID |
1167
5620ea24be94
stanza_router: Removed global function core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1165
diff
changeset
|
126 modules_handle_stanza(host or origin.host or origin.to_host, origin, stanza); |
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
|
127 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
|
128 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
|
129 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
|
130 else |
1167
5620ea24be94
stanza_router: Removed global function core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1165
diff
changeset
|
131 modules_handle_stanza(host or origin.host or origin.to_host, origin, stanza); |
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
132 end |
30 | 133 end |
134 | |
135 function core_route_stanza(origin, stanza) | |
136 -- Hooks | |
68
ceb7a55676a4
Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
137 --- ...later |
207 | 138 |
30 | 139 -- Deliver |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
140 local to = stanza.attr.to; |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
141 local node, host, resource = jid_split(to); |
170 | 142 local to_bare = node and (node.."@"..host) or host; -- bare JID |
143 local from = stanza.attr.from; | |
144 local from_node, from_host, from_resource = jid_split(from); | |
145 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
|
146 |
372
e7c1e30d06d5
Now possible to specify nil origin to core_route_stanza. Origin will be chosen as the host of the 'from' attribute on the stanza. Returns false on no such host.
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
147 -- Auto-detect origin if not specified |
e7c1e30d06d5
Now possible to specify nil origin to core_route_stanza. Origin will be chosen as the host of the 'from' attribute on the stanza. Returns false on no such host.
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
148 origin = origin or hosts[from_host]; |
e7c1e30d06d5
Now possible to specify nil origin to core_route_stanza. Origin will be chosen as the host of the 'from' attribute on the stanza. Returns false on no such host.
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
149 if not origin then return false; end |
e7c1e30d06d5
Now possible to specify nil origin to core_route_stanza. Origin will be chosen as the host of the 'from' attribute on the stanza. Returns false on no such host.
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
150 |
781
191b9f0e5485
Fixed: Some presence stanzas from local users were not being routed correctly to components (ghosts in mod_muc)
Waqas Hussain <waqas20@gmail.com>
parents:
780
diff
changeset
|
151 if hosts[to] and hosts[to].type == "component" then -- hack to allow components to handle node@server/resource and server/resource |
191b9f0e5485
Fixed: Some presence stanzas from local users were not being routed correctly to components (ghosts in mod_muc)
Waqas Hussain <waqas20@gmail.com>
parents:
780
diff
changeset
|
152 return component_handle_stanza(origin, stanza); |
191b9f0e5485
Fixed: Some presence stanzas from local users were not being routed correctly to components (ghosts in mod_muc)
Waqas Hussain <waqas20@gmail.com>
parents:
780
diff
changeset
|
153 elseif hosts[to_bare] and hosts[to_bare].type == "component" then -- hack to allow components to handle node@server |
191b9f0e5485
Fixed: Some presence stanzas from local users were not being routed correctly to components (ghosts in mod_muc)
Waqas Hussain <waqas20@gmail.com>
parents:
780
diff
changeset
|
154 return component_handle_stanza(origin, stanza); |
191b9f0e5485
Fixed: Some presence stanzas from local users were not being routed correctly to components (ghosts in mod_muc)
Waqas Hussain <waqas20@gmail.com>
parents:
780
diff
changeset
|
155 elseif hosts[host] and hosts[host].type == "component" then -- directed at a component |
191b9f0e5485
Fixed: Some presence stanzas from local users were not being routed correctly to components (ghosts in mod_muc)
Waqas Hussain <waqas20@gmail.com>
parents:
780
diff
changeset
|
156 return component_handle_stanza(origin, stanza); |
191b9f0e5485
Fixed: Some presence stanzas from local users were not being routed correctly to components (ghosts in mod_muc)
Waqas Hussain <waqas20@gmail.com>
parents:
780
diff
changeset
|
157 end |
191b9f0e5485
Fixed: Some presence stanzas from local users were not being routed correctly to components (ghosts in mod_muc)
Waqas Hussain <waqas20@gmail.com>
parents:
780
diff
changeset
|
158 |
966
d2692d427496
Fixed: Issue with presence error routing
Waqas Hussain <waqas20@gmail.com>
parents:
924
diff
changeset
|
159 if stanza.name == "presence" and (stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" and stanza.attr.type ~= "error") then resource = nil; end |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
160 |
68
ceb7a55676a4
Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
161 local host_session = hosts[host] |
ceb7a55676a4
Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
162 if host_session and host_session.type == "local" then |
ceb7a55676a4
Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
163 -- Local host |
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
164 local user = host_session.sessions[node]; |
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
165 if user then |
72 | 166 local res = user.sessions[resource]; |
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
167 if not res then |
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
168 -- 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
|
169 if stanza.name == "presence" then |
966
d2692d427496
Fixed: Issue with presence error routing
Waqas Hussain <waqas20@gmail.com>
parents:
924
diff
changeset
|
170 if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" and stanza.attr.type ~= "error" then |
321
31fe15ce6fac
Moved presence subscription code from stanza_router to presencemanager
Waqas Hussain <waqas20@gmail.com>
parents:
274
diff
changeset
|
171 handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza); |
966
d2692d427496
Fixed: Issue with presence error routing
Waqas Hussain <waqas20@gmail.com>
parents:
924
diff
changeset
|
172 elseif not resource then -- sender is available or unavailable or error |
200
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
173 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
|
174 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
|
175 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
|
176 session.send(stanza); |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
177 end |
106
f2a3d204a76a
Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents:
105
diff
changeset
|
178 end |
f2a3d204a76a
Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents:
105
diff
changeset
|
179 end |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
180 elseif stanza.name == "message" then -- select a resource to recieve message |
784
1de8a32f81e9
Change the to attribute of messages to the recipients' bare JID when the recipient/resource is offline.
Waqas Hussain <waqas20@gmail.com>
parents:
783
diff
changeset
|
181 stanza.attr.to = to_bare; |
1de8a32f81e9
Change the to attribute of messages to the recipients' bare JID when the recipient/resource is offline.
Waqas Hussain <waqas20@gmail.com>
parents:
783
diff
changeset
|
182 if stanza.attr.type == 'headline' then |
783
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
183 for _, session in pairs(user.sessions) do -- find resource with greatest priority |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
184 if session.presence and session.priority >= 0 then |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
185 session.send(stanza); |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
186 end |
106
f2a3d204a76a
Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents:
105
diff
changeset
|
187 end |
848
b1f3977fd140
core.stanza_router: Reply with error to groupchat messages directed at unavailable resources or offline users
Matthew Wild <mwild1@gmail.com>
parents:
789
diff
changeset
|
188 elseif resource and stanza.attr.type == 'groupchat' then |
b1f3977fd140
core.stanza_router: Reply with error to groupchat messages directed at unavailable resources or offline users
Matthew Wild <mwild1@gmail.com>
parents:
789
diff
changeset
|
189 -- Groupchat message sent to offline resource |
b1f3977fd140
core.stanza_router: Reply with error to groupchat messages directed at unavailable resources or offline users
Matthew Wild <mwild1@gmail.com>
parents:
789
diff
changeset
|
190 origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); |
783
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
191 else |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
192 local priority = 0; |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
193 local recipients = {}; |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
194 for _, session in pairs(user.sessions) do -- find resource with greatest priority |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
195 if session.presence then |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
196 local p = session.priority; |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
197 if p > priority then |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
198 priority = p; |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
199 recipients = {session}; |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
200 elseif p == priority then |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
201 t_insert(recipients, session); |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
202 end |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
203 end |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
204 end |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
205 local count = 0; |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
206 for _, session in ipairs(recipients) do |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
207 session.send(stanza); |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
208 count = count + 1; |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
209 end |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
210 if count == 0 and (stanza.attr.type == "chat" or stanza.attr.type == "normal" or not stanza.attr.type) then |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
211 offlinemanager.store(node, host, stanza); |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
212 -- TODO deal with storage errors |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
213 end |
200
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
214 end |
967
b021403c5d80
Fixed: Send correct error reply for IQs directed at unavailable resources
Waqas Hussain <waqas20@gmail.com>
parents:
966
diff
changeset
|
215 elseif stanza.attr.type == "get" or stanza.attr.type == "set" then |
b021403c5d80
Fixed: Send correct error reply for IQs directed at unavailable resources
Waqas Hussain <waqas20@gmail.com>
parents:
966
diff
changeset
|
216 origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); |
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
217 end |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
218 else |
121
74e5919e4737
Added a comment, removed all the old code
Matthew Wild <mwild1@gmail.com>
parents:
119
diff
changeset
|
219 -- User + resource is online... |
170 | 220 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
|
221 res.send(stanza); -- Yay \o/ |
106
f2a3d204a76a
Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents:
105
diff
changeset
|
222 end |
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
223 else |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
224 -- user not online |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
225 if user_exists(node, host) then |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
226 if stanza.name == "presence" then |
966
d2692d427496
Fixed: Issue with presence error routing
Waqas Hussain <waqas20@gmail.com>
parents:
924
diff
changeset
|
227 if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" and stanza.attr.type ~= "error" then |
321
31fe15ce6fac
Moved presence subscription code from stanza_router to presencemanager
Waqas Hussain <waqas20@gmail.com>
parents:
274
diff
changeset
|
228 handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza); |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
229 else |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
230 -- TODO send unavailable presence or unsubscribed |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
231 end |
642
0ae8584ba3e7
More error replies for offline and non-existing users
Waqas Hussain <waqas20@gmail.com>
parents:
641
diff
changeset
|
232 elseif stanza.name == "message" then -- FIXME if full jid, then send out to resources with highest priority |
784
1de8a32f81e9
Change the to attribute of messages to the recipients' bare JID when the recipient/resource is offline.
Waqas Hussain <waqas20@gmail.com>
parents:
783
diff
changeset
|
233 stanza.attr.to = to_bare; -- TODO not in RFC, but seems obvious. Should discuss on the mailing list. |
249
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
234 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
|
235 offlinemanager.store(node, host, stanza); |
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
236 -- FIXME don't store messages with only chat state notifications |
848
b1f3977fd140
core.stanza_router: Reply with error to groupchat messages directed at unavailable resources or offline users
Matthew Wild <mwild1@gmail.com>
parents:
789
diff
changeset
|
237 elseif stanza.attr.type == "groupchat" then |
b1f3977fd140
core.stanza_router: Reply with error to groupchat messages directed at unavailable resources or offline users
Matthew Wild <mwild1@gmail.com>
parents:
789
diff
changeset
|
238 local reply = st.error_reply(stanza, "cancel", "service-unavailable"); |
b1f3977fd140
core.stanza_router: Reply with error to groupchat messages directed at unavailable resources or offline users
Matthew Wild <mwild1@gmail.com>
parents:
789
diff
changeset
|
239 reply.attr.from = to; |
b1f3977fd140
core.stanza_router: Reply with error to groupchat messages directed at unavailable resources or offline users
Matthew Wild <mwild1@gmail.com>
parents:
789
diff
changeset
|
240 origin.send(reply); |
249
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
241 end |
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
242 -- TODO allow configuration of offline storage |
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
243 -- TODO send error if not storing offline |
854
b9cfc9d5496a
core.stanza_router: Don't bounce errors to iq type=result/error
Matthew Wild <mwild1@gmail.com>
parents:
848
diff
changeset
|
244 elseif stanza.name == "iq" and (stanza.attr.type == "get" or stanza.attr.type == "set") then |
642
0ae8584ba3e7
More error replies for offline and non-existing users
Waqas Hussain <waqas20@gmail.com>
parents:
641
diff
changeset
|
245 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
|
246 end |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
247 else -- user does not exist |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
248 -- 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
|
249 if stanza.name == "presence" then |
642
0ae8584ba3e7
More error replies for offline and non-existing users
Waqas Hussain <waqas20@gmail.com>
parents:
641
diff
changeset
|
250 local t = stanza.attr.type; |
0ae8584ba3e7
More error replies for offline and non-existing users
Waqas Hussain <waqas20@gmail.com>
parents:
641
diff
changeset
|
251 if t == "subscribe" or t == "probe" then |
186
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
178
diff
changeset
|
252 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
|
253 end |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
254 -- else ignore |
854
b9cfc9d5496a
core.stanza_router: Don't bounce errors to iq type=result/error
Matthew Wild <mwild1@gmail.com>
parents:
848
diff
changeset
|
255 elseif stanza.attr.type ~= "error" and (stanza.name ~= "iq" or stanza.attr.type ~= "result") then |
186
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
178
diff
changeset
|
256 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
|
257 end |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
258 end |
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
259 end |
148 | 260 elseif origin.type == "c2s" then |
68
ceb7a55676a4
Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
261 -- Remote host |
170 | 262 local xmlns = stanza.attr.xmlns; |
148 | 263 --stanza.attr.xmlns = "jabber:server"; |
264 stanza.attr.xmlns = nil; | |
146 | 265 log("debug", "sending s2s stanza: %s", tostring(stanza)); |
170 | 266 send_s2s(origin.host, host, stanza); -- TODO handle remote routing errors |
267 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
|
268 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
|
269 -- 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
|
270 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
|
271 send_s2s(origin.host, host, stanza); |
148 | 272 else |
273 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
|
274 end |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
275 stanza.attr.to = to; -- reset |
30 | 276 end |