diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-14 15:53:59 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-14 15:53:59 +0000 |
commit | 5d1088c2a899f709cc9bdf30af0bdbfea81be09e (patch) | |
tree | 34b03a54d96f8e0aeb7a5b4b06e3412d17661209 /lib | |
parent | 1d2a8cb75643160a0b565e41c80dd9b3b08a592d (diff) | |
parent | ba78465a264c64a742f83d797d63c38ef9ed083d (diff) | |
download | gitlab-ce-5d1088c2a899f709cc9bdf30af0bdbfea81be09e.tar.gz |
Merge branch '39885-ensure-users-cannot-create-environments-with-leading-slashes' into 'master'
Resolve "Environment with starting slash in name causes error"
Closes #39885
See merge request gitlab-org/gitlab-ce!17071
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/regex.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/gitlab/regex.rb b/lib/gitlab/regex.rb index 7ab85e1c35c..ac3de2a8f71 100644 --- a/lib/gitlab/regex.rb +++ b/lib/gitlab/regex.rb @@ -40,12 +40,16 @@ module Gitlab 'a-zA-Z0-9_/\\$\\{\\}\\. \\-' end + def environment_name_regex_chars_without_slash + 'a-zA-Z0-9_\\$\\{\\}\\. -' + end + def environment_name_regex - @environment_name_regex ||= /\A[#{environment_name_regex_chars}]+\z/.freeze + @environment_name_regex ||= /\A[#{environment_name_regex_chars_without_slash}]([#{environment_name_regex_chars}]*[#{environment_name_regex_chars_without_slash}])?\z/.freeze end def environment_name_regex_message - "can contain only letters, digits, '-', '_', '/', '$', '{', '}', '.', and spaces" + "can contain only letters, digits, '-', '_', '/', '$', '{', '}', '.', and spaces, but it cannot start or end with '/'" end def kubernetes_namespace_regex |