Mercurial > prosody-hg
annotate core/s2smanager.lua @ 186:bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Should fix outward routing problems.
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 30 Oct 2008 21:11:22 +0000 |
| parents | 774a172b03c8 |
| children | 1e993b7deae7 |
| rev | line source |
|---|---|
| 148 | 1 |
| 2 local hosts = hosts; | |
| 3 local sessions = sessions; | |
| 4 local socket = require "socket"; | |
| 5 local format = string.format; | |
| 6 local tostring, pairs, ipairs, getmetatable, print, newproxy, error, tonumber | |
| 7 = tostring, pairs, ipairs, getmetatable, print, newproxy, error, tonumber; | |
| 8 | |
| 9 local connlisteners_get = require "net.connlisteners".get; | |
| 10 local wraptlsclient = require "net.server".wraptlsclient; | |
| 11 local modulemanager = require "core.modulemanager"; | |
| 12 | |
| 13 local uuid_gen = require "util.uuid".generate; | |
| 14 | |
| 15 local logger_init = require "util.logger".init; | |
| 16 | |
| 17 local log = logger_init("s2smanager"); | |
| 18 | |
| 19 local md5_hash = require "util.hashes".md5; | |
| 20 | |
| 21 local dialback_secret = "This is very secret!!! Ha!"; | |
| 22 | |
|
157
f4e9b6ec34b0
Hack until we get SRV resolving
Matthew Wild <mwild1@gmail.com>
parents:
148
diff
changeset
|
23 local srvmap = { ["gmail.com"] = "talk.google.com", ["identi.ca"] = "longlance.controlezvous.ca" }; |
|
f4e9b6ec34b0
Hack until we get SRV resolving
Matthew Wild <mwild1@gmail.com>
parents:
148
diff
changeset
|
24 |
| 148 | 25 module "s2smanager" |
| 26 | |
| 27 function connect_host(from_host, to_host) | |
| 28 end | |
| 29 | |
| 30 function send_to_host(from_host, to_host, data) | |
| 31 if hosts[to_host] then | |
| 32 -- Write to connection | |
|
186
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
33 hosts[to_host].sends2s(data); |
| 148 | 34 log("debug", "stanza sent over s2s"); |
| 35 else | |
| 36 log("debug", "opening a new outgoing connection for this stanza"); | |
| 37 local host_session = new_outgoing(from_host, to_host); | |
| 38 -- Store in buffer | |
| 39 host_session.sendq = { data }; | |
| 40 end | |
| 41 end | |
| 42 | |
| 43 function disconnect_host(host) | |
| 44 | |
| 45 end | |
| 46 | |
| 47 local open_sessions = 0; | |
| 48 | |
| 49 function new_incoming(conn) | |
| 50 local session = { conn = conn, priority = 0, type = "s2sin_unauthed", direction = "incoming" }; | |
| 51 if true then | |
| 52 session.trace = newproxy(true); | |
| 53 getmetatable(session.trace).__gc = function () open_sessions = open_sessions - 1; print("s2s session got collected, now "..open_sessions.." s2s sessions are allocated") end; | |
| 54 end | |
| 55 open_sessions = open_sessions + 1; | |
| 56 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
|
57 session.sends2s = function (t) w(tostring(t)); end |
| 148 | 58 return session; |
| 59 end | |
| 60 | |
| 61 function new_outgoing(from_host, to_host) | |
| 62 local host_session = { to_host = to_host, from_host = from_host, notopen = true, type = "s2sout_unauthed", direction = "outgoing" }; | |
| 63 hosts[to_host] = host_session; | |
| 64 | |
| 65 local cl = connlisteners_get("xmppserver"); | |
| 66 | |
| 67 local conn, handler = socket.tcp() | |
| 68 --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
|
69 to_host = srvmap[to_host] or to_host; |
| 148 | 70 conn:connect(to_host, 5269); |
| 71 conn = wraptlsclient(cl, conn, to_host, 5269, 0, 1, hosts[from_host].ssl_ctx ); | |
| 72 host_session.conn = conn; | |
| 73 | |
| 74 -- Register this outgoing connection so that xmppserver_listener knows about it | |
| 75 -- otherwise it will assume it is a new incoming connection | |
| 76 cl.register_outgoing(conn, host_session); | |
| 77 | |
| 78 do | |
| 79 local conn_name = "s2sout"..tostring(conn):match("[a-f0-9]*$"); | |
| 80 host_session.log = logger_init(conn_name); | |
| 81 end | |
| 82 | |
| 83 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
|
84 host_session.sends2s = function (t) w(tostring(t)); end |
| 148 | 85 |
| 86 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)); | |
| 87 | |
| 88 return host_session; | |
| 89 end | |
| 90 | |
| 91 function streamopened(session, attr) | |
| 92 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
|
93 local send = session.sends2s; |
| 148 | 94 |
| 95 session.version = tonumber(attr.version) or 0; | |
| 96 if session.version >= 1.0 and not (attr.to and attr.from) then | |
| 97 print("to: "..tostring(attr.to).." from: "..tostring(attr.from)); | |
| 98 --error(session.to_host.." failed to specify 'to' or 'from' hostname as per RFC"); | |
| 99 log("warn", (session.to_host or "(unknown)").." failed to specify 'to' or 'from' hostname as per RFC"); | |
| 100 end | |
| 101 | |
| 102 if session.direction == "incoming" then | |
| 103 -- Send a reply stream header | |
| 104 | |
| 105 for k,v in pairs(attr) do print("", tostring(k), ":::", tostring(v)); end | |
| 106 | |
| 107 session.to_host = attr.to; | |
| 108 session.from_host = attr.from; | |
| 109 | |
| 110 session.streamid = uuid_gen(); | |
| 111 print(session, session.from_host, "incoming s2s stream opened"); | |
| 112 send("<?xml version='1.0'?>"); | |
| 113 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)); | |
| 114 elseif session.direction == "outgoing" then | |
| 115 -- If we are just using the connection for verifying dialback keys, we won't try and auth it | |
| 116 if not session.dialback_verifying then | |
| 117 -- generate dialback key | |
| 118 if not attr.id then error("stream response did not give us a streamid!!!"); end | |
| 119 session.streamid = attr.id; | |
| 120 session.dialback_key = generate_dialback(session.streamid, session.to_host, session.from_host); | |
|
186
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
121 session.sends2s(format("<db:result from='%s' to='%s'>%s</db:result>", session.from_host, session.to_host, session.dialback_key)); |
| 148 | 122 session.log("info", "sent dialback key on outgoing s2s stream"); |
| 123 else | |
| 124 mark_connected(session); | |
| 125 end | |
| 126 end | |
| 127 --[[ | |
| 128 local features = {}; | |
| 129 modulemanager.fire_event("stream-features-s2s", session, features); | |
| 130 | |
| 131 send("<stream:features>"); | |
| 132 | |
| 133 for _, feature in ipairs(features) do | |
| 134 send(tostring(feature)); | |
| 135 end | |
| 136 | |
| 137 send("</stream:features>");]] | |
| 138 log("info", "s2s stream opened successfully"); | |
| 139 session.notopen = nil; | |
| 140 end | |
| 141 | |
| 142 function generate_dialback(id, to, from) | |
| 143 return md5_hash(id..to..from..dialback_secret); -- FIXME: See XEP-185 and XEP-220 | |
| 144 end | |
| 145 | |
| 146 function verify_dialback(id, to, from, key) | |
| 147 return key == generate_dialback(id, to, from); | |
| 148 end | |
| 149 | |
| 150 function make_authenticated(session) | |
| 151 if session.type == "s2sout_unauthed" then | |
| 152 session.type = "s2sout"; | |
| 153 elseif session.type == "s2sin_unauthed" then | |
| 154 session.type = "s2sin"; | |
| 155 else | |
| 156 return false; | |
| 157 end | |
| 158 session.log("info", "connection is now authenticated"); | |
| 159 | |
| 160 mark_connected(session); | |
| 161 | |
| 162 return true; | |
| 163 end | |
| 164 | |
| 165 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
|
166 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
|
167 |
|
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
168 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
|
169 |
|
179
774a172b03c8
Better logging of s2s connections
Matthew Wild <mwild1@gmail.com>
parents:
169
diff
changeset
|
170 session.log("debug", session.direction.." s2s connection "..session.from_host.."->"..session.to_host.." is now complete"); |
|
186
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
171 |
|
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
172 local send_to_host = send_to_host; |
|
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
173 function session.send(data) send_to_host(from, to, data); end |
|
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
174 |
| 148 | 175 if sendq then |
|
186
bfa8a30ea488
sends2s -> s2s_session.send(), s2s_session.send() -> s2s_session.sends2s()
Matthew Wild <mwild1@gmail.com>
parents:
179
diff
changeset
|
176 session.log("debug", "sending queued stanzas across new outgoing connection to "..session.to_host); |
|
161
8c1a8a3e32e8
Destroy s2s sendqueue when connection is established successfully and data written
Matthew Wild <mwild1@gmail.com>
parents:
157
diff
changeset
|
177 for i, data in ipairs(sendq) do |
| 148 | 178 send(data); |
|
161
8c1a8a3e32e8
Destroy s2s sendqueue when connection is established successfully and data written
Matthew Wild <mwild1@gmail.com>
parents:
157
diff
changeset
|
179 sendq[i] = nil; |
| 148 | 180 end |
|
161
8c1a8a3e32e8
Destroy s2s sendqueue when connection is established successfully and data written
Matthew Wild <mwild1@gmail.com>
parents:
157
diff
changeset
|
181 session.sendq = nil; |
| 148 | 182 end |
| 183 end | |
| 184 | |
|
164
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
185 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
|
186 (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
|
187 if session.direction == "outgoing" then |
|
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
188 hosts[session.to_host] = nil; |
|
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
189 end |
|
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
190 session.conn = nil; |
|
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
191 session.disconnect = nil; |
|
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
192 for k in pairs(session) do |
|
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
193 if k ~= "trace" then |
|
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
194 session[k] = nil; |
|
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
195 end |
|
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
196 end |
|
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
197 end |
|
8dc1faa5b1df
other half of previous commit
Matthew Wild <mwild1@gmail.com>
parents:
162
diff
changeset
|
198 |
| 148 | 199 return _M; |