diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-09-11 23:09:03 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-09-11 23:09:03 +0000 |
| commit | 32062a9154763aedfcbdb821898b83884a1bcd2c (patch) | |
| tree | 564cd89e33d9365eb3325fa61d0d4a262df4d615 | |
| parent | a2be6536e9cd92f1fb3d842020136ca165fe9748 (diff) | |
| parent | 5c79c68ee755fb907227e3a74f018fc209c82242 (diff) | |
| download | gitlab-ce-32062a9154763aedfcbdb821898b83884a1bcd2c.tar.gz | |
Merge branch 'sh-allow-key-id-in-params' into 'master'
Filter any parameters ending with "key" in logs
See merge request gitlab-org/gitlab-ce!21688
| -rw-r--r-- | changelogs/unreleased/sh-allow-key-id-in-params.yml | 5 | ||||
| -rw-r--r-- | config/application.rb | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/changelogs/unreleased/sh-allow-key-id-in-params.yml b/changelogs/unreleased/sh-allow-key-id-in-params.yml new file mode 100644 index 00000000000..2be1cfb0ed3 --- /dev/null +++ b/changelogs/unreleased/sh-allow-key-id-in-params.yml @@ -0,0 +1,5 @@ +--- +title: Filter any parameters ending with "key" in logs +merge_request: 21688 +author: +type: changed diff --git a/config/application.rb b/config/application.rb index fae92f6f372..f3c53fa63f3 100644 --- a/config/application.rb +++ b/config/application.rb @@ -85,6 +85,7 @@ module Gitlab # - Any parameter ending with `token` # - Any parameter containing `password` # - Any parameter containing `secret` + # - Any parameter ending with `key` # - Two-factor tokens (:otp_attempt) # - Repo/Project Import URLs (:import_url) # - Build traces (:trace) @@ -92,15 +93,13 @@ module Gitlab # - GitLab Pages SSL cert/key info (:certificate, :encrypted_key) # - Webhook URLs (:hook) # - Sentry DSN (:sentry_dsn) - # - Deploy keys (:key) # - File content from Web Editor (:content) - config.filter_parameters += [/token$/, /password/, /secret/] + config.filter_parameters += [/token$/, /password/, /secret/, /key$/] config.filter_parameters += %i( certificate encrypted_key hook import_url - key otp_attempt sentry_dsn trace |