jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

danbooru logger: fix request parameter filtering.

Browse Source
This commit is contained in:
evazion
2019-12-22 13:55:56 -06:00
parent f586db97bc
commit 2320fad139
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/logical/danbooru_logger.rb
View File

@@ -22,7 +22,7 @@ class DanbooruLogger
end end
def self.add_session_attributes(request, session, user) def self.add_session_attributes(request, session, user)
request_params = request.parameters.with_indifferent_access.except(*Rails.application.config.filter_parameters, :controller, :action) request_params = request.parameters.with_indifferent_access.except(:controller, :action)
session_params = session.to_h.with_indifferent_access.slice(:session_id, :started_at) session_params = session.to_h.with_indifferent_access.slice(:session_id, :started_at)
user_params = { id: user&.id, name: user&.name, level: user&.level_string, ip: request.remote_ip, safe_mode: CurrentUser.safe_mode? } user_params = { id: user&.id, name: user&.name, level: user&.level_string, ip: request.remote_ip, safe_mode: CurrentUser.safe_mode? }
@@ -35,6 +35,7 @@ class DanbooruLogger
return unless defined?(::NewRelic) return unless defined?(::NewRelic)
attributes = flatten_hash(hash).transform_keys { |key| "#{prefix}.#{key}" } attributes = flatten_hash(hash).transform_keys { |key| "#{prefix}.#{key}" }
attributes.delete_if { |key, value| key.end_with?(*Rails.application.config.filter_parameters.map(&:to_s)) }
::NewRelic::Agent.add_custom_attributes(attributes) ::NewRelic::Agent.add_custom_attributes(attributes)
end end

2
config/application.rb
View File

@@ -26,7 +26,7 @@ module Danbooru
config.load_defaults 6.0 config.load_defaults 6.0
config.active_record.schema_format = :sql config.active_record.schema_format = :sql
config.encoding = "utf-8" config.encoding = "utf-8"
config.filter_parameters += [:password, :password_hash, :api_key] config.filter_parameters += [:password, :password_confirmation, :password_hash, :api_key]
#config.assets.enabled = true #config.assets.enabled = true
#config.assets.version = '1.0' #config.assets.version = '1.0'
config.autoload_paths += %W(#{config.root}/app/presenters #{config.root}/app/logical #{config.root}/app/mailers) config.autoload_paths += %W(#{config.root}/app/presenters #{config.root}/app/logical #{config.root}/app/mailers)