Validate environment name with regex

2 files changed, 14 insertions, 2 deletions

diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index 66f1bcea4ff..b19ce4aaff9 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -214,8 +214,8 @@ module Ci
         raise ValidationError, "#{name} job: when parameter should be on_success, on_failure or always"
       end
 
-      if job[:environment] && !validate_string(job[:environment])
-        raise ValidationError, "#{name} job: environment should be a string"
+      if job[:environment] && !validate_environment(job[:environment])
+        raise ValidationError, "#{name} job: environment parameter #{Gitlab::Regex.environment_name_regex_message}"
       end
     end
 
@@ -322,6 +322,10 @@ module Ci
       value.in?([true, false])
     end
 
+    def validate_environment(value)
+      value.is_a?(String) && value =~ Gitlab::Regex.environment_name_regex
+    end
+
     def process?(only_params, except_params, ref, tag, trigger_request)
       if only_params.present?
         return false unless matching?(only_params, ref, tag, trigger_request)
diff --git a/lib/gitlab/regex.rb b/lib/gitlab/regex.rb
index 1cbd6d945a0..c84c68f96f6 100644
--- a/lib/gitlab/regex.rb
+++ b/lib/gitlab/regex.rb
@@ -100,5 +100,13 @@ module Gitlab
     def container_registry_reference_regex
       git_reference_regex
     end
+
+    def environment_name_regex
+      @environment_name_regex ||= /\A[a-zA-Z0-9_-]+\z/.freeze
+    end
+
+    def environment_name_regex_message
+      "can contain only letters, digits, '-' and '_'."
+    end
   end
 end