diff options
| author | Steve Azzopardi <sazzopardi@gitlab.com> | 2018-11-23 08:04:23 +0000 |
|---|---|---|
| committer | Steve Azzopardi <sazzopardi@gitlab.com> | 2018-11-23 08:04:23 +0000 |
| commit | f5af3d80f1ad6f1516537b9069c407ffbedd90a2 (patch) | |
| tree | ff5eb4399a9cde16ca9083ad2fb6011cd24f5dbf | |
| parent | 747cadf5c4d4923f2826e9acd6c843d39f161996 (diff) | |
| parent | 54e4f6a802dee96b0fae2b4369c93c00e57dffae (diff) | |
| download | gitlab-ce-f5af3d80f1ad6f1516537b9069c407ffbedd90a2.tar.gz | |
Merge branch 'security-182-update-workhorse-11-5' into 'security-11-5'
[11.5] Redact sensitive information on gitlab-workhorse log
See merge request gitlab/gitlabhq!2628
| -rw-r--r-- | GITLAB_WORKHORSE_VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/security-182-update-workhorse.yml | 5 | ||||
| -rw-r--r-- | config/application.rb | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION index a3fcc7121bb..1996c504476 100644 --- a/GITLAB_WORKHORSE_VERSION +++ b/GITLAB_WORKHORSE_VERSION @@ -1 +1 @@ -7.1.0 +7.1.3 diff --git a/changelogs/unreleased/security-182-update-workhorse.yml b/changelogs/unreleased/security-182-update-workhorse.yml new file mode 100644 index 00000000000..76850901b68 --- /dev/null +++ b/changelogs/unreleased/security-182-update-workhorse.yml @@ -0,0 +1,5 @@ +--- +title: Redact sensitive information on gitlab-workhorse log +merge_request: +author: +type: security diff --git a/config/application.rb b/config/application.rb index 95b0f74a5a3..88d4e06c1d0 100644 --- a/config/application.rb +++ b/config/application.rb @@ -94,6 +94,9 @@ module Gitlab # - Webhook URLs (:hook) # - Sentry DSN (:sentry_dsn) # - File content from Web Editor (:content) + # + # NOTE: It is **IMPORTANT** to also update gitlab-workhorse's filter when adding parameters here to not + # introduce another security vulnerability: https://gitlab.com/gitlab-org/gitlab-workhorse/issues/182 config.filter_parameters += [/token$/, /password/, /secret/, /key$/] config.filter_parameters += %i( certificate |