mod_register: Updated to use the new events API.

1 files changed, 68 insertions, 68 deletions

diff --git a/plugins/mod_register.lua b/plugins/mod_register.lua
index 25f47a9e..1e916e73 100644
--- a/plugins/mod_register.lua
+++ b/plugins/mod_register.lua
@@ -18,75 +18,74 @@ local nodeprep = require "util.encodings".stringprep.nodeprep;
 
 module:add_feature("jabber:iq:register");
 
-module:add_iq_handler("c2s", "jabber:iq:register", function (session, stanza)
-	if stanza.tags[1].name == "query" then
-		local query = stanza.tags[1];
-		if stanza.attr.type == "get" then
-			local reply = st.reply(stanza);
-			reply:tag("query", {xmlns = "jabber:iq:register"})
-				:tag("registered"):up()
-				:tag("username"):text(session.username):up()
-				:tag("password"):up();
-			session.send(reply);
-		elseif stanza.attr.type == "set" then
-			if query.tags[1] and query.tags[1].name == "remove" then
-				-- TODO delete user auth data, send iq response, kick all user resources with a <not-authorized/>, delete all user data
-				local username, host = session.username, session.host;
-				--session.send(st.error_reply(stanza, "cancel", "not-allowed"));
-				--return;
-				usermanager_set_password(username, nil, host); -- Disable account
-				-- FIXME the disabling currently allows a different user to recreate the account
-				-- we should add an in-memory account block mode when we have threading
-				session.send(st.reply(stanza));
-				local roster = session.roster;
-				for _, session in pairs(hosts[host].sessions[username].sessions) do -- disconnect all resources
-					session:close({condition = "not-authorized", text = "Account deleted"});
-				end
-				-- TODO datamanager should be able to delete all user data itself
-				datamanager.store(username, host, "vcard", nil);
-				datamanager.store(username, host, "private", nil);
-				datamanager.list_store(username, host, "offline", nil);
-				local bare = username.."@"..host;
-				for jid, item in pairs(roster) do
-					if jid and jid ~= "pending" then
-						if item.subscription == "both" or item.subscription == "from" or (roster.pending and roster.pending[jid]) then
-							core_post_stanza(hosts[host], st.presence({type="unsubscribed", from=bare, to=jid}));
-						end
-						if item.subscription == "both" or item.subscription == "to" or item.ask then
-							core_post_stanza(hosts[host], st.presence({type="unsubscribe", from=bare, to=jid}));
-						end
+module:hook("iq/self/jabber:iq:register:query", function(event)
+	local session, stanza = event.origin, event.stanza;
+
+	local query = stanza.tags[1];
+	if stanza.attr.type == "get" then
+		local reply = st.reply(stanza);
+		reply:tag("query", {xmlns = "jabber:iq:register"})
+			:tag("registered"):up()
+			:tag("username"):text(session.username):up()
+			:tag("password"):up();
+		session.send(reply);
+	else -- stanza.attr.type == "set"
+		if query.tags[1] and query.tags[1].name == "remove" then
+			-- TODO delete user auth data, send iq response, kick all user resources with a <not-authorized/>, delete all user data
+			local username, host = session.username, session.host;
+			--session.send(st.error_reply(stanza, "cancel", "not-allowed"));
+			--return;
+			usermanager_set_password(username, nil, host); -- Disable account
+			-- FIXME the disabling currently allows a different user to recreate the account
+			-- we should add an in-memory account block mode when we have threading
+			session.send(st.reply(stanza));
+			local roster = session.roster;
+			for _, session in pairs(hosts[host].sessions[username].sessions) do -- disconnect all resources
+				session:close({condition = "not-authorized", text = "Account deleted"});
+			end
+			-- TODO datamanager should be able to delete all user data itself
+			datamanager.store(username, host, "vcard", nil);
+			datamanager.store(username, host, "private", nil);
+			datamanager.list_store(username, host, "offline", nil);
+			local bare = username.."@"..host;
+			for jid, item in pairs(roster) do
+				if jid and jid ~= "pending" then
+					if item.subscription == "both" or item.subscription == "from" or (roster.pending and roster.pending[jid]) then
+						core_post_stanza(hosts[host], st.presence({type="unsubscribed", from=bare, to=jid}));
+					end
+					if item.subscription == "both" or item.subscription == "to" or item.ask then
+						core_post_stanza(hosts[host], st.presence({type="unsubscribe", from=bare, to=jid}));
 					end
 				end
-				datamanager.store(username, host, "roster", nil);
-				datamanager.store(username, host, "privacy", nil);
-				datamanager.store(username, host, "accounts", nil); -- delete accounts datastore at the end
-				module:log("info", "User removed their account: %s@%s", username, host);
-				module:fire_event("user-deregistered", { username = username, host = host, source = "mod_register", session = session });
-			else
-				local username = query:child_with_name("username");
-				local password = query:child_with_name("password");
-				if username and password then
-					-- FIXME shouldn't use table.concat
-					username = nodeprep(table.concat(username));
-					password = table.concat(password);
-					if username == session.username then
-						if usermanager_set_password(username, password, session.host) then
-							session.send(st.reply(stanza));
-						else
-							-- TODO unable to write file, file may be locked, etc, what's the correct error?
-							session.send(st.error_reply(stanza, "wait", "internal-server-error"));
-						end
+			end
+			datamanager.store(username, host, "roster", nil);
+			datamanager.store(username, host, "privacy", nil);
+			datamanager.store(username, host, "accounts", nil); -- delete accounts datastore at the end
+			module:log("info", "User removed their account: %s@%s", username, host);
+			module:fire_event("user-deregistered", { username = username, host = host, source = "mod_register", session = session });
+		else
+			local username = query:child_with_name("username");
+			local password = query:child_with_name("password");
+			if username and password then
+				-- FIXME shouldn't use table.concat
+				username = nodeprep(table.concat(username));
+				password = table.concat(password);
+				if username == session.username then
+					if usermanager_set_password(username, password, session.host) then
+						session.send(st.reply(stanza));
 					else
-						session.send(st.error_reply(stanza, "modify", "bad-request"));
+						-- TODO unable to write file, file may be locked, etc, what's the correct error?
+						session.send(st.error_reply(stanza, "wait", "internal-server-error"));
 					end
 				else
 					session.send(st.error_reply(stanza, "modify", "bad-request"));
 				end
+			else
+				session.send(st.error_reply(stanza, "modify", "bad-request"));
 			end
 		end
-	else
-		session.send(st.error_reply(stanza, "cancel", "service-unavailable"));
-	end;
+	end
+	return true;
 end);
 
 local recent_ips = {};
@@ -98,10 +97,12 @@ local blacklisted_ips = module:get_option("registration_blacklist") or {};
 for _, ip in ipairs(whitelisted_ips) do whitelisted_ips[ip] = true; end
 for _, ip in ipairs(blacklisted_ips) do blacklisted_ips[ip] = true; end
 
-module:add_iq_handler("c2s_unauthed", "jabber:iq:register", function (session, stanza)
-	if module:get_option("allow_registration") == false then
+module:hook("stanza/iq/jabber:iq:register:query", function(event)
+	local session, stanza = event.origin, event.stanza;
+
+	if module:get_option("allow_registration") == false or session.type ~= "c2s_unauthed" then
 		session.send(st.error_reply(stanza, "cancel", "service-unavailable"));
-	elseif stanza.tags[1].name == "query" then
+	else
 		local query = stanza.tags[1];
 		if stanza.attr.type == "get" then
 			local reply = st.reply(stanza);
@@ -122,7 +123,7 @@ module:add_iq_handler("c2s_unauthed", "jabber:iq:register", function (session, s
 						module:log("debug", "User's IP not known; can't apply blacklist/whitelist");
 					elseif blacklisted_ips[session.ip] or (whitelist_only and not whitelisted_ips[session.ip]) then
 						session.send(st.error_reply(stanza, "cancel", "not-acceptable", "You are not allowed to register an account."));
-						return;
+						return true;
 					elseif min_seconds_between_registrations and not whitelisted_ips[session.ip] then
 						if not recent_ips[session.ip] then
 							recent_ips[session.ip] = { time = os_time(), count = 1 };
@@ -133,7 +134,7 @@ module:add_iq_handler("c2s_unauthed", "jabber:iq:register", function (session, s
 							if os_time() - ip.time < min_seconds_between_registrations then
 								ip.time = os_time();
 								session.send(st.error_reply(stanza, "wait", "not-acceptable"));
-								return;
+								return true;
 							end
 							ip.time = os_time();
 						end
@@ -163,8 +164,7 @@ module:add_iq_handler("c2s_unauthed", "jabber:iq:register", function (session, s
 				end
 			end
 		end
-	else
-		session.send(st.error_reply(stanza, "cancel", "service-unavailable"));
-	end;
+	end
+	return true;
 end);