Merge branch '117690107-request_trim' into staging

This commit is contained in:
Stas 2016-05-20 14:06:22 +03:00
commit 5d4fa62578
2 changed files with 1 additions and 1 deletions

View file

@ -362,7 +362,6 @@ class EppController < ApplicationController
frame.gsub!(/pw>.+<\//, 'pw>[FILTERED]</') frame.gsub!(/pw>.+<\//, 'pw>[FILTERED]</')
end end
trimmed_request = frame.gsub(/<eis:legalDocument([^>]+)>([^<])+<\/eis:legalDocument>/, "<eis:legalDocument>[FILTERED]</eis:legalDocument>") if frame.present? trimmed_request = frame.gsub(/<eis:legalDocument([^>]+)>([^<])+<\/eis:legalDocument>/, "<eis:legalDocument>[FILTERED]</eis:legalDocument>") if frame.present?
trimmed_request.gsub(/\s+</, "<").gsub(/>\s+/, ">")
ApiLog::EppLog.create({ ApiLog::EppLog.create({
request: trimmed_request, request: trimmed_request,

View file

@ -11,6 +11,7 @@ class EppConstraint
# creates parsed_frame, detects epp request object # creates parsed_frame, detects epp request object
def matches?(request) def matches?(request)
# TODO: Maybe move this to controller to keep params clean # TODO: Maybe move this to controller to keep params clean
request.params[:raw_frame] = request.params[:raw_frame].gsub!(/(?<=>)(.*?)(?=<)/) { |s| s.strip}
request.params[:nokogiri_frame] ||= Nokogiri::XML(request.params[:raw_frame]) request.params[:nokogiri_frame] ||= Nokogiri::XML(request.params[:raw_frame])
request.params[:parsed_frame] ||= request.params[:nokogiri_frame].dup.remove_namespaces! request.params[:parsed_frame] ||= request.params[:nokogiri_frame].dup.remove_namespaces!