diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2019-07-23 19:28:17 +0200 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2019-07-23 21:22:26 +0200 |
| commit | 136865713bbaeee03e45e9e7154dd99338d565d6 (patch) | |
| tree | e4f71df7787d6bbedba1f647b8ad95711b5173c7 | |
| parent | b49115487a676497e9ee2a942a685bff073aea3b (diff) | |
| download | gitlab-ce-mc/feature/add-at-colon-variable-masking.tar.gz | |
Document new masking requirementsmc/feature/add-at-colon-variable-masking
| -rw-r--r-- | app/models/concerns/maskable.rb | 3 | ||||
| -rw-r--r-- | doc/ci/variables/README.md | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/models/concerns/maskable.rb b/app/models/concerns/maskable.rb index 65679ac0e55..d70e47bc4ff 100644 --- a/app/models/concerns/maskable.rb +++ b/app/models/concerns/maskable.rb @@ -7,7 +7,8 @@ module Maskable # * No escape characters # * No variables # * No spaces - # * Minimal length of 8 characters from the Base64 alphabets (RFC4648) + # * Minimal length of 8 characters + # * Characters must be from the Base64 alphabet (RFC4648) with the addition of @ and : # * Absolutely no fun is allowed REGEX = /\A[a-zA-Z0-9_+=\/@:-]{8,}\z/.freeze diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md index 4d6ca8cff6d..14bc2e1cb47 100644 --- a/doc/ci/variables/README.md +++ b/doc/ci/variables/README.md @@ -94,7 +94,7 @@ This means that the value of the variable will be hidden in job logs, though it must match certain requirements to do so: - The value must be in a single line. -- The value must only consist of characters from the Base64 alphabet, defined in [RFC4648](https://tools.ietf.org/html/rfc4648). +- The value must only consist of characters from the Base64 alphabet ([RFC4648](https://tools.ietf.org/html/rfc4648)) with the addition of `@` and `:`. - The value must be at least 8 characters long. - The value must not use variables. |