diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-12-06 01:05:06 +0000 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2016-12-08 21:23:09 -0300 |
| commit | 6e1b52b8b9b83cb774a5f2f52d4b4355590f14f7 (patch) | |
| tree | 1bd1aacb2d52196c0d610c34e9addbc1909854f5 | |
| parent | 47bc0125beba2351c5d78323677a34d19b102047 (diff) | |
| download | gitlab-ce-6e1b52b8b9b83cb774a5f2f52d4b4355590f14f7.tar.gz | |
Merge branch 'rs-filter-authentication_token' into 'security'
Add authentication_token to filter_parameters list
See merge request !2041
| -rw-r--r-- | config/application.rb | 3 | ||||
| -rw-r--r-- | config/initializers/sentry.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/config/application.rb b/config/application.rb index fb84870dfbd..0aa2873f94a 100644 --- a/config/application.rb +++ b/config/application.rb @@ -45,7 +45,7 @@ module Gitlab # # Parameters filtered: # - Password (:password, :password_confirmation) - # - Private tokens (:private_token) + # - Private tokens (:private_token, :authentication_token) # - Two-factor tokens (:otp_attempt) # - Repo/Project Import URLs (:import_url) # - Build variables (:variables) @@ -55,6 +55,7 @@ module Gitlab # - Sentry DSN (:sentry_dsn) # - Deploy keys (:key) config.filter_parameters += %i( + authentication_token certificate encrypted_key hook diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb index 4f30d1265c8..6b0cff75653 100644 --- a/config/initializers/sentry.rb +++ b/config/initializers/sentry.rb @@ -15,7 +15,7 @@ if Rails.env.production? Raven.configure do |config| config.dsn = current_application_settings.sentry_dsn config.release = Gitlab::REVISION - + # Sanitize fields based on those sanitized from Rails. config.sanitize_fields = Rails.application.config.filter_parameters.map(&:to_s) # Sanitize authentication headers |