author | Waqas Hussain <waqas20@gmail.com> |
Thu, 25 Jun 2009 07:59:04 +0500 | |
changeset 1407 | 85ec12aec35f |
parent 1406 | 83c6fb3d9e73 |
child 1408 | 9b745496b953 |
permissions | -rw-r--r-- |
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"; |
249
1fc47cf5d144
Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents:
237
diff
changeset
|
20 |
local offlinemanager = require "core.offlinemanager"; |
171
28f420d057a0
Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents:
170
diff
changeset
|
21 |
|
191 | 22 |
local modules_handle_stanza = require "core.modulemanager".handle_stanza; |
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
23 |
local component_handle_stanza = require "core.componentmanager".handle_stanza; |
191 | 24 |
|
145 | 25 |
local tostring = tostring; |
200
5e8b3cce798f
Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents:
199
diff
changeset
|
26 |
local t_insert = table.insert; |
783
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
27 |
local pairs = pairs; |
defb0119f80f
Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents:
781
diff
changeset
|
28 |
local ipairs = ipairs; |
145 | 29 |
|
105
b099f0f80775
Removed an unnecessary line
Waqas Hussain <waqas20@gmail.com>
parents:
83
diff
changeset
|
30 |
local jid_split = require "util.jid".split; |
718 | 31 |
local jid_prepped_split = require "util.jid".prepped_split; |
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
|
32 |
local fire_event = prosody.events.fire_event; |
30 | 33 |
|
34 |
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
|
35 |
(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
|
36 |
|
1178
f332c033bfc8
stanza_router: Remove FIXME and replace with meaningful comment
Matthew Wild <mwild1@gmail.com>
parents:
1172
diff
changeset
|
37 |
-- 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
|
38 |
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
|
39 |
|
73 | 40 |
-- 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
|
41 |
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
|
42 |
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
|
43 |
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
|
44 |
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
|
45 |
return; |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
46 |
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
|
47 |
end |
78
972e31cc91e8
Fized: Added check to ensure that resource binding is done after auth.
Waqas Hussain <waqas20@gmail.com>
parents:
73
diff
changeset
|
48 |
|
1367
e4d660e58dfc
stanza_router: A little refactoring
Waqas Hussain <waqas20@gmail.com>
parents:
1358
diff
changeset
|
49 |
if origin.type == "c2s" then |
e4d660e58dfc
stanza_router: A little refactoring
Waqas Hussain <waqas20@gmail.com>
parents:
1358
diff
changeset
|
50 |
if not origin.full_jid |
e4d660e58dfc
stanza_router: A little refactoring
Waqas Hussain <waqas20@gmail.com>
parents:
1358
diff
changeset
|
51 |
and not(stanza.name == "iq" and stanza.attr.type == "set" and stanza.tags[1] and stanza.tags[1].name == "bind" |
e4d660e58dfc
stanza_router: A little refactoring
Waqas Hussain <waqas20@gmail.com>
parents:
1358
diff
changeset
|
52 |
and stanza.tags[1].attr.xmlns == "urn:ietf:params:xml:ns:xmpp-bind") then |
e4d660e58dfc
stanza_router: A little refactoring
Waqas Hussain <waqas20@gmail.com>
parents:
1358
diff
changeset
|
53 |
-- authenticated client isn't bound and current stanza is not a bind request |
e4d660e58dfc
stanza_router: A little refactoring
Waqas Hussain <waqas20@gmail.com>
parents:
1358
diff
changeset
|
54 |
origin.send(st.error_reply(stanza, "auth", "not-authorized")); -- FIXME maybe allow stanzas to account or server |
1368
0cb70958b8fb
stanza_router: Fixed a corner case where processing could continue after an error reply
Waqas Hussain <waqas20@gmail.com>
parents:
1367
diff
changeset
|
55 |
return; |
1367
e4d660e58dfc
stanza_router: A little refactoring
Waqas Hussain <waqas20@gmail.com>
parents:
1358
diff
changeset
|
56 |
end |
78
972e31cc91e8
Fized: Added check to ensure that resource binding is done after auth.
Waqas Hussain <waqas20@gmail.com>
parents:
73
diff
changeset
|
57 |
|
1367
e4d660e58dfc
stanza_router: A little refactoring
Waqas Hussain <waqas20@gmail.com>
parents:
1358
diff
changeset
|
58 |
-- TODO also, stanzas should be returned to their original state before the function ends |
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
59 |
stanza.attr.from = origin.full_jid; |
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
60 |
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
|
61 |
local to, xmlns = stanza.attr.to, stanza.attr.xmlns; |
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
62 |
local from = stanza.attr.from; |
718 | 63 |
local node, host, resource; |
64 |
local from_node, from_host, from_resource; |
|
65 |
local to_bare, from_bare; |
|
66 |
if to then |
|
1370
3a467e6885f0
stanza_router: Skip prepping 'to' in many common cases - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1369
diff
changeset
|
67 |
if full_sessions[to] or bare_sessions[to] or hosts[to] then |
3a467e6885f0
stanza_router: Skip prepping 'to' in many common cases - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1369
diff
changeset
|
68 |
node, host = jid_split(to); -- TODO only the host is needed, optimize |
3a467e6885f0
stanza_router: Skip prepping 'to' in many common cases - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1369
diff
changeset
|
69 |
else |
3a467e6885f0
stanza_router: Skip prepping 'to' in many common cases - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1369
diff
changeset
|
70 |
node, host, resource = jid_prepped_split(to); |
3a467e6885f0
stanza_router: Skip prepping 'to' in many common cases - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1369
diff
changeset
|
71 |
if not host then |
3a467e6885f0
stanza_router: Skip prepping 'to' in many common cases - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1369
diff
changeset
|
72 |
log("warn", "Received stanza with invalid destination JID: %s", to); |
3a467e6885f0
stanza_router: Skip prepping 'to' in many common cases - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1369
diff
changeset
|
73 |
if stanza.attr.type ~= "error" and stanza.attr.type ~= "result" then |
3a467e6885f0
stanza_router: Skip prepping 'to' in many common cases - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1369
diff
changeset
|
74 |
origin.send(st.error_reply(stanza, "modify", "jid-malformed", "The destination address is invalid: "..to)); |
3a467e6885f0
stanza_router: Skip prepping 'to' in many common cases - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1369
diff
changeset
|
75 |
end |
3a467e6885f0
stanza_router: Skip prepping 'to' in many common cases - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1369
diff
changeset
|
76 |
return; |
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
|
77 |
end |
1370
3a467e6885f0
stanza_router: Skip prepping 'to' in many common cases - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1369
diff
changeset
|
78 |
to_bare = node and (node.."@"..host) or host; -- bare JID |
3a467e6885f0
stanza_router: Skip prepping 'to' in many common cases - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1369
diff
changeset
|
79 |
if resource then to = to_bare.."/"..resource; else to = to_bare; end |
3a467e6885f0
stanza_router: Skip prepping 'to' in many common cases - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1369
diff
changeset
|
80 |
stanza.attr.to = to; |
718 | 81 |
end |
82 |
end |
|
1369
633e032a3b4b
stanza_router: Skip prepping 'from' on c2s origins - #optimization
Waqas Hussain <waqas20@gmail.com>
parents:
1368
diff
changeset
|
83 |
if from and not origin.full_jid 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
|
84 |
-- We only stamp the 'from' on c2s stanzas, so we still need to check validity |
718 | 85 |
from_node, from_host, from_resource = jid_prepped_split(from); |
86 |
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
|
87 |
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
|
88 |
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
|
89 |
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
|
90 |
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
|
91 |
return; |
718 | 92 |
end |
93 |
from_bare = from_node and (from_node.."@"..from_host) or from_host; -- bare JID |
|
94 |
if from_resource then from = from_bare.."/"..from_resource; else from = from_bare; end |
|
95 |
stanza.attr.from = from; |
|
96 |
end |
|
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
97 |
|
213 | 98 |
--[[if to and not(hosts[to]) and not(hosts[to_bare]) and (hosts[host] and hosts[host].type ~= "local") then -- not for us? |
99 |
log("warn", "stanza recieved for a non-local server"); |
|
212
9d6da9ed9063
Internal component support
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
100 |
return; -- FIXME what should we do here? |
213 | 101 |
end]] -- FIXME |
207 | 102 |
|
1165
ec69bcc7ceb5
stanza_router: Cleaner namespace handling
Waqas Hussain <waqas20@gmail.com>
parents:
1164
diff
changeset
|
103 |
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
|
104 |
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
|
105 |
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
|
106 |
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
|
107 |
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
|
108 |
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
|
109 |
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
|
110 |
end |
1172
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
111 |
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
|
112 |
else |
1254
c199be608546
stanza_router: Fire events for non-jabber:client and pre-auth stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1244
diff
changeset
|
113 |
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
|
114 |
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
|
115 |
local event; |
c199be608546
stanza_router: Fire events for non-jabber:client and pre-auth stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1244
diff
changeset
|
116 |
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
|
117 |
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
|
118 |
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
|
119 |
else |
c199be608546
stanza_router: Fire events for non-jabber:client and pre-auth stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1244
diff
changeset
|
120 |
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
|
121 |
end |
c199be608546
stanza_router: Fire events for non-jabber:client and pre-auth stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1244
diff
changeset
|
122 |
else |
c199be608546
stanza_router: Fire events for non-jabber:client and pre-auth stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
1244
diff
changeset
|
123 |
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
|
124 |
end |
1262
0d94c57555d9
Backed out changeset 98f0e9eadf3b (better fix on the way)
Matthew Wild <mwild1@gmail.com>
parents:
1256
diff
changeset
|
125 |
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
|
126 |
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
|
127 |
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
|
128 |
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
|
129 |
end |
b48a573608e8
Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents:
113
diff
changeset
|
130 |
end |
b48a573608e8
Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents:
113
diff
changeset
|
131 |
|
1172
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
132 |
function core_post_stanza(origin, stanza) |
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
133 |
local to = stanza.attr.to; |
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
134 |
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
|
135 |
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
|
136 |
|
1228
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
137 |
local to_type; |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
138 |
if node then |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
139 |
if resource then |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
140 |
to_type = '/full'; |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
141 |
else |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
142 |
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
|
143 |
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
|
144 |
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
|
145 |
end |
1228
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
146 |
end |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
147 |
else |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
148 |
if host then |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
149 |
to_type = '/host'; |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
150 |
else |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
151 |
to_type = '/bare'; |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
152 |
end |
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 |
|
1172
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
155 |
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
|
156 |
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
|
157 |
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
|
158 |
end |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
159 |
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
|
160 |
if h then |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
161 |
if h.type == "component" then |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
162 |
component_handle_stanza(origin, stanza); |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
163 |
return; |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
164 |
else |
1262
0d94c57555d9
Backed out changeset 98f0e9eadf3b (better fix on the way)
Matthew Wild <mwild1@gmail.com>
parents:
1256
diff
changeset
|
165 |
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
|
166 |
end |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
167 |
end |
853d3d76ba94
stanza_router: Fire per-host stanza events
Waqas Hussain <waqas20@gmail.com>
parents:
1212
diff
changeset
|
168 |
|
1182
89e9f0d555a2
stanza_router: Handle outbound presence if inbound handlers don't catch it
Waqas Hussain <waqas20@gmail.com>
parents:
1179
diff
changeset
|
169 |
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
|
170 |
-- event handled |
89e9f0d555a2
stanza_router: Handle outbound presence if inbound handlers don't catch it
Waqas Hussain <waqas20@gmail.com>
parents:
1179
diff
changeset
|
171 |
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
|
172 |
-- event handled |
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
173 |
elseif not to then |
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
174 |
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
|
175 |
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
|
176 |
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
|
177 |
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
|
178 |
component_handle_stanza(origin, stanza); |
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
179 |
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
|
180 |
component_handle_stanza(origin, stanza); |
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
181 |
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
|
182 |
modules_handle_stanza(host or origin.host or origin.to_host, origin, stanza); |
145 | 183 |
else |
1172
490ff24d0ac5
stanza_router: Added global function core_post_stanza
Waqas Hussain <waqas20@gmail.com>
parents:
1169
diff
changeset
|
184 |
core_route_stanza(origin, stanza); |
71
fbb4ef1da82e
Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents:
68
diff
changeset
|
185 |
end |
30 | 186 |
end |
187 |
||
188 |
function core_route_stanza(origin, stanza) |
|
189 |
-- Hooks |
|
68
ceb7a55676a4
Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
190 |
--- ...later |
207 | 191 |
|
30 | 192 |
-- Deliver |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
193 |
local to = stanza.attr.to; |
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
194 |
local node, host, resource = jid_split(to); |
170 | 195 |
local to_bare = node and (node.."@"..host) or host; -- bare JID |
196 |
local from = stanza.attr.from; |
|
197 |
local from_node, from_host, from_resource = jid_split(from); |
|
198 |
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
|
199 |
|
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
|
200 |
-- 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
|
201 |
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
|
202 |
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
|
203 |
|
1168
dd523bfc9ea9
Dropped support for resource based components
Waqas Hussain <waqas20@gmail.com>
parents:
1167
diff
changeset
|
204 |
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
|
205 |
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
|
206 |
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
|
207 |
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
|
208 |
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
|
209 |
|
966
d2692d427496
Fixed: Issue with presence error routing
Waqas Hussain <waqas20@gmail.com>
parents:
924
diff
changeset
|
210 |
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
|
211 |
|
68
ceb7a55676a4
Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
212 |
local host_session = hosts[host] |
ceb7a55676a4
Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
213 |
if host_session and host_session.type == "local" then |
1406
83c6fb3d9e73
stanza_router: Removed old routing code
Waqas Hussain <waqas20@gmail.com>
parents:
1370
diff
changeset
|
214 |
-- old stanza routing code removed |
148 | 215 |
elseif origin.type == "c2s" then |
68
ceb7a55676a4
Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents:
66
diff
changeset
|
216 |
-- Remote host |
170 | 217 |
local xmlns = stanza.attr.xmlns; |
148 | 218 |
--stanza.attr.xmlns = "jabber:server"; |
219 |
stanza.attr.xmlns = nil; |
|
146 | 220 |
log("debug", "sending s2s stanza: %s", tostring(stanza)); |
170 | 221 |
send_s2s(origin.host, host, stanza); -- TODO handle remote routing errors |
222 |
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
|
223 |
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
|
224 |
-- Route via s2s for components and modules |
1348
ffa70c0df850
stanza_router: Use stanza.attr.from's host instead of origin.host when routing stanzas to remote hosts (fixes problem with sending from node@host components)
Waqas Hussain <waqas20@gmail.com>
parents:
1307
diff
changeset
|
225 |
log("debug", "Routing outgoing stanza for %s to %s", from_host, host); |
ffa70c0df850
stanza_router: Use stanza.attr.from's host instead of origin.host when routing stanzas to remote hosts (fixes problem with sending from node@host components)
Waqas Hussain <waqas20@gmail.com>
parents:
1307
diff
changeset
|
226 |
send_s2s(from_host, host, stanza); |
148 | 227 |
else |
228 |
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
|
229 |
end |
113
9026fdad1531
Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents:
106
diff
changeset
|
230 |
stanza.attr.to = to; -- reset |
30 | 231 |
end |