Merge 0.7->trunk

[prosody.git] / plugins / mod_register.lua

diff --git a/plugins/mod_register.lua b/plugins/mod_register.lua
index 2272413008fa0ad7e68dbcf97cca8c0648248e7f..14b134c7f5b5c5641eabf72c2ef17b6b327f7b23 100644 (file)
--- a/plugins/mod_register.lua
+++ b/plugins/mod_register.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- 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.
@@ -12,6 +12,7 @@ local st = require "util.stanza";
 local datamanager = require "util.datamanager";
 local usermanager_user_exists = require "core.usermanager".user_exists;
 local usermanager_create_user = require "core.usermanager".create_user;
+local usermanager_set_password = require "core.usermanager".set_password;
 local datamanager_store = require "util.datamanager".store;
 local os_time = os.time;
 local nodeprep = require "util.encodings".stringprep.nodeprep;
@@ -34,7 +35,7 @@ module:add_iq_handler("c2s", "jabber:iq:register", function (session, stanza)
                                local username, host = session.username, session.host;
                                --session.send(st.error_reply(stanza, "cancel", "not-allowed"));
                                --return;
-                               usermanager_create_user(username, nil, host); -- Disable account
+                               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));
@@ -43,21 +44,22 @@ 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;
+                               datamanager.list_store(username, host, "offline", nil);
+                               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, "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 });
@@ -69,7 +71,7 @@ module:add_iq_handler("c2s", "jabber:iq:register", function (session, stanza)
                                        username = nodeprep(table.concat(username));
                                        password = table.concat(password);
                                        if username == session.username then
-                                               if usermanager_create_user(username, password, session.host) then -- password change -- TODO is this the right way?
+                                               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?
@@ -117,7 +119,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 +143,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."));