Filter EPP XML legalDocument tag

#314

config/application.rb

@@ -10,7 +10,6 @@ require 'sprockets/railtie'
 require 'csv'
 require 'rails/all'
 # require "rails/test_unit/railtie"
-require_relative '../lib/registry_log_formatter'
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
@@ -79,8 +78,6 @@ module Registry
       domain:               ENV['smtp_domain'],
       openssl_verify_mode:  ENV['smtp_openssl_verify_mode']
     }
-
-    config.log_formatter = RegistryLogFormatter.new # Only works if placed in application.rb
   end
 end
 

config/environments/production.rb

@@ -75,6 +75,9 @@ Rails.application.configure do
   # Disable automatic flushing of the log to improve performance.
   # config.autoflush_log = false
 
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
+
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
 end

config/initializers/filter_parameter_logging.rb

@@ -1,6 +1,10 @@
 Rails.application.configure do
-  config.filter_parameters += [:password, :nokogiri_frame, :parsed_frame]
+  config.filter_parameters += [:password, /^frame$/, /^nokogiri_frame$/, /^parsed_frame$/]
   config.filter_parameters << lambda do |key, value|
-    value.to_s.gsub!(/pw>.+<\//, 'pw>[FILTERED]</') if key =~ /^(frame|raw_frame)$/i
+    if key == 'raw_frame'
+      value.to_s.gsub!(/pw>.+<\//, 'pw>[FILTERED]</')
+      value.to_s.gsub!(/<eis:legalDocument([^>]+)>([^<])+<\/eis:legalDocument>/,
+                       "<eis:legalDocument>[FILTERED]</eis:legalDocument>")
+    end
   end
 end

lib/registry_log_formatter.rb

@@ -1,13 +0,0 @@
-class RegistryLogFormatter < ::Logger::Formatter
-  def call(severity, timestamp, progname, msg)
-    msg = filter_epp_legal_document(msg)
-    "#{msg}\n"
-  end
-
-  private
-
-  def filter_epp_legal_document(msg)
-    msg.gsub(/<eis:legalDocument([^>]+)>([^<])+<\/eis:legalDocument>/,
-             "<eis:legalDocument>[FILTERED]</eis:legalDocument>")
-  end
-end