Software / code / prosody
Annotate
core/s2smanager.lua @ 4026:21edd42768b5
s2smanager: send_to_host(): Handle already-destroyed session and bounce stanza accordingly
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 24 Dec 2010 04:56:37 +0000 |
| parent | 4025:cc2e75e49cfb |
| child | 4027:81d0ed5787f6 |
| rev | line source |
|---|---|
|
1523
841d61be198f
Remove version number from copyright headers
Matthew Wild <mwild1@gmail.com>
parents:
1492
diff
changeset
|
1 -- Prosody IM |
|
2923
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2889
diff
changeset
|
2 -- Copyright (C) 2008-2010 Matthew Wild |
|
b7049746bd29
Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents:
2889
diff
changeset
|
3 -- Copyright (C) 2008-2010 Waqas Hussain |
|
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
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:
451
diff
changeset
|
7 -- |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
diff
changeset
|
8 |
|
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
451
diff
changeset
|
9 |
| 148 | 10 |
| 11 local hosts = hosts; | |
| 12 local sessions = sessions; | |
|
631
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
13 local core_process_stanza = function(a, b) core_process_stanza(a, b); end |
|
1204
dea89234e545
s2smanager: Timeout DNS requests after 60 seconds (or dns_timeout in config)
Matthew Wild <mwild1@gmail.com>
parents:
1199
diff
changeset
|
14 local add_task = require "util.timer".add_task; |
| 148 | 15 local socket = require "socket"; |
| 16 local format = string.format; | |
| 337 | 17 local t_insert, t_sort = table.insert, table.sort; |
|
255
43a9683bcd19
Fix for detecting when we are routing a stanza to ourself (I'm sure this has something to do with you, waqas...)
Matthew Wild <mwild1@gmail.com>
parents:
254
diff
changeset
|
18 local get_traceback = debug.traceback; |
|
3540
bc139431830b
Monster whitespace commit (beware the whitespace monster).
Waqas Hussain <waqas20@gmail.com>
parents:
3489
diff
changeset
|
19 local tostring, pairs, ipairs, getmetatable, newproxy, error, tonumber, setmetatable |
|
bc139431830b
Monster whitespace commit (beware the whitespace monster).
Waqas Hussain <waqas20@gmail.com>
parents:
3489
diff
changeset
|
20 = tostring, pairs, ipairs, getmetatable, newproxy, error, tonumber, setmetatable; |
| 148 | 21 |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
22 local idna_to_ascii = require "util.encodings".idna.to_ascii; |
| 148 | 23 local connlisteners_get = require "net.connlisteners".get; |
|
3146
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
24 local initialize_filters = require "util.filters".initialize; |
|
739
1def06cd9311
Port to new server.lua, quite some changes, but I believe everything to be working
Matthew Wild <mwild1@gmail.com>
parents:
631
diff
changeset
|
25 local wrapclient = require "net.server".wrapclient; |
| 148 | 26 local modulemanager = require "core.modulemanager"; |
|
244
0e3bda34f958
Missed importing a function in last commit
Matthew Wild <mwild1@gmail.com>
parents:
243
diff
changeset
|
27 local st = require "stanza"; |
|
0e3bda34f958
Missed importing a function in last commit
Matthew Wild <mwild1@gmail.com>
parents:
243
diff
changeset
|
28 local stanza = st.stanza; |
|
931
4514ed5ee943
Fixed: s2smanager: Apply nameprep on hostnames passed in stream tag (part of issue #57)
Waqas Hussain <waqas20@gmail.com>
parents:
896
diff
changeset
|
29 local nameprep = require "util.encodings".stringprep.nameprep; |
| 148 | 30 |
|
3436
9c454c029c26
s2smanager: Remove dependency on eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
3432
diff
changeset
|
31 local fire_event = prosody.events.fire_event; |
| 148 | 32 local uuid_gen = require "util.uuid".generate; |
| 33 | |
| 34 local logger_init = require "util.logger".init; | |
| 35 | |
| 36 local log = logger_init("s2smanager"); | |
| 37 | |
|
448
2623519b25b0
Switched from md5 to sha256 for dialback key generation
Waqas Hussain <waqas20@gmail.com>
parents:
435
diff
changeset
|
38 local sha256_hash = require "util.hashes".sha256; |
| 148 | 39 |
|
1793
1fc6c2822e6b
s2smanager: Compatibility with domains which use CNAMEs
Matthew Wild <mwild1@gmail.com>
parents:
1791
diff
changeset
|
40 local adns, dns = require "net.adns", require "net.dns"; |
|
1962
3e7231c6d6a9
s2smanager: Fix access of 'config' global without requiring configmanager
Matthew Wild <mwild1@gmail.com>
parents:
1936
diff
changeset
|
41 local config = require "core.configmanager"; |
|
1796
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
42 local connect_timeout = config.get("*", "core", "s2s_timeout") or 60; |
|
3329
9adafeeadecb
s2smanager: Lower default DNS timeout to 15s (it's now a per-DNS-server timeout, rather than total timeout), use net.dns's new timeout system, and remove our custom timeout handlers
Matthew Wild <mwild1@gmail.com>
parents:
3312
diff
changeset
|
43 local dns_timeout = config.get("*", "core", "dns_timeout") or 15; |
|
1805
7e41ad68fe3c
core.s2smanager: Don't recurse CNAMEs infinitely :)
Matthew Wild <mwild1@gmail.com>
parents:
1796
diff
changeset
|
44 local max_dns_depth = config.get("*", "core", "dns_max_depth") or 3; |
|
1204
dea89234e545
s2smanager: Timeout DNS requests after 60 seconds (or dns_timeout in config)
Matthew Wild <mwild1@gmail.com>
parents:
1199
diff
changeset
|
45 |
|
3329
9adafeeadecb
s2smanager: Lower default DNS timeout to 15s (it's now a per-DNS-server timeout, rather than total timeout), use net.dns's new timeout system, and remove our custom timeout handlers
Matthew Wild <mwild1@gmail.com>
parents:
3312
diff
changeset
|
46 dns.settimeout(dns_timeout); |
|
9adafeeadecb
s2smanager: Lower default DNS timeout to 15s (it's now a per-DNS-server timeout, rather than total timeout), use net.dns's new timeout system, and remove our custom timeout handlers
Matthew Wild <mwild1@gmail.com>
parents:
3312
diff
changeset
|
47 |
|
3476
193bb0936a4e
s2smanager: Fire s2s{in,out}-established when new s2s connections are ready
Matthew Wild <mwild1@gmail.com>
parents:
3459
diff
changeset
|
48 local prosody = _G.prosody; |
|
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
|
49 incoming_s2s = {}; |
|
3476
193bb0936a4e
s2smanager: Fire s2s{in,out}-established when new s2s connections are ready
Matthew Wild <mwild1@gmail.com>
parents:
3459
diff
changeset
|
50 prosody.incoming_s2s = incoming_s2s; |
|
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
|
51 local incoming_s2s = incoming_s2s; |
|
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
|
52 |
| 148 | 53 module "s2smanager" |
| 54 | |
|
2711
5d97fb043141
s2smanager: Fix for the logic SRV record priority comparison (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents:
2165
diff
changeset
|
55 function compare_srv_priorities(a,b) |
|
5d97fb043141
s2smanager: Fix for the logic SRV record priority comparison (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents:
2165
diff
changeset
|
56 return a.priority < b.priority or (a.priority == b.priority and a.weight > b.weight); |
|
5d97fb043141
s2smanager: Fix for the logic SRV record priority comparison (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents:
2165
diff
changeset
|
57 end |
| 337 | 58 |
|
3431
c499f4752cd8
s2smanager: Only bounce real stanzas on s2s failure, not dialback and friends (thanks elghinn)
Matthew Wild <mwild1@gmail.com>
parents:
3383
diff
changeset
|
59 local bouncy_stanzas = { message = true, presence = true, iq = true }; |
|
2781
4b5881b6bbfc
s2smanager: Have both destroy_session and bounce_sendq accept a reason string to include in bounced stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2780
diff
changeset
|
60 local function bounce_sendq(session, reason) |
|
631
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
61 local sendq = session.sendq; |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
62 if sendq then |
|
1075
831c84cbf5fa
s2smanager: Miscellaneous logging improvements, changing levels, improving messages and using session loggers where possible
Matthew Wild <mwild1@gmail.com>
parents:
1007
diff
changeset
|
63 session.log("info", "sending error replies for "..#sendq.." queued stanzas because of failed outgoing connection to "..tostring(session.to_host)); |
|
631
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
64 local dummy = { |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
65 type = "s2sin"; |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
66 send = function(s) |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
67 (session.log or log)("error", "Replying to to an s2s error reply, please report this! Traceback: %s", get_traceback()); |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
68 end; |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
69 dummy = true; |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
70 }; |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
71 for i, data in ipairs(sendq) do |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
72 local reply = data[2]; |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
73 local xmlns = reply.attr.xmlns; |
|
3432
7f3e45955725
s2smanager: brackets, just to be sure :)
Matthew Wild <mwild1@gmail.com>
parents:
3431
diff
changeset
|
74 if not(xmlns) and bouncy_stanzas[reply.name] then |
|
631
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
75 reply.attr.type = "error"; |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
76 reply:tag("error", {type = "cancel"}) |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
77 :tag("remote-server-not-found", {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):up(); |
|
2781
4b5881b6bbfc
s2smanager: Have both destroy_session and bounce_sendq accept a reason string to include in bounced stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2780
diff
changeset
|
78 if reason then |
|
4b5881b6bbfc
s2smanager: Have both destroy_session and bounce_sendq accept a reason string to include in bounced stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2780
diff
changeset
|
79 reply:tag("text", {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):text("Connection failed: "..reason):up(); |
|
4b5881b6bbfc
s2smanager: Have both destroy_session and bounce_sendq accept a reason string to include in bounced stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2780
diff
changeset
|
80 end |
|
631
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
81 core_process_stanza(dummy, reply); |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
82 end |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
83 sendq[i] = nil; |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
84 end |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
85 session.sendq = nil; |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
86 end |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
87 end |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
88 |
| 148 | 89 function send_to_host(from_host, to_host, data) |
|
2165
529af807ba1a
s2smanager: Log warning when trying to send a stanza from a host we don't serve, instead of a traceback (thanks stpeter)
Matthew Wild <mwild1@gmail.com>
parents:
2090
diff
changeset
|
90 if not hosts[from_host] then |
|
529af807ba1a
s2smanager: Log warning when trying to send a stanza from a host we don't serve, instead of a traceback (thanks stpeter)
Matthew Wild <mwild1@gmail.com>
parents:
2090
diff
changeset
|
91 log("warn", "Attempt to send stanza from %s - a host we don't serve", from_host); |
|
529af807ba1a
s2smanager: Log warning when trying to send a stanza from a host we don't serve, instead of a traceback (thanks stpeter)
Matthew Wild <mwild1@gmail.com>
parents:
2090
diff
changeset
|
92 return false; |
|
529af807ba1a
s2smanager: Log warning when trying to send a stanza from a host we don't serve, instead of a traceback (thanks stpeter)
Matthew Wild <mwild1@gmail.com>
parents:
2090
diff
changeset
|
93 end |
|
260
182f0c895676
Now outgoing s2s sessions are associated with their from_host, fixes #15
Matthew Wild <mwild1@gmail.com>
parents:
259
diff
changeset
|
94 local host = hosts[from_host].s2sout[to_host]; |
|
190
1e993b7deae7
General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc.
Matthew Wild <mwild1@gmail.com>
parents:
186
diff
changeset
|
95 if host then |
|
241
021ccf988f3b
Some s2s fixes. Now connect() does not block, and stanzas are not lost when connection is slow
Matthew Wild <mwild1@gmail.com>
parents:
233
diff
changeset
|
96 -- We have a connection to this host already |
|
2949
ef19faa7d106
stanza_router, s2smanager, modulemanager: Fix for handling of the default namespace on stanzas, causing sometimes jabber:client to be sent over s2s, and accepted
Matthew Wild <mwild1@gmail.com>
parents:
2923
diff
changeset
|
97 if host.type == "s2sout_unauthed" and (data.name ~= "db:verify" or not host.dialback_key) then |
|
558
ab3960421356
Fix for s2s with jabberd2 (we weren't routing db:verify's over s2sout_unauthed)
Matthew Wild <mwild1@gmail.com>
parents:
544
diff
changeset
|
98 (host.log or log)("debug", "trying to send over unauthed s2sout to "..to_host); |
|
241
021ccf988f3b
Some s2s fixes. Now connect() does not block, and stanzas are not lost when connection is slow
Matthew Wild <mwild1@gmail.com>
parents:
233
diff
changeset
|
99 |
|
021ccf988f3b
Some s2s fixes. Now connect() does not block, and stanzas are not lost when connection is slow
Matthew Wild <mwild1@gmail.com>
parents:
233
diff
changeset
|
100 -- Queue stanza until we are able to send it |
|
631
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
101 if host.sendq then t_insert(host.sendq, {tostring(data), st.reply(data)}); |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
102 else host.sendq = { {tostring(data), st.reply(data)} }; end |
|
559
fa4a51fe6442
Remove an incorrect line which I didn't add, and fix the proper way. Corrects the sending of stanzas over unauthed s2sout's. Also fixes mod_dialback to send stanzas and not strings.
Matthew Wild <mwild1@gmail.com>
parents:
558
diff
changeset
|
103 host.log("debug", "stanza [%s] queued ", data.name); |
|
255
43a9683bcd19
Fix for detecting when we are routing a stanza to ourself (I'm sure this has something to do with you, waqas...)
Matthew Wild <mwild1@gmail.com>
parents:
254
diff
changeset
|
104 elseif host.type == "local" or host.type == "component" then |
|
43a9683bcd19
Fix for detecting when we are routing a stanza to ourself (I'm sure this has something to do with you, waqas...)
Matthew Wild <mwild1@gmail.com>
parents:
254
diff
changeset
|
105 log("error", "Trying to send a stanza to ourselves??") |
| 256 | 106 log("error", "Traceback: %s", get_traceback()); |
|
258
a93ccd84db83
Yep, s2s definitely works now. This is just a small fix for logging...
Matthew Wild <mwild1@gmail.com>
parents:
257
diff
changeset
|
107 log("error", "Stanza: %s", tostring(data)); |
|
4016
0e927d4644c3
s2smanager: send_to_host(): Return false on failure, and true otherwise
Matthew Wild <mwild1@gmail.com>
parents:
3650
diff
changeset
|
108 return false; |
|
190
1e993b7deae7
General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc.
Matthew Wild <mwild1@gmail.com>
parents:
186
diff
changeset
|
109 else |
|
253
f2869ded1d37
Another small fix, for logging in s2smanager
Matthew Wild <mwild1@gmail.com>
parents:
252
diff
changeset
|
110 (host.log or log)("debug", "going to send stanza to "..to_host.." from "..from_host); |
|
225
bbbd169b326b
Just committing this warning, because I want to know if the problem really affects us
Matthew Wild <mwild1@gmail.com>
parents:
199
diff
changeset
|
111 -- FIXME |
|
260
182f0c895676
Now outgoing s2s sessions are associated with their from_host, fixes #15
Matthew Wild <mwild1@gmail.com>
parents:
259
diff
changeset
|
112 if host.from_host ~= from_host then |
|
254
6eb3dea1d68b
Another small fix, for logging in s2smanager
Matthew Wild <mwild1@gmail.com>
parents:
253
diff
changeset
|
113 log("error", "WARNING! This might, possibly, be a bug, but it might not..."); |
| 331 | 114 log("error", "We are going to send from %s instead of %s", tostring(host.from_host), tostring(from_host)); |
|
254
6eb3dea1d68b
Another small fix, for logging in s2smanager
Matthew Wild <mwild1@gmail.com>
parents:
253
diff
changeset
|
115 end |
|
260
182f0c895676
Now outgoing s2s sessions are associated with their from_host, fixes #15
Matthew Wild <mwild1@gmail.com>
parents:
259
diff
changeset
|
116 host.sends2s(data); |
|
182f0c895676
Now outgoing s2s sessions are associated with their from_host, fixes #15
Matthew Wild <mwild1@gmail.com>
parents:
259
diff
changeset
|
117 host.log("debug", "stanza sent over "..host.type); |
|
190
1e993b7deae7
General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc.
Matthew Wild <mwild1@gmail.com>
parents:
186
diff
changeset
|
118 end |
| 148 | 119 else |
| 120 log("debug", "opening a new outgoing connection for this stanza"); | |
| 121 local host_session = new_outgoing(from_host, to_host); | |
|
2090
7810648ea26d
s2smanager: Fail outgoing s2s connection if hostname does not pass idna_to_ascii(), thanks Flo + waqas
Matthew Wild <mwild1@gmail.com>
parents:
2089
diff
changeset
|
122 |
| 148 | 123 -- Store in buffer |
|
631
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
124 host_session.sendq = { {tostring(data), st.reply(data)} }; |
|
1006
9166d7a8c3c0
core.s2smanager: Logging improvements
Matthew Wild <mwild1@gmail.com>
parents:
995
diff
changeset
|
125 log("debug", "stanza [%s] queued until connection complete", tostring(data.name)); |
|
9166d7a8c3c0
core.s2smanager: Logging improvements
Matthew Wild <mwild1@gmail.com>
parents:
995
diff
changeset
|
126 if (not host_session.connecting) and (not host_session.conn) then |
|
9166d7a8c3c0
core.s2smanager: Logging improvements
Matthew Wild <mwild1@gmail.com>
parents:
995
diff
changeset
|
127 log("warn", "Connection to %s failed already, destroying session...", to_host); |
|
4026
21edd42768b5
s2smanager: send_to_host(): Handle already-destroyed session and bounce stanza accordingly
Matthew Wild <mwild1@gmail.com>
parents:
4025
diff
changeset
|
128 if not destroy_session(host_session, "Connection failed") then |
|
21edd42768b5
s2smanager: send_to_host(): Handle already-destroyed session and bounce stanza accordingly
Matthew Wild <mwild1@gmail.com>
parents:
4025
diff
changeset
|
129 -- Already destroyed, we need to bounce our stanza |
|
21edd42768b5
s2smanager: send_to_host(): Handle already-destroyed session and bounce stanza accordingly
Matthew Wild <mwild1@gmail.com>
parents:
4025
diff
changeset
|
130 bounce_sendq(host_session, host_session.destruction_reason); |
|
21edd42768b5
s2smanager: send_to_host(): Handle already-destroyed session and bounce stanza accordingly
Matthew Wild <mwild1@gmail.com>
parents:
4025
diff
changeset
|
131 end |
|
4016
0e927d4644c3
s2smanager: send_to_host(): Return false on failure, and true otherwise
Matthew Wild <mwild1@gmail.com>
parents:
3650
diff
changeset
|
132 return false; |
|
1006
9166d7a8c3c0
core.s2smanager: Logging improvements
Matthew Wild <mwild1@gmail.com>
parents:
995
diff
changeset
|
133 end |
| 148 | 134 end |
|
4016
0e927d4644c3
s2smanager: send_to_host(): Return false on failure, and true otherwise
Matthew Wild <mwild1@gmail.com>
parents:
3650
diff
changeset
|
135 return true; |
| 148 | 136 end |
| 137 | |
| 138 local open_sessions = 0; | |
| 139 | |
| 140 function new_incoming(conn) | |
|
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
|
141 local session = { conn = conn, type = "s2sin_unauthed", direction = "incoming", hosts = {} }; |
| 148 | 142 if true then |
| 143 session.trace = newproxy(true); | |
|
583
5821eaa80baa
Remove print()s from sessionmanager and s2smanager
Matthew Wild <mwild1@gmail.com>
parents:
559
diff
changeset
|
144 getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; end; |
| 148 | 145 end |
| 146 open_sessions = open_sessions + 1; | |
| 343 | 147 local w, log = conn.write, logger_init("s2sin"..tostring(conn):match("[a-f0-9]+$")); |
|
1686
232c2bf155c7
core.s2smanager, xmppserver_listener: Move the responsibility of setting session.log from the latter to the former for incoming sessions (outgoing are already like this)
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
148 session.log = log; |
|
3146
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
149 local filter = initialize_filters(session); |
|
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
150 session.sends2s = function (t) |
|
3224
9dd54a708523
s2smanager: Move 'sending' debug log message so that it sees the pre-filtered stanzas
Matthew Wild <mwild1@gmail.com>
parents:
3152
diff
changeset
|
151 log("debug", "sending: %s", t.top_tag and t:top_tag() or t:match("^([^>]*>?)")); |
|
3146
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
152 if t.name then |
|
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
153 t = filter("stanzas/out", t); |
|
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
154 end |
|
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
155 if t then |
|
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
156 t = filter("bytes/out", tostring(t)); |
|
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
157 if t then |
|
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
158 return w(conn, t); |
|
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
159 end |
|
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
160 end |
|
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
161 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
|
162 incoming_s2s[session] = true; |
|
1796
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
163 add_task(connect_timeout, function () |
|
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
164 if session.conn ~= conn or |
|
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
165 session.type == "s2sin" then |
|
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
166 return; -- Ok, we're connect[ed|ing] |
|
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
167 end |
|
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
168 -- Not connected, need to close session and clean up |
|
2419
00d985639a06
s2smanager: Trim trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2382
diff
changeset
|
169 (session.log or log)("warn", "Destroying incomplete session %s->%s due to inactivity", |
|
1796
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
170 session.from_host or "(unknown)", session.to_host or "(unknown)"); |
|
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
171 session:close("connection-timeout"); |
|
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
172 end); |
| 148 | 173 return session; |
| 174 end | |
| 175 | |
|
2422
affeb565b050
s2smanager: Allow new_outgoing() to create sessions without automatically connecting them (set 3rd parameters to false)
Matthew Wild <mwild1@gmail.com>
parents:
2421
diff
changeset
|
176 function new_outgoing(from_host, to_host, connect) |
|
2419
00d985639a06
s2smanager: Trim trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2382
diff
changeset
|
177 local host_session = { to_host = to_host, from_host = from_host, host = from_host, |
|
2426
4cef9808662a
s2smanager: Split sending of stream header into a :open_stream() method
Matthew Wild <mwild1@gmail.com>
parents:
2422
diff
changeset
|
178 notopen = true, type = "s2sout_unauthed", direction = "outgoing", |
|
4cef9808662a
s2smanager: Split sending of stream header into a :open_stream() method
Matthew Wild <mwild1@gmail.com>
parents:
2422
diff
changeset
|
179 open_stream = session_open_stream }; |
|
1888
562635baad36
s2smanager: Give outgoing sessions a host field (the local one)
Matthew Wild <mwild1@gmail.com>
parents:
1836
diff
changeset
|
180 |
|
260
182f0c895676
Now outgoing s2s sessions are associated with their from_host, fixes #15
Matthew Wild <mwild1@gmail.com>
parents:
259
diff
changeset
|
181 hosts[from_host].s2sout[to_host] = host_session; |
| 148 | 182 |
|
4021
5af5fdaaa940
s2smanager: Give all new outgoing s2s sessions a close method by default (destroy_session)
Matthew Wild <mwild1@gmail.com>
parents:
4020
diff
changeset
|
183 host_session.close = destroy_session; -- This gets replaced by xmppserver_listener later |
|
5af5fdaaa940
s2smanager: Give all new outgoing s2s sessions a close method by default (destroy_session)
Matthew Wild <mwild1@gmail.com>
parents:
4020
diff
changeset
|
184 |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
185 local log; |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
186 do |
|
543
cf6e19ea1cbc
Fix logger ids for c2s and s2sout
Matthew Wild <mwild1@gmail.com>
parents:
519
diff
changeset
|
187 local conn_name = "s2sout"..tostring(host_session):match("[a-f0-9]*$"); |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
188 log = logger_init(conn_name); |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
189 host_session.log = log; |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
190 end |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
191 |
|
3146
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
192 initialize_filters(host_session); |
|
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
193 |
|
2422
affeb565b050
s2smanager: Allow new_outgoing() to create sessions without automatically connecting them (set 3rd parameters to false)
Matthew Wild <mwild1@gmail.com>
parents:
2421
diff
changeset
|
194 if connect ~= false then |
|
affeb565b050
s2smanager: Allow new_outgoing() to create sessions without automatically connecting them (set 3rd parameters to false)
Matthew Wild <mwild1@gmail.com>
parents:
2421
diff
changeset
|
195 -- Kick the connection attempting machine into life |
|
4025
cc2e75e49cfb
s2smanager: new_outgoing(): Destroy session if first connection attempt fails immediately (e.g. can't create sockets)
Matthew Wild <mwild1@gmail.com>
parents:
4021
diff
changeset
|
196 if not attempt_connection(host_session) then |
|
cc2e75e49cfb
s2smanager: new_outgoing(): Destroy session if first connection attempt fails immediately (e.g. can't create sockets)
Matthew Wild <mwild1@gmail.com>
parents:
4021
diff
changeset
|
197 -- Intentionally not returning here, the |
|
cc2e75e49cfb
s2smanager: new_outgoing(): Destroy session if first connection attempt fails immediately (e.g. can't create sockets)
Matthew Wild <mwild1@gmail.com>
parents:
4021
diff
changeset
|
198 -- session is needed, connected or not |
|
cc2e75e49cfb
s2smanager: new_outgoing(): Destroy session if first connection attempt fails immediately (e.g. can't create sockets)
Matthew Wild <mwild1@gmail.com>
parents:
4021
diff
changeset
|
199 destroy_session(host_session); |
|
cc2e75e49cfb
s2smanager: new_outgoing(): Destroy session if first connection attempt fails immediately (e.g. can't create sockets)
Matthew Wild <mwild1@gmail.com>
parents:
4021
diff
changeset
|
200 end |
|
2422
affeb565b050
s2smanager: Allow new_outgoing() to create sessions without automatically connecting them (set 3rd parameters to false)
Matthew Wild <mwild1@gmail.com>
parents:
2421
diff
changeset
|
201 end |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
202 |
|
2419
00d985639a06
s2smanager: Trim trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2382
diff
changeset
|
203 if not host_session.sends2s then |
|
1007
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
204 -- A sends2s which buffers data (until the stream is opened) |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
205 -- note that data in this buffer will be sent before the stream is authed |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
206 -- and will not be ack'd in any way, successful or otherwise |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
207 local buffer; |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
208 function host_session.sends2s(data) |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
209 if not buffer then |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
210 buffer = {}; |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
211 host_session.send_buffer = buffer; |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
212 end |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
213 log("debug", "Buffering data on unconnected s2sout to %s", to_host); |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
214 buffer[#buffer+1] = data; |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
215 log("debug", "Buffered item %d: %s", #buffer, tostring(data)); |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
216 end |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
217 end |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
218 |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
219 return host_session; |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
220 end |
|
353
e7d776b5ebb9
Remove an old FIXME comment
Matthew Wild <mwild1@gmail.com>
parents:
351
diff
changeset
|
221 |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
222 |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
223 function attempt_connection(host_session, err) |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
224 local from_host, to_host = host_session.from_host, host_session.to_host; |
|
3309
1c58cb93ef3e
s2smanager: Don't attempt to connect to a nil host (for whatever reason... invalid DNS record perhaps?) (thanks dersd)
Matthew Wild <mwild1@gmail.com>
parents:
3151
diff
changeset
|
225 local connect_host, connect_port = to_host and idna_to_ascii(to_host), 5269; |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
226 |
|
2090
7810648ea26d
s2smanager: Fail outgoing s2s connection if hostname does not pass idna_to_ascii(), thanks Flo + waqas
Matthew Wild <mwild1@gmail.com>
parents:
2089
diff
changeset
|
227 if not connect_host then |
|
7810648ea26d
s2smanager: Fail outgoing s2s connection if hostname does not pass idna_to_ascii(), thanks Flo + waqas
Matthew Wild <mwild1@gmail.com>
parents:
2089
diff
changeset
|
228 return false; |
|
7810648ea26d
s2smanager: Fail outgoing s2s connection if hostname does not pass idna_to_ascii(), thanks Flo + waqas
Matthew Wild <mwild1@gmail.com>
parents:
2089
diff
changeset
|
229 end |
|
7810648ea26d
s2smanager: Fail outgoing s2s connection if hostname does not pass idna_to_ascii(), thanks Flo + waqas
Matthew Wild <mwild1@gmail.com>
parents:
2089
diff
changeset
|
230 |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
231 if not err then -- This is our first attempt |
|
1006
9166d7a8c3c0
core.s2smanager: Logging improvements
Matthew Wild <mwild1@gmail.com>
parents:
995
diff
changeset
|
232 log("debug", "First attempt to connect to %s, starting with SRV lookup...", to_host); |
| 974 | 233 host_session.connecting = true; |
|
1791
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
234 local handle; |
|
1204
dea89234e545
s2smanager: Timeout DNS requests after 60 seconds (or dns_timeout in config)
Matthew Wild <mwild1@gmail.com>
parents:
1199
diff
changeset
|
235 handle = adns.lookup(function (answer) |
|
dea89234e545
s2smanager: Timeout DNS requests after 60 seconds (or dns_timeout in config)
Matthew Wild <mwild1@gmail.com>
parents:
1199
diff
changeset
|
236 handle = nil; |
| 974 | 237 host_session.connecting = nil; |
| 238 if answer then | |
| 239 log("debug", to_host.." has SRV records, handling..."); | |
| 240 local srv_hosts = {}; | |
| 241 host_session.srv_hosts = srv_hosts; | |
| 242 for _, record in ipairs(answer) do | |
| 243 t_insert(srv_hosts, record.srv); | |
| 244 end | |
| 245 t_sort(srv_hosts, compare_srv_priorities); | |
| 246 | |
| 247 local srv_choice = srv_hosts[1]; | |
| 248 host_session.srv_choice = 1; | |
| 249 if srv_choice then | |
| 250 connect_host, connect_port = srv_choice.target or to_host, srv_choice.port or connect_port; | |
| 251 log("debug", "Best record found, will connect to %s:%d", connect_host, connect_port); | |
| 252 end | |
| 253 else | |
| 254 log("debug", to_host.." has no SRV records, falling back to A"); | |
| 337 | 255 end |
| 974 | 256 -- Try with SRV, or just the plain hostname if no SRV |
|
1492
aaeccebad0f3
s2smanager: Fix to correctly bounce stanzas if first connection attempt fails instantly
Matthew Wild <mwild1@gmail.com>
parents:
1468
diff
changeset
|
257 local ok, err = try_connect(host_session, connect_host, connect_port); |
|
aaeccebad0f3
s2smanager: Fix to correctly bounce stanzas if first connection attempt fails instantly
Matthew Wild <mwild1@gmail.com>
parents:
1468
diff
changeset
|
258 if not ok then |
|
aaeccebad0f3
s2smanager: Fix to correctly bounce stanzas if first connection attempt fails instantly
Matthew Wild <mwild1@gmail.com>
parents:
1468
diff
changeset
|
259 if not attempt_connection(host_session, err) then |
|
aaeccebad0f3
s2smanager: Fix to correctly bounce stanzas if first connection attempt fails instantly
Matthew Wild <mwild1@gmail.com>
parents:
1468
diff
changeset
|
260 -- No more attempts will be made |
|
2783
57611584e27d
s2smanager: Give reasons to destroy_session in more cases, including when DNS lookup fails
Matthew Wild <mwild1@gmail.com>
parents:
2781
diff
changeset
|
261 destroy_session(host_session, err); |
|
1492
aaeccebad0f3
s2smanager: Fix to correctly bounce stanzas if first connection attempt fails instantly
Matthew Wild <mwild1@gmail.com>
parents:
1468
diff
changeset
|
262 end |
|
aaeccebad0f3
s2smanager: Fix to correctly bounce stanzas if first connection attempt fails instantly
Matthew Wild <mwild1@gmail.com>
parents:
1468
diff
changeset
|
263 end |
| 974 | 264 end, "_xmpp-server._tcp."..connect_host..".", "SRV"); |
|
1204
dea89234e545
s2smanager: Timeout DNS requests after 60 seconds (or dns_timeout in config)
Matthew Wild <mwild1@gmail.com>
parents:
1199
diff
changeset
|
265 |
| 974 | 266 return true; -- Attempt in progress |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
267 elseif host_session.srv_hosts and #host_session.srv_hosts > host_session.srv_choice then -- Not our first attempt, and we also have SRV |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
268 host_session.srv_choice = host_session.srv_choice + 1; |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
269 local srv_choice = host_session.srv_hosts[host_session.srv_choice]; |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
270 connect_host, connect_port = srv_choice.target or to_host, srv_choice.port or connect_port; |
|
1075
831c84cbf5fa
s2smanager: Miscellaneous logging improvements, changing levels, improving messages and using session loggers where possible
Matthew Wild <mwild1@gmail.com>
parents:
1007
diff
changeset
|
271 host_session.log("info", "Connection failed (%s). Attempt #%d: This time to %s:%d", tostring(err), host_session.srv_choice, connect_host, connect_port); |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
272 else |
|
1075
831c84cbf5fa
s2smanager: Miscellaneous logging improvements, changing levels, improving messages and using session loggers where possible
Matthew Wild <mwild1@gmail.com>
parents:
1007
diff
changeset
|
273 host_session.log("info", "Out of connection options, can't connect to %s", tostring(host_session.to_host)); |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
274 -- We're out of options |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
275 return false; |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
276 end |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
277 |
|
960
6bc16062da6c
core.s2smanager: Check for valid host and port before attempting connection
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
278 if not (connect_host and connect_port) then |
|
6bc16062da6c
core.s2smanager: Check for valid host and port before attempting connection
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
279 -- Likely we couldn't resolve DNS |
|
1006
9166d7a8c3c0
core.s2smanager: Logging improvements
Matthew Wild <mwild1@gmail.com>
parents:
995
diff
changeset
|
280 log("warn", "Hmm, we're without a host (%s) and port (%s) to connect to for %s, giving up :(", tostring(connect_host), tostring(connect_port), tostring(to_host)); |
|
960
6bc16062da6c
core.s2smanager: Check for valid host and port before attempting connection
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
281 return false; |
|
6bc16062da6c
core.s2smanager: Check for valid host and port before attempting connection
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
282 end |
|
6bc16062da6c
core.s2smanager: Check for valid host and port before attempting connection
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
283 |
| 974 | 284 return try_connect(host_session, connect_host, connect_port); |
| 285 end | |
| 286 | |
| 287 function try_connect(host_session, connect_host, connect_port) | |
|
1791
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
288 host_session.connecting = true; |
|
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
289 local handle; |
|
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
290 handle = adns.lookup(function (reply) |
|
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
291 handle = nil; |
|
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
292 host_session.connecting = nil; |
|
1793
1fc6c2822e6b
s2smanager: Compatibility with domains which use CNAMEs
Matthew Wild <mwild1@gmail.com>
parents:
1791
diff
changeset
|
293 |
|
1fc6c2822e6b
s2smanager: Compatibility with domains which use CNAMEs
Matthew Wild <mwild1@gmail.com>
parents:
1791
diff
changeset
|
294 -- COMPAT: This is a compromise for all you CNAME-(ab)users :) |
|
1828
48cb27e2716e
core.s2smanager: Always use last record in the DNS cache
Matthew Wild <mwild1@gmail.com>
parents:
1805
diff
changeset
|
295 if not (reply and reply[#reply] and reply[#reply].a) then |
|
1805
7e41ad68fe3c
core.s2smanager: Don't recurse CNAMEs infinitely :)
Matthew Wild <mwild1@gmail.com>
parents:
1796
diff
changeset
|
296 local count = max_dns_depth; |
|
1793
1fc6c2822e6b
s2smanager: Compatibility with domains which use CNAMEs
Matthew Wild <mwild1@gmail.com>
parents:
1791
diff
changeset
|
297 reply = dns.peek(connect_host, "CNAME", "IN"); |
|
1828
48cb27e2716e
core.s2smanager: Always use last record in the DNS cache
Matthew Wild <mwild1@gmail.com>
parents:
1805
diff
changeset
|
298 while count > 0 and reply and reply[#reply] and not reply[#reply].a and reply[#reply].cname do |
|
48cb27e2716e
core.s2smanager: Always use last record in the DNS cache
Matthew Wild <mwild1@gmail.com>
parents:
1805
diff
changeset
|
299 log("debug", "Looking up %s (DNS depth is %d)", tostring(reply[#reply].cname), count); |
|
48cb27e2716e
core.s2smanager: Always use last record in the DNS cache
Matthew Wild <mwild1@gmail.com>
parents:
1805
diff
changeset
|
300 reply = dns.peek(reply[#reply].cname, "A", "IN") or dns.peek(reply[#reply].cname, "CNAME", "IN"); |
|
1805
7e41ad68fe3c
core.s2smanager: Don't recurse CNAMEs infinitely :)
Matthew Wild <mwild1@gmail.com>
parents:
1796
diff
changeset
|
301 count = count - 1; |
|
1793
1fc6c2822e6b
s2smanager: Compatibility with domains which use CNAMEs
Matthew Wild <mwild1@gmail.com>
parents:
1791
diff
changeset
|
302 end |
|
1fc6c2822e6b
s2smanager: Compatibility with domains which use CNAMEs
Matthew Wild <mwild1@gmail.com>
parents:
1791
diff
changeset
|
303 end |
|
1fc6c2822e6b
s2smanager: Compatibility with domains which use CNAMEs
Matthew Wild <mwild1@gmail.com>
parents:
1791
diff
changeset
|
304 -- end of CNAME resolving |
|
1fc6c2822e6b
s2smanager: Compatibility with domains which use CNAMEs
Matthew Wild <mwild1@gmail.com>
parents:
1791
diff
changeset
|
305 |
|
1828
48cb27e2716e
core.s2smanager: Always use last record in the DNS cache
Matthew Wild <mwild1@gmail.com>
parents:
1805
diff
changeset
|
306 if reply and reply[#reply] and reply[#reply].a then |
|
48cb27e2716e
core.s2smanager: Always use last record in the DNS cache
Matthew Wild <mwild1@gmail.com>
parents:
1805
diff
changeset
|
307 log("debug", "DNS reply for %s gives us %s", connect_host, reply[#reply].a); |
|
48cb27e2716e
core.s2smanager: Always use last record in the DNS cache
Matthew Wild <mwild1@gmail.com>
parents:
1805
diff
changeset
|
308 return make_connect(host_session, reply[#reply].a, connect_port); |
|
1791
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
309 else |
|
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
310 log("debug", "DNS lookup failed to get a response for %s", connect_host); |
|
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
311 if not attempt_connection(host_session, "name resolution failed") then -- Retry if we can |
|
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
312 log("debug", "No other records to try for %s - destroying", host_session.to_host); |
|
2783
57611584e27d
s2smanager: Give reasons to destroy_session in more cases, including when DNS lookup fails
Matthew Wild <mwild1@gmail.com>
parents:
2781
diff
changeset
|
313 destroy_session(host_session, "DNS resolution failed"); -- End of the line, we can't |
|
1791
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
314 end |
|
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
315 end |
|
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
316 end, connect_host, "A", "IN"); |
|
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
317 |
|
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
318 return true; |
|
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
319 end |
|
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
320 |
|
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
321 function make_connect(host_session, connect_host, connect_port) |
|
2813
46dfcc33ea9e
s2smanager: Use s2smanager log() if session doesn't have a logger (thanks Flo)
Matthew Wild <mwild1@gmail.com>
parents:
2801
diff
changeset
|
322 (host_session.log or log)("info", "Beginning new connection attempt to %s (%s:%d)", host_session.to_host, connect_host, connect_port); |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
323 -- Ok, we're going to try to connect |
| 974 | 324 |
| 325 local from_host, to_host = host_session.from_host, host_session.to_host; | |
| 326 | |
|
4020
472691075967
s2smanager: Add a missing semi-colon
Matthew Wild <mwild1@gmail.com>
parents:
4019
diff
changeset
|
327 local conn, handler = socket.tcp(); |
|
2712
9c579864b20a
s2smanager: Log and fail gracefully when unable to create socket for outgoing s2s connection (thanks foucault)
Matthew Wild <mwild1@gmail.com>
parents:
2711
diff
changeset
|
328 |
|
9c579864b20a
s2smanager: Log and fail gracefully when unable to create socket for outgoing s2s connection (thanks foucault)
Matthew Wild <mwild1@gmail.com>
parents:
2711
diff
changeset
|
329 if not conn then |
|
9c579864b20a
s2smanager: Log and fail gracefully when unable to create socket for outgoing s2s connection (thanks foucault)
Matthew Wild <mwild1@gmail.com>
parents:
2711
diff
changeset
|
330 log("warn", "Failed to create outgoing connection, system error: %s", handler); |
|
9c579864b20a
s2smanager: Log and fail gracefully when unable to create socket for outgoing s2s connection (thanks foucault)
Matthew Wild <mwild1@gmail.com>
parents:
2711
diff
changeset
|
331 return false, handler; |
|
9c579864b20a
s2smanager: Log and fail gracefully when unable to create socket for outgoing s2s connection (thanks foucault)
Matthew Wild <mwild1@gmail.com>
parents:
2711
diff
changeset
|
332 end |
| 974 | 333 |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
334 conn:settimeout(0); |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
335 local success, err = conn:connect(connect_host, connect_port); |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
336 if not success and err ~= "timeout" then |
|
1468
83b297a412a2
s2smanager: Log the hostname and address when s2s connection fails instantly
Matthew Wild <mwild1@gmail.com>
parents:
1450
diff
changeset
|
337 log("warn", "s2s connect() to %s (%s:%d) failed: %s", host_session.to_host, connect_host, connect_port, err); |
|
1492
aaeccebad0f3
s2smanager: Fix to correctly bounce stanzas if first connection attempt fails instantly
Matthew Wild <mwild1@gmail.com>
parents:
1468
diff
changeset
|
338 return false, err; |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
339 end |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
340 |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
341 local cl = connlisteners_get("xmppserver"); |
|
2545
99700e601d16
s2smanager: Update for new server SSL API (don't pass a sslctx)
Matthew Wild <mwild1@gmail.com>
parents:
2539
diff
changeset
|
342 conn = wrapclient(conn, connect_host, connect_port, cl, cl.default_mode or 1 ); |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
343 host_session.conn = conn; |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
344 |
|
3146
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
345 local filter = initialize_filters(host_session); |
|
2019
c712ea57b877
s2smanager: Use session-specific logger to log outgoing data on outgoing s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1976
diff
changeset
|
346 local w, log = conn.write, host_session.log; |
|
3146
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
347 host_session.sends2s = function (t) |
|
3265
9374f84c6677
s2smanager: Fix logging for outgoing sessions to also log pre-filtered data
Matthew Wild <mwild1@gmail.com>
parents:
3224
diff
changeset
|
348 log("debug", "sending: %s", (t.top_tag and t:top_tag()) or t:match("^[^>]*>?")); |
|
3146
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
349 if t.name then |
|
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
350 t = filter("stanzas/out", t); |
|
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
351 end |
|
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
352 if t then |
|
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
353 t = filter("bytes/out", tostring(t)); |
|
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
354 if t then |
|
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
355 return w(conn, tostring(t)); |
|
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
356 end |
|
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
357 end |
|
aaaea4cdbf10
s2smanager: Add filters for outgoing bytes and stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2951
diff
changeset
|
358 end |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
359 |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
360 -- Register this outgoing connection so that xmppserver_listener knows about it |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
361 -- otherwise it will assume it is a new incoming connection |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
362 cl.register_outgoing(conn, host_session); |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
363 |
|
2469
9e0c0b08f219
s2smanager: No-one noticed that Prosody stopped sending to/from on stream headers recently? :)
Matthew Wild <mwild1@gmail.com>
parents:
2426
diff
changeset
|
364 host_session:open_stream(from_host, to_host); |
|
2426
4cef9808662a
s2smanager: Split sending of stream header into a :open_stream() method
Matthew Wild <mwild1@gmail.com>
parents:
2422
diff
changeset
|
365 |
| 974 | 366 log("debug", "Connection attempt in progress..."); |
|
1796
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
367 add_task(connect_timeout, function () |
|
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
368 if host_session.conn ~= conn or |
|
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
369 host_session.type == "s2sout" or |
|
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
370 host_session.connecting then |
|
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
371 return; -- Ok, we're connect[ed|ing] |
|
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
372 end |
|
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
373 -- Not connected, need to close session and clean up |
|
2419
00d985639a06
s2smanager: Trim trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2382
diff
changeset
|
374 (host_session.log or log)("warn", "Destroying incomplete session %s->%s due to inactivity", |
|
1796
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
375 host_session.from_host or "(unknown)", host_session.to_host or "(unknown)"); |
|
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
376 host_session:close("connection-timeout"); |
|
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
377 end); |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
378 return true; |
| 148 | 379 end |
| 380 | |
|
2426
4cef9808662a
s2smanager: Split sending of stream header into a :open_stream() method
Matthew Wild <mwild1@gmail.com>
parents:
2422
diff
changeset
|
381 function session_open_stream(session, from, to) |
|
4cef9808662a
s2smanager: Split sending of stream header into a :open_stream() method
Matthew Wild <mwild1@gmail.com>
parents:
2422
diff
changeset
|
382 session.sends2s(st.stanza("stream:stream", { |
|
4cef9808662a
s2smanager: Split sending of stream header into a :open_stream() method
Matthew Wild <mwild1@gmail.com>
parents:
2422
diff
changeset
|
383 xmlns='jabber:server', ["xmlns:db"]='jabber:server:dialback', |
|
4cef9808662a
s2smanager: Split sending of stream header into a :open_stream() method
Matthew Wild <mwild1@gmail.com>
parents:
2422
diff
changeset
|
384 ["xmlns:stream"]='http://etherx.jabber.org/streams', |
|
4cef9808662a
s2smanager: Split sending of stream header into a :open_stream() method
Matthew Wild <mwild1@gmail.com>
parents:
2422
diff
changeset
|
385 from=from, to=to, version='1.0', ["xml:lang"]='en'}):top_tag()); |
|
4cef9808662a
s2smanager: Split sending of stream header into a :open_stream() method
Matthew Wild <mwild1@gmail.com>
parents:
2422
diff
changeset
|
386 end |
|
4cef9808662a
s2smanager: Split sending of stream header into a :open_stream() method
Matthew Wild <mwild1@gmail.com>
parents:
2422
diff
changeset
|
387 |
| 148 | 388 function streamopened(session, attr) |
|
186
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
389 local send = session.sends2s; |
| 148 | 390 |
|
544
efde848869c5
Don't send stream:features to incoming s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
543
diff
changeset
|
391 -- TODO: #29: SASL/TLS on s2s streams |
|
1894
53f34ba6f6d6
Minor changes; outgoing TLS works.
Paul Aurich <paul@darkrain42.org>
parents:
1891
diff
changeset
|
392 session.version = tonumber(attr.version) or 0; |
|
544
efde848869c5
Don't send stream:features to incoming s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
543
diff
changeset
|
393 |
|
1909
84027581c995
s2smanager: Mark session as secure if it was negotiating TLS and opens a new stream
Matthew Wild <mwild1@gmail.com>
parents:
1895
diff
changeset
|
394 if session.secure == false then |
|
84027581c995
s2smanager: Mark session as secure if it was negotiating TLS and opens a new stream
Matthew Wild <mwild1@gmail.com>
parents:
1895
diff
changeset
|
395 session.secure = true; |
|
84027581c995
s2smanager: Mark session as secure if it was negotiating TLS and opens a new stream
Matthew Wild <mwild1@gmail.com>
parents:
1895
diff
changeset
|
396 end |
|
84027581c995
s2smanager: Mark session as secure if it was negotiating TLS and opens a new stream
Matthew Wild <mwild1@gmail.com>
parents:
1895
diff
changeset
|
397 |
| 148 | 398 if session.direction == "incoming" then |
| 399 -- Send a reply stream header | |
|
938
663f75dd7b42
Fixed: Some nil access bugs
Waqas Hussain <waqas20@gmail.com>
parents:
931
diff
changeset
|
400 session.to_host = attr.to and nameprep(attr.to); |
|
663f75dd7b42
Fixed: Some nil access bugs
Waqas Hussain <waqas20@gmail.com>
parents:
931
diff
changeset
|
401 session.from_host = attr.from and nameprep(attr.from); |
| 148 | 402 |
| 403 session.streamid = uuid_gen(); | |
|
360
e918c979ad1a
Remove or comment useless prints, or change them to log()
Matthew Wild <mwild1@gmail.com>
parents:
354
diff
changeset
|
404 (session.log or log)("debug", "incoming s2s received <stream:stream>"); |
|
3383
c7acddf80583
s2smanager: Handle disallow_s2s for incoming streams as well as outgoing
Matthew Wild <mwild1@gmail.com>
parents:
3329
diff
changeset
|
405 if session.to_host then |
|
c7acddf80583
s2smanager: Handle disallow_s2s for incoming streams as well as outgoing
Matthew Wild <mwild1@gmail.com>
parents:
3329
diff
changeset
|
406 if not hosts[session.to_host] then |
|
c7acddf80583
s2smanager: Handle disallow_s2s for incoming streams as well as outgoing
Matthew Wild <mwild1@gmail.com>
parents:
3329
diff
changeset
|
407 -- Attempting to connect to a host we don't serve |
|
c7acddf80583
s2smanager: Handle disallow_s2s for incoming streams as well as outgoing
Matthew Wild <mwild1@gmail.com>
parents:
3329
diff
changeset
|
408 session:close({ |
|
c7acddf80583
s2smanager: Handle disallow_s2s for incoming streams as well as outgoing
Matthew Wild <mwild1@gmail.com>
parents:
3329
diff
changeset
|
409 condition = "host-unknown"; |
|
c7acddf80583
s2smanager: Handle disallow_s2s for incoming streams as well as outgoing
Matthew Wild <mwild1@gmail.com>
parents:
3329
diff
changeset
|
410 text = "This host does not serve "..session.to_host |
|
c7acddf80583
s2smanager: Handle disallow_s2s for incoming streams as well as outgoing
Matthew Wild <mwild1@gmail.com>
parents:
3329
diff
changeset
|
411 }); |
|
c7acddf80583
s2smanager: Handle disallow_s2s for incoming streams as well as outgoing
Matthew Wild <mwild1@gmail.com>
parents:
3329
diff
changeset
|
412 return; |
|
c7acddf80583
s2smanager: Handle disallow_s2s for incoming streams as well as outgoing
Matthew Wild <mwild1@gmail.com>
parents:
3329
diff
changeset
|
413 elseif hosts[session.to_host].disallow_s2s then |
|
c7acddf80583
s2smanager: Handle disallow_s2s for incoming streams as well as outgoing
Matthew Wild <mwild1@gmail.com>
parents:
3329
diff
changeset
|
414 -- Attempting to connect to a host that disallows s2s |
|
c7acddf80583
s2smanager: Handle disallow_s2s for incoming streams as well as outgoing
Matthew Wild <mwild1@gmail.com>
parents:
3329
diff
changeset
|
415 session:close({ |
|
c7acddf80583
s2smanager: Handle disallow_s2s for incoming streams as well as outgoing
Matthew Wild <mwild1@gmail.com>
parents:
3329
diff
changeset
|
416 condition = "policy-violation"; |
|
c7acddf80583
s2smanager: Handle disallow_s2s for incoming streams as well as outgoing
Matthew Wild <mwild1@gmail.com>
parents:
3329
diff
changeset
|
417 text = "Server-to-server communication is not allowed to this host"; |
|
c7acddf80583
s2smanager: Handle disallow_s2s for incoming streams as well as outgoing
Matthew Wild <mwild1@gmail.com>
parents:
3329
diff
changeset
|
418 }); |
|
c7acddf80583
s2smanager: Handle disallow_s2s for incoming streams as well as outgoing
Matthew Wild <mwild1@gmail.com>
parents:
3329
diff
changeset
|
419 return; |
|
c7acddf80583
s2smanager: Handle disallow_s2s for incoming streams as well as outgoing
Matthew Wild <mwild1@gmail.com>
parents:
3329
diff
changeset
|
420 end |
| 331 | 421 end |
|
2780
f8232abcab2a
s2smanager: Send reply stream header only after checking we serve this host (sorry darkrain... :) )
Matthew Wild <mwild1@gmail.com>
parents:
2760
diff
changeset
|
422 send("<?xml version='1.0'?>"); |
|
2419
00d985639a06
s2smanager: Trim trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2382
diff
changeset
|
423 send(stanza("stream:stream", { xmlns='jabber:server', ["xmlns:db"]='jabber:server:dialback', |
|
2787
1067a454a068
s2smanager: Stamp a 'to' on the reply stream:stream. This makes prosody happy.
Paul Aurich <paul@darkrain42.org>
parents:
2783
diff
changeset
|
424 ["xmlns:stream"]='http://etherx.jabber.org/streams', id=session.streamid, from=session.to_host, to=session.from_host, version=(session.version > 0 and "1.0" or nil) }):top_tag()); |
|
345
6a7acfc1c933
Send version=1.0 in s2s stream header. Send s2s stream:features when in 1.0 mode.
Matthew Wild <mwild1@gmail.com>
parents:
344
diff
changeset
|
425 if session.version >= 1.0 then |
|
1889
e875833ae08e
s2smanager: Send stream:features for incoming s2s connections which support XMPP 1.0
Matthew Wild <mwild1@gmail.com>
parents:
1888
diff
changeset
|
426 local features = st.stanza("stream:features"); |
|
2780
f8232abcab2a
s2smanager: Send reply stream header only after checking we serve this host (sorry darkrain... :) )
Matthew Wild <mwild1@gmail.com>
parents:
2760
diff
changeset
|
427 |
|
1936
a6ca0dcc7b83
s2smanager: Make s2s-stream-features a per-host event
Matthew Wild <mwild1@gmail.com>
parents:
1930
diff
changeset
|
428 if session.to_host then |
|
2613
afa20941e098
s2smanager, mod_compression, mod_tls: Changed event.session to event.origin for s2s-stream-features event for consistency.
Waqas Hussain <waqas20@gmail.com>
parents:
2545
diff
changeset
|
429 hosts[session.to_host].events.fire_event("s2s-stream-features", { origin = session, features = features }); |
|
1936
a6ca0dcc7b83
s2smanager: Make s2s-stream-features a per-host event
Matthew Wild <mwild1@gmail.com>
parents:
1930
diff
changeset
|
430 else |
|
a6ca0dcc7b83
s2smanager: Make s2s-stream-features a per-host event
Matthew Wild <mwild1@gmail.com>
parents:
1930
diff
changeset
|
431 (session.log or log)("warn", "No 'to' on stream header from %s means we can't offer any features", session.from_host or "unknown host"); |
|
a6ca0dcc7b83
s2smanager: Make s2s-stream-features a per-host event
Matthew Wild <mwild1@gmail.com>
parents:
1930
diff
changeset
|
432 end |
|
1889
e875833ae08e
s2smanager: Send stream:features for incoming s2s connections which support XMPP 1.0
Matthew Wild <mwild1@gmail.com>
parents:
1888
diff
changeset
|
433 |
|
e875833ae08e
s2smanager: Send stream:features for incoming s2s connections which support XMPP 1.0
Matthew Wild <mwild1@gmail.com>
parents:
1888
diff
changeset
|
434 log("debug", "Sending stream features: %s", tostring(features)); |
|
e875833ae08e
s2smanager: Send stream:features for incoming s2s connections which support XMPP 1.0
Matthew Wild <mwild1@gmail.com>
parents:
1888
diff
changeset
|
435 send(features); |
|
345
6a7acfc1c933
Send version=1.0 in s2s stream header. Send s2s stream:features when in 1.0 mode.
Matthew Wild <mwild1@gmail.com>
parents:
344
diff
changeset
|
436 end |
| 148 | 437 elseif session.direction == "outgoing" then |
| 438 -- If we are just using the connection for verifying dialback keys, we won't try and auth it | |
|
190
1e993b7deae7
General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc.
Matthew Wild <mwild1@gmail.com>
parents:
186
diff
changeset
|
439 if not attr.id then error("stream response did not give us a streamid!!!"); end |
|
1e993b7deae7
General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc.
Matthew Wild <mwild1@gmail.com>
parents:
186
diff
changeset
|
440 session.streamid = attr.id; |
|
1e993b7deae7
General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc.
Matthew Wild <mwild1@gmail.com>
parents:
186
diff
changeset
|
441 |
|
1007
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
442 -- Send unauthed buffer |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
443 -- (stanzas which are fine to send before dialback) |
|
2419
00d985639a06
s2smanager: Trim trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2382
diff
changeset
|
444 -- Note that this is *not* the stanza queue (which |
|
1007
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
445 -- we can only send if auth succeeds) :) |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
446 local send_buffer = session.send_buffer; |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
447 if send_buffer and #send_buffer > 0 then |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
448 log("debug", "Sending s2s send_buffer now..."); |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
449 for i, data in ipairs(send_buffer) do |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
450 session.sends2s(tostring(data)); |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
451 send_buffer[i] = nil; |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
452 end |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
453 end |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
454 session.send_buffer = nil; |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
455 |
|
1890
aed0d8a0cca8
s2smanager: Don't wait for stream:features from non-XMPP-1.0 hosts
Matthew Wild <mwild1@gmail.com>
parents:
1889
diff
changeset
|
456 -- If server is pre-1.0, don't wait for features, just do dialback |
|
aed0d8a0cca8
s2smanager: Don't wait for stream:features from non-XMPP-1.0 hosts
Matthew Wild <mwild1@gmail.com>
parents:
1889
diff
changeset
|
457 if session.version < 1.0 then |
|
aed0d8a0cca8
s2smanager: Don't wait for stream:features from non-XMPP-1.0 hosts
Matthew Wild <mwild1@gmail.com>
parents:
1889
diff
changeset
|
458 if not session.dialback_verifying then |
|
1894
53f34ba6f6d6
Minor changes; outgoing TLS works.
Paul Aurich <paul@darkrain42.org>
parents:
1891
diff
changeset
|
459 log("debug", "Initiating dialback..."); |
|
1890
aed0d8a0cca8
s2smanager: Don't wait for stream:features from non-XMPP-1.0 hosts
Matthew Wild <mwild1@gmail.com>
parents:
1889
diff
changeset
|
460 initiate_dialback(session); |
|
aed0d8a0cca8
s2smanager: Don't wait for stream:features from non-XMPP-1.0 hosts
Matthew Wild <mwild1@gmail.com>
parents:
1889
diff
changeset
|
461 else |
|
aed0d8a0cca8
s2smanager: Don't wait for stream:features from non-XMPP-1.0 hosts
Matthew Wild <mwild1@gmail.com>
parents:
1889
diff
changeset
|
462 mark_connected(session); |
|
aed0d8a0cca8
s2smanager: Don't wait for stream:features from non-XMPP-1.0 hosts
Matthew Wild <mwild1@gmail.com>
parents:
1889
diff
changeset
|
463 end |
| 148 | 464 end |
| 465 end | |
| 466 session.notopen = nil; | |
| 467 end | |
| 468 | |
|
959
e3db909065f2
sessionmanager, s2smanager, mod_component: Send reply </stream:stream> when client closes stream
Matthew Wild <mwild1@gmail.com>
parents:
938
diff
changeset
|
469 function streamclosed(session) |
|
2747
168104895051
sessionmanager, s2smanager: Close session on </stream:stream>
Matthew Wild <mwild1@gmail.com>
parents:
2746
diff
changeset
|
470 (session.log or log)("debug", "Received </stream:stream>"); |
|
168104895051
sessionmanager, s2smanager: Close session on </stream:stream>
Matthew Wild <mwild1@gmail.com>
parents:
2746
diff
changeset
|
471 session:close(); |
|
959
e3db909065f2
sessionmanager, s2smanager, mod_component: Send reply </stream:stream> when client closes stream
Matthew Wild <mwild1@gmail.com>
parents:
938
diff
changeset
|
472 end |
|
e3db909065f2
sessionmanager, s2smanager, mod_component: Send reply </stream:stream> when client closes stream
Matthew Wild <mwild1@gmail.com>
parents:
938
diff
changeset
|
473 |
|
190
1e993b7deae7
General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc.
Matthew Wild <mwild1@gmail.com>
parents:
186
diff
changeset
|
474 function initiate_dialback(session) |
|
1e993b7deae7
General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc.
Matthew Wild <mwild1@gmail.com>
parents:
186
diff
changeset
|
475 -- generate dialback key |
|
1e993b7deae7
General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc.
Matthew Wild <mwild1@gmail.com>
parents:
186
diff
changeset
|
476 session.dialback_key = generate_dialback(session.streamid, session.to_host, session.from_host); |
|
1e993b7deae7
General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc.
Matthew Wild <mwild1@gmail.com>
parents:
186
diff
changeset
|
477 session.sends2s(format("<db:result from='%s' to='%s'>%s</db:result>", session.from_host, session.to_host, session.dialback_key)); |
|
1e993b7deae7
General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc.
Matthew Wild <mwild1@gmail.com>
parents:
186
diff
changeset
|
478 session.log("info", "sent dialback key on outgoing s2s stream"); |
|
1e993b7deae7
General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc.
Matthew Wild <mwild1@gmail.com>
parents:
186
diff
changeset
|
479 end |
|
1e993b7deae7
General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc.
Matthew Wild <mwild1@gmail.com>
parents:
186
diff
changeset
|
480 |
| 148 | 481 function generate_dialback(id, to, from) |
|
2420
6ccd36a95a81
s2smanager, hostmanager: Make dialback secrets per-host
Matthew Wild <mwild1@gmail.com>
parents:
2419
diff
changeset
|
482 return sha256_hash(id..to..from..hosts[from].dialback_secret, true); |
| 148 | 483 end |
| 484 | |
| 485 function verify_dialback(id, to, from, key) | |
| 486 return key == generate_dialback(id, to, from); | |
| 487 end | |
| 488 | |
|
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
|
489 function make_authenticated(session, host) |
|
2799
0dc7b5ceaf8f
s2smanager: Make require_s2s_encryption do what it says on the tin
Matthew Wild <mwild1@gmail.com>
parents:
2787
diff
changeset
|
490 if not session.secure then |
|
0dc7b5ceaf8f
s2smanager: Make require_s2s_encryption do what it says on the tin
Matthew Wild <mwild1@gmail.com>
parents:
2787
diff
changeset
|
491 local local_host = session.direction == "incoming" and session.to_host or session.from_host; |
|
2801
0323bdb1fcfa
s2smanager: Fix syntax error)
Matthew Wild <mwild1@gmail.com>
parents:
2800
diff
changeset
|
492 if config.get(local_host, "core", "s2s_require_encryption") then |
|
2799
0dc7b5ceaf8f
s2smanager: Make require_s2s_encryption do what it says on the tin
Matthew Wild <mwild1@gmail.com>
parents:
2787
diff
changeset
|
493 session:close({ |
|
0dc7b5ceaf8f
s2smanager: Make require_s2s_encryption do what it says on the tin
Matthew Wild <mwild1@gmail.com>
parents:
2787
diff
changeset
|
494 condition = "policy-violation", |
|
0dc7b5ceaf8f
s2smanager: Make require_s2s_encryption do what it says on the tin
Matthew Wild <mwild1@gmail.com>
parents:
2787
diff
changeset
|
495 text = "Encrypted server-to-server communication is required but was not " |
|
0dc7b5ceaf8f
s2smanager: Make require_s2s_encryption do what it says on the tin
Matthew Wild <mwild1@gmail.com>
parents:
2787
diff
changeset
|
496 ..((session.direction == "outgoing" and "offered") or "used") |
|
0dc7b5ceaf8f
s2smanager: Make require_s2s_encryption do what it says on the tin
Matthew Wild <mwild1@gmail.com>
parents:
2787
diff
changeset
|
497 }); |
|
0dc7b5ceaf8f
s2smanager: Make require_s2s_encryption do what it says on the tin
Matthew Wild <mwild1@gmail.com>
parents:
2787
diff
changeset
|
498 end |
|
0dc7b5ceaf8f
s2smanager: Make require_s2s_encryption do what it says on the tin
Matthew Wild <mwild1@gmail.com>
parents:
2787
diff
changeset
|
499 end |
| 148 | 500 if session.type == "s2sout_unauthed" then |
| 501 session.type = "s2sout"; | |
| 502 elseif session.type == "s2sin_unauthed" then | |
| 503 session.type = "s2sin"; | |
|
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
|
504 if host then |
|
3650
2b80450bd7ae
s2smanager: Compatibility hack for when not using dialback
Paul Aurich <paul@darkrain42.org>
parents:
3540
diff
changeset
|
505 if not session.hosts[host] then session.hosts[host] = {}; 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
|
506 session.hosts[host].authed = true; |
|
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
|
507 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
|
508 elseif session.type == "s2sin" and host then |
|
3650
2b80450bd7ae
s2smanager: Compatibility hack for when not using dialback
Paul Aurich <paul@darkrain42.org>
parents:
3540
diff
changeset
|
509 if not session.hosts[host] then session.hosts[host] = {}; 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
|
510 session.hosts[host].authed = true; |
| 148 | 511 else |
| 512 return false; | |
| 513 end | |
|
1075
831c84cbf5fa
s2smanager: Miscellaneous logging improvements, changing levels, improving messages and using session loggers where possible
Matthew Wild <mwild1@gmail.com>
parents:
1007
diff
changeset
|
514 session.log("debug", "connection %s->%s is now authenticated", session.from_host or "(unknown)", session.to_host or "(unknown)"); |
| 148 | 515 |
| 516 mark_connected(session); | |
| 517 | |
| 518 return true; | |
| 519 end | |
| 520 | |
| 1891 | 521 -- Stream is authorised, and ready for normal stanzas |
| 148 | 522 function mark_connected(session) |
|
186
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
523 local sendq, send = session.sendq, session.sends2s; |
|
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
524 |
|
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
525 local from, to = session.from_host, session.to_host; |
|
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
526 |
|
1075
831c84cbf5fa
s2smanager: Miscellaneous logging improvements, changing levels, improving messages and using session loggers where possible
Matthew Wild <mwild1@gmail.com>
parents:
1007
diff
changeset
|
527 session.log("info", session.direction.." s2s connection "..from.."->"..to.." complete"); |
|
186
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
528 |
|
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
529 local send_to_host = send_to_host; |
|
4017
2cb5bb26b831
s2smanager: session.send(): Return the result of send_to_host() (and incidentally make this a tail call \o/)
Matthew Wild <mwild1@gmail.com>
parents:
4016
diff
changeset
|
530 function session.send(data) return send_to_host(to, from, data); end |
|
190
1e993b7deae7
General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc.
Matthew Wild <mwild1@gmail.com>
parents:
186
diff
changeset
|
531 |
|
3476
193bb0936a4e
s2smanager: Fire s2s{in,out}-established when new s2s connections are ready
Matthew Wild <mwild1@gmail.com>
parents:
3459
diff
changeset
|
532 local event_data = { session = session }; |
|
193bb0936a4e
s2smanager: Fire s2s{in,out}-established when new s2s connections are ready
Matthew Wild <mwild1@gmail.com>
parents:
3459
diff
changeset
|
533 if session.type == "s2sout" then |
|
193bb0936a4e
s2smanager: Fire s2s{in,out}-established when new s2s connections are ready
Matthew Wild <mwild1@gmail.com>
parents:
3459
diff
changeset
|
534 prosody.events.fire_event("s2sout-established", event_data); |
|
193bb0936a4e
s2smanager: Fire s2s{in,out}-established when new s2s connections are ready
Matthew Wild <mwild1@gmail.com>
parents:
3459
diff
changeset
|
535 hosts[session.from_host].events.fire_event("s2sout-established", event_data); |
|
193bb0936a4e
s2smanager: Fire s2s{in,out}-established when new s2s connections are ready
Matthew Wild <mwild1@gmail.com>
parents:
3459
diff
changeset
|
536 else |
|
193bb0936a4e
s2smanager: Fire s2s{in,out}-established when new s2s connections are ready
Matthew Wild <mwild1@gmail.com>
parents:
3459
diff
changeset
|
537 prosody.events.fire_event("s2sin-established", event_data); |
|
193bb0936a4e
s2smanager: Fire s2s{in,out}-established when new s2s connections are ready
Matthew Wild <mwild1@gmail.com>
parents:
3459
diff
changeset
|
538 hosts[session.to_host].events.fire_event("s2sin-established", event_data); |
|
193bb0936a4e
s2smanager: Fire s2s{in,out}-established when new s2s connections are ready
Matthew Wild <mwild1@gmail.com>
parents:
3459
diff
changeset
|
539 end |
|
186
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
540 |
|
190
1e993b7deae7
General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc.
Matthew Wild <mwild1@gmail.com>
parents:
186
diff
changeset
|
541 if session.direction == "outgoing" then |
|
1e993b7deae7
General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc.
Matthew Wild <mwild1@gmail.com>
parents:
186
diff
changeset
|
542 if sendq then |
|
269
3cfac0e5e6ca
Log how many queued stanzas we send
Waqas Hussain <waqas20@gmail.com>
parents:
266
diff
changeset
|
543 session.log("debug", "sending "..#sendq.." queued stanzas across new outgoing connection to "..session.to_host); |
|
190
1e993b7deae7
General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc.
Matthew Wild <mwild1@gmail.com>
parents:
186
diff
changeset
|
544 for i, data in ipairs(sendq) do |
|
631
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
545 send(data[1]); |
|
190
1e993b7deae7
General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc.
Matthew Wild <mwild1@gmail.com>
parents:
186
diff
changeset
|
546 sendq[i] = nil; |
|
1e993b7deae7
General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc.
Matthew Wild <mwild1@gmail.com>
parents:
186
diff
changeset
|
547 end |
|
1e993b7deae7
General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc.
Matthew Wild <mwild1@gmail.com>
parents:
186
diff
changeset
|
548 session.sendq = nil; |
| 148 | 549 end |
|
1345
35b5686d73ea
s2smanager: Remove srv_hosts from session when connected, this fixes attempting to reconnect s2s sessions when they are closed during shutdown
Matthew Wild <mwild1@gmail.com>
parents:
1308
diff
changeset
|
550 |
|
35b5686d73ea
s2smanager: Remove srv_hosts from session when connected, this fixes attempting to reconnect s2s sessions when they are closed during shutdown
Matthew Wild <mwild1@gmail.com>
parents:
1308
diff
changeset
|
551 session.srv_hosts = nil; |
| 148 | 552 end |
| 553 end | |
| 554 | |
|
2746
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2714
diff
changeset
|
555 local resting_session = { -- Resting, not dead |
|
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2714
diff
changeset
|
556 destroyed = true; |
|
2915
f47bd0f7e2e6
sessionmanager, s2smanager: Add type of ?2s_destroyed to resting sessions (fixes a logging traceback, thanks Flo)
Matthew Wild <mwild1@gmail.com>
parents:
2892
diff
changeset
|
557 type = "s2s_destroyed"; |
|
2748
85a242cd1bc4
s2smanager: Add open_stream and close methods to resting sessions
Matthew Wild <mwild1@gmail.com>
parents:
2747
diff
changeset
|
558 open_stream = function (session) |
|
85a242cd1bc4
s2smanager: Add open_stream and close methods to resting sessions
Matthew Wild <mwild1@gmail.com>
parents:
2747
diff
changeset
|
559 session.log("debug", "Attempt to open stream on resting session"); |
|
85a242cd1bc4
s2smanager: Add open_stream and close methods to resting sessions
Matthew Wild <mwild1@gmail.com>
parents:
2747
diff
changeset
|
560 end; |
|
85a242cd1bc4
s2smanager: Add open_stream and close methods to resting sessions
Matthew Wild <mwild1@gmail.com>
parents:
2747
diff
changeset
|
561 close = function (session) |
|
85a242cd1bc4
s2smanager: Add open_stream and close methods to resting sessions
Matthew Wild <mwild1@gmail.com>
parents:
2747
diff
changeset
|
562 session.log("debug", "Attempt to close already-closed session"); |
|
85a242cd1bc4
s2smanager: Add open_stream and close methods to resting sessions
Matthew Wild <mwild1@gmail.com>
parents:
2747
diff
changeset
|
563 end; |
|
3459
543f31cdde19
sessionmanager, s2smanager: Give resting sessions a pass-through filter, fixes #202
Matthew Wild <mwild1@gmail.com>
parents:
3436
diff
changeset
|
564 filter = function (type, data) return data; end; |
|
2746
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2714
diff
changeset
|
565 }; resting_session.__index = resting_session; |
|
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2714
diff
changeset
|
566 |
|
4018
5061c8d41d89
s2smanager: retire_session(): Add a 'reason' parameter
Matthew Wild <mwild1@gmail.com>
parents:
4017
diff
changeset
|
567 function retire_session(session, reason) |
|
2746
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2714
diff
changeset
|
568 local log = session.log or log; |
|
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2714
diff
changeset
|
569 for k in pairs(session) do |
|
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2714
diff
changeset
|
570 if k ~= "trace" and k ~= "log" and k ~= "id" then |
|
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2714
diff
changeset
|
571 session[k] = nil; |
|
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2714
diff
changeset
|
572 end |
|
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2714
diff
changeset
|
573 end |
|
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2714
diff
changeset
|
574 |
|
4018
5061c8d41d89
s2smanager: retire_session(): Add a 'reason' parameter
Matthew Wild <mwild1@gmail.com>
parents:
4017
diff
changeset
|
575 session.destruction_reason = reason; |
|
5061c8d41d89
s2smanager: retire_session(): Add a 'reason' parameter
Matthew Wild <mwild1@gmail.com>
parents:
4017
diff
changeset
|
576 |
|
2746
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2714
diff
changeset
|
577 function session.send(data) log("debug", "Discarding data sent to resting session: %s", tostring(data)); end |
|
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2714
diff
changeset
|
578 function session.data(data) log("debug", "Discarding data received from resting session: %s", tostring(data)); end |
|
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2714
diff
changeset
|
579 return setmetatable(session, resting_session); |
|
3b9547fc0bed
sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks
Matthew Wild <mwild1@gmail.com>
parents:
2714
diff
changeset
|
580 end |
|
2857
6036c4b75235
sessionmanager, s2smanager: Give sessions dummy data handlers that log when data is received by a destroyed session
Matthew Wild <mwild1@gmail.com>
parents:
2712
diff
changeset
|
581 |
|
2781
4b5881b6bbfc
s2smanager: Have both destroy_session and bounce_sendq accept a reason string to include in bounced stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2780
diff
changeset
|
582 function destroy_session(session, reason) |
|
2749
8dc5f3651501
s2smanager: Don't re-destroy destroyed sessions
Matthew Wild <mwild1@gmail.com>
parents:
2748
diff
changeset
|
583 if session.destroyed then return; end |
|
169
92768120b717
Little tweak for more useful logging of closed s2s sessions
Matthew Wild <mwild1@gmail.com>
parents:
167
diff
changeset
|
584 (session.log or log)("info", "Destroying "..tostring(session.direction).." session "..tostring(session.from_host).."->"..tostring(session.to_host)); |
| 331 | 585 |
|
164
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
586 if session.direction == "outgoing" then |
|
260
182f0c895676
Now outgoing s2s sessions are associated with their from_host, fixes #15
Matthew Wild <mwild1@gmail.com>
parents:
259
diff
changeset
|
587 hosts[session.from_host].s2sout[session.to_host] = nil; |
|
2781
4b5881b6bbfc
s2smanager: Have both destroy_session and bounce_sendq accept a reason string to include in bounced stanzas
Matthew Wild <mwild1@gmail.com>
parents:
2780
diff
changeset
|
588 bounce_sendq(session, reason); |
|
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
|
589 elseif session.direction == "incoming" then |
|
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
|
590 incoming_s2s[session] = nil; |
|
164
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
591 end |
| 331 | 592 |
|
3488
4f3fc5f9d944
s2smanager: Fire s2s{in,out}-destroyed when s2s connections are destroyed
Matthew Wild <mwild1@gmail.com>
parents:
3476
diff
changeset
|
593 local event_data = { session = session, reason = reason }; |
|
4f3fc5f9d944
s2smanager: Fire s2s{in,out}-destroyed when s2s connections are destroyed
Matthew Wild <mwild1@gmail.com>
parents:
3476
diff
changeset
|
594 if session.type == "s2sout" then |
|
4f3fc5f9d944
s2smanager: Fire s2s{in,out}-destroyed when s2s connections are destroyed
Matthew Wild <mwild1@gmail.com>
parents:
3476
diff
changeset
|
595 prosody.events.fire_event("s2sout-destroyed", event_data); |
|
4f3fc5f9d944
s2smanager: Fire s2s{in,out}-destroyed when s2s connections are destroyed
Matthew Wild <mwild1@gmail.com>
parents:
3476
diff
changeset
|
596 if hosts[session.from_host] then |
|
4f3fc5f9d944
s2smanager: Fire s2s{in,out}-destroyed when s2s connections are destroyed
Matthew Wild <mwild1@gmail.com>
parents:
3476
diff
changeset
|
597 hosts[session.from_host].events.fire_event("s2sout-destroyed", event_data); |
|
4f3fc5f9d944
s2smanager: Fire s2s{in,out}-destroyed when s2s connections are destroyed
Matthew Wild <mwild1@gmail.com>
parents:
3476
diff
changeset
|
598 end |
|
3489
1b76d18e8045
s2smanager: Don't fire s2sin-destroyed for sessions that were never fully established (thanks Thomas)
Matthew Wild <mwild1@gmail.com>
parents:
3488
diff
changeset
|
599 elseif session.type == "s2sin" then |
|
3488
4f3fc5f9d944
s2smanager: Fire s2s{in,out}-destroyed when s2s connections are destroyed
Matthew Wild <mwild1@gmail.com>
parents:
3476
diff
changeset
|
600 prosody.events.fire_event("s2sin-destroyed", event_data); |
|
4f3fc5f9d944
s2smanager: Fire s2s{in,out}-destroyed when s2s connections are destroyed
Matthew Wild <mwild1@gmail.com>
parents:
3476
diff
changeset
|
601 if hosts[session.to_host] then |
|
4f3fc5f9d944
s2smanager: Fire s2s{in,out}-destroyed when s2s connections are destroyed
Matthew Wild <mwild1@gmail.com>
parents:
3476
diff
changeset
|
602 hosts[session.to_host].events.fire_event("s2sin-destroyed", event_data); |
|
4f3fc5f9d944
s2smanager: Fire s2s{in,out}-destroyed when s2s connections are destroyed
Matthew Wild <mwild1@gmail.com>
parents:
3476
diff
changeset
|
603 end |
|
4f3fc5f9d944
s2smanager: Fire s2s{in,out}-destroyed when s2s connections are destroyed
Matthew Wild <mwild1@gmail.com>
parents:
3476
diff
changeset
|
604 end |
|
4f3fc5f9d944
s2smanager: Fire s2s{in,out}-destroyed when s2s connections are destroyed
Matthew Wild <mwild1@gmail.com>
parents:
3476
diff
changeset
|
605 |
|
4019
80aa47c009f0
s2smanager: destroy_session(): Pass reason to retire_session() and return true on successful destruction
Matthew Wild <mwild1@gmail.com>
parents:
4018
diff
changeset
|
606 retire_session(session, reason); -- Clean session until it is GC'd |
|
80aa47c009f0
s2smanager: destroy_session(): Pass reason to retire_session() and return true on successful destruction
Matthew Wild <mwild1@gmail.com>
parents:
4018
diff
changeset
|
607 return true; |
|
164
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
608 end |
|
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
609 |
|
225
bbbd169b326b
Just committing this warning, because I want to know if the problem really affects us
Matthew Wild <mwild1@gmail.com>
parents:
199
diff
changeset
|
610 return _M; |
