diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-08-08 21:37:10 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-08-08 21:37:10 +0000 |
| commit | c43375dc87aa04d0a039b8d68bebfee07776cb82 (patch) | |
| tree | ee3daa2d5a4af9c75c96b97aab5ba98844029ea0 | |
| parent | dd7e932c9bce9872f6d28ad1f08998c9042fbdfd (diff) | |
| parent | 08d081ca8e665fe644a00d0054fdede69869290a (diff) | |
| download | gitlab-ce-c43375dc87aa04d0a039b8d68bebfee07776cb82.tar.gz | |
Merge branch 'filter-title-description-and-body-from-logs' into 'master'
Filter title, description, and body from logs
Closes #64460 and #60365
See merge request gitlab-org/gitlab-ce!31274
| -rw-r--r-- | changelogs/unreleased/filter-title-description-and-body-from-logs.yml | 5 | ||||
| -rw-r--r-- | config/application.rb | 19 |
2 files changed, 21 insertions, 3 deletions
diff --git a/changelogs/unreleased/filter-title-description-and-body-from-logs.yml b/changelogs/unreleased/filter-title-description-and-body-from-logs.yml new file mode 100644 index 00000000000..8b592790629 --- /dev/null +++ b/changelogs/unreleased/filter-title-description-and-body-from-logs.yml @@ -0,0 +1,5 @@ +--- +title: Filter title, description, and body parameters from logs +merge_request: +author: +type: changed diff --git a/config/application.rb b/config/application.rb index 21cb79f7851..47c5ab71285 100644 --- a/config/application.rb +++ b/config/application.rb @@ -105,10 +105,23 @@ module Gitlab # - Sentry DSN (:sentry_dsn) # - File content from Web Editor (:content) # - Jira shared secret (:sharedSecret) + # - Titles, bodies, and descriptions for notes, issues, etc. # - # 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$/, /^note$/, /^text$/] + # NOTE: It is **IMPORTANT** to also update labkit's filter when + # adding parameters here to not introduce another security + # vulnerability: + # https://gitlab.com/gitlab-org/labkit/blob/master/mask/matchers.go + config.filter_parameters += [ + /token$/, + /password/, + /secret/, + /key$/, + /^body$/, + /^description$/, + /^note$/, + /^text$/, + /^title$/ + ] config.filter_parameters += %i( certificate encrypted_key |