Commit 3881285c authored by Cindy Pallares's avatar Cindy Pallares

Merge branch 'security-182-update-workhorse' into 'master'

[Master] Redact sensitive information on gitlab-workhorse log

See merge request gitlab/gitlabhq!2584
parent 335434ca
---
title: Redact sensitive information on gitlab-workhorse log
merge_request:
author:
type: security
...@@ -103,6 +103,9 @@ module Gitlab ...@@ -103,6 +103,9 @@ module Gitlab
# - Webhook URLs (:hook) # - Webhook URLs (:hook)
# - Sentry DSN (:sentry_dsn) # - Sentry DSN (:sentry_dsn)
# - File content from Web Editor (:content) # - 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 += [/token$/, /password/, /secret/, /key$/]
config.filter_parameters += %i( config.filter_parameters += %i(
certificate certificate
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment