X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_dialback.lua;h=e1fd5a42e511c3063cf76bfcd870e3cc892b0630;hb=cebf72aab6f90334f3b3ece7d664e01b185bcfad;hp=b7617da4ce070c213d17760c9536081deb8ec1a5;hpb=8a6a7668b61b7c7a9a533f407e2610e90aa8a1a5;p=prosody.git

diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua
index b7617da4..e1fd5a42 100644
--- a/plugins/mod_dialback.lua
+++ b/plugins/mod_dialback.lua
@@ -1,46 +1,54 @@
--- Prosody IM v0.3
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
 
 
-
+local hosts = _G.hosts;
 local send_s2s = require "core.s2smanager".send_to_host;
 local s2s_make_authenticated = require "core.s2smanager".make_authenticated;
+local s2s_initiate_dialback = require "core.s2smanager".initiate_dialback;
 local s2s_verify_dialback = require "core.s2smanager".verify_dialback;
 local s2s_destroy_session = require "core.s2smanager".destroy_session;
 
-local st = require "util.stanza";
+local log = module._log;
 
-local log = require "util.logger".init("mod_dialback");
+local st = require "util.stanza";
 
+local xmlns_stream = "http://etherx.jabber.org/streams";
 local xmlns_dialback = "jabber:server:dialback";
 
 local dialback_requests = setmetatable({}, { __mode = 'v' });
 
-module:add_handler({"s2sin_unauthed", "s2sin"}, "verify", xmlns_dialback,
-	function (origin, stanza)
+module:hook("stanza/jabber:server:dialback:verify", function(event)
+	local origin, stanza = event.origin, event.stanza;
+	
+	if origin.type == "s2sin_unauthed" or origin.type == "s2sin" then
 		-- We are being asked to verify the key, to ensure it was generated by us
-		log("debug", "verifying dialback key...");
+		origin.log("debug", "verifying that dialback key is ours...");
 		local attr = stanza.attr;
-		-- FIXME: Grr, ejabberd breaks this one too?? it is black and white in XEP-220 example 34
+		-- COMPAT: 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);
+			origin.log("warn", "Asked to verify a dialback key that was incorrect. An imposter is claiming to be %s?", attr.to);
 		end
-		log("debug", "verified dialback key... it is %s", type);
+		origin.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);
+		return true;
+	end
+end);
 
-module:add_handler({ "s2sin_unauthed", "s2sin" }, "result", xmlns_dialback,
-	function (origin, stanza)
+module:hook("stanza/jabber:server:dialback:result", function(event)
+	local origin, stanza = event.origin, event.stanza;
+	
+	if origin.type == "s2sin_unauthed" or origin.type == "s2sin" then
 		-- he wants to be identified through dialback
 		-- We need to check the key with the Authoritative server
 		local attr = stanza.attr;
@@ -48,9 +56,9 @@ module:add_handler({ "s2sin_unauthed", "s2sin" }, "result", xmlns_dialback,
 		
 		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.log("info", "%s tried to connect to %s, which we don't serve", attr.from, attr.to);
 			origin:close("host-unknown");
-			return;
+			return true;
 		end
 		
 		dialback_requests[attr.from] = origin;
@@ -64,13 +72,17 @@ module:add_handler({ "s2sin_unauthed", "s2sin" }, "result", xmlns_dialback,
 			origin.to_host = attr.to;
 		end
 		
-		log("debug", "asking %s if key %s belongs to them", attr.from, stanza[1]);
+		origin.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);
+		return true;
+	end
+end);
 
-module:add_handler({ "s2sout_unauthed", "s2sout" }, "verify", xmlns_dialback,
-	function (origin, stanza)
+module:hook("stanza/jabber:server:dialback:verify", function(event)
+	local origin, stanza = event.origin, event.stanza;
+	
+	if origin.type == "s2sout_unauthed" or origin.type == "s2sout" then
 		local attr = stanza.attr;
 		local dialback_verifying = dialback_requests[attr.from];
 		if dialback_verifying then
@@ -92,24 +104,40 @@ module:add_handler({ "s2sout_unauthed", "s2sout" }, "verify", xmlns_dialback,
 			end
 			dialback_requests[attr.from] = nil;
 		end
-	end);
+		return true;
+	end
+end);
 
-module:add_handler({ "s2sout_unauthed", "s2sout" }, "result", xmlns_dialback,
-	function (origin, stanza)
+module:hook("stanza/jabber:server:dialback:result", function(event)
+	local origin, stanza = event.origin, event.stanza;
+	
+	if origin.type == "s2sout_unauthed" or origin.type == "s2sout" then
 		-- Remote server is telling us whether we passed dialback
 		
 		local attr = stanza.attr;
 		if not hosts[attr.to] then
 			origin:close("host-unknown");
-			return;
+			return true;
 		elseif hosts[attr.to].s2sout[attr.from] ~= origin then
 			-- This isn't right
 			origin:close("invalid-id");
-			return;
+			return true;
 		end
 		if stanza.attr.type == "valid" then
 			s2s_make_authenticated(origin, attr.from);
 		else
 			s2s_destroy_session(origin)
 		end
-	end);
+		return true;
+	end
+end);
+
+module:hook_stanza(xmlns_stream, "features", function (origin, stanza)
+	s2s_initiate_dialback(origin);
+	return true;
+end, 100);
+
+-- Offer dialback to incoming hosts
+module:hook("s2s-stream-features", function (data)
+	data.features:tag("dialback", { xmlns='urn:xmpp:features:dialback' }):tag("optional"):up():up();
+end);