prosody
aeb05598dec1
core/stanza_router.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Annotate

core/stanza_router.lua @ 897:aeb05598dec1

Merge
author Matthew Wild <mwild1@gmail.com>
date Fri, 20 Mar 2009 20:17:05 +0000
parent 896:2c0b9e3c11c3
parent 894:b61c3589cd7b
child 898:8176d224208a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
896
2c0b9e3c11c3 0.3->0.4
Matthew Wild <mwild1@gmail.com>
parents: 854
diff changeset
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
b1885732e979 GPL->MIT!
Matthew Wild <mwild1@gmail.com>
parents: 726
diff changeset
5 -- This project is MIT/X11 licensed. Please see the
b1885732e979 GPL->MIT!
Matthew Wild <mwild1@gmail.com>
parents: 726
diff changeset
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
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
10
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
11 local log = require "util.logger".init("stanzarouter")
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
12
71
fbb4ef1da82e Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents: 68
diff changeset
13 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
14 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
15 local user_exists = require "core.usermanager".user_exists;
71
fbb4ef1da82e Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents: 68
diff changeset
16
171
28f420d057a0 Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents: 170
diff changeset
17 local rostermanager = require "core.rostermanager";
175
5f71d290bb44 Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
18 local sessionmanager = require "core.sessionmanager";
249
1fc47cf5d144 Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents: 237
diff changeset
19 local offlinemanager = require "core.offlinemanager";
171
28f420d057a0 Inbound subscription approval
Waqas Hussain <waqas20@gmail.com>
parents: 170
diff changeset
20
145
fbb3a4ff9cf1 dialback keys now verified
Matthew Wild <mwild1@gmail.com>
parents: 144
diff changeset
21 local s2s_verify_dialback = require "core.s2smanager".verify_dialback;
146
3826ca244eb6 working outgoing s2s \o/
Matthew Wild <mwild1@gmail.com>
parents: 145
diff changeset
22 local s2s_make_authenticated = require "core.s2smanager".make_authenticated;
191
e64c8a44060f Fix s2s once and for all
Matthew Wild <mwild1@gmail.com>
parents: 190
diff changeset
23
e64c8a44060f Fix s2s once and for all
Matthew Wild <mwild1@gmail.com>
parents: 190
diff changeset
24 local modules_handle_stanza = require "core.modulemanager".handle_stanza;
212
9d6da9ed9063 Internal component support
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
25 local component_handle_stanza = require "core.componentmanager".handle_stanza;
191
e64c8a44060f Fix s2s once and for all
Matthew Wild <mwild1@gmail.com>
parents: 190
diff changeset
26
321
31fe15ce6fac Moved presence subscription code from stanza_router to presencemanager
Waqas Hussain <waqas20@gmail.com>
parents: 274
diff changeset
27 local handle_outbound_presence_subscriptions_and_probes = require "core.presencemanager".handle_outbound_presence_subscriptions_and_probes;
31fe15ce6fac Moved presence subscription code from stanza_router to presencemanager
Waqas Hussain <waqas20@gmail.com>
parents: 274
diff changeset
28 local handle_inbound_presence_subscriptions_and_probes = require "core.presencemanager".handle_inbound_presence_subscriptions_and_probes;
468
ab49cb6d0e92 Moved incoming c2s presence handling from stanza_router to presencemanager
Waqas Hussain <waqas20@gmail.com>
parents: 438
diff changeset
29 local handle_normal_presence = 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
30
145
fbb3a4ff9cf1 dialback keys now verified
Matthew Wild <mwild1@gmail.com>
parents: 144
diff changeset
31 local format = string.format;
fbb3a4ff9cf1 dialback keys now verified
Matthew Wild <mwild1@gmail.com>
parents: 144
diff changeset
32 local tostring = tostring;
199
eccf66b42bd7 Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents: 192
diff changeset
33 local t_concat = table.concat;
200
5e8b3cce798f Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents: 199
diff changeset
34 local t_insert = table.insert;
199
eccf66b42bd7 Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents: 192
diff changeset
35 local tonumber = tonumber;
eccf66b42bd7 Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents: 192
diff changeset
36 local s_find = string.find;
783
defb0119f80f Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents: 781
diff changeset
37 local pairs = pairs;
defb0119f80f Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents: 781
diff changeset
38 local ipairs = ipairs;
145
fbb3a4ff9cf1 dialback keys now verified
Matthew Wild <mwild1@gmail.com>
parents: 144
diff changeset
39
105
b099f0f80775 Removed an unnecessary line
Waqas Hussain <waqas20@gmail.com>
parents: 83
diff changeset
40 local jid_split = require "util.jid".split;
718
aa78dfb26593 Stringprep!
Waqas Hussain <waqas20@gmail.com>
parents: 715
diff changeset
41 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
42 local print = print;
715
beec1eb7d9c6 stanza_router: Fixed error replies for unhandled stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 667
diff changeset
43 local function checked_error_reply(origin, stanza)
718
aa78dfb26593 Stringprep!
Waqas Hussain <waqas20@gmail.com>
parents: 715
diff changeset
44 if (stanza.attr.xmlns == "jabber:client" or stanza.attr.xmlns == "jabber:server") and stanza.attr.type ~= "error" and stanza.attr.type ~= "result" then
715
beec1eb7d9c6 stanza_router: Fixed error replies for unhandled stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 667
diff changeset
45 origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); -- FIXME correct error?
beec1eb7d9c6 stanza_router: Fixed error replies for unhandled stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 667
diff changeset
46 end
beec1eb7d9c6 stanza_router: Fixed error replies for unhandled stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 667
diff changeset
47 end
30
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
48
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
49 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
50 (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
51
234
7c8313e055fb Hack to allow s2s stanzas to work until we do proper namespace handling
Waqas Hussain <waqas20@gmail.com>
parents: 223
diff changeset
52 if not stanza.attr.xmlns then stanza.attr.xmlns = "jabber:client"; end -- FIXME Hack. This should be removed when we fix namespace handling.
73
937448005121 Added to a comment
Waqas Hussain <waqas20@gmail.com>
parents: 72
diff changeset
53 -- TODO verify validity of stanza (as well as JID validity)
894
b61c3589cd7b Don't reject some valid IQs. Thanks to elmex for spotting.
Matthew Wild <mwild1@gmail.com>
parents: 854
diff changeset
54 if stanza.name == "iq" and #stanza.tags > 1 then
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
55 if stanza.attr.type == "set" or stanza.attr.type == "get" then
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
56 error("Invalid IQ");
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
fbb3a4ff9cf1 dialback keys now verified
Matthew Wild <mwild1@gmail.com>
parents: 144
diff changeset
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
aa78dfb26593 Stringprep!
Waqas Hussain <waqas20@gmail.com>
parents: 715
diff changeset
72 local node, host, resource;
aa78dfb26593 Stringprep!
Waqas Hussain <waqas20@gmail.com>
parents: 715
diff changeset
73 local from_node, from_host, from_resource;
aa78dfb26593 Stringprep!
Waqas Hussain <waqas20@gmail.com>
parents: 715
diff changeset
74 local to_bare, from_bare;
aa78dfb26593 Stringprep!
Waqas Hussain <waqas20@gmail.com>
parents: 715
diff changeset
75 if to then
aa78dfb26593 Stringprep!
Waqas Hussain <waqas20@gmail.com>
parents: 715
diff changeset
76 node, host, resource = jid_prepped_split(to);
aa78dfb26593 Stringprep!
Waqas Hussain <waqas20@gmail.com>
parents: 715
diff changeset
77 if not host then
aa78dfb26593 Stringprep!
Waqas Hussain <waqas20@gmail.com>
parents: 715
diff changeset
78 error("Invalid to JID");
aa78dfb26593 Stringprep!
Waqas Hussain <waqas20@gmail.com>
parents: 715
diff changeset
79 end
aa78dfb26593 Stringprep!
Waqas Hussain <waqas20@gmail.com>
parents: 715
diff changeset
80 to_bare = node and (node.."@"..host) or host; -- bare JID
aa78dfb26593 Stringprep!
Waqas Hussain <waqas20@gmail.com>
parents: 715
diff changeset
81 if resource then to = to_bare.."/"..resource; else to = to_bare; end
aa78dfb26593 Stringprep!
Waqas Hussain <waqas20@gmail.com>
parents: 715
diff changeset
82 stanza.attr.to = to;
aa78dfb26593 Stringprep!
Waqas Hussain <waqas20@gmail.com>
parents: 715
diff changeset
83 end
aa78dfb26593 Stringprep!
Waqas Hussain <waqas20@gmail.com>
parents: 715
diff changeset
84 if from then
aa78dfb26593 Stringprep!
Waqas Hussain <waqas20@gmail.com>
parents: 715
diff changeset
85 from_node, from_host, from_resource = jid_prepped_split(from);
aa78dfb26593 Stringprep!
Waqas Hussain <waqas20@gmail.com>
parents: 715
diff changeset
86 if not from_host then
aa78dfb26593 Stringprep!
Waqas Hussain <waqas20@gmail.com>
parents: 715
diff changeset
87 error("Invalid from JID");
aa78dfb26593 Stringprep!
Waqas Hussain <waqas20@gmail.com>
parents: 715
diff changeset
88 end
aa78dfb26593 Stringprep!
Waqas Hussain <waqas20@gmail.com>
parents: 715
diff changeset
89 from_bare = from_node and (from_node.."@"..from_host) or from_host; -- bare JID
aa78dfb26593 Stringprep!
Waqas Hussain <waqas20@gmail.com>
parents: 715
diff changeset
90 if from_resource then from = from_bare.."/"..from_resource; else from = from_bare; end
aa78dfb26593 Stringprep!
Waqas Hussain <waqas20@gmail.com>
parents: 715
diff changeset
91 stanza.attr.from = from;
aa78dfb26593 Stringprep!
Waqas Hussain <waqas20@gmail.com>
parents: 715
diff changeset
92 end
212
9d6da9ed9063 Internal component support
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
93
213
181f5cc6215b Commented a buggy check
Waqas Hussain <waqas20@gmail.com>
parents: 212
diff changeset
94 --[[if to and not(hosts[to]) and not(hosts[to_bare]) and (hosts[host] and hosts[host].type ~= "local") then -- not for us?
181f5cc6215b Commented a buggy check
Waqas Hussain <waqas20@gmail.com>
parents: 212
diff changeset
95 log("warn", "stanza recieved for a non-local server");
212
9d6da9ed9063 Internal component support
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
96 return; -- FIXME what should we do here?
213
181f5cc6215b Commented a buggy check
Waqas Hussain <waqas20@gmail.com>
parents: 212
diff changeset
97 end]] -- FIXME
207
90c387884234 A little whitespace fix
Waqas Hussain <waqas20@gmail.com>
parents: 200
diff changeset
98
212
9d6da9ed9063 Internal component support
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
99 -- FIXME do stanzas not of jabber:client get handled by components?
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
100 if (origin.type == "s2sin" or origin.type == "c2s") and (not xmlns or xmlns == "jabber:server" or xmlns == "jabber:client") then
631
6957fe7b0313 Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents: 621
diff changeset
101 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
102 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
103 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
104 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
105 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
106 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
107 end
780
4417ab6ccc20 Fixed directed presence handling to work correctly for components
Waqas Hussain <waqas20@gmail.com>
parents: 760
diff changeset
108 if origin.type == "c2s" and stanza.name == "presence" and to ~= nil and not(origin.roster[to_bare] and (origin.roster[to_bare].subscription == "both" or origin.roster[to_bare].subscription == "from")) then -- directed presence
4417ab6ccc20 Fixed directed presence handling to work correctly for components
Waqas Hussain <waqas20@gmail.com>
parents: 760
diff changeset
109 origin.directed = origin.directed or {};
4417ab6ccc20 Fixed directed presence handling to work correctly for components
Waqas Hussain <waqas20@gmail.com>
parents: 760
diff changeset
110 origin.directed[to] = true;
4417ab6ccc20 Fixed directed presence handling to work correctly for components
Waqas Hussain <waqas20@gmail.com>
parents: 760
diff changeset
111 --t_insert(origin.directed, to); -- FIXME does it make more sense to add to_bare rather than to?
4417ab6ccc20 Fixed directed presence handling to work correctly for components
Waqas Hussain <waqas20@gmail.com>
parents: 760
diff changeset
112 end
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
113 if not to then
6153462397d8 Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents: 221
diff changeset
114 core_handle_stanza(origin, stanza);
6153462397d8 Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents: 221
diff changeset
115 elseif hosts[to] and hosts[to].type == "local" then -- directed at a local server
6153462397d8 Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents: 221
diff changeset
116 core_handle_stanza(origin, stanza);
6153462397d8 Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents: 221
diff changeset
117 elseif stanza.attr.xmlns and stanza.attr.xmlns ~= "jabber:client" and stanza.attr.xmlns ~= "jabber:server" then
438
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents: 372
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);
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
125 elseif origin.type == "c2s" and stanza.name == "presence" and stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then
321
31fe15ce6fac Moved presence subscription code from stanza_router to presencemanager
Waqas Hussain <waqas20@gmail.com>
parents: 274
diff changeset
126 handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_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
127 elseif hosts[host] and hosts[host].type == "local" and stanza.name == "iq" and not resource then -- directed at bare JID
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
128 core_handle_stanza(origin, stanza);
6153462397d8 Redirecting all stanzas not from origin of type s2sin and c2s to core_handle_stanza
Waqas Hussain <waqas20@gmail.com>
parents: 221
diff changeset
129 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
130 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
131 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
132 else
212
9d6da9ed9063 Internal component support
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
133 core_handle_stanza(origin, stanza);
119
b48a573608e8 Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents: 113
diff changeset
134 end
b48a573608e8 Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents: 113
diff changeset
135 end
b48a573608e8 Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents: 113
diff changeset
136
121
74e5919e4737 Added a comment, removed all the old code
Matthew Wild <mwild1@gmail.com>
parents: 119
diff changeset
137 -- This function handles stanzas which are not routed any further,
74e5919e4737 Added a comment, removed all the old code
Matthew Wild <mwild1@gmail.com>
parents: 119
diff changeset
138 -- that is, they are handled by this server
119
b48a573608e8 Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents: 113
diff changeset
139 function core_handle_stanza(origin, stanza)
b48a573608e8 Relocate presence broadcast to core_handle_stanza()
Matthew Wild <mwild1@gmail.com>
parents: 113
diff changeset
140 -- Handlers
667
4f4d94253547 Send host, and not the recipient's JID to module manager (fixes #53)
Waqas Hussain <waqas20@gmail.com>
parents: 642
diff changeset
141 if modules_handle_stanza(select(2, jid_split(stanza.attr.to)) or origin.host, origin, stanza) then return; end
570
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
142 if origin.type == "c2s" or origin.type == "s2sin" then
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
143 if origin.type == "c2s" then
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
144 if stanza.name == "presence" and origin.roster then
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
145 if stanza.attr.type == nil or stanza.attr.type == "unavailable" then
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
146 handle_normal_presence(origin, stanza, core_route_stanza);
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
147 else
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
148 log("warn", "Unhandled c2s presence: %s", tostring(stanza));
715
beec1eb7d9c6 stanza_router: Fixed error replies for unhandled stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 667
diff changeset
149 checked_error_reply(origin, stanza);
570
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
150 end
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
151 else
570
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
152 log("warn", "Unhandled c2s stanza: %s", tostring(stanza));
715
beec1eb7d9c6 stanza_router: Fixed error replies for unhandled stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 667
diff changeset
153 checked_error_reply(origin, stanza);
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
154 end
570
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
155 else -- s2s stanzas
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
156 log("warn", "Unhandled s2s stanza: %s", tostring(stanza));
715
beec1eb7d9c6 stanza_router: Fixed error replies for unhandled stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 667
diff changeset
157 checked_error_reply(origin, stanza);
570
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
158 end
145
fbb3a4ff9cf1 dialback keys now verified
Matthew Wild <mwild1@gmail.com>
parents: 144
diff changeset
159 else
570
f40928c94933 Fixed: Stopped tryint to send error replies on unauthed connections
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
160 log("warn", "Unhandled %s stanza: %s", origin.type, tostring(stanza));
715
beec1eb7d9c6 stanza_router: Fixed error replies for unhandled stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 667
diff changeset
161 checked_error_reply(origin, stanza);
71
fbb4ef1da82e Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents: 68
diff changeset
162 end
30
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
163 end
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
164
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
165 function core_route_stanza(origin, stanza)
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
166 -- Hooks
68
ceb7a55676a4 Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents: 66
diff changeset
167 --- ...later
207
90c387884234 A little whitespace fix
Waqas Hussain <waqas20@gmail.com>
parents: 200
diff changeset
168
30
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
169 -- Deliver
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
170 local to = stanza.attr.to;
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
171 local node, host, resource = jid_split(to);
170
e7bff9cfbb65 Minor fixes, comments
Waqas Hussain <waqas20@gmail.com>
parents: 160
diff changeset
172 local to_bare = node and (node.."@"..host) or host; -- bare JID
e7bff9cfbb65 Minor fixes, comments
Waqas Hussain <waqas20@gmail.com>
parents: 160
diff changeset
173 local from = stanza.attr.from;
e7bff9cfbb65 Minor fixes, comments
Waqas Hussain <waqas20@gmail.com>
parents: 160
diff changeset
174 local from_node, from_host, from_resource = jid_split(from);
e7bff9cfbb65 Minor fixes, comments
Waqas Hussain <waqas20@gmail.com>
parents: 160
diff changeset
175 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
176
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
177 -- 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
178 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
179 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
180
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
181 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
182 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
183 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
184 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
185 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
186 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
187 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
188
151
096c7b9374fc Presence fixes (again)
Waqas Hussain <waqas20@gmail.com>
parents: 143
diff changeset
189 if stanza.name == "presence" and (stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable") then resource = nil; end
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
190
68
ceb7a55676a4 Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents: 66
diff changeset
191 local host_session = hosts[host]
ceb7a55676a4 Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents: 66
diff changeset
192 if host_session and host_session.type == "local" then
ceb7a55676a4 Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents: 66
diff changeset
193 -- Local host
71
fbb4ef1da82e Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents: 68
diff changeset
194 local user = host_session.sessions[node];
fbb4ef1da82e Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents: 68
diff changeset
195 if user then
72
e78db62beebc Code cleanup
Waqas Hussain <waqas20@gmail.com>
parents: 71
diff changeset
196 local res = user.sessions[resource];
71
fbb4ef1da82e Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents: 68
diff changeset
197 if not res then
fbb4ef1da82e Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents: 68
diff changeset
198 -- 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
199 if stanza.name == "presence" then
151
096c7b9374fc Presence fixes (again)
Waqas Hussain <waqas20@gmail.com>
parents: 143
diff changeset
200 if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then
321
31fe15ce6fac Moved presence subscription code from stanza_router to presencemanager
Waqas Hussain <waqas20@gmail.com>
parents: 274
diff changeset
201 handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza);
151
096c7b9374fc Presence fixes (again)
Waqas Hussain <waqas20@gmail.com>
parents: 143
diff changeset
202 else -- sender is available or unavailable
200
5e8b3cce798f Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents: 199
diff changeset
203 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
204 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
205 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
206 session.send(stanza);
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
207 end
106
f2a3d204a76a Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents: 105
diff changeset
208 end
f2a3d204a76a Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents: 105
diff changeset
209 end
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
210 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
211 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
212 if stanza.attr.type == 'headline' then
783
defb0119f80f Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents: 781
diff changeset
213 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
214 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
215 session.send(stanza);
defb0119f80f Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents: 781
diff changeset
216 end
106
f2a3d204a76a Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents: 105
diff changeset
217 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
218 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
219 -- 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
220 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
221 else
defb0119f80f Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents: 781
diff changeset
222 local priority = 0;
defb0119f80f Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents: 781
diff changeset
223 local recipients = {};
defb0119f80f Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents: 781
diff changeset
224 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
225 if session.presence then
defb0119f80f Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents: 781
diff changeset
226 local p = session.priority;
defb0119f80f Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents: 781
diff changeset
227 if p > priority then
defb0119f80f Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents: 781
diff changeset
228 priority = p;
defb0119f80f Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents: 781
diff changeset
229 recipients = {session};
defb0119f80f Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents: 781
diff changeset
230 elseif p == priority then
defb0119f80f Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents: 781
diff changeset
231 t_insert(recipients, session);
defb0119f80f Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents: 781
diff changeset
232 end
defb0119f80f Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents: 781
diff changeset
233 end
defb0119f80f Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents: 781
diff changeset
234 end
defb0119f80f Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents: 781
diff changeset
235 local count = 0;
defb0119f80f Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents: 781
diff changeset
236 for _, session in ipairs(recipients) do
defb0119f80f Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents: 781
diff changeset
237 session.send(stanza);
defb0119f80f Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents: 781
diff changeset
238 count = count + 1;
defb0119f80f Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents: 781
diff changeset
239 end
defb0119f80f Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents: 781
diff changeset
240 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
241 offlinemanager.store(node, host, stanza);
defb0119f80f Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents: 781
diff changeset
242 -- TODO deal with storage errors
defb0119f80f Stanza router: Message to bare JID fixes
Waqas Hussain <waqas20@gmail.com>
parents: 781
diff changeset
243 end
200
5e8b3cce798f Priority based message routing, etc
Waqas Hussain <waqas20@gmail.com>
parents: 199
diff changeset
244 end
106
f2a3d204a76a Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents: 105
diff changeset
245 else
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
246 -- TODO send IQ error
71
fbb4ef1da82e Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents: 68
diff changeset
247 end
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
248 else
121
74e5919e4737 Added a comment, removed all the old code
Matthew Wild <mwild1@gmail.com>
parents: 119
diff changeset
249 -- User + resource is online...
170
e7bff9cfbb65 Minor fixes, comments
Waqas Hussain <waqas20@gmail.com>
parents: 160
diff changeset
250 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
251 res.send(stanza); -- Yay \o/
106
f2a3d204a76a Added: presence broadcast
Waqas Hussain <waqas20@gmail.com>
parents: 105
diff changeset
252 end
71
fbb4ef1da82e Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents: 68
diff changeset
253 else
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
254 -- user not online
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
255 if user_exists(node, host) then
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
256 if stanza.name == "presence" then
175
5f71d290bb44 Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
257 if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" then
321
31fe15ce6fac Moved presence subscription code from stanza_router to presencemanager
Waqas Hussain <waqas20@gmail.com>
parents: 274
diff changeset
258 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
259 else
175
5f71d290bb44 Routing code reorganization
Waqas Hussain <waqas20@gmail.com>
parents: 174
diff changeset
260 -- TODO send unavailable presence or unsubscribed
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
261 end
642
0ae8584ba3e7 More error replies for offline and non-existing users
Waqas Hussain <waqas20@gmail.com>
parents: 641
diff changeset
262 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
263 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
264 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
265 offlinemanager.store(node, host, stanza);
1fc47cf5d144 Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents: 237
diff changeset
266 -- 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
267 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
268 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
269 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
270 origin.send(reply);
249
1fc47cf5d144 Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents: 237
diff changeset
271 end
1fc47cf5d144 Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents: 237
diff changeset
272 -- TODO allow configuration of offline storage
1fc47cf5d144 Added basic offline message support
Waqas Hussain <waqas20@gmail.com>
parents: 237
diff changeset
273 -- 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
274 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
275 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
276 end
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
277 else -- user does not exist
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
278 -- 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
279 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
280 local t = stanza.attr.type;
0ae8584ba3e7 More error replies for offline and non-existing users
Waqas Hussain <waqas20@gmail.com>
parents: 641
diff changeset
281 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
282 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
283 end
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
284 -- 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
285 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
286 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
287 end
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
288 end
71
fbb4ef1da82e Added: Local stanza routing
Waqas Hussain <waqas20@gmail.com>
parents: 68
diff changeset
289 end
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents: 147
diff changeset
290 elseif origin.type == "c2s" then
68
ceb7a55676a4 Beginnings of real stanza routing
Matthew Wild <mwild1@gmail.com>
parents: 66
diff changeset
291 -- Remote host
170
e7bff9cfbb65 Minor fixes, comments
Waqas Hussain <waqas20@gmail.com>
parents: 160
diff changeset
292 local xmlns = stanza.attr.xmlns;
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents: 147
diff changeset
293 --stanza.attr.xmlns = "jabber:server";
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents: 147
diff changeset
294 stanza.attr.xmlns = nil;
146
3826ca244eb6 working outgoing s2s \o/
Matthew Wild <mwild1@gmail.com>
parents: 145
diff changeset
295 log("debug", "sending s2s stanza: %s", tostring(stanza));
170
e7bff9cfbb65 Minor fixes, comments
Waqas Hussain <waqas20@gmail.com>
parents: 160
diff changeset
296 send_s2s(origin.host, host, stanza); -- TODO handle remote routing errors
e7bff9cfbb65 Minor fixes, comments
Waqas Hussain <waqas20@gmail.com>
parents: 160
diff changeset
297 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
298 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
299 -- 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
300 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
301 send_s2s(origin.host, host, stanza);
148
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents: 147
diff changeset
302 else
4c0dcd245d34 s2s works! \o/ \o/
Matthew Wild <mwild1@gmail.com>
parents: 147
diff changeset
303 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
304 end
113
9026fdad1531 Working presence, presence probes and other fixes
Waqas Hussain <waqas20@gmail.com>
parents: 106
diff changeset
305 stanza.attr.to = to; -- reset
30
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
306 end