Commit 238781a6 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'sh-filter-secret-variables' into 'master'

Filter secret variable values from logs

Closes #43313

See merge request gitlab-org/gitlab-ce!17159
parents efdde042 efbe0768
...@@ -69,6 +69,7 @@ module Gitlab ...@@ -69,6 +69,7 @@ module Gitlab
# - Webhook URLs (:hook) # - Webhook URLs (:hook)
# - Sentry DSN (:sentry_dsn) # - Sentry DSN (:sentry_dsn)
# - Deploy keys (:key) # - Deploy keys (:key)
# - Secret variable values (:value)
config.filter_parameters += [/token$/, /password/, /secret/] config.filter_parameters += [/token$/, /password/, /secret/]
config.filter_parameters += %i( config.filter_parameters += %i(
certificate certificate
...@@ -80,6 +81,7 @@ module Gitlab ...@@ -80,6 +81,7 @@ module Gitlab
sentry_dsn sentry_dsn
trace trace
variables variables
value
) )
# Enable escaping HTML in JSON. # Enable escaping HTML in JSON.
......
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