diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-10-06 08:33:11 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-06 08:33:11 +0200 |
| commit | d51bb99a7e7c4dce4abefbf4967aa69054066c3b (patch) | |
| tree | a6aba13ef5161890bbebd0b48bfc36ad3d8f8223 /config | |
| parent | 7e493b11546f15f7871a249474edf6afd418af89 (diff) | |
| parent | 3f57ea0c0ba55f2612997acfb531f83a70b73323 (diff) | |
| download | gitlab-ce-d51bb99a7e7c4dce4abefbf4967aa69054066c3b.tar.gz | |
Merge commit 'dev/security' into 'master'
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 2 | ||||
| -rw-r--r-- | config/initializers/sentry.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 5dbe5a8120b..962ffe0708d 100644 --- a/config/application.rb +++ b/config/application.rb @@ -50,6 +50,7 @@ module Gitlab # - Build variables (:variables) # - GitLab Pages SSL cert/key info (:certificate, :encrypted_key) # - Webhook URLs (:hook) + # - GitLab-shell secret token (:secret_token) # - Sentry DSN (:sentry_dsn) # - Deploy keys (:key) config.filter_parameters += %i( @@ -62,6 +63,7 @@ module Gitlab password password_confirmation private_token + secret_token sentry_dsn variables ) diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb index 5892c1de024..4f30d1265c8 100644 --- a/config/initializers/sentry.rb +++ b/config/initializers/sentry.rb @@ -18,6 +18,8 @@ if Rails.env.production? # Sanitize fields based on those sanitized from Rails. config.sanitize_fields = Rails.application.config.filter_parameters.map(&:to_s) + # Sanitize authentication headers + config.sanitize_http_headers = %w[Authorization Private-Token] config.tags = { program: Gitlab::Sentry.program_context } end end |