From ea08abf9e8787580b0b7dc28c8e88b8a3ac7bf21 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 14 Feb 2018 22:09:26 +0200 Subject: [PATCH 01/56] Add database constraints #694 --- .../20180214200224_add_domain_transfers_constraints.rb | 7 +++++++ db/structure.sql | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20180214200224_add_domain_transfers_constraints.rb diff --git a/db/migrate/20180214200224_add_domain_transfers_constraints.rb b/db/migrate/20180214200224_add_domain_transfers_constraints.rb new file mode 100644 index 000000000..bd4023deb --- /dev/null +++ b/db/migrate/20180214200224_add_domain_transfers_constraints.rb @@ -0,0 +1,7 @@ +class AddDomainTransfersConstraints < ActiveRecord::Migration + def change + change_column_null :domain_transfers, :domain_id, false + change_column_null :domain_transfers, :old_registrar_id, false + change_column_null :domain_transfers, :new_registrar_id, false + end +end diff --git a/db/structure.sql b/db/structure.sql index 2cad3e06f..7e8fef018 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -954,12 +954,12 @@ ALTER SEQUENCE domain_statuses_id_seq OWNED BY domain_statuses.id; CREATE TABLE domain_transfers ( id integer NOT NULL, - domain_id integer, + domain_id integer NOT NULL, status character varying, transfer_requested_at timestamp without time zone, transferred_at timestamp without time zone, - old_registrar_id integer, - new_registrar_id integer, + old_registrar_id integer NOT NULL, + new_registrar_id integer NOT NULL, created_at timestamp without time zone, updated_at timestamp without time zone, wait_until timestamp without time zone @@ -5070,3 +5070,5 @@ INSERT INTO schema_migrations (version) VALUES ('20180126104536'); INSERT INTO schema_migrations (version) VALUES ('20180126104903'); +INSERT INTO schema_migrations (version) VALUES ('20180214200224'); + From fee7fc94c7b3852f0c7089dda1888f270f40fddb Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 14 Feb 2018 23:34:21 +0200 Subject: [PATCH 02/56] Improve readability #694 --- test/models/domain/domain_transfer_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/models/domain/domain_transfer_test.rb b/test/models/domain/domain_transfer_test.rb index 7b2d2d4c2..58937c791 100644 --- a/test/models/domain/domain_transfer_test.rb +++ b/test/models/domain/domain_transfer_test.rb @@ -52,7 +52,7 @@ class DomainTransferTest < ActiveSupport::TestCase end end - def test_creates_message + def test_notifies_old_registrar assert_difference 'Message.count' do @domain.transfer(@new_registrar) end From bf013123540bd4b035b9ab883303d54589122760 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 14 Feb 2018 23:40:30 +0200 Subject: [PATCH 03/56] Add database constraints #694 --- .../20180214213743_change_messages_body_to_not_null.rb | 5 +++++ db/structure.sql | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20180214213743_change_messages_body_to_not_null.rb diff --git a/db/migrate/20180214213743_change_messages_body_to_not_null.rb b/db/migrate/20180214213743_change_messages_body_to_not_null.rb new file mode 100644 index 000000000..4a09101f1 --- /dev/null +++ b/db/migrate/20180214213743_change_messages_body_to_not_null.rb @@ -0,0 +1,5 @@ +class ChangeMessagesBodyToNotNull < ActiveRecord::Migration + def change + change_column_null :messages, :body, false + end +end diff --git a/db/structure.sql b/db/structure.sql index 7e8fef018..c5ea5f5e7 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -2185,7 +2185,7 @@ ALTER SEQUENCE mail_templates_id_seq OWNED BY mail_templates.id; CREATE TABLE messages ( id integer NOT NULL, registrar_id integer, - body character varying, + body character varying NOT NULL, attached_obj_type character varying, attached_obj_id character varying, queued boolean, @@ -5072,3 +5072,5 @@ INSERT INTO schema_migrations (version) VALUES ('20180126104903'); INSERT INTO schema_migrations (version) VALUES ('20180214200224'); +INSERT INTO schema_migrations (version) VALUES ('20180214213743'); + From 09e2bee29202b1dd7b0d33b854cb180fa0c456ba Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 14 Feb 2018 23:46:04 +0200 Subject: [PATCH 04/56] Update translation #694 --- config/locales/messages.en.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 config/locales/messages.en.yml diff --git a/config/locales/messages.en.yml b/config/locales/messages.en.yml new file mode 100644 index 000000000..5cc945c25 --- /dev/null +++ b/config/locales/messages.en.yml @@ -0,0 +1,8 @@ +en: + activerecord: + attributes: + message/body: + domain_transfer: >- + Domain transfer of %{domain_name} has been approved. + Old contacts: %{old_contacts}; + old registrant: %{old_registrant} From 2902a2f5a22972bf0c4bdf246de4513ec663ed95 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Fri, 16 Feb 2018 18:17:59 +0200 Subject: [PATCH 05/56] Revert "Tell Travis to build all branches" This reverts commit 0b1ffd5 --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index a5fec1a71..e375b943c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,3 +19,7 @@ services: - postgresql addons: postgresql: "9.4" +branches: + only: + - master + - staging From 6d991387a2734af4eba6cdd79619d5b02e118b03 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Fri, 16 Feb 2018 18:42:51 +0200 Subject: [PATCH 06/56] Do not use warden helper in EPP tests #694 --- test/integration/epp/domain/create/transfer_code_test.rb | 1 - test/integration/epp/domain/transfer/domain_transfer_test.rb | 4 ---- test/integration/epp/domain/transfer/transfer_code_test.rb | 4 ---- test/integration/epp/domain/update/transfer_code_test.rb | 4 ---- 4 files changed, 13 deletions(-) diff --git a/test/integration/epp/domain/create/transfer_code_test.rb b/test/integration/epp/domain/create/transfer_code_test.rb index f7d70a4ea..fbd62ec81 100644 --- a/test/integration/epp/domain/create/transfer_code_test.rb +++ b/test/integration/epp/domain/create/transfer_code_test.rb @@ -3,7 +3,6 @@ require 'test_helper' class EppDomainCreateTransferCodeTest < ActionDispatch::IntegrationTest def setup travel_to Time.zone.parse('2010-07-05') - login_as users(:api_bestnames) end def test_generates_default diff --git a/test/integration/epp/domain/transfer/domain_transfer_test.rb b/test/integration/epp/domain/transfer/domain_transfer_test.rb index 1b1e604ba..6421bc71b 100644 --- a/test/integration/epp/domain/transfer/domain_transfer_test.rb +++ b/test/integration/epp/domain/transfer/domain_transfer_test.rb @@ -1,10 +1,6 @@ require 'test_helper' class EppDomainTransferTest < ActionDispatch::IntegrationTest - def setup - login_as users(:api_goodnames) - end - def test_successfully_transfers_domain request_xml = <<-XML diff --git a/test/integration/epp/domain/transfer/transfer_code_test.rb b/test/integration/epp/domain/transfer/transfer_code_test.rb index 0db6ba0d6..48c4d8db6 100644 --- a/test/integration/epp/domain/transfer/transfer_code_test.rb +++ b/test/integration/epp/domain/transfer/transfer_code_test.rb @@ -1,10 +1,6 @@ require 'test_helper' class EppDomainTransferTransferCodeTest < ActionDispatch::IntegrationTest - def setup - login_as users(:api_goodnames) - end - def test_wrong request_xml = <<-XML diff --git a/test/integration/epp/domain/update/transfer_code_test.rb b/test/integration/epp/domain/update/transfer_code_test.rb index 6208c2899..eae8ec675 100644 --- a/test/integration/epp/domain/update/transfer_code_test.rb +++ b/test/integration/epp/domain/update/transfer_code_test.rb @@ -1,10 +1,6 @@ require 'test_helper' class EppDomainUpdateTest < ActionDispatch::IntegrationTest - def setup - login_as users(:api_bestnames) - end - def test_overwrites_existing request_xml = <<-XML From bb0a6e3922da8b53399ef225867f388538f8d6ad Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sat, 17 Feb 2018 01:21:36 +0200 Subject: [PATCH 07/56] Add test #694 --- test/models/domain/domain_transfer_test.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/models/domain/domain_transfer_test.rb b/test/models/domain/domain_transfer_test.rb index 58937c791..0086648a9 100644 --- a/test/models/domain/domain_transfer_test.rb +++ b/test/models/domain/domain_transfer_test.rb @@ -63,4 +63,10 @@ class DomainTransferTest < ActiveSupport::TestCase @domain.transfer(@new_registrar) end end + + def test_bypasses_validation + domain = domains(:invalid) + domain.transfer(@new_registrar) + assert_equal @new_registrar, @domain.registrar + end end From a469b6b5d45dd1eb870583fb165f5092bec46d09 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sat, 17 Feb 2018 01:34:38 +0200 Subject: [PATCH 08/56] Reformat #694 --- app/models/domain_transfer.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/domain_transfer.rb b/app/models/domain_transfer.rb index 6dd539bb8..5f498185e 100644 --- a/app/models/domain_transfer.rb +++ b/app/models/domain_transfer.rb @@ -10,6 +10,7 @@ class DomainTransfer < ActiveRecord::Base SERVER_APPROVED = 'serverApproved' before_create :set_wait_until + def set_wait_until wait_time = Setting.transfer_wait_time return if wait_time == 0 @@ -17,6 +18,7 @@ class DomainTransfer < ActiveRecord::Base end before_create :set_status + def set_status if Setting.transfer_wait_time > 0 self.status = PENDING unless status From e92f8621efbff2a3d3f17f6eb72bfdbb9d0c92ef Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sat, 17 Feb 2018 02:25:33 +0200 Subject: [PATCH 09/56] Improve test #694 --- .../integration/epp/domain/transfer/domain_transfer_test.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/integration/epp/domain/transfer/domain_transfer_test.rb b/test/integration/epp/domain/transfer/domain_transfer_test.rb index 6421bc71b..2d47549c8 100644 --- a/test/integration/epp/domain/transfer/domain_transfer_test.rb +++ b/test/integration/epp/domain/transfer/domain_transfer_test.rb @@ -1,7 +1,9 @@ require 'test_helper' class EppDomainTransferTest < ActionDispatch::IntegrationTest - def test_successfully_transfers_domain + def test_transfers_domain_at_once_if_auto_confirm_is_enabled + Setting.transfer_wait_time = 0 + request_xml = <<-XML @@ -21,7 +23,7 @@ class EppDomainTransferTest < ActionDispatch::IntegrationTest session_id = epp_sessions(:api_goodnames).session_id post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => "session=#{session_id}" } assert_equal registrars(:goodnames), domains(:shop).registrar - assert Nokogiri::XML(response.body).at_css('result[code="1000"]') + assert_equal '1000', Nokogiri::XML(response.body).at_css('result')[:code] assert_equal 1, Nokogiri::XML(response.body).css('result').size end From 59ceb9c51a7eec6de4732849297ecbd77e1da529 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sat, 17 Feb 2018 02:42:22 +0200 Subject: [PATCH 10/56] Hard code test data #694 --- test/integration/epp/domain/create/transfer_code_test.rb | 6 ++---- .../integration/epp/domain/transfer/domain_transfer_test.rb | 6 ++---- test/integration/epp/domain/transfer/transfer_code_test.rb | 3 +-- test/integration/epp/domain/update/transfer_code_test.rb | 3 +-- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/test/integration/epp/domain/create/transfer_code_test.rb b/test/integration/epp/domain/create/transfer_code_test.rb index fbd62ec81..109447c94 100644 --- a/test/integration/epp/domain/create/transfer_code_test.rb +++ b/test/integration/epp/domain/create/transfer_code_test.rb @@ -26,8 +26,7 @@ class EppDomainCreateTransferCodeTest < ActionDispatch::IntegrationTest XML - session_id = epp_sessions(:api_bestnames).session_id - post '/epp/command/create', { frame: request_xml }, { 'HTTP_COOKIE' => "session=#{session_id}" } + post '/epp/command/create', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } refute_empty Domain.find_by(name: 'brandnew.test').transfer_code end @@ -55,8 +54,7 @@ class EppDomainCreateTransferCodeTest < ActionDispatch::IntegrationTest XML - session_id = epp_sessions(:api_bestnames).session_id - post '/epp/command/create', { frame: request_xml }, { 'HTTP_COOKIE' => "session=#{session_id}" } + post '/epp/command/create', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } assert_equal '1058ad73', Domain.find_by(name: 'brandnew.test').transfer_code end end diff --git a/test/integration/epp/domain/transfer/domain_transfer_test.rb b/test/integration/epp/domain/transfer/domain_transfer_test.rb index 2d47549c8..736a066e6 100644 --- a/test/integration/epp/domain/transfer/domain_transfer_test.rb +++ b/test/integration/epp/domain/transfer/domain_transfer_test.rb @@ -20,8 +20,7 @@ class EppDomainTransferTest < ActionDispatch::IntegrationTest XML - session_id = epp_sessions(:api_goodnames).session_id - post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => "session=#{session_id}" } + post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } assert_equal registrars(:goodnames), domains(:shop).registrar assert_equal '1000', Nokogiri::XML(response.body).at_css('result')[:code] assert_equal 1, Nokogiri::XML(response.body).css('result').size @@ -44,8 +43,7 @@ class EppDomainTransferTest < ActionDispatch::IntegrationTest XML - session_id = epp_sessions(:api_goodnames).session_id - post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => "session=#{session_id}" } + post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } assert Nokogiri::XML(response.body).at_css('result[code="2303"]') end end diff --git a/test/integration/epp/domain/transfer/transfer_code_test.rb b/test/integration/epp/domain/transfer/transfer_code_test.rb index 48c4d8db6..803f5aac7 100644 --- a/test/integration/epp/domain/transfer/transfer_code_test.rb +++ b/test/integration/epp/domain/transfer/transfer_code_test.rb @@ -18,8 +18,7 @@ class EppDomainTransferTransferCodeTest < ActionDispatch::IntegrationTest XML - session_id = epp_sessions(:api_goodnames).session_id - post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => "session=#{session_id}" } + post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } refute_equal registrars(:goodnames), domains(:shop).registrar assert Nokogiri::XML(response.body).at_css('result[code="2201"]') end diff --git a/test/integration/epp/domain/update/transfer_code_test.rb b/test/integration/epp/domain/update/transfer_code_test.rb index eae8ec675..eea29f151 100644 --- a/test/integration/epp/domain/update/transfer_code_test.rb +++ b/test/integration/epp/domain/update/transfer_code_test.rb @@ -20,8 +20,7 @@ class EppDomainUpdateTest < ActionDispatch::IntegrationTest XML - session_id = epp_sessions(:api_bestnames).session_id - post '/epp/command/update', { frame: request_xml }, { 'HTTP_COOKIE' => "session=#{session_id}" } + post '/epp/command/update', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } assert_equal 'f0ff7d17b0', domains(:shop).transfer_code end end From 443485d5d6c83720017102529cb88e40db788245 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sat, 17 Feb 2018 02:48:45 +0200 Subject: [PATCH 11/56] Improve test #694 --- test/integration/epp/domain/create/transfer_code_test.rb | 4 ++++ test/integration/epp/domain/transfer/domain_transfer_test.rb | 2 +- test/integration/epp/domain/transfer/transfer_code_test.rb | 2 +- test/integration/epp/domain/update/transfer_code_test.rb | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/test/integration/epp/domain/create/transfer_code_test.rb b/test/integration/epp/domain/create/transfer_code_test.rb index 109447c94..276386851 100644 --- a/test/integration/epp/domain/create/transfer_code_test.rb +++ b/test/integration/epp/domain/create/transfer_code_test.rb @@ -28,6 +28,8 @@ class EppDomainCreateTransferCodeTest < ActionDispatch::IntegrationTest post '/epp/command/create', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } refute_empty Domain.find_by(name: 'brandnew.test').transfer_code + assert_equal '1000', Nokogiri::XML(response.body).at_css('result')[:code] + assert_equal 1, Nokogiri::XML(response.body).css('result').size end def test_honors_custom @@ -56,5 +58,7 @@ class EppDomainCreateTransferCodeTest < ActionDispatch::IntegrationTest post '/epp/command/create', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } assert_equal '1058ad73', Domain.find_by(name: 'brandnew.test').transfer_code + assert_equal '1000', Nokogiri::XML(response.body).at_css('result')[:code] + assert_equal 1, Nokogiri::XML(response.body).css('result').size end end diff --git a/test/integration/epp/domain/transfer/domain_transfer_test.rb b/test/integration/epp/domain/transfer/domain_transfer_test.rb index 736a066e6..38b7a2757 100644 --- a/test/integration/epp/domain/transfer/domain_transfer_test.rb +++ b/test/integration/epp/domain/transfer/domain_transfer_test.rb @@ -44,6 +44,6 @@ class EppDomainTransferTest < ActionDispatch::IntegrationTest XML post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } - assert Nokogiri::XML(response.body).at_css('result[code="2303"]') + assert_equal '2303', Nokogiri::XML(response.body).at_css('result')[:code] end end diff --git a/test/integration/epp/domain/transfer/transfer_code_test.rb b/test/integration/epp/domain/transfer/transfer_code_test.rb index 803f5aac7..0509d632a 100644 --- a/test/integration/epp/domain/transfer/transfer_code_test.rb +++ b/test/integration/epp/domain/transfer/transfer_code_test.rb @@ -20,6 +20,6 @@ class EppDomainTransferTransferCodeTest < ActionDispatch::IntegrationTest post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } refute_equal registrars(:goodnames), domains(:shop).registrar - assert Nokogiri::XML(response.body).at_css('result[code="2201"]') + assert_equal '2201', Nokogiri::XML(response.body).at_css('result')[:code] end end diff --git a/test/integration/epp/domain/update/transfer_code_test.rb b/test/integration/epp/domain/update/transfer_code_test.rb index eea29f151..92ee58a02 100644 --- a/test/integration/epp/domain/update/transfer_code_test.rb +++ b/test/integration/epp/domain/update/transfer_code_test.rb @@ -22,5 +22,7 @@ class EppDomainUpdateTest < ActionDispatch::IntegrationTest post '/epp/command/update', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } assert_equal 'f0ff7d17b0', domains(:shop).transfer_code + assert_equal '1000', Nokogiri::XML(response.body).at_css('result')[:code] + assert_equal 1, Nokogiri::XML(response.body).css('result').size end end From 62c987f524b2ab3c498a023c68335ca70964ff83 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sat, 17 Feb 2018 02:55:40 +0200 Subject: [PATCH 12/56] Fix test #694 --- test/models/domain/domain_transfer_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/models/domain/domain_transfer_test.rb b/test/models/domain/domain_transfer_test.rb index 0086648a9..cba9d822e 100644 --- a/test/models/domain/domain_transfer_test.rb +++ b/test/models/domain/domain_transfer_test.rb @@ -67,6 +67,6 @@ class DomainTransferTest < ActiveSupport::TestCase def test_bypasses_validation domain = domains(:invalid) domain.transfer(@new_registrar) - assert_equal @new_registrar, @domain.registrar + assert_equal @new_registrar, domain.registrar end end From 6808bcb2458b50451bc4af9aaadeef2d591c633e Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sat, 17 Feb 2018 02:56:19 +0200 Subject: [PATCH 13/56] Improve readability #694 --- test/models/domain/domain_transfer_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/models/domain/domain_transfer_test.rb b/test/models/domain/domain_transfer_test.rb index cba9d822e..9f86615e3 100644 --- a/test/models/domain/domain_transfer_test.rb +++ b/test/models/domain/domain_transfer_test.rb @@ -64,7 +64,7 @@ class DomainTransferTest < ActiveSupport::TestCase end end - def test_bypasses_validation + def test_bypasses_domain_validation domain = domains(:invalid) domain.transfer(@new_registrar) assert_equal @new_registrar, domain.registrar From 46bca463202b3f0dad0776a812389aed54481ac7 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sat, 17 Feb 2018 22:31:29 +0200 Subject: [PATCH 14/56] Tell Rubocop to prefer `alias_method` #694 --- .rubocop.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.rubocop.yml b/.rubocop.yml index cc32da4b9..3d8fd0b90 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1 +1,4 @@ inherit_from: .rubocop_todo.yml + +Style/Alias: + EnforcedStyle: prefer_alias_method From e84a1dc0de346ef5361917c2470a5936d675e99a Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 18 Feb 2018 02:46:20 +0200 Subject: [PATCH 15/56] Change database column type #694 --- ...218004148_change_messages_attached_obj_id_type_to_int.rb | 5 +++++ db/structure.sql | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20180218004148_change_messages_attached_obj_id_type_to_int.rb diff --git a/db/migrate/20180218004148_change_messages_attached_obj_id_type_to_int.rb b/db/migrate/20180218004148_change_messages_attached_obj_id_type_to_int.rb new file mode 100644 index 000000000..9996b5e67 --- /dev/null +++ b/db/migrate/20180218004148_change_messages_attached_obj_id_type_to_int.rb @@ -0,0 +1,5 @@ +class ChangeMessagesAttachedObjIdTypeToInt < ActiveRecord::Migration + def change + change_column :messages, :attached_obj_id, 'integer USING attached_obj_id::integer' + end +end diff --git a/db/structure.sql b/db/structure.sql index 881b1de36..16523bd5c 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -2186,7 +2186,7 @@ CREATE TABLE messages ( registrar_id integer, body character varying NOT NULL, attached_obj_type character varying, - attached_obj_id character varying, + attached_obj_id integer, queued boolean, created_at timestamp without time zone, updated_at timestamp without time zone, @@ -3635,7 +3635,7 @@ ALTER TABLE ONLY contacts -- --- Name: unique_session_id; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- Name: unique_session_id; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: -- ALTER TABLE ONLY epp_sessions @@ -5098,3 +5098,5 @@ INSERT INTO schema_migrations (version) VALUES ('20180214200224'); INSERT INTO schema_migrations (version) VALUES ('20180214213743'); +INSERT INTO schema_migrations (version) VALUES ('20180218004148'); + From 4ab6821d8a21e7c2b57d6d7f9b47b08787795632 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 18 Feb 2018 05:08:28 +0200 Subject: [PATCH 16/56] Improve tests #694 --- test/fixtures/contacts.yml | 11 +++ test/fixtures/domain_contacts.yml | 5 ++ test/fixtures/domain_transfers.yml | 7 ++ test/integration/api/domain_transfers_test.rb | 49 ++++++++-- .../{transfer_code_test.rb => base_test.rb} | 11 ++- .../domain/transfer/domain_transfer_test.rb | 49 ---------- .../epp/domain/transfer/query_test.rb | 74 +++++++++++++++ .../epp/domain/transfer/request_test.rb | 90 +++++++++++++++++++ ...main_transfer_test.rb => transfer_test.rb} | 18 ---- 9 files changed, 236 insertions(+), 78 deletions(-) create mode 100644 test/fixtures/domain_transfers.yml rename test/integration/epp/domain/transfer/{transfer_code_test.rb => base_test.rb} (65%) delete mode 100644 test/integration/epp/domain/transfer/domain_transfer_test.rb create mode 100644 test/integration/epp/domain/transfer/query_test.rb create mode 100644 test/integration/epp/domain/transfer/request_test.rb rename test/models/domain/{domain_transfer_test.rb => transfer_test.rb} (78%) diff --git a/test/fixtures/contacts.yml b/test/fixtures/contacts.yml index 8c0fb4e10..eaf4401b7 100644 --- a/test/fixtures/contacts.yml +++ b/test/fixtures/contacts.yml @@ -9,6 +9,17 @@ john: code: john-001 auth_info: cacb5b +william: + name: William + email: william@inbox.test + phone: '+555.555' + ident: 1234 + ident_type: priv + ident_country_code: US + registrar: bestnames + code: william-001 + auth_info: 6573d0 + jane: name: Jane email: jane@mail.test diff --git a/test/fixtures/domain_contacts.yml b/test/fixtures/domain_contacts.yml index fd60e8c99..3442278a1 100644 --- a/test/fixtures/domain_contacts.yml +++ b/test/fixtures/domain_contacts.yml @@ -3,6 +3,11 @@ shop_jane: contact: jane type: AdminDomainContact +shop_william: + domain: shop + contact: william + type: TechDomainContact + airport_john: domain: airport contact: john diff --git a/test/fixtures/domain_transfers.yml b/test/fixtures/domain_transfers.yml new file mode 100644 index 000000000..c8b4181f2 --- /dev/null +++ b/test/fixtures/domain_transfers.yml @@ -0,0 +1,7 @@ +shop: + status: serverApproved + transfer_requested_at: 2010-07-05 + transferred_at: 2010-07-05 + domain: shop + old_registrar: bestnames + new_registrar: goodnames diff --git a/test/integration/api/domain_transfers_test.rb b/test/integration/api/domain_transfers_test.rb index 8d6cd6c5e..80c637eaa 100644 --- a/test/integration/api/domain_transfers_test.rb +++ b/test/integration/api/domain_transfers_test.rb @@ -1,11 +1,12 @@ require 'test_helper' class APIDomainTransfersTest < ActionDispatch::IntegrationTest - def test_transfers_domain - request_params = { format: :json, - data: { domainTransfers: [{ domainName: 'shop.test', transferCode: '65078d5' }] } } + def setup + @domain = domains(:shop) + end + + def test_returns_domain_transfers post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } - assert_equal registrars(:goodnames), domains(:shop).registrar assert_response 200 assert_equal ({ data: [{ type: 'domain_transfer' @@ -13,6 +14,39 @@ class APIDomainTransfersTest < ActionDispatch::IntegrationTest JSON.parse(response.body, symbolize_names: true) end + def test_approves_automatically + post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } + assert @domain.domain_transfers.last.approved? + end + + def test_changes_registrar + post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } + @domain.reload + assert_equal registrars(:goodnames), @domain.registrar + end + + def test_regenerates_transfer_code + @old_transfer_code = @domain.transfer_code + + post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } + @domain.reload + refute_equal @domain.transfer_code, @old_transfer_code + end + + def test_notifies_old_registrar + @old_registrar = @domain.registrar + + assert_difference -> { @old_registrar.messages.count } do + post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } + end + end + + def test_creates_copy_of_registrant_admin_and_tech_contacts + assert_difference 'Contact.count', 3 do + post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } + end + end + def test_fails_if_domain_does_not_exist request_params = { format: :json, data: { domainTransfers: [{ domainName: 'non-existent.test', transferCode: 'any' }] } } @@ -27,13 +61,18 @@ class APIDomainTransfersTest < ActionDispatch::IntegrationTest data: { domainTransfers: [{ domainName: 'shop.test', transferCode: 'wrong' }] } } post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } assert_response 400 - refute_equal registrars(:goodnames), domains(:shop).registrar + refute_equal registrars(:goodnames), @domain.registrar assert_equal ({ errors: [{ title: 'shop.test transfer code is wrong' }] }), JSON.parse(response.body, symbolize_names: true) end private + def request_params + { format: :json, + data: { domainTransfers: [{ domainName: 'shop.test', transferCode: '65078d5' }] } } + end + def http_auth_key ActionController::HttpAuthentication::Basic.encode_credentials('test_goodnames', 'testtest') end diff --git a/test/integration/epp/domain/transfer/transfer_code_test.rb b/test/integration/epp/domain/transfer/base_test.rb similarity index 65% rename from test/integration/epp/domain/transfer/transfer_code_test.rb rename to test/integration/epp/domain/transfer/base_test.rb index 0509d632a..aa9f841b6 100644 --- a/test/integration/epp/domain/transfer/transfer_code_test.rb +++ b/test/integration/epp/domain/transfer/base_test.rb @@ -1,16 +1,16 @@ require 'test_helper' -class EppDomainTransferTransferCodeTest < ActionDispatch::IntegrationTest - def test_wrong +class EppDomainTransferBaseTest < ActionDispatch::IntegrationTest + def test_non_existent_domain request_xml = <<-XML - shop.test + non-existent.test - wrong + any @@ -19,7 +19,6 @@ class EppDomainTransferTransferCodeTest < ActionDispatch::IntegrationTest XML post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } - refute_equal registrars(:goodnames), domains(:shop).registrar - assert_equal '2201', Nokogiri::XML(response.body).at_css('result')[:code] + assert_equal '2303', Nokogiri::XML(response.body).at_css('result')[:code] end end diff --git a/test/integration/epp/domain/transfer/domain_transfer_test.rb b/test/integration/epp/domain/transfer/domain_transfer_test.rb deleted file mode 100644 index 38b7a2757..000000000 --- a/test/integration/epp/domain/transfer/domain_transfer_test.rb +++ /dev/null @@ -1,49 +0,0 @@ -require 'test_helper' - -class EppDomainTransferTest < ActionDispatch::IntegrationTest - def test_transfers_domain_at_once_if_auto_confirm_is_enabled - Setting.transfer_wait_time = 0 - - request_xml = <<-XML - - - - - - shop.test - - 65078d5 - - - - - - XML - - post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } - assert_equal registrars(:goodnames), domains(:shop).registrar - assert_equal '1000', Nokogiri::XML(response.body).at_css('result')[:code] - assert_equal 1, Nokogiri::XML(response.body).css('result').size - end - - def test_non_existent_domain - request_xml = <<-XML - - - - - - non-existent.test - - any - - - - - - XML - - post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } - assert_equal '2303', Nokogiri::XML(response.body).at_css('result')[:code] - end -end diff --git a/test/integration/epp/domain/transfer/query_test.rb b/test/integration/epp/domain/transfer/query_test.rb new file mode 100644 index 000000000..0097a43f4 --- /dev/null +++ b/test/integration/epp/domain/transfer/query_test.rb @@ -0,0 +1,74 @@ +require 'test_helper' + +class EppDomainTransferQueryTest < ActionDispatch::IntegrationTest + def test_domain_transfer_details + request_xml = <<-XML + + + + + + shop.test + + 65078d5 + + + + + + XML + + post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } + xml_doc = Nokogiri::XML(response.body) + assert_equal '1000', xml_doc.at_css('result')[:code] + assert_equal 1, xml_doc.css('result').size + assert_equal 'shop.test', xml_doc.xpath('//domain:name', 'domain' => 'https://epp.tld.ee/schema/domain-eis-1.0.xsd').text + assert_equal 'serverApproved', xml_doc.xpath('//domain:trStatus', 'domain' => 'https://epp.tld.ee/schema/domain-eis-1.0.xsd').text + assert_equal 'goodnames', xml_doc.xpath('//domain:reID', 'domain' => 'https://epp.tld.ee/schema/domain-eis-1.0.xsd').text + assert_equal 'bestnames', xml_doc.xpath('//domain:acID', 'domain' => 'https://epp.tld.ee/schema/domain-eis-1.0.xsd').text + end + + def test_wrong_transfer_code + request_xml = <<-XML + + + + + + shop.test + + wrong + + + + + + XML + + post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } + assert_equal '2201', Nokogiri::XML(response.body).at_css('result')[:code] + end + + def test_no_domain_transfer + domains(:shop).domain_transfers.delete_all + + request_xml = <<-XML + + + + + + shop.test + + 65078d5 + + + + + + XML + + post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } + assert_equal '2303', Nokogiri::XML(response.body).at_css('result')[:code] + end +end diff --git a/test/integration/epp/domain/transfer/request_test.rb b/test/integration/epp/domain/transfer/request_test.rb new file mode 100644 index 000000000..981223d1e --- /dev/null +++ b/test/integration/epp/domain/transfer/request_test.rb @@ -0,0 +1,90 @@ +require 'test_helper' + +class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest + def setup + @domain = domains(:shop) + Setting.transfer_wait_time = 0 + end + + def test_transfers_domain_at_once_if_auto_approval_is_enabled + post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } + assert_equal '1000', Nokogiri::XML(response.body).at_css('result')[:code] + assert_equal 1, Nokogiri::XML(response.body).css('result').size + end + + def test_approves_automatically + post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } + assert @domain.domain_transfers.last.approved? + end + + def test_changes_registrar + post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } + @domain.reload + assert_equal registrars(:goodnames), @domain.registrar + end + + def test_regenerates_transfer_code + @old_transfer_code = @domain.transfer_code + + post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } + + @domain.reload + refute_equal @domain.transfer_code, @old_transfer_code + end + + def test_notifies_old_registrar + @old_registrar = @domain.registrar + + assert_difference -> { @old_registrar.messages.count } do + post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } + end + end + + def test_creates_copy_of_registrant_admin_and_tech_contacts + assert_difference 'Contact.count', 3 do + post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } + end + end + + def test_wrong_transfer_code + request_xml = <<-XML + + + + + + shop.test + + wrong + + + + + + XML + + post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } + refute_equal registrars(:goodnames), @domain.registrar + assert_equal '2201', Nokogiri::XML(response.body).at_css('result')[:code] + end + + private + + def request_xml + <<-XML + + + + + + shop.test + + 65078d5 + + + + + + XML + end +end diff --git a/test/models/domain/domain_transfer_test.rb b/test/models/domain/transfer_test.rb similarity index 78% rename from test/models/domain/domain_transfer_test.rb rename to test/models/domain/transfer_test.rb index 9f86615e3..7b4e83138 100644 --- a/test/models/domain/domain_transfer_test.rb +++ b/test/models/domain/transfer_test.rb @@ -46,24 +46,6 @@ class DomainTransferTest < ActiveSupport::TestCase refute_same old_transfer_code, @domain.transfer_code end - def test_creates_domain_transfer - assert_difference 'DomainTransfer.count' do - @domain.transfer(@new_registrar) - end - end - - def test_notifies_old_registrar - assert_difference 'Message.count' do - @domain.transfer(@new_registrar) - end - end - - def test_copies_contacts - assert_difference 'Contact.count', 2 do - @domain.transfer(@new_registrar) - end - end - def test_bypasses_domain_validation domain = domains(:invalid) domain.transfer(@new_registrar) From 1fa3a3496c3788b3f68a3956810c6f66669f7dd8 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 18 Feb 2018 23:52:50 +0200 Subject: [PATCH 17/56] Bypass domain validation on transfer #694 --- app/models/concerns/domain/transferable.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/concerns/domain/transferable.rb b/app/models/concerns/domain/transferable.rb index 62b70a71b..67ebe0027 100644 --- a/app/models/concerns/domain/transferable.rb +++ b/app/models/concerns/domain/transferable.rb @@ -28,7 +28,7 @@ module Concerns::Domain::Transferable ) transfer_contacts(new_registrar) - save! + save(validate: false) end end From b16f931e9c7bc00cfc133330c87c2a3ecd2fd0e8 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Feb 2018 00:05:11 +0200 Subject: [PATCH 18/56] Extract method #694 --- app/models/concerns/domain/transferable.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/models/concerns/domain/transferable.rb b/app/models/concerns/domain/transferable.rb index 67ebe0027..d05535cff 100644 --- a/app/models/concerns/domain/transferable.rb +++ b/app/models/concerns/domain/transferable.rb @@ -2,7 +2,7 @@ module Concerns::Domain::Transferable extend ActiveSupport::Concern included do - after_initialize :generate_transfer_code, if: 'new_record? && transfer_code.blank?' + after_initialize :generate_transfer_code, if: :generate_transfer_code? end def transfer(new_registrar) @@ -34,6 +34,10 @@ module Concerns::Domain::Transferable private + def generate_transfer_code? + new_record? && transfer_code.blank? + end + def generate_transfer_code self.transfer_code = SecureRandom.hex end From fec617aa7d7846796cfd19e11f168296b2241768 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Feb 2018 00:56:17 +0200 Subject: [PATCH 19/56] Improve tests #694 --- .../epp/domain/transfer/base_test.rb | 23 +++++++++++ .../epp/domain/transfer/query_test.rb | 23 +---------- .../epp/domain/transfer/request_test.rb | 38 +++++++------------ 3 files changed, 38 insertions(+), 46 deletions(-) diff --git a/test/integration/epp/domain/transfer/base_test.rb b/test/integration/epp/domain/transfer/base_test.rb index aa9f841b6..4cb13f999 100644 --- a/test/integration/epp/domain/transfer/base_test.rb +++ b/test/integration/epp/domain/transfer/base_test.rb @@ -1,6 +1,29 @@ require 'test_helper' class EppDomainTransferBaseTest < ActionDispatch::IntegrationTest + def test_does_not_transfer_if_transfer_code_is_wrong + request_xml = <<-XML + + + + + + shop.test + + wrong + + + + + + XML + + post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } + domains(:shop).reload + assert_equal registrars(:bestnames), domains(:shop).registrar + assert_equal '2201', Nokogiri::XML(response.body).at_css('result')[:code] + end + def test_non_existent_domain request_xml = <<-XML diff --git a/test/integration/epp/domain/transfer/query_test.rb b/test/integration/epp/domain/transfer/query_test.rb index 0097a43f4..df426ba11 100644 --- a/test/integration/epp/domain/transfer/query_test.rb +++ b/test/integration/epp/domain/transfer/query_test.rb @@ -1,7 +1,7 @@ require 'test_helper' class EppDomainTransferQueryTest < ActionDispatch::IntegrationTest - def test_domain_transfer_details + def test_returns_domain_transfer_details request_xml = <<-XML @@ -28,27 +28,6 @@ class EppDomainTransferQueryTest < ActionDispatch::IntegrationTest assert_equal 'bestnames', xml_doc.xpath('//domain:acID', 'domain' => 'https://epp.tld.ee/schema/domain-eis-1.0.xsd').text end - def test_wrong_transfer_code - request_xml = <<-XML - - - - - - shop.test - - wrong - - - - - - XML - - post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } - assert_equal '2201', Nokogiri::XML(response.body).at_css('result')[:code] - end - def test_no_domain_transfer domains(:shop).domain_transfers.delete_all diff --git a/test/integration/epp/domain/transfer/request_test.rb b/test/integration/epp/domain/transfer/request_test.rb index 981223d1e..f2091dfad 100644 --- a/test/integration/epp/domain/transfer/request_test.rb +++ b/test/integration/epp/domain/transfer/request_test.rb @@ -6,15 +6,16 @@ class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest Setting.transfer_wait_time = 0 end - def test_transfers_domain_at_once_if_auto_approval_is_enabled + def test_transfers_domain_at_once post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } assert_equal '1000', Nokogiri::XML(response.body).at_css('result')[:code] assert_equal 1, Nokogiri::XML(response.body).css('result').size end - def test_approves_automatically + def test_approves_automatically_if_auto_approval_is_enabled post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } - assert @domain.domain_transfers.last.approved? + assert_equal 'serverApproved', Nokogiri::XML(response.body).xpath('//domain:trStatus', 'domain' => + 'https://epp.tld.ee/schema/domain-eis-1.0.xsd').text end def test_changes_registrar @@ -40,32 +41,16 @@ class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest end end - def test_creates_copy_of_registrant_admin_and_tech_contacts + def test_duplicates_registrant_admin_and_tech_contacts assert_difference 'Contact.count', 3 do post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } end end - def test_wrong_transfer_code - request_xml = <<-XML - - - - - - shop.test - - wrong - - - - - - XML - - post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } - refute_equal registrars(:goodnames), @domain.registrar - assert_equal '2201', Nokogiri::XML(response.body).at_css('result')[:code] + def test_saves_legal_document + assert_difference -> { @domain.legal_documents(true).size } do + post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } + end end private @@ -83,6 +68,11 @@ class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest + + + test + + XML From 126428f38f34ef756f71c8f0ffe9e99d8c62b105 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Feb 2018 00:59:00 +0200 Subject: [PATCH 20/56] Improve tests #694 --- test/integration/api/domain_transfers_test.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/integration/api/domain_transfers_test.rb b/test/integration/api/domain_transfers_test.rb index 80c637eaa..938fec53f 100644 --- a/test/integration/api/domain_transfers_test.rb +++ b/test/integration/api/domain_transfers_test.rb @@ -14,9 +14,9 @@ class APIDomainTransfersTest < ActionDispatch::IntegrationTest JSON.parse(response.body, symbolize_names: true) end - def test_approves_automatically + def test_approves_automatically_if_auto_approval_is_enabled post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } - assert @domain.domain_transfers.last.approved? + assert @domain.domain_transfers(true).last.approved? end def test_changes_registrar @@ -41,7 +41,7 @@ class APIDomainTransfersTest < ActionDispatch::IntegrationTest end end - def test_creates_copy_of_registrant_admin_and_tech_contacts + def test_duplicates_registrant_admin_and_tech_contacts assert_difference 'Contact.count', 3 do post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } end From 4ada9d1bd00a02f7d10fabf84a1ce135bd59c4c0 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Feb 2018 02:04:39 +0200 Subject: [PATCH 21/56] Fail earlier if domain is non-transferable Regardless of EPP transfer operation #694 --- app/controllers/epp/domains_controller.rb | 7 ++++++ app/models/concerns/domain/transferable.rb | 4 +++ app/models/epp/domain.rb | 7 ------ test/fixtures/domains.yml | 9 +++++++ .../epp/domain/transfer/base_test.rb | 25 ++++++++++++++++++- 5 files changed, 44 insertions(+), 8 deletions(-) diff --git a/app/controllers/epp/domains_controller.rb b/app/controllers/epp/domains_controller.rb index 02c75c7da..3b8b94155 100644 --- a/app/controllers/epp/domains_controller.rb +++ b/app/controllers/epp/domains_controller.rb @@ -142,6 +142,13 @@ class Epp::DomainsController < EppController authorize! :transfer, @domain, @password action = params[:parsed_frame].css('transfer').first[:op] + if @domain.non_transferable? + throw :epp_error, { + code: '2304', + msg: I18n.t(:object_status_prohibits_operation) + } + end + @domain_transfer = @domain.transfer(params[:parsed_frame], action, current_user) if @domain_transfer diff --git a/app/models/concerns/domain/transferable.rb b/app/models/concerns/domain/transferable.rb index d05535cff..eda71722c 100644 --- a/app/models/concerns/domain/transferable.rb +++ b/app/models/concerns/domain/transferable.rb @@ -5,6 +5,10 @@ module Concerns::Domain::Transferable after_initialize :generate_transfer_code, if: :generate_transfer_code? end + def non_transferable? + !transferrable? + end + def transfer(new_registrar) old_registrar = registrar diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb index a59094d1e..2b2b6d615 100644 --- a/app/models/epp/domain.rb +++ b/app/models/epp/domain.rb @@ -644,13 +644,6 @@ class Epp::Domain < Domain # rubocop: disable Metrics/MethodLength # rubocop: disable Metrics/AbcSize def query_transfer(frame, current_user) - unless transferrable? - throw :epp_error, { - code: '2304', - msg: I18n.t(:object_status_prohibits_operation) - } - end - if current_user.registrar == registrar throw :epp_error, { code: '2002', diff --git a/test/fixtures/domains.yml b/test/fixtures/domains.yml index 7c0844d97..d6ffe2904 100644 --- a/test/fixtures/domains.yml +++ b/test/fixtures/domains.yml @@ -28,6 +28,15 @@ library: period: 1 period_unit: m +non_transferable: + name: non-transferable.test + transfer_code: d382682 + valid_to: 2010-07-05 + registrar: bestnames + registrant: john + statuses: + - serverTransferProhibited + invalid: name: invalid.test transfer_code: any diff --git a/test/integration/epp/domain/transfer/base_test.rb b/test/integration/epp/domain/transfer/base_test.rb index 4cb13f999..a973037e1 100644 --- a/test/integration/epp/domain/transfer/base_test.rb +++ b/test/integration/epp/domain/transfer/base_test.rb @@ -1,7 +1,30 @@ require 'test_helper' class EppDomainTransferBaseTest < ActionDispatch::IntegrationTest - def test_does_not_transfer_if_transfer_code_is_wrong + def test_non_transferable_domain + request_xml = <<-XML + + + + + + non-transferable.test + + d382682 + + + + + + XML + + post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } + domains(:shop).reload + assert_equal registrars(:bestnames), domains(:shop).registrar + assert_equal '2304', Nokogiri::XML(response.body).at_css('result')[:code] + end + + def test_wrong_transfer_code request_xml = <<-XML From 36f65a267cddc2ae5fbda6d86faf3731614ca61d Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Feb 2018 02:14:13 +0200 Subject: [PATCH 22/56] Improve tests #694 --- .../epp/domain/transfer/base_test.rb | 23 --------- .../epp/domain/transfer/query_test.rb | 48 +++++++++++-------- .../epp/domain/transfer/request_test.rb | 23 +++++++++ 3 files changed, 51 insertions(+), 43 deletions(-) diff --git a/test/integration/epp/domain/transfer/base_test.rb b/test/integration/epp/domain/transfer/base_test.rb index a973037e1..0ceeca30a 100644 --- a/test/integration/epp/domain/transfer/base_test.rb +++ b/test/integration/epp/domain/transfer/base_test.rb @@ -24,29 +24,6 @@ class EppDomainTransferBaseTest < ActionDispatch::IntegrationTest assert_equal '2304', Nokogiri::XML(response.body).at_css('result')[:code] end - def test_wrong_transfer_code - request_xml = <<-XML - - - - - - shop.test - - wrong - - - - - - XML - - post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } - domains(:shop).reload - assert_equal registrars(:bestnames), domains(:shop).registrar - assert_equal '2201', Nokogiri::XML(response.body).at_css('result')[:code] - end - def test_non_existent_domain request_xml = <<-XML diff --git a/test/integration/epp/domain/transfer/query_test.rb b/test/integration/epp/domain/transfer/query_test.rb index df426ba11..f12cb381f 100644 --- a/test/integration/epp/domain/transfer/query_test.rb +++ b/test/integration/epp/domain/transfer/query_test.rb @@ -2,22 +2,6 @@ require 'test_helper' class EppDomainTransferQueryTest < ActionDispatch::IntegrationTest def test_returns_domain_transfer_details - request_xml = <<-XML - - - - - - shop.test - - 65078d5 - - - - - - XML - post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } xml_doc = Nokogiri::XML(response.body) assert_equal '1000', xml_doc.at_css('result')[:code] @@ -28,10 +12,37 @@ class EppDomainTransferQueryTest < ActionDispatch::IntegrationTest assert_equal 'bestnames', xml_doc.xpath('//domain:acID', 'domain' => 'https://epp.tld.ee/schema/domain-eis-1.0.xsd').text end + def test_wrong_transfer_code + request_xml = <<-XML + + + + + + shop.test + + wrong + + + + + + XML + + post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } + assert_equal '2201', Nokogiri::XML(response.body).at_css('result')[:code] + end + def test_no_domain_transfer domains(:shop).domain_transfers.delete_all + post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } + assert_equal '2303', Nokogiri::XML(response.body).at_css('result')[:code] + end - request_xml = <<-XML + private + + def request_xml + <<-XML @@ -46,8 +57,5 @@ class EppDomainTransferQueryTest < ActionDispatch::IntegrationTest XML - - post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } - assert_equal '2303', Nokogiri::XML(response.body).at_css('result')[:code] end end diff --git a/test/integration/epp/domain/transfer/request_test.rb b/test/integration/epp/domain/transfer/request_test.rb index f2091dfad..a775e3204 100644 --- a/test/integration/epp/domain/transfer/request_test.rb +++ b/test/integration/epp/domain/transfer/request_test.rb @@ -53,6 +53,29 @@ class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest end end + def test_wrong_transfer_code + request_xml = <<-XML + + + + + + shop.test + + wrong + + + + + + XML + + post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } + domains(:shop).reload + assert_equal registrars(:bestnames), domains(:shop).registrar + assert_equal '2201', Nokogiri::XML(response.body).at_css('result')[:code] + end + private def request_xml From 1ba274764db07cfd71c0b0729d236118b630a1ba Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Feb 2018 02:21:47 +0200 Subject: [PATCH 23/56] Convert spec to test #694 --- .../epp/domain/transfer/discarded_spec.rb | 45 ------------------- test/fixtures/domains.yml | 9 ++++ .../epp/domain/transfer/request_test.rb | 23 ++++++++++ 3 files changed, 32 insertions(+), 45 deletions(-) delete mode 100644 spec/requests/epp/domain/transfer/discarded_spec.rb diff --git a/spec/requests/epp/domain/transfer/discarded_spec.rb b/spec/requests/epp/domain/transfer/discarded_spec.rb deleted file mode 100644 index 26596d993..000000000 --- a/spec/requests/epp/domain/transfer/discarded_spec.rb +++ /dev/null @@ -1,45 +0,0 @@ -require 'rails_helper' - -RSpec.describe 'EPP domain:transfer' do - let(:registrar) { create(:registrar) } - let(:user) { create(:api_user_epp, registrar: registrar) } - let(:session_id) { create(:epp_session, user: user).session_id } - let(:request_xml) { <<-XML - - - - - - test.com - - 98oiewslkfkd - - - - - - XML - } - - before :example do - login_as user - end - - context 'when domain is not discarded' do - let!(:domain) { create(:domain, name: 'test.com') } - - it 'returns epp code of 1000' do - post '/epp/command/transfer', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" - expect(response).to have_code_of(1000) - end - end - - context 'when domain is discarded' do - let!(:domain) { create(:domain_discarded, name: 'test.com') } - - it 'returns epp code of 2105' do - post '/epp/command/transfer', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" - expect(response).to have_code_of(2105) - end - end -end diff --git a/test/fixtures/domains.yml b/test/fixtures/domains.yml index d6ffe2904..2e4a06de2 100644 --- a/test/fixtures/domains.yml +++ b/test/fixtures/domains.yml @@ -37,6 +37,15 @@ non_transferable: statuses: - serverTransferProhibited +discarded: + name: discarded.test + transfer_code: any + valid_to: 2010-07-05 + registrar: bestnames + registrant: john + statuses: + - deleteCandidate + invalid: name: invalid.test transfer_code: any diff --git a/test/integration/epp/domain/transfer/request_test.rb b/test/integration/epp/domain/transfer/request_test.rb index a775e3204..007efe762 100644 --- a/test/integration/epp/domain/transfer/request_test.rb +++ b/test/integration/epp/domain/transfer/request_test.rb @@ -53,6 +53,29 @@ class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest end end + def test_discarded_domain + request_xml = <<-XML + + + + + + discarded.test + + any + + + + + + XML + + post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } + @domain.reload + assert_equal registrars(:bestnames), @domain.registrar + assert_equal '2105', Nokogiri::XML(response.body).at_css('result')[:code] + end + def test_wrong_transfer_code request_xml = <<-XML From de625878068e832d135350e009e2139bbd5fc04c Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Feb 2018 02:22:47 +0200 Subject: [PATCH 24/56] Improve test #694 --- test/integration/epp/domain/transfer/request_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/epp/domain/transfer/request_test.rb b/test/integration/epp/domain/transfer/request_test.rb index 007efe762..5031760c3 100644 --- a/test/integration/epp/domain/transfer/request_test.rb +++ b/test/integration/epp/domain/transfer/request_test.rb @@ -94,8 +94,8 @@ class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest XML post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } - domains(:shop).reload - assert_equal registrars(:bestnames), domains(:shop).registrar + @domain.reload + refute_equal registrars(:goodnames), @domain.registrar assert_equal '2201', Nokogiri::XML(response.body).at_css('result')[:code] end From 5c4d69cc1877f0bf5827694526f22713f5ab05df Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Feb 2018 02:26:25 +0200 Subject: [PATCH 25/56] Move method #694 --- app/models/concerns/domain/transferable.rb | 14 ++++++++++++++ app/models/epp/domain.rb | 14 -------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/models/concerns/domain/transferable.rb b/app/models/concerns/domain/transferable.rb index eda71722c..ce442140a 100644 --- a/app/models/concerns/domain/transferable.rb +++ b/app/models/concerns/domain/transferable.rb @@ -38,6 +38,20 @@ module Concerns::Domain::Transferable private + def transferrable? + (statuses & [ + DomainStatus::PENDING_DELETE_CONFIRMATION, + DomainStatus::PENDING_CREATE, + DomainStatus::PENDING_UPDATE, + DomainStatus::PENDING_DELETE, + DomainStatus::PENDING_RENEW, + DomainStatus::PENDING_TRANSFER, + DomainStatus::FORCE_DELETE, + DomainStatus::SERVER_TRANSFER_PROHIBITED, + DomainStatus::CLIENT_TRANSFER_PROHIBITED + ]).empty? + end + def generate_transfer_code? new_record? && transfer_code.blank? end diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb index 2b2b6d615..033640c1e 100644 --- a/app/models/epp/domain.rb +++ b/app/models/epp/domain.rb @@ -804,20 +804,6 @@ class Epp::Domain < Domain true end - def transferrable? - (statuses & [ - DomainStatus::PENDING_DELETE_CONFIRMATION, - DomainStatus::PENDING_CREATE, - DomainStatus::PENDING_UPDATE, - DomainStatus::PENDING_DELETE, - DomainStatus::PENDING_RENEW, - DomainStatus::PENDING_TRANSFER, - DomainStatus::FORCE_DELETE, - DomainStatus::SERVER_TRANSFER_PROHIBITED, - DomainStatus::CLIENT_TRANSFER_PROHIBITED - ]).empty? - end - ## SHARED # For domain transfer From 07e40d61ddb8c6b01f84f5d51a76d829b3809673 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Feb 2018 02:28:00 +0200 Subject: [PATCH 26/56] Fix typo #694 --- app/models/concerns/domain/transferable.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/concerns/domain/transferable.rb b/app/models/concerns/domain/transferable.rb index ce442140a..df00a1b42 100644 --- a/app/models/concerns/domain/transferable.rb +++ b/app/models/concerns/domain/transferable.rb @@ -6,7 +6,7 @@ module Concerns::Domain::Transferable end def non_transferable? - !transferrable? + !transferable? end def transfer(new_registrar) @@ -38,7 +38,7 @@ module Concerns::Domain::Transferable private - def transferrable? + def transferable? (statuses & [ DomainStatus::PENDING_DELETE_CONFIRMATION, DomainStatus::PENDING_CREATE, From 34f1e2be2f4b41d4d08105a687695ab835071a4a Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Feb 2018 02:40:25 +0200 Subject: [PATCH 27/56] Improve tests #694 --- test/integration/api/domain_transfers_test.rb | 7 +++++++ test/integration/epp/domain/transfer/request_test.rb | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/test/integration/api/domain_transfers_test.rb b/test/integration/api/domain_transfers_test.rb index 938fec53f..12c8c78c1 100644 --- a/test/integration/api/domain_transfers_test.rb +++ b/test/integration/api/domain_transfers_test.rb @@ -3,6 +3,7 @@ require 'test_helper' class APIDomainTransfersTest < ActionDispatch::IntegrationTest def setup @domain = domains(:shop) + Setting.transfer_wait_time = 0 # Auto-approval end def test_returns_domain_transfers @@ -14,6 +15,12 @@ class APIDomainTransfersTest < ActionDispatch::IntegrationTest JSON.parse(response.body, symbolize_names: true) end + def test_creates_new_domain_transfer + assert_difference -> { @domain.domain_transfers.size } do + post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } + end + end + def test_approves_automatically_if_auto_approval_is_enabled post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } assert @domain.domain_transfers(true).last.approved? diff --git a/test/integration/epp/domain/transfer/request_test.rb b/test/integration/epp/domain/transfer/request_test.rb index 5031760c3..8ad1f6c92 100644 --- a/test/integration/epp/domain/transfer/request_test.rb +++ b/test/integration/epp/domain/transfer/request_test.rb @@ -12,6 +12,12 @@ class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest assert_equal 1, Nokogiri::XML(response.body).css('result').size end + def test_creates_new_domain_transfer + assert_difference -> { @domain.domain_transfers.size } do + post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } + end + end + def test_approves_automatically_if_auto_approval_is_enabled post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } assert_equal 'serverApproved', Nokogiri::XML(response.body).xpath('//domain:trStatus', 'domain' => From 8606cf7b48107c102bb3622d81f518cd26ff9b5c Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Feb 2018 02:52:35 +0200 Subject: [PATCH 28/56] Refactor domain transfer #694 --- app/api/repp/domain_transfers_v1.rb | 2 +- app/models/concerns/domain/transferable.rb | 17 --------- app/models/domain_transfer.rb | 42 ++++++++++++++++++++++ test/models/domain_transfer_test.rb | 30 ++++++++++++++++ 4 files changed, 73 insertions(+), 18 deletions(-) create mode 100644 test/models/domain_transfer_test.rb diff --git a/app/api/repp/domain_transfers_v1.rb b/app/api/repp/domain_transfers_v1.rb index addae67b2..ea714a731 100644 --- a/app/api/repp/domain_transfers_v1.rb +++ b/app/api/repp/domain_transfers_v1.rb @@ -25,7 +25,7 @@ module Repp if domain if domain.transfer_code == transfer_code - domain.transfer(new_registrar) + DomainTransfer.request(domain, new_registrar) successful_domain_transfers << { type: 'domain_transfer' } else errors << { title: "#{domain_name} transfer code is wrong" } diff --git a/app/models/concerns/domain/transferable.rb b/app/models/concerns/domain/transferable.rb index df00a1b42..554eb7dd3 100644 --- a/app/models/concerns/domain/transferable.rb +++ b/app/models/concerns/domain/transferable.rb @@ -10,27 +10,10 @@ module Concerns::Domain::Transferable end def transfer(new_registrar) - old_registrar = registrar - self.registrar = new_registrar regenerate_transfer_code - contact_codes = contacts.pluck(:code).sort.uniq - registrant_code = registrant.code - transaction do - old_registrar.messages.create!( - body: I18n.t('domain_transfer_was_approved', contacts: contact_codes, registrant: registrant_code), - attached_obj_id: id, - attached_obj_type: self.class.name - ) - - domain_transfers.create!( - transfer_requested_at: Time.zone.now, - old_registrar: old_registrar, - new_registrar: new_registrar - ) - transfer_contacts(new_registrar) save(validate: false) end diff --git a/app/models/domain_transfer.rb b/app/models/domain_transfer.rb index 5f498185e..42f531030 100644 --- a/app/models/domain_transfer.rb +++ b/app/models/domain_transfer.rb @@ -11,6 +11,25 @@ class DomainTransfer < ActiveRecord::Base before_create :set_wait_until + class << self + def request(domain, new_registrar) + domain_transfer = create!( + transfer_requested_at: Time.zone.now, + domain: domain, + old_registrar: domain.registrar, + new_registrar: new_registrar + ) + + domain_transfer.approve if approve_automatically? + end + + private + + def approve_automatically? + Setting.transfer_wait_time.zero? + end + end + def set_wait_until wait_time = Setting.transfer_wait_time return if wait_time == 0 @@ -45,4 +64,27 @@ class DomainTransfer < ActiveRecord::Base attached_obj_type: self.class.to_s ) end + + def approve + transaction do + self.status = SERVER_APPROVED + save! + + notify_old_registrar + domain.transfer(new_registrar) + end + end + + private + + def notify_old_registrar + old_contacts_codes = domain.contacts.pluck(:code).sort.uniq + old_registrant_code = domain.registrant.code + + old_registrar.messages.create!( + body: I18n.t('domain_transfer_was_approved', contacts: old_contacts_codes, registrant: old_registrant_code), + attached_obj_id: id, + attached_obj_type: self.class.name + ) + end end diff --git a/test/models/domain_transfer_test.rb b/test/models/domain_transfer_test.rb new file mode 100644 index 000000000..12f36d459 --- /dev/null +++ b/test/models/domain_transfer_test.rb @@ -0,0 +1,30 @@ +require 'test_helper' + +class DomainTransferTest < ActiveSupport::TestCase + def setup + @domain_transfer = domain_transfers(:shop) + end + + def test_approval + @domain_transfer.approve + @domain_transfer.reload + assert @domain_transfer.approved? + end + + def test_notifies_old_registrar_on_approval + old_registrar = @domain_transfer.old_registrar + + assert_difference -> { old_registrar.messages.count } do + @domain_transfer.approve + end + + body = 'Domain transfer was approved, associated contacts were: ["jane-001", "william-001"] and registrant was john-001' + id = @domain_transfer.id + class_name = @domain_transfer.class.name + + message = old_registrar.messages.last + assert_equal body, message.body + assert_equal id, message.attached_obj_id + assert_equal class_name, message.attached_obj_type + end +end From 6a7effac50e40ccdefcb01fffa4542a6bc558a0f Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Feb 2018 03:04:55 +0200 Subject: [PATCH 29/56] Improve tests #694 --- test/integration/api/domain_transfers_test.rb | 3 +++ test/integration/epp/domain/transfer/request_test.rb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/test/integration/api/domain_transfers_test.rb b/test/integration/api/domain_transfers_test.rb index 12c8c78c1..47730e475 100644 --- a/test/integration/api/domain_transfers_test.rb +++ b/test/integration/api/domain_transfers_test.rb @@ -46,6 +46,9 @@ class APIDomainTransfersTest < ActionDispatch::IntegrationTest assert_difference -> { @old_registrar.messages.count } do post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } end + + message = 'Domain transfer was approved, associated contacts were: ["jane-001", "william-001"] and registrant was john-001' + assert_equal message, @old_registrar.messages.last.body end def test_duplicates_registrant_admin_and_tech_contacts diff --git a/test/integration/epp/domain/transfer/request_test.rb b/test/integration/epp/domain/transfer/request_test.rb index 8ad1f6c92..ce00d1fdb 100644 --- a/test/integration/epp/domain/transfer/request_test.rb +++ b/test/integration/epp/domain/transfer/request_test.rb @@ -45,6 +45,9 @@ class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest assert_difference -> { @old_registrar.messages.count } do post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } end + + message = 'Domain transfer was approved, associated contacts were: ["jane-001", "william-001"] and registrant was john-001' + assert_equal message, @old_registrar.messages.last.body end def test_duplicates_registrant_admin_and_tech_contacts From 4d7a222547af0b956137eb8820b9d512924a704a Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Feb 2018 03:51:32 +0200 Subject: [PATCH 30/56] Add domain name to domain transfer message #694 --- app/models/domain_transfer.rb | 15 +++++---------- app/models/epp/domain.rb | 5 +---- config/locales/en.yml | 1 - config/locales/messages.en.yml | 13 ++++++------- test/integration/api/domain_transfers_test.rb | 4 +++- .../epp/domain/transfer/request_test.rb | 4 +++- test/models/domain_transfer_test.rb | 4 +++- 7 files changed, 21 insertions(+), 25 deletions(-) diff --git a/app/models/domain_transfer.rb b/app/models/domain_transfer.rb index 42f531030..6982f36b6 100644 --- a/app/models/domain_transfer.rb +++ b/app/models/domain_transfer.rb @@ -57,14 +57,6 @@ class DomainTransfer < ActiveRecord::Base status == PENDING end - def notify_losing_registrar(contacts, registrant) - old_registrar.messages.create!( - body: I18n.t('domain_transfer_was_approved', contacts: contacts, registrant: registrant), - attached_obj_id: id, - attached_obj_type: self.class.to_s - ) - end - def approve transaction do self.status = SERVER_APPROVED @@ -78,11 +70,14 @@ class DomainTransfer < ActiveRecord::Base private def notify_old_registrar - old_contacts_codes = domain.contacts.pluck(:code).sort.uniq + old_contacts_codes = domain.contacts.pluck(:code).sort.uniq.join(', ') old_registrant_code = domain.registrant.code old_registrar.messages.create!( - body: I18n.t('domain_transfer_was_approved', contacts: old_contacts_codes, registrant: old_registrant_code), + body: I18n.t('messages.texts.domain_transfer', + domain_name: domain.name, + old_contacts_codes: old_contacts_codes, + old_registrant_code: old_registrant_code), attached_obj_id: id, attached_obj_type: self.class.name ) diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb index 033640c1e..32a8a2198 100644 --- a/app/models/epp/domain.rb +++ b/app/models/epp/domain.rb @@ -651,9 +651,6 @@ class Epp::Domain < Domain } end - old_contact_codes = contacts.pluck(:code).sort.uniq - old_registrant_code = registrant.code - transaction do dt = domain_transfers.create!( transfer_requested_at: Time.zone.now, @@ -670,8 +667,8 @@ class Epp::Domain < Domain end if dt.approved? + dt.send(:notify_old_registrar) transfer_contacts(current_user.registrar) - dt.notify_losing_registrar(old_contact_codes, old_registrant_code) regenerate_transfer_code self.registrar = current_user.registrar end diff --git a/config/locales/en.yml b/config/locales/en.yml index da6df608a..38b9c1973 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -451,7 +451,6 @@ en: client_side_status_editing_error: 'Parameter value policy error. Client-side object status management not supported' switch_to: Switch to admin_menu: Admin - domain_transfer_was_approved: 'Domain transfer was approved, associated contacts were: %{contacts} and registrant was %{registrant}' business_registry_service_not_available: "Business Registry service Ärireg is not available" # DEPP diff --git a/config/locales/messages.en.yml b/config/locales/messages.en.yml index 5cc945c25..2827a2f18 100644 --- a/config/locales/messages.en.yml +++ b/config/locales/messages.en.yml @@ -1,8 +1,7 @@ en: - activerecord: - attributes: - message/body: - domain_transfer: >- - Domain transfer of %{domain_name} has been approved. - Old contacts: %{old_contacts}; - old registrant: %{old_registrant} + messages: + texts: + domain_transfer: >- + Domain transfer of %{domain_name} has been approved. + Old contacts: %{old_contacts_codes}; + old registrant: %{old_registrant_code} diff --git a/test/integration/api/domain_transfers_test.rb b/test/integration/api/domain_transfers_test.rb index 47730e475..acae0e2e0 100644 --- a/test/integration/api/domain_transfers_test.rb +++ b/test/integration/api/domain_transfers_test.rb @@ -47,7 +47,9 @@ class APIDomainTransfersTest < ActionDispatch::IntegrationTest post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } end - message = 'Domain transfer was approved, associated contacts were: ["jane-001", "william-001"] and registrant was john-001' + message = 'Domain transfer of shop.test has been approved.' \ + ' Old contacts: jane-001, william-001' \ + '; old registrant: john-001' assert_equal message, @old_registrar.messages.last.body end diff --git a/test/integration/epp/domain/transfer/request_test.rb b/test/integration/epp/domain/transfer/request_test.rb index ce00d1fdb..e83bfb2e4 100644 --- a/test/integration/epp/domain/transfer/request_test.rb +++ b/test/integration/epp/domain/transfer/request_test.rb @@ -46,7 +46,9 @@ class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } end - message = 'Domain transfer was approved, associated contacts were: ["jane-001", "william-001"] and registrant was john-001' + message = 'Domain transfer of shop.test has been approved.' \ + ' Old contacts: jane-001, william-001' \ + '; old registrant: john-001' assert_equal message, @old_registrar.messages.last.body end diff --git a/test/models/domain_transfer_test.rb b/test/models/domain_transfer_test.rb index 12f36d459..3d1e8edd9 100644 --- a/test/models/domain_transfer_test.rb +++ b/test/models/domain_transfer_test.rb @@ -18,7 +18,9 @@ class DomainTransferTest < ActiveSupport::TestCase @domain_transfer.approve end - body = 'Domain transfer was approved, associated contacts were: ["jane-001", "william-001"] and registrant was john-001' + body = 'Domain transfer of shop.test has been approved.' \ + ' Old contacts: jane-001, william-001' \ + '; old registrant: john-001' id = @domain_transfer.id class_name = @domain_transfer.class.name From 46ef0d1db60f3f2161d4855c16881fcd68dde128 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Feb 2018 03:56:35 +0200 Subject: [PATCH 31/56] Revert "Revert "Tell Travis to build all branches"" This reverts commit 2902a2f5a22972bf0c4bdf246de4513ec663ed95. --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e375b943c..a5fec1a71 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,3 @@ services: - postgresql addons: postgresql: "9.4" -branches: - only: - - master - - staging From ebd9fc550404e6af99a00d1075a5644bff966e19 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Feb 2018 04:18:01 +0200 Subject: [PATCH 32/56] Extract translation #694 --- app/views/registrar/polls/show.haml | 4 ++-- config/locales/registrar/polls.en.yml | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 config/locales/registrar/polls.en.yml diff --git a/app/views/registrar/polls/show.haml b/app/views/registrar/polls/show.haml index 69e74751b..c4c337749 100644 --- a/app/views/registrar/polls/show.haml +++ b/app/views/registrar/polls/show.haml @@ -2,7 +2,7 @@ - msg_q = @data.css('msgQ').first .row .col-sm-12 - %h2= t('messages', count: msg_q['count']) + %h2= t '.header', count: msg_q['count'] %hr .row .col-md-12 @@ -75,7 +75,7 @@ - else .row .col-sm-12 - %h2= t('messages', count: 0) + %h2= t '.header', count: 0 %hr .row .col-md-12 diff --git a/config/locales/registrar/polls.en.yml b/config/locales/registrar/polls.en.yml new file mode 100644 index 000000000..4d09e54f4 --- /dev/null +++ b/config/locales/registrar/polls.en.yml @@ -0,0 +1,5 @@ +en: + registrar: + polls: + show: + header: Messages (%{count}) From 5ad66ef43e0f057fe3eaaeb951fa469f82604f6c Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Feb 2018 04:27:09 +0200 Subject: [PATCH 33/56] Remove unused translation #694 --- config/locales/en.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 38b9c1973..c49781934 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -525,7 +525,6 @@ en: address: 'Address' street: 'Street' city: 'City' - messages: 'Messages (%{count})' message: 'Message' message_no: 'Message #%{id}' queue_date: 'Queue date' From 25e34b388d3017d652f84afd3284ef04c73c3dc9 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Feb 2018 04:54:49 +0200 Subject: [PATCH 34/56] Mutate fixture instead of relying on separate ones #694 --- test/fixtures/domains.yml | 18 ------------- .../epp/domain/transfer/base_test.rb | 23 ---------------- .../epp/domain/transfer/request_test.rb | 27 +++++++++---------- 3 files changed, 12 insertions(+), 56 deletions(-) diff --git a/test/fixtures/domains.yml b/test/fixtures/domains.yml index 2e4a06de2..7c0844d97 100644 --- a/test/fixtures/domains.yml +++ b/test/fixtures/domains.yml @@ -28,24 +28,6 @@ library: period: 1 period_unit: m -non_transferable: - name: non-transferable.test - transfer_code: d382682 - valid_to: 2010-07-05 - registrar: bestnames - registrant: john - statuses: - - serverTransferProhibited - -discarded: - name: discarded.test - transfer_code: any - valid_to: 2010-07-05 - registrar: bestnames - registrant: john - statuses: - - deleteCandidate - invalid: name: invalid.test transfer_code: any diff --git a/test/integration/epp/domain/transfer/base_test.rb b/test/integration/epp/domain/transfer/base_test.rb index 0ceeca30a..aa9f841b6 100644 --- a/test/integration/epp/domain/transfer/base_test.rb +++ b/test/integration/epp/domain/transfer/base_test.rb @@ -1,29 +1,6 @@ require 'test_helper' class EppDomainTransferBaseTest < ActionDispatch::IntegrationTest - def test_non_transferable_domain - request_xml = <<-XML - - - - - - non-transferable.test - - d382682 - - - - - - XML - - post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } - domains(:shop).reload - assert_equal registrars(:bestnames), domains(:shop).registrar - assert_equal '2304', Nokogiri::XML(response.body).at_css('result')[:code] - end - def test_non_existent_domain request_xml = <<-XML diff --git a/test/integration/epp/domain/transfer/request_test.rb b/test/integration/epp/domain/transfer/request_test.rb index e83bfb2e4..cc9fb5475 100644 --- a/test/integration/epp/domain/transfer/request_test.rb +++ b/test/integration/epp/domain/transfer/request_test.rb @@ -64,25 +64,22 @@ class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest end end + def test_non_transferable_domain + @domain.update!(statuses: [DomainStatus::SERVER_TRANSFER_PROHIBITED]) + + post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } + domains(:shop).reload + + assert_equal registrars(:bestnames), domains(:shop).registrar + assert_equal '2304', Nokogiri::XML(response.body).at_css('result')[:code] + end + def test_discarded_domain - request_xml = <<-XML - - - - - - discarded.test - - any - - - - - - XML + @domain.update!(statuses: [DomainStatus::DELETE_CANDIDATE]) post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } @domain.reload + assert_equal registrars(:bestnames), @domain.registrar assert_equal '2105', Nokogiri::XML(response.body).at_css('result')[:code] end From a7ed2f35d79cecdd64f3bd346cdc431a0302269d Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Feb 2018 05:05:35 +0200 Subject: [PATCH 35/56] Rename Domain#domain_transfers to #transfers #694 --- app/models/domain.rb | 4 ++-- app/models/epp/domain.rb | 4 ++-- test/integration/api/domain_transfers_test.rb | 4 ++-- test/integration/epp/domain/transfer/query_test.rb | 2 +- test/integration/epp/domain/transfer/request_test.rb | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/models/domain.rb b/app/models/domain.rb index 31ba838f2..54dfe608e 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -49,7 +49,7 @@ class Domain < ActiveRecord::Base accepts_nested_attributes_for :domain_statuses, allow_destroy: true, reject_if: proc { |attrs| attrs[:value].blank? } - has_many :domain_transfers, dependent: :destroy + has_many :transfers, class_name: 'DomainTransfer', dependent: :destroy has_many :dnskeys, dependent: :destroy @@ -280,7 +280,7 @@ class Domain < ActiveRecord::Base end def pending_transfer - domain_transfers.find_by(status: DomainTransfer::PENDING) + transfers.find_by(status: DomainTransfer::PENDING) end def server_holdable? diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb index 32a8a2198..8c9e8bcc8 100644 --- a/app/models/epp/domain.rb +++ b/app/models/epp/domain.rb @@ -628,7 +628,7 @@ class Epp::Domain < Domain case action when 'query' - return domain_transfers.last if domain_transfers.any? + return transfers.last if transfers.any? when 'request' return pending_transfer if pending_transfer return query_transfer(frame, current_user) @@ -652,7 +652,7 @@ class Epp::Domain < Domain end transaction do - dt = domain_transfers.create!( + dt = transfers.create!( transfer_requested_at: Time.zone.now, old_registrar: registrar, new_registrar: current_user.registrar diff --git a/test/integration/api/domain_transfers_test.rb b/test/integration/api/domain_transfers_test.rb index acae0e2e0..439b67424 100644 --- a/test/integration/api/domain_transfers_test.rb +++ b/test/integration/api/domain_transfers_test.rb @@ -16,14 +16,14 @@ class APIDomainTransfersTest < ActionDispatch::IntegrationTest end def test_creates_new_domain_transfer - assert_difference -> { @domain.domain_transfers.size } do + assert_difference -> { @domain.transfers.size } do post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } end end def test_approves_automatically_if_auto_approval_is_enabled post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } - assert @domain.domain_transfers(true).last.approved? + assert @domain.transfers.last.approved? end def test_changes_registrar diff --git a/test/integration/epp/domain/transfer/query_test.rb b/test/integration/epp/domain/transfer/query_test.rb index f12cb381f..1412dd9b3 100644 --- a/test/integration/epp/domain/transfer/query_test.rb +++ b/test/integration/epp/domain/transfer/query_test.rb @@ -34,7 +34,7 @@ class EppDomainTransferQueryTest < ActionDispatch::IntegrationTest end def test_no_domain_transfer - domains(:shop).domain_transfers.delete_all + domains(:shop).transfers.delete_all post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } assert_equal '2303', Nokogiri::XML(response.body).at_css('result')[:code] end diff --git a/test/integration/epp/domain/transfer/request_test.rb b/test/integration/epp/domain/transfer/request_test.rb index cc9fb5475..6c28dd67f 100644 --- a/test/integration/epp/domain/transfer/request_test.rb +++ b/test/integration/epp/domain/transfer/request_test.rb @@ -13,7 +13,7 @@ class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest end def test_creates_new_domain_transfer - assert_difference -> { @domain.domain_transfers.size } do + assert_difference -> { @domain.transfers.size } do post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } end end From 7a425ffaf6bd41d1fc915e933f166b9518fb7db5 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Feb 2018 05:10:12 +0200 Subject: [PATCH 36/56] Remove unused method #694 --- app/models/registrar.rb | 9 --------- 1 file changed, 9 deletions(-) diff --git a/app/models/registrar.rb b/app/models/registrar.rb index 7646b2ceb..46022808f 100644 --- a/app/models/registrar.rb +++ b/app/models/registrar.rb @@ -137,15 +137,6 @@ class Registrar < ActiveRecord::Base cash_account.account_activities.create!(args) end - def domain_transfers - at = DomainTransfer.arel_table - DomainTransfer.where( - at[:new_registrar_id].eq(id).or( - at[:old_registrar_id].eq(id) - ) - ) - end - def address [street, city, state, zip].reject(&:blank?).compact.join(', ') end From 8d6cd06012ec954083602184ff89d6c01db720e5 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 11 Feb 2018 23:57:50 +0200 Subject: [PATCH 37/56] Remove unused constant #697 --- app/controllers/epp_controller.rb | 1 - config/initializers/initial_settings.rb | 3 --- 2 files changed, 4 deletions(-) diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb index eee6cef7a..36bdcd6cc 100644 --- a/app/controllers/epp_controller.rb +++ b/app/controllers/epp_controller.rb @@ -335,7 +335,6 @@ class EppController < ApplicationController # rubocop: disable Metrics/CyclomaticComplexity # rubocop: disable Metrics/PerceivedComplexity def write_to_epp_log - # return nil if EPP_LOG_ENABLED request_command = params[:command] || params[:action] # error receives :command, other methods receive :action frame = params[:raw_frame] || params[:frame] diff --git a/config/initializers/initial_settings.rb b/config/initializers/initial_settings.rb index 94ff1dc7e..5ae521bc5 100644 --- a/config/initializers/initial_settings.rb +++ b/config/initializers/initial_settings.rb @@ -73,6 +73,3 @@ if con.present? && con.table_exists?('settings') Setting.save_default(:registry_swift, 'LHVBEE22') Setting.save_default(:registry_invoice_contact, 'Martti Õigus') end - -# dev only setting -EPP_LOG_ENABLED = true # !Rails.env.test? From 2b743dba83d223d82eca71bb5dca201bff5cffa1 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 11 Feb 2018 23:48:31 +0200 Subject: [PATCH 38/56] Remove unused translations #697 --- config/locales/en.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index c49781934..2931a7381 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -214,20 +214,12 @@ en: blank: 'is missing' epp_domain_reserved: 'Domain name is reserved' epp_obj_does_not_exist: 'Object does not exist' - epp_command_failed: 'Command failed' epp_authorization_error: 'Authorization error' - epp_authentication_error: 'Authentication error' epp_id_taken: 'Contact id already exists' epp_domain_not_found: 'Domain not found' epp_exp_dates_do_not_match: 'Given and current expire dates do not match' - epp_registrant_not_found: 'Registrant not found' - epp_command_syntax_error: 'Command syntax error' required_parameter_missing: 'Required parameter missing: %{key}' - attr_missing: 'Required parameter missing: %{key}' - repeating_postal_info: 'Only one of each postal info types may be provided' - invalid_type: 'PostalInfo type is invalid' unimplemented_command: 'Unimplemented command' - domain_exists_but_belongs_to_other_registrar: 'Domain exists but belongs to other registrar' required_ident_attribute_missing: "Required ident attribute missing: %{key}" invalid_iso31661_alpha2: does not conform to ISO 3166-1 alpha-2 standard invalid_iso8601_date: has invalid date format YYYY-MM-DD (ISO 8601) From 030189ab69f97599d0d265e6e464bceb6ff95406 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 11 Feb 2018 03:21:11 +0200 Subject: [PATCH 39/56] Add foreign key #697 (cherry picked from commit 169ce19) --- .../20180211011948_add_messages_registrar_id_fk.rb | 5 +++++ db/structure.sql | 10 ++++++++++ 2 files changed, 15 insertions(+) create mode 100644 db/migrate/20180211011948_add_messages_registrar_id_fk.rb diff --git a/db/migrate/20180211011948_add_messages_registrar_id_fk.rb b/db/migrate/20180211011948_add_messages_registrar_id_fk.rb new file mode 100644 index 000000000..af8df7b97 --- /dev/null +++ b/db/migrate/20180211011948_add_messages_registrar_id_fk.rb @@ -0,0 +1,5 @@ +class AddMessagesRegistrarIdFk < ActiveRecord::Migration + def change + add_foreign_key :messages, :registrars, name: 'messages_registrar_id_fk' + end +end diff --git a/db/structure.sql b/db/structure.sql index 16523bd5c..d95e5f4e2 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -4524,6 +4524,14 @@ ALTER TABLE ONLY account_activities ADD CONSTRAINT fk_rails_d2cc3c2fa9 FOREIGN KEY (price_id) REFERENCES prices(id); +-- +-- Name: messages_registrar_id_fk; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY messages + ADD CONSTRAINT messages_registrar_id_fk FOREIGN KEY (registrar_id) REFERENCES registrars(id); + + -- -- Name: user_registrar_id_fk; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -5086,6 +5094,8 @@ INSERT INTO schema_migrations (version) VALUES ('20180207071528'); INSERT INTO schema_migrations (version) VALUES ('20180207072139'); +INSERT INTO schema_migrations (version) VALUES ('20180211011948'); + INSERT INTO schema_migrations (version) VALUES ('20180212123810'); INSERT INTO schema_migrations (version) VALUES ('20180212152810'); From 8c5478bb6f551d905c57e96046b7fc27c0107dd4 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 11 Feb 2018 03:11:36 +0200 Subject: [PATCH 40/56] Add tests #697 --- test/models/message_test.rb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 test/models/message_test.rb diff --git a/test/models/message_test.rb b/test/models/message_test.rb new file mode 100644 index 000000000..bc20715c0 --- /dev/null +++ b/test/models/message_test.rb @@ -0,0 +1,17 @@ +require 'test_helper' + +class MessageTest < ActiveSupport::TestCase + def setup + @message = messages(:greeting) + end + + def test_valid + assert @message.valid? + end + + def test_invalid_without_body + @message.body = nil + @message.validate + assert @message.invalid? + end +end From 9697752823e3dd302788f62a02d6e883af411278 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 11 Feb 2018 03:18:39 +0200 Subject: [PATCH 41/56] Always require association #697 (cherry picked from commit a65354c) --- app/models/message.rb | 2 +- ...180211011450_change_messages_registrar_id_to_not_null.rb | 5 +++++ db/structure.sql | 4 +++- test/models/message_test.rb | 6 ++++++ 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20180211011450_change_messages_registrar_id_to_not_null.rb diff --git a/app/models/message.rb b/app/models/message.rb index 10d823e63..1f01842c8 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -1,6 +1,6 @@ class Message < ActiveRecord::Base include Versions # version/message_version.rb - belongs_to :registrar + belongs_to :registrar, required: true before_create -> { self.queued = true } diff --git a/db/migrate/20180211011450_change_messages_registrar_id_to_not_null.rb b/db/migrate/20180211011450_change_messages_registrar_id_to_not_null.rb new file mode 100644 index 000000000..962022ae0 --- /dev/null +++ b/db/migrate/20180211011450_change_messages_registrar_id_to_not_null.rb @@ -0,0 +1,5 @@ +class ChangeMessagesRegistrarIdToNotNull < ActiveRecord::Migration + def change + change_column_null :messages, :registrar_id, false + end +end diff --git a/db/structure.sql b/db/structure.sql index d95e5f4e2..237c82e66 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -2183,7 +2183,7 @@ ALTER SEQUENCE mail_templates_id_seq OWNED BY mail_templates.id; CREATE TABLE messages ( id integer NOT NULL, - registrar_id integer, + registrar_id integer NOT NULL, body character varying NOT NULL, attached_obj_type character varying, attached_obj_id integer, @@ -5094,6 +5094,8 @@ INSERT INTO schema_migrations (version) VALUES ('20180207071528'); INSERT INTO schema_migrations (version) VALUES ('20180207072139'); +INSERT INTO schema_migrations (version) VALUES ('20180211011450'); + INSERT INTO schema_migrations (version) VALUES ('20180211011948'); INSERT INTO schema_migrations (version) VALUES ('20180212123810'); diff --git a/test/models/message_test.rb b/test/models/message_test.rb index bc20715c0..58ac90980 100644 --- a/test/models/message_test.rb +++ b/test/models/message_test.rb @@ -14,4 +14,10 @@ class MessageTest < ActiveSupport::TestCase @message.validate assert @message.invalid? end + + def test_invalid_without_registrar + @message.registrar = nil + @message.validate + assert @message.invalid? + end end From a34ea256b4a34d594a470c3580580f76d266855f Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 11 Feb 2018 03:10:38 +0200 Subject: [PATCH 42/56] Remove useless spec #697 --- spec/models/message_spec.rb | 47 ------------------------------------- 1 file changed, 47 deletions(-) delete mode 100644 spec/models/message_spec.rb diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb deleted file mode 100644 index a71988701..000000000 --- a/spec/models/message_spec.rb +++ /dev/null @@ -1,47 +0,0 @@ -require 'rails_helper' - -describe Message do - context 'with invalid attribute' do - before :all do - @mssage = Message.new - end - - it 'should not be valid' do - @mssage.valid? - @mssage.errors.full_messages.should match_array([ - "Body is missing" - ]) - end - - it 'should not have any versions' do - @mssage.versions.should == [] - end - end - - context 'with valid attributes' do - before :all do - @mssage = create(:message) - end - - it 'should be valid' do - @mssage.valid? - @mssage.errors.full_messages.should match_array([]) - end - - it 'should be valid twice' do - @mssage = create(:message) - @mssage.valid? - @mssage.errors.full_messages.should match_array([]) - end - - it 'should have one version' do - with_versioning do - @mssage.versions.should == [] - @mssage.body = 'New body' - @mssage.save - @mssage.errors.full_messages.should match_array([]) - @mssage.versions.size.should == 1 - end - end - end -end From 7fb7a4f657784c707969923fc3b99196f175cb56 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 11 Feb 2018 03:10:54 +0200 Subject: [PATCH 43/56] Remove unused factory #697 --- spec/factories/message.rb | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 spec/factories/message.rb diff --git a/spec/factories/message.rb b/spec/factories/message.rb deleted file mode 100644 index 6ae235aaf..000000000 --- a/spec/factories/message.rb +++ /dev/null @@ -1,5 +0,0 @@ -FactoryBot.define do - factory :message do - body 'fabricator body' - end -end From 223b4f4815ad9b606bb8345d7b562be534ec5b68 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sun, 11 Feb 2018 03:02:24 +0200 Subject: [PATCH 44/56] Add tests #697 (cherry picked from commit bfe9ef3) --- test/fixtures/messages.yml | 4 ++++ test/integration/epp/poll_test.rb | 30 ++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 test/fixtures/messages.yml create mode 100644 test/integration/epp/poll_test.rb diff --git a/test/fixtures/messages.yml b/test/fixtures/messages.yml new file mode 100644 index 000000000..47cbdd0f2 --- /dev/null +++ b/test/fixtures/messages.yml @@ -0,0 +1,4 @@ +greeting: + body: Welcome! + queued: true + registrar: bestnames diff --git a/test/integration/epp/poll_test.rb b/test/integration/epp/poll_test.rb new file mode 100644 index 000000000..db6091cb0 --- /dev/null +++ b/test/integration/epp/poll_test.rb @@ -0,0 +1,30 @@ +require 'test_helper' + +class EppPollTest < ActionDispatch::IntegrationTest + def test_messages + post '/epp/command/poll', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } + assert_equal '1301', Nokogiri::XML(response.body).at_css('result')[:code] + assert_equal 1, Nokogiri::XML(response.body).css('msgQ').size + assert_equal 1, Nokogiri::XML(response.body).css('result').size + end + + def test_no_messages + registrars(:bestnames).messages.delete_all(:delete_all) + post '/epp/command/poll', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } + assert_equal '1300', Nokogiri::XML(response.body).at_css('result')[:code] + assert_equal 1, Nokogiri::XML(response.body).css('result').size + end + + private + + def request_xml + <<-XML + + + + + + + XML + end +end From 782c53672dbfe7f22f480d7d27c5dc02d6208be9 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Feb 2018 05:58:07 +0200 Subject: [PATCH 45/56] Revert "Bypass domain validation on transfer" This reverts commit 1fa3a3496c3788b3f68a3956810c6f66669f7dd8. --- app/models/concerns/domain/transferable.rb | 2 +- test/models/domain/transfer_test.rb | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/app/models/concerns/domain/transferable.rb b/app/models/concerns/domain/transferable.rb index 554eb7dd3..f2e7736c2 100644 --- a/app/models/concerns/domain/transferable.rb +++ b/app/models/concerns/domain/transferable.rb @@ -15,7 +15,7 @@ module Concerns::Domain::Transferable transaction do transfer_contacts(new_registrar) - save(validate: false) + save! end end diff --git a/test/models/domain/transfer_test.rb b/test/models/domain/transfer_test.rb index 7b4e83138..536c00a5c 100644 --- a/test/models/domain/transfer_test.rb +++ b/test/models/domain/transfer_test.rb @@ -45,10 +45,4 @@ class DomainTransferTest < ActiveSupport::TestCase @domain.transfer(@new_registrar) refute_same old_transfer_code, @domain.transfer_code end - - def test_bypasses_domain_validation - domain = domains(:invalid) - domain.transfer(@new_registrar) - assert_equal @new_registrar, domain.registrar - end end From c29c248fea99f1b7dc55d384f438ade5d4ec2a86 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Feb 2018 06:17:49 +0200 Subject: [PATCH 46/56] Fix test name clash #694 --- test/models/domain/{transfer_test.rb => transferable_test.rb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename test/models/domain/{transfer_test.rb => transferable_test.rb} (95%) diff --git a/test/models/domain/transfer_test.rb b/test/models/domain/transferable_test.rb similarity index 95% rename from test/models/domain/transfer_test.rb rename to test/models/domain/transferable_test.rb index 536c00a5c..c0de4992b 100644 --- a/test/models/domain/transfer_test.rb +++ b/test/models/domain/transferable_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class DomainTransferTest < ActiveSupport::TestCase +class DomainTransferableTest < ActiveSupport::TestCase def setup @domain = domains(:shop) @new_registrar = registrars(:goodnames) From 3501a752d360b1b718f7cb56b6e4ab89fc403c3f Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Feb 2018 06:22:05 +0200 Subject: [PATCH 47/56] Remove duplicated translation #694 --- config/locales/en.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 2931a7381..c37cb9a48 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -744,7 +744,6 @@ en: parameter_value_range_error: 'Parameter value range error: %{key}' payment_received: 'Payment received' api_user_not_found: 'API user not found' - domain_already_belongs_to_the_querying_registrar: 'Domain already belongs to the querying registrar' notes: Notes active_price_for_this_operation_is: 'Active price for this operation is %{price}' active_price_missing_for_this_operation: 'Active price missing for this operation!' From cf43ce2e7c4debeee6907e570b70a28a681a708f Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Feb 2018 06:33:00 +0200 Subject: [PATCH 48/56] Add test #694 --- test/integration/epp/domain/transfer/request_test.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/integration/epp/domain/transfer/request_test.rb b/test/integration/epp/domain/transfer/request_test.rb index 6c28dd67f..e61d8213c 100644 --- a/test/integration/epp/domain/transfer/request_test.rb +++ b/test/integration/epp/domain/transfer/request_test.rb @@ -84,6 +84,14 @@ class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest assert_equal '2105', Nokogiri::XML(response.body).at_css('result')[:code] end + def test_same_registrar + assert_no_difference -> { @domain.transfers.size } do + post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } + end + + assert_equal '2002', Nokogiri::XML(response.body).at_css('result')[:code] + end + def test_wrong_transfer_code request_xml = <<-XML From 3385441846b765dc7c044604b096e413c62d5434 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Feb 2018 06:35:37 +0200 Subject: [PATCH 49/56] Enable "use_transactional_fixtures" #694 --- spec/rails_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index f4dcd9cb3..88e3145f1 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -56,7 +56,7 @@ RSpec.configure do |config| metadata[:type] = :request end - config.use_transactional_fixtures = false + config.use_transactional_fixtures = true config.infer_spec_type_from_file_location! config.expect_with :rspec do |c| From 9e050b4bcd3d4cb78da1d7fbc363b44e68b20f36 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Feb 2018 06:35:51 +0200 Subject: [PATCH 50/56] Fix test #694 --- test/integration/epp/domain/transfer/request_test.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/integration/epp/domain/transfer/request_test.rb b/test/integration/epp/domain/transfer/request_test.rb index e61d8213c..c7aeea946 100644 --- a/test/integration/epp/domain/transfer/request_test.rb +++ b/test/integration/epp/domain/transfer/request_test.rb @@ -67,7 +67,7 @@ class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest def test_non_transferable_domain @domain.update!(statuses: [DomainStatus::SERVER_TRANSFER_PROHIBITED]) - post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } + post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } domains(:shop).reload assert_equal registrars(:bestnames), domains(:shop).registrar @@ -77,7 +77,7 @@ class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest def test_discarded_domain @domain.update!(statuses: [DomainStatus::DELETE_CANDIDATE]) - post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } + post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } @domain.reload assert_equal registrars(:bestnames), @domain.registrar @@ -109,7 +109,7 @@ class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest XML - post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } + post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } @domain.reload refute_equal registrars(:goodnames), @domain.registrar assert_equal '2201', Nokogiri::XML(response.body).at_css('result')[:code] From c7d8ed266aea23b9d0bb8755b25bebb64aa0e8b2 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 19 Feb 2018 06:54:24 +0200 Subject: [PATCH 51/56] Revert "Enable "use_transactional_fixtures"" This reverts commit 3385441 --- spec/rails_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 88e3145f1..f4dcd9cb3 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -56,7 +56,7 @@ RSpec.configure do |config| metadata[:type] = :request end - config.use_transactional_fixtures = true + config.use_transactional_fixtures = false config.infer_spec_type_from_file_location! config.expect_with :rspec do |c| From 769e185666c445dc4ee1d7b94ad967736485d8ad Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Sat, 10 Feb 2018 22:38:21 +0200 Subject: [PATCH 52/56] Hide methods #697 (cherry picked from commit 8d08810) --- app/controllers/epp/polls_controller.rb | 4 ++-- doc/controllers_complete.svg | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/controllers/epp/polls_controller.rb b/app/controllers/epp/polls_controller.rb index fb032975f..44f8afdc1 100644 --- a/app/controllers/epp/polls_controller.rb +++ b/app/controllers/epp/polls_controller.rb @@ -6,6 +6,8 @@ class Epp::PollsController < EppController ack_poll if params[:parsed_frame].css('poll').first['op'] == 'ack' end + private + def req_poll @message = current_user.queued_messages.last @@ -49,8 +51,6 @@ class Epp::PollsController < EppController render_epp_response 'epp/poll/poll_ack' end - private - def validate_poll requires_attribute 'poll', 'op', values: %(ack req), allow_blank: true end diff --git a/doc/controllers_complete.svg b/doc/controllers_complete.svg index 68d02cf4a..765d4a08b 100644 --- a/doc/controllers_complete.svg +++ b/doc/controllers_complete.svg @@ -86,9 +86,7 @@ Epp::PollsController -ack_poll poll -req_poll _layout From cf8cfa8252498e1ab4419347c3d5e7f245401291 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Thu, 22 Feb 2018 12:52:46 +0200 Subject: [PATCH 53/56] Improve test #694 --- test/models/message_test.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/models/message_test.rb b/test/models/message_test.rb index 58ac90980..1c7c7bad1 100644 --- a/test/models/message_test.rb +++ b/test/models/message_test.rb @@ -11,13 +11,11 @@ class MessageTest < ActiveSupport::TestCase def test_invalid_without_body @message.body = nil - @message.validate assert @message.invalid? end def test_invalid_without_registrar @message.registrar = nil - @message.validate assert @message.invalid? end end From 2d78688d3f470820053f6243995defd56827b971 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Thu, 22 Feb 2018 12:59:30 +0200 Subject: [PATCH 54/56] Remove too detailed integration test #694 --- test/integration/api/domain_transfers_test.rb | 5 ----- test/integration/epp/domain/transfer/request_test.rb | 5 ----- 2 files changed, 10 deletions(-) diff --git a/test/integration/api/domain_transfers_test.rb b/test/integration/api/domain_transfers_test.rb index 439b67424..10675b507 100644 --- a/test/integration/api/domain_transfers_test.rb +++ b/test/integration/api/domain_transfers_test.rb @@ -46,11 +46,6 @@ class APIDomainTransfersTest < ActionDispatch::IntegrationTest assert_difference -> { @old_registrar.messages.count } do post '/repp/v1/domain_transfers', request_params, { 'HTTP_AUTHORIZATION' => http_auth_key } end - - message = 'Domain transfer of shop.test has been approved.' \ - ' Old contacts: jane-001, william-001' \ - '; old registrant: john-001' - assert_equal message, @old_registrar.messages.last.body end def test_duplicates_registrant_admin_and_tech_contacts diff --git a/test/integration/epp/domain/transfer/request_test.rb b/test/integration/epp/domain/transfer/request_test.rb index c7aeea946..03c5e7daf 100644 --- a/test/integration/epp/domain/transfer/request_test.rb +++ b/test/integration/epp/domain/transfer/request_test.rb @@ -45,11 +45,6 @@ class EppDomainTransferRequestTest < ActionDispatch::IntegrationTest assert_difference -> { @old_registrar.messages.count } do post '/epp/command/transfer', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_goodnames' } end - - message = 'Domain transfer of shop.test has been approved.' \ - ' Old contacts: jane-001, william-001' \ - '; old registrant: john-001' - assert_equal message, @old_registrar.messages.last.body end def test_duplicates_registrant_admin_and_tech_contacts From eb61bb620fdec2acee97ad37bbda1a5d0106a47c Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Thu, 22 Feb 2018 13:00:09 +0200 Subject: [PATCH 55/56] Change translation #694 --- config/locales/messages.en.yml | 6 +++--- test/models/domain_transfer_test.rb | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/locales/messages.en.yml b/config/locales/messages.en.yml index 2827a2f18..5b93f402a 100644 --- a/config/locales/messages.en.yml +++ b/config/locales/messages.en.yml @@ -2,6 +2,6 @@ en: messages: texts: domain_transfer: >- - Domain transfer of %{domain_name} has been approved. - Old contacts: %{old_contacts_codes}; - old registrant: %{old_registrant_code} + Transfer of domain domain_name_here has been approved. + It was associated with registrant %{old_registrant_code} + and contacts %{old_contacts_codes}. diff --git a/test/models/domain_transfer_test.rb b/test/models/domain_transfer_test.rb index 3d1e8edd9..728f59bdc 100644 --- a/test/models/domain_transfer_test.rb +++ b/test/models/domain_transfer_test.rb @@ -18,9 +18,9 @@ class DomainTransferTest < ActiveSupport::TestCase @domain_transfer.approve end - body = 'Domain transfer of shop.test has been approved.' \ - ' Old contacts: jane-001, william-001' \ - '; old registrant: john-001' + body = 'Transfer of domain domain_name_here has been approved.' \ + ' It was associated with registrant john-001' \ + ' and contacts jane-001, william-001.' id = @domain_transfer.id class_name = @domain_transfer.class.name From 775b44d10d1131673780ffa54734d630fbc8e3c3 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Fri, 23 Feb 2018 11:28:14 +0200 Subject: [PATCH 56/56] Fix translation #694 --- config/locales/messages.en.yml | 2 +- test/models/domain_transfer_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/messages.en.yml b/config/locales/messages.en.yml index 5b93f402a..0c85bb49c 100644 --- a/config/locales/messages.en.yml +++ b/config/locales/messages.en.yml @@ -2,6 +2,6 @@ en: messages: texts: domain_transfer: >- - Transfer of domain domain_name_here has been approved. + Transfer of domain %{domain_name} has been approved. It was associated with registrant %{old_registrant_code} and contacts %{old_contacts_codes}. diff --git a/test/models/domain_transfer_test.rb b/test/models/domain_transfer_test.rb index 728f59bdc..7f11caf80 100644 --- a/test/models/domain_transfer_test.rb +++ b/test/models/domain_transfer_test.rb @@ -18,7 +18,7 @@ class DomainTransferTest < ActiveSupport::TestCase @domain_transfer.approve end - body = 'Transfer of domain domain_name_here has been approved.' \ + body = 'Transfer of domain shop.test has been approved.' \ ' It was associated with registrant john-001' \ ' and contacts jane-001, william-001.' id = @domain_transfer.id