aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2009-10-02 17:07:18 +0500
committerWaqas Hussain <waqas20@gmail.com>2009-10-02 17:07:18 +0500
commit498421b3bac3f259cc2a7b65cea6f7601a974d88 (patch)
tree88c090bcad83d62d17d70daf44d260ee624f65bb
parent27b8833ce2a493447840e207d936e176dd6430ee (diff)
downloadprosody-498421b3bac3f259cc2a7b65cea6f7601a974d88.tar.gz
prosody-498421b3bac3f259cc2a7b65cea6f7601a974d88.zip
mod_register: Added helpful text to registration error responses.
-rw-r--r--plugins/mod_register.lua11
1 files changed, 5 insertions, 6 deletions
diff --git a/plugins/mod_register.lua b/plugins/mod_register.lua
index 1d883eff..bbd5ea42 100644
--- a/plugins/mod_register.lua
+++ b/plugins/mod_register.lua
@@ -119,13 +119,12 @@ 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;
@@ -142,9 +141,9 @@ module:add_iq_handler("c2s_unauthed", "jabber:iq:register", function (session, s
password = table.concat(password);
local host = module.host;
if not username then
- session.send(st.error_reply(stanza, "modify", "not-acceptable"));
+ 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"));
+ session.send(st.error_reply(stanza, "cancel", "conflict", "The requested username already exists."));
else
if usermanager_create_user(username, password, host) then
session.send(st.reply(stanza)); -- user created!
@@ -154,7 +153,7 @@ module:add_iq_handler("c2s_unauthed", "jabber:iq:register", function (session, s
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