Add latest changes from gitlab-org/gitlab@master

1 files changed, 21 insertions, 1 deletions

diff --git a/app/models/concerns/ci/maskable.rb b/app/models/concerns/ci/maskable.rb
index 62be0150ee0..eb0852f139b 100644
--- a/app/models/concerns/ci/maskable.rb
+++ b/app/models/concerns/ci/maskable.rb
@@ -12,10 +12,30 @@ module Ci
     # * Characters must be from the Base64 alphabet (RFC4648) with the addition of '@', ':', '.', and '~'
     # * Absolutely no fun is allowed
     REGEX = %r{\A[a-zA-Z0-9_+=/@:.~-]{8,}\z}.freeze
+    # * Single line
+    # * No spaces
+    # * Minimal length of 8 characters
+    # * Some fun is allowed
+    MASK_AND_RAW_REGEX = %r{\A\S{8,}\z}.freeze
 
     included do
       validates :masked, inclusion: { in: [true, false] }
-      validates :value, format: { with: REGEX }, if: :masked?
+      validates :value, format: { with: REGEX }, if: :masked_and_expanded?
+      validates :value, format: { with: MASK_AND_RAW_REGEX }, if: :masked_and_raw?
+    end
+
+    def masked_and_raw?
+      return false unless Feature.enabled?(:ci_remove_character_limitation_raw_masked_var)
+      return false unless self.class.method_defined?(:raw)
+
+      masked? && raw?
+    end
+
+    def masked_and_expanded?
+      return true unless Feature.enabled?(:ci_remove_character_limitation_raw_masked_var)
+      return true unless self.class.method_defined?(:raw)
+
+      masked? && !raw?
     end
 
     def to_runner_variable