diff options
Diffstat (limited to 'lib/api/validations')
| -rw-r--r-- | lib/api/validations/validators/bulk_imports.rb | 26 | ||||
| -rw-r--r-- | lib/api/validations/validators/git_ref.rb | 2 |
2 files changed, 8 insertions, 20 deletions
diff --git a/lib/api/validations/validators/bulk_imports.rb b/lib/api/validations/validators/bulk_imports.rb index 77d76c98e00..b09df7b7133 100644 --- a/lib/api/validations/validators/bulk_imports.rb +++ b/lib/api/validations/validators/bulk_imports.rb @@ -6,26 +6,14 @@ module API module BulkImports class DestinationSlugPath < Grape::Validations::Validators::Base def validate_param!(attr_name, params) - if Feature.disabled?(:restrict_special_characters_in_namespace_path) - return if params[attr_name] =~ Gitlab::Regex.group_path_regex + return if params[attr_name] =~ Gitlab::Regex.oci_repository_path_regex - raise Grape::Exceptions::Validation.new( - params: [@scope.full_name(attr_name)], - message: "#{Gitlab::Regex.group_path_regex_message} " \ - "It can only contain alphanumeric characters, periods, underscores, and dashes. " \ - "For example, 'destination_namespace' not 'destination/namespace'" - ) - else - return if params[attr_name] =~ Gitlab::Regex.oci_repository_path_regex - - raise Grape::Exceptions::Validation.new( - params: [@scope.full_name(attr_name)], - message: "#{Gitlab::Regex.oci_repository_path_regex_message} " \ - "It can only contain alphanumeric characters, periods, underscores, and dashes. " \ - "For example, 'destination_namespace' not 'destination/namespace'" - ) - - end + raise Grape::Exceptions::Validation.new( + params: [@scope.full_name(attr_name)], + message: "#{Gitlab::Regex.oci_repository_path_regex_message} " \ + "It can only contain alphanumeric characters, periods, underscores, and dashes. " \ + "For example, 'destination_namespace' not 'destination/namespace'" + ) end end diff --git a/lib/api/validations/validators/git_ref.rb b/lib/api/validations/validators/git_ref.rb index 711c272ab4e..4e113a4ef67 100644 --- a/lib/api/validations/validators/git_ref.rb +++ b/lib/api/validations/validators/git_ref.rb @@ -10,7 +10,7 @@ module API # We have skipped some checks that are optional and can be skipped for exception. # We also check for control characters, More info on ctrl chars - https://ruby-doc.org/core-2.7.0/Regexp.html#class-Regexp-label-Character+Classes INVALID_CHARS = Regexp.union('..', '\\', '@', '@{', ' ', '~', '^', ':', '*', '?', '[', /[[:cntrl:]]/).freeze - GIT_REF_LENGTH = (1..1024).freeze + GIT_REF_LENGTH = (1..1024) def validate_param!(attr_name, params) revision = params[attr_name] |