codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 15:48:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: do not block registration for whitelisted IP address

Browse source
This commit is contained in:
Arpit Jalan 2015-06-02 15:06:45 +05:30
parent afafa30989
commit 79f5eff68b
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/spam_handler.rb
View file

@ -16,6 +16,9 @@ class SpamHandler
return false if staff_members_with_same_ip > 0 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 tl0_accounts_with_same_ip = User.unscoped
.where(trust_level: TrustLevel[0]) .where(trust_level: TrustLevel[0])
.where(ip_address: ip_address.to_s) .where(ip_address: ip_address.to_s)

11
spec/components/spam_handler_spec.rb
View file

@ -46,6 +46,17 @@ describe SpamHandler do
Fabricate(:user, ip_address: "42.42.42.42", trust_level: TrustLevel[0]) Fabricate(:user, ip_address: "42.42.42.42", trust_level: TrustLevel[0])
end 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
end end