X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_iq.lua;h=5be045335c478e256913228207d31fc76b6f3719;hb=dbeef4d3e2933c4441885596f43e5a42683a66cd;hp=fc79e92c810d40662afd38b03db91c04bddf5dbf;hpb=9b6c56b6ead32454132ddcb3f461ecc6ebcdab80;p=prosody.git

diff --git a/plugins/mod_iq.lua b/plugins/mod_iq.lua
index fc79e92c..5be04533 100644
--- a/plugins/mod_iq.lua
+++ b/plugins/mod_iq.lua
@@ -1,3 +1,15 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
+
+local st = require "util.stanza";
+local jid_split = require "util.jid".split;
+local user_exists = require "core.usermanager".user_exists;
 
 local full_sessions = full_sessions;
 local bare_sessions = bare_sessions;
@@ -10,22 +22,34 @@ module:hook("iq/full", function(data)
 	if session then
 		-- TODO fire post processing event
 		session.send(stanza);
-		return true;
 	else -- resource not online
-		-- TODO error reply
+		if stanza.attr.type == "get" or stanza.attr.type == "set" then
+			origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
+		end
 	end
+	return true;
 end);
 
 module:hook("iq/bare", function(data)
 	-- IQ to bare JID recieved
 	local origin, stanza = data.origin, data.stanza;
 
-	-- TODO if not user exists, return an error
+	local to = stanza.attr.to;
+	if to and not bare_sessions[to] then -- quick check for account existance
+		local node, host = jid_split(to);
+		if not user_exists(node, host) then -- full check for account existance
+			if stanza.attr.type == "get" or stanza.attr.type == "set" then
+				origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
+			end
+			return true;
+		end
+	end
 	-- TODO fire post processing events
-	if #stanza.tags == 1 then
-		return module:fire_event("iq/bare/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name);
+	if stanza.attr.type == "get" or stanza.attr.type == "set" then
+		return module:fire_event("iq/bare/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
 	else
-		return true; -- TODO do something with results and errors
+		module:fire_event("iq/bare/"..stanza.attr.id, data);
+		return true;
 	end
 end);
 
@@ -33,9 +57,10 @@ module:hook("iq/host", function(data)
 	-- IQ to a local host recieved
 	local origin, stanza = data.origin, data.stanza;
 
-	if #stanza.tags == 1 then
-		return module:fire_event("iq/host/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name);
+	if stanza.attr.type == "get" or stanza.attr.type == "set" then
+		return module:fire_event("iq/host/"..stanza.tags[1].attr.xmlns..":"..stanza.tags[1].name, data);
 	else
-		return true; -- TODO do something with results and errors
+		module:fire_event("iq/host/"..stanza.attr.id, data);
+		return true;
 	end
 end);