Thu, 04 Dec 2008 19:21:50 +0000
Automated merge with http://waqas.ath.cx/
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
1 | -- Prosody IM v0.1 |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
2 | -- Copyright (C) 2008 Matthew Wild |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
3 | -- Copyright (C) 2008 Waqas Hussain |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
4 | -- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
5 | -- This program is free software; you can redistribute it and/or |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
6 | -- modify it under the terms of the GNU General Public License |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
7 | -- as published by the Free Software Foundation; either version 2 |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
8 | -- of the License, or (at your option) any later version. |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
9 | -- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
10 | -- This program is distributed in the hope that it will be useful, |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
11 | -- but WITHOUT ANY WARRANTY; without even the implied warranty of |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
12 | -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
13 | -- GNU General Public License for more details. |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
14 | -- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
15 | -- You should have received a copy of the GNU General Public License |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
16 | -- along with this program; if not, write to the Free Software |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
17 | -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
18 | -- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
19 | |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
20 | |
191 | 21 | |
22 | local format = string.format; | |
23 | local send_s2s = require "core.s2smanager".send_to_host; | |
24 | local s2s_make_authenticated = require "core.s2smanager".make_authenticated; | |
25 | local s2s_verify_dialback = require "core.s2smanager".verify_dialback; | |
26 | ||
27 | local log = require "util.logger".init("mod_dialback"); | |
28 | ||
29 | local xmlns_dialback = "jabber:server:dialback"; | |
30 | ||
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
352
diff
changeset
|
31 | module:add_handler({"s2sin_unauthed", "s2sin"}, "verify", xmlns_dialback, |
219 | 32 | function (origin, stanza) |
33 | -- We are being asked to verify the key, to ensure it was generated by us | |
34 | log("debug", "verifying dialback key..."); | |
35 | local attr = stanza.attr; | |
36 | -- FIXME: Grr, ejabberd breaks this one too?? it is black and white in XEP-220 example 34 | |
37 | --if attr.from ~= origin.to_host then error("invalid-from"); end | |
38 | local type; | |
39 | if s2s_verify_dialback(attr.id, attr.from, attr.to, stanza[1]) then | |
40 | type = "valid" | |
41 | else | |
42 | type = "invalid" | |
43 | log("warn", "Asked to verify a dialback key that was incorrect. An imposter is claiming to be %s?", attr.to); | |
44 | end | |
259 | 45 | log("debug", "verifyied dialback key... it is %s", type); |
219 | 46 | origin.sends2s(format("<db:verify from='%s' to='%s' id='%s' type='%s'>%s</db:verify>", attr.to, attr.from, attr.id, type, stanza[1])); |
47 | end); | |
191 | 48 | |
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
352
diff
changeset
|
49 | module:add_handler("s2sin_unauthed", "result", xmlns_dialback, |
219 | 50 | function (origin, stanza) |
51 | -- he wants to be identified through dialback | |
52 | -- We need to check the key with the Authoritative server | |
53 | local attr = stanza.attr; | |
54 | local attr = stanza.attr; | |
55 | origin.from_host = attr.from; | |
56 | origin.to_host = attr.to; | |
57 | origin.dialback_key = stanza[1]; | |
58 | log("debug", "asking %s if key %s belongs to them", origin.from_host, origin.dialback_key); | |
59 | send_s2s(origin.to_host, origin.from_host, | |
60 | format("<db:verify from='%s' to='%s' id='%s'>%s</db:verify>", origin.to_host, origin.from_host, | |
61 | origin.streamid, origin.dialback_key)); | |
260
182f0c895676
Now outgoing s2s sessions are associated with their from_host, fixes #15
Matthew Wild <mwild1@gmail.com>
parents:
259
diff
changeset
|
62 | hosts[origin.to_host].s2sout[origin.from_host].dialback_verifying = origin; |
219 | 63 | end); |
191 | 64 | |
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
352
diff
changeset
|
65 | module:add_handler({ "s2sout_unauthed", "s2sout" }, "verify", xmlns_dialback, |
219 | 66 | function (origin, stanza) |
67 | if origin.dialback_verifying then | |
68 | local valid; | |
69 | local attr = stanza.attr; | |
70 | if attr.type == "valid" then | |
71 | s2s_make_authenticated(origin.dialback_verifying); | |
72 | valid = "valid"; | |
73 | else | |
74 | -- Warn the original connection that is was not verified successfully | |
75 | log("warn", "dialback for "..(origin.dialback_verifying.from_host or "(unknown)").." failed"); | |
76 | valid = "invalid"; | |
191 | 77 | end |
347
fba39fda0879
Don't error if the original s2s connection has closed before we get the dialback result
Matthew Wild <mwild1@gmail.com>
parents:
260
diff
changeset
|
78 | if not origin.dialback_verifying.sends2s then |
348
aab28eacd84e
Show which session got disconnected in log message
Matthew Wild <mwild1@gmail.com>
parents:
347
diff
changeset
|
79 | log("warn", "Incoming s2s session %s was closed in the meantime, so we can't notify it of the db result", tostring(origin.dialback_verifying):match("%w+$")); |
347
fba39fda0879
Don't error if the original s2s connection has closed before we get the dialback result
Matthew Wild <mwild1@gmail.com>
parents:
260
diff
changeset
|
80 | else |
fba39fda0879
Don't error if the original s2s connection has closed before we get the dialback result
Matthew Wild <mwild1@gmail.com>
parents:
260
diff
changeset
|
81 | origin.dialback_verifying.sends2s(format("<db:result from='%s' to='%s' id='%s' type='%s'>%s</db:result>", |
352
a73a5afd7da3
Fix the reversed to/from on the final db:result. Fixes M-Link and Gmail. Thanks dwd!!
Matthew Wild <mwild1@gmail.com>
parents:
348
diff
changeset
|
82 | attr.to, attr.from, attr.id, valid, origin.dialback_verifying.dialback_key)); |
347
fba39fda0879
Don't error if the original s2s connection has closed before we get the dialback result
Matthew Wild <mwild1@gmail.com>
parents:
260
diff
changeset
|
83 | end |
219 | 84 | end |
85 | end); | |
191 | 86 | |
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
352
diff
changeset
|
87 | module:add_handler({ "s2sout_unauthed", "s2sout" }, "result", xmlns_dialback, |
219 | 88 | function (origin, stanza) |
89 | if stanza.attr.type == "valid" then | |
90 | s2s_make_authenticated(origin); | |
91 | else | |
92 | -- FIXME | |
93 | error("dialback failed!"); | |
94 | end | |
95 | end); |