From 5de0645d41fbd1d6ee19705d61d2bda72e00546d Mon Sep 17 00:00:00 2001 From: Oleg Hasjanov Date: Fri, 29 Jan 2021 18:00:51 +0200 Subject: [PATCH 01/61] added tests for domain locked notifications --- test/jobs/domain_update_confirm_job_test.rb | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/test/jobs/domain_update_confirm_job_test.rb b/test/jobs/domain_update_confirm_job_test.rb index ded0d3d8a..51c42aa4f 100644 --- a/test/jobs/domain_update_confirm_job_test.rb +++ b/test/jobs/domain_update_confirm_job_test.rb @@ -1,5 +1,4 @@ require "test_helper" - class DomainUpdateConfirmJobTest < ActiveSupport::TestCase def setup super @@ -19,6 +18,22 @@ class DomainUpdateConfirmJobTest < ActiveSupport::TestCase super end + def test_registrant_locked_domain + refute @domain.locked_by_registrant? + @domain.apply_registry_lock + assert @domain.locked_by_registrant? + assert_equal(@domain.registrar.notifications.last.text, 'Domain has been locked by registrant') + end + + def test_registrant_unlocked_domain + refute @domain.locked_by_registrant? + @domain.apply_registry_lock + assert @domain.locked_by_registrant? + @domain.remove_registry_lock + refute @domain.locked_by_registrant? + assert_equal(@domain.registrar.notifications.last.text, 'Domain has been unlocked by registrant') + end + def test_rejected_registrant_verification_notifies_registrar DomainUpdateConfirmJob.perform_now(@domain.id, RegistrantVerification::REJECTED) From 1bbacbf56c16b7345ac5d74e2a01410cbf22d56f Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Mon, 11 Jan 2021 13:29:22 +0500 Subject: [PATCH 02/61] Fix class/routes namespace for ContactRequest endpoint --- .../api/v1/contact_requests_controller.rb | 23 +++++++++++ app/models/contact_request.rb | 33 ++++++++++++++++ config/routes.rb | 1 + .../api/v1/contact_requests_test.rb | 39 +++++++++++++++++++ 4 files changed, 96 insertions(+) create mode 100644 app/controllers/api/v1/contact_requests_controller.rb create mode 100644 app/models/contact_request.rb create mode 100644 test/integration/api/v1/contact_requests_test.rb diff --git a/app/controllers/api/v1/contact_requests_controller.rb b/app/controllers/api/v1/contact_requests_controller.rb new file mode 100644 index 000000000..0ac379396 --- /dev/null +++ b/app/controllers/api/v1/contact_requests_controller.rb @@ -0,0 +1,23 @@ +module Api + module V1 + class ContactRequestsController < BaseController + before_action :authenticate_shared_key + + # POST api/v1/contact_requests/ + def create + return head(:bad_request) if contact_request_params[:email].blank? + + ContactRequest.save_record(contact_request_params) + head(:created) + rescue ActionController::ParameterMissing + head(:bad_request) + end + + def update; end + + def contact_request_params + params.require(:contact_request).permit(:email, :whois_record_id, :name, :status, :id) + end + end + end +end diff --git a/app/models/contact_request.rb b/app/models/contact_request.rb new file mode 100644 index 000000000..5da1587dc --- /dev/null +++ b/app/models/contact_request.rb @@ -0,0 +1,33 @@ +class ContactRequest < ApplicationRecord + establish_connection :"whois_#{Rails.env}" + self.table_name = 'contact_requests' + + STATUS_NEW = 'new'.freeze + STATUS_CONFIRMED = 'confirmed'.freeze + STATUS_SENT = 'sent'.freeze + STATUSES = [STATUS_NEW, STATUS_CONFIRMED, STATUS_SENT].freeze + + validates :whois_record_id, presence: true + validates :email, presence: true + validates :name, presence: true + validates :status, inclusion: { in: STATUSES } + + attr_readonly :secret, + :valid_to + + def self.save_record(params) + contact_request = new(params) + contact_request.secret = create_random_secret + contact_request.valid_to = set_valid_to_24_hours_from_now + contact_request.status = STATUS_NEW + contact_request.save! + end + + def self.create_random_secret + SecureRandom.hex(64) + end + + def self.set_valid_to_24_hours_from_now + (Time.zone.now + 24.hours) + end +end diff --git a/config/routes.rb b/config/routes.rb index 3042eced4..93897b0f1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -91,6 +91,7 @@ Rails.application.routes.draw do end resources :auctions, only: %i[index show update], param: :uuid + resources :contact_requests, only: %i[create update], param: :uuid resources :bounces, only: %i[create] end diff --git a/test/integration/api/v1/contact_requests_test.rb b/test/integration/api/v1/contact_requests_test.rb new file mode 100644 index 000000000..78525e0b5 --- /dev/null +++ b/test/integration/api/v1/contact_requests_test.rb @@ -0,0 +1,39 @@ +require 'test_helper' + +class ApiV1ContactRequestTest < ActionDispatch::IntegrationTest + def setup + @api_key = "Basic #{ENV['api_shared_key']}" + @headers = { "Authorization": "#{@api_key}" } + @json_body = { "contact_request": valid_contact_request_body }.as_json + end + + def test_authorizes_api_request + post api_v1_contact_requests_path, params: @json_body, headers: @headers + assert_response :created + + invalid_headers = { "Authorization": "Basic invalid_api_key" } + post api_v1_contact_requests_path, params: @json_body, headers: invalid_headers + assert_response :unauthorized + end + + def test_saves_new_contact_request + request_body = @json_body.dup + random_mail = "#{rand(10000..99999)}@registry.test" + request_body['contact_request']['email'] = random_mail + + post api_v1_contact_requests_path, params: request_body, headers: @headers + assert_response :created + + contact_request = ContactRequest.last + assert_equal contact_request.email, random_mail + assert ContactRequest::STATUS_NEW, contact_request.status + end + + def valid_contact_request_body + { + "email": "aaa@bbb.com", + "whois_record_id": "1", + "name": "test" + }.as_json + end +end From b708cebbfdd2f901e1c69886eb6c56c8892d887a Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Mon, 11 Jan 2021 14:52:03 +0500 Subject: [PATCH 03/61] Add update endpoint for ContactRequests --- .../api/v1/contact_requests_controller.rb | 16 ++++++-- app/models/contact_request.rb | 5 +++ config/routes.rb | 2 +- test/fixtures/contact_requests.yml | 8 ++++ .../api/v1/contact_requests_test.rb | 39 ++++++++++++++++--- 5 files changed, 61 insertions(+), 9 deletions(-) create mode 100644 test/fixtures/contact_requests.yml diff --git a/app/controllers/api/v1/contact_requests_controller.rb b/app/controllers/api/v1/contact_requests_controller.rb index 0ac379396..114e3c64d 100644 --- a/app/controllers/api/v1/contact_requests_controller.rb +++ b/app/controllers/api/v1/contact_requests_controller.rb @@ -9,14 +9,24 @@ module Api ContactRequest.save_record(contact_request_params) head(:created) - rescue ActionController::ParameterMissing + rescue StandardError head(:bad_request) end - def update; end + def update + return head(:bad_request) if params[:id].blank? + + record = ContactRequest.find_by(id: params[:id]) + return head(:not_found) unless record + + record.update_status(contact_request_params[:status]) + head(:ok) + rescue StandardError + head(:bad_request) + end def contact_request_params - params.require(:contact_request).permit(:email, :whois_record_id, :name, :status, :id) + params.require(:contact_request).permit(:email, :whois_record_id, :name, :status) end end end diff --git a/app/models/contact_request.rb b/app/models/contact_request.rb index 5da1587dc..a49a92f41 100644 --- a/app/models/contact_request.rb +++ b/app/models/contact_request.rb @@ -23,6 +23,11 @@ class ContactRequest < ApplicationRecord contact_request.save! end + def update_status(status) + self.status = status + save! + end + def self.create_random_secret SecureRandom.hex(64) end diff --git a/config/routes.rb b/config/routes.rb index 93897b0f1..1635789fe 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -91,7 +91,7 @@ Rails.application.routes.draw do end resources :auctions, only: %i[index show update], param: :uuid - resources :contact_requests, only: %i[create update], param: :uuid + resources :contact_requests, only: %i[create update], param: :id resources :bounces, only: %i[create] end diff --git a/test/fixtures/contact_requests.yml b/test/fixtures/contact_requests.yml new file mode 100644 index 000000000..030a4d726 --- /dev/null +++ b/test/fixtures/contact_requests.yml @@ -0,0 +1,8 @@ +new: + whois_record_id: 1 + email: aaa@bbb.com + name: Testname + status: new + secret: somesecret + valid_to: 2010-07-05 + diff --git a/test/integration/api/v1/contact_requests_test.rb b/test/integration/api/v1/contact_requests_test.rb index 78525e0b5..f0621b686 100644 --- a/test/integration/api/v1/contact_requests_test.rb +++ b/test/integration/api/v1/contact_requests_test.rb @@ -4,20 +4,22 @@ class ApiV1ContactRequestTest < ActionDispatch::IntegrationTest def setup @api_key = "Basic #{ENV['api_shared_key']}" @headers = { "Authorization": "#{@api_key}" } - @json_body = { "contact_request": valid_contact_request_body }.as_json + @json_create = { "contact_request": valid_contact_request_create }.as_json + @json_update = { "contact_request": valid_contact_request_update }.as_json + @contact_request = contact_requests(:new) end def test_authorizes_api_request - post api_v1_contact_requests_path, params: @json_body, headers: @headers + post api_v1_contact_requests_path, params: @json_create, headers: @headers assert_response :created invalid_headers = { "Authorization": "Basic invalid_api_key" } - post api_v1_contact_requests_path, params: @json_body, headers: invalid_headers + post api_v1_contact_requests_path, params: @json_create, headers: invalid_headers assert_response :unauthorized end def test_saves_new_contact_request - request_body = @json_body.dup + request_body = @json_create.dup random_mail = "#{rand(10000..99999)}@registry.test" request_body['contact_request']['email'] = random_mail @@ -29,11 +31,38 @@ class ApiV1ContactRequestTest < ActionDispatch::IntegrationTest assert ContactRequest::STATUS_NEW, contact_request.status end - def valid_contact_request_body + def test_updates_existing_contact_request + request_body = @json_update.dup + + put api_v1_contact_request_path(@contact_request.id), params: request_body, headers: @headers + assert_response :ok + + @contact_request.reload + assert ContactRequest::STATUS_CONFIRMED, @contact_request.status + end + + def test_not_updates_if_status_error + request_body = @json_update.dup + request_body['contact_request']['status'] = 'some_error_status' + + put api_v1_contact_request_path(@contact_request.id), params: request_body, headers: @headers + assert_response 400 + + @contact_request.reload + assert ContactRequest::STATUS_NEW, @contact_request.status + end + + def valid_contact_request_create { "email": "aaa@bbb.com", "whois_record_id": "1", "name": "test" }.as_json end + + def valid_contact_request_update + { + "status": "#{ContactRequest::STATUS_CONFIRMED}", + }.as_json + end end From 2d510ec3a6758ce4eade3fc6d8beb968a532d8ed Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Mon, 11 Jan 2021 14:58:42 +0500 Subject: [PATCH 04/61] Fix CC --- .../api/v1/contact_requests_controller.rb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/controllers/api/v1/contact_requests_controller.rb b/app/controllers/api/v1/contact_requests_controller.rb index 114e3c64d..a02a68606 100644 --- a/app/controllers/api/v1/contact_requests_controller.rb +++ b/app/controllers/api/v1/contact_requests_controller.rb @@ -16,13 +16,18 @@ module Api def update return head(:bad_request) if params[:id].blank? - record = ContactRequest.find_by(id: params[:id]) - return head(:not_found) unless record + result = process_id(params[:id]) + head(result) + end + + def process_id(id) + record = ContactRequest.find_by(id: id) + return :not_found unless record record.update_status(contact_request_params[:status]) - head(:ok) + :ok rescue StandardError - head(:bad_request) + :bad_request end def contact_request_params From 402005cda103017954b7720d86a47e31e2fff157 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Mon, 11 Jan 2021 15:30:05 +0500 Subject: [PATCH 05/61] Add IP address saving --- app/controllers/api/v1/contact_requests_controller.rb | 4 ++-- app/models/contact_request.rb | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/controllers/api/v1/contact_requests_controller.rb b/app/controllers/api/v1/contact_requests_controller.rb index a02a68606..531b7e506 100644 --- a/app/controllers/api/v1/contact_requests_controller.rb +++ b/app/controllers/api/v1/contact_requests_controller.rb @@ -24,14 +24,14 @@ module Api record = ContactRequest.find_by(id: id) return :not_found unless record - record.update_status(contact_request_params[:status]) + record.update_status(contact_request_params) :ok rescue StandardError :bad_request end def contact_request_params - params.require(:contact_request).permit(:email, :whois_record_id, :name, :status) + params.require(:contact_request).permit(:email, :whois_record_id, :name, :status, :ip) end end end diff --git a/app/models/contact_request.rb b/app/models/contact_request.rb index a49a92f41..7b91bdd78 100644 --- a/app/models/contact_request.rb +++ b/app/models/contact_request.rb @@ -23,8 +23,9 @@ class ContactRequest < ApplicationRecord contact_request.save! end - def update_status(status) - self.status = status + def update_status(params) + self.status = params['status'] + self.ip_address = params['ip'] save! end From 83b5dc6fc783db7696c199a675acdb4aaf3523e6 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Mon, 18 Jan 2021 14:23:08 +0500 Subject: [PATCH 06/61] Return created/updated ContactRequest in body --- app/controllers/api/v1/contact_requests_controller.rb | 11 +++++------ app/models/contact_request.rb | 1 + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/api/v1/contact_requests_controller.rb b/app/controllers/api/v1/contact_requests_controller.rb index 531b7e506..2b5977f59 100644 --- a/app/controllers/api/v1/contact_requests_controller.rb +++ b/app/controllers/api/v1/contact_requests_controller.rb @@ -7,8 +7,8 @@ module Api def create return head(:bad_request) if contact_request_params[:email].blank? - ContactRequest.save_record(contact_request_params) - head(:created) + contact_request = ContactRequest.save_record(contact_request_params) + render json: contact_request, status: :created rescue StandardError head(:bad_request) end @@ -16,8 +16,7 @@ module Api def update return head(:bad_request) if params[:id].blank? - result = process_id(params[:id]) - head(result) + process_id(params[:id]) end def process_id(id) @@ -25,9 +24,9 @@ module Api return :not_found unless record record.update_status(contact_request_params) - :ok + render json: record, status: :ok rescue StandardError - :bad_request + head :bad_request end def contact_request_params diff --git a/app/models/contact_request.rb b/app/models/contact_request.rb index 7b91bdd78..e6a5e9f7d 100644 --- a/app/models/contact_request.rb +++ b/app/models/contact_request.rb @@ -21,6 +21,7 @@ class ContactRequest < ApplicationRecord contact_request.valid_to = set_valid_to_24_hours_from_now contact_request.status = STATUS_NEW contact_request.save! + contact_request end def update_status(params) From bb7effc3705223f1322f8bbfe644299d0f2fe0ea Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Thu, 4 Feb 2021 12:30:13 +0500 Subject: [PATCH 07/61] Change name of API key --- app/controllers/api/v1/base_controller.rb | 2 +- config/application.yml.sample | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/api/v1/base_controller.rb b/app/controllers/api/v1/base_controller.rb index b62b3e063..045e4395e 100644 --- a/app/controllers/api/v1/base_controller.rb +++ b/app/controllers/api/v1/base_controller.rb @@ -11,7 +11,7 @@ module Api end def authenticate_shared_key - api_key = "Basic #{ENV['api_shared_key']}" + api_key = "Basic #{ENV['internal_api_key']}" head(:unauthorized) unless api_key == request.authorization end diff --git a/config/application.yml.sample b/config/application.yml.sample index 5885c47a2..21f1df8e0 100644 --- a/config/application.yml.sample +++ b/config/application.yml.sample @@ -90,6 +90,9 @@ registrant_api_auth_allowed_ips: '127.0.0.1, 0.0.0.0' #ips, separated with comma # Bounces API api_shared_key: testkey +# Link to REST-WHOIS API +internal_api_key: testkey + # Base URL (inc. https://) of REST registrant portal # Leave blank to use internal registrant portal registrant_portal_verifications_base_url: '' From ac50634a00d7de60caf000bc71bebd75db224252 Mon Sep 17 00:00:00 2001 From: Oleg Hasjanov Date: Thu, 4 Feb 2021 13:59:52 +0200 Subject: [PATCH 08/61] added tests for getting info from contact without prefix --- .../integration/epp/contact/info/base_test.rb | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/test/integration/epp/contact/info/base_test.rb b/test/integration/epp/contact/info/base_test.rb index 4e4a9190e..6b04d98a2 100644 --- a/test/integration/epp/contact/info/base_test.rb +++ b/test/integration/epp/contact/info/base_test.rb @@ -44,6 +44,56 @@ class EppContactInfoBaseTest < EppTestCase contact: xml_schema).text end + def test_get_info_about_contact_with_prefix + @contact.update_columns(code: 'TEST:JOHN-001') + + request_xml = <<-XML + + + + + + TEST:JOHN-001 + + + + + XML + + post epp_info_path, params: { frame: request_xml }, + headers: { 'HTTP_COOKIE' => 'session=api_bestnames' } + + response_xml = Nokogiri::XML(response.body) + assert_epp_response :completed_successfully + assert_equal 'TEST:JOHN-001', response_xml.at_xpath('//contact:id', contact: xml_schema).text + assert_equal '+555.555', response_xml.at_xpath('//contact:voice', contact: xml_schema).text + end + + def test_get_info_about_contact_without_prefix + @contact.update_columns(code: 'TEST:JOHN-001') + + request_xml = <<-XML + + + + + + JOHN-001 + + + + + XML + + post epp_info_path, params: { frame: request_xml }, + headers: { 'HTTP_COOKIE' => 'session=api_bestnames' } + + response_xml = Nokogiri::XML(response.body) + assert_epp_response :completed_successfully + assert_equal 'TEST:JOHN-001', response_xml.at_xpath('//contact:id', contact: xml_schema).text + assert_equal '+555.555', response_xml.at_xpath('//contact:voice', contact: xml_schema).text + end + def test_hides_password_and_name_when_current_registrar_is_not_sponsoring non_sponsoring_registrar = registrars(:goodnames) @contact.update!(registrar: non_sponsoring_registrar) From 8f4f2509ef607ab86d0761d40cf7a4ef199ac8a8 Mon Sep 17 00:00:00 2001 From: Oleg Hasjanov Date: Thu, 4 Feb 2021 14:02:48 +0200 Subject: [PATCH 09/61] mend --- .ruby-version | 2 +- test/integration/epp/contact/info/base_test.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index 37c2961c2..57cf282eb 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.2 +2.6.5 diff --git a/test/integration/epp/contact/info/base_test.rb b/test/integration/epp/contact/info/base_test.rb index 6b04d98a2..4b4cb017f 100644 --- a/test/integration/epp/contact/info/base_test.rb +++ b/test/integration/epp/contact/info/base_test.rb @@ -46,6 +46,7 @@ class EppContactInfoBaseTest < EppTestCase def test_get_info_about_contact_with_prefix @contact.update_columns(code: 'TEST:JOHN-001') + assert @contact.code, 'TEST:JOHN-001' request_xml = <<-XML @@ -71,6 +72,7 @@ class EppContactInfoBaseTest < EppTestCase def test_get_info_about_contact_without_prefix @contact.update_columns(code: 'TEST:JOHN-001') + assert @contact.code, 'TEST:JOHN-001' request_xml = <<-XML From 1bdfcef36b91e0fa2d9abc7daa1754d6b2571ac3 Mon Sep 17 00:00:00 2001 From: Oleg Hasjanov Date: Thu, 4 Feb 2021 14:04:03 +0200 Subject: [PATCH 10/61] Revert "mend" This reverts commit 8f4f2509ef607ab86d0761d40cf7a4ef199ac8a8. --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index 57cf282eb..37c2961c2 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.5 +2.7.2 From 8ed3aaf78151915871869b130e8c3eaf997c96b2 Mon Sep 17 00:00:00 2001 From: Oleg Hasjanov Date: Thu, 4 Feb 2021 12:52:42 +0200 Subject: [PATCH 11/61] test added --- test/models/white_ip_test.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/test/models/white_ip_test.rb b/test/models/white_ip_test.rb index 607887730..7a0c6078b 100644 --- a/test/models/white_ip_test.rb +++ b/test/models/white_ip_test.rb @@ -38,6 +38,20 @@ class WhiteIpTest < ActiveSupport::TestCase assert white_ip.valid? end + def test_validates_include_empty_ipv4 + white_ip = WhiteIp.new + + white_ip.ipv4 = '' + white_ip.ipv6 = '001:0db8:85a3:0000:0000:8a2e:0370:7334' + white_ip.registrar = registrars(:bestnames) + + assert_nothing_raised { white_ip.save } + assert white_ip.valid? + + assert WhiteIp.include_ip?(white_ip.ipv6) + assert_not WhiteIp.include_ip?('192.168.1.1') + end + private def valid_white_ip From dc428b3c18804d927eaa2b5de75f36d6c98fd6be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Thu, 4 Feb 2021 16:24:01 +0200 Subject: [PATCH 12/61] Fix IPv4/IPv6 parsing for empty string --- app/models/white_ip.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/white_ip.rb b/app/models/white_ip.rb index 417633b12..7bb3ccb37 100644 --- a/app/models/white_ip.rb +++ b/app/models/white_ip.rb @@ -50,10 +50,10 @@ class WhiteIp < ApplicationRecord def ids_including(ip) ipv4 = ipv6 = [] if check_ip4(ip).present? - ipv4 = select { |white_ip| IPAddr.new(white_ip.ipv4, Socket::AF_INET) === check_ip4(ip) } + ipv4 = select { |white_ip| check_ip4(white_ip.ipv4) === check_ip4(ip) } end if check_ip6(ip).present? - ipv6 = select { |white_ip| IPAddr.new(white_ip.ipv6, Socket::AF_INET6) === check_ip6(ip) } + ipv6 = select { |white_ip| check_ip6(white_ip.ipv6) === check_ip6(ip) } end (ipv4 + ipv6).pluck(:id).flatten.uniq end From b34be2c0273b75a1ca3fe29b31a3954ea9a451bc Mon Sep 17 00:00:00 2001 From: Oleg Hasjanov Date: Fri, 5 Feb 2021 10:34:32 +0200 Subject: [PATCH 13/61] modifed test --- test/models/white_ip_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/models/white_ip_test.rb b/test/models/white_ip_test.rb index 7a0c6078b..ba5abe42f 100644 --- a/test/models/white_ip_test.rb +++ b/test/models/white_ip_test.rb @@ -41,7 +41,7 @@ class WhiteIpTest < ActiveSupport::TestCase def test_validates_include_empty_ipv4 white_ip = WhiteIp.new - white_ip.ipv4 = '' + white_ip.ipv4 = nil white_ip.ipv6 = '001:0db8:85a3:0000:0000:8a2e:0370:7334' white_ip.registrar = registrars(:bestnames) From d99dd477c6fd667faf70a30a1faf72a4088d4837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Fri, 5 Feb 2021 11:45:58 +0200 Subject: [PATCH 14/61] WhiteIP: Replace empty string with nil --- app/models/white_ip.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/models/white_ip.rb b/app/models/white_ip.rb index 7bb3ccb37..38cee7b6b 100644 --- a/app/models/white_ip.rb +++ b/app/models/white_ip.rb @@ -4,8 +4,13 @@ class WhiteIp < ApplicationRecord validate :valid_ipv4? validate :valid_ipv6? - validate :validate_ipv4_and_ipv6 + before_save :normalize_blank_values + + def normalize_blank_values + %i[ipv4 ipv6].each { |c| self[c].present? || self[c] = nil } + end + def validate_ipv4_and_ipv6 return if ipv4.present? || ipv6.present? errors.add(:base, I18n.t(:ipv4_or_ipv6_must_be_present)) From f4abad7a9fb8e50196d45ff088a152e089159e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20V=C3=B5hmar?= Date: Fri, 5 Feb 2021 12:46:14 +0200 Subject: [PATCH 15/61] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45ab590db..064905ba7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +05.02.2021 +* Fixed IPv4 empty string issue in case of IPv6 only entries for IP whitelist [#1833](https://github.com/internetee/registry/issues/1833) + 02.02.2021 * Fixed updateProhibited status not affecting bulk tech contact change operation [#1820](https://github.com/internetee/registry/pull/1820) From a05f21c86cc0160f41f0a4a25e292b9f0a8266c0 Mon Sep 17 00:00:00 2001 From: Oleg Hasjanov Date: Tue, 26 Jan 2021 13:58:58 +0200 Subject: [PATCH 16/61] added domain admin contacts bulk change tests --- .../api/domain_admin_contacts_test.rb | 115 ++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 test/integration/api/domain_admin_contacts_test.rb diff --git a/test/integration/api/domain_admin_contacts_test.rb b/test/integration/api/domain_admin_contacts_test.rb new file mode 100644 index 000000000..75b58d318 --- /dev/null +++ b/test/integration/api/domain_admin_contacts_test.rb @@ -0,0 +1,115 @@ +require 'test_helper' + +class APIDomainAdminContactsTest < ApplicationIntegrationTest + def test_replace_all_admin_contacts_of_the_current_registrar + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: 'william-001', + new_contact_id: 'john-001' }, + headers: { 'HTTP_AUTHORIZATION' => http_auth_key } + + assert_nil domains(:shop).admin_contacts.find_by(code: 'william-001') + assert domains(:shop).admin_contacts.find_by(code: 'john-001') + assert domains(:airport).admin_contacts.find_by(code: 'john-001') + end + + def test_skip_discarded_domains + domains(:airport).update!(statuses: [DomainStatus::DELETE_CANDIDATE]) + + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: 'william-001', + new_contact_id: 'john-001' }, + headers: { 'HTTP_AUTHORIZATION' => http_auth_key } + + assert domains(:airport).admin_contacts.find_by(code: 'william-001') + end + + def test_return_affected_domains_in_alphabetical_order + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: 'william-001', + new_contact_id: 'john-001' }, + headers: { 'HTTP_AUTHORIZATION' => http_auth_key } + + assert_response :ok + assert_equal ({ code: 1000, message: 'Command completed successfully', data: { affected_domains: %w[airport.test shop.test], + skipped_domains: [] }}), + JSON.parse(response.body, symbolize_names: true) + end + + def test_return_skipped_domains_in_alphabetical_order + domains(:shop).update!(statuses: [DomainStatus::DELETE_CANDIDATE]) + domains(:airport).update!(statuses: [DomainStatus::DELETE_CANDIDATE]) + + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: 'william-001', + new_contact_id: 'john-001' }, + headers: { 'HTTP_AUTHORIZATION' => http_auth_key } + + assert_response :ok + assert_equal %w[airport.test shop.test], JSON.parse(response.body, + symbolize_names: true)[:data][:skipped_domains] + end + + def test_keep_other_admin_contacts_intact + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: 'william-001', + new_contact_id: 'john-001' }, + headers: { 'HTTP_AUTHORIZATION' => http_auth_key } + + assert domains(:shop).admin_contacts.find_by(code: 'acme-ltd-001') + end + + def test_keep_tech_contacts_intact + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: 'william-001', + new_contact_id: 'john-001' }, + headers: { 'HTTP_AUTHORIZATION' => http_auth_key } + + assert domains(:airport).tech_contacts.find_by(code: 'william-001') + end + + def test_restrict_contacts_to_the_current_registrar + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: 'jack-001', + new_contact_id: 'william-002' }, + headers: { 'HTTP_AUTHORIZATION' => http_auth_key } + + assert_response :not_found + assert_equal ({ code: 2303, message: 'Object does not exist' }), + JSON.parse(response.body, symbolize_names: true) + end + + def test_non_existent_current_contact + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: 'non-existent', + new_contact_id: 'john-001' }, + headers: { 'HTTP_AUTHORIZATION' => http_auth_key } + assert_response :not_found + assert_equal ({ code: 2303, message: 'Object does not exist' }), + JSON.parse(response.body, symbolize_names: true) + end + + def test_non_existent_new_contact + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: 'william-001', + new_contact_id: 'non-existent' }, + headers: { 'HTTP_AUTHORIZATION' => http_auth_key } + assert_response :not_found + assert_equal ({code: 2303, message: 'Object does not exist'}), + JSON.parse(response.body, symbolize_names: true) + end + + def test_disallow_invalid_new_contact + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: 'william-001', + new_contact_id: 'invalid' }, + headers: { 'HTTP_AUTHORIZATION' => http_auth_key } + assert_response :bad_request + assert_equal ({ code: 2304, message: 'New contact must be valid', data: {} }), + JSON.parse(response.body, symbolize_names: true) + end + + def test_disallow_self_replacement + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: 'william-001', + new_contact_id: 'william-001' }, + headers: { 'HTTP_AUTHORIZATION' => http_auth_key } + assert_response :bad_request + assert_equal ({ code: 2304, message: 'New contact must be different from current', data: {} }), + JSON.parse(response.body, symbolize_names: true) + end + + private + + def http_auth_key + ActionController::HttpAuthentication::Basic.encode_credentials('test_bestnames', 'testtest') + end +end From 275da4645a84733ad20ec9db3a7492a27a0f01f4 Mon Sep 17 00:00:00 2001 From: Oleg Hasjanov Date: Wed, 27 Jan 2021 13:52:42 +0200 Subject: [PATCH 17/61] added test for admin bulk change when domain has status update prohibited --- .../api/domain_admin_contacts_test.rb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/test/integration/api/domain_admin_contacts_test.rb b/test/integration/api/domain_admin_contacts_test.rb index 75b58d318..babc58207 100644 --- a/test/integration/api/domain_admin_contacts_test.rb +++ b/test/integration/api/domain_admin_contacts_test.rb @@ -107,6 +107,24 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest JSON.parse(response.body, symbolize_names: true) end + def test_admin_bulk_changed_when_domain_update_prohibited + domains(:shop).update!(statuses: [DomainStatus::SERVER_UPDATE_PROHIBITED]) + + shop_admin_contact = Contact.find_by(code: 'jane-001') + assert domains(:shop).admin_contacts.include?(shop_admin_contact) + + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: 'jane-001', + new_contact_id: 'john-001' }, + headers: { 'HTTP_AUTHORIZATION' => http_auth_key } + + assert_response :ok + assert_equal ({ code: 1000, + message: 'Command completed successfully', + data: { affected_domains: ["airport.test"], + skipped_domains: ["shop.test"] }}), + JSON.parse(response.body, symbolize_names: true) + end + private def http_auth_key From efdb445488e9484b827939107de31d2f88b51ac2 Mon Sep 17 00:00:00 2001 From: Oleg Hasjanov Date: Fri, 29 Jan 2021 14:41:23 +0200 Subject: [PATCH 18/61] added new test, changed contacts values --- .../api/domain_admin_contacts_test.rb | 71 ++++++++++++------- 1 file changed, 47 insertions(+), 24 deletions(-) diff --git a/test/integration/api/domain_admin_contacts_test.rb b/test/integration/api/domain_admin_contacts_test.rb index babc58207..ff56096d2 100644 --- a/test/integration/api/domain_admin_contacts_test.rb +++ b/test/integration/api/domain_admin_contacts_test.rb @@ -1,29 +1,52 @@ require 'test_helper' class APIDomainAdminContactsTest < ApplicationIntegrationTest - def test_replace_all_admin_contacts_of_the_current_registrar - patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: 'william-001', - new_contact_id: 'john-001' }, + setup do + @admin_current = domains(:shop).admin_contacts.find_by(code: 'jane-001') + @admin_new = contacts(:william) + + @admin_new.update(ident: @admin_current.ident, + ident_type: @admin_current.ident_type, + ident_country_code: @admin_current.ident_country_code) + end + + def test_replace_all_admin_contacts_when_ident_data_doesnt_match + @admin_new.update(ident: '777' , + ident_type: 'priv', + ident_country_code: 'LV') + + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current, + new_contact_id: @admin_new }, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } - assert_nil domains(:shop).admin_contacts.find_by(code: 'william-001') - assert domains(:shop).admin_contacts.find_by(code: 'john-001') - assert domains(:airport).admin_contacts.find_by(code: 'john-001') + assert_response :bad_request + assert_equal ({ code: 2304, message: 'New admin contact must have same ident' }), + JSON.parse(response.body, symbolize_names: true) + end + + def test_replace_all_admin_contacts_of_the_current_registrar + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current, + new_contact_id: @admin_new }, + headers: { 'HTTP_AUTHORIZATION' => http_auth_key } + + assert_nil domains(:shop).admin_contacts.find_by(code: @admin_current) + assert domains(:shop).admin_contacts.find_by(code: @admin_new) + assert domains(:airport).admin_contacts.find_by(code: @admin_new) end def test_skip_discarded_domains domains(:airport).update!(statuses: [DomainStatus::DELETE_CANDIDATE]) - patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: 'william-001', - new_contact_id: 'john-001' }, + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current, + new_contact_id: @admin_new }, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } - assert domains(:airport).admin_contacts.find_by(code: 'william-001') + assert domains(:shop).admin_contacts.find_by(code: @admin_current) end def test_return_affected_domains_in_alphabetical_order - patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: 'william-001', - new_contact_id: 'john-001' }, + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current, + new_contact_id: @admin_new }, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } assert_response :ok @@ -36,8 +59,8 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest domains(:shop).update!(statuses: [DomainStatus::DELETE_CANDIDATE]) domains(:airport).update!(statuses: [DomainStatus::DELETE_CANDIDATE]) - patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: 'william-001', - new_contact_id: 'john-001' }, + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current, + new_contact_id: @admin_new }, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } assert_response :ok @@ -46,23 +69,23 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest end def test_keep_other_admin_contacts_intact - patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: 'william-001', - new_contact_id: 'john-001' }, + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current, + new_contact_id: @admin_new }, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } - assert domains(:shop).admin_contacts.find_by(code: 'acme-ltd-001') + assert domains(:airport).admin_contacts.find_by(code: 'john-001') end def test_keep_tech_contacts_intact - patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: 'william-001', - new_contact_id: 'john-001' }, + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current, + new_contact_id: @admin_new }, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } assert domains(:airport).tech_contacts.find_by(code: 'william-001') end def test_restrict_contacts_to_the_current_registrar - patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: 'jack-001', + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current, new_contact_id: 'william-002' }, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } @@ -73,7 +96,7 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest def test_non_existent_current_contact patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: 'non-existent', - new_contact_id: 'john-001' }, + new_contact_id: @admin_new}, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } assert_response :not_found assert_equal ({ code: 2303, message: 'Object does not exist' }), @@ -81,7 +104,7 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest end def test_non_existent_new_contact - patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: 'william-001', + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current, new_contact_id: 'non-existent' }, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } assert_response :not_found @@ -90,7 +113,7 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest end def test_disallow_invalid_new_contact - patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: 'william-001', + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current, new_contact_id: 'invalid' }, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } assert_response :bad_request @@ -99,8 +122,8 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest end def test_disallow_self_replacement - patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: 'william-001', - new_contact_id: 'william-001' }, + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current, + new_contact_id: @admin_current }, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } assert_response :bad_request assert_equal ({ code: 2304, message: 'New contact must be different from current', data: {} }), From f3f89bedd72ae1a998d6f916cca8232a37bc5c9e Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Mon, 1 Feb 2021 15:35:44 +0500 Subject: [PATCH 19/61] Add first version of admin bulk change --- .../v1/domains/admin_contacts_controller.rb | 40 +++++++++++++ app/models/admin_domain_contact.rb | 21 +++++++ app/models/concerns/contact/identical.rb | 6 ++ config/routes.rb | 1 + .../api/domain_admin_contacts_test.rb | 56 +++++++++---------- 5 files changed, 96 insertions(+), 28 deletions(-) create mode 100644 app/controllers/repp/v1/domains/admin_contacts_controller.rb diff --git a/app/controllers/repp/v1/domains/admin_contacts_controller.rb b/app/controllers/repp/v1/domains/admin_contacts_controller.rb new file mode 100644 index 000000000..035cd36fd --- /dev/null +++ b/app/controllers/repp/v1/domains/admin_contacts_controller.rb @@ -0,0 +1,40 @@ +module Repp + module V1 + module Domains + class AdminContactsController < BaseController + before_action :set_current_contact, only: [:update] + before_action :set_new_contact, only: [:update] + + def set_current_contact + @current_contact = current_user.registrar.contacts.find_by!(code: contact_params[:current_contact_id]) + end + + def set_new_contact + @new_contact = current_user.registrar.contacts.find_by!(code: params[:new_contact_id]) + end + + def update + @epp_errors ||= [] + @epp_errors << { code: 2304, msg: 'New contact must be valid' } if @new_contact.invalid? + + unless @new_contact.identical_to?(@current_contact) + @epp_errors << { code: 2304, msg: 'Admin contacts must be identical' } + end + + return handle_errors if @epp_errors.any? + + affected, skipped = AdminDomainContact.replace(@current_contact, @new_contact) + @response = { affected_domains: affected, skipped_domains: skipped } + render_success(data: @response) + end + + private + + def contact_params + params.require(%i[current_contact_id new_contact_id]) + params.permit(:current_contact_id, :new_contact_id) + end + end + end + end +end diff --git a/app/models/admin_domain_contact.rb b/app/models/admin_domain_contact.rb index 14907403d..9fb8166af 100644 --- a/app/models/admin_domain_contact.rb +++ b/app/models/admin_domain_contact.rb @@ -1,2 +1,23 @@ class AdminDomainContact < DomainContact + def self.replace(current_contact, new_contact) + affected_domains = [] + skipped_domains = [] + admin_contacts = where(contact: current_contact) + + admin_contacts.each do |admin_contact| + if admin_contact.domain.discarded? + skipped_domains << admin_contact.domain.name + next + end + begin + admin_contact.contact = new_contact + admin_contact.save! + affected_domains << admin_contact.domain.name + rescue ActiveRecord::RecordNotUnique + skipped_domains << admin_contact.domain.name + end + end + + [affected_domains.sort, skipped_domains.sort] + end end diff --git a/app/models/concerns/contact/identical.rb b/app/models/concerns/contact/identical.rb index f529e09ac..aa527f723 100644 --- a/app/models/concerns/contact/identical.rb +++ b/app/models/concerns/contact/identical.rb @@ -20,6 +20,12 @@ module Concerns::Contact::Identical .where.not(id: id).take end + def identical_to?(contact) + IDENTIFIABLE_ATTRIBUTES.all? do |attribute| + self.attributes[attribute] == contact.attributes[attribute] + end + end + private def identifiable_hash diff --git a/config/routes.rb b/config/routes.rb index 3042eced4..16102f2b6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -64,6 +64,7 @@ Rails.application.routes.draw do get ':id/transfer_info', to: 'domains#transfer_info', constraints: { id: /.*/ } post 'transfer', to: 'domains#transfer' patch 'contacts', to: 'domains/contacts#update' + patch 'admin_contacts', to: 'domains/admin_contacts#update' post 'renew/bulk', to: 'domains/renews#bulk_renew' end end diff --git a/test/integration/api/domain_admin_contacts_test.rb b/test/integration/api/domain_admin_contacts_test.rb index ff56096d2..f1ad9ff27 100644 --- a/test/integration/api/domain_admin_contacts_test.rb +++ b/test/integration/api/domain_admin_contacts_test.rb @@ -5,48 +5,48 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest @admin_current = domains(:shop).admin_contacts.find_by(code: 'jane-001') @admin_new = contacts(:william) - @admin_new.update(ident: @admin_current.ident, - ident_type: @admin_current.ident_type, + @admin_new.update(ident: @admin_current.ident, + ident_type: @admin_current.ident_type, ident_country_code: @admin_current.ident_country_code) end def test_replace_all_admin_contacts_when_ident_data_doesnt_match @admin_new.update(ident: '777' , - ident_type: 'priv', + ident_type: 'priv', ident_country_code: 'LV') - patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current, - new_contact_id: @admin_new }, + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current.code, + new_contact_id: @admin_new.code }, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } assert_response :bad_request - assert_equal ({ code: 2304, message: 'New admin contact must have same ident' }), + assert_equal ({ code: 2304, message: 'Admin contacts must be identical', data: {} }), JSON.parse(response.body, symbolize_names: true) end def test_replace_all_admin_contacts_of_the_current_registrar - patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current, - new_contact_id: @admin_new }, + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current.code, + new_contact_id: @admin_new.code }, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } - assert_nil domains(:shop).admin_contacts.find_by(code: @admin_current) - assert domains(:shop).admin_contacts.find_by(code: @admin_new) - assert domains(:airport).admin_contacts.find_by(code: @admin_new) + assert_nil domains(:shop).admin_contacts.find_by(code: @admin_current.code) + assert domains(:shop).admin_contacts.find_by(code: @admin_new.code) + assert domains(:airport).admin_contacts.find_by(code: @admin_new.code) end def test_skip_discarded_domains domains(:airport).update!(statuses: [DomainStatus::DELETE_CANDIDATE]) - patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current, - new_contact_id: @admin_new }, + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current.code, + new_contact_id: @admin_new.code }, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } - assert domains(:shop).admin_contacts.find_by(code: @admin_current) + assert domains(:shop).admin_contacts.find_by(code: @admin_current.code) end def test_return_affected_domains_in_alphabetical_order - patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current, - new_contact_id: @admin_new }, + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current.code, + new_contact_id: @admin_new.code }, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } assert_response :ok @@ -59,8 +59,8 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest domains(:shop).update!(statuses: [DomainStatus::DELETE_CANDIDATE]) domains(:airport).update!(statuses: [DomainStatus::DELETE_CANDIDATE]) - patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current, - new_contact_id: @admin_new }, + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current.code, + new_contact_id: @admin_new.code }, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } assert_response :ok @@ -69,23 +69,23 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest end def test_keep_other_admin_contacts_intact - patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current, - new_contact_id: @admin_new }, + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current.code, + new_contact_id: @admin_new.code }, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } assert domains(:airport).admin_contacts.find_by(code: 'john-001') end def test_keep_tech_contacts_intact - patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current, - new_contact_id: @admin_new }, + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current.code, + new_contact_id: @admin_new.code }, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } assert domains(:airport).tech_contacts.find_by(code: 'william-001') end def test_restrict_contacts_to_the_current_registrar - patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current, + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current.code, new_contact_id: 'william-002' }, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } @@ -96,7 +96,7 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest def test_non_existent_current_contact patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: 'non-existent', - new_contact_id: @admin_new}, + new_contact_id: @admin_new.code}, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } assert_response :not_found assert_equal ({ code: 2303, message: 'Object does not exist' }), @@ -104,7 +104,7 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest end def test_non_existent_new_contact - patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current, + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current.code, new_contact_id: 'non-existent' }, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } assert_response :not_found @@ -113,7 +113,7 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest end def test_disallow_invalid_new_contact - patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current, + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current.code, new_contact_id: 'invalid' }, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } assert_response :bad_request @@ -122,8 +122,8 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest end def test_disallow_self_replacement - patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current, - new_contact_id: @admin_current }, + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current.code, + new_contact_id: @admin_current.code }, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } assert_response :bad_request assert_equal ({ code: 2304, message: 'New contact must be different from current', data: {} }), From 3c0f7b3a86d5366a7c9514afeb4c833ac8895380 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Mon, 1 Feb 2021 15:50:31 +0500 Subject: [PATCH 20/61] Modify tests to make sure working pair of contacts is identical --- app/models/admin_domain_contact.rb | 1 - test/integration/api/domain_admin_contacts_test.rb | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/models/admin_domain_contact.rb b/app/models/admin_domain_contact.rb index 9fb8166af..426ea2ead 100644 --- a/app/models/admin_domain_contact.rb +++ b/app/models/admin_domain_contact.rb @@ -17,7 +17,6 @@ class AdminDomainContact < DomainContact skipped_domains << admin_contact.domain.name end end - [affected_domains.sort, skipped_domains.sort] end end diff --git a/test/integration/api/domain_admin_contacts_test.rb b/test/integration/api/domain_admin_contacts_test.rb index f1ad9ff27..bea1a9545 100644 --- a/test/integration/api/domain_admin_contacts_test.rb +++ b/test/integration/api/domain_admin_contacts_test.rb @@ -7,7 +7,12 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest @admin_new.update(ident: @admin_current.ident, ident_type: @admin_current.ident_type, - ident_country_code: @admin_current.ident_country_code) + ident_country_code: @admin_current.ident_country_code, + name: @admin_current.name, + email: @admin_current.email, + phone: @admin_current.phone, + fax: @admin_current.fax, + org_name: @admin_current.org_name) end def test_replace_all_admin_contacts_when_ident_data_doesnt_match @@ -25,6 +30,7 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest end def test_replace_all_admin_contacts_of_the_current_registrar + assert @admin_new.identical_to?(@admin_current) patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current.code, new_contact_id: @admin_new.code }, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } From 38b7e52ac8b8dd19fac44d6f850855d91ba91323 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Mon, 1 Feb 2021 16:08:51 +0500 Subject: [PATCH 21/61] Modify tests to have :airport domain included in processing --- test/integration/api/domain_admin_contacts_test.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/integration/api/domain_admin_contacts_test.rb b/test/integration/api/domain_admin_contacts_test.rb index bea1a9545..cce80e0c3 100644 --- a/test/integration/api/domain_admin_contacts_test.rb +++ b/test/integration/api/domain_admin_contacts_test.rb @@ -3,6 +3,8 @@ require 'test_helper' class APIDomainAdminContactsTest < ApplicationIntegrationTest setup do @admin_current = domains(:shop).admin_contacts.find_by(code: 'jane-001') + domain = domains(:airport) + domain.admin_contacts = [@admin_current] @admin_new = contacts(:william) @admin_new.update(ident: @admin_current.ident, From fc3a764896e473e0cd69a369f843260cf41e978e Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Mon, 1 Feb 2021 16:52:38 +0500 Subject: [PATCH 22/61] Fix discarded domains test --- app/models/concerns/contact/identical.rb | 9 ++++++++- test/integration/api/domain_admin_contacts_test.rb | 9 ++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/models/concerns/contact/identical.rb b/app/models/concerns/contact/identical.rb index aa527f723..1a5516bc5 100644 --- a/app/models/concerns/contact/identical.rb +++ b/app/models/concerns/contact/identical.rb @@ -11,6 +11,13 @@ module Concerns::Contact::Identical ident_country_code org_name ] + + IDENTICAL_ATTRIBUTES = %w[ + ident + ident_type + ident_country_code + ] + private_constant :IDENTIFIABLE_ATTRIBUTES def identical(registrar) @@ -21,7 +28,7 @@ module Concerns::Contact::Identical end def identical_to?(contact) - IDENTIFIABLE_ATTRIBUTES.all? do |attribute| + IDENTICAL_ATTRIBUTES.all? do |attribute| self.attributes[attribute] == contact.attributes[attribute] end end diff --git a/test/integration/api/domain_admin_contacts_test.rb b/test/integration/api/domain_admin_contacts_test.rb index cce80e0c3..2e8cbe6da 100644 --- a/test/integration/api/domain_admin_contacts_test.rb +++ b/test/integration/api/domain_admin_contacts_test.rb @@ -9,12 +9,7 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest @admin_new.update(ident: @admin_current.ident, ident_type: @admin_current.ident_type, - ident_country_code: @admin_current.ident_country_code, - name: @admin_current.name, - email: @admin_current.email, - phone: @admin_current.phone, - fax: @admin_current.fax, - org_name: @admin_current.org_name) + ident_country_code: @admin_current.ident_country_code) end def test_replace_all_admin_contacts_when_ident_data_doesnt_match @@ -49,7 +44,7 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest new_contact_id: @admin_new.code }, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } - assert domains(:shop).admin_contacts.find_by(code: @admin_current.code) + assert domains(:airport).admin_contacts.find_by(code: @admin_current.code) end def test_return_affected_domains_in_alphabetical_order From da032dad798545dc5e955429ebdbb80b5fd0d8d0 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Mon, 1 Feb 2021 17:13:19 +0500 Subject: [PATCH 23/61] Add BulkUpdatable concern, fix tests --- app/models/admin_domain_contact.rb | 2 +- .../api/domain_admin_contacts_test.rb | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/app/models/admin_domain_contact.rb b/app/models/admin_domain_contact.rb index 426ea2ead..d84ac7793 100644 --- a/app/models/admin_domain_contact.rb +++ b/app/models/admin_domain_contact.rb @@ -5,7 +5,7 @@ class AdminDomainContact < DomainContact admin_contacts = where(contact: current_contact) admin_contacts.each do |admin_contact| - if admin_contact.domain.discarded? + if admin_contact.domain.bulk_update_prohibited? skipped_domains << admin_contact.domain.name next end diff --git a/test/integration/api/domain_admin_contacts_test.rb b/test/integration/api/domain_admin_contacts_test.rb index 2e8cbe6da..cd5b92865 100644 --- a/test/integration/api/domain_admin_contacts_test.rb +++ b/test/integration/api/domain_admin_contacts_test.rb @@ -4,7 +4,7 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest setup do @admin_current = domains(:shop).admin_contacts.find_by(code: 'jane-001') domain = domains(:airport) - domain.admin_contacts = [@admin_current] + domain.admin_contacts << @admin_current @admin_new = contacts(:william) @admin_new.update(ident: @admin_current.ident, @@ -48,6 +48,8 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest end def test_return_affected_domains_in_alphabetical_order + domain = domains(:airport) + domain.admin_contacts = [@admin_current] patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current.code, new_contact_id: @admin_new.code }, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } @@ -124,23 +126,15 @@ class APIDomainAdminContactsTest < ApplicationIntegrationTest JSON.parse(response.body, symbolize_names: true) end - def test_disallow_self_replacement - patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current.code, - new_contact_id: @admin_current.code }, - headers: { 'HTTP_AUTHORIZATION' => http_auth_key } - assert_response :bad_request - assert_equal ({ code: 2304, message: 'New contact must be different from current', data: {} }), - JSON.parse(response.body, symbolize_names: true) - end - def test_admin_bulk_changed_when_domain_update_prohibited domains(:shop).update!(statuses: [DomainStatus::SERVER_UPDATE_PROHIBITED]) + domains(:airport).admin_contacts = [@admin_current] shop_admin_contact = Contact.find_by(code: 'jane-001') assert domains(:shop).admin_contacts.include?(shop_admin_contact) - patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: 'jane-001', - new_contact_id: 'john-001' }, + patch '/repp/v1/domains/admin_contacts', params: { current_contact_id: @admin_current.code, + new_contact_id: @admin_new.code }, headers: { 'HTTP_AUTHORIZATION' => http_auth_key } assert_response :ok From f6a2d91d61c311ceff292dd210b5ed54743b6eed Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Mon, 1 Feb 2021 17:21:29 +0500 Subject: [PATCH 24/61] Fix CC issues --- .../v1/domains/admin_contacts_controller.rb | 23 ++------------ .../v1/domains/base_contacts_controller.rb | 31 +++++++++++++++++++ .../repp/v1/domains/contacts_controller.rb | 25 ++------------- app/models/admin_domain_contact.rb | 4 +++ app/models/concerns/contact/identical.rb | 4 +-- 5 files changed, 41 insertions(+), 46 deletions(-) create mode 100644 app/controllers/repp/v1/domains/base_contacts_controller.rb diff --git a/app/controllers/repp/v1/domains/admin_contacts_controller.rb b/app/controllers/repp/v1/domains/admin_contacts_controller.rb index 035cd36fd..2e9a285eb 100644 --- a/app/controllers/repp/v1/domains/admin_contacts_controller.rb +++ b/app/controllers/repp/v1/domains/admin_contacts_controller.rb @@ -1,21 +1,9 @@ module Repp module V1 module Domains - class AdminContactsController < BaseController - before_action :set_current_contact, only: [:update] - before_action :set_new_contact, only: [:update] - - def set_current_contact - @current_contact = current_user.registrar.contacts.find_by!(code: contact_params[:current_contact_id]) - end - - def set_new_contact - @new_contact = current_user.registrar.contacts.find_by!(code: params[:new_contact_id]) - end - + class AdminContactsController < BaseContactsController def update - @epp_errors ||= [] - @epp_errors << { code: 2304, msg: 'New contact must be valid' } if @new_contact.invalid? + super unless @new_contact.identical_to?(@current_contact) @epp_errors << { code: 2304, msg: 'Admin contacts must be identical' } @@ -27,13 +15,6 @@ module Repp @response = { affected_domains: affected, skipped_domains: skipped } render_success(data: @response) end - - private - - def contact_params - params.require(%i[current_contact_id new_contact_id]) - params.permit(:current_contact_id, :new_contact_id) - end end end end diff --git a/app/controllers/repp/v1/domains/base_contacts_controller.rb b/app/controllers/repp/v1/domains/base_contacts_controller.rb new file mode 100644 index 000000000..b601c5313 --- /dev/null +++ b/app/controllers/repp/v1/domains/base_contacts_controller.rb @@ -0,0 +1,31 @@ +module Repp + module V1 + module Domains + class BaseContactsController < BaseController + before_action :set_current_contact, only: [:update] + before_action :set_new_contact, only: [:update] + + def set_current_contact + @current_contact = current_user.registrar.contacts + .find_by!(code: contact_params[:current_contact_id]) + end + + def set_new_contact + @new_contact = current_user.registrar.contacts.find_by!(code: params[:new_contact_id]) + end + + def update + @epp_errors ||= [] + @epp_errors << { code: 2304, msg: 'New contact must be valid' } if @new_contact.invalid? + end + + private + + def contact_params + params.require(%i[current_contact_id new_contact_id]) + params.permit(:current_contact_id, :new_contact_id) + end + end + end + end +end diff --git a/app/controllers/repp/v1/domains/contacts_controller.rb b/app/controllers/repp/v1/domains/contacts_controller.rb index 75404e0c6..131615570 100644 --- a/app/controllers/repp/v1/domains/contacts_controller.rb +++ b/app/controllers/repp/v1/domains/contacts_controller.rb @@ -1,23 +1,9 @@ module Repp module V1 module Domains - class ContactsController < BaseController - before_action :set_current_contact, only: [:update] - before_action :set_new_contact, only: [:update] - - def set_current_contact - @current_contact = current_user.registrar.contacts.find_by!( - code: contact_params[:current_contact_id] - ) - end - - def set_new_contact - @new_contact = current_user.registrar.contacts.find_by!(code: params[:new_contact_id]) - end - + class ContactsController < BaseContactsController def update - @epp_errors ||= [] - @epp_errors << { code: 2304, msg: 'New contact must be valid' } if @new_contact.invalid? + super if @new_contact == @current_contact @epp_errors << { code: 2304, msg: 'New contact must be different from current' } @@ -29,13 +15,6 @@ module Repp @response = { affected_domains: affected, skipped_domains: skipped } render_success(data: @response) end - - private - - def contact_params - params.require(%i[current_contact_id new_contact_id]) - params.permit(:current_contact_id, :new_contact_id) - end end end end diff --git a/app/models/admin_domain_contact.rb b/app/models/admin_domain_contact.rb index d84ac7793..7ccf3efcb 100644 --- a/app/models/admin_domain_contact.rb +++ b/app/models/admin_domain_contact.rb @@ -1,4 +1,6 @@ class AdminDomainContact < DomainContact + # rubocop:disable Metrics/AbcSize + # rubocop:disable Metrics/MethodLength def self.replace(current_contact, new_contact) affected_domains = [] skipped_domains = [] @@ -19,4 +21,6 @@ class AdminDomainContact < DomainContact end [affected_domains.sort, skipped_domains.sort] end + # rubocop:enable Metrics/AbcSize + # rubocop:enable Metrics/MethodLength end diff --git a/app/models/concerns/contact/identical.rb b/app/models/concerns/contact/identical.rb index 1a5516bc5..5327d1704 100644 --- a/app/models/concerns/contact/identical.rb +++ b/app/models/concerns/contact/identical.rb @@ -16,7 +16,7 @@ module Concerns::Contact::Identical ident ident_type ident_country_code - ] + ].freeze private_constant :IDENTIFIABLE_ATTRIBUTES @@ -29,7 +29,7 @@ module Concerns::Contact::Identical def identical_to?(contact) IDENTICAL_ATTRIBUTES.all? do |attribute| - self.attributes[attribute] == contact.attributes[attribute] + attributes[attribute] == contact.attributes[attribute] end end From fbad7b00b27c785365bca23150672303cb66682d Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Fri, 5 Feb 2021 15:12:36 +0500 Subject: [PATCH 25/61] Refactor bulk_change & tech_contact controllers code to be more reusable --- .../registrar/bulk_change_controller.rb | 30 ++++++++++++++++++ .../registrar/tech_contacts_controller.rb | 31 +++---------------- 2 files changed, 34 insertions(+), 27 deletions(-) diff --git a/app/controllers/registrar/bulk_change_controller.rb b/app/controllers/registrar/bulk_change_controller.rb index 801ab0516..218e7dc5d 100644 --- a/app/controllers/registrar/bulk_change_controller.rb +++ b/app/controllers/registrar/bulk_change_controller.rb @@ -26,6 +26,36 @@ class Registrar private + def do_request(request, uri) + if Rails.env.test? + response = Net::HTTP.start(uri.hostname, uri.port, + use_ssl: (uri.scheme == 'https'), + verify_mode: OpenSSL::SSL::VERIFY_NONE) do |http| + http.request(request) + end + elsif Rails.env.development? + client_cert = File.read(ENV['cert_path']) + client_key = File.read(ENV['key_path']) + response = Net::HTTP.start(uri.hostname, uri.port, + use_ssl: (uri.scheme == 'https'), + verify_mode: OpenSSL::SSL::VERIFY_NONE, + cert: OpenSSL::X509::Certificate.new(client_cert), + key: OpenSSL::PKey::RSA.new(client_key)) do |http| + http.request(request) + end + else + client_cert = File.read(ENV['cert_path']) + client_key = File.read(ENV['key_path']) + response = Net::HTTP.start(uri.hostname, uri.port, + use_ssl: (uri.scheme == 'https'), + cert: OpenSSL::X509::Certificate.new(client_cert), + key: OpenSSL::PKey::RSA.new(client_key)) do |http| + http.request(request) + end + end + response + end + def ready_to_renew? domain_ids_for_bulk_renew.present? && params[:renew].present? end diff --git a/app/controllers/registrar/tech_contacts_controller.rb b/app/controllers/registrar/tech_contacts_controller.rb index 001651250..5cb0e8ee6 100644 --- a/app/controllers/registrar/tech_contacts_controller.rb +++ b/app/controllers/registrar/tech_contacts_controller.rb @@ -1,9 +1,11 @@ class Registrar class TechContactsController < BulkChangeController + BASE_URL = URI.parse("#{ENV['repp_url']}domains/contacts").freeze + def update authorize! :manage, :repp - uri = URI.parse("#{ENV['repp_url']}domains/contacts") + uri = BASE_URL request = Net::HTTP::Patch.new(uri) request.set_form_data(current_contact_id: params[:current_contact_id], @@ -11,32 +13,7 @@ class Registrar request.basic_auth(current_registrar_user.username, current_registrar_user.plain_text_password) - if Rails.env.test? - response = Net::HTTP.start(uri.hostname, uri.port, - use_ssl: (uri.scheme == 'https'), - verify_mode: OpenSSL::SSL::VERIFY_NONE) do |http| - http.request(request) - end - elsif Rails.env.development? - client_cert = File.read(ENV['cert_path']) - client_key = File.read(ENV['key_path']) - response = Net::HTTP.start(uri.hostname, uri.port, - use_ssl: (uri.scheme == 'https'), - verify_mode: OpenSSL::SSL::VERIFY_NONE, - cert: OpenSSL::X509::Certificate.new(client_cert), - key: OpenSSL::PKey::RSA.new(client_key)) do |http| - http.request(request) - end - else - client_cert = File.read(ENV['cert_path']) - client_key = File.read(ENV['key_path']) - response = Net::HTTP.start(uri.hostname, uri.port, - use_ssl: (uri.scheme == 'https'), - cert: OpenSSL::X509::Certificate.new(client_cert), - key: OpenSSL::PKey::RSA.new(client_key)) do |http| - http.request(request) - end - end + response = do_request(request, uri) parsed_response = JSON.parse(response.body, symbolize_names: true) From 3979fc5f8f1702dd271200d58393e9d2c33547c0 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Fri, 5 Feb 2021 15:27:10 +0500 Subject: [PATCH 26/61] Fix CC issues --- .../registrar/bulk_change_controller.rb | 82 +++++++++++++------ .../registrar/domain_transfers_controller.rb | 27 +----- .../registrar/nameservers_controller.rb | 27 +----- .../registrar/tech_contacts_controller.rb | 24 ++---- 4 files changed, 65 insertions(+), 95 deletions(-) diff --git a/app/controllers/registrar/bulk_change_controller.rb b/app/controllers/registrar/bulk_change_controller.rb index 218e7dc5d..63d7b6cb1 100644 --- a/app/controllers/registrar/bulk_change_controller.rb +++ b/app/controllers/registrar/bulk_change_controller.rb @@ -26,36 +26,70 @@ class Registrar private - def do_request(request, uri) - if Rails.env.test? - response = Net::HTTP.start(uri.hostname, uri.port, - use_ssl: (uri.scheme == 'https'), - verify_mode: OpenSSL::SSL::VERIFY_NONE) do |http| - http.request(request) - end - elsif Rails.env.development? - client_cert = File.read(ENV['cert_path']) - client_key = File.read(ENV['key_path']) - response = Net::HTTP.start(uri.hostname, uri.port, - use_ssl: (uri.scheme == 'https'), - verify_mode: OpenSSL::SSL::VERIFY_NONE, - cert: OpenSSL::X509::Certificate.new(client_cert), - key: OpenSSL::PKey::RSA.new(client_key)) do |http| - http.request(request) + def process_response(response:, start_notice: "", active_tab:) + parsed_response = JSON.parse(response.body, symbolize_names: true) + + if response.code == '200' + notices = [start_notice] + + notices << "#{t('registrar.tech_contacts.process_request.affected_domains')}: " \ + "#{parsed_response[:data][:affected_domains].join(', ')}" + + if parsed_response[:data][:skipped_domains] + notices << "#{t('registrar.tech_contacts.process_request.skipped_domains')}: " \ + "#{parsed_response[:data][:skipped_domains].join(', ')}" end + + flash[:notice] = notices.join(', ') + redirect_to registrar_domains_url else - client_cert = File.read(ENV['cert_path']) - client_key = File.read(ENV['key_path']) - response = Net::HTTP.start(uri.hostname, uri.port, - use_ssl: (uri.scheme == 'https'), - cert: OpenSSL::X509::Certificate.new(client_cert), - key: OpenSSL::PKey::RSA.new(client_key)) do |http| - http.request(request) - end + @error = response.code == '404' ? 'Contact(s) not found' : parsed_response[:message] + render file: 'registrar/bulk_change/new', locals: { active_tab: active_tab } end + end + + def do_request(request, uri) + response = if Rails.env.test? + do_test_request(request, uri) + elsif Rails.env.development? + do_dev_request(request, uri) + else + do_live_request(request, uri) + end response end + def do_live_request(request, uri) + client_cert = File.read(ENV['cert_path']) + client_key = File.read(ENV['key_path']) + Net::HTTP.start(uri.hostname, uri.port, + use_ssl: (uri.scheme == 'https'), + cert: OpenSSL::X509::Certificate.new(client_cert), + key: OpenSSL::PKey::RSA.new(client_key)) do |http| + http.request(request) + end + end + + def do_dev_request(request, uri) + client_cert = File.read(ENV['cert_path']) + client_key = File.read(ENV['key_path']) + Net::HTTP.start(uri.hostname, uri.port, + use_ssl: (uri.scheme == 'https'), + verify_mode: OpenSSL::SSL::VERIFY_NONE, + cert: OpenSSL::X509::Certificate.new(client_cert), + key: OpenSSL::PKey::RSA.new(client_key)) do |http| + http.request(request) + end + end + + def do_test_request(request, uri) + Net::HTTP.start(uri.hostname, uri.port, + use_ssl: (uri.scheme == 'https'), + verify_mode: OpenSSL::SSL::VERIFY_NONE) do |http| + http.request(request) + end + end + def ready_to_renew? domain_ids_for_bulk_renew.present? && params[:renew].present? end diff --git a/app/controllers/registrar/domain_transfers_controller.rb b/app/controllers/registrar/domain_transfers_controller.rb index 584a50d33..e055c38d8 100644 --- a/app/controllers/registrar/domain_transfers_controller.rb +++ b/app/controllers/registrar/domain_transfers_controller.rb @@ -25,32 +25,7 @@ class Registrar current_registrar_user.plain_text_password) - if Rails.env.test? - response = Net::HTTP.start(uri.hostname, uri.port, - use_ssl: (uri.scheme == 'https'), - verify_mode: OpenSSL::SSL::VERIFY_NONE) do |http| - http.request(request) - end - elsif Rails.env.development? - client_cert = File.read(ENV['cert_path']) - client_key = File.read(ENV['key_path']) - response = Net::HTTP.start(uri.hostname, uri.port, - use_ssl: (uri.scheme == 'https'), - verify_mode: OpenSSL::SSL::VERIFY_NONE, - cert: OpenSSL::X509::Certificate.new(client_cert), - key: OpenSSL::PKey::RSA.new(client_key)) do |http| - http.request(request) - end - else - client_cert = File.read(ENV['cert_path']) - client_key = File.read(ENV['key_path']) - response = Net::HTTP.start(uri.hostname, uri.port, - use_ssl: (uri.scheme == 'https'), - cert: OpenSSL::X509::Certificate.new(client_cert), - key: OpenSSL::PKey::RSA.new(client_key)) do |http| - http.request(request) - end - end + response = do_request(request, uri) parsed_response = JSON.parse(response.body, symbolize_names: true) diff --git a/app/controllers/registrar/nameservers_controller.rb b/app/controllers/registrar/nameservers_controller.rb index 52c43bb1d..3eb23cd48 100644 --- a/app/controllers/registrar/nameservers_controller.rb +++ b/app/controllers/registrar/nameservers_controller.rb @@ -18,32 +18,7 @@ class Registrar request.basic_auth(current_registrar_user.username, current_registrar_user.plain_text_password) - if Rails.env.test? - response = Net::HTTP.start(uri.hostname, uri.port, - use_ssl: (uri.scheme == 'https'), - verify_mode: OpenSSL::SSL::VERIFY_NONE) do |http| - http.request(request) - end - elsif Rails.env.development? - client_cert = File.read(ENV['cert_path']) - client_key = File.read(ENV['key_path']) - response = Net::HTTP.start(uri.hostname, uri.port, - use_ssl: (uri.scheme == 'https'), - verify_mode: OpenSSL::SSL::VERIFY_NONE, - cert: OpenSSL::X509::Certificate.new(client_cert), - key: OpenSSL::PKey::RSA.new(client_key)) do |http| - http.request(request) - end - else - client_cert = File.read(ENV['cert_path']) - client_key = File.read(ENV['key_path']) - response = Net::HTTP.start(uri.hostname, uri.port, - use_ssl: (uri.scheme == 'https'), - cert: OpenSSL::X509::Certificate.new(client_cert), - key: OpenSSL::PKey::RSA.new(client_key)) do |http| - http.request(request) - end - end + response = do_request(request, uri) parsed_response = JSON.parse(response.body, symbolize_names: true) diff --git a/app/controllers/registrar/tech_contacts_controller.rb b/app/controllers/registrar/tech_contacts_controller.rb index 5cb0e8ee6..90dc333f6 100644 --- a/app/controllers/registrar/tech_contacts_controller.rb +++ b/app/controllers/registrar/tech_contacts_controller.rb @@ -1,12 +1,12 @@ class Registrar class TechContactsController < BulkChangeController BASE_URL = URI.parse("#{ENV['repp_url']}domains/contacts").freeze + ACTIVE_TAB = :technical_contact def update authorize! :manage, :repp uri = BASE_URL - request = Net::HTTP::Patch.new(uri) request.set_form_data(current_contact_id: params[:current_contact_id], new_contact_id: params[:new_contact_id]) @@ -15,25 +15,11 @@ class Registrar response = do_request(request, uri) - parsed_response = JSON.parse(response.body, symbolize_names: true) + start_notice = t('registrar.tech_contacts.process_request.replaced') - if response.code == '200' - notices = [t('.replaced')] - - notices << "#{t('.affected_domains')}: " \ - "#{parsed_response[:data][:affected_domains].join(', ')}" - - if parsed_response[:data][:skipped_domains] - notices << "#{t('.skipped_domains')}: " \ - "#{parsed_response[:data][:skipped_domains].join(', ')}" - end - - flash[:notice] = notices.join(', ') - redirect_to registrar_domains_url - else - @error = response.code == '404' ? 'Contact(s) not found' : parsed_response[:message] - render file: 'registrar/bulk_change/new', locals: { active_tab: :technical_contact } - end + process_response(response: response, + start_notice: start_notice, + active_tab: ACTIVE_TAB) end end end From 489cd2f7e50da44f7a42f923f71466680be69522 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Fri, 5 Feb 2021 15:59:34 +0500 Subject: [PATCH 27/61] Fix i18n --- .../registrar/bulk_change_controller.rb | 25 +++++++++++-------- .../registrar/tech_contacts_controller.rb | 2 +- config/locales/registrar/bulk_change.en.yml | 3 +++ config/locales/registrar/tech_contacts.en.yml | 4 +++ 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/app/controllers/registrar/bulk_change_controller.rb b/app/controllers/registrar/bulk_change_controller.rb index 63d7b6cb1..b11883d6a 100644 --- a/app/controllers/registrar/bulk_change_controller.rb +++ b/app/controllers/registrar/bulk_change_controller.rb @@ -26,19 +26,11 @@ class Registrar private - def process_response(response:, start_notice: "", active_tab:) + def process_response(response:, start_notice: '', active_tab:) parsed_response = JSON.parse(response.body, symbolize_names: true) if response.code == '200' - notices = [start_notice] - - notices << "#{t('registrar.tech_contacts.process_request.affected_domains')}: " \ - "#{parsed_response[:data][:affected_domains].join(', ')}" - - if parsed_response[:data][:skipped_domains] - notices << "#{t('registrar.tech_contacts.process_request.skipped_domains')}: " \ - "#{parsed_response[:data][:skipped_domains].join(', ')}" - end + notices = success_notices(parsed_response, start_notice) flash[:notice] = notices.join(', ') redirect_to registrar_domains_url @@ -48,6 +40,19 @@ class Registrar end end + def success_notices(parsed_response, start_notice) + notices = [start_notice] + + notices << "#{t('.affected_domains')}: " \ + "#{parsed_response[:data][:affected_domains].join(', ')}" + + if parsed_response[:data][:skipped_domains] + notices << "#{t('.skipped_domains')}: " \ + "#{parsed_response[:data][:skipped_domains].join(', ')}" + end + notices + end + def do_request(request, uri) response = if Rails.env.test? do_test_request(request, uri) diff --git a/app/controllers/registrar/tech_contacts_controller.rb b/app/controllers/registrar/tech_contacts_controller.rb index 90dc333f6..3cddb5f36 100644 --- a/app/controllers/registrar/tech_contacts_controller.rb +++ b/app/controllers/registrar/tech_contacts_controller.rb @@ -15,7 +15,7 @@ class Registrar response = do_request(request, uri) - start_notice = t('registrar.tech_contacts.process_request.replaced') + start_notice = t('.replaced') process_response(response: response, start_notice: start_notice, diff --git a/config/locales/registrar/bulk_change.en.yml b/config/locales/registrar/bulk_change.en.yml index 75becfada..58d5fce97 100644 --- a/config/locales/registrar/bulk_change.en.yml +++ b/config/locales/registrar/bulk_change.en.yml @@ -4,6 +4,7 @@ en: new: header: Bulk change technical_contact: Technical contact + admin_contact: Admin contact nameserver: Nameserver bulk_transfer: Bulk transfer bulk_renew: Bulk renew @@ -38,3 +39,5 @@ en: domain_ids: Domains for bulk renewal current_balance: Current balance period: Period + affected_domains: Affected domains + skipped_domains: Skipped domains diff --git a/config/locales/registrar/tech_contacts.en.yml b/config/locales/registrar/tech_contacts.en.yml index bf57f0cc7..b6e5d041b 100644 --- a/config/locales/registrar/tech_contacts.en.yml +++ b/config/locales/registrar/tech_contacts.en.yml @@ -5,3 +5,7 @@ en: replaced: Technical contacts have been successfully replaced. affected_domains: Affected domains skipped_domains: Skipped domains + process_request: + affected_domains: Affected domains + skipped_domains: Skipped domains + replaced: Technical contacts have been successfully replaced. From fca12fdb34f57550daa6b7623383a5720a16e25a Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Fri, 5 Feb 2021 16:51:38 +0500 Subject: [PATCH 28/61] Add a view and routes --- .codeclimate.yml | 6 +- .../registrar/admin_contacts_controller.rb | 19 ++++++ .../registrar/bulk_change_controller.rb | 9 +++ .../registrar/tech_contacts_controller.rb | 8 +-- .../bulk_change/_admin_contact_form.html.erb | 60 +++++++++++++++++++ app/views/registrar/bulk_change/new.html.erb | 9 +++ .../locales/registrar/admin_contacts.en.yml | 6 ++ config/locales/registrar/bulk_change.en.yml | 10 ++++ config/routes.rb | 1 + 9 files changed, 119 insertions(+), 9 deletions(-) create mode 100644 app/controllers/registrar/admin_contacts_controller.rb create mode 100644 app/views/registrar/bulk_change/_admin_contact_form.html.erb create mode 100644 config/locales/registrar/admin_contacts.en.yml diff --git a/.codeclimate.yml b/.codeclimate.yml index 2324522fc..31da9b9cb 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -16,8 +16,10 @@ plugins: enabled: true config: languages: - - ruby - - javascript + ruby: + mass_threshold: 100 + javascript: + mass_threshold: 100 eslint: enabled: true channel: eslint-5 diff --git a/app/controllers/registrar/admin_contacts_controller.rb b/app/controllers/registrar/admin_contacts_controller.rb new file mode 100644 index 000000000..55cfbae9e --- /dev/null +++ b/app/controllers/registrar/admin_contacts_controller.rb @@ -0,0 +1,19 @@ +class Registrar + class AdminContactsController < BulkChangeController + BASE_URL = URI.parse("#{ENV['repp_url']}domains/admin_contacts").freeze + ACTIVE_TAB = :admin_contact + + def update + authorize! :manage, :repp + + uri = BASE_URL + request = form_request(uri) + response = do_request(request, uri) + start_notice = t('.replaced') + + process_response(response: response, + start_notice: start_notice, + active_tab: ACTIVE_TAB) + end + end +end diff --git a/app/controllers/registrar/bulk_change_controller.rb b/app/controllers/registrar/bulk_change_controller.rb index b11883d6a..74bbf89e8 100644 --- a/app/controllers/registrar/bulk_change_controller.rb +++ b/app/controllers/registrar/bulk_change_controller.rb @@ -26,6 +26,15 @@ class Registrar private + def form_request(uri) + request = Net::HTTP::Patch.new(uri) + request.set_form_data(current_contact_id: params[:current_contact_id], + new_contact_id: params[:new_contact_id]) + request.basic_auth(current_registrar_user.username, + current_registrar_user.plain_text_password) + request + end + def process_response(response:, start_notice: '', active_tab:) parsed_response = JSON.parse(response.body, symbolize_names: true) diff --git a/app/controllers/registrar/tech_contacts_controller.rb b/app/controllers/registrar/tech_contacts_controller.rb index 3cddb5f36..cc9238730 100644 --- a/app/controllers/registrar/tech_contacts_controller.rb +++ b/app/controllers/registrar/tech_contacts_controller.rb @@ -7,14 +7,8 @@ class Registrar authorize! :manage, :repp uri = BASE_URL - request = Net::HTTP::Patch.new(uri) - request.set_form_data(current_contact_id: params[:current_contact_id], - new_contact_id: params[:new_contact_id]) - request.basic_auth(current_registrar_user.username, - current_registrar_user.plain_text_password) - + request = form_request(uri) response = do_request(request, uri) - start_notice = t('.replaced') process_response(response: response, diff --git a/app/views/registrar/bulk_change/_admin_contact_form.html.erb b/app/views/registrar/bulk_change/_admin_contact_form.html.erb new file mode 100644 index 000000000..d8b4beb55 --- /dev/null +++ b/app/views/registrar/bulk_change/_admin_contact_form.html.erb @@ -0,0 +1,60 @@ +<%= form_tag registrar_admin_contacts_path, method: :patch, class: 'form-horizontal' do %> + <% if @error %> +
+ <%= @error %> +
+ <% end %> + +
+
+ <%= label_tag :current_contact_id, t('.current_contact_id') %> +
+ +
+ <%= text_field_tag :current_contact_id, params[:current_contact_id], + list: :contacts, + required: true, + autofocus: true, + class: 'form-control' %> +
+
+ +
+
+ <%= label_tag :new_contact_id, t('.new_contact_id') %> +
+ +
+ <%= text_field_tag :new_contact_id, params[:new_contact_id], + list: :contacts, + required: true, + class: 'form-control' %> +
+
+ +
+
+ +
+
+ +
+
+ <%= t '.help_btn' %> +
+
+ <%= t '.help' %> +
+
+
+
+<% end %> + + + <% available_contacts.each do |data| %> + + <% end %> + diff --git a/app/views/registrar/bulk_change/new.html.erb b/app/views/registrar/bulk_change/new.html.erb index e61270b6d..f3095a53d 100644 --- a/app/views/registrar/bulk_change/new.html.erb +++ b/app/views/registrar/bulk_change/new.html.erb @@ -12,6 +12,10 @@ <%= t '.technical_contact' %> +
  • + <%= t '.admin_contact' %> +
    • +
  • <%= t '.nameserver' %>
    • @@ -31,6 +35,11 @@ <%= render 'tech_contact_form', available_contacts: available_contacts %> +
    + <%= render 'admin_contact_form', available_contacts: available_contacts %> +
    +
    <%= render 'nameserver_form' %>
    diff --git a/config/locales/registrar/admin_contacts.en.yml b/config/locales/registrar/admin_contacts.en.yml new file mode 100644 index 000000000..9265a6d10 --- /dev/null +++ b/config/locales/registrar/admin_contacts.en.yml @@ -0,0 +1,6 @@ +en: + registrar: + admin_contacts: + update: + replaced: Admin contacts have been successfully replaced. + replaced: Technical contacts have been successfully replaced. diff --git a/config/locales/registrar/bulk_change.en.yml b/config/locales/registrar/bulk_change.en.yml index 58d5fce97..6bd7fd84c 100644 --- a/config/locales/registrar/bulk_change.en.yml +++ b/config/locales/registrar/bulk_change.en.yml @@ -18,6 +18,16 @@ en: Replace technical contact specified in "current contact ID" with the one in "new contact ID" on any domain registered under this registrar + admin_contact_form: + current_contact_id: Current admin contact ID + new_contact_id: New admin contact ID + submit_btn: Replace admin contacts + help_btn: Toggle help + help: >- + Replace admin contact specified in "current contact ID" with the one in "new + contact ID" on any domain registered under this registrar. Contact idents must + be the same + nameserver_form: ip_hint: One IP per line replace_btn: Replace nameserver diff --git a/config/routes.rb b/config/routes.rb index 16102f2b6..2c9590477 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -137,6 +137,7 @@ Rails.application.routes.draw do resource :bulk_change, controller: :bulk_change, only: :new post '/bulk_renew/new', to: 'bulk_change#bulk_renew', as: :bulk_renew resource :tech_contacts, only: :update + resource :admin_contacts, only: :update resource :nameservers, only: :update resources :contacts, constraints: {:id => /[^\/]+(?=#{ ActionController::Renderers::RENDERERS.map{|e| "\\.#{e}\\z"}.join("|") })|[^\/]+/} do member do From e5c41cf531d99137e68abfd3ad463ecfbf646475 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Mon, 8 Feb 2021 14:53:54 +0500 Subject: [PATCH 29/61] Fix tests --- .../registrar/bulk_change/_admin_contact_form.html.erb | 4 ++-- .../registrar/bulk_change/_tech_contact_form.html.erb | 4 ++-- .../registrar_area/bulk_change/tech_contact_test.rb | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/registrar/bulk_change/_admin_contact_form.html.erb b/app/views/registrar/bulk_change/_admin_contact_form.html.erb index d8b4beb55..bb682aa60 100644 --- a/app/views/registrar/bulk_change/_admin_contact_form.html.erb +++ b/app/views/registrar/bulk_change/_admin_contact_form.html.erb @@ -10,7 +10,7 @@ <%= label_tag :current_contact_id, t('.current_contact_id') %> -
    +
    <%= text_field_tag :current_contact_id, params[:current_contact_id], list: :contacts, required: true, @@ -24,7 +24,7 @@ <%= label_tag :new_contact_id, t('.new_contact_id') %>
    -
    +
    <%= text_field_tag :new_contact_id, params[:new_contact_id], list: :contacts, required: true, diff --git a/app/views/registrar/bulk_change/_tech_contact_form.html.erb b/app/views/registrar/bulk_change/_tech_contact_form.html.erb index 2848e3634..789db92ba 100644 --- a/app/views/registrar/bulk_change/_tech_contact_form.html.erb +++ b/app/views/registrar/bulk_change/_tech_contact_form.html.erb @@ -10,7 +10,7 @@ <%= label_tag :current_contact_id, t('.current_contact_id') %>
    -
    +
    <%= text_field_tag :current_contact_id, params[:current_contact_id], list: :contacts, required: true, @@ -24,7 +24,7 @@ <%= label_tag :new_contact_id, t('.new_contact_id') %>
    -
    +
    <%= text_field_tag :new_contact_id, params[:new_contact_id], list: :contacts, required: true, diff --git a/test/system/registrar_area/bulk_change/tech_contact_test.rb b/test/system/registrar_area/bulk_change/tech_contact_test.rb index e08457f60..055ec25ca 100644 --- a/test/system/registrar_area/bulk_change/tech_contact_test.rb +++ b/test/system/registrar_area/bulk_change/tech_contact_test.rb @@ -16,8 +16,8 @@ class RegistrarAreaTechContactBulkChangeTest < ApplicationSystemTestCase visit registrar_domains_url click_link 'Bulk change' - fill_in 'Current contact ID', with: 'william-001' - fill_in 'New contact ID', with: 'john-001' + find('.current_tech_contact').fill_in 'Current contact ID', with: 'william-001' + find('.new_tech_contact').fill_in 'New contact ID', with: 'john-001' click_on 'Replace technical contacts' assert_requested request_stub @@ -36,8 +36,8 @@ class RegistrarAreaTechContactBulkChangeTest < ApplicationSystemTestCase visit registrar_domains_url click_link 'Bulk change' - fill_in 'Current contact ID', with: 'william-001' - fill_in 'New contact ID', with: 'john-001' + find('.current_tech_contact').fill_in 'Current contact ID', with: 'william-001' + find('.new_tech_contact').fill_in 'New contact ID', with: 'john-001' click_on 'Replace technical contacts' assert_text 'epic fail' From 9611df92b0f0f1a86cddd05069dd9211144d2941 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Mon, 8 Feb 2021 15:35:46 +0500 Subject: [PATCH 30/61] Add system test & fix locale --- .../registrar/admin_contacts_controller.rb | 1 - config/locales/registrar/admin_contacts.yml | 11 +++++ .../bulk_change/admin_contact_test.rb | 49 +++++++++++++++++++ 3 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 config/locales/registrar/admin_contacts.yml create mode 100644 test/system/registrar_area/bulk_change/admin_contact_test.rb diff --git a/app/controllers/registrar/admin_contacts_controller.rb b/app/controllers/registrar/admin_contacts_controller.rb index 55cfbae9e..a1400b6dc 100644 --- a/app/controllers/registrar/admin_contacts_controller.rb +++ b/app/controllers/registrar/admin_contacts_controller.rb @@ -5,7 +5,6 @@ class Registrar def update authorize! :manage, :repp - uri = BASE_URL request = form_request(uri) response = do_request(request, uri) diff --git a/config/locales/registrar/admin_contacts.yml b/config/locales/registrar/admin_contacts.yml new file mode 100644 index 000000000..d258b4275 --- /dev/null +++ b/config/locales/registrar/admin_contacts.yml @@ -0,0 +1,11 @@ +en: + registrar: + admin_contacts: + update: + replaced: Admin contacts have been successfully replaced. + affected_domains: Affected domains + skipped_domains: Skipped domains + process_request: + affected_domains: Affected domains + skipped_domains: Skipped domains + replaced: Admin contacts have been successfully replaced. diff --git a/test/system/registrar_area/bulk_change/admin_contact_test.rb b/test/system/registrar_area/bulk_change/admin_contact_test.rb new file mode 100644 index 000000000..8847812cb --- /dev/null +++ b/test/system/registrar_area/bulk_change/admin_contact_test.rb @@ -0,0 +1,49 @@ +require 'application_system_test_case' + +class RegistrarAreaAdminContactBulkChangeTest < ApplicationSystemTestCase + setup do + sign_in users(:api_bestnames) + end + + def test_replace_domain_contacts_of_current_registrar + request_stub = stub_request(:patch, /domains\/admin_contacts/) + .with(body: { current_contact_id: 'william-001', new_contact_id: 'john-001' }, + basic_auth: ['test_bestnames', 'testtest']) + .to_return(body: { data: { affected_domains: %w[foo.test bar.test], + skipped_domains: %w[baz.test qux.test] } }.to_json, + status: 200) + + visit registrar_domains_url + click_link 'Bulk change' + click_link 'Admin contact' + + find('.current_admin_contact').fill_in 'Current contact ID', with: 'william-001' + find('.new_admin_contact').fill_in 'New contact ID', with: 'john-001' + click_on 'Replace admin contacts' + + assert_requested request_stub + assert_current_path registrar_domains_path + assert_text 'Admin contacts have been successfully replaced' + assert_text 'Affected domains: foo.test, bar.test' + assert_text 'Skipped domains: baz.test, qux.test' + end + + def test_fails_gracefully + stub_request(:patch, /domains\/admin_contacts/) + .to_return(status: 400, + body: { message: 'epic fail' }.to_json, + headers: { 'Content-type' => Mime[:json] }) + + visit registrar_domains_url + click_link 'Bulk change' + click_link 'Admin contact' + + find('.current_admin_contact').fill_in 'Current contact ID', with: 'william-001' + find('.new_admin_contact').fill_in 'New contact ID', with: 'john-001' + click_on 'Replace admin contacts' + + assert_text 'epic fail' + assert_field 'Current contact ID', with: 'william-001' + assert_field 'New contact ID', with: 'john-001' + end +end From 6304ebdbc63605fa152b47966dc64fcab040301a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Mon, 8 Feb 2021 16:28:04 +0200 Subject: [PATCH 31/61] Add Amazon SDK gem --- Gemfile | 2 ++ Gemfile.lock | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/Gemfile b/Gemfile index dd879a11b..2d156c829 100644 --- a/Gemfile +++ b/Gemfile @@ -92,3 +92,5 @@ group :test do gem 'webdrivers' gem 'webmock' end + +gem "aws-sdk-ses", "~> 1.37" diff --git a/Gemfile.lock b/Gemfile.lock index 51c880c9e..01408ebd7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -148,6 +148,18 @@ GEM attr_required (1.0.1) autoprefixer-rails (10.0.0.2) execjs + aws-eventstream (1.1.0) + aws-partitions (1.424.0) + aws-sdk-core (3.112.0) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.239.0) + aws-sigv4 (~> 1.1) + jmespath (~> 1.0) + aws-sdk-ses (1.37.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.2.2) + aws-eventstream (~> 1, >= 1.0.2) bcrypt (3.1.16) bindata (2.4.8) bootsnap (1.4.8) @@ -226,6 +238,7 @@ GEM i18n_data (0.10.0) isikukood (0.1.2) iso8601 (0.12.1) + jmespath (1.4.0) jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) @@ -484,6 +497,7 @@ DEPENDENCIES active_interaction (~> 3.8) activerecord-import airbrake + aws-sdk-ses (~> 1.37) bootsnap (>= 1.1.0) bootstrap-sass (~> 3.4) cancancan From 2af0bfdda04f5427080385507f2faf8a31e7e783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Mon, 8 Feb 2021 16:52:31 +0200 Subject: [PATCH 32/61] BouncedMailAddress: Remove from AWS suppression list upon destroy --- Gemfile | 2 +- Gemfile.lock | 4 ++-- app/models/bounced_mail_address.rb | 17 +++++++++++++++++ config/initializers/aws_ses.rb | 4 ++++ 4 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 config/initializers/aws_ses.rb diff --git a/Gemfile b/Gemfile index 2d156c829..79862bd69 100644 --- a/Gemfile +++ b/Gemfile @@ -93,4 +93,4 @@ group :test do gem 'webmock' end -gem "aws-sdk-ses", "~> 1.37" +gem "aws-sdk-sesv2", "~> 1.16" diff --git a/Gemfile.lock b/Gemfile.lock index 01408ebd7..08daf4226 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -155,7 +155,7 @@ GEM aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ses (1.37.0) + aws-sdk-sesv2 (1.16.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sigv4 (1.2.2) @@ -497,7 +497,7 @@ DEPENDENCIES active_interaction (~> 3.8) activerecord-import airbrake - aws-sdk-ses (~> 1.37) + aws-sdk-sesv2 (~> 1.16) bootsnap (>= 1.1.0) bootstrap-sass (~> 3.4) cancancan diff --git a/app/models/bounced_mail_address.rb b/app/models/bounced_mail_address.rb index 73c6a0941..d0411a6c9 100644 --- a/app/models/bounced_mail_address.rb +++ b/app/models/bounced_mail_address.rb @@ -1,5 +1,6 @@ class BouncedMailAddress < ApplicationRecord validates :email, :message_id, :bounce_type, :bounce_subtype, :action, :status, presence: true + after_destroy :destroy_aws_suppression def bounce_reason "#{action} (#{status} #{diagnostic})" @@ -25,4 +26,20 @@ class BouncedMailAddress < ApplicationRecord diagnostic: bounced_record['diagnosticCode'], } end + + def destroy_aws_suppression + return unless BouncedMailAddress.ses_configured? + + res = Aws::SESV2::Client.new.delete_suppressed_destination({ email_address: email }) + res.successful? + rescue Aws::SESV2::Errors::ServiceError => e + logger.warn("Suppression not removed. #{e}") + end + + def self.ses_configured? + ses ||= Aws::SES::Client.new + ses.config.credentials.access_key_id.present? + rescue Aws::Errors::MissingRegionError + false + end end diff --git a/config/initializers/aws_ses.rb b/config/initializers/aws_ses.rb new file mode 100644 index 000000000..baa148e65 --- /dev/null +++ b/config/initializers/aws_ses.rb @@ -0,0 +1,4 @@ +Aws.config.update( + region: ENV['aws_default_region'], + credentials: Aws::Credentials.new(ENV['aws_access_key_id'], ENV['aws_secret_access_key']) +) From f6fd10b01767bb3aa0421200ef9901ad0d387042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Mon, 8 Feb 2021 16:57:16 +0200 Subject: [PATCH 33/61] Fix CC issues --- Gemfile | 2 +- app/models/bounced_mail_address.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 79862bd69..82a0b4666 100644 --- a/Gemfile +++ b/Gemfile @@ -93,4 +93,4 @@ group :test do gem 'webmock' end -gem "aws-sdk-sesv2", "~> 1.16" +gem 'aws-sdk-sesv2', '~> 1.16' diff --git a/app/models/bounced_mail_address.rb b/app/models/bounced_mail_address.rb index d0411a6c9..db4413829 100644 --- a/app/models/bounced_mail_address.rb +++ b/app/models/bounced_mail_address.rb @@ -30,14 +30,14 @@ class BouncedMailAddress < ApplicationRecord def destroy_aws_suppression return unless BouncedMailAddress.ses_configured? - res = Aws::SESV2::Client.new.delete_suppressed_destination({ email_address: email }) + res = Aws::SESV2::Client.new.delete_suppressed_destination(email_address: email) res.successful? rescue Aws::SESV2::Errors::ServiceError => e logger.warn("Suppression not removed. #{e}") end def self.ses_configured? - ses ||= Aws::SES::Client.new + ses ||= Aws::SESV2::Client.new ses.config.credentials.access_key_id.present? rescue Aws::Errors::MissingRegionError false From c7b40450184f959472bd25bc1017a593eb1e7ffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Tue, 9 Feb 2021 11:46:47 +0200 Subject: [PATCH 34/61] Contact: Append prefix unless present --- app/controllers/epp/contacts_controller.rb | 6 +++++- test/integration/epp/contact/info/base_test.rb | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/controllers/epp/contacts_controller.rb b/app/controllers/epp/contacts_controller.rb index 85305213b..a0c3f503f 100644 --- a/app/controllers/epp/contacts_controller.rb +++ b/app/controllers/epp/contacts_controller.rb @@ -93,7 +93,11 @@ module Epp def find_contact code = params[:parsed_frame].css('id').text.strip.upcase - @contact = Epp::Contact.find_by!(code: code) + reg_code = current_user.registrar.code.upcase + arr = [code, "#{reg_code}:#{code}", "CID:#{code}", "CID:#{reg_code}:#{code}"] + + contact = arr.find { |c| Epp::Contact.find_by(code: c).present? } + @contact = Epp::Contact.find_by!(code: contact || code) end # diff --git a/test/integration/epp/contact/info/base_test.rb b/test/integration/epp/contact/info/base_test.rb index 4b4cb017f..3edb6d461 100644 --- a/test/integration/epp/contact/info/base_test.rb +++ b/test/integration/epp/contact/info/base_test.rb @@ -71,8 +71,8 @@ class EppContactInfoBaseTest < EppTestCase end def test_get_info_about_contact_without_prefix - @contact.update_columns(code: 'TEST:JOHN-001') - assert @contact.code, 'TEST:JOHN-001' + @contact.update_columns(code: "#{@contact.registrar.code}:JOHN-001".upcase) + assert @contact.code, "#{@contact.registrar.code}:JOHN-001".upcase request_xml = <<-XML @@ -92,7 +92,7 @@ class EppContactInfoBaseTest < EppTestCase response_xml = Nokogiri::XML(response.body) assert_epp_response :completed_successfully - assert_equal 'TEST:JOHN-001', response_xml.at_xpath('//contact:id', contact: xml_schema).text + assert_equal "#{@contact.registrar.code}:JOHN-001".upcase, response_xml.at_xpath('//contact:id', contact: xml_schema).text assert_equal '+555.555', response_xml.at_xpath('//contact:voice', contact: xml_schema).text end From b892927f11c98b961cae8d33ee3daa605a966600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20V=C3=B5hmar?= Date: Tue, 9 Feb 2021 16:12:57 +0200 Subject: [PATCH 35/61] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 064905ba7..891059845 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +09.02.2021 +* Added new endpoint for WHOIS contact requests [#1794](https://github.com/internetee/registry/pull/1794) + 05.02.2021 * Fixed IPv4 empty string issue in case of IPv6 only entries for IP whitelist [#1833](https://github.com/internetee/registry/issues/1833) From aefb7e42aea9611db582d9f892cb574f46c1d31a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Tue, 9 Feb 2021 16:27:15 +0200 Subject: [PATCH 36/61] Registry lock: Notify Registrar by EPP notification --- app/models/concerns/domain/registry_lockable.rb | 12 ++++++++++++ config/locales/notifications.en.yml | 2 ++ test/jobs/domain_update_confirm_job_test.rb | 6 +++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/models/concerns/domain/registry_lockable.rb b/app/models/concerns/domain/registry_lockable.rb index 4a759296d..4190722f3 100644 --- a/app/models/concerns/domain/registry_lockable.rb +++ b/app/models/concerns/domain/registry_lockable.rb @@ -12,6 +12,7 @@ module Concerns statuses << DomainStatus::SERVER_DELETE_PROHIBITED statuses << DomainStatus::SERVER_TRANSFER_PROHIBITED self.locked_by_registrant_at = Time.zone.now + alert_registrar_lock_changes! save! end @@ -42,10 +43,21 @@ module Concerns statuses.delete(DomainStatus::SERVER_DELETE_PROHIBITED) statuses.delete(DomainStatus::SERVER_TRANSFER_PROHIBITED) self.locked_by_registrant_at = nil + alert_registrar_lock_changes! save! end end + + def alert_registrar_lock_changes! + translation = locked_by_registrant? ? 'locked' : 'unlocked' + registrar.notifications.create!( + text: I18n.t("notifications.texts.registrar_#{translation}", + domain_name: domain.name), + attached_obj_id: name, + attached_obj_type: self.class.name + ) + end end end end diff --git a/config/locales/notifications.en.yml b/config/locales/notifications.en.yml index 1dff4a97c..d67fb5a5b 100644 --- a/config/locales/notifications.en.yml +++ b/config/locales/notifications.en.yml @@ -6,3 +6,5 @@ en: It was associated with registrant %{old_registrant_code} and contacts %{old_contacts_codes}. contact_update: Contact %{contact} has been updated by registrant + registrar_locked: Domain %{domain_name} has been locked by registrant + registrar_unlocked: Domain %{domain_name} has been unlocked by registrant diff --git a/test/jobs/domain_update_confirm_job_test.rb b/test/jobs/domain_update_confirm_job_test.rb index 51c42aa4f..dc6e14bf9 100644 --- a/test/jobs/domain_update_confirm_job_test.rb +++ b/test/jobs/domain_update_confirm_job_test.rb @@ -18,11 +18,11 @@ class DomainUpdateConfirmJobTest < ActiveSupport::TestCase super end - def test_registrant_locked_domain + def test_registrant_locked_domain refute @domain.locked_by_registrant? @domain.apply_registry_lock assert @domain.locked_by_registrant? - assert_equal(@domain.registrar.notifications.last.text, 'Domain has been locked by registrant') + assert_equal(@domain.registrar.notifications.last.text, "Domain #{@domain.name} has been unlocked by registrant") end def test_registrant_unlocked_domain @@ -31,7 +31,7 @@ class DomainUpdateConfirmJobTest < ActiveSupport::TestCase assert @domain.locked_by_registrant? @domain.remove_registry_lock refute @domain.locked_by_registrant? - assert_equal(@domain.registrar.notifications.last.text, 'Domain has been unlocked by registrant') + assert_equal(@domain.registrar.notifications.last.text, "Domain #{@domain.name} has been unlocked by registrant") end def test_rejected_registrant_verification_notifies_registrar From 66dfa730ec1c8f3a00d94c51b37d3088f71a5ed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Tue, 9 Feb 2021 16:27:15 +0200 Subject: [PATCH 37/61] Registry lock: Notify Registrar by EPP notification --- app/models/concerns/domain/registry_lockable.rb | 12 ++++++++++++ config/locales/notifications.en.yml | 2 ++ test/jobs/domain_update_confirm_job_test.rb | 6 +++--- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/models/concerns/domain/registry_lockable.rb b/app/models/concerns/domain/registry_lockable.rb index 4a759296d..ccb0f305e 100644 --- a/app/models/concerns/domain/registry_lockable.rb +++ b/app/models/concerns/domain/registry_lockable.rb @@ -12,6 +12,7 @@ module Concerns statuses << DomainStatus::SERVER_DELETE_PROHIBITED statuses << DomainStatus::SERVER_TRANSFER_PROHIBITED self.locked_by_registrant_at = Time.zone.now + alert_registrar_lock_changes! save! end @@ -42,10 +43,21 @@ module Concerns statuses.delete(DomainStatus::SERVER_DELETE_PROHIBITED) statuses.delete(DomainStatus::SERVER_TRANSFER_PROHIBITED) self.locked_by_registrant_at = nil + alert_registrar_lock_changes! save! end end + + def alert_registrar_lock_changes! + translation = locked_by_registrant? ? 'locked' : 'unlocked' + registrar.notifications.create!( + text: I18n.t("notifications.texts.registrar_#{translation}", + domain_name: name), + attached_obj_id: name, + attached_obj_type: self.class.name + ) + end end end end diff --git a/config/locales/notifications.en.yml b/config/locales/notifications.en.yml index 1dff4a97c..d67fb5a5b 100644 --- a/config/locales/notifications.en.yml +++ b/config/locales/notifications.en.yml @@ -6,3 +6,5 @@ en: It was associated with registrant %{old_registrant_code} and contacts %{old_contacts_codes}. contact_update: Contact %{contact} has been updated by registrant + registrar_locked: Domain %{domain_name} has been locked by registrant + registrar_unlocked: Domain %{domain_name} has been unlocked by registrant diff --git a/test/jobs/domain_update_confirm_job_test.rb b/test/jobs/domain_update_confirm_job_test.rb index 51c42aa4f..dc6e14bf9 100644 --- a/test/jobs/domain_update_confirm_job_test.rb +++ b/test/jobs/domain_update_confirm_job_test.rb @@ -18,11 +18,11 @@ class DomainUpdateConfirmJobTest < ActiveSupport::TestCase super end - def test_registrant_locked_domain + def test_registrant_locked_domain refute @domain.locked_by_registrant? @domain.apply_registry_lock assert @domain.locked_by_registrant? - assert_equal(@domain.registrar.notifications.last.text, 'Domain has been locked by registrant') + assert_equal(@domain.registrar.notifications.last.text, "Domain #{@domain.name} has been unlocked by registrant") end def test_registrant_unlocked_domain @@ -31,7 +31,7 @@ class DomainUpdateConfirmJobTest < ActiveSupport::TestCase assert @domain.locked_by_registrant? @domain.remove_registry_lock refute @domain.locked_by_registrant? - assert_equal(@domain.registrar.notifications.last.text, 'Domain has been unlocked by registrant') + assert_equal(@domain.registrar.notifications.last.text, "Domain #{@domain.name} has been unlocked by registrant") end def test_rejected_registrant_verification_notifies_registrar From 43ff03e6e147c65620363d8c6356f15879c1f4fd Mon Sep 17 00:00:00 2001 From: Oleg Hasjanov Date: Wed, 10 Feb 2021 10:42:59 +0200 Subject: [PATCH 38/61] added test for check --- .../epp/contact/check/base_test.rb | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/test/integration/epp/contact/check/base_test.rb b/test/integration/epp/contact/check/base_test.rb index 528d69d86..3fc9f64ac 100644 --- a/test/integration/epp/contact/check/base_test.rb +++ b/test/integration/epp/contact/check/base_test.rb @@ -98,6 +98,58 @@ class EppContactCheckBaseTest < EppTestCase assert_equal 3, response_xml.xpath('//contact:cd', contact: xml_schema).size end + def test_check_contact_with_prefix + @contact.update_columns(code: 'TEST:JOHN-001') + assert @contact.code, 'TEST:JOHN-001' + + request_xml = <<-XML + + + + + + TEST:JOHN-001 + + + + + XML + + post epp_check_path, params: { frame: request_xml }, + headers: { 'HTTP_COOKIE' => 'session=api_bestnames' } + + response_xml = Nokogiri::XML(response.body) + assert_epp_response :completed_successfully + assert_equal 'TEST:JOHN-001', response_xml.at_xpath('//contact:id', contact: xml_schema).text + assert_equal 'in use', response_xml.at_xpath('//contact:reason', contact: xml_schema).text + end + + def test_check_contact_without_prefix + @contact.update_columns(code: "#{@contact.registrar.code}:JOHN-001".upcase) + assert @contact.code, "#{@contact.registrar.code}:JOHN-001".upcase + + request_xml = <<-XML + + + + + + JOHN-001 + + + + + XML + + post epp_check_path, params: { frame: request_xml }, + headers: { 'HTTP_COOKIE' => 'session=api_bestnames' } + + response_xml = Nokogiri::XML(response.body) + assert_epp_response :completed_successfully + assert_equal 'TEST:JOHN-001', response_xml.at_xpath('//contact:id', contact: xml_schema).text + assert_equal 'in use', response_xml.at_xpath('//contact:reason', contact: xml_schema).text + end + private def xml_schema From 0617ef9d7d3e82b3785fcf0520a4149a165a51e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Wed, 10 Feb 2021 12:03:22 +0200 Subject: [PATCH 39/61] Fix contact code check --- app/controllers/epp/contacts_controller.rb | 2 +- app/models/epp/contact.rb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/epp/contacts_controller.rb b/app/controllers/epp/contacts_controller.rb index a0c3f503f..65354ff48 100644 --- a/app/controllers/epp/contacts_controller.rb +++ b/app/controllers/epp/contacts_controller.rb @@ -14,7 +14,7 @@ module Epp authorize! :check, Epp::Contact ids = params[:parsed_frame].css('id').map(&:text) - @results = Epp::Contact.check_availability(ids) + @results = Epp::Contact.check_availability(ids, reg: current_user.registrar.code) render_epp_response '/epp/contacts/check' end diff --git a/app/models/epp/contact.rb b/app/models/epp/contact.rb index 50ebac065..edc828f81 100644 --- a/app/models/epp/contact.rb +++ b/app/models/epp/contact.rb @@ -42,8 +42,9 @@ class Epp::Contact < Contact ) end - def check_availability(codes) + def check_availability(codes, reg:) codes = [codes] if codes.is_a?(String) + codes = codes.map { |c| c.include?(':') ? c : "#{reg}:#{c}" } res = [] codes.each do |x| From 1b6c4516564343679715fc852aecb7db4987739b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Wed, 10 Feb 2021 12:17:32 +0200 Subject: [PATCH 40/61] Create separate key for Bounces API --- app/controllers/api/v1/base_controller.rb | 2 +- app/controllers/api/v1/bounces_controller.rb | 9 ++++++++- config/application.yml.sample | 6 +++--- test/integration/api/v1/bounces/create_test.rb | 2 +- test/integration/api/v1/contact_requests_test.rb | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/app/controllers/api/v1/base_controller.rb b/app/controllers/api/v1/base_controller.rb index 045e4395e..6ee986a48 100644 --- a/app/controllers/api/v1/base_controller.rb +++ b/app/controllers/api/v1/base_controller.rb @@ -11,7 +11,7 @@ module Api end def authenticate_shared_key - api_key = "Basic #{ENV['internal_api_key']}" + api_key = "Basic #{ENV['rwhois_internal_api_shared_key']}" head(:unauthorized) unless api_key == request.authorization end diff --git a/app/controllers/api/v1/bounces_controller.rb b/app/controllers/api/v1/bounces_controller.rb index fd10a3398..de2814250 100644 --- a/app/controllers/api/v1/bounces_controller.rb +++ b/app/controllers/api/v1/bounces_controller.rb @@ -1,7 +1,7 @@ module Api module V1 class BouncesController < BaseController - before_action :authenticate_shared_key + before_action :validate_shared_key_integrity # POST api/v1/bounces/ def create @@ -20,6 +20,13 @@ module Api params.require(:data) end + + private + + def validate_shared_key_integrity + api_key = "Basic #{ENV['rwhois_bounces_api_shared_key']}" + head(:unauthorized) unless api_key == request.authorization + end end end end diff --git a/config/application.yml.sample b/config/application.yml.sample index 21f1df8e0..dd38e206c 100644 --- a/config/application.yml.sample +++ b/config/application.yml.sample @@ -87,11 +87,11 @@ sk_digi_doc_service_name: 'Testimine' registrant_api_base_url: registrant_api_auth_allowed_ips: '127.0.0.1, 0.0.0.0' #ips, separated with commas -# Bounces API -api_shared_key: testkey +# Shared key for REST-WHOIS Bounces API incl. CERT +rwhois_bounces_api_shared_key: testkey # Link to REST-WHOIS API -internal_api_key: testkey +rwhois_internal_api_shared_key: testkey # Base URL (inc. https://) of REST registrant portal # Leave blank to use internal registrant portal diff --git a/test/integration/api/v1/bounces/create_test.rb b/test/integration/api/v1/bounces/create_test.rb index 899b6c5c7..0d3dc65d7 100644 --- a/test/integration/api/v1/bounces/create_test.rb +++ b/test/integration/api/v1/bounces/create_test.rb @@ -2,7 +2,7 @@ require 'test_helper' class BouncesApiV1CreateTest < ActionDispatch::IntegrationTest def setup - @api_key = "Basic #{ENV['api_shared_key']}" + @api_key = "Basic #{ENV['rwhois_bounces_api_shared_key']}" @headers = { "Authorization": "#{@api_key}" } @json_body = { "data": valid_bounce_request }.as_json end diff --git a/test/integration/api/v1/contact_requests_test.rb b/test/integration/api/v1/contact_requests_test.rb index f0621b686..c9e2ac9bd 100644 --- a/test/integration/api/v1/contact_requests_test.rb +++ b/test/integration/api/v1/contact_requests_test.rb @@ -2,7 +2,7 @@ require 'test_helper' class ApiV1ContactRequestTest < ActionDispatch::IntegrationTest def setup - @api_key = "Basic #{ENV['api_shared_key']}" + @api_key = "Basic #{ENV['rwhois_internal_api_shared_key']}" @headers = { "Authorization": "#{@api_key}" } @json_create = { "contact_request": valid_contact_request_create }.as_json @json_update = { "contact_request": valid_contact_request_update }.as_json From 476093f3ce0a8741354160980a6189f376189146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20V=C3=B5hmar?= Date: Wed, 10 Feb 2021 14:14:23 +0200 Subject: [PATCH 41/61] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 891059845..6e53f4714 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +10.02.2021 +* Option to remove email addresses from AWS SES Supression list [#1839](https://github.com/internetee/registry/issues/1839) +* Added separate key for bounce API [#1842](https://github.com/internetee/registry/pull/1842) + 09.02.2021 * Added new endpoint for WHOIS contact requests [#1794](https://github.com/internetee/registry/pull/1794) From 7638bff5466fd74f5fc80f48493c82fc96b67230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Wed, 10 Feb 2021 16:36:57 +0200 Subject: [PATCH 42/61] Add registry lock operation to epp notification --- app/models/notification.rb | 4 ++++ app/views/epp/poll/poll_req.xml.builder | 22 ++++++++++++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/app/models/notification.rb b/app/models/notification.rb index e83b2c9da..07e824367 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -25,6 +25,10 @@ class Notification < ApplicationRecord '' end + def registry_lock? + text.include?('has been locked') || text.include?('has been unlocked') + end + private def set_defaults diff --git a/app/views/epp/poll/poll_req.xml.builder b/app/views/epp/poll/poll_req.xml.builder index 664327dae..a58b082c5 100644 --- a/app/views/epp/poll/poll_req.xml.builder +++ b/app/views/epp/poll/poll_req.xml.builder @@ -15,12 +15,22 @@ xml.epp_head do end if @object end - if @notification.action&.contact - render(partial: 'epp/poll/action', - locals: { - builder: xml, - action: @notification.action - }) + if @notification.action&.contact || @notification.registry_lock? + if @notification.registry_lock? + state = @notification.text.include?('unlocked') ? 'unlock' : 'lock' + xml.extension do + xml.tag!('changePoll:changeData', + 'xmlns:changePoll': 'https://epp.tld.ee/schema/changePoll-1.0.xsd') do + xml.tag!('changePoll:operation', state) + end + end + else + render(partial: 'epp/poll/action', + locals: { + builder: xml, + action: @notification.action, + }) + end end render('epp/shared/trID', builder: xml) From 4051c1941b4e861bee9a406829243aba70b7c7cf Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Wed, 10 Feb 2021 19:57:39 +0500 Subject: [PATCH 43/61] Add a commenting message to UI form --- app/views/registrar/bulk_change/_admin_contact_form.html.erb | 5 +++++ config/locales/registrar/bulk_change.en.yml | 3 +++ 2 files changed, 8 insertions(+) diff --git a/app/views/registrar/bulk_change/_admin_contact_form.html.erb b/app/views/registrar/bulk_change/_admin_contact_form.html.erb index bb682aa60..77734e872 100644 --- a/app/views/registrar/bulk_change/_admin_contact_form.html.erb +++ b/app/views/registrar/bulk_change/_admin_contact_form.html.erb @@ -6,6 +6,11 @@ <% end %>
    +
    +
    +

    <%= t '.comment' %>

    +
    +
    <%= label_tag :current_contact_id, t('.current_contact_id') %>
    diff --git a/config/locales/registrar/bulk_change.en.yml b/config/locales/registrar/bulk_change.en.yml index 6bd7fd84c..d9f6ebbd2 100644 --- a/config/locales/registrar/bulk_change.en.yml +++ b/config/locales/registrar/bulk_change.en.yml @@ -27,6 +27,9 @@ en: Replace admin contact specified in "current contact ID" with the one in "new contact ID" on any domain registered under this registrar. Contact idents must be the same + comment: >- + Bulk admin change is only allowed in case of old and new contact are sharing identical + ident data ie for updating contact information. nameserver_form: ip_hint: One IP per line From 7063aa1210cd488ee99c38da2a4e2d78f2e0486e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20V=C3=B5hmar?= Date: Wed, 10 Feb 2021 17:04:08 +0200 Subject: [PATCH 44/61] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e53f4714..7f6065826 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ 10.02.2021 +* Admin contact bulk change option for registrars [#1764](https://github.com/internetee/registry/issues/1764) * Option to remove email addresses from AWS SES Supression list [#1839](https://github.com/internetee/registry/issues/1839) * Added separate key for bounce API [#1842](https://github.com/internetee/registry/pull/1842) From 47d143e6ccc57a887848be549d5590321ee0efc0 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Thu, 11 Feb 2021 15:20:57 +0500 Subject: [PATCH 45/61] Undo removing serverUpdateProhibited status on domain renew --- app/models/epp/domain.rb | 1 - .../repp/v1/domains/bulk_renew_test.rb | 23 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb index ad96adc64..f280eb160 100644 --- a/app/models/epp/domain.rb +++ b/app/models/epp/domain.rb @@ -612,7 +612,6 @@ class Epp::Domain < Domain statuses.delete(DomainStatus::SERVER_HOLD) statuses.delete(DomainStatus::EXPIRED) - statuses.delete(DomainStatus::SERVER_UPDATE_PROHIBITED) cancel_pending_delete save diff --git a/test/integration/repp/v1/domains/bulk_renew_test.rb b/test/integration/repp/v1/domains/bulk_renew_test.rb index 4cec91914..46e2fbf7d 100644 --- a/test/integration/repp/v1/domains/bulk_renew_test.rb +++ b/test/integration/repp/v1/domains/bulk_renew_test.rb @@ -37,6 +37,29 @@ class ReppV1DomainsBulkRenewTest < ActionDispatch::IntegrationTest end end + def test_keeps_update_prohibited_status + domain = domains(:shop) + domain.update(statuses: [DomainStatus::CLIENT_UPDATE_PROHIBITED, DomainStatus::SERVER_UPDATE_PROHIBITED]) + payload = { + "domains": [ + 'shop.test' + ], + "renew_period": "1y" + } + + assert_changes -> { Domain.find_by(name: 'shop.test').valid_to } do + post "/repp/v1/domains/renew/bulk", headers: @auth_headers, params: payload + json = JSON.parse(response.body, symbolize_names: true) + + assert_response :ok + assert_equal 1000, json[:code] + assert_equal 'Command completed successfully', json[:message] + assert json[:data][:updated_domains].include? 'shop.test' + end + domain.reload + assert_equal domain.statuses, [DomainStatus::CLIENT_UPDATE_PROHIBITED, DomainStatus::SERVER_UPDATE_PROHIBITED] + end + def test_throws_error_when_domain_not_renewable payload = { "domains": [ From b2e489630d9effe967a8ebb88d5bd0ab556c2015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20V=C3=B5hmar?= Date: Thu, 11 Feb 2021 13:15:47 +0200 Subject: [PATCH 46/61] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f6065826..b935ae6e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +11.02.2021 +* Poll messages on locking and unlocking a domain [#1828](https://github.com/internetee/registry/issues/1828) + 10.02.2021 * Admin contact bulk change option for registrars [#1764](https://github.com/internetee/registry/issues/1764) * Option to remove email addresses from AWS SES Supression list [#1839](https://github.com/internetee/registry/issues/1839) From 8dfe1c83e6da53d7fe1d8577120ad2ad188ea4a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20V=C3=B5hmar?= Date: Thu, 11 Feb 2021 14:06:51 +0200 Subject: [PATCH 47/61] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b935ae6e4..9afedbf17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ 11.02.2021 * Poll messages on locking and unlocking a domain [#1828](https://github.com/internetee/registry/issues/1828) +* Registrar's prefix is now checked and added to contact id for info and check requests [#1832](https://github.com/internetee/registry/issues/1832) 10.02.2021 * Admin contact bulk change option for registrars [#1764](https://github.com/internetee/registry/issues/1764) From ac726a955495d917abe13b61a0b067260e0d657a Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Thu, 11 Feb 2021 19:58:02 +0500 Subject: [PATCH 48/61] Add admin_contact bulk update endpoint documentation --- doc/repp/v1/admin_contacts.md | 30 ++++++++++++++++++++++++++++++ doc/repp/v1/domain_contacts.md | 4 ++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 doc/repp/v1/admin_contacts.md diff --git a/doc/repp/v1/admin_contacts.md b/doc/repp/v1/admin_contacts.md new file mode 100644 index 000000000..3b78829d0 --- /dev/null +++ b/doc/repp/v1/admin_contacts.md @@ -0,0 +1,30 @@ +# Admin domain contacts + +## PATCH https://repp.internet.ee/v1/domains/admin_contacts +Replaces admin domain contacts of the current registrar. + +### Example request +``` +PATCH /repp/v1/domains/admin_contacts HTTP/1.1 +Accept: application/json +Content-Type: application/json +Authorization: Basic dGVzdDp0ZXN0dGVzdA== + +{ + "current_contact_id": "ATSAA:749AA80F", + "new_contact_id": "ATSAA:E36957D7" +} +``` +### Example response +``` +{ + "code": 1000, + "message": "Command completed successfully", + "data": { + "affected_domains": [ + "private.ee", + ], + "skipped_domains": [] + } +} +``` diff --git a/doc/repp/v1/domain_contacts.md b/doc/repp/v1/domain_contacts.md index 2e542bf81..8c3c9b9de 100644 --- a/doc/repp/v1/domain_contacts.md +++ b/doc/repp/v1/domain_contacts.md @@ -1,7 +1,7 @@ -# Domain contacts +# Tech domain contacts ## PATCH https://repp.internet.ee/v1/domains/contacts -Replaces all domain contacts of the current registrar. +Replaces technical domain contacts of the current registrar. ### Example request ``` From 06ae9b8e2447df2ce286779256eeb96dbf40b960 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Fri, 12 Feb 2021 13:01:28 +0200 Subject: [PATCH 49/61] Optimize WHOIS record destroy SQL check --- app/models/whois_record.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/whois_record.rb b/app/models/whois_record.rb index 19805d583..9a6229fcb 100644 --- a/app/models/whois_record.rb +++ b/app/models/whois_record.rb @@ -97,7 +97,9 @@ class WhoisRecord < ApplicationRecord end def destroy_whois_record - Whois::Record.without_auctions.where(name: name).delete_all + return if Auction.find_by(domain: name).present? + + Whois::Record.where(name: name).delete_all end private From ffde92954057226330799f10e928ae69b8b61663 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Fri, 12 Feb 2021 15:54:04 +0500 Subject: [PATCH 50/61] Set validation to prohibit ManualInzone with any of the *Hold statuses --- app/models/concerns/domain/deletable.rb | 6 ++++++ app/models/concerns/domain/force_delete.rb | 9 +++++++++ app/models/domain.rb | 12 ++++++------ test/models/domain/force_delete_test.rb | 13 +++++++++++++ 4 files changed, 34 insertions(+), 6 deletions(-) diff --git a/app/models/concerns/domain/deletable.rb b/app/models/concerns/domain/deletable.rb index 81518c739..3c63cf96d 100644 --- a/app/models/concerns/domain/deletable.rb +++ b/app/models/concerns/domain/deletable.rb @@ -1,6 +1,12 @@ module Concerns::Domain::Deletable extend ActiveSupport::Concern + DELETE_STATUSES = [ + DomainStatus::PENDING_DELETE_CONFIRMATION, + DomainStatus::PENDING_DELETE, + DomainStatus::FORCE_DELETE, + ].freeze + private def delete_later diff --git a/app/models/concerns/domain/force_delete.rb b/app/models/concerns/domain/force_delete.rb index 87e9a957b..5f09dd9fb 100644 --- a/app/models/concerns/domain/force_delete.rb +++ b/app/models/concerns/domain/force_delete.rb @@ -11,6 +11,11 @@ module Concerns::Domain::ForceDelete # rubocop:disable Metrics/ModuleLength lambda { where("(force_delete_data->>'contact_notification_sent_date') is null") } + + HOLD_STATUSES = [ + DomainStatus::SERVER_HOLD, + DomainStatus::CLIENT_HOLD, + ].freeze end class_methods do @@ -19,6 +24,10 @@ module Concerns::Domain::ForceDelete # rubocop:disable Metrics/ModuleLength end end + def hold_status? + HOLD_STATUSES.any? { |status| statuses.include? status } + end + def notification_template(explicit: nil) reason = explicit&.downcase return reason if %w[invalid_email invalid_phone].include?(reason) diff --git a/app/models/domain.rb b/app/models/domain.rb index 53f0fa5b6..dc3ce79f5 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -107,13 +107,13 @@ class Domain < ApplicationRecord validate :status_is_consistant def status_is_consistant - has_error = (statuses.include?(DomainStatus::SERVER_HOLD) && statuses.include?(DomainStatus::SERVER_MANUAL_INZONE)) - unless has_error - if (statuses & [DomainStatus::PENDING_DELETE_CONFIRMATION, DomainStatus::PENDING_DELETE, DomainStatus::FORCE_DELETE]).any? - has_error = statuses.include? DomainStatus::SERVER_DELETE_PROHIBITED - end + has_error = (hold_status? && statuses.include?(DomainStatus::SERVER_MANUAL_INZONE)) + unless has_error + if (statuses & DELETE_STATUSES).any? + has_error = statuses.include? DomainStatus::SERVER_DELETE_PROHIBITED end - errors.add(:domains, I18n.t(:object_status_prohibits_operation)) if has_error + end + errors.add(:domains, I18n.t(:object_status_prohibits_operation)) if has_error end attr_accessor :is_admin diff --git a/test/models/domain/force_delete_test.rb b/test/models/domain/force_delete_test.rb index 2bb1b5b8f..19338f495 100644 --- a/test/models/domain/force_delete_test.rb +++ b/test/models/domain/force_delete_test.rb @@ -234,6 +234,19 @@ class ForceDeleteTest < ActionMailer::TestCase assert_includes(@domain.statuses, asserted_status) end + def test_client_hold_prohibits_manual_inzone + @domain.update(valid_to: Time.zone.parse('2012-08-05')) + @domain.update(template_name: 'legal_person') + travel_to Time.zone.parse('2010-07-05') + @domain.schedule_force_delete(type: :soft) + travel_to Time.zone.parse('2010-08-21') + Domains::ClientHold::SetClientHold.run! + @domain.reload + + @domain.statuses << DomainStatus::SERVER_MANUAL_INZONE + assert_not @domain.valid? + end + def test_force_delete_soft_year_ahead_not_sets_client_hold_before_threshold asserted_status = DomainStatus::CLIENT_HOLD From d3287fd73fd737b6a1c73aa6d9c10343ed6764db Mon Sep 17 00:00:00 2001 From: Oleg Hasjanov Date: Fri, 12 Feb 2021 14:22:46 +0200 Subject: [PATCH 51/61] Added test for check domain status UpdatePending if registrants have the same ident --- .../epp/domain/update/base_test.rb | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/test/integration/epp/domain/update/base_test.rb b/test/integration/epp/domain/update/base_test.rb index 14e806fca..9a5e79639 100644 --- a/test/integration/epp/domain/update/base_test.rb +++ b/test/integration/epp/domain/update/base_test.rb @@ -123,6 +123,46 @@ class EppDomainUpdateBaseTest < EppTestCase assert_verification_and_notification_emails end + def test_domain_should_doesnt_have_pending_update_when_updated_registrant_with_same_idents_data + assert_not @domain.statuses.include? "pendingUpdate" + + old_registrant = @domain.registrant + new_registrant = contacts(:william).becomes(Registrant) + + new_registrant.update(ident: old_registrant.ident) + new_registrant.update(ident_country_code: old_registrant.ident_country_code) + new_registrant.update(ident_type: old_registrant.ident_type) + + request_xml = <<-XML + + + + + + #{@domain.name} + + #{new_registrant.code} + + + + + + #{'test' * 2000} + + + + + XML + + post epp_update_path, params: { frame: request_xml }, + headers: { 'HTTP_COOKIE' => 'session=api_bestnames' } + @domain.reload + assert_epp_response :completed_successfully + + assert_equal @domain.registrant, new_registrant + assert_not @domain.statuses.include? "pendingUpdate" + end + def test_requires_verification_from_current_registrant_when_not_yet_verified_by_registrar Setting.request_confirmation_on_registrant_change_enabled = true new_registrant = contacts(:william) From 36d4ea981a46bda0ad68565e84e45c1f5d74f088 Mon Sep 17 00:00:00 2001 From: Oleg Hasjanov Date: Fri, 12 Feb 2021 15:21:09 +0200 Subject: [PATCH 52/61] add test for removing contact with server delete prohibited --- .../epp/contact/delete/base_test.rb | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/test/integration/epp/contact/delete/base_test.rb b/test/integration/epp/contact/delete/base_test.rb index 26ba63897..50335edb5 100644 --- a/test/integration/epp/contact/delete/base_test.rb +++ b/test/integration/epp/contact/delete/base_test.rb @@ -27,6 +27,33 @@ class EppContactDeleteBaseTest < EppTestCase assert_epp_response :completed_successfully end + def test_delete_contact_with_server_delete_prohibited + contact = deletable_contact + contact.update(statuses: Contact::SERVER_DELETE_PROHIBITED) + assert contact.statuses.include? Contact::SERVER_DELETE_PROHIBITED + + contact.update_columns(code: contact.code.upcase) + + request_xml = <<-XML + + + + + + #{contact.code.upcase} + + + + + XML + + post epp_delete_path, params: { frame: request_xml }, + headers: { 'HTTP_COOKIE' => 'session=api_bestnames' } + + assert Contact.exists?(id: contact.id) + assert_epp_response :object_association_prohibits_operation + end + def test_undeletable_cannot_be_deleted contact = contacts(:john) assert_not contact.deletable? From fad739d279bb15a0dd8cb1137905b0b939992439 Mon Sep 17 00:00:00 2001 From: Oleg Hasjanov Date: Fri, 12 Feb 2021 15:22:05 +0200 Subject: [PATCH 53/61] add test for removing contact with client delete prohibited --- .../epp/contact/delete/base_test.rb | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/test/integration/epp/contact/delete/base_test.rb b/test/integration/epp/contact/delete/base_test.rb index 50335edb5..a93b68b6d 100644 --- a/test/integration/epp/contact/delete/base_test.rb +++ b/test/integration/epp/contact/delete/base_test.rb @@ -54,6 +54,33 @@ class EppContactDeleteBaseTest < EppTestCase assert_epp_response :object_association_prohibits_operation end + def test_delete_contact_with_client_delete_prohibited + contact = deletable_contact + contact.update(statuses: Contact::CLIENT_DELETE_PROHIBITED) + assert contact.statuses.include? Contact::CLIENT_DELETE_PROHIBITED + + contact.update_columns(code: contact.code.upcase) + + request_xml = <<-XML + + + + + + #{contact.code.upcase} + + + + + XML + + post epp_delete_path, params: { frame: request_xml }, + headers: { 'HTTP_COOKIE' => 'session=api_bestnames' } + + assert Contact.exists?(id: contact.id) + assert_epp_response :object_association_prohibits_operation + end + def test_undeletable_cannot_be_deleted contact = contacts(:john) assert_not contact.deletable? From 69562ec2a2d6e05b9c810f306e42a25700aa56fa Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Mon, 15 Feb 2021 17:56:18 +0500 Subject: [PATCH 54/61] Fix checking if verification needed --- app/models/epp/domain.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb index ad96adc64..1aec22f7f 100644 --- a/app/models/epp/domain.rb +++ b/app/models/epp/domain.rb @@ -495,7 +495,7 @@ class Epp::Domain < Domain registrant_verification_needed = false # registrant block may not be present, so we need this to rule out false positives if frame.css('registrant').text.present? - registrant_verification_needed = (registrant.code != frame.css('registrant').text) + registrant_verification_needed = verification_needed?(code: frame.css('registrant').text) end if registrant_verification_needed && disputed? @@ -798,4 +798,13 @@ class Epp::Domain < Domain result end end + + private + + def verification_needed?(code:) + new_registrant = Registrant.find_by(code: code) + return false if new_registrant.try(:identical_to?, registrant) + + registrant.code != code + end end From 340e1820f273fe6bdd4a66eb88000451c7ee86d5 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Mon, 15 Feb 2021 14:51:01 +0500 Subject: [PATCH 55/61] Fix contact deletion if contact *DeleteProhibited --- app/models/actions/contact_delete.rb | 5 +++++ app/models/epp/contact.rb | 3 ++- config/locales/contacts.en.yml | 2 ++ test/integration/epp/contact/delete/base_test.rb | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/models/actions/contact_delete.rb b/app/models/actions/contact_delete.rb index 59032d566..d4169e8b3 100644 --- a/app/models/actions/contact_delete.rb +++ b/app/models/actions/contact_delete.rb @@ -19,6 +19,11 @@ module Actions return end + if contact.delete_prohibited? + contact.errors.add(:status, :delete_prohibited) + return + end + commit end diff --git a/app/models/epp/contact.rb b/app/models/epp/contact.rb index 0c0ed3d5f..e7054c8aa 100644 --- a/app/models/epp/contact.rb +++ b/app/models/epp/contact.rb @@ -83,7 +83,8 @@ class Epp::Contact < Contact [:code, :epp_id_taken] ], '2305' => [ # Association exists - [:domains, :exist] + [:domains, :exist], + [:domains, :delete_prohibited], ] } end diff --git a/config/locales/contacts.en.yml b/config/locales/contacts.en.yml index 906bde193..b5f0dd7ed 100644 --- a/config/locales/contacts.en.yml +++ b/config/locales/contacts.en.yml @@ -25,6 +25,8 @@ en: email_regex_check_error: Invalid format domains: exist: 'Object association prohibits operation' + status: + delete_prohibited: Contact delete prohibited by status statuses: not_uniq: 'not uniq' country_code: diff --git a/test/integration/epp/contact/delete/base_test.rb b/test/integration/epp/contact/delete/base_test.rb index a93b68b6d..5bdb7b8cf 100644 --- a/test/integration/epp/contact/delete/base_test.rb +++ b/test/integration/epp/contact/delete/base_test.rb @@ -115,4 +115,4 @@ class EppContactDeleteBaseTest < EppTestCase DomainContact.delete_all contacts(:john) end -end \ No newline at end of file +end From b9d57be6abb90dbbac170ca676633fc0cc2b8b59 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Mon, 15 Feb 2021 19:46:16 +0500 Subject: [PATCH 56/61] Add i18n, change error response code to 2304 --- app/models/actions/contact_delete.rb | 2 +- app/models/epp/contact.rb | 4 +++- config/locales/contacts.en.yml | 2 +- test/integration/epp/contact/delete/base_test.rb | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/models/actions/contact_delete.rb b/app/models/actions/contact_delete.rb index d4169e8b3..60d3252c4 100644 --- a/app/models/actions/contact_delete.rb +++ b/app/models/actions/contact_delete.rb @@ -20,7 +20,7 @@ module Actions end if contact.delete_prohibited? - contact.errors.add(:status, :delete_prohibited) + contact.errors.add(:statuses, :delete_prohibited) return end diff --git a/app/models/epp/contact.rb b/app/models/epp/contact.rb index e7054c8aa..4cd876d5f 100644 --- a/app/models/epp/contact.rb +++ b/app/models/epp/contact.rb @@ -82,9 +82,11 @@ class Epp::Contact < Contact '2302' => [ # Object exists [:code, :epp_id_taken] ], + '2304' => [ # Status prohibits operation + [:statuses, :delete_prohibited], + ], '2305' => [ # Association exists [:domains, :exist], - [:domains, :delete_prohibited], ] } end diff --git a/config/locales/contacts.en.yml b/config/locales/contacts.en.yml index b5f0dd7ed..4b4d099d7 100644 --- a/config/locales/contacts.en.yml +++ b/config/locales/contacts.en.yml @@ -25,10 +25,10 @@ en: email_regex_check_error: Invalid format domains: exist: 'Object association prohibits operation' - status: delete_prohibited: Contact delete prohibited by status statuses: not_uniq: 'not uniq' + delete_prohibited: Contact delete prohibited by status country_code: invalid: Country code is not valid, should be in ISO_3166-1 alpha 2 format (%{value}) disclosed_attributes: diff --git a/test/integration/epp/contact/delete/base_test.rb b/test/integration/epp/contact/delete/base_test.rb index 5bdb7b8cf..e86bea9dd 100644 --- a/test/integration/epp/contact/delete/base_test.rb +++ b/test/integration/epp/contact/delete/base_test.rb @@ -51,7 +51,7 @@ class EppContactDeleteBaseTest < EppTestCase headers: { 'HTTP_COOKIE' => 'session=api_bestnames' } assert Contact.exists?(id: contact.id) - assert_epp_response :object_association_prohibits_operation + assert_epp_response :object_status_prohibits_operation end def test_delete_contact_with_client_delete_prohibited @@ -78,7 +78,7 @@ class EppContactDeleteBaseTest < EppTestCase headers: { 'HTTP_COOKIE' => 'session=api_bestnames' } assert Contact.exists?(id: contact.id) - assert_epp_response :object_association_prohibits_operation + assert_epp_response :object_status_prohibits_operation end def test_undeletable_cannot_be_deleted From 2b7dbba9183bea26b6376ef05719147dba327d4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20V=C3=B5hmar?= Date: Fri, 19 Feb 2021 17:34:28 +0200 Subject: [PATCH 57/61] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9afedbf17..25a1402af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +19.02.2021 +* Fixed clientHold and serverManualInzone status conflict issue [#1845](https://github.com/internetee/registry/issues/1845) + 11.02.2021 * Poll messages on locking and unlocking a domain [#1828](https://github.com/internetee/registry/issues/1828) * Registrar's prefix is now checked and added to contact id for info and check requests [#1832](https://github.com/internetee/registry/issues/1832) From 1d405968c55930eb91529f115abb4e82ad2207f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20V=C3=B5hmar?= Date: Fri, 19 Feb 2021 17:47:06 +0200 Subject: [PATCH 58/61] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25a1402af..03cc6aa58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ 19.02.2021 +* Update prohibited staatus is kept after renew [#1843](https://github.com/internetee/registry/issues/1843) * Fixed clientHold and serverManualInzone status conflict issue [#1845](https://github.com/internetee/registry/issues/1845) 11.02.2021 From 79c5d963daadddaf08417cfe6ac3705c5b98560a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20V=C3=B5hmar?= Date: Fri, 19 Feb 2021 18:05:27 +0200 Subject: [PATCH 59/61] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03cc6aa58..4c9a0facf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ 19.02.2021 * Update prohibited staatus is kept after renew [#1843](https://github.com/internetee/registry/issues/1843) * Fixed clientHold and serverManualInzone status conflict issue [#1845](https://github.com/internetee/registry/issues/1845) +* Replacing registrant object with another that has the same ident data set does not require registrant verification [#1852](https://github.com/internetee/registry/issues/1852) 11.02.2021 * Poll messages on locking and unlocking a domain [#1828](https://github.com/internetee/registry/issues/1828) From 36f679a24047cea7b288be9ac6ce68c495221c03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20V=C3=B5hmar?= Date: Mon, 22 Feb 2021 13:23:28 +0200 Subject: [PATCH 60/61] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c9a0facf..f1cfab5b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +22.02.2021 +* serverDeleteProhibited prohibts delete action [#1849](https://github.com/internetee/registry/issues/1849) + 19.02.2021 * Update prohibited staatus is kept after renew [#1843](https://github.com/internetee/registry/issues/1843) * Fixed clientHold and serverManualInzone status conflict issue [#1845](https://github.com/internetee/registry/issues/1845) From d8642657606a05244c51881a138f9ec2be619cbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Tue, 23 Feb 2021 13:41:17 +0200 Subject: [PATCH 61/61] Registrant API: Expose Bearer token internally --- app/controllers/api/v1/registrant/auth_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/api/v1/registrant/auth_controller.rb b/app/controllers/api/v1/registrant/auth_controller.rb index 03dfa45f3..30f3ed973 100644 --- a/app/controllers/api/v1/registrant/auth_controller.rb +++ b/app/controllers/api/v1/registrant/auth_controller.rb @@ -19,6 +19,8 @@ module Api token = create_token(user) if token + ToStdout.msg("Bearer for #{eid_params[:first_name]} #{eid_params[:last_name]} " \ + "(#{eid_params[:ident]}) - '#{token[:access_token]}'") render json: token else render json: { errors: [{ base: ['Cannot create generate session token'] }] }