diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2009-10-02 17:51:53 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2009-10-02 17:51:53 +0500 |
| commit | 902cc7dea99f105d2143e6e55a211e846ec50fe7 (patch) | |
| tree | b5e26b456ee2a8a03373a60c44667429234fb56f /plugins | |
| parent | 3525d3e37048d7fe2444347439d81d1484f0ad1a (diff) | |
| parent | 727cc275bba229332912af42fe0e55524d73efdb (diff) | |
| download | prosody-902cc7dea99f105d2143e6e55a211e846ec50fe7.tar.gz prosody-902cc7dea99f105d2143e6e55a211e846ec50fe7.zip | |
Merge with 0.5
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_register.lua | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/plugins/mod_register.lua b/plugins/mod_register.lua index 0cb8d771..22724130 100644 --- a/plugins/mod_register.lua +++ b/plugins/mod_register.lua @@ -118,19 +118,18 @@ module:add_iq_handler("c2s_unauthed", "jabber:iq:register", function (session, s 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 - session.send(st.error_reply(stanza, "cancel", "not-acceptable")); - return; + 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 if not recent_ips[session.ip] then recent_ips[session.ip] = { time = os_time(), count = 1 }; else - local ip = recent_ips[session.ip]; ip.count = ip.count + 1; if os_time() - ip.time < min_seconds_between_registrations then ip.time = os_time(); - session.send(st.error_reply(stanza, "cancel", "not-acceptable")); + session.send(st.error_reply(stanza, "wait", "not-acceptable")); return; end ip.time = os_time(); @@ -139,18 +138,21 @@ module:add_iq_handler("c2s_unauthed", "jabber:iq:register", function (session, s -- FIXME shouldn't use table.concat 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")); + local host = module.host; + if not 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.")); else - if usermanager_create_user(username, password, session.host) then + if usermanager_create_user(username, password, host) then session.send(st.reply(stanza)); -- user created! - module:log("info", "User account created: %s@%s", username, session.host); + module:log("info", "User account created: %s@%s", username, host); module:fire_event("user-registered", { - username = username, host = session.host, source = "mod_register", + username = username, host = 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")); + session.send(st.error_reply(stanza, "wait", "internal-server-error", "Failed to write data to disk.")); end end else |