github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-25 00:32:52 +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

18
spec/models/embeddable_host_spec.rb
View File

@ -96,37 +96,37 @@ describe EmbeddableHost do
end
end
describe "path_whitelist" do
describe "allowed_paths" do
it "matches the path" do
Fabricate(:embeddable_host, path_whitelist: '^/fp/\d{4}/\d{2}/\d{2}/.*$')
Fabricate(:embeddable_host, allowed_paths: '^/fp/\d{4}/\d{2}/\d{2}/.*$')
expect(EmbeddableHost.url_allowed?('http://eviltrout.com')).to eq(false)
expect(EmbeddableHost.url_allowed?('http://eviltrout.com/fp/2016/08/25/test-page')).to eq(true)
end
it "respects query parameters" do
Fabricate(:embeddable_host, path_whitelist: '^/fp$')
Fabricate(:embeddable_host, allowed_paths: '^/fp$')
expect(EmbeddableHost.url_allowed?('http://eviltrout.com/fp?test=1')).to eq(false)
expect(EmbeddableHost.url_allowed?('http://eviltrout.com/fp')).to eq(true)
end
it "allows multiple records with different paths" do
Fabricate(:embeddable_host, path_whitelist: '/rick/.*')
Fabricate(:embeddable_host, path_whitelist: '/morty/.*')
Fabricate(:embeddable_host, allowed_paths: '/rick/.*')
Fabricate(:embeddable_host, allowed_paths: '/morty/.*')
expect(EmbeddableHost.url_allowed?('http://eviltrout.com/rick/smith')).to eq(true)
expect(EmbeddableHost.url_allowed?('http://eviltrout.com/morty/sanchez')).to eq(true)
end
it "works with non-english paths" do
Fabricate(:embeddable_host, path_whitelist: '/انگلیسی/.*')
Fabricate(:embeddable_host, path_whitelist: '/definição/.*')
Fabricate(:embeddable_host, allowed_paths: '/انگلیسی/.*')
Fabricate(:embeddable_host, allowed_paths: '/definição/.*')
expect(EmbeddableHost.url_allowed?('http://eviltrout.com/انگلیسی/foo')).to eq(true)
expect(EmbeddableHost.url_allowed?('http://eviltrout.com/definição/foo')).to eq(true)
expect(EmbeddableHost.url_allowed?('http://eviltrout.com/bar/foo')).to eq(false)
end
it "works with URL encoded paths" do
Fabricate(:embeddable_host, path_whitelist: '/definição/.*')
Fabricate(:embeddable_host, path_whitelist: '/ingl%C3%A9s/.*')
Fabricate(:embeddable_host, allowed_paths: '/definição/.*')
Fabricate(:embeddable_host, allowed_paths: '/ingl%C3%A9s/.*')
expect(EmbeddableHost.url_allowed?('http://eviltrout.com/defini%C3%A7%C3%A3o/foo')).to eq(true)
expect(EmbeddableHost.url_allowed?('http://eviltrout.com/inglés/foo')).to eq(true)