From 0a9cbf4c32c51b1097cd4c3e56a44a039e701758 Mon Sep 17 00:00:00 2001 From: Georg Kahest Date: Tue, 12 Nov 2019 23:36:25 +0200 Subject: [PATCH 1/4] revert codeclimate rubocop upgrade --- app/controllers/epp/sessions_controller.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/controllers/epp/sessions_controller.rb b/app/controllers/epp/sessions_controller.rb index 2175f7281..892628ab7 100644 --- a/app/controllers/epp/sessions_controller.rb +++ b/app/controllers/epp/sessions_controller.rb @@ -13,6 +13,9 @@ module Epp webclient_request = ENV['webclient_ips'].split(',').map(&:strip).include?(request.ip) if webclient_request && !Rails.env.test? && !Rails.env.development? client_md5 = Certificate.parse_md_from_string(request.env['HTTP_SSL_CLIENT_CERT']) + if ENV['cert_path'].nil? + logger.error('webclient cert (cert_path) missing, registrar epp/repp disabled') + end server_md5 = Certificate.parse_md_from_string(File.read(ENV['cert_path'])) if client_md5 != server_md5 epp_errors << { From 4858fd0f9745c584bca379f0b822d172c79cd963 Mon Sep 17 00:00:00 2001 From: Georg Kahest Date: Tue, 12 Nov 2019 23:36:25 +0200 Subject: [PATCH 2/4] log error when cert_path is unconfigured --- app/controllers/epp/sessions_controller.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/controllers/epp/sessions_controller.rb b/app/controllers/epp/sessions_controller.rb index 2175f7281..892628ab7 100644 --- a/app/controllers/epp/sessions_controller.rb +++ b/app/controllers/epp/sessions_controller.rb @@ -13,6 +13,9 @@ module Epp webclient_request = ENV['webclient_ips'].split(',').map(&:strip).include?(request.ip) if webclient_request && !Rails.env.test? && !Rails.env.development? client_md5 = Certificate.parse_md_from_string(request.env['HTTP_SSL_CLIENT_CERT']) + if ENV['cert_path'].nil? + logger.error('webclient cert (cert_path) missing, registrar epp/repp disabled') + end server_md5 = Certificate.parse_md_from_string(File.read(ENV['cert_path'])) if client_md5 != server_md5 epp_errors << { From 2324fd2ceb6b02c737e1dd007913a0663de1caad Mon Sep 17 00:00:00 2001 From: Georg Kahest Date: Mon, 27 Jan 2020 08:49:43 +0200 Subject: [PATCH 3/4] resolve https://github.com/internetee/registry/pull/1420#discussion_r346786232 --- app/controllers/epp/sessions_controller.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/controllers/epp/sessions_controller.rb b/app/controllers/epp/sessions_controller.rb index 892628ab7..d3db24723 100644 --- a/app/controllers/epp/sessions_controller.rb +++ b/app/controllers/epp/sessions_controller.rb @@ -13,9 +13,8 @@ module Epp webclient_request = ENV['webclient_ips'].split(',').map(&:strip).include?(request.ip) if webclient_request && !Rails.env.test? && !Rails.env.development? client_md5 = Certificate.parse_md_from_string(request.env['HTTP_SSL_CLIENT_CERT']) - if ENV['cert_path'].nil? - logger.error('webclient cert (cert_path) missing, registrar epp/repp disabled') - end + fail 'webclient cert (cert_path) missing, registrar epp/repp disabled' unless ENV['cert_path'].present? + server_md5 = Certificate.parse_md_from_string(File.read(ENV['cert_path'])) if client_md5 != server_md5 epp_errors << { From 0924381473d7ccff663b13c6c4706da560fd206c Mon Sep 17 00:00:00 2001 From: Georg Kahest Date: Mon, 27 Jan 2020 09:15:45 +0200 Subject: [PATCH 4/4] fixup! follow styleguide --- app/controllers/epp/sessions_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/epp/sessions_controller.rb b/app/controllers/epp/sessions_controller.rb index d3db24723..f1cd35b33 100644 --- a/app/controllers/epp/sessions_controller.rb +++ b/app/controllers/epp/sessions_controller.rb @@ -13,7 +13,9 @@ module Epp webclient_request = ENV['webclient_ips'].split(',').map(&:strip).include?(request.ip) if webclient_request && !Rails.env.test? && !Rails.env.development? client_md5 = Certificate.parse_md_from_string(request.env['HTTP_SSL_CLIENT_CERT']) - fail 'webclient cert (cert_path) missing, registrar epp/repp disabled' unless ENV['cert_path'].present? + if ENV['cert_path'].blank? + raise 'webclient cert (cert_path) missing, registrar (r)epp disabled' + end server_md5 = Certificate.parse_md_from_string(File.read(ENV['cert_path'])) if client_md5 != server_md5