X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fmod_dialback.lua;h=4e29b3349a79079cbcfe617eeb149eb1482de440;hb=67081a9864d45796f59658ccd4b779ffbe0d44e0;hp=ea0f9e91c7af104b94e907def2bad822aa227a30;hpb=10904eb0553bd5e6efadbd8ab04ed77c49aa03b9;p=prosody.git
diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua
index ea0f9e91..4e29b334 100644
--- a/plugins/mod_dialback.lua
+++ b/plugins/mod_dialback.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.1
+-- Prosody IM v0.2
-- Copyright (C) 2008 Matthew Wild
-- Copyright (C) 2008 Waqas Hussain
--
@@ -19,15 +19,18 @@
-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 st = require "util.stanza";
+
local log = require "util.logger".init("mod_dialback");
local xmlns_dialback = "jabber:server:dialback";
+local dialback_requests = setmetatable({}, { __mode = 'v' });
+
module: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
@@ -42,54 +45,82 @@ module:add_handler({"s2sin_unauthed", "s2sin"}, "verify", xmlns_dialback,
type = "invalid"
log("warn", "Asked to verify a dialback key that was incorrect. An imposter is claiming to be %s?", attr.to);
end
- log("debug", "verifyied dialback key... it is %s", type);
- origin.sends2s(format("%s", attr.to, attr.from, attr.id, type, stanza[1]));
+ log("debug", "verified dialback key... it is %s", type);
+ origin.sends2s(st.stanza("db:verify", { from = attr.to, to = attr.from, id = attr.id, type = type }):text(stanza[1]));
end);
-module:add_handler("s2sin_unauthed", "result", xmlns_dialback,
+module:add_handler({ "s2sin_unauthed", "s2sin" }, "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("%s", origin.to_host, origin.from_host,
- origin.streamid, origin.dialback_key));
- hosts[origin.to_host].s2sout[origin.from_host].dialback_verifying = origin;
+ origin.hosts[attr.from] = { dialback_key = stanza[1] };
+
+ if not hosts[attr.to] then
+ -- Not a host that we serve
+ log("info", "%s tried to connect to %s, which we don't serve", attr.from, attr.to);
+ origin:close("host-unknown");
+ return;
+ end
+
+ dialback_requests[attr.from] = origin;
+
+ if not origin.from_host then
+ -- Just used for friendlier logging
+ origin.from_host = attr.from;
+ end
+ if not origin.to_host then
+ -- Just used for friendlier logging
+ origin.to_host = attr.to;
+ end
+
+ log("debug", "asking %s if key %s belongs to them", attr.from, stanza[1]);
+ send_s2s(attr.to, attr.from,
+ st.stanza("db:verify", { from = attr.to, to = attr.from, id = origin.streamid }):text(stanza[1]));
end);
module:add_handler({ "s2sout_unauthed", "s2sout" }, "verify", xmlns_dialback,
function (origin, stanza)
- if origin.dialback_verifying then
+ local attr = stanza.attr;
+ local dialback_verifying = dialback_requests[attr.from];
+ if dialback_verifying then
local valid;
- local attr = stanza.attr;
if attr.type == "valid" then
- s2s_make_authenticated(origin.dialback_verifying);
+ s2s_make_authenticated(dialback_verifying, attr.from);
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");
+ log("warn", "authoritative server for "..(attr.from or "(unknown)").." denied the key");
valid = "invalid";
end
- if not origin.dialback_verifying.sends2s then
- 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+$"));
+ if not dialback_verifying.sends2s then
+ log("warn", "Incoming s2s session %s was closed in the meantime, so we can't notify it of the db result", tostring(dialback_verifying):match("%w+$"));
else
- origin.dialback_verifying.sends2s(format("%s",
- attr.to, attr.from, attr.id, valid, origin.dialback_verifying.dialback_key));
+ dialback_verifying.sends2s(
+ st.stanza("db:result", { from = attr.to, to = attr.from, id = attr.id, type = valid })
+ :text(dialback_verifying.hosts[attr.from].dialback_key));
end
+ dialback_requests[attr.from] = nil;
end
end);
module:add_handler({ "s2sout_unauthed", "s2sout" }, "result", xmlns_dialback,
function (origin, stanza)
+ -- Remote server is telling us whether we passed dialback
+
+ local attr = stanza.attr;
+ if not hosts[attr.to] then
+ origin:close("host-unknown");
+ return;
+ elseif hosts[attr.to].s2sout[attr.from] ~= origin then
+ -- This isn't right
+ origin:close("invalid-id");
+ return;
+ end
if stanza.attr.type == "valid" then
- s2s_make_authenticated(origin);
+ s2s_make_authenticated(origin, attr.from);
else
- -- FIXME
+ -- FIXME: Waiting on #33
error("dialback failed!");
end
end);