From e70c84b2802aac7dd6e74af8ea056b0e376652ab Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Wed, 1 Mar 2017 23:13:40 +0200
Subject: [PATCH] Filter EPP XML legalDocument tag

#314
---
 config/application.rb                           |  3 ---
 config/environments/production.rb               |  3 +++
 config/initializers/filter_parameter_logging.rb |  8 ++++++--
 lib/registry_log_formatter.rb                   | 13 -------------
 4 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 lib/registry_log_formatter.rb

diff --git a/config/application.rb b/config/application.rb
index f366f084b..109fa4d1b 100644
--- a/config/application.rb
+++ b/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
 
diff --git a/config/environments/production.rb b/config/environments/production.rb
index e0f14e1ea..0c8989a3b 100644
--- a/config/environments/production.rb
+++ b/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
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
index fb8784c3f..f2acc88e6 100644
--- a/config/initializers/filter_parameter_logging.rb
+++ b/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
diff --git a/lib/registry_log_formatter.rb b/lib/registry_log_formatter.rb
deleted file mode 100644
index 4ce229156..000000000
--- a/lib/registry_log_formatter.rb
+++ /dev/null
@@ -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