From d74063f1fe345ab22cb992e39092c3dc5585d3e9 Mon Sep 17 00:00:00 2001
From: Priit Tark <priit@gitlab.eu>
Date: Mon, 13 Jul 2015 18:06:59 +0300
Subject: [PATCH] Add pw filtered #2757

---
 app/controllers/epp_controller.rb               | 2 +-
 config/initializers/filter_parameter_logging.rb | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb
index 6ec5758e5..2cd1c8bc7 100644
--- a/app/controllers/epp_controller.rb
+++ b/app/controllers/epp_controller.rb
@@ -309,7 +309,7 @@ class EppController < ApplicationController
 
     # filter pw
     if request_command == 'login' && frame.present?
-      frame.gsub!(/<pw>.+<\/pw>/, '<pw>[FILTERED]</pw>')
+      frame.gsub!(/pw>.+<\//, 'pw>[FILTERED]</')
     end
 
     ApiLog::EppLog.create({
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
index 4a994e1e7..21e09cd43 100644
--- a/config/initializers/filter_parameter_logging.rb
+++ b/config/initializers/filter_parameter_logging.rb
@@ -2,3 +2,7 @@
 
 # Configure sensitive parameters which will be filtered from the log file.
 Rails.application.config.filter_parameters += [:password]
+
+Rails.application.config.filter_parameters << lambda do |key, value|
+  frame.gsub!(/pw>.+<\//, 'pw>[FILTERED]</') if key =~ /frame|raw_frame/i
+end