Sat, 08 Nov 2008 20:44:32 +0000
Fix some very misleading logging
148 | 1 | |
2 | local hosts = hosts; | |
3 | local sessions = sessions; | |
4 | local socket = require "socket"; | |
5 | local format = string.format; | |
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
|
6 | local t_insert = table.insert; |
148 | 7 | local tostring, pairs, ipairs, getmetatable, print, newproxy, error, tonumber |
8 | = tostring, pairs, ipairs, getmetatable, print, newproxy, error, tonumber; | |
9 | ||
10 | local connlisteners_get = require "net.connlisteners".get; | |
11 | local wraptlsclient = require "net.server".wraptlsclient; | |
12 | local modulemanager = require "core.modulemanager"; | |
13 | ||
14 | local uuid_gen = require "util.uuid".generate; | |
15 | ||
16 | local logger_init = require "util.logger".init; | |
17 | ||
18 | local log = logger_init("s2smanager"); | |
19 | ||
20 | local md5_hash = require "util.hashes".md5; | |
21 | ||
22 | local dialback_secret = "This is very secret!!! Ha!"; | |
23 | ||
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
|
24 | local srvmap = { ["gmail.com"] = "talk.google.com", ["identi.ca"] = "longlance.controlezvous.ca", ["cdr.se"] = "jabber.cdr.se" }; |
157
f4e9b6ec34b0
Hack until we get SRV resolving
Matthew Wild <mwild1@gmail.com>
parents:
148
diff
changeset
|
25 | |
148 | 26 | module "s2smanager" |
27 | ||
28 | function connect_host(from_host, to_host) | |
29 | end | |
30 | ||
31 | function send_to_host(from_host, to_host, 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
|
32 | local host = hosts[to_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
|
33 | if host then |
148 | 34 | -- Write to connection |
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
|
35 | if host.type == "s2sout_unauthed" and not host.notopen and not host.dialback_key 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
|
36 | log("debug", "trying to send over unauthed s2sout to "..to_host..", authing it now..."); |
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
|
37 | initiate_dialback(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
|
38 | if not host.sendq then host.sendq = { data }; |
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
|
39 | else t_insert(host.sendq, 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
|
40 | else |
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
|
41 | 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
|
42 | -- FIXME |
227
211c2e04c82b
Fix some very misleading logging
Matthew Wild <mwild1@gmail.com>
parents:
225
diff
changeset
|
43 | if hosts[to_host].from_host ~= from_host then log("error", "WARNING! This might, possibly, be a bug, but it might not..."); end |
190
1e993b7deae7
General fixes for s2s, to make it more robust (I hope), sending data to remote hosts sane (s2ssession.send() works as expected), recycle outgoing dialback connections, etc.
Matthew Wild <mwild1@gmail.com>
parents:
186
diff
changeset
|
44 | hosts[to_host].sends2s(data); |
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
|
45 | log("debug", "stanza sent over "..hosts[to_host].type); |
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
|
46 | end |
148 | 47 | else |
48 | log("debug", "opening a new outgoing connection for this stanza"); | |
49 | local host_session = new_outgoing(from_host, to_host); | |
50 | -- Store in buffer | |
51 | host_session.sendq = { data }; | |
52 | end | |
53 | end | |
54 | ||
55 | function disconnect_host(host) | |
56 | ||
57 | end | |
58 | ||
59 | local open_sessions = 0; | |
60 | ||
61 | function new_incoming(conn) | |
199
eccf66b42bd7
Added resource priority handling, etc
Waqas Hussain <waqas20@gmail.com>
parents:
191
diff
changeset
|
62 | local session = { conn = conn, type = "s2sin_unauthed", direction = "incoming" }; |
148 | 63 | if true then |
64 | session.trace = newproxy(true); | |
65 | getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; print("s2s session got collected, now "..open_sessions.." s2s sessions are allocated") end; | |
66 | end | |
67 | open_sessions = open_sessions + 1; | |
68 | local w = conn.write; | |
186
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
69 | session.sends2s = function (t) w(tostring(t)); end |
148 | 70 | return session; |
71 | end | |
72 | ||
73 | function new_outgoing(from_host, to_host) | |
74 | local host_session = { to_host = to_host, from_host = from_host, notopen = true, type = "s2sout_unauthed", direction = "outgoing" }; | |
75 | hosts[to_host] = host_session; | |
76 | local cl = connlisteners_get("xmppserver"); | |
77 | ||
78 | local conn, handler = socket.tcp() | |
79 | --FIXME: Below parameters (ports/ip) are incorrect (use SRV) | |
157
f4e9b6ec34b0
Hack until we get SRV resolving
Matthew Wild <mwild1@gmail.com>
parents:
148
diff
changeset
|
80 | to_host = srvmap[to_host] or to_host; |
148 | 81 | conn:connect(to_host, 5269); |
82 | conn = wraptlsclient(cl, conn, to_host, 5269, 0, 1, hosts[from_host].ssl_ctx ); | |
83 | host_session.conn = conn; | |
84 | ||
85 | -- Register this outgoing connection so that xmppserver_listener knows about it | |
86 | -- otherwise it will assume it is a new incoming connection | |
87 | cl.register_outgoing(conn, host_session); | |
88 | ||
89 | do | |
90 | local conn_name = "s2sout"..tostring(conn):match("[a-f0-9]*$"); | |
91 | host_session.log = logger_init(conn_name); | |
92 | end | |
93 | ||
94 | local w = conn.write; | |
186
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
95 | host_session.sends2s = function (t) w(tostring(t)); end |
148 | 96 | |
97 | 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'>]], from_host, to_host)); | |
98 | ||
99 | return host_session; | |
100 | end | |
101 | ||
102 | function streamopened(session, attr) | |
103 | session.log("debug", "s2s stream opened"); | |
186
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
104 | local send = session.sends2s; |
148 | 105 | |
106 | session.version = tonumber(attr.version) or 0; | |
107 | if session.version >= 1.0 and not (attr.to and attr.from) then | |
108 | print("to: "..tostring(attr.to).." from: "..tostring(attr.from)); | |
109 | --error(session.to_host.." failed to specify 'to' or 'from' hostname as per RFC"); | |
110 | log("warn", (session.to_host or "(unknown)").." failed to specify 'to' or 'from' hostname as per RFC"); | |
111 | end | |
112 | ||
113 | if session.direction == "incoming" then | |
114 | -- Send a reply stream header | |
115 | ||
116 | for k,v in pairs(attr) do print("", tostring(k), ":::", tostring(v)); end | |
117 | ||
118 | session.to_host = attr.to; | |
119 | session.from_host = attr.from; | |
120 | ||
121 | session.streamid = uuid_gen(); | |
122 | print(session, session.from_host, "incoming s2s stream opened"); | |
123 | send("<?xml version='1.0'?>"); | |
124 | send(format("<stream:stream xmlns='jabber:server' xmlns:db='jabber:server:dialback' xmlns:stream='http://etherx.jabber.org/streams' id='%s' from='%s'>", session.streamid, session.to_host)); | |
125 | elseif session.direction == "outgoing" then | |
126 | -- 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
|
127 | 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
|
128 | 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
|
129 | |
148 | 130 | 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
|
131 | initiate_dialback(session); |
148 | 132 | else |
133 | mark_connected(session); | |
134 | end | |
135 | end | |
136 | --[[ | |
137 | local features = {}; | |
138 | modulemanager.fire_event("stream-features-s2s", session, features); | |
139 | ||
140 | send("<stream:features>"); | |
141 | ||
142 | for _, feature in ipairs(features) do | |
143 | send(tostring(feature)); | |
144 | end | |
145 | ||
146 | send("</stream:features>");]] | |
147 | log("info", "s2s stream opened successfully"); | |
148 | session.notopen = nil; | |
149 | end | |
150 | ||
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
|
151 | 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
|
152 | -- 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
|
153 | 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
|
154 | 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
|
155 | 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
|
156 | 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
|
157 | |
148 | 158 | function generate_dialback(id, to, from) |
159 | return md5_hash(id..to..from..dialback_secret); -- FIXME: See XEP-185 and XEP-220 | |
160 | end | |
161 | ||
162 | function verify_dialback(id, to, from, key) | |
163 | return key == generate_dialback(id, to, from); | |
164 | end | |
165 | ||
166 | function make_authenticated(session) | |
167 | if session.type == "s2sout_unauthed" then | |
168 | session.type = "s2sout"; | |
169 | elseif session.type == "s2sin_unauthed" then | |
170 | session.type = "s2sin"; | |
171 | else | |
172 | return false; | |
173 | end | |
174 | session.log("info", "connection is now authenticated"); | |
175 | ||
176 | mark_connected(session); | |
177 | ||
178 | return true; | |
179 | end | |
180 | ||
181 | 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
|
182 | 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
|
183 | |
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
184 | 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
|
185 | |
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
|
186 | session.log("debug", session.direction.." s2s connection "..from.."->"..to.." is now complete"); |
186
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
187 | |
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
188 | 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
|
189 | 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
|
190 | |
186
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
191 | |
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
|
192 | 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
|
193 | if sendq 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
|
194 | session.log("debug", "sending queued stanzas across new outgoing connection to "..session.to_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
|
195 | for i, data in ipairs(sendq) do |
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
|
196 | send(data); |
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
|
197 | 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
|
198 | 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
|
199 | session.sendq = nil; |
148 | 200 | end |
201 | end | |
202 | end | |
203 | ||
164
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
204 | 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
|
205 | (session.log or log)("info", "Destroying "..tostring(session.direction).." session "..tostring(session.from_host).."->"..tostring(session.to_host)); |
164
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
206 | if session.direction == "outgoing" then |
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
207 | hosts[session.to_host] = nil; |
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
208 | end |
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
209 | session.conn = nil; |
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
210 | session.disconnect = nil; |
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
211 | for k in pairs(session) do |
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
212 | if k ~= "trace" then |
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
213 | session[k] = nil; |
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
214 | end |
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
215 | end |
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
216 | end |
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
217 | |
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
|
218 | return _M; |