Commit 207927ae authored by Douwe Maan's avatar Douwe Maan
Browse files

Merge branch 'filter-import-url' into 'master'

Filter import_url params because they may contain auth information. Fixes #14199

cc @dzaporozhets @DouweM tagging you since this is security related.

See merge request !3174
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
config.encoding = "utf-8" config.encoding = "utf-8"
# Configure sensitive parameters which will be filtered from the log file. # Configure sensitive parameters which will be filtered from the log file.
config.filter_parameters.push(:password, :password_confirmation, :private_token, :otp_attempt, :variables) config.filter_parameters.push(:password, :password_confirmation, :private_token, :otp_attempt, :variables, :import_url)
# Enable escaping HTML in JSON. # Enable escaping HTML in JSON.
config.active_support.escape_html_entities_in_json = true config.active_support.escape_html_entities_in_json = true
......
Supports Markdown
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