Software /
code /
prosody
Annotate
core/stanza_router.lua @ 1328:0709c9564b1c
Automated merge with http://waqas.ath.cx:8000/
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Sun, 07 Jun 2009 14:19:36 +0100 |
parent | 1307:c9c58aa990bb |
child | 1348:ffa70c0df850 |
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 |
191 | 23 local modules_handle_stanza = require "core.modulemanager".handle_stanza; |
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
24 local component_handle_stanza = require "core.componentmanager".handle_stanza; |
191 | 25 |
1011
beb039827c9f
Stopped using presencemanager in stanza_router
Waqas Hussain <waqas20@gmail.com>
parents:
1008
diff
changeset
|
26 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
|
27 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
|
28 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
|
29 |
145 | 30 local format = string.format; |
31 local tostring = tostring; | |
199
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
32 local t_concat = table.concat; |
200
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
33 local t_insert = table.insert; |
199
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
34 local tonumber = tonumber; |
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
192
diff
changeset
|
35 local s_find = string.find; |
783
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
36 local pairs = pairs; |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
37 local ipairs = ipairs; |
145 | 38 |
105
b099f0f80775
Removed an unnecessary line
Waqas Hussain <waqas20@gmail.com>
parents:
83
diff
changeset
|
39 local jid_split = require "util.jid".split; |
718 | 40 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
|
41 local print = print; |
1244
3df7417225fe
stanza_router: Changed to use the prosody.events object directly, rather than through eventmanager2
Waqas Hussain <waqas20@gmail.com>
parents:
1230
diff
changeset
|
42 local fire_event = prosody.events.fire_event; |
30 | 43 |
1212
3be23cf5a659
stanza_router: Break off resource selection for messages into a standalone function
Matthew Wild <mwild1@gmail.com>
parents:
1191
diff
changeset
|
44 local select_best_resources; |
3be23cf5a659
stanza_router: Break off resource selection for messages into a standalone function
Matthew Wild <mwild1@gmail.com>
parents:
1191
diff
changeset
|
45 |
30 | 46 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
|
47 (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
|
48 |
1178
f332c033bfc8
stanza_router: Remove FIXME and replace with meaningful comment
Matthew Wild <mwild1@gmail.com>
parents:
1172
diff
changeset
|
49 -- Currently we guarantee every stanza to have an xmlns, should we keep this rule? |
f332c033bfc8
stanza_router: Remove FIXME and replace with meaningful comment
Matthew Wild <mwild1@gmail.com>
parents:
1172
diff
changeset
|
50 if not stanza.attr.xmlns then stanza.attr.xmlns = "jabber:client"; end |
f332c033bfc8
stanza_router: Remove FIXME and replace with meaningful comment
Matthew Wild <mwild1@gmail.com>
parents:
1172
diff
changeset
|
51 |
73 | 52 -- 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
|
53 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
|
54 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
|
55 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
|
56 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
|
57 return; |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
58 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
|
59 end |
78
972e31cc91e8
Fized: Added check to ensure that resource binding is done after auth.
Waqas Hussain <waqas20@gmail.com>
parents:
73
diff
changeset
|
60 |
972e31cc91e8
Fized: Added check to ensure that resource binding is done after auth.
Waqas Hussain <waqas20@gmail.com>
parents:
73
diff
changeset
|
61 if origin.type == "c2s" and not origin.full_jid |
1269
b06d6674477b
stanza_router: Proper error for clients sending stanzas after auth but before resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
1263
diff
changeset
|
62 and not(stanza.name == "iq" and stanza.attr.type == "set" and stanza.tags[1] 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
|
63 and stanza.tags[1].attr.xmlns == "urn:ietf:params:xml:ns:xmpp-bind") then |
1269
b06d6674477b
stanza_router: Proper error for clients sending stanzas after auth but before resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
1263
diff
changeset
|
64 -- authenticated client isn't bound and current stanza is not a bind request |
b06d6674477b
stanza_router: Proper error for clients sending stanzas after auth but before resource binding
Waqas Hussain <waqas20@gmail.com>
parents:
1263
diff
changeset
|
65 origin.send(st.error_reply(stanza, "auth", "not-authorized")); -- FIXME maybe allow stanzas to account or server |
78
972e31cc91e8
Fized: Added check to ensure that resource binding is done after auth.
Waqas Hussain <waqas20@gmail.com>
parents:
73
diff
changeset
|
66 end |
972e31cc91e8
Fized: Added check to ensure that resource binding is done after auth.
Waqas Hussain <waqas20@gmail.com>
parents:
73
diff
changeset
|
67 |
274
9e68a697435d
Fix routing of outbound iq stanzas
Matthew Wild <mwild1@gmail.com>
parents:
264
diff
changeset
|
68 -- TODO also, stanzas should be returned to their original state before the function ends |
145 | 69 if origin.type == "c2s" then |
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
70 stanza.attr.from = origin.full_jid; |
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
71 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
|
72 local to, xmlns = stanza.attr.to, stanza.attr.xmlns; |
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
73 local from = stanza.attr.from; |
718 | 74 local node, host, resource; |
75 local from_node, from_host, from_resource; | |
76 local to_bare, from_bare; | |
77 if to then | |
78 node, host, resource = jid_prepped_split(to); | |
79 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
|
80 log("warn", "Received stanza with invalid destination JID: %s", to); |
1270
0e700e2041ef
stanza_router: Don't reply with an error on invalid JIDs in error or result stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1269
diff
changeset
|
81 if stanza.attr.type ~= "error" and stanza.attr.type ~= "result" then |
0e700e2041ef
stanza_router: Don't reply with an error on invalid JIDs in error or result stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1269
diff
changeset
|
82 origin.send(st.error_reply(stanza, "modify", "jid-malformed", "The destination address is invalid: "..to)); |
0e700e2041ef
stanza_router: Don't reply with an error on invalid JIDs in error or result stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1269
diff
changeset
|
83 end |
1143
5bab3eb566ad
stanza_router: Bounce stanzas to/from invalid JIDs with a jid-malformed error
Matthew Wild <mwild1@gmail.com>
parents:
967
diff
changeset
|
84 return; |
718 | 85 end |
86 to_bare = node and (node.."@"..host) or host; -- bare JID | |
87 if resource then to = to_bare.."/"..resource; else to = to_bare; end | |
88 stanza.attr.to = to; | |
89 end | |
90 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
|
91 -- We only stamp the 'from' on c2s stanzas, so we still need to check validity |
718 | 92 from_node, from_host, from_resource = jid_prepped_split(from); |
93 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
|
94 log("warn", "Received stanza with invalid source JID: %s", from); |
1270
0e700e2041ef
stanza_router: Don't reply with an error on invalid JIDs in error or result stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1269
diff
changeset
|
95 if stanza.attr.type ~= "error" and stanza.attr.type ~= "result" then |
0e700e2041ef
stanza_router: Don't reply with an error on invalid JIDs in error or result stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1269
diff
changeset
|
96 origin.send(st.error_reply(stanza, "modify", "jid-malformed", "The source address is invalid: "..from)); |
0e700e2041ef
stanza_router: Don't reply with an error on invalid JIDs in error or result stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1269
diff
changeset
|
97 end |
1143
5bab3eb566ad
stanza_router: Bounce stanzas to/from invalid JIDs with a jid-malformed error
Matthew Wild <mwild1@gmail.com>
parents:
967
diff
changeset
|
98 return; |
718 | 99 end |
100 from_bare = from_node and (from_node.."@"..from_host) or from_host; -- bare JID | |
101 if from_resource then from = from_bare.."/"..from_resource; else from = from_bare; end | |
102 stanza.attr.from = from; | |
103 end | |
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
104 |
213 | 105 --[[if to and not(hosts[to]) and not(hosts[to_bare]) and (hosts[host] and hosts[host].type ~= "local") then -- not for us? |
106 log("warn", "stanza recieved for a non-local server"); | |
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
107 return; -- FIXME what should we do here? |
213 | 108 end]] -- FIXME |
207 | 109 |
1165
ec69bcc7ceb5
stanza_router: Cleaner namespace handling
Waqas Hussain <waqas20@gmail.com>
parents:
1164
diff
changeset
|
110 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
|
111 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
|
112 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
|
113 if not host_status or not host_status.authed then -- remote server trying to impersonate some other server? |
1179
503d68e7e18a
stanza_router: s/conn/stream/ in log message
Matthew Wild <mwild1@gmail.com>
parents:
1178
diff
changeset
|
114 log("warn", "Received a stanza claiming to be from %s, over a stream authed for %s!", from_host, origin.from_host); |
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
|
115 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
|
116 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
|
117 end |
1172
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
118 core_post_stanza(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
|
119 else |
1254
c199be608546
stanza_router: Fire events for non-jabber:client and pre-auth stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1244
diff
changeset
|
120 local h = hosts[stanza.attr.to or origin.host or origin.to_host]; |
c199be608546
stanza_router: Fire events for non-jabber:client and pre-auth stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1244
diff
changeset
|
121 if h then |
c199be608546
stanza_router: Fire events for non-jabber:client and pre-auth stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1244
diff
changeset
|
122 local event; |
c199be608546
stanza_router: Fire events for non-jabber:client and pre-auth stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1244
diff
changeset
|
123 if stanza.attr.xmlns == "jabber:client" then |
c199be608546
stanza_router: Fire events for non-jabber:client and pre-auth stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1244
diff
changeset
|
124 if stanza.name == "iq" and (stanza.attr.type == "set" or stanza.attr.type == "get") then |
c199be608546
stanza_router: Fire events for non-jabber:client and pre-auth stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1244
diff
changeset
|
125 event = "stanza/iq/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name; |
c199be608546
stanza_router: Fire events for non-jabber:client and pre-auth stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1244
diff
changeset
|
126 else |
c199be608546
stanza_router: Fire events for non-jabber:client and pre-auth stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1244
diff
changeset
|
127 event = "stanza/"..stanza.name; |
c199be608546
stanza_router: Fire events for non-jabber:client and pre-auth stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1244
diff
changeset
|
128 end |
c199be608546
stanza_router: Fire events for non-jabber:client and pre-auth stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1244
diff
changeset
|
129 else |
c199be608546
stanza_router: Fire events for non-jabber:client and pre-auth stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1244
diff
changeset
|
130 event = "stanza/"..stanza.attr.xmlns..":"..stanza.name; |
c199be608546
stanza_router: Fire events for non-jabber:client and pre-auth stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1244
diff
changeset
|
131 end |
1262
0d94c57555d9
Backed out changeset 98f0e9eadf3b (better fix on the way)
Matthew Wild <mwild1@gmail.com>
parents:
1256
diff
changeset
|
132 if h.events.fire_event(event, {origin = origin, stanza = stanza}) then return; end |
1254
c199be608546
stanza_router: Fire events for non-jabber:client and pre-auth stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1244
diff
changeset
|
133 end |
1294
39197fe5ae94
stanza_router: workaround for a Pidgin bug which sets 'to' to the SRV result
Waqas Hussain <waqas20@gmail.com>
parents:
1292
diff
changeset
|
134 if host and not hosts[host] then host = nil; end -- workaround for a Pidgin bug which sets 'to' to the SRV result |
1167
5620ea24be94
stanza_router: Removed global function core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1165
diff
changeset
|
135 modules_handle_stanza(host or origin.host or origin.to_host, origin, stanza); |
119
b48a573608e8
Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents:
113
diff
changeset
|
136 end |
b48a573608e8
Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents:
113
diff
changeset
|
137 end |
b48a573608e8
Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents:
113
diff
changeset
|
138 |
1172
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
139 function core_post_stanza(origin, stanza) |
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
140 local to = stanza.attr.to; |
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
141 local node, host, resource = jid_split(to); |
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
142 local to_bare = node and (node.."@"..host) or host; -- bare JID |
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
143 |
1228
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
144 local to_type; |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
145 if node then |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
146 if resource then |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
147 to_type = '/full'; |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
148 else |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
149 to_type = '/bare'; |
1292
b18c1ad7fcb6
stanza_router: Remove the 'to' attribute when it's value is the bare JID of the local user sending the stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1273
diff
changeset
|
150 if node == origin.username and host == origin.host then |
b18c1ad7fcb6
stanza_router: Remove the 'to' attribute when it's value is the bare JID of the local user sending the stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1273
diff
changeset
|
151 stanza.attr.to = nil; |
b18c1ad7fcb6
stanza_router: Remove the 'to' attribute when it's value is the bare JID of the local user sending the stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1273
diff
changeset
|
152 end |
1228
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
153 end |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
154 else |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
155 if host then |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
156 to_type = '/host'; |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
157 else |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
158 to_type = '/bare'; |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
159 end |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
160 end |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
161 |
1172
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
162 local event_data = {origin=origin, stanza=stanza}; |
1228
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
163 if origin.full_jid then -- c2s connection |
1262
0d94c57555d9
Backed out changeset 98f0e9eadf3b (better fix on the way)
Matthew Wild <mwild1@gmail.com>
parents:
1256
diff
changeset
|
164 if hosts[origin.host].events.fire_event('pre-'..stanza.name..to_type, event_data) then return; end -- do preprocessing |
1228
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
165 end |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
166 local h = hosts[to_bare] or hosts[host or origin.host]; |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
167 if h then |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
168 if h.type == "component" then |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
169 component_handle_stanza(origin, stanza); |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
170 return; |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
171 else |
1262
0d94c57555d9
Backed out changeset 98f0e9eadf3b (better fix on the way)
Matthew Wild <mwild1@gmail.com>
parents:
1256
diff
changeset
|
172 if h.events.fire_event(stanza.name..to_type, event_data) then return; end -- do processing |
1228
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
173 end |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
174 end |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
175 |
1182
89e9f0d555a2
stanza_router: Handle outbound presence if inbound handlers don't catch it
Waqas Hussain <waqas20@gmail.com>
parents:
1179
diff
changeset
|
176 if host and fire_event(host.."/"..stanza.name, event_data) then |
89e9f0d555a2
stanza_router: Handle outbound presence if inbound handlers don't catch it
Waqas Hussain <waqas20@gmail.com>
parents:
1179
diff
changeset
|
177 -- event handled |
89e9f0d555a2
stanza_router: Handle outbound presence if inbound handlers don't catch it
Waqas Hussain <waqas20@gmail.com>
parents:
1179
diff
changeset
|
178 elseif stanza.name == "presence" and origin.host and fire_event(origin.host.."/"..stanza.name, event_data) then |
1172
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
179 -- event handled |
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
180 elseif not to then |
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
181 modules_handle_stanza(host or origin.host or origin.to_host, origin, stanza); |
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
182 elseif hosts[to] and hosts[to].type == "local" then -- directed at a local server |
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
183 modules_handle_stanza(host or origin.host or origin.to_host, origin, stanza); |
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
184 elseif hosts[to_bare] and hosts[to_bare].type == "component" then -- hack to allow components to handle node@server |
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
185 component_handle_stanza(origin, stanza); |
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
186 elseif hosts[host] and hosts[host].type == "component" then -- directed at a component |
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
187 component_handle_stanza(origin, stanza); |
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
188 elseif hosts[host] and hosts[host].type == "local" and stanza.name == "iq" and not resource then -- directed at bare JID |
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
189 modules_handle_stanza(host or origin.host or origin.to_host, origin, stanza); |
145 | 190 else |
1172
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
191 core_route_stanza(origin, stanza); |
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
192 end |
30 | 193 end |
194 | |
195 function core_route_stanza(origin, stanza) | |
196 -- Hooks | |
68
ceb7a55676a4
Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
197 --- ...later |
207 | 198 |
30 | 199 -- Deliver |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
200 local to = stanza.attr.to; |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
201 local node, host, resource = jid_split(to); |
170 | 202 local to_bare = node and (node.."@"..host) or host; -- bare JID |
203 local from = stanza.attr.from; | |
204 local from_node, from_host, from_resource = jid_split(from); | |
205 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
|
206 |
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
|
207 -- 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
|
208 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
|
209 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
|
210 |
1168
dd523bfc9ea9
Dropped support for resource based components
Waqas Hussain <waqas20@gmail.com>
parents:
1167
diff
changeset
|
211 if hosts[to_bare] and hosts[to_bare].type == "component" then -- hack to allow components to handle node@server |
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
|
212 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
|
213 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
|
214 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
|
215 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
|
216 |
966
d2692d427496
Fixed: Issue with presence error routing
Waqas Hussain <waqas20@gmail.com>
parents:
924
diff
changeset
|
217 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
|
218 |
68
ceb7a55676a4
Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
219 local host_session = hosts[host] |
ceb7a55676a4
Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
220 if host_session and host_session.type == "local" then |
ceb7a55676a4
Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
221 -- Local host |
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
222 local user = host_session.sessions[node]; |
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
223 if user then |
72 | 224 local res = user.sessions[resource]; |
1169
fdc68aec1d49
stanza_router: Improved message routing order
Waqas Hussain <waqas20@gmail.com>
parents:
1168
diff
changeset
|
225 if res then -- resource is online... |
fdc68aec1d49
stanza_router: Improved message routing order
Waqas Hussain <waqas20@gmail.com>
parents:
1168
diff
changeset
|
226 res.send(stanza); -- Yay \o/ |
fdc68aec1d49
stanza_router: Improved message routing order
Waqas Hussain <waqas20@gmail.com>
parents:
1168
diff
changeset
|
227 else |
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
228 -- 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
|
229 if stanza.name == "presence" then |
966
d2692d427496
Fixed: Issue with presence error routing
Waqas Hussain <waqas20@gmail.com>
parents:
924
diff
changeset
|
230 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
|
231 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
|
232 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
|
233 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
|
234 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
|
235 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
|
236 session.send(stanza); |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
237 end |
106
f2a3d204a76a
Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents:
105
diff
changeset
|
238 end |
f2a3d204a76a
Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents:
105
diff
changeset
|
239 end |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
240 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
|
241 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
|
242 if stanza.attr.type == 'headline' then |
783
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
243 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
|
244 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
|
245 session.send(stanza); |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
246 end |
106
f2a3d204a76a
Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents:
105
diff
changeset
|
247 end |
1273
85353014ff34
stanza_router: Reply with an error on groupchat messages to bare JID
Waqas Hussain <waqas20@gmail.com>
parents:
1270
diff
changeset
|
248 elseif stanza.attr.type == 'groupchat' then |
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
|
249 -- 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
|
250 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
|
251 else |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
252 local count = 0; |
1212
3be23cf5a659
stanza_router: Break off resource selection for messages into a standalone function
Matthew Wild <mwild1@gmail.com>
parents:
1191
diff
changeset
|
253 for _, session in ipairs(select_best_resources(user)) do |
783
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
254 session.send(stanza); |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
255 count = count + 1; |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
256 end |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
257 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
|
258 offlinemanager.store(node, host, stanza); |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
259 -- TODO deal with storage errors |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
260 end |
200
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
261 end |
967
b021403c5d80
Fixed: Send correct error reply for IQs directed at unavailable resources
Waqas Hussain <waqas20@gmail.com>
parents:
966
diff
changeset
|
262 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
|
263 origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); |
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
264 end |
106
f2a3d204a76a
Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents:
105
diff
changeset
|
265 end |
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
266 else |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
267 -- user not online |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
268 if user_exists(node, host) then |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
269 if stanza.name == "presence" then |
966
d2692d427496
Fixed: Issue with presence error routing
Waqas Hussain <waqas20@gmail.com>
parents:
924
diff
changeset
|
270 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
|
271 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
|
272 else |
175
5f71d290bb44
Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents:
174
diff
changeset
|
273 -- TODO send unavailable presence or unsubscribed |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
274 end |
642
0ae8584ba3e7
More error replies for offline and non-existing users
Waqas Hussain <waqas20@gmail.com>
parents:
641
diff
changeset
|
275 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
|
276 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
|
277 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
|
278 offlinemanager.store(node, host, stanza); |
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
279 -- 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
|
280 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
|
281 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
|
282 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
|
283 origin.send(reply); |
249
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
284 end |
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
285 -- TODO allow configuration of offline storage |
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
286 -- 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
|
287 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
|
288 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
|
289 end |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
290 else -- user does not exist |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
291 -- 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
|
292 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
|
293 local t = stanza.attr.type; |
0ae8584ba3e7
More error replies for offline and non-existing users
Waqas Hussain <waqas20@gmail.com>
parents:
641
diff
changeset
|
294 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
|
295 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
|
296 end |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
297 -- 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
|
298 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
|
299 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
|
300 end |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
301 end |
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
302 end |
148 | 303 elseif origin.type == "c2s" then |
68
ceb7a55676a4
Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
304 -- Remote host |
170 | 305 local xmlns = stanza.attr.xmlns; |
148 | 306 --stanza.attr.xmlns = "jabber:server"; |
307 stanza.attr.xmlns = nil; | |
146 | 308 log("debug", "sending s2s stanza: %s", tostring(stanza)); |
170 | 309 send_s2s(origin.host, host, stanza); -- TODO handle remote routing errors |
310 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
|
311 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
|
312 -- 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
|
313 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
|
314 send_s2s(origin.host, host, stanza); |
148 | 315 else |
316 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
|
317 end |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
318 stanza.attr.to = to; -- reset |
30 | 319 end |
1212
3be23cf5a659
stanza_router: Break off resource selection for messages into a standalone function
Matthew Wild <mwild1@gmail.com>
parents:
1191
diff
changeset
|
320 |
3be23cf5a659
stanza_router: Break off resource selection for messages into a standalone function
Matthew Wild <mwild1@gmail.com>
parents:
1191
diff
changeset
|
321 function select_best_resources(user) |
3be23cf5a659
stanza_router: Break off resource selection for messages into a standalone function
Matthew Wild <mwild1@gmail.com>
parents:
1191
diff
changeset
|
322 local priority = 0; |
3be23cf5a659
stanza_router: Break off resource selection for messages into a standalone function
Matthew Wild <mwild1@gmail.com>
parents:
1191
diff
changeset
|
323 local recipients = {}; |
3be23cf5a659
stanza_router: Break off resource selection for messages into a standalone function
Matthew Wild <mwild1@gmail.com>
parents:
1191
diff
changeset
|
324 for _, session in pairs(user.sessions) do -- find resource with greatest priority |
3be23cf5a659
stanza_router: Break off resource selection for messages into a standalone function
Matthew Wild <mwild1@gmail.com>
parents:
1191
diff
changeset
|
325 if session.presence then |
3be23cf5a659
stanza_router: Break off resource selection for messages into a standalone function
Matthew Wild <mwild1@gmail.com>
parents:
1191
diff
changeset
|
326 local p = session.priority; |
3be23cf5a659
stanza_router: Break off resource selection for messages into a standalone function
Matthew Wild <mwild1@gmail.com>
parents:
1191
diff
changeset
|
327 if p > priority then |
3be23cf5a659
stanza_router: Break off resource selection for messages into a standalone function
Matthew Wild <mwild1@gmail.com>
parents:
1191
diff
changeset
|
328 priority = p; |
3be23cf5a659
stanza_router: Break off resource selection for messages into a standalone function
Matthew Wild <mwild1@gmail.com>
parents:
1191
diff
changeset
|
329 recipients = {session}; |
3be23cf5a659
stanza_router: Break off resource selection for messages into a standalone function
Matthew Wild <mwild1@gmail.com>
parents:
1191
diff
changeset
|
330 elseif p == priority then |
3be23cf5a659
stanza_router: Break off resource selection for messages into a standalone function
Matthew Wild <mwild1@gmail.com>
parents:
1191
diff
changeset
|
331 t_insert(recipients, session); |
3be23cf5a659
stanza_router: Break off resource selection for messages into a standalone function
Matthew Wild <mwild1@gmail.com>
parents:
1191
diff
changeset
|
332 end |
3be23cf5a659
stanza_router: Break off resource selection for messages into a standalone function
Matthew Wild <mwild1@gmail.com>
parents:
1191
diff
changeset
|
333 end |
3be23cf5a659
stanza_router: Break off resource selection for messages into a standalone function
Matthew Wild <mwild1@gmail.com>
parents:
1191
diff
changeset
|
334 end |
3be23cf5a659
stanza_router: Break off resource selection for messages into a standalone function
Matthew Wild <mwild1@gmail.com>
parents:
1191
diff
changeset
|
335 return recipients; |
3be23cf5a659
stanza_router: Break off resource selection for messages into a standalone function
Matthew Wild <mwild1@gmail.com>
parents:
1191
diff
changeset
|
336 end |