Merge pull request #3518 from techAPJ/patch-3

FIX: do not block registration for whitelisted IP address
This commit is contained in:
Régis Hanol 2015-06-03 12:37:50 +02:00
commit 74b121beeb
2 changed files with 14 additions and 0 deletions

View File

@ -16,6 +16,9 @@ class SpamHandler
return false if staff_members_with_same_ip > 0
ip_whitelisted = ScreenedIpAddress.is_whitelisted?(ip_address)
return false if ip_whitelisted
tl0_accounts_with_same_ip = User.unscoped
.where(trust_level: TrustLevel[0])
.where(ip_address: ip_address.to_s)

View File

@ -46,6 +46,17 @@ describe SpamHandler do
Fabricate(:user, ip_address: "42.42.42.42", trust_level: TrustLevel[0])
end
it "doesn't limit registrations when the IP is whitelisted" do
# setup
SiteSetting.stubs(:max_new_accounts_per_registration_ip).returns(0)
Fabricate(:user, ip_address: "42.42.42.42", trust_level: TrustLevel[0])
ScreenedIpAddress.stubs(:is_whitelisted?).with("42.42.42.42").returns(true)
# should not limit registration
SiteSetting.stubs(:max_new_accounts_per_registration_ip).returns(1)
Fabricate(:user, ip_address: "42.42.42.42", trust_level: TrustLevel[0])
end
end
end