aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_register.lua
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2009-11-19 17:53:52 +0100
committerTobias Markmann <tm@ayena.de>2009-11-19 17:53:52 +0100
commit55df1de9bdfac703203e5659bb7cf172760ef484 (patch)
treee65da676bceabba8ad622a2b6d3c28b8f5d0953a /plugins/mod_register.lua
parent315e7ac799abb96f627be4c5b27648f007b89be7 (diff)
parent4cac67d580f99530cd401f4b9b7e7f2036697ada (diff)
downloadprosody-55df1de9bdfac703203e5659bb7cf172760ef484.tar.gz
prosody-55df1de9bdfac703203e5659bb7cf172760ef484.zip
Merge with trunk.
Diffstat (limited to 'plugins/mod_register.lua')
-rw-r--r--plugins/mod_register.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/mod_register.lua b/plugins/mod_register.lua
index 22724130..2ae01fed 100644
--- a/plugins/mod_register.lua
+++ b/plugins/mod_register.lua
@@ -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