mod_tls: Cleanup.

[prosody.git] / plugins / mod_register.lua

diff --git a/plugins/mod_register.lua b/plugins/mod_register.lua
index 2272413008fa0ad7e68dbcf97cca8c0648248e7f..be1be0aebecb1dca7c28a74df66e74af49ff8c90 100644 (file)
--- a/plugins/mod_register.lua
+++ b/plugins/mod_register.lua
@@ -43,21 +43,21 @@ module:add_iq_handler("c2s", "jabber:iq:register", function (session, stanza)
                                        session:close({condition = "not-authorized", text = "Account deleted"});
                                end
                                -- TODO datamanager should be able to delete all user data itself
-                               datamanager.store(username, host, "roster", nil);
                                datamanager.store(username, host, "vcard", nil);
                                datamanager.store(username, host, "private", nil);
                                datamanager.store(username, host, "offline", nil);
-                               --local bare = username.."@"..host;
+                               local bare = username.."@"..host;
                                for jid, item in pairs(roster) do
-                                       if jid ~= "pending" then
-                                               if item.subscription == "both" or item.subscription == "to" then
-                                                       -- TODO unsubscribe
+                                       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 == "from" then
-                                                       -- TODO unsubscribe
+                                               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
                                end
+                               datamanager.store(username, host, "roster", 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 });
@@ -117,7 +117,9 @@ module:add_iq_handler("c2s_unauthed", "jabber:iq:register", function (session, s
                                local password = query:child_with_name("password");
                                if username and password then
                                        -- Check that the user is not blacklisted or registering too often
-                                       if blacklisted_ips[session.ip] or (whitelist_only and not whitelisted_ips[session.ip]) then
+                                       if not session.ip then
+                                               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;
                                        elseif min_seconds_between_registrations and not whitelisted_ips[session.ip] then
@@ -139,7 +141,7 @@ module:add_iq_handler("c2s_unauthed", "jabber:iq:register", function (session, s
                                        username = nodeprep(table.concat(username));
                                        password = table.concat(password);
                                        local host = module.host;
-                                       if not username then
+                                       if not username or username == "" then
                                                session.send(st.error_reply(stanza, "modify", "not-acceptable", "The requested username is invalid."));
                                        elseif usermanager_user_exists(username, host) then
                                                session.send(st.error_reply(stanza, "cancel", "conflict", "The requested username already exists."));