diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6517b4ff..157cc9501 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+24.01.2017
+* Disallow EPP domain:update/transfer/delete if a domain has "deleteCandidate" status
+
22.12.2016
* Return business registry code and country for 'org' type registrants in WHOIS and Rest-WHOIS
diff --git a/app/models/concerns/domain/deletable.rb b/app/models/concerns/domain/deletable.rb
new file mode 100644
index 000000000..f724162e5
--- /dev/null
+++ b/app/models/concerns/domain/deletable.rb
@@ -0,0 +1,11 @@
+module Concerns::Domain::Deletable
+ extend ActiveSupport::Concern
+
+ included do
+ alias_attribute :delete_time, :delete_at
+ end
+
+ def discarded?
+ statuses.include?(DomainStatus::DELETE_CANDIDATE)
+ end
+end
diff --git a/app/models/domain.rb b/app/models/domain.rb
index bca5942ac..3e71dd1e9 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -5,6 +5,7 @@ class Domain < ActiveRecord::Base
include Concerns::Domain::Expirable
include Concerns::Domain::Activatable
include Concerns::Domain::ForceDelete
+ include Concerns::Domain::Deletable
has_paper_trail class_name: "DomainVersion", meta: { children: :children_log }
@@ -14,7 +15,6 @@ class Domain < ActiveRecord::Base
alias_attribute :on_hold_time, :outzone_at
alias_attribute :outzone_time, :outzone_at
- alias_attribute :delete_time, :delete_at
# TODO: whois requests ip whitelist for full info for own domains and partial info for other domains
# TODO: most inputs should be trimmed before validatation, probably some global logic?
diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index 6a2edf5ed..a2a5dd1dc 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -472,6 +472,9 @@ class Epp::Domain < Domain
# rubocop: disable Metrics/CyclomaticComplexity
def update(frame, current_user, verify = true)
return super if frame.blank?
+
+ check_discarded
+
at = {}.with_indifferent_access
at.deep_merge!(attrs_from(frame.css('chg'), current_user, 'chg'))
at.deep_merge!(attrs_from(frame.css('rem'), current_user, 'rem'))
@@ -563,6 +566,8 @@ class Epp::Domain < Domain
def epp_destroy(frame, user_id)
return false unless valid?
+ check_discarded
+
if doc = attach_legal_document(Epp::Domain.parse_legal_document_from_frame(frame))
frame.css("legalDocument").first.content = doc.path if doc && doc.persisted?
end
@@ -629,6 +634,8 @@ class Epp::Domain < Domain
# rubocop: disable Metrics/CyclomaticComplexity
def transfer(frame, action, current_user)
+ check_discarded
+
@is_transfer = true
case action
@@ -925,5 +932,16 @@ class Epp::Domain < Domain
res
end
end
+
+ private
+
+ def check_discarded
+ if discarded?
+ throw :epp_error, {
+ code: '2105',
+ msg: I18n.t(:object_is_not_eligible_for_renewal),
+ }
+ end
+ end
end
# rubocop: enable Metrics/ClassLength
diff --git a/spec/factories/domain.rb b/spec/factories/domain.rb
index edbd2274c..4c1b4b1cc 100644
--- a/spec/factories/domain.rb
+++ b/spec/factories/domain.rb
@@ -15,5 +15,9 @@ FactoryGirl.define do
force_delete_time nil
statuses []
end
+
+ factory :domain_discarded do
+ statuses [DomainStatus::DELETE_CANDIDATE]
+ end
end
end
diff --git a/spec/models/concerns/domain/deletable_spec.rb b/spec/models/concerns/domain/deletable_spec.rb
new file mode 100644
index 000000000..826299b69
--- /dev/null
+++ b/spec/models/concerns/domain/deletable_spec.rb
@@ -0,0 +1,19 @@
+require 'rails_helper'
+
+RSpec.describe Domain, db: false do
+ it { is_expected.to alias_attribute(:delete_time, :delete_at) }
+
+ describe '#discarded?' do
+ context 'when :deleteCandidate status is present' do
+ let(:domain) { described_class.new(statuses: [DomainStatus::DELETE_CANDIDATE]) }
+
+ specify { expect(domain).to be_discarded }
+ end
+
+ context 'when :deleteCandidate status is absent' do
+ let(:domain) { described_class.new(statuses: []) }
+
+ specify { expect(domain).to_not be_discarded }
+ end
+ end
+end
diff --git a/spec/models/domain_spec.rb b/spec/models/domain_spec.rb
index 6e224080f..65c96dbe8 100644
--- a/spec/models/domain_spec.rb
+++ b/spec/models/domain_spec.rb
@@ -607,7 +607,6 @@ end
RSpec.describe Domain, db: false do
it { is_expected.to alias_attribute(:on_hold_time, :outzone_at) }
- it { is_expected.to alias_attribute(:delete_time, :delete_at) }
it { is_expected.to alias_attribute(:outzone_time, :outzone_at) }
describe 'nameserver validation', db: true do
diff --git a/spec/requests/epp/domain/delete/discarded_spec.rb b/spec/requests/epp/domain/delete/discarded_spec.rb
new file mode 100644
index 000000000..f136e0696
--- /dev/null
+++ b/spec/requests/epp/domain/delete/discarded_spec.rb
@@ -0,0 +1,48 @@
+require 'rails_helper'
+
+RSpec.describe 'EPP domain:delete' do
+ let(:request_xml) { <<-XML
+
+
+
+
+
+ test.com
+
+
+
+
+ dGVzdCBmYWlsCg==
+
+
+
+
+ XML
+ }
+
+ 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
+ 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
+ expect(response_code).to eq('1001'), "Expected EPP code of 1001, got #{response_code} (#{response_description})"
+ end
+ end
+
+ context 'when domain is discarded' do
+ let!(:domain) { create(:domain_discarded, name: 'test.com') }
+
+ it 'returns epp code of 2105' do
+ post '/epp/command/delete', frame: request_xml
+ expect(response_code).to eq('2105'), "Expected EPP code of 2105, got #{response_code} (#{response_description})"
+ end
+ end
+end
diff --git a/spec/requests/epp/domain/transfer/discarded_spec.rb b/spec/requests/epp/domain/transfer/discarded_spec.rb
new file mode 100644
index 000000000..045e3cd2f
--- /dev/null
+++ b/spec/requests/epp/domain/transfer/discarded_spec.rb
@@ -0,0 +1,46 @@
+require 'rails_helper'
+
+RSpec.describe 'EPP domain:transfer' do
+ let(:request_xml) { <<-XML
+
+
+
+
+
+ test.com
+
+ 98oiewslkfkd
+
+
+
+
+
+ XML
+ }
+
+ 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
+ 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
+ expect(response_code).to eq('1000'), "Expected EPP code of 1000, got #{response_code} (#{response_description})"
+ end
+ end
+
+ context 'when domain is discarded' do
+ let!(:domain) { create(:domain_discarded, name: 'test.com') }
+
+ it 'returns epp code of 2105' do
+ post '/epp/command/transfer', frame: request_xml
+ expect(response_code).to eq('2105'), "Expected EPP code of 2105, got #{response_code} (#{response_description})"
+ end
+ end
+end
diff --git a/spec/requests/epp/domain/update/discarded_spec.rb b/spec/requests/epp/domain/update/discarded_spec.rb
new file mode 100644
index 000000000..c1061a95f
--- /dev/null
+++ b/spec/requests/epp/domain/update/discarded_spec.rb
@@ -0,0 +1,43 @@
+require 'rails_helper'
+
+RSpec.describe 'EPP domain:update' do
+ let(:request_xml) { <<-XML
+
+
+
+
+
+ test.com
+
+
+
+
+ XML
+ }
+
+ 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
+ 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
+ expect(response_code).to eq('1000'), "Expected EPP code of 1000, got #{response_code} (#{response_description})"
+ end
+ end
+
+ context 'when domain is discarded' do
+ let!(:domain) { create(:domain_discarded, name: 'test.com') }
+
+ it 'returns epp code of 2105' do
+ post '/epp/command/update', frame: request_xml
+ expect(response_code).to eq('2105'), "Expected EPP code of 2105, got #{response_code} (#{response_description})"
+ end
+ end
+end