github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 23:38:29 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: use allowlist and blocklist terminology (#10209)

Browse Source 
This is a PR of the renaming whitelist to allowlist and blacklist to the blocklist.
This commit is contained in:
Krzysztof Kotlarek
2020-07-27 10:23:54 +10:00
committed by GitHub
parent 5077cf52fd
commit e0d9232259
130 changed files with 676 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
spec/models/screened_ip_address_spec.rb
View File

@ -212,37 +212,37 @@ describe ScreenedIpAddress do
end
end
describe '#is_whitelisted?' do
describe '#is_allowed?' do
it 'returns false when record does not exist' do
expect(described_class.is_whitelisted?(ip_address)).to eq(false)
expect(described_class.is_allowed?(ip_address)).to eq(false)
end
it 'returns false when no record matches' do
Fabricate(:screened_ip_address, ip_address: '111.234.23.11', action_type: described_class.actions[:do_nothing])
expect(described_class.is_whitelisted?('222.12.12.12')).to eq(false)
expect(described_class.is_allowed?('222.12.12.12')).to eq(false)
end
context 'IPv4' do
it 'returns true when when record matches and action is :do_nothing' do
Fabricate(:screened_ip_address, ip_address: '111.234.23.11', action_type: described_class.actions[:do_nothing])
expect(described_class.is_whitelisted?('111.234.23.11')).to eq(true)
expect(described_class.is_allowed?('111.234.23.11')).to eq(true)
end
it 'returns false when when record matches and action is :block' do
Fabricate(:screened_ip_address, ip_address: '111.234.23.11', action_type: described_class.actions[:block])
expect(described_class.is_whitelisted?('111.234.23.11')).to eq(false)
expect(described_class.is_allowed?('111.234.23.11')).to eq(false)
end
end
context 'IPv6' do
it 'returns true when when record matches and action is :do_nothing' do
Fabricate(:screened_ip_address, ip_address: '2001:db8::ff00:42:8329', action_type: described_class.actions[:do_nothing])
expect(described_class.is_whitelisted?('2001:db8::ff00:42:8329')).to eq(true)
expect(described_class.is_allowed?('2001:db8::ff00:42:8329')).to eq(true)
end
it 'returns false when when record matches and action is :block' do
Fabricate(:screened_ip_address, ip_address: '2001:db8::ff00:42:8329', action_type: described_class.actions[:block])
expect(described_class.is_whitelisted?('2001:db8::ff00:42:8329')).to eq(false)
expect(described_class.is_allowed?('2001:db8::ff00:42:8329')).to eq(false)
end
end
end
@ -250,12 +250,12 @@ describe ScreenedIpAddress do
describe '#block_admin_login?' do
context 'no allow_admin records exist' do
it "returns false when use_admin_ip_whitelist is false" do
it "returns false when use_admin_ip_allowlist is false" do
expect(described_class.block_admin_login?(Fabricate.build(:user), '123.12.12.12')).to eq(false)
end
context "use_admin_ip_whitelist is true" do
before { SiteSetting.use_admin_ip_whitelist = true }
context "use_admin_ip_allowlist is true" do
before { SiteSetting.use_admin_ip_allowlist = true }
it "returns false when user is nil" do
expect(described_class.block_admin_login?(nil, '123.12.12.12')).to eq(false)
@ -281,12 +281,12 @@ describe ScreenedIpAddress do
Fabricate(:screened_ip_address, ip_address: @permitted_ip_address, action_type: described_class.actions[:allow_admin])
end
it "returns false when use_admin_ip_whitelist is false" do
it "returns false when use_admin_ip_allowlist is false" do
expect(described_class.block_admin_login?(Fabricate.build(:admin), '123.12.12.12')).to eq(false)
end
context "use_admin_ip_whitelist is true" do
before { SiteSetting.use_admin_ip_whitelist = true }
context "use_admin_ip_allowlist is true" do
before { SiteSetting.use_admin_ip_allowlist = true }
it "returns false when user is nil" do
expect(described_class.block_admin_login?(nil, @permitted_ip_address)).to eq(false)