Software / code / prosody
Annotate
core/s2smanager.lua @ 1626:7f17d0d00fbb
Fixed: Self-references could be added to rosters via presence subscriptions
| author | Waqas Hussain <waqas20@gmail.com> |
|---|---|
| date | Mon, 03 Aug 2009 21:48:51 +0500 |
| parent | 1523:841d61be198f |
| child | 1686:232c2bf155c7 |
| child | 1791:42d0b68a1efd |
| rev | line source |
|---|---|
|
1523
841d61be198f
Remove version number from copyright headers
Matthew Wild <mwild1@gmail.com>
parents:
1492
diff
changeset
|
1 -- Prosody IM |
|
760
90ce865eebd8
Update copyright notices for 2009
Matthew Wild <mwild1@gmail.com>
parents:
759
diff
changeset
|
2 -- Copyright (C) 2008-2009 Matthew Wild |
|
90ce865eebd8
Update copyright notices for 2009
Matthew Wild <mwild1@gmail.com>
parents:
759
diff
changeset
|
3 -- Copyright (C) 2008-2009 Waqas Hussain |
|
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
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; |
|
976
17af9851c81d
core.s2smanager: Remove some debugging
Matthew Wild <mwild1@gmail.com>
parents:
974
diff
changeset
|
19 local tostring, pairs, ipairs, getmetatable, newproxy, error, tonumber |
|
17af9851c81d
core.s2smanager: Remove some debugging
Matthew Wild <mwild1@gmail.com>
parents:
974
diff
changeset
|
20 = tostring, pairs, ipairs, getmetatable, newproxy, error, tonumber; |
| 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; |
|
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
|
24 local wrapclient = require "net.server".wrapclient; |
| 148 | 25 local modulemanager = require "core.modulemanager"; |
|
244
0e3bda34f958
Missed importing a function in last commit
Matthew Wild <mwild1@gmail.com>
parents:
243
diff
changeset
|
26 local st = require "stanza"; |
|
0e3bda34f958
Missed importing a function in last commit
Matthew Wild <mwild1@gmail.com>
parents:
243
diff
changeset
|
27 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
|
28 local nameprep = require "util.encodings".stringprep.nameprep; |
| 148 | 29 |
| 30 local uuid_gen = require "util.uuid".generate; | |
| 31 | |
| 32 local logger_init = require "util.logger".init; | |
| 33 | |
| 34 local log = logger_init("s2smanager"); | |
| 35 | |
|
448
2623519b25b0
Switched from md5 to sha256 for dialback key generation
Waqas Hussain <waqas20@gmail.com>
parents:
435
diff
changeset
|
36 local sha256_hash = require "util.hashes".sha256; |
| 148 | 37 |
|
1308
7b20a3d87244
s2smanager: Use a UUID as the dialback secret
Waqas Hussain <waqas20@gmail.com>
parents:
1204
diff
changeset
|
38 local dialback_secret = uuid_gen(); |
| 148 | 39 |
| 974 | 40 local adns = require "net.adns"; |
| 41 | |
|
1204
dea89234e545
s2smanager: Timeout DNS requests after 60 seconds (or dns_timeout in config)
Matthew Wild <mwild1@gmail.com>
parents:
1199
diff
changeset
|
42 local dns_timeout = config.get("*", "core", "dns_timeout") or 60; |
|
dea89234e545
s2smanager: Timeout DNS requests after 60 seconds (or dns_timeout in config)
Matthew Wild <mwild1@gmail.com>
parents:
1199
diff
changeset
|
43 |
|
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
|
44 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
|
45 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
|
46 |
| 148 | 47 module "s2smanager" |
| 48 | |
| 337 | 49 local function compare_srv_priorities(a,b) return a.priority < b.priority or a.weight < b.weight; end |
| 50 | |
|
631
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
51 local function bounce_sendq(session) |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
52 local sendq = session.sendq; |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
53 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
|
54 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
|
55 local dummy = { |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
56 type = "s2sin"; |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
57 send = function(s) |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
58 (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
|
59 end; |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
60 dummy = true; |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
61 }; |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
62 for i, data in ipairs(sendq) do |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
63 local reply = data[2]; |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
64 local xmlns = reply.attr.xmlns; |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
65 if not xmlns or xmlns == "jabber:client" or xmlns == "jabber:server" then |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
66 reply.attr.type = "error"; |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
67 reply:tag("error", {type = "cancel"}) |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
68 :tag("remote-server-not-found", {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):up(); |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
69 core_process_stanza(dummy, reply); |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
70 end |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
71 sendq[i] = nil; |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
72 end |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
73 session.sendq = nil; |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
74 end |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
75 end |
|
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
76 |
| 148 | 77 function send_to_host(from_host, to_host, data) |
|
260
182f0c895676
Now outgoing s2s sessions are associated with their from_host, fixes #15
Matthew Wild <mwild1@gmail.com>
parents:
259
diff
changeset
|
78 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
|
79 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
|
80 -- We have a connection to this host already |
|
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
|
81 if host.type == "s2sout_unauthed" and data.name ~= "db:verify" and ((not data.xmlns) or data.xmlns == "jabber:client" or data.xmlns == "jabber:server") 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
|
82 (host.log or log)("debug", "trying to send over unauthed s2sout to "..to_host); |
|
995
a007d85b4045
core.s2smanager: Don't initiate dialback if we don't have a connection yet
Matthew Wild <mwild1@gmail.com>
parents:
977
diff
changeset
|
83 if not host.notopen and not host.dialback_key and host.sends2s 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
|
84 host.log("debug", "dialback had not been initiated"); |
|
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
|
85 initiate_dialback(host); |
|
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
|
86 end |
|
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
|
87 |
|
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
|
88 -- 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
|
89 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
|
90 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
|
91 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
|
92 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
|
93 log("error", "Trying to send a stanza to ourselves??") |
| 256 | 94 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
|
95 log("error", "Stanza: %s", tostring(data)); |
|
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
|
96 else |
|
253
f2869ded1d37
Another small fix, for logging in s2smanager
Matthew Wild <mwild1@gmail.com>
parents:
252
diff
changeset
|
97 (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
|
98 -- FIXME |
|
260
182f0c895676
Now outgoing s2s sessions are associated with their from_host, fixes #15
Matthew Wild <mwild1@gmail.com>
parents:
259
diff
changeset
|
99 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
|
100 log("error", "WARNING! This might, possibly, be a bug, but it might not..."); |
| 331 | 101 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
|
102 end |
|
260
182f0c895676
Now outgoing s2s sessions are associated with their from_host, fixes #15
Matthew Wild <mwild1@gmail.com>
parents:
259
diff
changeset
|
103 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
|
104 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
|
105 end |
| 148 | 106 else |
| 107 log("debug", "opening a new outgoing connection for this stanza"); | |
| 108 local host_session = new_outgoing(from_host, to_host); | |
| 109 -- Store in buffer | |
|
631
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
110 host_session.sendq = { {tostring(data), st.reply(data)} }; |
|
1006
9166d7a8c3c0
core.s2smanager: Logging improvements
Matthew Wild <mwild1@gmail.com>
parents:
995
diff
changeset
|
111 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
|
112 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
|
113 log("warn", "Connection to %s failed already, destroying session...", to_host); |
|
9166d7a8c3c0
core.s2smanager: Logging improvements
Matthew Wild <mwild1@gmail.com>
parents:
995
diff
changeset
|
114 destroy_session(host_session); |
|
9166d7a8c3c0
core.s2smanager: Logging improvements
Matthew Wild <mwild1@gmail.com>
parents:
995
diff
changeset
|
115 end |
| 148 | 116 end |
| 117 end | |
| 118 | |
| 119 local open_sessions = 0; | |
| 120 | |
| 121 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
|
122 local session = { conn = conn, type = "s2sin_unauthed", direction = "incoming", hosts = {} }; |
| 148 | 123 if true then |
| 124 session.trace = newproxy(true); | |
|
583
5821eaa80baa
Remove print()s from sessionmanager and s2smanager
Matthew Wild <mwild1@gmail.com>
parents:
559
diff
changeset
|
125 getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; end; |
| 148 | 126 end |
| 127 open_sessions = open_sessions + 1; | |
| 343 | 128 local w, log = conn.write, logger_init("s2sin"..tostring(conn):match("[a-f0-9]+$")); |
| 129 session.sends2s = function (t) log("debug", "sending: %s", tostring(t)); w(tostring(t)); 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
|
130 incoming_s2s[session] = true; |
| 148 | 131 return session; |
| 132 end | |
| 133 | |
| 134 function new_outgoing(from_host, to_host) | |
| 135 local host_session = { to_host = to_host, from_host = from_host, notopen = true, type = "s2sout_unauthed", direction = "outgoing" }; | |
|
260
182f0c895676
Now outgoing s2s sessions are associated with their from_host, fixes #15
Matthew Wild <mwild1@gmail.com>
parents:
259
diff
changeset
|
136 hosts[from_host].s2sout[to_host] = host_session; |
| 148 | 137 |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
138 local log; |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
139 do |
|
543
cf6e19ea1cbc
Fix logger ids for c2s and s2sout
Matthew Wild <mwild1@gmail.com>
parents:
519
diff
changeset
|
140 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
|
141 log = logger_init(conn_name); |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
142 host_session.log = log; |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
143 end |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
144 |
|
1492
aaeccebad0f3
s2smanager: Fix to correctly bounce stanzas if first connection attempt fails instantly
Matthew Wild <mwild1@gmail.com>
parents:
1468
diff
changeset
|
145 -- This is the first call, can't fail (the first step is DNS lookup) |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
146 attempt_connection(host_session); |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
147 |
|
1007
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
148 if not host_session.sends2s then |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
149 -- 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
|
150 -- 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
|
151 -- 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
|
152 local buffer; |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
153 function host_session.sends2s(data) |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
154 if not buffer then |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
155 buffer = {}; |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
156 host_session.send_buffer = buffer; |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
157 end |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
158 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
|
159 buffer[#buffer+1] = data; |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
160 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
|
161 end |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
162 |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
163 end |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
164 |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
165 return host_session; |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
166 end |
|
353
e7d776b5ebb9
Remove an old FIXME comment
Matthew Wild <mwild1@gmail.com>
parents:
351
diff
changeset
|
167 |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
168 |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
169 function attempt_connection(host_session, err) |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
170 local from_host, to_host = host_session.from_host, host_session.to_host; |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
171 local connect_host, connect_port = idna_to_ascii(to_host), 5269; |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
172 |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
173 if not err then -- This is our first attempt |
|
1006
9166d7a8c3c0
core.s2smanager: Logging improvements
Matthew Wild <mwild1@gmail.com>
parents:
995
diff
changeset
|
174 log("debug", "First attempt to connect to %s, starting with SRV lookup...", to_host); |
| 974 | 175 host_session.connecting = true; |
|
1204
dea89234e545
s2smanager: Timeout DNS requests after 60 seconds (or dns_timeout in config)
Matthew Wild <mwild1@gmail.com>
parents:
1199
diff
changeset
|
176 local answer, handle; |
|
dea89234e545
s2smanager: Timeout DNS requests after 60 seconds (or dns_timeout in config)
Matthew Wild <mwild1@gmail.com>
parents:
1199
diff
changeset
|
177 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
|
178 handle = nil; |
| 974 | 179 host_session.connecting = nil; |
| 180 if answer then | |
| 181 log("debug", to_host.." has SRV records, handling..."); | |
| 182 local srv_hosts = {}; | |
| 183 host_session.srv_hosts = srv_hosts; | |
| 184 for _, record in ipairs(answer) do | |
| 185 t_insert(srv_hosts, record.srv); | |
| 186 end | |
| 187 t_sort(srv_hosts, compare_srv_priorities); | |
| 188 | |
| 189 local srv_choice = srv_hosts[1]; | |
| 190 host_session.srv_choice = 1; | |
| 191 if srv_choice then | |
| 192 connect_host, connect_port = srv_choice.target or to_host, srv_choice.port or connect_port; | |
| 193 log("debug", "Best record found, will connect to %s:%d", connect_host, connect_port); | |
| 194 end | |
| 195 else | |
| 196 log("debug", to_host.." has no SRV records, falling back to A"); | |
| 337 | 197 end |
| 974 | 198 -- 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
|
199 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
|
200 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
|
201 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
|
202 -- No more attempts will be made |
|
aaeccebad0f3
s2smanager: Fix to correctly bounce stanzas if first connection attempt fails instantly
Matthew Wild <mwild1@gmail.com>
parents:
1468
diff
changeset
|
203 destroy_session(host_session); |
|
aaeccebad0f3
s2smanager: Fix to correctly bounce stanzas if first connection attempt fails instantly
Matthew Wild <mwild1@gmail.com>
parents:
1468
diff
changeset
|
204 end |
|
aaeccebad0f3
s2smanager: Fix to correctly bounce stanzas if first connection attempt fails instantly
Matthew Wild <mwild1@gmail.com>
parents:
1468
diff
changeset
|
205 end |
| 974 | 206 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
|
207 |
|
dea89234e545
s2smanager: Timeout DNS requests after 60 seconds (or dns_timeout in config)
Matthew Wild <mwild1@gmail.com>
parents:
1199
diff
changeset
|
208 -- Set handler for DNS timeout |
|
dea89234e545
s2smanager: Timeout DNS requests after 60 seconds (or dns_timeout in config)
Matthew Wild <mwild1@gmail.com>
parents:
1199
diff
changeset
|
209 add_task(dns_timeout, function () |
|
dea89234e545
s2smanager: Timeout DNS requests after 60 seconds (or dns_timeout in config)
Matthew Wild <mwild1@gmail.com>
parents:
1199
diff
changeset
|
210 if handle then |
|
dea89234e545
s2smanager: Timeout DNS requests after 60 seconds (or dns_timeout in config)
Matthew Wild <mwild1@gmail.com>
parents:
1199
diff
changeset
|
211 adns.cancel(handle, true); |
|
dea89234e545
s2smanager: Timeout DNS requests after 60 seconds (or dns_timeout in config)
Matthew Wild <mwild1@gmail.com>
parents:
1199
diff
changeset
|
212 end |
|
dea89234e545
s2smanager: Timeout DNS requests after 60 seconds (or dns_timeout in config)
Matthew Wild <mwild1@gmail.com>
parents:
1199
diff
changeset
|
213 end); |
|
dea89234e545
s2smanager: Timeout DNS requests after 60 seconds (or dns_timeout in config)
Matthew Wild <mwild1@gmail.com>
parents:
1199
diff
changeset
|
214 |
|
1006
9166d7a8c3c0
core.s2smanager: Logging improvements
Matthew Wild <mwild1@gmail.com>
parents:
995
diff
changeset
|
215 log("debug", "DNS lookup for %s sent, waiting for response before we can connect", to_host); |
| 974 | 216 return true; -- Attempt in progress |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
217 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
|
218 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
|
219 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
|
220 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
|
221 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
|
222 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
|
223 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
|
224 -- We're out of options |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
225 return false; |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
226 end |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
227 |
|
960
6bc16062da6c
core.s2smanager: Check for valid host and port before attempting connection
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
228 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
|
229 -- Likely we couldn't resolve DNS |
|
1006
9166d7a8c3c0
core.s2smanager: Logging improvements
Matthew Wild <mwild1@gmail.com>
parents:
995
diff
changeset
|
230 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
|
231 return false; |
|
6bc16062da6c
core.s2smanager: Check for valid host and port before attempting connection
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
232 end |
|
6bc16062da6c
core.s2smanager: Check for valid host and port before attempting connection
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
233 |
| 974 | 234 return try_connect(host_session, connect_host, connect_port); |
| 235 end | |
| 236 | |
| 237 function try_connect(host_session, connect_host, 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
|
238 host_session.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
|
239 -- Ok, we're going to try to connect |
| 974 | 240 |
| 241 local from_host, to_host = host_session.from_host, host_session.to_host; | |
| 242 | |
| 243 local conn, handler = socket.tcp() | |
| 244 | |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
245 conn:settimeout(0); |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
246 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
|
247 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
|
248 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
|
249 return false, err; |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
250 end |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
251 |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
252 local cl = connlisteners_get("xmppserver"); |
|
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
|
253 conn = wrapclient(conn, connect_host, connect_port, cl, cl.default_mode or 1, hosts[from_host].ssl_ctx, false ); |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
254 host_session.conn = conn; |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
255 |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
256 -- 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
|
257 -- 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
|
258 cl.register_outgoing(conn, host_session); |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
259 |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
260 local w = conn.write; |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
261 host_session.sends2s = function (t) log("debug", "sending: %s", tostring(t)); w(tostring(t)); end |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
262 |
|
1450
c1c7b27b983b
Send xml:lang in stream headers, fixes #78
Matthew Wild <mwild1@gmail.com>
parents:
1345
diff
changeset
|
263 conn.write(format([[<stream:stream xmlns='jabber:server' xmlns:db='jabber:server:dialback' xmlns:stream='http://etherx.jabber.org/streams' from='%s' to='%s' version='1.0' xml:lang='en'>]], from_host, to_host)); |
| 974 | 264 log("debug", "Connection attempt in progress..."); |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
265 return true; |
| 148 | 266 end |
| 267 | |
| 268 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
|
269 local send = session.sends2s; |
| 148 | 270 |
|
544
efde848869c5
Don't send stream:features to incoming s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
543
diff
changeset
|
271 -- TODO: #29: SASL/TLS on s2s streams |
|
efde848869c5
Don't send stream:features to incoming s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
543
diff
changeset
|
272 session.version = 0; --tonumber(attr.version) or 0; |
|
efde848869c5
Don't send stream:features to incoming s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
543
diff
changeset
|
273 |
| 148 | 274 if session.version >= 1.0 and not (attr.to and attr.from) then |
| 275 log("warn", (session.to_host or "(unknown)").." failed to specify 'to' or 'from' hostname as per RFC"); | |
| 276 end | |
| 277 | |
| 278 if session.direction == "incoming" then | |
| 279 -- Send a reply stream header | |
|
938
663f75dd7b42
Fixed: Some nil access bugs
Waqas Hussain <waqas20@gmail.com>
parents:
931
diff
changeset
|
280 session.to_host = attr.to and nameprep(attr.to); |
|
663f75dd7b42
Fixed: Some nil access bugs
Waqas Hussain <waqas20@gmail.com>
parents:
931
diff
changeset
|
281 session.from_host = attr.from and nameprep(attr.from); |
| 148 | 282 |
| 283 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
|
284 (session.log or log)("debug", "incoming s2s received <stream:stream>"); |
| 148 | 285 send("<?xml version='1.0'?>"); |
|
852
3c2d99ba1dc2
core.s2smanager: Remove some old commented code, break a long line in 2
Matthew Wild <mwild1@gmail.com>
parents:
760
diff
changeset
|
286 send(stanza("stream:stream", { xmlns='jabber:server', ["xmlns:db"]='jabber:server:dialback', |
|
3c2d99ba1dc2
core.s2smanager: Remove some old commented code, break a long line in 2
Matthew Wild <mwild1@gmail.com>
parents:
760
diff
changeset
|
287 ["xmlns:stream"]='http://etherx.jabber.org/streams', id=session.streamid, from=session.to_host }):top_tag()); |
| 331 | 288 if session.to_host and not hosts[session.to_host] then |
| 289 -- Attempting to connect to a host we don't serve | |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
290 session:close({ condition = "host-unknown"; text = "This host does not serve "..session.to_host }); |
| 331 | 291 return; |
| 292 end | |
|
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
|
293 if session.version >= 1.0 then |
|
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
|
294 send(st.stanza("stream:features") |
|
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
|
295 :tag("dialback", { xmlns='urn:xmpp:features:dialback' }):tag("optional"):up():up()); |
|
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
|
296 end |
| 148 | 297 elseif session.direction == "outgoing" then |
| 298 -- 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
|
299 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
|
300 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
|
301 |
|
1007
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
302 -- Send unauthed buffer |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
303 -- (stanzas which are fine to send before dialback) |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
304 -- Note that this is *not* the stanza queue (which |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
305 -- we can only send if auth succeeds) :) |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
306 local send_buffer = session.send_buffer; |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
307 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
|
308 log("debug", "Sending s2s send_buffer now..."); |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
309 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
|
310 session.sends2s(tostring(data)); |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
311 send_buffer[i] = nil; |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
312 end |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
313 end |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
314 session.send_buffer = nil; |
|
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
315 |
| 148 | 316 if not session.dialback_verifying then |
|
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
|
317 initiate_dialback(session); |
| 148 | 318 else |
| 319 mark_connected(session); | |
| 320 end | |
| 321 end | |
| 259 | 322 |
| 148 | 323 session.notopen = nil; |
| 324 end | |
| 325 | |
|
959
e3db909065f2
sessionmanager, s2smanager, mod_component: Send reply </stream:stream> when client closes stream
Matthew Wild <mwild1@gmail.com>
parents:
938
diff
changeset
|
326 function streamclosed(session) |
|
1006
9166d7a8c3c0
core.s2smanager: Logging improvements
Matthew Wild <mwild1@gmail.com>
parents:
995
diff
changeset
|
327 (session.log or log)("debug", "</stream:stream>"); |
|
1199
db2a55fe94f2
s2smanager: Only send reply </stream:stream> when connection is still open
Matthew Wild <mwild1@gmail.com>
parents:
1075
diff
changeset
|
328 if session.sends2s then |
|
db2a55fe94f2
s2smanager: Only send reply </stream:stream> when connection is still open
Matthew Wild <mwild1@gmail.com>
parents:
1075
diff
changeset
|
329 session.sends2s("</stream:stream>"); |
|
db2a55fe94f2
s2smanager: Only send reply </stream:stream> when connection is still open
Matthew Wild <mwild1@gmail.com>
parents:
1075
diff
changeset
|
330 end |
|
959
e3db909065f2
sessionmanager, s2smanager, mod_component: Send reply </stream:stream> when client closes stream
Matthew Wild <mwild1@gmail.com>
parents:
938
diff
changeset
|
331 session.notopen = true; |
|
e3db909065f2
sessionmanager, s2smanager, mod_component: Send reply </stream:stream> when client closes stream
Matthew Wild <mwild1@gmail.com>
parents:
938
diff
changeset
|
332 end |
|
e3db909065f2
sessionmanager, s2smanager, mod_component: Send reply </stream:stream> when client closes stream
Matthew Wild <mwild1@gmail.com>
parents:
938
diff
changeset
|
333 |
|
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
|
334 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
|
335 -- 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
|
336 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
|
337 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
|
338 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
|
339 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
|
340 |
| 148 | 341 function generate_dialback(id, to, from) |
|
448
2623519b25b0
Switched from md5 to sha256 for dialback key generation
Waqas Hussain <waqas20@gmail.com>
parents:
435
diff
changeset
|
342 return sha256_hash(id..to..from..dialback_secret, true); |
| 148 | 343 end |
| 344 | |
| 345 function verify_dialback(id, to, from, key) | |
| 346 return key == generate_dialback(id, to, from); | |
| 347 end | |
| 348 | |
|
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
|
349 function make_authenticated(session, host) |
| 148 | 350 if session.type == "s2sout_unauthed" then |
| 351 session.type = "s2sout"; | |
| 352 elseif session.type == "s2sin_unauthed" then | |
| 353 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
|
354 if host 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
|
355 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
|
356 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
|
357 elseif session.type == "s2sin" and host 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
|
358 session.hosts[host].authed = true; |
| 148 | 359 else |
| 360 return false; | |
| 361 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
|
362 session.log("debug", "connection %s->%s is now authenticated", session.from_host or "(unknown)", session.to_host or "(unknown)"); |
| 148 | 363 |
| 364 mark_connected(session); | |
| 365 | |
| 366 return true; | |
| 367 end | |
| 368 | |
| 369 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
|
370 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
|
371 |
|
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
372 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
|
373 |
|
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
|
374 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
|
375 |
|
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
376 local send_to_host = send_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
|
377 function session.send(data) send_to_host(to, from, data); 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
|
378 |
|
186
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
379 |
|
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
|
380 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
|
381 if sendq then |
|
269
3cfac0e5e6ca
Log how many queued stanzas we send
Waqas Hussain <waqas20@gmail.com>
parents:
266
diff
changeset
|
382 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
|
383 for i, data in ipairs(sendq) do |
|
631
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
384 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
|
385 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
|
386 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
|
387 session.sendq = nil; |
| 148 | 388 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
|
389 |
|
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
|
390 session.srv_hosts = nil; |
| 148 | 391 end |
| 392 end | |
| 393 | |
|
164
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
394 function destroy_session(session) |
|
169
92768120b717
Little tweak for more useful logging of closed s2s sessions
Matthew Wild <mwild1@gmail.com>
parents:
167
diff
changeset
|
395 (session.log or log)("info", "Destroying "..tostring(session.direction).." session "..tostring(session.from_host).."->"..tostring(session.to_host)); |
| 331 | 396 |
|
164
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
397 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
|
398 hosts[session.from_host].s2sout[session.to_host] = nil; |
|
631
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
399 bounce_sendq(session); |
|
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
|
400 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
|
401 incoming_s2s[session] = nil; |
|
164
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
402 end |
| 331 | 403 |
|
164
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
404 for k in pairs(session) do |
|
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
405 if k ~= "trace" then |
|
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
406 session[k] = nil; |
|
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
407 end |
|
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
408 end |
|
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
409 end |
|
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
410 |
|
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
|
411 return _M; |
