author | Matthew Wild <mwild1@gmail.com> |
Tue, 30 Mar 2010 19:45:56 +0100 | |
changeset 2951 | 294c359a05f5 |
parent 2925 | 692b3c6c5bd2 |
parent 2949 | ef19faa7d106 |
child 3146 | aaaea4cdbf10 |
child 3151 | 6eca858feb04 |
permissions | -rw-r--r-- |
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; |
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
|
19 |
local tostring, pairs, ipairs, getmetatable, newproxy, error, tonumber, |
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
|
20 |
setmetatable |
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
|
21 |
= tostring, pairs, ipairs, getmetatable, newproxy, error, tonumber, |
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
|
22 |
setmetatable; |
148 | 23 |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
24 |
local idna_to_ascii = require "util.encodings".idna.to_ascii; |
148 | 25 |
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
|
26 |
local wrapclient = require "net.server".wrapclient; |
148 | 27 |
local modulemanager = require "core.modulemanager"; |
244
0e3bda34f958
Missed importing a function in last commit
Matthew Wild <mwild1@gmail.com>
parents:
243
diff
changeset
|
28 |
local st = require "stanza"; |
0e3bda34f958
Missed importing a function in last commit
Matthew Wild <mwild1@gmail.com>
parents:
243
diff
changeset
|
29 |
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
|
30 |
local nameprep = require "util.encodings".stringprep.nameprep; |
148 | 31 |
|
1889
e875833ae08e
s2smanager: Send stream:features for incoming s2s connections which support XMPP 1.0
Matthew Wild <mwild1@gmail.com>
parents:
1888
diff
changeset
|
32 |
local fire_event = require "core.eventmanager".fire_event; |
148 | 33 |
local uuid_gen = require "util.uuid".generate; |
34 |
||
35 |
local logger_init = require "util.logger".init; |
|
36 |
||
37 |
local log = logger_init("s2smanager"); |
|
38 |
||
448
2623519b25b0
Switched from md5 to sha256 for dialback key generation
Waqas Hussain <waqas20@gmail.com>
parents:
435
diff
changeset
|
39 |
local sha256_hash = require "util.hashes".sha256; |
148 | 40 |
|
1793
1fc6c2822e6b
s2smanager: Compatibility with domains which use CNAMEs
Matthew Wild <mwild1@gmail.com>
parents:
1791
diff
changeset
|
41 |
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
|
42 |
local config = require "core.configmanager"; |
1796
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
43 |
local connect_timeout = config.get("*", "core", "s2s_timeout") or 60; |
1204
dea89234e545
s2smanager: Timeout DNS requests after 60 seconds (or dns_timeout in config)
Matthew Wild <mwild1@gmail.com>
parents:
1199
diff
changeset
|
44 |
local dns_timeout = config.get("*", "core", "dns_timeout") or 60; |
1805
7e41ad68fe3c
core.s2smanager: Don't recurse CNAMEs infinitely :)
Matthew Wild <mwild1@gmail.com>
parents:
1796
diff
changeset
|
45 |
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
|
46 |
|
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
|
47 |
incoming_s2s = {}; |
1976
5f3eaab987c3
s2smanager: Add incoming_s2s to the prosody object
Matthew Wild <mwild1@gmail.com>
parents:
1962
diff
changeset
|
48 |
_G.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
|
49 |
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
|
50 |
|
148 | 51 |
module "s2smanager" |
52 |
||
2711
5d97fb043141
s2smanager: Fix for the logic SRV record priority comparison (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents:
2165
diff
changeset
|
53 |
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
|
54 |
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
|
55 |
end |
337 | 56 |
|
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
|
57 |
local function bounce_sendq(session, reason) |
631
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
58 |
local sendq = session.sendq; |
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
59 |
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
|
60 |
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
|
61 |
local dummy = { |
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
62 |
type = "s2sin"; |
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
63 |
send = function(s) |
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
64 |
(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
|
65 |
end; |
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
66 |
dummy = true; |
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
67 |
}; |
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
68 |
for i, data in ipairs(sendq) do |
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
69 |
local reply = data[2]; |
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
70 |
local xmlns = reply.attr.xmlns; |
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
|
71 |
if not xmlns then |
631
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
72 |
reply.attr.type = "error"; |
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
73 |
reply:tag("error", {type = "cancel"}) |
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
74 |
: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
|
75 |
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
|
76 |
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
|
77 |
end |
631
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
78 |
core_process_stanza(dummy, reply); |
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
79 |
end |
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
80 |
sendq[i] = nil; |
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
81 |
end |
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
82 |
session.sendq = nil; |
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
83 |
end |
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 |
|
148 | 86 |
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
|
87 |
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
|
88 |
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
|
89 |
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
|
90 |
end |
260
182f0c895676
Now outgoing s2s sessions are associated with their from_host, fixes #15
Matthew Wild <mwild1@gmail.com>
parents:
259
diff
changeset
|
91 |
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
|
92 |
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
|
93 |
-- 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
|
94 |
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
|
95 |
(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
|
96 |
|
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
|
97 |
-- 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
|
98 |
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
|
99 |
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
|
100 |
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
|
101 |
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
|
102 |
log("error", "Trying to send a stanza to ourselves??") |
256 | 103 |
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
|
104 |
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
|
105 |
else |
253
f2869ded1d37
Another small fix, for logging in s2smanager
Matthew Wild <mwild1@gmail.com>
parents:
252
diff
changeset
|
106 |
(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
|
107 |
-- FIXME |
260
182f0c895676
Now outgoing s2s sessions are associated with their from_host, fixes #15
Matthew Wild <mwild1@gmail.com>
parents:
259
diff
changeset
|
108 |
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
|
109 |
log("error", "WARNING! This might, possibly, be a bug, but it might not..."); |
331 | 110 |
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
|
111 |
end |
260
182f0c895676
Now outgoing s2s sessions are associated with their from_host, fixes #15
Matthew Wild <mwild1@gmail.com>
parents:
259
diff
changeset
|
112 |
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
|
113 |
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
|
114 |
end |
148 | 115 |
else |
116 |
log("debug", "opening a new outgoing connection for this stanza"); |
|
117 |
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
|
118 |
|
148 | 119 |
-- Store in buffer |
631
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
120 |
host_session.sendq = { {tostring(data), st.reply(data)} }; |
1006
9166d7a8c3c0
core.s2smanager: Logging improvements
Matthew Wild <mwild1@gmail.com>
parents:
995
diff
changeset
|
121 |
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
|
122 |
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
|
123 |
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
|
124 |
destroy_session(host_session); |
9166d7a8c3c0
core.s2smanager: Logging improvements
Matthew Wild <mwild1@gmail.com>
parents:
995
diff
changeset
|
125 |
end |
148 | 126 |
end |
127 |
end |
|
128 |
||
129 |
local open_sessions = 0; |
|
130 |
||
131 |
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
|
132 |
local session = { conn = conn, type = "s2sin_unauthed", direction = "incoming", hosts = {} }; |
148 | 133 |
if true then |
134 |
session.trace = newproxy(true); |
|
583
5821eaa80baa
Remove print()s from sessionmanager and s2smanager
Matthew Wild <mwild1@gmail.com>
parents:
559
diff
changeset
|
135 |
getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; end; |
148 | 136 |
end |
137 |
open_sessions = open_sessions + 1; |
|
343 | 138 |
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
|
139 |
session.log = log; |
2134
9044e7cfefc2
s2smanager: Fix syntax error introduced in merge
Matthew Wild <mwild1@gmail.com>
parents:
2133
diff
changeset
|
140 |
session.sends2s = function (t) log("debug", "sending: %s", t.top_tag and t:top_tag() or t:match("^([^>]*>?)")); w(conn, 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
|
141 |
incoming_s2s[session] = true; |
1796
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
142 |
add_task(connect_timeout, function () |
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
143 |
if session.conn ~= conn or |
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
144 |
session.type == "s2sin" then |
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
145 |
return; -- Ok, we're connect[ed|ing] |
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
146 |
end |
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
147 |
-- Not connected, need to close session and clean up |
2419
00d985639a06
s2smanager: Trim trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2382
diff
changeset
|
148 |
(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
|
149 |
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
|
150 |
session:close("connection-timeout"); |
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
151 |
end); |
148 | 152 |
return session; |
153 |
end |
|
154 |
||
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
|
155 |
function new_outgoing(from_host, to_host, connect) |
2419
00d985639a06
s2smanager: Trim trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2382
diff
changeset
|
156 |
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
|
157 |
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
|
158 |
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
|
159 |
|
260
182f0c895676
Now outgoing s2s sessions are associated with their from_host, fixes #15
Matthew Wild <mwild1@gmail.com>
parents:
259
diff
changeset
|
160 |
hosts[from_host].s2sout[to_host] = host_session; |
148 | 161 |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
162 |
local log; |
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
163 |
do |
543
cf6e19ea1cbc
Fix logger ids for c2s and s2sout
Matthew Wild <mwild1@gmail.com>
parents:
519
diff
changeset
|
164 |
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
|
165 |
log = logger_init(conn_name); |
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
166 |
host_session.log = log; |
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
167 |
end |
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
168 |
|
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
|
169 |
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
|
170 |
-- Kick the connection attempting machine into life |
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
|
171 |
attempt_connection(host_session); |
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
|
172 |
end |
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
173 |
|
2419
00d985639a06
s2smanager: Trim trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2382
diff
changeset
|
174 |
if not host_session.sends2s then |
1007
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
175 |
-- 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
|
176 |
-- 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
|
177 |
-- 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
|
178 |
local buffer; |
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
179 |
function host_session.sends2s(data) |
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
180 |
if not buffer then |
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
181 |
buffer = {}; |
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
182 |
host_session.send_buffer = buffer; |
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
183 |
end |
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
184 |
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
|
185 |
buffer[#buffer+1] = data; |
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
186 |
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
|
187 |
end |
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
188 |
end |
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
189 |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
190 |
return host_session; |
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
191 |
end |
353
e7d776b5ebb9
Remove an old FIXME comment
Matthew Wild <mwild1@gmail.com>
parents:
351
diff
changeset
|
192 |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
193 |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
194 |
function attempt_connection(host_session, err) |
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
195 |
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
|
196 |
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
|
197 |
|
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
|
198 |
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
|
199 |
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
|
200 |
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
|
201 |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
202 |
if not err then -- This is our first attempt |
1006
9166d7a8c3c0
core.s2smanager: Logging improvements
Matthew Wild <mwild1@gmail.com>
parents:
995
diff
changeset
|
203 |
log("debug", "First attempt to connect to %s, starting with SRV lookup...", to_host); |
974 | 204 |
host_session.connecting = true; |
1791
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
205 |
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
|
206 |
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
|
207 |
handle = nil; |
974 | 208 |
host_session.connecting = nil; |
209 |
if answer then |
|
210 |
log("debug", to_host.." has SRV records, handling..."); |
|
211 |
local srv_hosts = {}; |
|
212 |
host_session.srv_hosts = srv_hosts; |
|
213 |
for _, record in ipairs(answer) do |
|
214 |
t_insert(srv_hosts, record.srv); |
|
215 |
end |
|
216 |
t_sort(srv_hosts, compare_srv_priorities); |
|
217 |
||
218 |
local srv_choice = srv_hosts[1]; |
|
219 |
host_session.srv_choice = 1; |
|
220 |
if srv_choice then |
|
221 |
connect_host, connect_port = srv_choice.target or to_host, srv_choice.port or connect_port; |
|
222 |
log("debug", "Best record found, will connect to %s:%d", connect_host, connect_port); |
|
223 |
end |
|
224 |
else |
|
225 |
log("debug", to_host.." has no SRV records, falling back to A"); |
|
337 | 226 |
end |
974 | 227 |
-- 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
|
228 |
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
|
229 |
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
|
230 |
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
|
231 |
-- 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
|
232 |
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
|
233 |
end |
aaeccebad0f3
s2smanager: Fix to correctly bounce stanzas if first connection attempt fails instantly
Matthew Wild <mwild1@gmail.com>
parents:
1468
diff
changeset
|
234 |
end |
974 | 235 |
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
|
236 |
|
dea89234e545
s2smanager: Timeout DNS requests after 60 seconds (or dns_timeout in config)
Matthew Wild <mwild1@gmail.com>
parents:
1199
diff
changeset
|
237 |
-- 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
|
238 |
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
|
239 |
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
|
240 |
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
|
241 |
end |
dea89234e545
s2smanager: Timeout DNS requests after 60 seconds (or dns_timeout in config)
Matthew Wild <mwild1@gmail.com>
parents:
1199
diff
changeset
|
242 |
end); |
dea89234e545
s2smanager: Timeout DNS requests after 60 seconds (or dns_timeout in config)
Matthew Wild <mwild1@gmail.com>
parents:
1199
diff
changeset
|
243 |
|
1006
9166d7a8c3c0
core.s2smanager: Logging improvements
Matthew Wild <mwild1@gmail.com>
parents:
995
diff
changeset
|
244 |
log("debug", "DNS lookup for %s sent, waiting for response before we can connect", to_host); |
974 | 245 |
return true; -- Attempt in progress |
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
246 |
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
|
247 |
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
|
248 |
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
|
249 |
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
|
250 |
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
|
251 |
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
|
252 |
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
|
253 |
-- We're out of options |
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
254 |
return false; |
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
255 |
end |
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
256 |
|
960
6bc16062da6c
core.s2smanager: Check for valid host and port before attempting connection
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
257 |
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
|
258 |
-- Likely we couldn't resolve DNS |
1006
9166d7a8c3c0
core.s2smanager: Logging improvements
Matthew Wild <mwild1@gmail.com>
parents:
995
diff
changeset
|
259 |
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
|
260 |
return false; |
6bc16062da6c
core.s2smanager: Check for valid host and port before attempting connection
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
261 |
end |
6bc16062da6c
core.s2smanager: Check for valid host and port before attempting connection
Matthew Wild <mwild1@gmail.com>
parents:
959
diff
changeset
|
262 |
|
974 | 263 |
return try_connect(host_session, connect_host, connect_port); |
264 |
end |
|
265 |
||
266 |
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
|
267 |
host_session.connecting = true; |
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
268 |
local handle; |
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
269 |
handle = adns.lookup(function (reply) |
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
270 |
handle = nil; |
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
271 |
host_session.connecting = nil; |
1793
1fc6c2822e6b
s2smanager: Compatibility with domains which use CNAMEs
Matthew Wild <mwild1@gmail.com>
parents:
1791
diff
changeset
|
272 |
|
1fc6c2822e6b
s2smanager: Compatibility with domains which use CNAMEs
Matthew Wild <mwild1@gmail.com>
parents:
1791
diff
changeset
|
273 |
-- 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
|
274 |
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
|
275 |
local count = max_dns_depth; |
1793
1fc6c2822e6b
s2smanager: Compatibility with domains which use CNAMEs
Matthew Wild <mwild1@gmail.com>
parents:
1791
diff
changeset
|
276 |
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
|
277 |
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
|
278 |
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
|
279 |
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
|
280 |
count = count - 1; |
1793
1fc6c2822e6b
s2smanager: Compatibility with domains which use CNAMEs
Matthew Wild <mwild1@gmail.com>
parents:
1791
diff
changeset
|
281 |
end |
1fc6c2822e6b
s2smanager: Compatibility with domains which use CNAMEs
Matthew Wild <mwild1@gmail.com>
parents:
1791
diff
changeset
|
282 |
end |
1fc6c2822e6b
s2smanager: Compatibility with domains which use CNAMEs
Matthew Wild <mwild1@gmail.com>
parents:
1791
diff
changeset
|
283 |
-- end of CNAME resolving |
1fc6c2822e6b
s2smanager: Compatibility with domains which use CNAMEs
Matthew Wild <mwild1@gmail.com>
parents:
1791
diff
changeset
|
284 |
|
1828
48cb27e2716e
core.s2smanager: Always use last record in the DNS cache
Matthew Wild <mwild1@gmail.com>
parents:
1805
diff
changeset
|
285 |
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
|
286 |
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
|
287 |
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
|
288 |
else |
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
289 |
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
|
290 |
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
|
291 |
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
|
292 |
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
|
293 |
end |
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
294 |
end |
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
295 |
end, connect_host, "A", "IN"); |
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
296 |
|
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
297 |
-- Set handler for DNS timeout |
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
298 |
add_task(dns_timeout, function () |
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
299 |
if handle then |
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
300 |
adns.cancel(handle, true); |
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
301 |
end |
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
302 |
end); |
2419
00d985639a06
s2smanager: Trim trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2382
diff
changeset
|
303 |
|
1791
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
304 |
return true; |
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
305 |
end |
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
306 |
|
42d0b68a1efd
s2smanager: Pass A-record lookups through adns module
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
307 |
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
|
308 |
(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
|
309 |
-- Ok, we're going to try to connect |
974 | 310 |
|
311 |
local from_host, to_host = host_session.from_host, host_session.to_host; |
|
312 |
||
313 |
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
|
314 |
|
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
|
315 |
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
|
316 |
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
|
317 |
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
|
318 |
end |
974 | 319 |
|
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
320 |
conn:settimeout(0); |
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
321 |
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
|
322 |
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
|
323 |
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
|
324 |
return false, err; |
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
325 |
end |
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
326 |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
327 |
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
|
328 |
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
|
329 |
host_session.conn = conn; |
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
330 |
|
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
331 |
-- 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
|
332 |
-- 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
|
333 |
cl.register_outgoing(conn, host_session); |
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
334 |
|
2019
c712ea57b877
s2smanager: Use session-specific logger to log outgoing data on outgoing s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1976
diff
changeset
|
335 |
local w, log = conn.write, host_session.log; |
2133 | 336 |
host_session.sends2s = function (t) log("debug", "sending: %s", (t.top_tag and t:top_tag()) or t:match("^[^>]*>?")); w(conn, tostring(t)); end |
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
337 |
|
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
|
338 |
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
|
339 |
|
974 | 340 |
log("debug", "Connection attempt in progress..."); |
1796
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
341 |
add_task(connect_timeout, function () |
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
342 |
if host_session.conn ~= conn or |
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
343 |
host_session.type == "s2sout" or |
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
344 |
host_session.connecting then |
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
345 |
return; -- Ok, we're connect[ed|ing] |
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
346 |
end |
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
347 |
-- Not connected, need to close session and clean up |
2419
00d985639a06
s2smanager: Trim trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2382
diff
changeset
|
348 |
(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
|
349 |
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
|
350 |
host_session:close("connection-timeout"); |
5f7b2f940816
s2smanager: Timeout unauthed s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
1793
diff
changeset
|
351 |
end); |
434
0d7ba3742f7a
(Basic) IDNA and SRV fallback support
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
352 |
return true; |
148 | 353 |
end |
354 |
||
2426
4cef9808662a
s2smanager: Split sending of stream header into a :open_stream() method
Matthew Wild <mwild1@gmail.com>
parents:
2422
diff
changeset
|
355 |
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
|
356 |
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
|
357 |
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
|
358 |
["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
|
359 |
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
|
360 |
end |
4cef9808662a
s2smanager: Split sending of stream header into a :open_stream() method
Matthew Wild <mwild1@gmail.com>
parents:
2422
diff
changeset
|
361 |
|
148 | 362 |
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
|
363 |
local send = session.sends2s; |
148 | 364 |
|
544
efde848869c5
Don't send stream:features to incoming s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
543
diff
changeset
|
365 |
-- TODO: #29: SASL/TLS on s2s streams |
1894
53f34ba6f6d6
Minor changes; outgoing TLS works.
Paul Aurich <paul@darkrain42.org>
parents:
1891
diff
changeset
|
366 |
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
|
367 |
|
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
|
368 |
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
|
369 |
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
|
370 |
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
|
371 |
|
148 | 372 |
if session.direction == "incoming" then |
373 |
-- Send a reply stream header |
|
938
663f75dd7b42
Fixed: Some nil access bugs
Waqas Hussain <waqas20@gmail.com>
parents:
931
diff
changeset
|
374 |
session.to_host = attr.to and nameprep(attr.to); |
663f75dd7b42
Fixed: Some nil access bugs
Waqas Hussain <waqas20@gmail.com>
parents:
931
diff
changeset
|
375 |
session.from_host = attr.from and nameprep(attr.from); |
148 | 376 |
|
377 |
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
|
378 |
(session.log or log)("debug", "incoming s2s received <stream:stream>"); |
331 | 379 |
if session.to_host and not hosts[session.to_host] then |
380 |
-- 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
|
381 |
session:close({ condition = "host-unknown"; text = "This host does not serve "..session.to_host }); |
331 | 382 |
return; |
383 |
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
|
384 |
send("<?xml version='1.0'?>"); |
2419
00d985639a06
s2smanager: Trim trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2382
diff
changeset
|
385 |
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
|
386 |
["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
|
387 |
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
|
388 |
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
|
389 |
|
1936
a6ca0dcc7b83
s2smanager: Make s2s-stream-features a per-host event
Matthew Wild <mwild1@gmail.com>
parents:
1930
diff
changeset
|
390 |
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
|
391 |
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
|
392 |
else |
a6ca0dcc7b83
s2smanager: Make s2s-stream-features a per-host event
Matthew Wild <mwild1@gmail.com>
parents:
1930
diff
changeset
|
393 |
(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
|
394 |
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
|
395 |
|
e875833ae08e
s2smanager: Send stream:features for incoming s2s connections which support XMPP 1.0
Matthew Wild <mwild1@gmail.com>
parents:
1888
diff
changeset
|
396 |
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
|
397 |
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
|
398 |
end |
148 | 399 |
elseif session.direction == "outgoing" then |
400 |
-- 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
|
401 |
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
|
402 |
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
|
403 |
|
1007
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
404 |
-- Send unauthed buffer |
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
405 |
-- (stanzas which are fine to send before dialback) |
2419
00d985639a06
s2smanager: Trim trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents:
2382
diff
changeset
|
406 |
-- 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
|
407 |
-- we can only send if auth succeeds) :) |
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
408 |
local send_buffer = session.send_buffer; |
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
409 |
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
|
410 |
log("debug", "Sending s2s send_buffer now..."); |
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
411 |
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
|
412 |
session.sends2s(tostring(data)); |
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
413 |
send_buffer[i] = nil; |
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
414 |
end |
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
415 |
end |
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
416 |
session.send_buffer = nil; |
c500d4cb7855
core.s2smanager: Buffer data sent before connection
Matthew Wild <mwild1@gmail.com>
parents:
1006
diff
changeset
|
417 |
|
1890
aed0d8a0cca8
s2smanager: Don't wait for stream:features from non-XMPP-1.0 hosts
Matthew Wild <mwild1@gmail.com>
parents:
1889
diff
changeset
|
418 |
-- 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
|
419 |
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
|
420 |
if not session.dialback_verifying then |
1894
53f34ba6f6d6
Minor changes; outgoing TLS works.
Paul Aurich <paul@darkrain42.org>
parents:
1891
diff
changeset
|
421 |
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
|
422 |
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
|
423 |
else |
aed0d8a0cca8
s2smanager: Don't wait for stream:features from non-XMPP-1.0 hosts
Matthew Wild <mwild1@gmail.com>
parents:
1889
diff
changeset
|
424 |
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
|
425 |
end |
148 | 426 |
end |
427 |
end |
|
428 |
session.notopen = nil; |
|
429 |
end |
|
430 |
||
959
e3db909065f2
sessionmanager, s2smanager, mod_component: Send reply </stream:stream> when client closes stream
Matthew Wild <mwild1@gmail.com>
parents:
938
diff
changeset
|
431 |
function streamclosed(session) |
2747
168104895051
sessionmanager, s2smanager: Close session on </stream:stream>
Matthew Wild <mwild1@gmail.com>
parents:
2746
diff
changeset
|
432 |
(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
|
433 |
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
|
434 |
end |
e3db909065f2
sessionmanager, s2smanager, mod_component: Send reply </stream:stream> when client closes stream
Matthew Wild <mwild1@gmail.com>
parents:
938
diff
changeset
|
435 |
|
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
|
436 |
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
|
437 |
-- 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
|
438 |
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
|
439 |
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
|
440 |
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
|
441 |
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
|
442 |
|
148 | 443 |
function generate_dialback(id, to, from) |
2420
6ccd36a95a81
s2smanager, hostmanager: Make dialback secrets per-host
Matthew Wild <mwild1@gmail.com>
parents:
2419
diff
changeset
|
444 |
return sha256_hash(id..to..from..hosts[from].dialback_secret, true); |
148 | 445 |
end |
446 |
||
447 |
function verify_dialback(id, to, from, key) |
|
448 |
return key == generate_dialback(id, to, from); |
|
449 |
end |
|
450 |
||
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
|
451 |
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
|
452 |
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
|
453 |
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
|
454 |
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
|
455 |
session:close({ |
0dc7b5ceaf8f
s2smanager: Make require_s2s_encryption do what it says on the tin
Matthew Wild <mwild1@gmail.com>
parents:
2787
diff
changeset
|
456 |
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
|
457 |
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
|
458 |
..((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
|
459 |
}); |
0dc7b5ceaf8f
s2smanager: Make require_s2s_encryption do what it says on the tin
Matthew Wild <mwild1@gmail.com>
parents:
2787
diff
changeset
|
460 |
end |
0dc7b5ceaf8f
s2smanager: Make require_s2s_encryption do what it says on the tin
Matthew Wild <mwild1@gmail.com>
parents:
2787
diff
changeset
|
461 |
end |
148 | 462 |
if session.type == "s2sout_unauthed" then |
463 |
session.type = "s2sout"; |
|
464 |
elseif session.type == "s2sin_unauthed" then |
|
465 |
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
|
466 |
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
|
467 |
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
|
468 |
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
|
469 |
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
|
470 |
session.hosts[host].authed = true; |
148 | 471 |
else |
472 |
return false; |
|
473 |
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
|
474 |
session.log("debug", "connection %s->%s is now authenticated", session.from_host or "(unknown)", session.to_host or "(unknown)"); |
148 | 475 |
|
476 |
mark_connected(session); |
|
477 |
||
478 |
return true; |
|
479 |
end |
|
480 |
||
1891 | 481 |
-- Stream is authorised, and ready for normal stanzas |
148 | 482 |
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
|
483 |
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
|
484 |
|
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
485 |
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
|
486 |
|
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
|
487 |
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
|
488 |
|
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
489 |
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
|
490 |
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
|
491 |
|
186
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
492 |
|
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
|
493 |
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
|
494 |
if sendq then |
269
3cfac0e5e6ca
Log how many queued stanzas we send
Waqas Hussain <waqas20@gmail.com>
parents:
266
diff
changeset
|
495 |
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
|
496 |
for i, data in ipairs(sendq) do |
631
6957fe7b0313
Bounce stanza errors on failed s2s
Waqas Hussain <waqas20@gmail.com>
parents:
621
diff
changeset
|
497 |
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
|
498 |
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
|
499 |
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
|
500 |
session.sendq = nil; |
148 | 501 |
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
|
502 |
|
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
|
503 |
session.srv_hosts = nil; |
148 | 504 |
end |
505 |
end |
|
506 |
||
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
|
507 |
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
|
508 |
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
|
509 |
type = "s2s_destroyed"; |
2748
85a242cd1bc4
s2smanager: Add open_stream and close methods to resting sessions
Matthew Wild <mwild1@gmail.com>
parents:
2747
diff
changeset
|
510 |
open_stream = function (session) |
85a242cd1bc4
s2smanager: Add open_stream and close methods to resting sessions
Matthew Wild <mwild1@gmail.com>
parents:
2747
diff
changeset
|
511 |
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
|
512 |
end; |
85a242cd1bc4
s2smanager: Add open_stream and close methods to resting sessions
Matthew Wild <mwild1@gmail.com>
parents:
2747
diff
changeset
|
513 |
close = function (session) |
85a242cd1bc4
s2smanager: Add open_stream and close methods to resting sessions
Matthew Wild <mwild1@gmail.com>
parents:
2747
diff
changeset
|
514 |
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
|
515 |
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
|
516 |
}; 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
|
517 |
|
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
|
518 |
function retire_session(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
|
519 |
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
|
520 |
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
|
521 |
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
|
522 |
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
|
523 |
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
|
524 |
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
|
525 |
|
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
|
526 |
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
|
527 |
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
|
528 |
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
|
529 |
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
|
530 |
|
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
|
531 |
function destroy_session(session, reason) |
2749
8dc5f3651501
s2smanager: Don't re-destroy destroyed sessions
Matthew Wild <mwild1@gmail.com>
parents:
2748
diff
changeset
|
532 |
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
|
533 |
(session.log or log)("info", "Destroying "..tostring(session.direction).." session "..tostring(session.from_host).."->"..tostring(session.to_host)); |
331 | 534 |
|
164
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
535 |
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
|
536 |
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
|
537 |
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
|
538 |
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
|
539 |
incoming_s2s[session] = nil; |
164
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
540 |
end |
331 | 541 |
|
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
|
542 |
retire_session(session); -- Clean session until it is GC'd |
164
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
543 |
end |
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
544 |
|
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
|
545 |
return _M; |