From 34f782030033a664c700cc4c37f6c3626b25aae2 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 6 Feb 2018 23:36:50 +0200 Subject: [PATCH 01/41] Do not allow NULL in `epp_sessions.session_id` #700 --- ...80206213435_change_epp_sessions_session_id_to_not_null.rb | 5 +++++ db/structure.sql | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20180206213435_change_epp_sessions_session_id_to_not_null.rb diff --git a/db/migrate/20180206213435_change_epp_sessions_session_id_to_not_null.rb b/db/migrate/20180206213435_change_epp_sessions_session_id_to_not_null.rb new file mode 100644 index 000000000..887ef3cb4 --- /dev/null +++ b/db/migrate/20180206213435_change_epp_sessions_session_id_to_not_null.rb @@ -0,0 +1,5 @@ +class ChangeEppSessionsSessionIdToNotNull < ActiveRecord::Migration + def change + change_column_null :epp_sessions, :session_id, false + end +end diff --git a/db/structure.sql b/db/structure.sql index 2cad3e06f..bf3230c57 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -1050,7 +1050,7 @@ ALTER SEQUENCE domains_id_seq OWNED BY domains.id; CREATE TABLE epp_sessions ( id integer NOT NULL, - session_id character varying, + session_id character varying NOT NULL, data text, created_at timestamp without time zone, updated_at 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 ('20180206213435'); + From cdb01876f767014592f71dbd77ed12d19f0359d4 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 6 Feb 2018 23:45:11 +0200 Subject: [PATCH 02/41] Convert spec to test #700 --- spec/models/epp_session.rb | 21 --------------------- test/models/epp_session_test.rb | 13 +++++++++++++ 2 files changed, 13 insertions(+), 21 deletions(-) delete mode 100644 spec/models/epp_session.rb create mode 100644 test/models/epp_session_test.rb diff --git a/spec/models/epp_session.rb b/spec/models/epp_session.rb deleted file mode 100644 index 484cd1345..000000000 --- a/spec/models/epp_session.rb +++ /dev/null @@ -1,21 +0,0 @@ -require 'rails_helper' - -describe EppSession do - let(:epp_session) { create(:epp_session) } - - it 'has marshalled data' do - expect(epp_session.read_attribute(:data)).to_not be_blank - expect(epp_session.read_attribute(:data).class).to eq(String) - expect(epp_session.data.class).to eq(Hash) - end - - it 'stores data' do - expect(epp_session[:api_user_id]).to eq(1) - - epp_session[:api_user_id] = 3 - expect(epp_session[:api_user_id]).to eq(3) - - epp_session = EppSession.find_by(session_id: 'test') - expect(epp_session[:api_user_id]).to eq(3) - end -end diff --git a/test/models/epp_session_test.rb b/test/models/epp_session_test.rb new file mode 100644 index 000000000..72d8f84ac --- /dev/null +++ b/test/models/epp_session_test.rb @@ -0,0 +1,13 @@ +require 'test_helper' + +class EppSessionTest < ActiveSupport::TestCase + def test_api_user_id_serialization + epp_session = EppSession.new + epp_session.registrar = registrars(:bestnames) + epp_session[:api_user_id] = ActiveRecord::Fixtures.identify(:api_bestnames) + epp_session.save! + epp_session.reload + + assert_equal ActiveRecord::Fixtures.identify(:api_bestnames), epp_session[:api_user_id] + end +end From a757a92816fe0cfaf8a0221c7da7906f2d0a6dfc Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 6 Feb 2018 23:45:39 +0200 Subject: [PATCH 03/41] Do not use factory #700 --- lib/tasks/dev.rake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake index c624b3c95..e25053133 100644 --- a/lib/tasks/dev.rake +++ b/lib/tasks/dev.rake @@ -49,9 +49,10 @@ namespace :dev do account = create(:account, registrar: registrar, balance: 1_000_000) api_user = create(:api_user, username: 'test', password: 'testtest', registrar: registrar) - epp_session = build(:epp_session, registrar: registrar) + epp_session = EppSession.new + epp_session.session_id = 'test' + epp_session.registrar = registrar epp_session[:api_user_id] = api_user.id - epp_session.registrar_id = registrar.id epp_session.save! domain_counter = 1.step From 4163ee9017f6cc1593917a6557fcd86d17bea266 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 6 Feb 2018 23:45:49 +0200 Subject: [PATCH 04/41] Remove factory #700 --- spec/factories/epp_session.rb | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 spec/factories/epp_session.rb diff --git a/spec/factories/epp_session.rb b/spec/factories/epp_session.rb deleted file mode 100644 index 96dd78da3..000000000 --- a/spec/factories/epp_session.rb +++ /dev/null @@ -1,5 +0,0 @@ -FactoryBot.define do - factory :epp_session do - - end -end From 1c560b1748ab72379346b504e3f0595afb32a021 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 6 Feb 2018 23:53:14 +0200 Subject: [PATCH 05/41] Disallow blank EppSession#session_id #700 --- app/models/epp_session.rb | 2 ++ test/models/epp_session_test.rb | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/app/models/epp_session.rb b/app/models/epp_session.rb index f051b50ed..8d36e15ef 100644 --- a/app/models/epp_session.rb +++ b/app/models/epp_session.rb @@ -1,6 +1,8 @@ class EppSession < ActiveRecord::Base before_save :marshal_data! + validates :session_id, presence: true + belongs_to :registrar # rubocop: disable Rails/ReadWriteAttribute # Turned back to read_attribute, thus in Rails 4 diff --git a/test/models/epp_session_test.rb b/test/models/epp_session_test.rb index 72d8f84ac..b4801bb5a 100644 --- a/test/models/epp_session_test.rb +++ b/test/models/epp_session_test.rb @@ -1,8 +1,17 @@ require 'test_helper' class EppSessionTest < ActiveSupport::TestCase + def setup + @epp_session = epp_sessions(:api_bestnames) + end + + def test_valid + assert @epp_session.valid? + end + def test_api_user_id_serialization epp_session = EppSession.new + epp_session.session_id = 'test' epp_session.registrar = registrars(:bestnames) epp_session[:api_user_id] = ActiveRecord::Fixtures.identify(:api_bestnames) epp_session.save! @@ -10,4 +19,10 @@ class EppSessionTest < ActiveSupport::TestCase assert_equal ActiveRecord::Fixtures.identify(:api_bestnames), epp_session[:api_user_id] end + + def test_session_id_presence_validation + @epp_session.session_id = nil + @epp_session.validate + assert @epp_session.invalid? + end end From d5b96060e07992f3f029568f0eefad82ec27a0e2 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 7 Feb 2018 00:58:48 +0200 Subject: [PATCH 06/41] Remove unneeded `if` statement epp_session.session_id is always present #700 --- app/controllers/epp_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb index 58f450147..254cb8968 100644 --- a/app/controllers/epp_controller.rb +++ b/app/controllers/epp_controller.rb @@ -119,7 +119,7 @@ class EppController < ApplicationController # by default PaperTrail uses before filter and at that # time current_user is not yet present ::PaperTrail.whodunnit = user_log_str(@current_user) - ::PaperSession.session = epp_session.session_id if epp_session.session_id.present? + ::PaperSession.session = epp_session.session_id @current_user end From 82c74a48119232df398870cadeb4dee185efe769 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 7 Feb 2018 01:10:45 +0200 Subject: [PATCH 07/41] Remove test logic #700 --- app/controllers/epp/sessions_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/epp/sessions_controller.rb b/app/controllers/epp/sessions_controller.rb index 1396a5b35..dc67405d1 100644 --- a/app/controllers/epp/sessions_controller.rb +++ b/app/controllers/epp/sessions_controller.rb @@ -114,7 +114,6 @@ class Epp::SessionsController < EppController end def connection_limit_ok? - return true if Rails.env.test? || Rails.env.development? c = EppSession.where( 'registrar_id = ? AND updated_at >= ?', @api_user.registrar_id, Time.zone.now - 1.second ).count From ba341ee41125d381fb9da06b51d13b16a48113e7 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 7 Feb 2018 02:01:23 +0200 Subject: [PATCH 08/41] Add `epp_sessions.user_id` #700 --- ...234620_extract_user_id_from_epp_sessions_data.rb | 5 +++++ db/structure.sql | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20180206234620_extract_user_id_from_epp_sessions_data.rb diff --git a/db/migrate/20180206234620_extract_user_id_from_epp_sessions_data.rb b/db/migrate/20180206234620_extract_user_id_from_epp_sessions_data.rb new file mode 100644 index 000000000..5fd686168 --- /dev/null +++ b/db/migrate/20180206234620_extract_user_id_from_epp_sessions_data.rb @@ -0,0 +1,5 @@ +class ExtractUserIdFromEppSessionsData < ActiveRecord::Migration + def change + add_reference :epp_sessions, :user, foreign_key: true + end +end diff --git a/db/structure.sql b/db/structure.sql index bf3230c57..b925a2a1b 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -1054,7 +1054,8 @@ CREATE TABLE epp_sessions ( data text, created_at timestamp without time zone, updated_at timestamp without time zone, - registrar_id integer + registrar_id integer, + user_id integer ); @@ -4484,6 +4485,14 @@ ALTER TABLE ONLY domain_transfers ADD CONSTRAINT fk_rails_87b8e40c63 FOREIGN KEY (domain_id) REFERENCES domains(id); +-- +-- Name: fk_rails_adff2dc8e3; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY epp_sessions + ADD CONSTRAINT fk_rails_adff2dc8e3 FOREIGN KEY (user_id) REFERENCES users(id); + + -- -- Name: fk_rails_b80dbb973d; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -5072,3 +5081,5 @@ INSERT INTO schema_migrations (version) VALUES ('20180126104903'); INSERT INTO schema_migrations (version) VALUES ('20180206213435'); +INSERT INTO schema_migrations (version) VALUES ('20180206234620'); + From 940613ae347af450426887a72873cdc41df445fb Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 7 Feb 2018 02:17:48 +0200 Subject: [PATCH 09/41] Decompose EppSession#data #700 --- .reek | 2 -- .rubocop_todo.yml | 5 --- app/controllers/epp/sessions_controller.rb | 2 +- app/controllers/epp_controller.rb | 2 +- app/models/epp_session.rb | 36 ++-------------------- lib/tasks/dev.rake | 2 +- test/fixtures/epp_sessions.yml | 4 +-- test/models/epp_session_test.rb | 17 ++++------ 8 files changed, 13 insertions(+), 57 deletions(-) diff --git a/.reek b/.reek index 3bdfebb81..b621c44a5 100644 --- a/.reek +++ b/.reek @@ -538,7 +538,6 @@ IrresponsibleModule: - DomainStatus - DomainTransfer - Epp::Contact - - EppSession - Invoice - InvoiceItem - Keyrelay @@ -1027,7 +1026,6 @@ PrimaDonnaMethod: - Contact - Domain - Epp::Domain - - EppSession - RegistrantVerification - Registrar BooleanParameter: diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index a9c491df9..7acf2bd1b 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -655,11 +655,6 @@ Performance/StringReplacement: - 'app/models/directo.rb' - 'app/models/dnskey.rb' -# Offense count: 1 -Security/MarshalLoad: - Exclude: - - 'app/models/epp_session.rb' - # Offense count: 4 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, SupportedStyles. diff --git a/app/controllers/epp/sessions_controller.rb b/app/controllers/epp/sessions_controller.rb index dc67405d1..8f4d14ac7 100644 --- a/app/controllers/epp/sessions_controller.rb +++ b/app/controllers/epp/sessions_controller.rb @@ -91,7 +91,7 @@ class Epp::SessionsController < EppController end end - epp_session[:api_user_id] = @api_user.id + epp_session.user = @api_user epp_session.update_column(:registrar_id, @api_user.registrar_id) render_epp_response('login_success') else diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb index 254cb8968..07d3286d0 100644 --- a/app/controllers/epp_controller.rb +++ b/app/controllers/epp_controller.rb @@ -115,7 +115,7 @@ class EppController < ApplicationController end def current_user - @current_user ||= ApiUser.find_by_id(epp_session[:api_user_id]) + @current_user ||= epp_session.user # by default PaperTrail uses before filter and at that # time current_user is not yet present ::PaperTrail.whodunnit = user_log_str(@current_user) diff --git a/app/models/epp_session.rb b/app/models/epp_session.rb index 8d36e15ef..dd97a91a9 100644 --- a/app/models/epp_session.rb +++ b/app/models/epp_session.rb @@ -1,38 +1,6 @@ class EppSession < ActiveRecord::Base - before_save :marshal_data! + belongs_to :user, required: true + belongs_to :registrar validates :session_id, presence: true - - belongs_to :registrar - # rubocop: disable Rails/ReadWriteAttribute - # Turned back to read_attribute, thus in Rails 4 - # there is differences between self[:data] and read_attribute. - def data - @data ||= self.class.unmarshal(read_attribute(:data)) || {} - end - # rubocop: enable Rails/ReadWriteAttribute - - def [](key) - data[key.to_sym] - end - - def []=(key, value) - data[key.to_sym] = value - save! - end - - def marshal_data! - self.data = self.class.marshal(data) - end - - class << self - def marshal(data) - ::Base64.encode64(Marshal.dump(data)) if data - end - - def unmarshal(data) - return data unless data.is_a? String - Marshal.load(::Base64.decode64(data)) if data - end - end end diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake index e25053133..d0c855903 100644 --- a/lib/tasks/dev.rake +++ b/lib/tasks/dev.rake @@ -52,7 +52,7 @@ namespace :dev do epp_session = EppSession.new epp_session.session_id = 'test' epp_session.registrar = registrar - epp_session[:api_user_id] = api_user.id + epp_session.user = api_user epp_session.save! domain_counter = 1.step diff --git a/test/fixtures/epp_sessions.yml b/test/fixtures/epp_sessions.yml index 8cdaedb8c..9d824cf1c 100644 --- a/test/fixtures/epp_sessions.yml +++ b/test/fixtures/epp_sessions.yml @@ -1,9 +1,9 @@ api_bestnames: session_id: 1 + user: api_bestnames registrar: bestnames - data: <%= Base64.encode64(Marshal.dump({api_user_id: ActiveRecord::Fixtures.identify(:api_bestnames)})) %> api_goodnames: session_id: 2 + user: api_goodnames registrar: goodnames - data: <%= Base64.encode64(Marshal.dump({api_user_id: ActiveRecord::Fixtures.identify(:api_goodnames)})) %> diff --git a/test/models/epp_session_test.rb b/test/models/epp_session_test.rb index b4801bb5a..98ae993f5 100644 --- a/test/models/epp_session_test.rb +++ b/test/models/epp_session_test.rb @@ -9,20 +9,15 @@ class EppSessionTest < ActiveSupport::TestCase assert @epp_session.valid? end - def test_api_user_id_serialization - epp_session = EppSession.new - epp_session.session_id = 'test' - epp_session.registrar = registrars(:bestnames) - epp_session[:api_user_id] = ActiveRecord::Fixtures.identify(:api_bestnames) - epp_session.save! - epp_session.reload - - assert_equal ActiveRecord::Fixtures.identify(:api_bestnames), epp_session[:api_user_id] - end - def test_session_id_presence_validation @epp_session.session_id = nil @epp_session.validate assert @epp_session.invalid? end + + def test_user_presence_validation + @epp_session.user = nil + @epp_session.validate + assert @epp_session.invalid? + end end From cf5ea5a16dadd9a3e7c014c7a183152705118fe6 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 7 Feb 2018 06:18:09 +0200 Subject: [PATCH 10/41] Revert "Remove factory" This reverts commit 4163ee9017f6cc1593917a6557fcd86d17bea266. --- spec/factories/epp_session.rb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 spec/factories/epp_session.rb diff --git a/spec/factories/epp_session.rb b/spec/factories/epp_session.rb new file mode 100644 index 000000000..96dd78da3 --- /dev/null +++ b/spec/factories/epp_session.rb @@ -0,0 +1,5 @@ +FactoryBot.define do + factory :epp_session do + + end +end From ad1f5e6144f91607c56801989303388ea7e66b99 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 7 Feb 2018 08:38:14 +0200 Subject: [PATCH 11/41] Fix invalid factory #700 --- spec/factories/epp_session.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/factories/epp_session.rb b/spec/factories/epp_session.rb index 96dd78da3..20e3afc45 100644 --- a/spec/factories/epp_session.rb +++ b/spec/factories/epp_session.rb @@ -1,5 +1,7 @@ FactoryBot.define do factory :epp_session do - + sequence(:session_id) { |n| "test#{n}" } + registrar + association :user, factory: :api_user end end From 278ae07ac6016195c7ab7be1d6b1a25f96f85252 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 7 Feb 2018 08:46:55 +0200 Subject: [PATCH 12/41] Fix EPP login in specs #700 --- .../requests/epp/contact/create/ident_spec.rb | 7 +++++-- .../requests/epp/contact/create/phone_spec.rb | 7 +++++-- spec/requests/epp/contact/create_spec.rb | 21 +++++++++++-------- spec/requests/epp/contact/delete/used_spec.rb | 5 +++-- spec/requests/epp/contact/info_spec.rb | 13 +++++++----- .../requests/epp/contact/update/ident_spec.rb | 7 +++++-- .../requests/epp/contact/update/phone_spec.rb | 7 +++++-- spec/requests/epp/contact/update_spec.rb | 17 ++++++++------- .../epp/domain/create/account_balance_spec.rb | 5 +++-- .../epp/domain/create/default_period_spec.rb | 5 +++-- .../domain/create/optional_nameserver_spec.rb | 5 +++-- .../requests/epp/domain/create/period_spec.rb | 5 +++-- spec/requests/epp/domain/create/price_spec.rb | 5 +++-- .../domain/create/required_nameserver_spec.rb | 5 +++-- .../epp/domain/delete/discarded_spec.rb | 9 +++++--- .../epp/domain/renew/account_balance_spec.rb | 5 +++-- .../epp/domain/renew/default_period_spec.rb | 5 +++-- .../epp/domain/renew/expire_time_spec.rb | 5 +++-- .../epp/domain/renew/max_expire_time_spec.rb | 11 +++++----- spec/requests/epp/domain/renew/period_spec.rb | 5 +++-- spec/requests/epp/domain/renew/price_spec.rb | 5 +++-- .../epp/domain/transfer/discarded_spec.rb | 9 +++++--- .../epp/domain/update/discarded_spec.rb | 9 +++++--- .../epp/domain/update/nameserver_add_spec.rb | 13 +++++++----- .../domain/update/nameserver_remove_spec.rb | 14 +++++++------ .../registrant_change/same_as_current_spec.rb | 7 +++++-- .../update/registrant_change/verified_spec.rb | 7 +++++-- .../requests/epp/domain/update/status_spec.rb | 7 +++++-- 28 files changed, 141 insertions(+), 84 deletions(-) diff --git a/spec/requests/epp/contact/create/ident_spec.rb b/spec/requests/epp/contact/create/ident_spec.rb index e112e2618..cdf457002 100644 --- a/spec/requests/epp/contact/create/ident_spec.rb +++ b/spec/requests/epp/contact/create/ident_spec.rb @@ -1,11 +1,14 @@ require 'rails_helper' RSpec.describe 'EPP contact:create' do - let(:request) { post '/epp/command/create', frame: request_xml } + let(:registrar) { create(:registrar) } + let(:user) { create(:api_user_epp, registrar: registrar) } + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:request) { post '/epp/command/create', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } before do Setting.address_processing = false - sign_in_to_epp_area + login_as user end context 'when all ident params are valid' do diff --git a/spec/requests/epp/contact/create/phone_spec.rb b/spec/requests/epp/contact/create/phone_spec.rb index dd205de87..3c7796659 100644 --- a/spec/requests/epp/contact/create/phone_spec.rb +++ b/spec/requests/epp/contact/create/phone_spec.rb @@ -2,7 +2,10 @@ require 'rails_helper' require_relative '../shared/phone' RSpec.describe 'EPP contact:create' do - let(:request) { post '/epp/command/create', frame: request_xml } + let(:registrar) { create(:registrar) } + let(:user) { create(:api_user_epp, registrar: registrar) } + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:request) { post '/epp/command/create', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let(:request_xml) { <<-XML @@ -27,7 +30,7 @@ RSpec.describe 'EPP contact:create' do } before do - sign_in_to_epp_area + login_as user allow(Contact).to receive(:address_processing?).and_return(false) end diff --git a/spec/requests/epp/contact/create_spec.rb b/spec/requests/epp/contact/create_spec.rb index 0f03fd6ac..8b4b14794 100644 --- a/spec/requests/epp/contact/create_spec.rb +++ b/spec/requests/epp/contact/create_spec.rb @@ -1,6 +1,9 @@ require 'rails_helper' RSpec.describe 'EPP contact:create' do + let(:registrar) { create(:registrar) } + let(:user) { create(:api_user_epp, registrar: registrar) } + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } let(:request_xml_with_address) { ' @@ -36,7 +39,7 @@ RSpec.describe 'EPP contact:create' do subject(:address_saved) { Contact.last.attributes.slice(*Contact.address_attribute_names).compact.any? } before do - sign_in_to_epp_area + login_as user end context 'when address processing is enabled' do @@ -46,17 +49,17 @@ RSpec.describe 'EPP contact:create' do context 'with address' do it 'returns epp code of 1000' do - post '/epp/command/create', frame: request_xml_with_address + post '/epp/command/create', { frame: request_xml_with_address }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response_code).to eq('1000') end it 'returns epp description' do - post '/epp/command/create', frame: request_xml_with_address + post '/epp/command/create', { frame: request_xml_with_address}, 'HTTP_COOKIE' => "session=#{session_id}" expect(response_description).to eq('Command completed successfully') end it 'saves address' do - post '/epp/command/create', frame: request_xml_with_address + post '/epp/command/create', { frame: request_xml_with_address }, 'HTTP_COOKIE' => "session=#{session_id}" expect(address_saved).to be_truthy end end @@ -69,17 +72,17 @@ RSpec.describe 'EPP contact:create' do context 'with address' do it 'returns epp code of 1100' do - post '/epp/command/create', frame: request_xml_with_address + post '/epp/command/create', { frame: request_xml_with_address }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response_code).to eq('1100') end it 'returns epp description' do - post '/epp/command/create', frame: request_xml_with_address + post '/epp/command/create', { frame: request_xml_with_address }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response_description).to eq('Command completed successfully; Postal address data discarded') end it 'does not save address' do - post '/epp/command/create', frame: request_xml_with_address + post '/epp/command/create', { frame: request_xml_with_address }, 'HTTP_COOKIE' => "session=#{session_id}" expect(address_saved).to be_falsey end end @@ -110,12 +113,12 @@ RSpec.describe 'EPP contact:create' do } it 'returns epp code of 1000' do - post '/epp/command/create', frame: request_xml_without_address + post '/epp/command/create', { frame: request_xml_without_address }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response_code).to eq('1000') end it 'returns epp description' do - post '/epp/command/create', frame: request_xml_without_address + post '/epp/command/create', { frame: request_xml_without_address }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response_description).to eq('Command completed successfully') end end diff --git a/spec/requests/epp/contact/delete/used_spec.rb b/spec/requests/epp/contact/delete/used_spec.rb index f6db6b65b..e37d30173 100644 --- a/spec/requests/epp/contact/delete/used_spec.rb +++ b/spec/requests/epp/contact/delete/used_spec.rb @@ -1,10 +1,11 @@ require 'rails_helper' RSpec.describe 'EPP contact:delete' do + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } let(:user) { create(:api_user, registrar: registrar) } let(:registrar) { create(:registrar) } let!(:registrant) { create(:registrant, registrar: registrar, code: 'TEST') } - let(:request) { post '/epp/command/delete', frame: request_xml } + let(:request) { post '/epp/command/delete', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let(:request_xml) { <<-XML @@ -20,7 +21,7 @@ RSpec.describe 'EPP contact:delete' do } before do - sign_in_to_epp_area(user: user) + login_as user end context 'when contact is used' do diff --git a/spec/requests/epp/contact/info_spec.rb b/spec/requests/epp/contact/info_spec.rb index d97a0373e..a16a235a8 100644 --- a/spec/requests/epp/contact/info_spec.rb +++ b/spec/requests/epp/contact/info_spec.rb @@ -1,6 +1,9 @@ require 'rails_helper' RSpec.describe 'EPP contact:update' do + let(:registrar) { create(:registrar) } + let(:user) { create(:api_user_epp, registrar: registrar) } + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } let(:request_xml) { ' @@ -19,7 +22,7 @@ RSpec.describe 'EPP contact:update' do .count } before do - sign_in_to_epp_area + login_as user create(:contact, code: 'TEST') end @@ -29,12 +32,12 @@ RSpec.describe 'EPP contact:update' do end it 'returns epp code of 1000' do - post '/epp/command/info', frame: request_xml + post '/epp/command/info', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response_code).to eq('1000') end it 'returns address' do - post '/epp/command/info', frame: request_xml + post '/epp/command/info', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" expect(address_count).to_not be_zero end end @@ -45,12 +48,12 @@ RSpec.describe 'EPP contact:update' do end it 'returns epp code of 1000' do - post '/epp/command/info', frame: request_xml + post '/epp/command/info', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response_code).to eq('1000') end it 'does not return address' do - post '/epp/command/info', frame: request_xml + post '/epp/command/info', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" expect(address_count).to be_zero end end diff --git a/spec/requests/epp/contact/update/ident_spec.rb b/spec/requests/epp/contact/update/ident_spec.rb index c93ba6390..ec25d1c8c 100644 --- a/spec/requests/epp/contact/update/ident_spec.rb +++ b/spec/requests/epp/contact/update/ident_spec.rb @@ -3,8 +3,11 @@ require 'rails_helper' # https://github.com/internetee/registry/issues/576 RSpec.describe 'EPP contact:update' do + let(:registrar) { create(:registrar) } + let(:user) { create(:api_user_epp, registrar: registrar) } + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } let(:ident) { contact.identifier } - let(:request) { post '/epp/command/update', frame: request_xml } + let(:request) { post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let(:request_xml) { <<-XML @@ -30,7 +33,7 @@ RSpec.describe 'EPP contact:update' do } before do - sign_in_to_epp_area + login_as user end context 'when contact ident is valid' do diff --git a/spec/requests/epp/contact/update/phone_spec.rb b/spec/requests/epp/contact/update/phone_spec.rb index 452b80c5c..696725ab4 100644 --- a/spec/requests/epp/contact/update/phone_spec.rb +++ b/spec/requests/epp/contact/update/phone_spec.rb @@ -2,8 +2,11 @@ require 'rails_helper' require_relative '../shared/phone' RSpec.describe 'EPP contact:update' do + let(:registrar) { create(:registrar) } + let(:user) { create(:api_user_epp, registrar: registrar) } + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } let!(:contact) { create(:contact, code: 'TEST') } - let(:request) { post '/epp/command/update', frame: request_xml } + let(:request) { post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let(:request_xml) { <<-XML @@ -22,7 +25,7 @@ RSpec.describe 'EPP contact:update' do } before do - sign_in_to_epp_area + login_as user allow(Contact).to receive(:address_processing?).and_return(false) end diff --git a/spec/requests/epp/contact/update_spec.rb b/spec/requests/epp/contact/update_spec.rb index a8be4c85d..3d40e8699 100644 --- a/spec/requests/epp/contact/update_spec.rb +++ b/spec/requests/epp/contact/update_spec.rb @@ -1,6 +1,9 @@ require 'rails_helper' RSpec.describe 'EPP contact:update' do + let(:registrar) { create(:registrar) } + let(:user) { create(:api_user_epp, registrar: registrar) } + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } let(:request_xml_with_address) { ' @@ -33,7 +36,7 @@ RSpec.describe 'EPP contact:update' do subject(:response_description) { response_xml.css('result msg').text } before do - sign_in_to_epp_area + login_as user create(:contact, code: 'TEST') end @@ -44,12 +47,12 @@ RSpec.describe 'EPP contact:update' do context 'with address' do it 'returns epp code of 1000' do - post '/epp/command/update', frame: request_xml_with_address + post '/epp/command/update', { frame: request_xml_with_address }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response_code).to eq('1000') end it 'returns epp description' do - post '/epp/command/update', frame: request_xml_with_address + post '/epp/command/update', { frame: request_xml_with_address }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response_description).to eq('Command completed successfully') end end @@ -62,12 +65,12 @@ RSpec.describe 'EPP contact:update' do context 'with address' do it 'returns epp code of 1100' do - post '/epp/command/update', frame: request_xml_with_address + post '/epp/command/update', { frame: request_xml_with_address }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response_code).to eq('1100') end it 'returns epp description' do - post '/epp/command/update', frame: request_xml_with_address + post '/epp/command/update', { frame: request_xml_with_address }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response_description).to eq('Command completed successfully; Postal address data discarded') end end @@ -92,12 +95,12 @@ RSpec.describe 'EPP contact:update' do } it 'returns epp code of 1000' do - post '/epp/command/update', frame: request_xml_without_address + post '/epp/command/update', { frame: request_xml_without_address }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response_code).to eq('1000') end it 'returns epp description' do - post '/epp/command/update', frame: request_xml_without_address + post '/epp/command/update', { frame: request_xml_without_address }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response_description).to eq('Command completed successfully') end end diff --git a/spec/requests/epp/domain/create/account_balance_spec.rb b/spec/requests/epp/domain/create/account_balance_spec.rb index 9c3905801..43edae1aa 100644 --- a/spec/requests/epp/domain/create/account_balance_spec.rb +++ b/spec/requests/epp/domain/create/account_balance_spec.rb @@ -1,7 +1,8 @@ require 'rails_helper' RSpec.describe 'EPP domain:create', settings: false do - let(:request) { post '/epp/command/create', frame: request_xml } + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:request) { post '/epp/command/create', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let!(:user) { create(:api_user_epp, registrar: registrar) } let!(:contact) { create(:contact, code: 'test') } let!(:zone) { create(:zone, origin: 'test') } @@ -36,7 +37,7 @@ RSpec.describe 'EPP domain:create', settings: false do before :example do travel_to Time.zone.parse('05.07.2010') Setting.days_to_renew_domain_before_expire = 0 - sign_in_to_epp_area(user: user) + login_as user end context 'when account balance is sufficient' do diff --git a/spec/requests/epp/domain/create/default_period_spec.rb b/spec/requests/epp/domain/create/default_period_spec.rb index 05a1ab73a..fd807bef0 100644 --- a/spec/requests/epp/domain/create/default_period_spec.rb +++ b/spec/requests/epp/domain/create/default_period_spec.rb @@ -1,7 +1,8 @@ require 'rails_helper' RSpec.describe 'EPP domain:create', settings: false do - let(:request) { post '/epp/command/create', frame: request_xml } + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:request) { post '/epp/command/create', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let!(:user) { create(:api_user_epp, registrar: registrar) } let!(:contact) { create(:contact, code: 'test') } let!(:zone) { create(:zone, origin: 'test') } @@ -37,7 +38,7 @@ RSpec.describe 'EPP domain:create', settings: false do before :example do travel_to Time.zone.parse('05.07.2010 10:30') Setting.days_to_renew_domain_before_expire = 0 - sign_in_to_epp_area(user: user) + login_as user end context 'when period is absent' do diff --git a/spec/requests/epp/domain/create/optional_nameserver_spec.rb b/spec/requests/epp/domain/create/optional_nameserver_spec.rb index bf1550268..83ab1df44 100644 --- a/spec/requests/epp/domain/create/optional_nameserver_spec.rb +++ b/spec/requests/epp/domain/create/optional_nameserver_spec.rb @@ -1,7 +1,8 @@ require 'rails_helper' RSpec.describe 'EPP domain:create', settings: false do - let(:request) { post '/epp/command/create', frame: request_xml } + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:request) { post '/epp/command/create', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let!(:registrar) { create(:registrar_with_unlimited_balance) } let!(:user) { create(:api_user_epp, registrar: registrar) } let!(:contact) { create(:contact, code: 'test') } @@ -17,7 +18,7 @@ RSpec.describe 'EPP domain:create', settings: false do before :example do travel_to Time.zone.parse('05.07.2010') - sign_in_to_epp_area(user: user) + login_as user end context 'when nameserver is optional' do diff --git a/spec/requests/epp/domain/create/period_spec.rb b/spec/requests/epp/domain/create/period_spec.rb index 355ef7557..f9550002e 100644 --- a/spec/requests/epp/domain/create/period_spec.rb +++ b/spec/requests/epp/domain/create/period_spec.rb @@ -1,7 +1,8 @@ require 'rails_helper' RSpec.describe 'EPP domain:create', settings: false do - let(:request) { post '/epp/command/create', frame: request_xml } + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:request) { post '/epp/command/create', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let!(:user) { create(:api_user_epp, registrar: registrar) } let!(:contact) { create(:contact, code: 'test') } let!(:zone) { create(:zone, origin: 'test') } @@ -10,7 +11,7 @@ RSpec.describe 'EPP domain:create', settings: false do before :example do travel_to Time.zone.parse('05.07.2010 10:30') Setting.days_to_renew_domain_before_expire = 0 - sign_in_to_epp_area(user: user) + login_as user end context 'when period is 3 months' do diff --git a/spec/requests/epp/domain/create/price_spec.rb b/spec/requests/epp/domain/create/price_spec.rb index 69439bb41..2b2aa789e 100644 --- a/spec/requests/epp/domain/create/price_spec.rb +++ b/spec/requests/epp/domain/create/price_spec.rb @@ -1,7 +1,8 @@ require 'rails_helper' RSpec.describe 'EPP domain:create', settings: false do - let(:request) { post '/epp/command/create', frame: request_xml } + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:request) { post '/epp/command/create', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let!(:user) { create(:api_user_epp, registrar: registrar) } let!(:contact) { create(:contact, code: 'test') } let!(:zone) { create(:zone, origin: 'test') } @@ -30,7 +31,7 @@ RSpec.describe 'EPP domain:create', settings: false do before :example do travel_to Time.zone.parse('05.07.2010') Setting.days_to_renew_domain_before_expire = 0 - sign_in_to_epp_area(user: user) + login_as user end context 'when price is present' do diff --git a/spec/requests/epp/domain/create/required_nameserver_spec.rb b/spec/requests/epp/domain/create/required_nameserver_spec.rb index 11b49aede..3c72c58a5 100644 --- a/spec/requests/epp/domain/create/required_nameserver_spec.rb +++ b/spec/requests/epp/domain/create/required_nameserver_spec.rb @@ -1,7 +1,8 @@ require 'rails_helper' RSpec.describe 'EPP domain:create', settings: false do - let(:request) { post '/epp/command/create', frame: request_xml } + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:request) { post '/epp/command/create', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let!(:registrar) { create(:registrar_with_unlimited_balance) } let!(:user) { create(:api_user_epp, registrar: registrar) } let!(:contact) { create(:contact, code: 'test') } @@ -17,7 +18,7 @@ RSpec.describe 'EPP domain:create', settings: false do before :example do travel_to Time.zone.parse('05.07.2010') - sign_in_to_epp_area(user: user) + login_as user end context 'when nameserver is required' do diff --git a/spec/requests/epp/domain/delete/discarded_spec.rb b/spec/requests/epp/domain/delete/discarded_spec.rb index 99ec59267..1cce794bc 100644 --- a/spec/requests/epp/domain/delete/discarded_spec.rb +++ b/spec/requests/epp/domain/delete/discarded_spec.rb @@ -1,6 +1,9 @@ require 'rails_helper' RSpec.describe 'EPP domain:delete' do + let(:registrar) { create(:registrar) } + let(:user) { create(:api_user_epp, registrar: registrar) } + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } let(:request_xml) { <<-XML @@ -21,14 +24,14 @@ RSpec.describe 'EPP domain:delete' do } before :example do - sign_in_to_epp_area + login_as user end context 'when domain is not discarded' do let!(:domain) { create(:domain, name: 'test.com') } it 'returns epp code of 1001' do - post '/epp/command/delete', frame: request_xml + post '/epp/command/delete', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response).to have_code_of(1001) end end @@ -37,7 +40,7 @@ RSpec.describe 'EPP domain:delete' do let!(:domain) { create(:domain_discarded, name: 'test.com') } it 'returns epp code of 2105' do - post '/epp/command/delete', frame: request_xml + post '/epp/command/delete', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response).to have_code_of(2105) end end diff --git a/spec/requests/epp/domain/renew/account_balance_spec.rb b/spec/requests/epp/domain/renew/account_balance_spec.rb index 39f9eac02..128c60070 100644 --- a/spec/requests/epp/domain/renew/account_balance_spec.rb +++ b/spec/requests/epp/domain/renew/account_balance_spec.rb @@ -1,7 +1,8 @@ require 'rails_helper' RSpec.describe 'EPP domain:renew' do - let(:request) { post '/epp/command/renew', frame: request_xml } + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:request) { post '/epp/command/renew', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let!(:user) { create(:api_user_epp, registrar: registrar) } let!(:zone) { create(:zone, origin: 'test') } let!(:price) { create(:price, @@ -16,7 +17,7 @@ RSpec.describe 'EPP domain:renew' do before :example do Setting.days_to_renew_domain_before_expire = 0 travel_to Time.zone.parse('05.07.2010') - sign_in_to_epp_area(user: user) + login_as user end context 'when account balance is sufficient' do diff --git a/spec/requests/epp/domain/renew/default_period_spec.rb b/spec/requests/epp/domain/renew/default_period_spec.rb index 70ab2d58d..2f09acbcc 100644 --- a/spec/requests/epp/domain/renew/default_period_spec.rb +++ b/spec/requests/epp/domain/renew/default_period_spec.rb @@ -1,7 +1,8 @@ require 'rails_helper' RSpec.describe 'EPP domain:renew', settings: false do - let(:request) { post '/epp/command/renew', frame: request_xml } + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:request) { post '/epp/command/renew', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let!(:user) { create(:api_user_epp, registrar: registrar) } let!(:zone) { create(:zone, origin: 'test') } let!(:registrar) { create(:registrar_with_unlimited_balance) } @@ -37,7 +38,7 @@ RSpec.describe 'EPP domain:renew', settings: false do before :example do travel_to Time.zone.parse('05.07.2010') Setting.days_to_renew_domain_before_expire = 0 - sign_in_to_epp_area(user: user) + login_as user end context 'when period is absent' do diff --git a/spec/requests/epp/domain/renew/expire_time_spec.rb b/spec/requests/epp/domain/renew/expire_time_spec.rb index e656249ab..90cad850e 100644 --- a/spec/requests/epp/domain/renew/expire_time_spec.rb +++ b/spec/requests/epp/domain/renew/expire_time_spec.rb @@ -1,7 +1,8 @@ require 'rails_helper' RSpec.describe 'EPP domain:renew' do - let(:request) { post '/epp/command/renew', frame: request_xml } + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:request) { post '/epp/command/renew', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let!(:user) { create(:api_user_epp, registrar: registrar) } let!(:registrar) { create(:registrar_with_unlimited_balance) } let!(:zone) { create(:zone, origin: 'test') } @@ -17,7 +18,7 @@ RSpec.describe 'EPP domain:renew' do before :example do Setting.days_to_renew_domain_before_expire = 0 travel_to Time.zone.parse('05.07.2010') - sign_in_to_epp_area(user: user) + login_as user end context 'when given expire time and current match' do diff --git a/spec/requests/epp/domain/renew/max_expire_time_spec.rb b/spec/requests/epp/domain/renew/max_expire_time_spec.rb index 2a9a0c52c..211af8685 100644 --- a/spec/requests/epp/domain/renew/max_expire_time_spec.rb +++ b/spec/requests/epp/domain/renew/max_expire_time_spec.rb @@ -1,6 +1,7 @@ require 'rails_helper' RSpec.describe 'EPP domain:renew' do + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } let(:user) { create(:api_user_epp, registrar: registrar) } let(:registrar) { create(:registrar_with_unlimited_balance) } let!(:zone) { create(:zone, origin: 'test') } @@ -19,7 +20,7 @@ RSpec.describe 'EPP domain:renew' do before :example do travel_to Time.zone.parse('05.07.2010') Setting.days_to_renew_domain_before_expire = 0 - sign_in_to_epp_area(user: user) + login_as user end context 'when domain can be renewed' do @@ -45,12 +46,12 @@ RSpec.describe 'EPP domain:renew' do } it 'returns epp code of 1000' do - post '/epp/command/renew', frame: request_xml + post '/epp/command/renew', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response_code).to eq('1000') end it 'returns epp description' do - post '/epp/command/renew', frame: request_xml + post '/epp/command/renew', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response_description).to eq('Command completed successfully') end end @@ -78,12 +79,12 @@ RSpec.describe 'EPP domain:renew' do } it 'returns epp code of 2105' do - post '/epp/command/renew', frame: request_xml + post '/epp/command/renew', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response_code).to eq('2105') end it 'returns epp description' do - post '/epp/command/renew', frame: request_xml + post '/epp/command/renew', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response_description).to eq('Object is not eligible for renewal; ' \ 'Expiration date must be before 2021-07-05') end diff --git a/spec/requests/epp/domain/renew/period_spec.rb b/spec/requests/epp/domain/renew/period_spec.rb index 3523927eb..6c5167d26 100644 --- a/spec/requests/epp/domain/renew/period_spec.rb +++ b/spec/requests/epp/domain/renew/period_spec.rb @@ -1,7 +1,8 @@ require 'rails_helper' RSpec.describe 'EPP domain:renew', settings: false do - let(:request) { post '/epp/command/renew', frame: request_xml } + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:request) { post '/epp/command/renew', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let!(:user) { create(:api_user_epp, registrar: registrar) } let!(:zone) { create(:zone, origin: 'test') } let!(:registrar) { create(:registrar_with_unlimited_balance) } @@ -14,7 +15,7 @@ RSpec.describe 'EPP domain:renew', settings: false do before :example do travel_to Time.zone.parse('05.07.2010') Setting.days_to_renew_domain_before_expire = 0 - sign_in_to_epp_area(user: user) + login_as user end context 'when period is 3 months' do diff --git a/spec/requests/epp/domain/renew/price_spec.rb b/spec/requests/epp/domain/renew/price_spec.rb index 3b5139103..4a9c65ff3 100644 --- a/spec/requests/epp/domain/renew/price_spec.rb +++ b/spec/requests/epp/domain/renew/price_spec.rb @@ -1,7 +1,8 @@ require 'rails_helper' RSpec.describe 'EPP domain:renew', settings: false do - let(:request) { post '/epp/command/renew', frame: request_xml } + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:request) { post '/epp/command/renew', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let!(:user) { create(:api_user_epp, registrar: registrar) } let!(:zone) { create(:zone, origin: 'test') } let!(:registrar) { create(:registrar_with_unlimited_balance) } @@ -29,7 +30,7 @@ RSpec.describe 'EPP domain:renew', settings: false do before :example do travel_to Time.zone.parse('05.07.2010') Setting.days_to_renew_domain_before_expire = 0 - sign_in_to_epp_area(user: user) + login_as user end context 'when price is present' do diff --git a/spec/requests/epp/domain/transfer/discarded_spec.rb b/spec/requests/epp/domain/transfer/discarded_spec.rb index 51f65c641..d279bf003 100644 --- a/spec/requests/epp/domain/transfer/discarded_spec.rb +++ b/spec/requests/epp/domain/transfer/discarded_spec.rb @@ -1,6 +1,9 @@ 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, registrar: registrar).session_id } let(:request_xml) { <<-XML @@ -19,14 +22,14 @@ RSpec.describe 'EPP domain:transfer' do } before :example do - sign_in_to_epp_area + 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 + post '/epp/command/transfer', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response).to have_code_of(1000) end end @@ -35,7 +38,7 @@ RSpec.describe 'EPP domain:transfer' do let!(:domain) { create(:domain_discarded, name: 'test.com') } it 'returns epp code of 2105' do - post '/epp/command/transfer', frame: request_xml + post '/epp/command/transfer', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response).to have_code_of(2105) end end diff --git a/spec/requests/epp/domain/update/discarded_spec.rb b/spec/requests/epp/domain/update/discarded_spec.rb index 14ff1c743..29ae1f44c 100644 --- a/spec/requests/epp/domain/update/discarded_spec.rb +++ b/spec/requests/epp/domain/update/discarded_spec.rb @@ -1,6 +1,9 @@ require 'rails_helper' RSpec.describe 'EPP domain:update' do + let(:registrar) { create(:registrar) } + let(:user) { create(:api_user_epp, registrar: registrar) } + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } let(:request_xml) { <<-XML @@ -16,14 +19,14 @@ RSpec.describe 'EPP domain:update' do } before :example do - sign_in_to_epp_area + 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/update', frame: request_xml + post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response).to have_code_of(1000) end end @@ -32,7 +35,7 @@ RSpec.describe 'EPP domain:update' do let!(:domain) { create(:domain_discarded, name: 'test.com') } it 'returns epp code of 2105' do - post '/epp/command/update', frame: request_xml + post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response).to have_code_of(2105) end end diff --git a/spec/requests/epp/domain/update/nameserver_add_spec.rb b/spec/requests/epp/domain/update/nameserver_add_spec.rb index d6f886932..8a00d585d 100644 --- a/spec/requests/epp/domain/update/nameserver_add_spec.rb +++ b/spec/requests/epp/domain/update/nameserver_add_spec.rb @@ -1,13 +1,16 @@ require 'rails_helper' RSpec.describe 'EPP domain:update' do + let(:registrar) { create(:registrar) } + let(:user) { create(:api_user_epp, registrar: registrar) } + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } let!(:domain) { create(:domain, name: 'test.com') } subject(:response_xml) { Nokogiri::XML(response.body) } subject(:response_code) { response_xml.xpath('//xmlns:result').first['code'] } subject(:response_description) { response_xml.css('result msg').text } before :example do - sign_in_to_epp_area + login_as user allow(Domain).to receive(:nameserver_required?).and_return(false) Setting.ns_min_count = 2 @@ -37,12 +40,12 @@ RSpec.describe 'EPP domain:update' do } it 'returns epp code of 2308' do - post '/epp/command/update', frame: request_xml + post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response_code).to eq('2308'), "Expected EPP code of 2308, got #{response_code} (#{response_description})" end it 'returns epp description' do - post '/epp/command/update', frame: request_xml + post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" description = 'Data management policy violation;' \ " Nameserver count must be between #{Setting.ns_min_count}-#{Setting.ns_max_count}" \ @@ -78,12 +81,12 @@ RSpec.describe 'EPP domain:update' do } it 'returns epp code of 1000' do - post '/epp/command/update', frame: request_xml + post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response_code).to eq('1000'), "Expected EPP code of 1000, got #{response_code} (#{response_description})" end it 'removes inactive status' do - post '/epp/command/update', frame: request_xml + post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" domain = Domain.find_by(name: 'test.com') expect(domain.statuses).to_not include(DomainStatus::INACTIVE) diff --git a/spec/requests/epp/domain/update/nameserver_remove_spec.rb b/spec/requests/epp/domain/update/nameserver_remove_spec.rb index 5ecc2f29a..3796d2e12 100644 --- a/spec/requests/epp/domain/update/nameserver_remove_spec.rb +++ b/spec/requests/epp/domain/update/nameserver_remove_spec.rb @@ -1,13 +1,15 @@ require 'rails_helper' RSpec.describe 'EPP domain:update' do + let(:registrar) { create(:registrar) } + let(:user) { create(:api_user_epp, registrar: registrar) } + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } subject(:response_xml) { Nokogiri::XML(response.body) } subject(:response_code) { response_xml.xpath('//xmlns:result').first['code'] } subject(:response_description) { response_xml.css('result msg').text } before :example do - sign_in_to_epp_area - + login_as user allow(Domain).to receive(:nameserver_required?).and_return(false) end @@ -43,12 +45,12 @@ RSpec.describe 'EPP domain:update' do end it 'returns epp code of 2308' do - post '/epp/command/update', frame: request_xml + post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response_code).to eq('2308'), "Expected EPP code of 2308, got #{response_code} (#{response_description})" end it 'returns epp description' do - post '/epp/command/update', frame: request_xml + post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" description = 'Data management policy violation;' \ " Nameserver count must be between #{Setting.ns_min_count}-#{Setting.ns_max_count}" \ @@ -91,13 +93,13 @@ RSpec.describe 'EPP domain:update' do end it 'returns epp code of 1000' do - post '/epp/command/update', frame: request_xml + post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" expect(response_code).to eq('1000'), "Expected EPP code of 1000, got #{response_code} (#{response_description})" end describe 'domain' do it 'has status of inactive' do - post '/epp/command/update', frame: request_xml + post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" domain = Domain.find_by(name: 'test.com') expect(domain.statuses).to include(DomainStatus::INACTIVE) end diff --git a/spec/requests/epp/domain/update/registrant_change/same_as_current_spec.rb b/spec/requests/epp/domain/update/registrant_change/same_as_current_spec.rb index d929423aa..1c0c8eb5b 100644 --- a/spec/requests/epp/domain/update/registrant_change/same_as_current_spec.rb +++ b/spec/requests/epp/domain/update/registrant_change/same_as_current_spec.rb @@ -1,11 +1,14 @@ require 'rails_helper' RSpec.describe 'EPP domain:update' do - let(:request) { post '/epp/command/update', frame: request_xml } + let(:registrar) { create(:registrar) } + let(:user) { create(:api_user_epp, registrar: registrar) } + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:request) { post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let!(:domain) { create(:domain, name: 'test.com', registrant: registrant) } before :example do - sign_in_to_epp_area + login_as user end context 'when registrant change confirmation is enabled' do diff --git a/spec/requests/epp/domain/update/registrant_change/verified_spec.rb b/spec/requests/epp/domain/update/registrant_change/verified_spec.rb index 996fffccf..e94923644 100644 --- a/spec/requests/epp/domain/update/registrant_change/verified_spec.rb +++ b/spec/requests/epp/domain/update/registrant_change/verified_spec.rb @@ -1,13 +1,16 @@ require 'rails_helper' RSpec.describe 'EPP domain:update' do - let(:request) { post '/epp/command/update', frame: request_xml } + let(:registrar) { create(:registrar) } + let(:user) { create(:api_user_epp, registrar: registrar) } + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:request) { post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let!(:registrant) { create(:registrant, code: 'old-code') } let!(:domain) { create(:domain, name: 'test.com', registrant: registrant) } let!(:new_registrant) { create(:registrant, code: 'new-code') } before :example do - sign_in_to_epp_area + login_as user end context 'when registrant change confirmation is enabled' do diff --git a/spec/requests/epp/domain/update/status_spec.rb b/spec/requests/epp/domain/update/status_spec.rb index 1ef8d7900..df5506fb6 100644 --- a/spec/requests/epp/domain/update/status_spec.rb +++ b/spec/requests/epp/domain/update/status_spec.rb @@ -1,7 +1,10 @@ require 'rails_helper' RSpec.describe 'EPP domain:update' do - let(:request) { post '/epp/command/update', frame: request_xml } + let(:registrar) { create(:registrar) } + let(:user) { create(:api_user_epp, registrar: registrar) } + let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:request) { post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let(:request_xml) { <<-XML @@ -17,7 +20,7 @@ RSpec.describe 'EPP domain:update' do } before :example do - sign_in_to_epp_area + login_as user end context 'when domain has both SERVER_DELETE_PROHIBITED and PENDING_UPDATE statuses' do From 2dcf0f5878c1b1b5e34e50922df2d4ad9fd52c74 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 7 Feb 2018 08:47:25 +0200 Subject: [PATCH 13/41] Remove rspec helper #700 --- .reek | 1 - spec/support/requests/session_helpers.rb | 29 ------------------------ 2 files changed, 30 deletions(-) diff --git a/.reek b/.reek index b621c44a5..e51946a9a 100644 --- a/.reek +++ b/.reek @@ -959,7 +959,6 @@ FeatureEnvy: - ActionDispatch::Flash#call - Ransack::Adapters::ActiveRecord::Context#evaluate - EppConstraint#matches? - - Requests::SessionHelpers#sign_in_to_epp_area TooManyMethods: exclude: - Epp::ContactsController diff --git a/spec/support/requests/session_helpers.rb b/spec/support/requests/session_helpers.rb index 0345959e2..84cb9c701 100644 --- a/spec/support/requests/session_helpers.rb +++ b/spec/support/requests/session_helpers.rb @@ -1,34 +1,5 @@ module Requests module SessionHelpers - def sign_in_to_epp_area(user: create(:api_user_epp)) - login_xml = " - - - - #{user.username} - #{user.password} - - 1.0 - en - - - https://epp.tld.ee/schema/domain-eis-1.0.xsd - https://epp.tld.ee/schema/contact-ee-1.1.xsd - urn:ietf:params:xml:ns:host-1.0 - urn:ietf:params:xml:ns:keyrelay-1.0 - - urn:ietf:params:xml:ns:secDNS-1.1 - https://epp.tld.ee/schema/eis-1.0.xsd - - - - ABC-12345 - - " - - post '/epp/session/login', frame: login_xml - end - def sign_in_to_admin_area(user: create(:admin_user)) post admin_sessions_path, admin_user: { username: user.username, password: user.password } end From c5f8c7e1e8c7e2798380833b66a05737fba7bdcb Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 7 Feb 2018 09:15:15 +0200 Subject: [PATCH 14/41] Rename migration #700 --- ...sions_data.rb => 20180206234620_add_epp_sessions_user_id.rb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename db/migrate/{20180206234620_extract_user_id_from_epp_sessions_data.rb => 20180206234620_add_epp_sessions_user_id.rb} (55%) diff --git a/db/migrate/20180206234620_extract_user_id_from_epp_sessions_data.rb b/db/migrate/20180206234620_add_epp_sessions_user_id.rb similarity index 55% rename from db/migrate/20180206234620_extract_user_id_from_epp_sessions_data.rb rename to db/migrate/20180206234620_add_epp_sessions_user_id.rb index 5fd686168..0e04a7f53 100644 --- a/db/migrate/20180206234620_extract_user_id_from_epp_sessions_data.rb +++ b/db/migrate/20180206234620_add_epp_sessions_user_id.rb @@ -1,4 +1,4 @@ -class ExtractUserIdFromEppSessionsData < ActiveRecord::Migration +class AddEppSessionsUserId < ActiveRecord::Migration def change add_reference :epp_sessions, :user, foreign_key: true end From 38f967a7d64d586262c7e9da6eb3c66576491c9c Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 7 Feb 2018 09:40:35 +0200 Subject: [PATCH 15/41] Migrate `epp_sessions.data` to `user_id` #700 --- ...207071528_extract_user_id_from_epp_sessions_data.rb | 10 ++++++++++ db/migrate/20180207072139_remove_epp_sessions_data.rb | 5 +++++ db/structure.sql | 5 ++++- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20180207071528_extract_user_id_from_epp_sessions_data.rb create mode 100644 db/migrate/20180207072139_remove_epp_sessions_data.rb diff --git a/db/migrate/20180207071528_extract_user_id_from_epp_sessions_data.rb b/db/migrate/20180207071528_extract_user_id_from_epp_sessions_data.rb new file mode 100644 index 000000000..24a5f25a6 --- /dev/null +++ b/db/migrate/20180207071528_extract_user_id_from_epp_sessions_data.rb @@ -0,0 +1,10 @@ +class ExtractUserIdFromEppSessionsData < ActiveRecord::Migration + def change + EppSession.all.each do |epp_session| + user_id = Marshal.load(::Base64.decode64(epp_session.data_before_type_cast))[:api_user_id] + user = ApiUser.find(user_id) + epp_session.user = user + epp_session.save! + end + end +end diff --git a/db/migrate/20180207072139_remove_epp_sessions_data.rb b/db/migrate/20180207072139_remove_epp_sessions_data.rb new file mode 100644 index 000000000..90ec58740 --- /dev/null +++ b/db/migrate/20180207072139_remove_epp_sessions_data.rb @@ -0,0 +1,5 @@ +class RemoveEppSessionsData < ActiveRecord::Migration + def change + remove_column :epp_sessions, :data, :string + end +end diff --git a/db/structure.sql b/db/structure.sql index b925a2a1b..a6f29a47e 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -1051,7 +1051,6 @@ ALTER SEQUENCE domains_id_seq OWNED BY domains.id; CREATE TABLE epp_sessions ( id integer NOT NULL, session_id character varying NOT NULL, - data text, created_at timestamp without time zone, updated_at timestamp without time zone, registrar_id integer, @@ -5083,3 +5082,7 @@ INSERT INTO schema_migrations (version) VALUES ('20180206213435'); INSERT INTO schema_migrations (version) VALUES ('20180206234620'); +INSERT INTO schema_migrations (version) VALUES ('20180207071528'); + +INSERT INTO schema_migrations (version) VALUES ('20180207072139'); + From 7fa75f33dcab1260354f9987bfd67bbeb4c1d2df Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 7 Feb 2018 12:22:00 +0200 Subject: [PATCH 16/41] Improve CodeClimate config --- .codeclimate.yml | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/.codeclimate.yml b/.codeclimate.yml index 21ab3742c..c3a7e4b2a 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -1,5 +1,4 @@ ---- -engines: +plugins: brakeman: enabled: true bundler-audit: @@ -14,8 +13,6 @@ engines: languages: - ruby - javascript - - python - - php eslint: enabled: true fixme: @@ -33,24 +30,9 @@ engines: checks: IrresponsibleModule: enabled: false -ratings: - paths: - - Gemfile.lock - - "**.erb" - - "**.haml" - - "**.rb" - - "**.rhtml" - - "**.slim" - - "**.css" - - "**.coffee" - - "**.inc" - - "**.js" - - "**.jsx" - - "**.module" - - "**.php" - - "**.py" -exclude_paths: +exclude_patterns: - config/ - db/ -- spec/ - vendor/ +- spec/ +- test/ From 114361f7f6dfea99f437da3ae0c8d1d2aafbfb1f Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 7 Feb 2018 12:33:00 +0200 Subject: [PATCH 17/41] Quote values #700 --- .codeclimate.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.codeclimate.yml b/.codeclimate.yml index c3a7e4b2a..e33254023 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -31,8 +31,8 @@ plugins: IrresponsibleModule: enabled: false exclude_patterns: -- config/ -- db/ -- vendor/ -- spec/ -- test/ +- "config/" +- "db/" +- "vendor/" +- "spec/" +- "test/" From b11306eea3064f9341e620ff576de5bc950ab559 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 12 Feb 2018 11:38:48 +0200 Subject: [PATCH 18/41] Create new EPP session on login explicitly #700 --- app/controllers/epp/sessions_controller.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/epp/sessions_controller.rb b/app/controllers/epp/sessions_controller.rb index 8f4d14ac7..1ffd9c02e 100644 --- a/app/controllers/epp/sessions_controller.rb +++ b/app/controllers/epp/sessions_controller.rb @@ -91,8 +91,11 @@ class Epp::SessionsController < EppController end end + epp_session = EppSession.new + epp_session.session_id = cookies[:session] epp_session.user = @api_user - epp_session.update_column(:registrar_id, @api_user.registrar_id) + epp_session.registrar = @api_user.registrar + epp_session.save! render_epp_response('login_success') else response.headers['X-EPP-Returncode'] = '2500' From fa6edab62ac7a4e9d1b8a7b79c89bbbb7cb24b45 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 12 Feb 2018 15:50:12 +0200 Subject: [PATCH 19/41] Remove extra attribute Registrar can be queried from user #700 --- app/controllers/epp/sessions_controller.rb | 8 +++----- .../20180212123810_remove_epp_sessions_registrar_id.rb | 5 +++++ db/structure.sql | 3 ++- lib/tasks/dev.rake | 1 - spec/factories/epp_session.rb | 1 - spec/requests/epp/contact/create/ident_spec.rb | 2 +- spec/requests/epp/contact/create/phone_spec.rb | 2 +- spec/requests/epp/contact/create_spec.rb | 2 +- spec/requests/epp/contact/delete/used_spec.rb | 2 +- spec/requests/epp/contact/info_spec.rb | 2 +- spec/requests/epp/contact/update/ident_spec.rb | 2 +- spec/requests/epp/contact/update/phone_spec.rb | 2 +- spec/requests/epp/contact/update_spec.rb | 2 +- spec/requests/epp/domain/create/account_balance_spec.rb | 2 +- spec/requests/epp/domain/create/default_period_spec.rb | 2 +- .../epp/domain/create/optional_nameserver_spec.rb | 2 +- spec/requests/epp/domain/create/period_spec.rb | 2 +- spec/requests/epp/domain/create/price_spec.rb | 2 +- .../epp/domain/create/required_nameserver_spec.rb | 2 +- spec/requests/epp/domain/delete/discarded_spec.rb | 2 +- spec/requests/epp/domain/renew/account_balance_spec.rb | 2 +- spec/requests/epp/domain/renew/default_period_spec.rb | 2 +- spec/requests/epp/domain/renew/expire_time_spec.rb | 2 +- spec/requests/epp/domain/renew/max_expire_time_spec.rb | 2 +- spec/requests/epp/domain/renew/period_spec.rb | 2 +- spec/requests/epp/domain/renew/price_spec.rb | 2 +- spec/requests/epp/domain/transfer/discarded_spec.rb | 2 +- spec/requests/epp/domain/update/discarded_spec.rb | 2 +- spec/requests/epp/domain/update/nameserver_add_spec.rb | 2 +- spec/requests/epp/domain/update/nameserver_remove_spec.rb | 2 +- .../update/registrant_change/same_as_current_spec.rb | 2 +- .../epp/domain/update/registrant_change/verified_spec.rb | 2 +- spec/requests/epp/domain/update/status_spec.rb | 2 +- test/fixtures/epp_sessions.yml | 2 -- 34 files changed, 38 insertions(+), 38 deletions(-) create mode 100644 db/migrate/20180212123810_remove_epp_sessions_registrar_id.rb diff --git a/app/controllers/epp/sessions_controller.rb b/app/controllers/epp/sessions_controller.rb index 1ffd9c02e..e4efc581d 100644 --- a/app/controllers/epp/sessions_controller.rb +++ b/app/controllers/epp/sessions_controller.rb @@ -94,7 +94,6 @@ class Epp::SessionsController < EppController epp_session = EppSession.new epp_session.session_id = cookies[:session] epp_session.user = @api_user - epp_session.registrar = @api_user.registrar epp_session.save! render_epp_response('login_success') else @@ -117,11 +116,10 @@ class Epp::SessionsController < EppController end def connection_limit_ok? - c = EppSession.where( - 'registrar_id = ? AND updated_at >= ?', @api_user.registrar_id, Time.zone.now - 1.second - ).count + epp_session_count = EppSession.where(user_id: @api_user.registrar.api_users.ids) + .where('updated_at >= ?', Time.zone.now - 1.second).count - return false if c >= 4 + return false if epp_session_count >= 4 true end diff --git a/db/migrate/20180212123810_remove_epp_sessions_registrar_id.rb b/db/migrate/20180212123810_remove_epp_sessions_registrar_id.rb new file mode 100644 index 000000000..80e2a7056 --- /dev/null +++ b/db/migrate/20180212123810_remove_epp_sessions_registrar_id.rb @@ -0,0 +1,5 @@ +class RemoveEppSessionsRegistrarId < ActiveRecord::Migration + def change + remove_column :epp_sessions, :registrar_id, :integer + end +end diff --git a/db/structure.sql b/db/structure.sql index a6f29a47e..f7fdc5148 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -1053,7 +1053,6 @@ CREATE TABLE epp_sessions ( session_id character varying NOT NULL, created_at timestamp without time zone, updated_at timestamp without time zone, - registrar_id integer, user_id integer ); @@ -5086,3 +5085,5 @@ INSERT INTO schema_migrations (version) VALUES ('20180207071528'); INSERT INTO schema_migrations (version) VALUES ('20180207072139'); +INSERT INTO schema_migrations (version) VALUES ('20180212123810'); + diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake index d0c855903..f4b133ed1 100644 --- a/lib/tasks/dev.rake +++ b/lib/tasks/dev.rake @@ -51,7 +51,6 @@ namespace :dev do epp_session = EppSession.new epp_session.session_id = 'test' - epp_session.registrar = registrar epp_session.user = api_user epp_session.save! diff --git a/spec/factories/epp_session.rb b/spec/factories/epp_session.rb index 20e3afc45..296368a92 100644 --- a/spec/factories/epp_session.rb +++ b/spec/factories/epp_session.rb @@ -1,7 +1,6 @@ FactoryBot.define do factory :epp_session do sequence(:session_id) { |n| "test#{n}" } - registrar association :user, factory: :api_user end end diff --git a/spec/requests/epp/contact/create/ident_spec.rb b/spec/requests/epp/contact/create/ident_spec.rb index cdf457002..5a9535187 100644 --- a/spec/requests/epp/contact/create/ident_spec.rb +++ b/spec/requests/epp/contact/create/ident_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' RSpec.describe 'EPP contact:create' do let(:registrar) { create(:registrar) } let(:user) { create(:api_user_epp, registrar: registrar) } - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let(:request) { post '/epp/command/create', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } before do diff --git a/spec/requests/epp/contact/create/phone_spec.rb b/spec/requests/epp/contact/create/phone_spec.rb index 3c7796659..1b55f6407 100644 --- a/spec/requests/epp/contact/create/phone_spec.rb +++ b/spec/requests/epp/contact/create/phone_spec.rb @@ -4,7 +4,7 @@ require_relative '../shared/phone' RSpec.describe 'EPP contact:create' do let(:registrar) { create(:registrar) } let(:user) { create(:api_user_epp, registrar: registrar) } - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let(:request) { post '/epp/command/create', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let(:request_xml) { <<-XML diff --git a/spec/requests/epp/contact/create_spec.rb b/spec/requests/epp/contact/create_spec.rb index 8b4b14794..3d72e3eda 100644 --- a/spec/requests/epp/contact/create_spec.rb +++ b/spec/requests/epp/contact/create_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' RSpec.describe 'EPP contact:create' do let(:registrar) { create(:registrar) } let(:user) { create(:api_user_epp, registrar: registrar) } - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let(:request_xml_with_address) { ' diff --git a/spec/requests/epp/contact/delete/used_spec.rb b/spec/requests/epp/contact/delete/used_spec.rb index e37d30173..663065ca5 100644 --- a/spec/requests/epp/contact/delete/used_spec.rb +++ b/spec/requests/epp/contact/delete/used_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' RSpec.describe 'EPP contact:delete' do - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let(:user) { create(:api_user, registrar: registrar) } let(:registrar) { create(:registrar) } let!(:registrant) { create(:registrant, registrar: registrar, code: 'TEST') } diff --git a/spec/requests/epp/contact/info_spec.rb b/spec/requests/epp/contact/info_spec.rb index a16a235a8..0468e097a 100644 --- a/spec/requests/epp/contact/info_spec.rb +++ b/spec/requests/epp/contact/info_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' RSpec.describe 'EPP contact:update' do let(:registrar) { create(:registrar) } let(:user) { create(:api_user_epp, registrar: registrar) } - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let(:request_xml) { ' diff --git a/spec/requests/epp/contact/update/ident_spec.rb b/spec/requests/epp/contact/update/ident_spec.rb index ec25d1c8c..ed42d129f 100644 --- a/spec/requests/epp/contact/update/ident_spec.rb +++ b/spec/requests/epp/contact/update/ident_spec.rb @@ -5,7 +5,7 @@ require 'rails_helper' RSpec.describe 'EPP contact:update' do let(:registrar) { create(:registrar) } let(:user) { create(:api_user_epp, registrar: registrar) } - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let(:ident) { contact.identifier } let(:request) { post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let(:request_xml) { <<-XML diff --git a/spec/requests/epp/contact/update/phone_spec.rb b/spec/requests/epp/contact/update/phone_spec.rb index 696725ab4..57109367d 100644 --- a/spec/requests/epp/contact/update/phone_spec.rb +++ b/spec/requests/epp/contact/update/phone_spec.rb @@ -4,7 +4,7 @@ require_relative '../shared/phone' RSpec.describe 'EPP contact:update' do let(:registrar) { create(:registrar) } let(:user) { create(:api_user_epp, registrar: registrar) } - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let!(:contact) { create(:contact, code: 'TEST') } let(:request) { post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let(:request_xml) { <<-XML diff --git a/spec/requests/epp/contact/update_spec.rb b/spec/requests/epp/contact/update_spec.rb index 3d40e8699..c5344bae2 100644 --- a/spec/requests/epp/contact/update_spec.rb +++ b/spec/requests/epp/contact/update_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' RSpec.describe 'EPP contact:update' do let(:registrar) { create(:registrar) } let(:user) { create(:api_user_epp, registrar: registrar) } - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let(:request_xml_with_address) { ' diff --git a/spec/requests/epp/domain/create/account_balance_spec.rb b/spec/requests/epp/domain/create/account_balance_spec.rb index 43edae1aa..e27477b3a 100644 --- a/spec/requests/epp/domain/create/account_balance_spec.rb +++ b/spec/requests/epp/domain/create/account_balance_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' RSpec.describe 'EPP domain:create', settings: false do - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let(:request) { post '/epp/command/create', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let!(:user) { create(:api_user_epp, registrar: registrar) } let!(:contact) { create(:contact, code: 'test') } diff --git a/spec/requests/epp/domain/create/default_period_spec.rb b/spec/requests/epp/domain/create/default_period_spec.rb index fd807bef0..c4708f5cb 100644 --- a/spec/requests/epp/domain/create/default_period_spec.rb +++ b/spec/requests/epp/domain/create/default_period_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' RSpec.describe 'EPP domain:create', settings: false do - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let(:request) { post '/epp/command/create', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let!(:user) { create(:api_user_epp, registrar: registrar) } let!(:contact) { create(:contact, code: 'test') } diff --git a/spec/requests/epp/domain/create/optional_nameserver_spec.rb b/spec/requests/epp/domain/create/optional_nameserver_spec.rb index 83ab1df44..409307373 100644 --- a/spec/requests/epp/domain/create/optional_nameserver_spec.rb +++ b/spec/requests/epp/domain/create/optional_nameserver_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' RSpec.describe 'EPP domain:create', settings: false do - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let(:request) { post '/epp/command/create', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let!(:registrar) { create(:registrar_with_unlimited_balance) } let!(:user) { create(:api_user_epp, registrar: registrar) } diff --git a/spec/requests/epp/domain/create/period_spec.rb b/spec/requests/epp/domain/create/period_spec.rb index f9550002e..15f49d41f 100644 --- a/spec/requests/epp/domain/create/period_spec.rb +++ b/spec/requests/epp/domain/create/period_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' RSpec.describe 'EPP domain:create', settings: false do - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let(:request) { post '/epp/command/create', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let!(:user) { create(:api_user_epp, registrar: registrar) } let!(:contact) { create(:contact, code: 'test') } diff --git a/spec/requests/epp/domain/create/price_spec.rb b/spec/requests/epp/domain/create/price_spec.rb index 2b2aa789e..e065ba3bb 100644 --- a/spec/requests/epp/domain/create/price_spec.rb +++ b/spec/requests/epp/domain/create/price_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' RSpec.describe 'EPP domain:create', settings: false do - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let(:request) { post '/epp/command/create', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let!(:user) { create(:api_user_epp, registrar: registrar) } let!(:contact) { create(:contact, code: 'test') } diff --git a/spec/requests/epp/domain/create/required_nameserver_spec.rb b/spec/requests/epp/domain/create/required_nameserver_spec.rb index 3c72c58a5..7657075b7 100644 --- a/spec/requests/epp/domain/create/required_nameserver_spec.rb +++ b/spec/requests/epp/domain/create/required_nameserver_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' RSpec.describe 'EPP domain:create', settings: false do - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let(:request) { post '/epp/command/create', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let!(:registrar) { create(:registrar_with_unlimited_balance) } let!(:user) { create(:api_user_epp, registrar: registrar) } diff --git a/spec/requests/epp/domain/delete/discarded_spec.rb b/spec/requests/epp/domain/delete/discarded_spec.rb index 1cce794bc..55e74d965 100644 --- a/spec/requests/epp/domain/delete/discarded_spec.rb +++ b/spec/requests/epp/domain/delete/discarded_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' RSpec.describe 'EPP domain:delete' do let(:registrar) { create(:registrar) } let(:user) { create(:api_user_epp, registrar: registrar) } - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let(:request_xml) { <<-XML diff --git a/spec/requests/epp/domain/renew/account_balance_spec.rb b/spec/requests/epp/domain/renew/account_balance_spec.rb index 128c60070..98d088075 100644 --- a/spec/requests/epp/domain/renew/account_balance_spec.rb +++ b/spec/requests/epp/domain/renew/account_balance_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' RSpec.describe 'EPP domain:renew' do - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let(:request) { post '/epp/command/renew', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let!(:user) { create(:api_user_epp, registrar: registrar) } let!(:zone) { create(:zone, origin: 'test') } diff --git a/spec/requests/epp/domain/renew/default_period_spec.rb b/spec/requests/epp/domain/renew/default_period_spec.rb index 2f09acbcc..fb4961e9d 100644 --- a/spec/requests/epp/domain/renew/default_period_spec.rb +++ b/spec/requests/epp/domain/renew/default_period_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' RSpec.describe 'EPP domain:renew', settings: false do - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let(:request) { post '/epp/command/renew', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let!(:user) { create(:api_user_epp, registrar: registrar) } let!(:zone) { create(:zone, origin: 'test') } diff --git a/spec/requests/epp/domain/renew/expire_time_spec.rb b/spec/requests/epp/domain/renew/expire_time_spec.rb index 90cad850e..d2b6dce5f 100644 --- a/spec/requests/epp/domain/renew/expire_time_spec.rb +++ b/spec/requests/epp/domain/renew/expire_time_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' RSpec.describe 'EPP domain:renew' do - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let(:request) { post '/epp/command/renew', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let!(:user) { create(:api_user_epp, registrar: registrar) } let!(:registrar) { create(:registrar_with_unlimited_balance) } diff --git a/spec/requests/epp/domain/renew/max_expire_time_spec.rb b/spec/requests/epp/domain/renew/max_expire_time_spec.rb index 211af8685..5983fb02c 100644 --- a/spec/requests/epp/domain/renew/max_expire_time_spec.rb +++ b/spec/requests/epp/domain/renew/max_expire_time_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' RSpec.describe 'EPP domain:renew' do - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let(:user) { create(:api_user_epp, registrar: registrar) } let(:registrar) { create(:registrar_with_unlimited_balance) } let!(:zone) { create(:zone, origin: 'test') } diff --git a/spec/requests/epp/domain/renew/period_spec.rb b/spec/requests/epp/domain/renew/period_spec.rb index 6c5167d26..3704519ca 100644 --- a/spec/requests/epp/domain/renew/period_spec.rb +++ b/spec/requests/epp/domain/renew/period_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' RSpec.describe 'EPP domain:renew', settings: false do - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let(:request) { post '/epp/command/renew', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let!(:user) { create(:api_user_epp, registrar: registrar) } let!(:zone) { create(:zone, origin: 'test') } diff --git a/spec/requests/epp/domain/renew/price_spec.rb b/spec/requests/epp/domain/renew/price_spec.rb index 4a9c65ff3..02603ca60 100644 --- a/spec/requests/epp/domain/renew/price_spec.rb +++ b/spec/requests/epp/domain/renew/price_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' RSpec.describe 'EPP domain:renew', settings: false do - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let(:request) { post '/epp/command/renew', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let!(:user) { create(:api_user_epp, registrar: registrar) } let!(:zone) { create(:zone, origin: 'test') } diff --git a/spec/requests/epp/domain/transfer/discarded_spec.rb b/spec/requests/epp/domain/transfer/discarded_spec.rb index d279bf003..26596d993 100644 --- a/spec/requests/epp/domain/transfer/discarded_spec.rb +++ b/spec/requests/epp/domain/transfer/discarded_spec.rb @@ -3,7 +3,7 @@ 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, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let(:request_xml) { <<-XML diff --git a/spec/requests/epp/domain/update/discarded_spec.rb b/spec/requests/epp/domain/update/discarded_spec.rb index 29ae1f44c..4a31b7d10 100644 --- a/spec/requests/epp/domain/update/discarded_spec.rb +++ b/spec/requests/epp/domain/update/discarded_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' RSpec.describe 'EPP domain:update' do let(:registrar) { create(:registrar) } let(:user) { create(:api_user_epp, registrar: registrar) } - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let(:request_xml) { <<-XML diff --git a/spec/requests/epp/domain/update/nameserver_add_spec.rb b/spec/requests/epp/domain/update/nameserver_add_spec.rb index 8a00d585d..2acc462f6 100644 --- a/spec/requests/epp/domain/update/nameserver_add_spec.rb +++ b/spec/requests/epp/domain/update/nameserver_add_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' RSpec.describe 'EPP domain:update' do let(:registrar) { create(:registrar) } let(:user) { create(:api_user_epp, registrar: registrar) } - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let!(:domain) { create(:domain, name: 'test.com') } subject(:response_xml) { Nokogiri::XML(response.body) } subject(:response_code) { response_xml.xpath('//xmlns:result').first['code'] } diff --git a/spec/requests/epp/domain/update/nameserver_remove_spec.rb b/spec/requests/epp/domain/update/nameserver_remove_spec.rb index 3796d2e12..129d1ce55 100644 --- a/spec/requests/epp/domain/update/nameserver_remove_spec.rb +++ b/spec/requests/epp/domain/update/nameserver_remove_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' RSpec.describe 'EPP domain:update' do let(:registrar) { create(:registrar) } let(:user) { create(:api_user_epp, registrar: registrar) } - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } subject(:response_xml) { Nokogiri::XML(response.body) } subject(:response_code) { response_xml.xpath('//xmlns:result').first['code'] } subject(:response_description) { response_xml.css('result msg').text } diff --git a/spec/requests/epp/domain/update/registrant_change/same_as_current_spec.rb b/spec/requests/epp/domain/update/registrant_change/same_as_current_spec.rb index 1c0c8eb5b..0a5f3b245 100644 --- a/spec/requests/epp/domain/update/registrant_change/same_as_current_spec.rb +++ b/spec/requests/epp/domain/update/registrant_change/same_as_current_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' RSpec.describe 'EPP domain:update' do let(:registrar) { create(:registrar) } let(:user) { create(:api_user_epp, registrar: registrar) } - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let(:request) { post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let!(:domain) { create(:domain, name: 'test.com', registrant: registrant) } diff --git a/spec/requests/epp/domain/update/registrant_change/verified_spec.rb b/spec/requests/epp/domain/update/registrant_change/verified_spec.rb index e94923644..c81d46f66 100644 --- a/spec/requests/epp/domain/update/registrant_change/verified_spec.rb +++ b/spec/requests/epp/domain/update/registrant_change/verified_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' RSpec.describe 'EPP domain:update' do let(:registrar) { create(:registrar) } let(:user) { create(:api_user_epp, registrar: registrar) } - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let(:request) { post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let!(:registrant) { create(:registrant, code: 'old-code') } let!(:domain) { create(:domain, name: 'test.com', registrant: registrant) } diff --git a/spec/requests/epp/domain/update/status_spec.rb b/spec/requests/epp/domain/update/status_spec.rb index df5506fb6..f5cb638ad 100644 --- a/spec/requests/epp/domain/update/status_spec.rb +++ b/spec/requests/epp/domain/update/status_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' RSpec.describe 'EPP domain:update' do let(:registrar) { create(:registrar) } let(:user) { create(:api_user_epp, registrar: registrar) } - let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id } + let(:session_id) { create(:epp_session, user: user).session_id } let(:request) { post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" } let(:request_xml) { <<-XML diff --git a/test/fixtures/epp_sessions.yml b/test/fixtures/epp_sessions.yml index 9d824cf1c..cc40c8211 100644 --- a/test/fixtures/epp_sessions.yml +++ b/test/fixtures/epp_sessions.yml @@ -1,9 +1,7 @@ api_bestnames: session_id: 1 user: api_bestnames - registrar: bestnames api_goodnames: session_id: 2 user: api_goodnames - registrar: goodnames From 5a101ddaf42b046e57120b4ef8ec0e2aad2d01cc Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 12 Feb 2018 17:50:48 +0200 Subject: [PATCH 20/41] Replace index with constraint #700 --- ...p_sessions_session_id_unique_constraint.rb | 13 +++++++++++++ ...ve_epp_sessions_session_id_unique_index.rb | 5 +++++ db/structure.sql | 19 ++++++++++++------- 3 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 db/migrate/20180212152810_add_epp_sessions_session_id_unique_constraint.rb create mode 100644 db/migrate/20180212154731_remove_epp_sessions_session_id_unique_index.rb diff --git a/db/migrate/20180212152810_add_epp_sessions_session_id_unique_constraint.rb b/db/migrate/20180212152810_add_epp_sessions_session_id_unique_constraint.rb new file mode 100644 index 000000000..7eac99e63 --- /dev/null +++ b/db/migrate/20180212152810_add_epp_sessions_session_id_unique_constraint.rb @@ -0,0 +1,13 @@ +class AddEppSessionsSessionIdUniqueConstraint < ActiveRecord::Migration + def up + execute <<-SQL + ALTER TABLE epp_sessions ADD CONSTRAINT unique_session_id UNIQUE (session_id) + SQL + end + + def down + execute <<-SQL + ALTER TABLE epp_sessions DROP CONSTRAINT unique_session_id + SQL + end +end diff --git a/db/migrate/20180212154731_remove_epp_sessions_session_id_unique_index.rb b/db/migrate/20180212154731_remove_epp_sessions_session_id_unique_index.rb new file mode 100644 index 000000000..47fb20157 --- /dev/null +++ b/db/migrate/20180212154731_remove_epp_sessions_session_id_unique_index.rb @@ -0,0 +1,5 @@ +class RemoveEppSessionsSessionIdUniqueIndex < ActiveRecord::Migration + def change + remove_index :epp_sessions, name: :index_epp_sessions_on_session_id + end +end diff --git a/db/structure.sql b/db/structure.sql index f7fdc5148..e743e42f6 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -3634,6 +3634,14 @@ ALTER TABLE ONLY contacts ADD CONSTRAINT unique_contact_code UNIQUE (code); +-- +-- Name: unique_session_id; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: +-- + +ALTER TABLE ONLY epp_sessions + ADD CONSTRAINT unique_session_id UNIQUE (session_id); + + -- -- Name: unique_zone_origin; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: -- @@ -3885,13 +3893,6 @@ CREATE INDEX index_domains_on_registrar_id ON domains USING btree (registrar_id) CREATE INDEX index_domains_on_statuses ON domains USING gin (statuses); --- --- Name: index_epp_sessions_on_session_id; Type: INDEX; Schema: public; Owner: -; Tablespace: --- - -CREATE UNIQUE INDEX index_epp_sessions_on_session_id ON epp_sessions USING btree (session_id); - - -- -- Name: index_epp_sessions_on_updated_at; Type: INDEX; Schema: public; Owner: -; Tablespace: -- @@ -5087,3 +5088,7 @@ INSERT INTO schema_migrations (version) VALUES ('20180207072139'); INSERT INTO schema_migrations (version) VALUES ('20180212123810'); +INSERT INTO schema_migrations (version) VALUES ('20180212152810'); + +INSERT INTO schema_migrations (version) VALUES ('20180212154731'); + From e2c90cdd40642d08e4237221b9433ae10b9a0c6a Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 12 Feb 2018 18:04:45 +0200 Subject: [PATCH 21/41] Add EPP session tests #700 --- test/fixtures/epp_sessions.yml | 4 +- test/integration/epp/session/login_test.rb | 60 +++++++++++++++++++++ test/integration/epp/session/logout_test.rb | 29 ++++++++++ 3 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 test/integration/epp/session/login_test.rb create mode 100644 test/integration/epp/session/logout_test.rb diff --git a/test/fixtures/epp_sessions.yml b/test/fixtures/epp_sessions.yml index cc40c8211..6f1173ca9 100644 --- a/test/fixtures/epp_sessions.yml +++ b/test/fixtures/epp_sessions.yml @@ -1,7 +1,7 @@ api_bestnames: - session_id: 1 + session_id: api_bestnames user: api_bestnames api_goodnames: - session_id: 2 + session_id: api_goodnames user: api_goodnames diff --git a/test/integration/epp/session/login_test.rb b/test/integration/epp/session/login_test.rb new file mode 100644 index 000000000..2be7e09a5 --- /dev/null +++ b/test/integration/epp/session/login_test.rb @@ -0,0 +1,60 @@ +require 'test_helper' + +class EppLoginTest < ActionDispatch::IntegrationTest + def test_correct_credentials + request_xml = <<-XML + + + + + test_bestnames + testtest + + 1.0 + en + + + https://epp.tld.ee/schema/domain-eis-1.0.xsd + https://epp.tld.ee/schema/contact-ee-1.1.xsd + urn:ietf:params:xml:ns:host-1.0 + urn:ietf:params:xml:ns:keyrelay-1.0 + + + + + XML + + post '/epp/session/login', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=new_session_id' } + assert EppSession.find_by(session_id: 'new_session_id') + assert_equal users(:api_bestnames), EppSession.find_by(session_id: 'new_session_id').user + assert Nokogiri::XML(response.body).at_css('result[code="1000"]') + assert_equal 1, Nokogiri::XML(response.body).css('result').size + end + + def test_wrong_credentials + request_xml = <<-XML + + + + + non-existent + valid-but-wrong + + 1.0 + en + + + https://epp.tld.ee/schema/domain-eis-1.0.xsd + https://epp.tld.ee/schema/contact-ee-1.1.xsd + urn:ietf:params:xml:ns:host-1.0 + urn:ietf:params:xml:ns:keyrelay-1.0 + + + + + XML + + post '/epp/session/login', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=any_random_string' } + assert Nokogiri::XML(response.body).at_css('result[code="2501"]') + end +end diff --git a/test/integration/epp/session/logout_test.rb b/test/integration/epp/session/logout_test.rb new file mode 100644 index 000000000..7237d4073 --- /dev/null +++ b/test/integration/epp/session/logout_test.rb @@ -0,0 +1,29 @@ +require 'test_helper' + +class EppLogoutTest < ActionDispatch::IntegrationTest + def setup + @request_xml = <<-XML + + + + + + + XML + + post '/epp/session/logout', { frame: @request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } + end + + def test_success_response + assert Nokogiri::XML(response.body).at_css('result[code="1500"]') + assert_equal 1, Nokogiri::XML(response.body).css('result').size + end + + def test_ends_current_session + assert_nil EppSession.find_by(session_id: 'api_bestnames') + end + + def test_keeps_other_sessions_intact + assert EppSession.find_by(session_id: 'api_goodnames') + end +end From 40c12380ee5e6cc9ed7928395e2b173f1e320ed4 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 13 Feb 2018 19:52:34 +0200 Subject: [PATCH 22/41] Improve readability #700 --- test/models/epp_session_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/models/epp_session_test.rb b/test/models/epp_session_test.rb index 98ae993f5..a6aca3eca 100644 --- a/test/models/epp_session_test.rb +++ b/test/models/epp_session_test.rb @@ -9,13 +9,13 @@ class EppSessionTest < ActiveSupport::TestCase assert @epp_session.valid? end - def test_session_id_presence_validation + def test_invalid_without_session_id @epp_session.session_id = nil @epp_session.validate assert @epp_session.invalid? end - def test_user_presence_validation + def test_invalid_without_user @epp_session.user = nil @epp_session.validate assert @epp_session.invalid? From 4ec4e50334169230ce6c6742a7a2fd81e757a5a7 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 13 Feb 2018 20:16:44 +0200 Subject: [PATCH 23/41] Ensure unique EPP session id #700 --- app/models/epp_session.rb | 2 +- test/models/epp_session_test.rb | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/models/epp_session.rb b/app/models/epp_session.rb index dd97a91a9..3d489e567 100644 --- a/app/models/epp_session.rb +++ b/app/models/epp_session.rb @@ -2,5 +2,5 @@ class EppSession < ActiveRecord::Base belongs_to :user, required: true belongs_to :registrar - validates :session_id, presence: true + validates :session_id, uniqueness: true, presence: true end diff --git a/test/models/epp_session_test.rb b/test/models/epp_session_test.rb index a6aca3eca..497bf441e 100644 --- a/test/models/epp_session_test.rb +++ b/test/models/epp_session_test.rb @@ -20,4 +20,18 @@ class EppSessionTest < ActiveSupport::TestCase @epp_session.validate assert @epp_session.invalid? end + + def test_invalid_if_persisted_record_with_the_same_session_id_exists + epp_session = EppSession.new(session_id: @epp_session.session_id, user: @epp_session.user) + epp_session.validate + assert epp_session.invalid? + end + + def test_database_session_id_unique_constraint + epp_session = EppSession.new(session_id: @epp_session.session_id, user: @epp_session.user) + + assert_raises ActiveRecord::RecordNotUnique do + epp_session.save(validate: false) + end + end end From 3c274ba8d4d24ef46ac698c46214c3024da726bc Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 13 Feb 2018 20:18:52 +0200 Subject: [PATCH 24/41] Remove invalid association Completes fa6edab62ac7a4e9d1b8a7b79c89bbbb7cb24b45 #700 --- app/models/epp_session.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/epp_session.rb b/app/models/epp_session.rb index 3d489e567..0a1a146a2 100644 --- a/app/models/epp_session.rb +++ b/app/models/epp_session.rb @@ -1,6 +1,5 @@ class EppSession < ActiveRecord::Base belongs_to :user, required: true - belongs_to :registrar validates :session_id, uniqueness: true, presence: true end From 1f66f1323ab217d4ec7c622a7fc2f6dbb2f211ac Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 13 Feb 2018 20:45:30 +0200 Subject: [PATCH 25/41] Add NOT NULL constraint #700 --- ...20180213183818_change_epp_sessions_user_id_to_not_null.rb | 5 +++++ db/structure.sql | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20180213183818_change_epp_sessions_user_id_to_not_null.rb diff --git a/db/migrate/20180213183818_change_epp_sessions_user_id_to_not_null.rb b/db/migrate/20180213183818_change_epp_sessions_user_id_to_not_null.rb new file mode 100644 index 000000000..fbe685b33 --- /dev/null +++ b/db/migrate/20180213183818_change_epp_sessions_user_id_to_not_null.rb @@ -0,0 +1,5 @@ +class ChangeEppSessionsUserIdToNotNull < ActiveRecord::Migration + def change + change_column_null :epp_sessions, :user_id, false + end +end diff --git a/db/structure.sql b/db/structure.sql index e743e42f6..449ec44f8 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -1053,7 +1053,7 @@ CREATE TABLE epp_sessions ( session_id character varying NOT NULL, created_at timestamp without time zone, updated_at timestamp without time zone, - user_id integer + user_id integer NOT NULL ); @@ -5092,3 +5092,5 @@ INSERT INTO schema_migrations (version) VALUES ('20180212152810'); INSERT INTO schema_migrations (version) VALUES ('20180212154731'); +INSERT INTO schema_migrations (version) VALUES ('20180213183818'); + From fc6a2df2c53ca2f349a752953ee69b03107735e8 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 13 Feb 2018 20:46:08 +0200 Subject: [PATCH 26/41] Add database constraint test Having session_id constraints at the database level is crucial #700 --- test/models/epp_session_test.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/models/epp_session_test.rb b/test/models/epp_session_test.rb index 497bf441e..1a0e9e114 100644 --- a/test/models/epp_session_test.rb +++ b/test/models/epp_session_test.rb @@ -27,6 +27,8 @@ class EppSessionTest < ActiveSupport::TestCase assert epp_session.invalid? end + # Having session_id constraints at the database level is crucial + def test_database_session_id_unique_constraint epp_session = EppSession.new(session_id: @epp_session.session_id, user: @epp_session.user) @@ -34,4 +36,11 @@ class EppSessionTest < ActiveSupport::TestCase epp_session.save(validate: false) end end + + def test_database_session_id_not_null_constraint + @epp_session.session_id = nil + assert_raises ActiveRecord::StatementInvalid do + @epp_session.save(validate: false) + end + end end From 6f1f121e9282d6e608c274c066ed51a417ef3ad8 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Tue, 13 Feb 2018 23:50:22 +0200 Subject: [PATCH 27/41] Remove unused view #700 --- app/views/epp/sessions/login_fail.xml.builder | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 app/views/epp/sessions/login_fail.xml.builder diff --git a/app/views/epp/sessions/login_fail.xml.builder b/app/views/epp/sessions/login_fail.xml.builder deleted file mode 100644 index 5e2e99162..000000000 --- a/app/views/epp/sessions/login_fail.xml.builder +++ /dev/null @@ -1,9 +0,0 @@ -xml.epp_head do - xml.response do - xml.result('code' => '2501') do - xml.msg(@msg || 'Authentication error; server closing connection') - end - - render('epp/shared/trID', builder: xml) - end -end From 2ce4fa9ce091035c9483500e8eeee7a691d9f23a Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 14 Feb 2018 01:14:59 +0200 Subject: [PATCH 28/41] Document test #700 --- test/integration/epp/session/login_test.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/integration/epp/session/login_test.rb b/test/integration/epp/session/login_test.rb index 2be7e09a5..c268ab1eb 100644 --- a/test/integration/epp/session/login_test.rb +++ b/test/integration/epp/session/login_test.rb @@ -31,6 +31,10 @@ class EppLoginTest < ActionDispatch::IntegrationTest assert_equal 1, Nokogiri::XML(response.body).css('result').size end + def test_already_logged_in + assert true # Handled by mod_epp + end + def test_wrong_credentials request_xml = <<-XML From ec43586ef48a3cbae37e1affb3026296af3e5c24 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 14 Feb 2018 01:17:51 +0200 Subject: [PATCH 29/41] Require authentication on EPP logout #700 --- app/controllers/epp/sessions_controller.rb | 9 +++++ app/controllers/epp_controller.rb | 10 +++++ test/integration/epp/session/logout_test.rb | 42 ++++++++++++--------- 3 files changed, 44 insertions(+), 17 deletions(-) diff --git a/app/controllers/epp/sessions_controller.rb b/app/controllers/epp/sessions_controller.rb index e4efc581d..69e549d21 100644 --- a/app/controllers/epp/sessions_controller.rb +++ b/app/controllers/epp/sessions_controller.rb @@ -124,6 +124,15 @@ class Epp::SessionsController < EppController end def logout + unless signed_in? + epp_errors << { + code: 2201, + msg: 'Authorization error' + } + handle_errors + return + end + @api_user = current_user # cache current_user for logging epp_session.destroy response.headers['X-EPP-Returncode'] = '1500' diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb index 07d3286d0..1bd587c23 100644 --- a/app/controllers/epp_controller.rb +++ b/app/controllers/epp_controller.rb @@ -397,4 +397,14 @@ class EppController < ApplicationController name = self.class.to_s.sub("Epp::","").sub("Controller","").underscore.singularize instance_variable_get("@#{name}") end + + private + + def signed_in? + epp_session + end + + def epp_session_id + cookies[:session] + end end diff --git a/test/integration/epp/session/logout_test.rb b/test/integration/epp/session/logout_test.rb index 7237d4073..75b26f2f3 100644 --- a/test/integration/epp/session/logout_test.rb +++ b/test/integration/epp/session/logout_test.rb @@ -1,8 +1,31 @@ require 'test_helper' class EppLogoutTest < ActionDispatch::IntegrationTest - def setup - @request_xml = <<-XML + def test_success_response + post '/epp/session/logout', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } + assert Nokogiri::XML(response.body).at_css('result[code="1500"]') + assert_equal 1, Nokogiri::XML(response.body).css('result').size + end + + def test_ends_current_session + post '/epp/session/logout', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } + assert_nil EppSession.find_by(session_id: 'api_bestnames') + end + + def test_keeps_other_sessions_intact + post '/epp/session/logout', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } + assert EppSession.find_by(session_id: 'api_goodnames') + end + + def test_anonymous_user + post '/epp/session/logout', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=non-existent' } + assert Nokogiri::XML(response.body).at_css('result[code="2201"]') + end + + private + + def request_xml + <<-XML @@ -10,20 +33,5 @@ class EppLogoutTest < ActionDispatch::IntegrationTest XML - - post '/epp/session/logout', { frame: @request_xml }, { 'HTTP_COOKIE' => 'session=api_bestnames' } - end - - def test_success_response - assert Nokogiri::XML(response.body).at_css('result[code="1500"]') - assert_equal 1, Nokogiri::XML(response.body).css('result').size - end - - def test_ends_current_session - assert_nil EppSession.find_by(session_id: 'api_bestnames') - end - - def test_keeps_other_sessions_intact - assert EppSession.find_by(session_id: 'api_goodnames') end end From b37251f9bb0b15244aca5b927a7b32ad9507bbcb Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 14 Feb 2018 01:20:50 +0200 Subject: [PATCH 30/41] Refactor #700 --- app/controllers/epp/sessions_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/epp/sessions_controller.rb b/app/controllers/epp/sessions_controller.rb index 69e549d21..b9884b582 100644 --- a/app/controllers/epp/sessions_controller.rb +++ b/app/controllers/epp/sessions_controller.rb @@ -92,7 +92,7 @@ class Epp::SessionsController < EppController end epp_session = EppSession.new - epp_session.session_id = cookies[:session] + epp_session.session_id = epp_session_id epp_session.user = @api_user epp_session.save! render_epp_response('login_success') From c97e65139859ebabaebfc8bfb4e98ca5ff98b211 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 14 Feb 2018 01:22:24 +0200 Subject: [PATCH 31/41] Improve readability #700 --- app/controllers/epp_controller.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb index 1bd587c23..a0148e744 100644 --- a/app/controllers/epp_controller.rb +++ b/app/controllers/epp_controller.rb @@ -95,12 +95,11 @@ class EppController < ApplicationController def update_epp_session iptables_counter_update - e_s = epp_session - return if e_s.new_record? + return if epp_session.new_record? - if !Rails.env.development? && (e_s.updated_at < Time.zone.now - 5.minutes) + if !Rails.env.development? && (epp_session.updated_at < Time.zone.now - 5.minutes) @api_user = current_user # cache current_user for logging - e_s.destroy + epp_session.destroy response.headers['X-EPP-Returncode'] = '1500' epp_errors << { @@ -110,7 +109,7 @@ class EppController < ApplicationController handle_errors and return else - e_s.update_column(:updated_at, Time.zone.now) + epp_session.update_column(:updated_at, Time.zone.now) end end From 0ee32549f0da2330fa36c743d42c1be5b6035783 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 14 Feb 2018 01:24:12 +0200 Subject: [PATCH 32/41] Use standard API to read cookies #700 --- app/controllers/epp_controller.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb index a0148e744..16d63de83 100644 --- a/app/controllers/epp_controller.rb +++ b/app/controllers/epp_controller.rb @@ -86,11 +86,8 @@ class EppController < ApplicationController @params_hash ||= Hash.from_xml(params[:frame]).with_indifferent_access end - # SESSION MANAGEMENT def epp_session - cookies # Probably does some initialization - cookie = env['rack.request.cookie_hash'] || {} - EppSession.find_or_initialize_by(session_id: cookie['session']) + EppSession.find_by(session_id: epp_session_id) end def update_epp_session From cd037f7faefd0478515d5d45e84fead9e8db4803 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 14 Feb 2018 01:25:38 +0200 Subject: [PATCH 33/41] Do not update EPP session updated_at if not authenticated #700 --- app/controllers/epp_controller.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb index 16d63de83..ba46032c8 100644 --- a/app/controllers/epp_controller.rb +++ b/app/controllers/epp_controller.rb @@ -8,7 +8,7 @@ class EppController < ApplicationController before_action :latin_only before_action :validate_against_schema before_action :validate_request - before_action :update_epp_session + before_action :update_epp_session, if: 'signed_in?' around_action :catch_epp_errors @@ -92,7 +92,6 @@ class EppController < ApplicationController def update_epp_session iptables_counter_update - return if epp_session.new_record? if !Rails.env.development? && (epp_session.updated_at < Time.zone.now - 5.minutes) @api_user = current_user # cache current_user for logging From 0c5284e8f965781f340139c13c9e8cba4669e95b Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 14 Feb 2018 01:37:34 +0200 Subject: [PATCH 34/41] Simplify method #700 --- app/controllers/epp_controller.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb index ba46032c8..440c731b2 100644 --- a/app/controllers/epp_controller.rb +++ b/app/controllers/epp_controller.rb @@ -110,12 +110,8 @@ class EppController < ApplicationController end def current_user - @current_user ||= epp_session.user - # by default PaperTrail uses before filter and at that - # time current_user is not yet present - ::PaperTrail.whodunnit = user_log_str(@current_user) - ::PaperSession.session = epp_session.session_id - @current_user + return unless signed_in? + epp_session.user end # ERROR + RESPONSE HANDLING From 66b03e6d11ae5b658026e98b5b470f34eb6d2b26 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 14 Feb 2018 01:40:03 +0200 Subject: [PATCH 35/41] Hide method #700 --- app/controllers/epp_controller.rb | 38 +++++++++++++++---------------- doc/controllers_complete.svg | 1 - 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb index 440c731b2..68ca93b23 100644 --- a/app/controllers/epp_controller.rb +++ b/app/controllers/epp_controller.rb @@ -90,25 +90,6 @@ class EppController < ApplicationController EppSession.find_by(session_id: epp_session_id) end - def update_epp_session - iptables_counter_update - - if !Rails.env.development? && (epp_session.updated_at < Time.zone.now - 5.minutes) - @api_user = current_user # cache current_user for logging - epp_session.destroy - response.headers['X-EPP-Returncode'] = '1500' - - epp_errors << { - msg: t('session_timeout'), - code: '2201' - } - - handle_errors and return - else - epp_session.update_column(:updated_at, Time.zone.now) - end - end - def current_user return unless signed_in? epp_session.user @@ -398,4 +379,23 @@ class EppController < ApplicationController def epp_session_id cookies[:session] end + + def update_epp_session + iptables_counter_update + + if !Rails.env.development? && (epp_session.updated_at < Time.zone.now - 5.minutes) + @api_user = current_user # cache current_user for logging + epp_session.destroy + response.headers['X-EPP-Returncode'] = '1500' + + epp_errors << { + msg: t('session_timeout'), + code: '2201' + } + + handle_errors and return + else + epp_session.update_column(:updated_at, Time.zone.now) + end + end end diff --git a/doc/controllers_complete.svg b/doc/controllers_complete.svg index 61ca0ec5f..9a0028bb1 100644 --- a/doc/controllers_complete.svg +++ b/doc/controllers_complete.svg @@ -681,7 +681,6 @@ render_epp_response requires requires_attribute -update_epp_session validate_request write_to_epp_log xml_attrs_present? From 17fefcf5921a805be974f27e646466e14b5fde4a Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 14 Feb 2018 02:13:55 +0200 Subject: [PATCH 36/41] Ensure EPP session id is passed --- app/controllers/epp_controller.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb index 68ca93b23..91296aa42 100644 --- a/app/controllers/epp_controller.rb +++ b/app/controllers/epp_controller.rb @@ -4,6 +4,7 @@ class EppController < ApplicationController protect_from_forgery with: :null_session skip_before_action :verify_authenticity_token + before_action :ensure_session_id_passed before_action :generate_svtrid before_action :latin_only before_action :validate_against_schema @@ -377,7 +378,11 @@ class EppController < ApplicationController end def epp_session_id - cookies[:session] + cookies[:session] # Passed by mod_epp https://github.com/mod-epp/mod-epp#requestscript-interface + end + + def ensure_session_id_passed + raise 'EPP session id is empty' unless epp_session_id.present? end def update_epp_session From d430092ba217a3d453d446f4d33522a26f0b6288 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 14 Feb 2018 02:24:40 +0200 Subject: [PATCH 37/41] Extract method #700 --- app/controllers/epp_controller.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb index 91296aa42..8fe93ae4a 100644 --- a/app/controllers/epp_controller.rb +++ b/app/controllers/epp_controller.rb @@ -388,7 +388,7 @@ class EppController < ApplicationController def update_epp_session iptables_counter_update - if !Rails.env.development? && (epp_session.updated_at < Time.zone.now - 5.minutes) + if !Rails.env.development? && session_timeout_reached? @api_user = current_user # cache current_user for logging epp_session.destroy response.headers['X-EPP-Returncode'] = '1500' @@ -403,4 +403,9 @@ class EppController < ApplicationController epp_session.update_column(:updated_at, Time.zone.now) end end + + def session_timeout_reached? + timeout = 5.minutes + epp_session.updated_at < (Time.zone.now - timeout) + end end From fc02e4ad8a7e5119a7c0b643ad4c202a736e4ac0 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 14 Feb 2018 02:28:51 +0200 Subject: [PATCH 38/41] Remove environment dependency #700 --- app/controllers/epp_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb index 8fe93ae4a..eee6cef7a 100644 --- a/app/controllers/epp_controller.rb +++ b/app/controllers/epp_controller.rb @@ -388,7 +388,7 @@ class EppController < ApplicationController def update_epp_session iptables_counter_update - if !Rails.env.development? && session_timeout_reached? + if session_timeout_reached? @api_user = current_user # cache current_user for logging epp_session.destroy response.headers['X-EPP-Returncode'] = '1500' From 93055acb3a62da8b71a93e25c81a640639686d45 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 14 Feb 2018 02:42:00 +0200 Subject: [PATCH 39/41] Hide method #700 --- .reek | 2 -- app/controllers/epp/sessions_controller.rb | 16 ++++++++-------- doc/controllers_complete.svg | 1 - 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.reek b/.reek index e51946a9a..d9ea95353 100644 --- a/.reek +++ b/.reek @@ -34,7 +34,6 @@ UncommunicativeVariableName: - Admin::SettingsController#create - Epp::DomainsController#renew - Epp::DomainsController#update - - Epp::SessionsController#connection_limit_ok? - Epp::SessionsController#login - EppController - EppController#create_full_selectors @@ -172,7 +171,6 @@ DuplicateMethodCall: - Epp::PollsController#ack_poll - Epp::PollsController#poll - Epp::PollsController#req_poll - - Epp::SessionsController#connection_limit_ok? - Epp::SessionsController#ip_white? - Epp::SessionsController#login - Epp::SessionsController#login_params diff --git a/app/controllers/epp/sessions_controller.rb b/app/controllers/epp/sessions_controller.rb index b9884b582..eb460a8d1 100644 --- a/app/controllers/epp/sessions_controller.rb +++ b/app/controllers/epp/sessions_controller.rb @@ -115,14 +115,6 @@ class Epp::SessionsController < EppController true end - def connection_limit_ok? - epp_session_count = EppSession.where(user_id: @api_user.registrar.api_users.ids) - .where('updated_at >= ?', Time.zone.now - 1.second).count - - return false if epp_session_count >= 4 - true - end - def logout unless signed_in? epp_errors << { @@ -151,4 +143,12 @@ class Epp::SessionsController < EppController def resource @api_user end + + def connection_limit_ok? + epp_session_count = EppSession.where(user_id: @api_user.registrar.api_users.ids) + .where('updated_at >= ?', Time.zone.now - 1.second).count + + return false if epp_session_count >= 4 + true + end end diff --git a/doc/controllers_complete.svg b/doc/controllers_complete.svg index 9a0028bb1..68d02cf4a 100644 --- a/doc/controllers_complete.svg +++ b/doc/controllers_complete.svg @@ -71,7 +71,6 @@ Epp::SessionsController -connection_limit_ok? hello ip_white? login From 9b4aa478bf50e638c40d2f094cb7a94e12c6e533 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 14 Feb 2018 04:06:13 +0200 Subject: [PATCH 40/41] Refactor EPP session limit #700 --- app/controllers/epp/sessions_controller.rb | 10 +--- app/models/epp_session.rb | 9 ++++ test/integration/epp/session/limit_test.rb | 63 ++++++++++++++++++++++ test/models/epp_session_test.rb | 17 ++++++ 4 files changed, 90 insertions(+), 9 deletions(-) create mode 100644 test/integration/epp/session/limit_test.rb diff --git a/app/controllers/epp/sessions_controller.rb b/app/controllers/epp/sessions_controller.rb index eb460a8d1..d5844500e 100644 --- a/app/controllers/epp/sessions_controller.rb +++ b/app/controllers/epp/sessions_controller.rb @@ -74,7 +74,7 @@ class Epp::SessionsController < EppController success = false end - if success && !connection_limit_ok? + if success && EppSession.limit_reached?(@api_user.registrar) epp_errors << { msg: 'Authentication error; server closing connection (connection limit reached)', code: '2501' @@ -143,12 +143,4 @@ class Epp::SessionsController < EppController def resource @api_user end - - def connection_limit_ok? - epp_session_count = EppSession.where(user_id: @api_user.registrar.api_users.ids) - .where('updated_at >= ?', Time.zone.now - 1.second).count - - return false if epp_session_count >= 4 - true - end end diff --git a/app/models/epp_session.rb b/app/models/epp_session.rb index 0a1a146a2..dfd603fc4 100644 --- a/app/models/epp_session.rb +++ b/app/models/epp_session.rb @@ -2,4 +2,13 @@ class EppSession < ActiveRecord::Base belongs_to :user, required: true validates :session_id, uniqueness: true, presence: true + + def self.limit_per_registrar + 4 + end + + def self.limit_reached?(registrar) + count = where(user_id: registrar.api_users.ids).where('updated_at >= ?', Time.zone.now - 1.second).count + count >= limit_per_registrar + end end diff --git a/test/integration/epp/session/limit_test.rb b/test/integration/epp/session/limit_test.rb new file mode 100644 index 000000000..b186031b6 --- /dev/null +++ b/test/integration/epp/session/limit_test.rb @@ -0,0 +1,63 @@ +require 'test_helper' + +class EppSessionLimitTest < ActionDispatch::IntegrationTest + def setup + travel_to Time.zone.parse('2010-07-05') + EppSession.delete_all + end + + def test_not_reached + (EppSession.limit_per_registrar - 1).times do + EppSession.create!(session_id: SecureRandom.hex, + user: users(:api_bestnames), + updated_at: Time.zone.parse('2010-07-05')) + end + + assert_difference 'EppSession.count' do + post '/epp/session/login', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=new_session_id' } + end + + assert Nokogiri::XML(response.body).at_css('result[code="1000"]') + assert_equal 1, Nokogiri::XML(response.body).css('result').size + end + + def test_reached + EppSession.limit_per_registrar.times do + EppSession.create!(session_id: SecureRandom.hex, + user: users(:api_bestnames), + updated_at: Time.zone.parse('2010-07-05')) + end + + assert_no_difference 'EppSession.count' do + post '/epp/session/login', { frame: request_xml }, { 'HTTP_COOKIE' => 'session=new_session_id' } + end + + assert Nokogiri::XML(response.body).at_css('result[code="2501"]') + end + + private + + def request_xml + <<-XML + + + + + test_bestnames + testtest + + 1.0 + en + + + https://epp.tld.ee/schema/domain-eis-1.0.xsd + https://epp.tld.ee/schema/contact-ee-1.1.xsd + urn:ietf:params:xml:ns:host-1.0 + urn:ietf:params:xml:ns:keyrelay-1.0 + + + + + XML + end +end diff --git a/test/models/epp_session_test.rb b/test/models/epp_session_test.rb index 1a0e9e114..fd795b23c 100644 --- a/test/models/epp_session_test.rb +++ b/test/models/epp_session_test.rb @@ -43,4 +43,21 @@ class EppSessionTest < ActiveSupport::TestCase @epp_session.save(validate: false) end end + + def test_limit_per_registrar + assert_equal 4, EppSession.limit_per_registrar + end + + def test_limit_is_per_registrar + travel_to Time.zone.parse('2010-07-05') + EppSession.delete_all + + EppSession.limit_per_registrar.times do + EppSession.create!(session_id: SecureRandom.hex, + user: users(:api_goodnames), + updated_at: Time.zone.parse('2010-07-05')) + end + + refute EppSession.limit_reached?(registrars(:bestnames)) + end end From 46e85965af346207ace360fe2aaf11d8db8c5a6c Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Wed, 14 Feb 2018 04:08:24 +0200 Subject: [PATCH 41/41] Reorganize tests #700 --- .../epp/{session/login_test.rb => login/credentials_test.rb} | 2 +- .../epp/{session/limit_test.rb => login/session_limit_test.rb} | 2 +- test/integration/epp/{session => }/logout_test.rb | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename test/integration/epp/{session/login_test.rb => login/credentials_test.rb} (97%) rename test/integration/epp/{session/limit_test.rb => login/session_limit_test.rb} (96%) rename test/integration/epp/{session => }/logout_test.rb (100%) diff --git a/test/integration/epp/session/login_test.rb b/test/integration/epp/login/credentials_test.rb similarity index 97% rename from test/integration/epp/session/login_test.rb rename to test/integration/epp/login/credentials_test.rb index c268ab1eb..6a27c7393 100644 --- a/test/integration/epp/session/login_test.rb +++ b/test/integration/epp/login/credentials_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class EppLoginTest < ActionDispatch::IntegrationTest +class EppLoginCredentialsTest < ActionDispatch::IntegrationTest def test_correct_credentials request_xml = <<-XML diff --git a/test/integration/epp/session/limit_test.rb b/test/integration/epp/login/session_limit_test.rb similarity index 96% rename from test/integration/epp/session/limit_test.rb rename to test/integration/epp/login/session_limit_test.rb index b186031b6..513699415 100644 --- a/test/integration/epp/session/limit_test.rb +++ b/test/integration/epp/login/session_limit_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class EppSessionLimitTest < ActionDispatch::IntegrationTest +class EppLoginSessionLimitTest < ActionDispatch::IntegrationTest def setup travel_to Time.zone.parse('2010-07-05') EppSession.delete_all diff --git a/test/integration/epp/session/logout_test.rb b/test/integration/epp/logout_test.rb similarity index 100% rename from test/integration/epp/session/logout_test.rb rename to test/integration/epp/logout_test.rb