Merge pull request #13515 from dmarcoux/scm-ci-airbrake

Ignore scm_token and string in parameters and Airbrake
openSUSE · Dec 12, 2022 · 550d35a · 550d35a
2 parents 7b52bdf + ba36a4f
commit 550d35a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/api/config/initializers/airbrake.rb b/src/api/config/initializers/airbrake.rb
@@ -51,7 +51,8 @@
   # Airbrake. By default, all "password" attributes will have their contents
   # replaced.
   # https://github.com/airbrake/airbrake-ruby#blocklist_keys
-  c.blacklist_keys = [/password/i, /authorization/i]
+  # FIXME: `string` is a column from the Tokens table, this column should be renamed.
+  c.blacklist_keys = [/password/i, /authorization/i, /scm_token/i, /string/i]
 
   # Alternatively, you can integrate with Rails' filter_parameters.
   # Read more: https://goo.gl/gqQ1xS

diff --git a/src/api/config/initializers/filter_parameter_logging.rb b/src/api/config/initializers/filter_parameter_logging.rb
@@ -3,4 +3,5 @@
 # Configure parameters to be filtered from the log file. Use this to limit dissemination of
 # sensitive information. See the ActiveSupport::ParameterFilter documentation for supported
 # notations and behaviors.
-Rails.application.config.filter_parameters += [:password, :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn]
+# FIXME: `string` is a column from the Tokens table, this column should be renamed.
+Rails.application.config.filter_parameters += [:password, :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn, :scm_token, :string]