mod_pep: Fix undefined global access

[prosody.git] / plugins / mod_register.lua

diff --git a/plugins/mod_register.lua b/plugins/mod_register.lua
index f131a60da7efbba6a266ce6560a8152d0902b885..43124ff98f45d92cb82b815cac87ae007cc0252a 100644 (file)
--- a/plugins/mod_register.lua
+++ b/plugins/mod_register.lua
@@ -7,12 +7,15 @@
 --
 
 
-
+local hosts = _G.hosts;
 local st = require "util.stanza";
+local config = require "core.configmanager";
+local datamanager = require "util.datamanager";
 local usermanager_user_exists = require "core.usermanager".user_exists;
 local usermanager_create_user = require "core.usermanager".create_user;
 local datamanager_store = require "util.datamanager".store;
 local os_time = os.time;
+local nodeprep = require "util.encodings".stringprep.nodeprep;
 
 module:add_feature("jabber:iq:register");
 
@@ -57,12 +60,14 @@ module:add_iq_handler("c2s", "jabber:iq:register", function (session, stanza)
                                        end
                                end
                                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 = table.concat(username);
+                                       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?
@@ -133,13 +138,17 @@ module:add_iq_handler("c2s_unauthed", "jabber:iq:register", function (session, s
                                                end
                                        end
                                        -- FIXME shouldn't use table.concat
-                                       username = table.concat(username);
+                                       username = nodeprep(table.concat(username));
                                        password = table.concat(password);
                                        if usermanager_user_exists(username, session.host) then
                                                session.send(st.error_reply(stanza, "cancel", "conflict"));
                                        else
                                                if usermanager_create_user(username, password, session.host) then
                                                        session.send(st.reply(stanza)); -- user created!
+                                                       module:log("info", "User account created: %s@%s", username, session.host);
+                                                       module:fire_event("user-registered", { 
+                                                               username = username, host = session.host, source = "mod_register",
+                                                               session = session });
                                                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"));