aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_dialback.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-11-01 21:07:14 +0000
committerMatthew Wild <mwild1@gmail.com>2008-11-01 21:07:14 +0000
commit4851756ca45d3e9dc2d8add552528db9423332da (patch)
tree1e33e3e6bc432810ab76b987925bb7e4dca097c6 /plugins/mod_dialback.lua
parent7a2fc45f65a14933f2ab8e83d6ae9487b59e6a79 (diff)
downloadprosody-4851756ca45d3e9dc2d8add552528db9423332da.tar.gz
prosody-4851756ca45d3e9dc2d8add552528db9423332da.zip
Fix s2s once and for all
- Moved dialback to the new mod_dialback (mostly). - Modules can now supply a list of origins to handle to add_handler - Modules can now handle and process any stanza, overriding the core - Modules handle non-jabber:client/jabber:server xmlns'd stanzas
Diffstat (limited to 'plugins/mod_dialback.lua')
-rw-r--r--plugins/mod_dialback.lua67
1 files changed, 67 insertions, 0 deletions
diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua
new file mode 100644
index 00000000..9ff181b7
--- /dev/null
+++ b/plugins/mod_dialback.lua
@@ -0,0 +1,67 @@
+
+local format = string.format;
+local send_s2s = require "core.s2smanager".send_to_host;
+local s2s_make_authenticated = require "core.s2smanager".make_authenticated;
+local s2s_verify_dialback = require "core.s2smanager".verify_dialback;
+
+local log = require "util.logger".init("mod_dialback");
+
+local xmlns_dialback = "jabber:server:dialback";
+
+add_handler({"s2sin_unauthed", "s2sin"}, "verify", xmlns_dialback,
+ function (origin, stanza)
+ -- We are being asked to verify the key, to ensure it was generated by us
+ log("debug", "verifying dialback key...");
+ local attr = stanza.attr;
+ -- FIXME: Grr, ejabberd breaks this one too?? it is black and white in XEP-220 example 34
+ --if attr.from ~= origin.to_host then error("invalid-from"); end
+ local type;
+ if s2s_verify_dialback(attr.id, attr.from, attr.to, stanza[1]) then
+ type = "valid"
+ else
+ type = "invalid"
+ log("warn", "Asked to verify a dialback key that was incorrect. An imposter is claiming to be %s?", attr.to);
+ end
+ 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]));
+ end);
+
+add_handler("s2sin_unauthed", "result", xmlns_dialback,
+ function (origin, stanza)
+ -- he wants to be identified through dialback
+ -- We need to check the key with the Authoritative server
+ local attr = stanza.attr;
+ local attr = stanza.attr;
+ origin.from_host = attr.from;
+ origin.to_host = attr.to;
+ origin.dialback_key = stanza[1];
+ log("debug", "asking %s if key %s belongs to them", origin.from_host, origin.dialback_key);
+ send_s2s(origin.to_host, origin.from_host, format("<db:verify from='%s' to='%s' id='%s'>%s</db:verify>", origin.to_host, origin.from_host, origin.streamid, origin.dialback_key));
+ hosts[origin.from_host].dialback_verifying = origin;
+ end);
+
+add_handler({ "s2sout_unauthed", "s2sout" }, "verify", xmlns_dialback,
+ function (origin, stanza)
+ if origin.dialback_verifying then
+ local valid;
+ local attr = stanza.attr;
+ if attr.type == "valid" then
+ s2s_make_authenticated(origin.dialback_verifying);
+ valid = "valid";
+ else
+ -- Warn the original connection that is was not verified successfully
+ log("warn", "dialback for "..(origin.dialback_verifying.from_host or "(unknown)").." failed");
+ valid = "invalid";
+ end
+ origin.dialback_verifying.sends2s(format("<db:result from='%s' to='%s' id='%s' type='%s'>%s</db:result>", attr.from, attr.to, attr.id, valid, origin.dialback_verifying.dialback_key));
+ end
+ end);
+
+add_handler({ "s2sout_unauthed", "s2sout" }, "result", xmlns_dialback,
+ function (origin, stanza)
+ if stanza.attr.type == "valid" then
+ s2s_make_authenticated(origin);
+ else
+ -- FIXME
+ error("dialback failed!");
+ end
+ end); \ No newline at end of file