kotovalexarian-likes-github
/
carrierwaveuploader--carrierwave
mirror of https://github.com/carrierwaveuploader/carrierwave.git
1
0
Fork 0
Code Releases Activity

Rename remaining whitelist/blacklist terminology to allowlist/denylist 

Refs. #2442
This commit is contained in:
M.Shibuya 2021-02-20 19:48:44 +09:00
parent 4c3cac75f3
commit dafab19c32
No known key found for this signature in database
GPG Key ID: 76087F03B4FB52E7
4 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/generators/templates/uploader.rb
View File

@ -33,9 +33,9 @@ class <%= class_name %>Uploader < CarrierWave::Uploader::Base
# process resize_to_fit: [50, 50]
# end
# Add a white list of extensions which are allowed to be uploaded.
# Add an allowlist of extensions which are allowed to be uploaded.
# For images you might use something like this:
# def extension_whitelist
# def extension_allowlist
# %w(jpg jpeg gif png)
# end

12
spec/mount_multiple_spec.rb
View File

@ -199,10 +199,10 @@ describe CarrierWave::Mount do
instance.images = [test_file_stub]
end
context "if the images fails a white list integrity check" do
context "if the images fails an allowlist integrity check" do
before do
uploader.class_eval do
def extension_whitelist
def extension_allowlist
%w(txt)
end
end
@ -218,10 +218,10 @@ describe CarrierWave::Mount do
end
end
describe "if the images fails a black list integrity check" do
describe "if the images fails a denylist integrity check" do
before do
uploader.class_eval do
def extension_blacklist
def extension_denylist
%w(jpg)
end
end
@ -715,7 +715,7 @@ describe CarrierWave::Mount do
describe "when an integrity check fails" do
before do
uploader.class_eval do
def extension_whitelist
def extension_allowlist
%w(txt)
end
end
@ -965,7 +965,7 @@ describe CarrierWave::Mount do
let(:uploader) do
Class.new(CarrierWave::Uploader::Base).tap do |u|
u.class_eval do
def extension_whitelist
def extension_allowlist
%w(txt)
end
end

12
spec/mount_single_spec.rb
View File

@ -145,9 +145,9 @@ describe CarrierWave::Mount do
@instance.image = stub_file('test.jpg')
end
it "should fail silently if the image fails a white list integrity check" do
it "should fail silently if the image fails an allowlist integrity check" do
@uploader.class_eval do
def extension_whitelist
def extension_allowlist
%w(txt)
end
end
@ -155,9 +155,9 @@ describe CarrierWave::Mount do
expect(@instance.image).to be_blank
end
it "should fail silently if the image fails a black list integrity check" do
it "should fail silently if the image fails a denylist integrity check" do
@uploader.class_eval do
def extension_blacklist
def extension_denylist
%w(jpg)
end
end
@ -462,7 +462,7 @@ describe CarrierWave::Mount do
describe "when an integrity check fails" do
before do
@uploader.class_eval do
def extension_whitelist
def extension_allowlist
%w(txt)
end
end
@ -695,7 +695,7 @@ describe CarrierWave::Mount do
@instance = @class.new
@uploader.class_eval do
def extension_whitelist
def extension_allowlist
%w(txt)
end
end

32
spec/orm/activerecord_spec.rb
View File

@ -246,10 +246,10 @@ describe CarrierWave::ActiveRecord do
end
context 'when validating white list integrity' do
context 'when validating allowlist integrity' do
before do
@uploader.class_eval do
def extension_whitelist
def extension_allowlist
%w(txt)
end
end
@ -259,10 +259,10 @@ describe CarrierWave::ActiveRecord do
# Localize the error message to Dutch
change_locale_and_store_translations(:nl, :errors => {
:messages => {
:extension_whitelist_error => "Het opladen van %{extension} bestanden is niet toe gestaan. Geaccepteerde types: %{allowed_types}"
:extension_allowlist_error => "Het opladen van %{extension} bestanden is niet toe gestaan. Geaccepteerde types: %{allowed_types}"
}
}) do
# Assigning image triggers check_whitelist! and thus should be inside change_locale_and_store_translations
# Assigning image triggers check_allowlist! and thus should be inside change_locale_and_store_translations
@event.image = stub_file('test.jpg')
expect(@event).to_not be_valid
@event.valid?
@ -271,10 +271,10 @@ describe CarrierWave::ActiveRecord do
end
end
context 'when validating black list integrity' do
context 'when validating denylist integrity' do
before do
@uploader.class_eval do
def extension_blacklist
def extension_denylist
%w(jpg)
end
end
@ -284,10 +284,10 @@ describe CarrierWave::ActiveRecord do
# Localize the error message to Dutch
change_locale_and_store_translations(:nl, :errors => {
:messages => {
:extension_blacklist_error => "You are not allowed to upload %{extension} files, prohibited types: %{prohibited_types}"
:extension_denylist_error => "You are not allowed to upload %{extension} files, prohibited types: %{prohibited_types}"
}
}) do
# Assigning image triggers check_blacklist! and thus should be inside change_locale_and_store_translations
# Assigning image triggers check_denylist! and thus should be inside change_locale_and_store_translations
@event.image = stub_file('test.jpg')
expect(@event).to_not be_valid
@event.valid?
@ -1041,10 +1041,10 @@ describe CarrierWave::ActiveRecord do
expect(@event.images).to be_empty
end
context 'when validating white list integrity' do
context 'when validating allowlist integrity' do
before do
@uploader.class_eval do
def extension_whitelist
def extension_allowlist
%w(txt)
end
end
@ -1054,10 +1054,10 @@ describe CarrierWave::ActiveRecord do
# Localize the error message to Dutch
change_locale_and_store_translations(:nl, :errors => {
:messages => {
:extension_whitelist_error => "Het opladen van %{extension} bestanden is niet toe gestaan. Geaccepteerde types: %{allowed_types}"
:extension_allowlist_error => "Het opladen van %{extension} bestanden is niet toe gestaan. Geaccepteerde types: %{allowed_types}"
}
}) do
# Assigning images triggers check_whitelist! and thus should be inside change_locale_and_store_translations
# Assigning images triggers check_allowlist! and thus should be inside change_locale_and_store_translations
@event.images = [stub_file('test.jpg')]
expect(@event).to_not be_valid
@event.valid?
@ -1066,10 +1066,10 @@ describe CarrierWave::ActiveRecord do
end
end
context 'when validating black list integrity' do
context 'when validating denylist integrity' do
before do
@uploader.class_eval do
def extension_blacklist
def extension_denylist
%w(jpg)
end
end
@ -1079,10 +1079,10 @@ describe CarrierWave::ActiveRecord do
# Localize the error message to Dutch
change_locale_and_store_translations(:nl, :errors => {
:messages => {
:extension_blacklist_error => "You are not allowed to upload %{extension} files, prohibited types: %{prohibited_types}"
:extension_denylist_error => "You are not allowed to upload %{extension} files, prohibited types: %{prohibited_types}"
}
}) do
# Assigning images triggers check_blacklist! and thus should be inside change_locale_and_store_translations
# Assigning images triggers check_denylist! and thus should be inside change_locale_and_store_translations
@event.images = [stub_file('test.jpg')]
expect(@event).to_not be_valid
@event.valid?