diff options
| author | Thomas Nilsson <thomas.nilsson@irfu.se> | 2019-05-20 15:49:23 +0300 |
|---|---|---|
| committer | mfluharty <mfluharty@gitlab.com> | 2019-06-06 17:46:45 +0300 |
| commit | ff3486a92bfcf00b85d45c9224c27cc5fa9c49e2 (patch) | |
| tree | 6633bc6d12773a19f1dfb01e293686007f5fdc06 /app/assets/javascripts/ci_variable_list | |
| parent | e5aba4b153d4ebaa8a6b0683f7ecae706e9c7e45 (diff) | |
Allow masking if 8 or more characters in base64
This should allow for private ssh-keys to remain private.
Solves https://gitlab.com/gitlab-org/gitlab-ce/issues/60790.
Diffstat (limited to 'app/assets/javascripts/ci_variable_list')
| -rw-r--r-- | app/assets/javascripts/ci_variable_list/ci_variable_list.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/ci_variable_list/ci_variable_list.js b/app/assets/javascripts/ci_variable_list/ci_variable_list.js index 0390a3bf96a..70335ff5751 100644 --- a/app/assets/javascripts/ci_variable_list/ci_variable_list.js +++ b/app/assets/javascripts/ci_variable_list/ci_variable_list.js @@ -196,7 +196,7 @@ export default class VariableList { validateMaskability($row) { const invalidInputClass = 'gl-field-error-outline'; - const maskableRegex = /^\w{8,}$/; // Eight or more alphanumeric characters plus underscores + const maskableRegex = /^[a-zA-Z0-9_+=/-]{8,}$/; // Eight or more characters, from the Base64 alphabet (RFC4648) const variableValue = $row.find(this.inputMap.secret_value.selector).val(); const isValueMaskable = maskableRegex.test(variableValue) || variableValue === ''; const isMaskedChecked = $row.find(this.inputMap.masked.selector).val() === 'true'; |