diff --git a/app/controllers/concerns/workhorse_authorization.rb b/app/controllers/concerns/workhorse_authorization.rb index 648e6f409e6c9c52e1af11de3fe22483ed3e8ceb..f9b859443071a45abd3b963fb668133a16b120b6 100644 --- a/app/controllers/concerns/workhorse_authorization.rb +++ b/app/controllers/concerns/workhorse_authorization.rb @@ -26,7 +26,7 @@ module WorkhorseAuthorization def file_is_valid?(file) return false unless file.is_a?(::UploadedFile) - file_extension_whitelist.include?(File.extname(file.original_filename).downcase.delete('.')) + file_extension_allowlist.include?(File.extname(file.original_filename).downcase.delete('.')) end def uploader_class @@ -37,7 +37,7 @@ module WorkhorseAuthorization raise NotImplementedError end - def file_extension_whitelist + def file_extension_allowlist ImportExportUploader::EXTENSION_ALLOWLIST end end diff --git a/ee/app/controllers/projects/requirements_management/requirements_controller.rb b/ee/app/controllers/projects/requirements_management/requirements_controller.rb index f6b6c0eb04f47040fffdbb5a052e121b31857090..4405a6bc106531734844e01795437ebdb4b94577 100644 --- a/ee/app/controllers/projects/requirements_management/requirements_controller.rb +++ b/ee/app/controllers/projects/requirements_management/requirements_controller.rb @@ -3,7 +3,7 @@ class Projects::RequirementsManagement::RequirementsController < Projects::ApplicationController include WorkhorseAuthorization - EXTENSION_WHITELIST = %w[csv].map(&:downcase).freeze + EXTENSION_ALLOWLIST = %w[csv].map(&:downcase).freeze before_action :authorize_read_requirement! before_action :authorize_import_access!, only: [:import_csv, :authorize] @@ -44,7 +44,7 @@ class Projects::RequirementsManagement::RequirementsController < Projects::Appli end def invalid_file_message - supported_file_extensions = ".#{EXTENSION_WHITELIST.join(', .')}" + supported_file_extensions = ".#{EXTENSION_ALLOWLIST.join(', .')}" _("The uploaded file was invalid. Supported file extensions are %{extensions}.") % { extensions: supported_file_extensions } end @@ -56,7 +56,7 @@ class Projects::RequirementsManagement::RequirementsController < Projects::Appli Gitlab::CurrentSettings.max_attachment_size.megabytes end - def file_extension_whitelist - EXTENSION_WHITELIST + def file_extension_allowlist + EXTENSION_ALLOWLIST end end