1 files changed, 49 insertions, 19 deletions

diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua
index 59fc4332..4e29b334 100644
--- a/plugins/mod_dialback.lua
+++ b/plugins/mod_dialback.lua
@@ -29,6 +29,8 @@ 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
@@ -47,50 +49,78 @@ module:add_handler({"s2sin_unauthed", "s2sin"}, "verify", xmlns_dialback,
 		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,
-			st.stanza("db:verify", { from = origin.to_host, to = origin.from_host, id = origin.streamid }):text(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(
+				dialback_verifying.sends2s(
 						st.stanza("db:result", { from = attr.to, to = attr.from, id = attr.id, type = valid })
-								:text(origin.dialback_verifying.dialback_key));
+								: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);