diff --git a/.rubocop_todo/naming/inclusive_language.yml b/.rubocop_todo/naming/inclusive_language.yml
index 9d1e98f87d3bb4d08d943f06006abebea1002be8..271286d475290565545e9ae20e016e3f474d9543 100644
--- a/.rubocop_todo/naming/inclusive_language.yml
+++ b/.rubocop_todo/naming/inclusive_language.yml
@@ -1,26 +1,19 @@
---
Naming/InclusiveLanguage:
Exclude:
- - 'app/controllers/admin/application_settings/appearances_controller.rb'
- - 'app/controllers/concerns/requires_whitelisted_monitoring_client.rb'
- - 'app/controllers/health_check_controller.rb'
- - 'app/controllers/health_controller.rb'
- - 'app/controllers/metrics_controller.rb'
+ - 'app/controllers/concerns/requires_allowlisted_monitoring_client.rb'
- 'app/helpers/application_settings_helper.rb'
- - 'app/helpers/blob_helper.rb'
- 'app/helpers/markup_helper.rb'
- 'app/models/application_setting.rb'
- 'app/models/application_setting_implementation.rb'
- 'app/models/concerns/cache_markdown_field.rb'
- 'app/services/application_settings/update_service.rb'
- - 'app/services/projects/download_service.rb'
- 'app/uploaders/avatar_uploader.rb'
- 'app/uploaders/content_type_whitelist.rb'
- 'app/uploaders/design_management/design_v432x230_uploader.rb'
- 'app/uploaders/favicon_uploader.rb'
- 'app/uploaders/gitlab_uploader.rb'
- 'app/uploaders/import_export_uploader.rb'
- - 'app/validators/cron_validator.rb'
- 'app/validators/qualified_domain_array_validator.rb'
- 'config/initializers/1_settings.rb'
- 'config/initializers/doorkeeper.rb'
@@ -28,14 +21,12 @@ Naming/InclusiveLanguage:
- 'ee/app/controllers/projects/push_rules_controller.rb'
- 'ee/lib/arkose/verify_response.rb'
- 'ee/lib/system_check/geo/http_connection_check.rb'
- - 'ee/spec/models/dora/lead_time_for_changes_metric_spec.rb'
- 'lib/api/entities/application_setting.rb'
- 'lib/api/settings.rb'
- 'lib/banzai/filter/asset_proxy_filter.rb'
- 'lib/gitlab/asset_proxy.rb'
- 'lib/gitlab/auth/ip_rate_limiter.rb'
- 'lib/gitlab/ci/config/external/file/base.rb'
- - 'lib/gitlab/git/hook_env.rb'
- 'lib/gitlab/github_import/markdown/attachment.rb'
- 'lib/gitlab/markdown_cache/active_record/extension.rb'
- 'lib/gitlab/markdown_cache/field_data.rb'
@@ -44,9 +35,6 @@ Naming/InclusiveLanguage:
- 'lib/gitlab/sanitizers/svg.rb'
- 'lib/gitlab/sanitizers/svg/whitelist.rb'
- 'lib/system_check/app/git_user_default_ssh_config_check.rb'
- - 'rubocop/cop/avoid_return_from_blocks.rb'
- - 'rubocop/cop/graphql/id_type.rb'
- - 'spec/controllers/concerns/issuable_collections_spec.rb'
- 'spec/controllers/health_check_controller_spec.rb'
- 'spec/controllers/metrics_controller_spec.rb'
- 'spec/helpers/markup_helper_spec.rb'
@@ -61,17 +49,7 @@ Naming/InclusiveLanguage:
- 'spec/models/application_setting_spec.rb'
- 'spec/requests/api/settings_spec.rb'
- 'spec/requests/health_controller_spec.rb'
- - 'spec/rubocop/cop/avoid_return_from_blocks_spec.rb'
- - 'spec/rubocop/cop/graphql/id_type_spec.rb'
- 'spec/services/application_settings/update_service_spec.rb'
- - 'spec/services/design_management/generate_image_versions_service_spec.rb'
- - 'spec/services/projects/download_service_spec.rb'
- - 'spec/support/import_export/export_file_helper.rb'
- 'spec/support/shared_contexts/upload_type_check_shared_context.rb'
- - 'spec/support/shared_examples/lib/banzai/filters/sanitization_filter_shared_examples.rb'
- 'spec/support/shared_examples/models/application_setting_shared_examples.rb'
- - 'spec/uploaders/avatar_uploader_spec.rb'
- 'spec/uploaders/content_type_whitelist_spec.rb'
- - 'spec/uploaders/design_management/design_v432x230_uploader_spec.rb'
- - 'spec/uploaders/favicon_uploader_spec.rb'
- - 'spec/validators/cron_validator_spec.rb'
diff --git a/app/controllers/admin/application_settings/appearances_controller.rb b/app/controllers/admin/application_settings/appearances_controller.rb
index 719e8e4a913275fc2f5f112d8c2bbd15896a1b57..1a1e85d48da113ddf574b586aeedd41e9c61cb3b 100644
--- a/app/controllers/admin/application_settings/appearances_controller.rb
+++ b/app/controllers/admin/application_settings/appearances_controller.rb
@@ -69,7 +69,7 @@ def set_appearance
@appearance = Appearance.current || Appearance.new
end
- # Only allow a trusted parameter "white list" through.
+ # Only allow a trusted parameter "allow list" through.
def appearance_params
params.require(:appearance).permit(allowed_appearance_params)
end
diff --git a/app/controllers/concerns/requires_whitelisted_monitoring_client.rb b/app/controllers/concerns/requires_allowlisted_monitoring_client.rb
similarity index 63%
rename from app/controllers/concerns/requires_whitelisted_monitoring_client.rb
rename to app/controllers/concerns/requires_allowlisted_monitoring_client.rb
index ef3d281589aa6354e2433940cc7c0440fc695641..ad6d4dc548cbb86f3682aef5df802d76cd19ab3a 100644
--- a/app/controllers/concerns/requires_whitelisted_monitoring_client.rb
+++ b/app/controllers/concerns/requires_allowlisted_monitoring_client.rb
@@ -1,28 +1,28 @@
# frozen_string_literal: true
-module RequiresWhitelistedMonitoringClient
+module RequiresAllowlistedMonitoringClient
extend ActiveSupport::Concern
included do
- before_action :validate_ip_whitelisted_or_valid_token!
+ before_action :validate_ip_allowlisted_or_valid_token!
end
private
- def validate_ip_whitelisted_or_valid_token!
- render_404 unless client_ip_whitelisted? || valid_token?
+ def validate_ip_allowlisted_or_valid_token!
+ render_404 unless client_ip_allowlisted? || valid_token?
end
- def client_ip_whitelisted?
+ def client_ip_allowlisted?
# Always allow developers to access http://localhost:3000/-/metrics for
# debugging purposes
return true if Rails.env.development? && request.local?
- ip_whitelist.any? { |e| e.include?(Gitlab::RequestContext.instance.client_ip) }
+ ip_allowlist.any? { |e| e.include?(Gitlab::RequestContext.instance.client_ip) }
end
- def ip_whitelist
- @ip_whitelist ||= Settings.monitoring.ip_whitelist.map { |ip| IPAddr.new(ip) }
+ def ip_allowlist
+ @ip_allowlist ||= Settings.monitoring.ip_whitelist.map { |ip| IPAddr.new(ip) }
end
def valid_token?
diff --git a/app/controllers/health_check_controller.rb b/app/controllers/health_check_controller.rb
index a2abed7ba4e1e27e57418f582ba843293291451e..a85629985ba7d8482c33e695a3d96c72a31c698c 100644
--- a/app/controllers/health_check_controller.rb
+++ b/app/controllers/health_check_controller.rb
@@ -1,5 +1,5 @@
# frozen_string_literal: true
class HealthCheckController < HealthCheck::HealthCheckController
- include RequiresWhitelistedMonitoringClient
+ include RequiresAllowlistedMonitoringClient
end
diff --git a/app/controllers/health_controller.rb b/app/controllers/health_controller.rb
index 5fac7c0d66312dcabc4f19fbcd27c092998bedf1..1381999ab4c8836e1f79593be17b4411eb351aa3 100644
--- a/app/controllers/health_controller.rb
+++ b/app/controllers/health_controller.rb
@@ -3,7 +3,7 @@
# rubocop:disable Rails/ApplicationController
class HealthController < ActionController::Base
protect_from_forgery with: :exception, prepend: true
- include RequiresWhitelistedMonitoringClient
+ include RequiresAllowlistedMonitoringClient
CHECKS = [
Gitlab::HealthChecks::MasterCheck
diff --git a/app/controllers/metrics_controller.rb b/app/controllers/metrics_controller.rb
index 3dfa8d7b11e9bf9c2b32431f6d36d26b8cd3f882..9f41c092fa0a107cbec291b33721f03ee154f564 100644
--- a/app/controllers/metrics_controller.rb
+++ b/app/controllers/metrics_controller.rb
@@ -2,7 +2,7 @@
# rubocop:disable Rails/ApplicationController
class MetricsController < ActionController::Base
- include RequiresWhitelistedMonitoringClient
+ include RequiresAllowlistedMonitoringClient
protect_from_forgery with: :exception, prepend: true
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb
index be9306ce80bc7c5289b55f54a476da3e4265ff10..6746e6549ecd3762fc574ca54d06fd7213b16b4b 100644
--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -118,8 +118,8 @@ def parent_dir_raw_path
"#{blob_raw_path.rpartition('/').first}/"
end
- # SVGs can contain malicious JavaScript; only include whitelisted
- # elements and attributes. Note that this whitelist is by no means complete
+ # SVGs can contain malicious JavaScript; only include allowlisted
+ # elements and attributes. Note that this allowlist is by no means complete
# and may omit some elements.
def sanitize_svg_data(data)
Gitlab::Sanitizers::SVG.clean(data)
diff --git a/app/services/projects/download_service.rb b/app/services/projects/download_service.rb
index 72cb399704557307c4b4746d8994948e4cf6d763..221044091998b38ecdec753e7f8185f99ba171e7 100644
--- a/app/services/projects/download_service.rb
+++ b/app/services/projects/download_service.rb
@@ -2,7 +2,7 @@
module Projects
class DownloadService < BaseService
- WHITELIST = [
+ ALLOWLIST = [
/^[^.]+\.fogbugz.com$/
].freeze
@@ -33,7 +33,7 @@ def http?(url)
def valid_domain?(url)
host = URI.parse(url).host
- WHITELIST.any? { |entry| entry === host }
+ ALLOWLIST.any? { |entry| entry === host }
end
end
end
diff --git a/app/validators/cron_validator.rb b/app/validators/cron_validator.rb
index 91b9cfcccc494af7c4a0e441d4f0fde63319921a..c12b29410d4ff32fb80dc85a3ede995bf87297e0 100644
--- a/app/validators/cron_validator.rb
+++ b/app/validators/cron_validator.rb
@@ -1,16 +1,16 @@
# frozen_string_literal: true
class CronValidator < ActiveModel::EachValidator
- ATTRIBUTE_WHITELIST = %i[cron freeze_start freeze_end].freeze
+ ATTRIBUTE_ALLOWLIST = %i[cron freeze_start freeze_end].freeze
- NonWhitelistedAttributeError = Class.new(StandardError)
+ NonAllowlistedAttributeError = Class.new(StandardError)
def validate_each(record, attribute, value)
- if ATTRIBUTE_WHITELIST.include?(attribute)
+ if ATTRIBUTE_ALLOWLIST.include?(attribute)
cron_parser = Gitlab::Ci::CronParser.new(record.public_send(attribute), record.cron_timezone) # rubocop:disable GitlabSecurity/PublicSend
record.errors.add(attribute, " is invalid syntax") unless cron_parser.cron_valid?
else
- raise NonWhitelistedAttributeError, "Non-whitelisted attribute"
+ raise NonAllowlistedAttributeError, "Non-allowlisted attribute"
end
end
end
diff --git a/ee/spec/models/dora/lead_time_for_changes_metric_spec.rb b/ee/spec/models/dora/lead_time_for_changes_metric_spec.rb
index 8abaa7f683994c5dfb626f4eff0ccaad236d6661..0162fb334c8e0886771e895fad79971c915dfeb1 100644
--- a/ee/spec/models/dora/lead_time_for_changes_metric_spec.rb
+++ b/ee/spec/models/dora/lead_time_for_changes_metric_spec.rb
@@ -61,7 +61,7 @@
create :dora_configuration, project: project, branches_for_lead_time_for_changes: %w[main staging]
end
- it 'returns median of time between merge and deployment for MRs with target branch from configuration whitelist' do
+ it 'returns median of time between merge and deployment for MRs with target branch from configuration allowlist' do
expect(query_result).to eql 3.days.to_f
end
end
diff --git a/lib/gitlab/git/hook_env.rb b/lib/gitlab/git/hook_env.rb
index f93ab19fc6524c65be481ab165ba24f428d21d9b..2524d4c4cfb0e6f210e8771a724b97c79d4b0119 100644
--- a/lib/gitlab/git/hook_env.rb
+++ b/lib/gitlab/git/hook_env.rb
@@ -14,7 +14,7 @@ module Git
#
# This class is thread-safe via RequestStore.
class HookEnv
- WHITELISTED_VARIABLES = %w[
+ ALLOWLISTED_VARIABLES = %w[
GIT_OBJECT_DIRECTORY_RELATIVE
GIT_ALTERNATE_OBJECT_DIRECTORIES_RELATIVE
].freeze
@@ -25,7 +25,7 @@ def self.set(gl_repository, env)
raise "missing gl_repository" if gl_repository.blank?
Gitlab::SafeRequestStore[:gitlab_git_env] ||= {}
- Gitlab::SafeRequestStore[:gitlab_git_env][gl_repository] = whitelist_git_env(env)
+ Gitlab::SafeRequestStore[:gitlab_git_env][gl_repository] = allowlist_git_env(env)
end
def self.all(gl_repository)
@@ -46,8 +46,8 @@ def self.to_env_hash(gl_repository)
env
end
- def self.whitelist_git_env(env)
- env.select { |key, _| WHITELISTED_VARIABLES.include?(key.to_s) }.with_indifferent_access
+ def self.allowlist_git_env(env)
+ env.select { |key, _| ALLOWLISTED_VARIABLES.include?(key.to_s) }.with_indifferent_access
end
end
end
diff --git a/rubocop/cop/avoid_return_from_blocks.rb b/rubocop/cop/avoid_return_from_blocks.rb
index c6a7a87c548ba0db019187dc84fed93e85301c3e..bc10410af1de0eda10be2d121fb372ae24ec89e1 100644
--- a/rubocop/cop/avoid_return_from_blocks.rb
+++ b/rubocop/cop/avoid_return_from_blocks.rb
@@ -23,7 +23,7 @@ module Cop
class AvoidReturnFromBlocks < RuboCop::Cop::Base
MSG = 'Do not return from a block, use next or break instead.'
DEF_METHODS = %i[define_method lambda].freeze
- WHITELISTED_METHODS = %i[each each_filename times loop].freeze
+ ALLOWLISTED_METHODS = %i[each each_filename times loop].freeze
def on_block(node)
block_body = node.body
@@ -32,7 +32,7 @@ def on_block(node)
return unless top_block?(node)
block_body.each_node(:return) do |return_node|
- next if parent_blocks(node, return_node).all? { |block_node| whitelisted?(block_node) }
+ next if parent_blocks(node, return_node).all? { |block_node| allowlisted?(block_node) }
add_offense(return_node)
end
@@ -69,8 +69,8 @@ def def?(node)
(node.type == :block && DEF_METHODS.include?(node.method_name))
end
- def whitelisted?(block_node)
- WHITELISTED_METHODS.include?(block_node.method_name)
+ def allowlisted?(block_node)
+ ALLOWLISTED_METHODS.include?(block_node.method_name)
end
end
end
diff --git a/rubocop/cop/graphql/id_type.rb b/rubocop/cop/graphql/id_type.rb
index c9d9b4ea6ebbda417e3299839e53d7a25fb937c3..53d79751fa8e6cc50a5dff5532d663be720cc298 100644
--- a/rubocop/cop/graphql/id_type.rb
+++ b/rubocop/cop/graphql/id_type.rb
@@ -6,7 +6,7 @@ module Graphql
class IDType < RuboCop::Cop::Base
MSG = 'Do not use GraphQL::Types::ID, use a specific GlobalIDType instead'
- WHITELISTED_ARGUMENTS = %i[iid full_path project_path group_path target_project_path namespace_path].freeze
+ ALLOWLISTED_ARGUMENTS = %i[iid full_path project_path group_path target_project_path namespace_path].freeze
def_node_search :graphql_id_type?, <<~PATTERN
(send nil? :argument (_ #does_not_match?) (const (const (const nil? :GraphQL) :Types) :ID) ...)
@@ -21,7 +21,7 @@ def on_send(node)
private
def does_not_match?(arg)
- !WHITELISTED_ARGUMENTS.include?(arg) # rubocop:disable Rails/NegateInclude
+ !ALLOWLISTED_ARGUMENTS.include?(arg) # rubocop:disable Rails/NegateInclude
end
end
end
diff --git a/spec/controllers/concerns/issuable_collections_spec.rb b/spec/controllers/concerns/issuable_collections_spec.rb
index 6fa273bf3d76ab0f3d6cc501ffe64e45b6c8f9de..9eb0f36cb37e928c14f54c86741958863d39a835 100644
--- a/spec/controllers/concerns/issuable_collections_spec.rb
+++ b/spec/controllers/concerns/issuable_collections_spec.rb
@@ -92,7 +92,7 @@ def finder_type
}
end
- it 'only allows whitelisted params' do
+ it 'only allows allowlisted params' do
is_expected.to include({
'assignee_id' => '1',
'assignee_username' => 'user1',
@@ -123,7 +123,7 @@ def finder_type
}
end
- it 'only allows whitelisted params' do
+ it 'only allows allowlisted params' do
is_expected.to include({
'label_name' => %w[label1 label2],
'assignee_username' => %w[user1 user2]
diff --git a/spec/rubocop/cop/avoid_return_from_blocks_spec.rb b/spec/rubocop/cop/avoid_return_from_blocks_spec.rb
index e35705ae791fe586cd893f6bbd6cbf9ce0e2b793..1b41e1404543774a666f48e9272a23ae794718b9 100644
--- a/spec/rubocop/cop/avoid_return_from_blocks_spec.rb
+++ b/spec/rubocop/cop/avoid_return_from_blocks_spec.rb
@@ -41,10 +41,10 @@ def a_method
RUBY
end
- shared_examples 'examples with whitelisted method' do |whitelisted_method|
- it "doesn't flag violation for return inside #{whitelisted_method}" do
+ shared_examples 'examples with allowlisted method' do |allowlisted_method|
+ it "doesn't flag violation for return inside #{allowlisted_method}" do
expect_no_offenses(<<~RUBY)
- items.#{whitelisted_method} do |item|
+ items.#{allowlisted_method} do |item|
do_something
return if something_else
end
@@ -52,8 +52,8 @@ def a_method
end
end
- %i[each each_filename times loop].each do |whitelisted_method|
- it_behaves_like 'examples with whitelisted method', whitelisted_method
+ %i[each each_filename times loop].each do |allowlisted_method|
+ it_behaves_like 'examples with allowlisted method', allowlisted_method
end
shared_examples 'examples with def methods' do |def_method|
diff --git a/spec/rubocop/cop/graphql/id_type_spec.rb b/spec/rubocop/cop/graphql/id_type_spec.rb
index 3a56753d39e58c21eb09e621fb8dfe188547dd65..6eb4890c06447bf75271028eb919429b5c0149f1 100644
--- a/spec/rubocop/cop/graphql/id_type_spec.rb
+++ b/spec/rubocop/cop/graphql/id_type_spec.rb
@@ -12,8 +12,8 @@
TYPE
end
- context 'whitelisted arguments' do
- RuboCop::Cop::Graphql::IDType::WHITELISTED_ARGUMENTS.each do |arg|
+ context 'allowlisted arguments' do
+ RuboCop::Cop::Graphql::IDType::ALLOWLISTED_ARGUMENTS.each do |arg|
it "does not add an offense for calls to #argument with #{arg} as argument name" do
expect_no_offenses(<<~TYPE.strip)
argument #{arg}, GraphQL::Types::ID, some: other, params: do_not_matter
diff --git a/spec/services/design_management/generate_image_versions_service_spec.rb b/spec/services/design_management/generate_image_versions_service_spec.rb
index 08442f221fa0ae311dda17f1c86825bfa804d050..d02d472f8976dec3dbb5c1b895106ff014db6606 100644
--- a/spec/services/design_management/generate_image_versions_service_spec.rb
+++ b/spec/services/design_management/generate_image_versions_service_spec.rb
@@ -15,7 +15,7 @@
.from(nil).to(CarrierWave::SanitizedFile)
end
- it 'skips generating image versions if the mime type is not whitelisted' do
+ it 'skips generating image versions if the mime type is not allowlisted' do
stub_const('DesignManagement::DesignV432x230Uploader::MIME_TYPE_ALLOWLIST', [])
described_class.new(version).execute
diff --git a/spec/services/projects/download_service_spec.rb b/spec/services/projects/download_service_spec.rb
index e062ee04bf458ae771f74e99af1eb8aa086ad216..a0b14a3610612eb979fa2a26e4fabc32ec3193be 100644
--- a/spec/services/projects/download_service_spec.rb
+++ b/spec/services/projects/download_service_spec.rb
@@ -9,7 +9,7 @@
@project = create(:project, creator_id: @user.id, namespace: @user.namespace)
end
- context 'for a URL that is not on whitelist' do
+ context 'for a URL that is not on allowlist' do
before do
url = 'https://code.jquery.com/jquery-2.1.4.min.js'
@link_to_file = download_file(@project, url)
@@ -18,7 +18,7 @@
it { expect(@link_to_file).to eq(nil) }
end
- context 'for URLs that are on the whitelist' do
+ context 'for URLs that are on the allowlist' do
before do
# `ssrf_filter` resolves the hostname. See https://github.com/carrierwaveuploader/carrierwave/commit/91714adda998bc9e8decf5b1f5d260d808761304
stub_request(:get, %r{http://[\d.]+/rails_sample.jpg}).to_return(body: File.read(Rails.root + 'spec/fixtures/rails_sample.jpg'))
diff --git a/spec/support/import_export/export_file_helper.rb b/spec/support/import_export/export_file_helper.rb
index ee1b4a3c33a3c09106b8d8897a1c64692dd9c4b6..3be2d39906d6b81eaa8c9e85be5f61153ae9a2a6 100644
--- a/spec/support/import_export/export_file_helper.rb
+++ b/spec/support/import_export/export_file_helper.rb
@@ -92,7 +92,7 @@ def object_contains_key?(object, sensitive_key_word)
end
# Returns the offended ObjectWithParent object if a sensitive word is found inside a hash,
- # excluding the whitelisted safe hashes.
+ # excluding the allowlisted safe hashes.
def find_sensitive_attributes(sensitive_word, project_hash)
loop do
object_with_parent = deep_find_with_parent(sensitive_word, project_hash)
diff --git a/spec/support/shared_examples/lib/banzai/filters/sanitization_filter_shared_examples.rb b/spec/support/shared_examples/lib/banzai/filters/sanitization_filter_shared_examples.rb
index 99d0bc287a3b89c18ad00df41bbbbff5b8e47d7b..e6433f963f489c335d529880f6a84d5a81529d19 100644
--- a/spec/support/shared_examples/lib/banzai/filters/sanitization_filter_shared_examples.rb
+++ b/spec/support/shared_examples/lib/banzai/filters/sanitization_filter_shared_examples.rb
@@ -25,7 +25,7 @@
expect(filter(act).to_html).to eq exp
end
- it 'allows whitelisted HTML tags from the user' do
+ it 'allows allowlisted HTML tags from the user' do
exp = act = "<dl>\n<dt>Term</dt>\n<dd>Definition</dd>\n</dl>"
expect(filter(act).to_html).to eq exp
end
diff --git a/spec/uploaders/avatar_uploader_spec.rb b/spec/uploaders/avatar_uploader_spec.rb
index e472ac46e660fa16fbc2d62c57b9fb116d636d67..bba7eb78f9992db695b426c12a5e77f2a2c417ab 100644
--- a/spec/uploaders/avatar_uploader_spec.rb
+++ b/spec/uploaders/avatar_uploader_spec.rb
@@ -47,7 +47,7 @@
end
end
- context 'accept whitelist file content type' do
+ context 'accept allowlist file content type' do
# We need to feed through a valid path, but we force the parsed mime type
# in a stub below so we can set any path.
let_it_be(:path) { File.join('spec', 'fixtures', 'video_sample.mp4') }
@@ -61,13 +61,13 @@
end
end
- context 'upload non-whitelisted file content type' do
+ context 'upload denylisted file content type' do
let_it_be(:path) { File.join('spec', 'fixtures', 'sanitized.svg') }
it_behaves_like 'denied carrierwave upload'
end
- context 'upload misnamed non-whitelisted file content type' do
+ context 'upload misnamed denylisted file content type' do
let_it_be(:path) { File.join('spec', 'fixtures', 'not_a_png.png') }
it_behaves_like 'denied carrierwave upload'
diff --git a/spec/uploaders/design_management/design_v432x230_uploader_spec.rb b/spec/uploaders/design_management/design_v432x230_uploader_spec.rb
index f3dd77d67a0746b8556645f0239ba32db7649896..3991058b32d54926498e3076fdee361da18f7c62 100644
--- a/spec/uploaders/design_management/design_v432x230_uploader_spec.rb
+++ b/spec/uploaders/design_management/design_v432x230_uploader_spec.rb
@@ -58,7 +58,7 @@
)
end
- context 'accept whitelist file content type' do
+ context 'accept allowlisted file content type' do
# We need to feed through a valid path, but we force the parsed mime type
# in a stub below so we can set any path.
let_it_be(:path) { File.join('spec', 'fixtures', 'dk.png') }
@@ -72,13 +72,13 @@
end
end
- context 'upload non-whitelisted file content type' do
+ context 'upload denylisted file content type' do
let_it_be(:path) { File.join('spec', 'fixtures', 'logo_sample.svg') }
it_behaves_like 'denied carrierwave upload'
end
- context 'upload misnamed non-whitelisted file content type' do
+ context 'upload misnamed denylisted file content type' do
let_it_be(:path) { File.join('spec', 'fixtures', 'not_a_png.png') }
it_behaves_like 'denied carrierwave upload'
diff --git a/spec/uploaders/favicon_uploader_spec.rb b/spec/uploaders/favicon_uploader_spec.rb
index 7f45207529377d7f74216b89363fc755bd70502a..ab14397c27d2e282b96f2822dc2cd39dbf04d246 100644
--- a/spec/uploaders/favicon_uploader_spec.rb
+++ b/spec/uploaders/favicon_uploader_spec.rb
@@ -6,7 +6,7 @@
let_it_be(:model) { build_stubbed(:user) }
let_it_be(:uploader) { described_class.new(model, :favicon) }
- context 'accept whitelist file content type' do
+ context 'accept allowlist file content type' do
include_context 'ignore extension allowlist check'
# We need to feed through a valid path, but we force the parsed mime type
@@ -22,7 +22,7 @@
end
end
- context 'upload non-whitelisted file content type' do
+ context 'upload denylisted file content type' do
include_context 'ignore extension allowlist check'
let_it_be(:path) { File.join('spec', 'fixtures', 'sanitized.svg') }
@@ -30,7 +30,7 @@
it_behaves_like 'denied carrierwave upload'
end
- context 'upload misnamed non-whitelisted file content type' do
+ context 'upload misnamed denylisted file content type' do
include_context 'ignore extension allowlist check'
let_it_be(:path) { File.join('spec', 'fixtures', 'not_a_png.png') }
diff --git a/spec/validators/cron_validator_spec.rb b/spec/validators/cron_validator_spec.rb
index bd7fe2429571d0ecab159542fcc206c77c0190a7..52a57f6e16051c7e1603522d907692f3928bfdb8 100644
--- a/spec/validators/cron_validator_spec.rb
+++ b/spec/validators/cron_validator_spec.rb
@@ -29,7 +29,7 @@ def cron_timezone
expect(subject.valid?).to be_falsy
end
- context 'cron field is not whitelisted' do
+ context 'cron field is not allowlisted' do
subject do
Class.new do
include ActiveModel::Model
@@ -43,7 +43,7 @@ def cron_timezone
it 'raises an error' do
subject.cron_partytime = '0 23 * * 5'
- expect { subject.valid? }.to raise_error(StandardError, "Non-whitelisted attribute")
+ expect { subject.valid? }.to raise_error(StandardError, "Non-allowlisted attribute")
end
end
end