github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-26 04:11:26 +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

22
spec/components/auth/github_authenticator_spec.rb
View File

@ -178,38 +178,38 @@ describe Auth::GithubAuthenticator do
expect(result.email_valid).to eq(hash[:info][:email].present?)
end
it 'will skip blacklisted domains for non existing users' do
it 'will skip blocklisted domains for non existing users' do
hash = {
extra: {
all_emails: [{
email: "not_allowed@blacklist.com",
email: "not_allowed@blocklist.com",
primary: true,
verified: true,
}, {
email: "allowed@whitelist.com",
email: "allowed@allowlist.com",
primary: false,
verified: true,
}]
},
info: {
email: "not_allowed@blacklist.com",
email: "not_allowed@blocklist.com",
nickname: "person",
name: "Person Lastname",
},
uid: "100"
}
SiteSetting.email_domains_blacklist = "blacklist.com"
SiteSetting.blocked_email_domains = "blocklist.com"
result = authenticator.after_authenticate(hash)
expect(result.user).to eq(nil)
expect(result.username).to eq(hash[:info][:nickname])
expect(result.name).to eq(hash[:info][:name])
expect(result.email).to eq("allowed@whitelist.com")
expect(result.email).to eq("allowed@allowlist.com")
expect(result.email_valid).to eq(true)
end
it 'will find whitelisted domains for non existing users' do
it 'will find allowlisted domains for non existing users' do
hash = {
extra: {
all_emails: [{
@ -217,11 +217,11 @@ describe Auth::GithubAuthenticator do
primary: true,
verified: true,
}, {
email: "not_allowed@blacklist.com",
email: "not_allowed@blocklist.com",
primary: false,
verified: true,
}, {
email: "allowed@whitelist.com",
email: "allowed@allowlist.com",
primary: false,
verified: true,
}]
@ -234,13 +234,13 @@ describe Auth::GithubAuthenticator do
uid: "100"
}
SiteSetting.email_domains_whitelist = "whitelist.com"
SiteSetting.allowed_email_domains = "allowlist.com"
result = authenticator.after_authenticate(hash)
expect(result.user).to eq(nil)
expect(result.username).to eq(hash[:info][:nickname])
expect(result.name).to eq(hash[:info][:name])
expect(result.email).to eq("allowed@whitelist.com")
expect(result.email).to eq("allowed@allowlist.com")
expect(result.email_valid).to eq(true)
end