diff --git a/app/controllers/epp/domains_controller.rb b/app/controllers/epp/domains_controller.rb index adcad8f72..d2e146c0a 100644 --- a/app/controllers/epp/domains_controller.rb +++ b/app/controllers/epp/domains_controller.rb @@ -162,8 +162,8 @@ module Epp @prefix = 'update > update >' requires 'name' - dnskey_update_enabled if Feature.obj_and_extensions_statuses_enabled? - dnkey_update_prohibited if Feature.obj_and_extensions_statuses_enabled? + dnskey_update_enabled + dnkey_update_prohibited status_editing_disabled end diff --git a/app/models/concerns/domain/registry_lockable.rb b/app/models/concerns/domain/registry_lockable.rb index 028966c58..9930cae08 100644 --- a/app/models/concerns/domain/registry_lockable.rb +++ b/app/models/concerns/domain/registry_lockable.rb @@ -1,15 +1,9 @@ module Domain::RegistryLockable extend ActiveSupport::Concern - LOCK_STATUSES = if Feature.enable_lock_domain_with_new_statuses? - [DomainStatus::SERVER_OBJ_UPDATE_PROHIBITED, - DomainStatus::SERVER_DELETE_PROHIBITED, - DomainStatus::SERVER_TRANSFER_PROHIBITED].freeze - else - [DomainStatus::SERVER_UPDATE_PROHIBITED, - DomainStatus::SERVER_DELETE_PROHIBITED, - DomainStatus::SERVER_TRANSFER_PROHIBITED].freeze - end + LOCK_STATUSES = [DomainStatus::SERVER_OBJ_UPDATE_PROHIBITED, + DomainStatus::SERVER_DELETE_PROHIBITED, + DomainStatus::SERVER_TRANSFER_PROHIBITED].freeze EXTENSIONS_STATUS = [DomainStatus::SERVER_EXTENSION_UPDATE_PROHIBITED].freeze @@ -25,7 +19,7 @@ module Domain::RegistryLockable def apply_statuses_locked_statuses(extensions_prohibited:) self.admin_store_statuses_history = self.statuses self.statuses |= LOCK_STATUSES - self.statuses |= EXTENSIONS_STATUS if Feature.obj_and_extensions_statuses_enabled? && extensions_prohibited + self.statuses |= EXTENSIONS_STATUS if extensions_prohibited self.locked_by_registrant_at = Time.zone.now alert_registrar_lock_changes!(lock: true) diff --git a/app/models/domain_status.rb b/app/models/domain_status.rb index d8d750799..c4b132189 100644 --- a/app/models/domain_status.rb +++ b/app/models/domain_status.rb @@ -82,10 +82,10 @@ class DomainStatus < ApplicationRecord CLIENT_DELETE_PROHIBITED, SERVER_DELETE_PROHIBITED, CLIENT_HOLD, SERVER_HOLD, CLIENT_RENEW_PROHIBITED, SERVER_RENEW_PROHIBITED, CLIENT_TRANSFER_PROHIBITED, SERVER_TRANSFER_PROHIBITED, CLIENT_UPDATE_PROHIBITED, SERVER_UPDATE_PROHIBITED, - INACTIVE, OK, PENDING_CREATE, PENDING_DELETE, PENDING_DELETE_CONFIRMATION, + INACTIVE, OK, PENDING_CREATE, PENDING_DELETE, PENDING_DELETE_CONFIRMATION, PENDING_RENEW, PENDING_TRANSFER, PENDING_UPDATE, SERVER_MANUAL_INZONE, - SERVER_REGISTRANT_CHANGE_PROHIBITED, SERVER_ADMIN_CHANGE_PROHIBITED, - SERVER_TECH_CHANGE_PROHIBITED, FORCE_DELETE, DELETE_CANDIDATE, EXPIRED, DISPUTED, + SERVER_REGISTRANT_CHANGE_PROHIBITED, SERVER_ADMIN_CHANGE_PROHIBITED, + SERVER_TECH_CHANGE_PROHIBITED, FORCE_DELETE, DELETE_CANDIDATE, EXPIRED, DISPUTED, SERVER_RELEASE_PROHIBITED, SERVER_EXTENSION_UPDATE_PROHIBITED, SERVER_OBJ_UPDATE_PROHIBITED ].freeze @@ -98,7 +98,7 @@ class DomainStatus < ApplicationRecord SERVER_STATUSES = [ SERVER_DELETE_PROHIBITED, SERVER_HOLD, SERVER_RENEW_PROHIBITED, SERVER_TRANSFER_PROHIBITED, SERVER_UPDATE_PROHIBITED, SERVER_MANUAL_INZONE, SERVER_REGISTRANT_CHANGE_PROHIBITED, - SERVER_ADMIN_CHANGE_PROHIBITED, SERVER_TECH_CHANGE_PROHIBITED, SERVER_RELEASE_PROHIBITED, + SERVER_ADMIN_CHANGE_PROHIBITED, SERVER_TECH_CHANGE_PROHIBITED, SERVER_RELEASE_PROHIBITED, SERVER_EXTENSION_UPDATE_PROHIBITED, SERVER_OBJ_UPDATE_PROHIBITED ].freeze @@ -165,13 +165,10 @@ class DomainStatus < ApplicationRecord ['UpdateProhibited', SERVER_UPDATE_PROHIBITED], ['DeleteProhibited', SERVER_DELETE_PROHIBITED], ['ReleaseProhibited', SERVER_RELEASE_PROHIBITED], + ['ExtensionUpdateProhibited', SERVER_EXTENSION_UPDATE_PROHIBITED], + ['ObjUpdateProhibited', SERVER_OBJ_UPDATE_PROHIBITED], ] - if Feature.obj_and_extensions_statuses_enabled? - admin_statuses << ['ExtensionUpdateProhibited', SERVER_EXTENSION_UPDATE_PROHIBITED] - admin_statuses << ['ObjUpdateProhibited', SERVER_OBJ_UPDATE_PROHIBITED] - end - admin_statuses end diff --git a/app/models/feature.rb b/app/models/feature.rb index f14eefa4d..4143f108e 100644 --- a/app/models/feature.rb +++ b/app/models/feature.rb @@ -1,13 +1,13 @@ class Feature - def self.obj_and_extensions_statuses_enabled? - return false if ENV['obj_and_extensions_prohibited'] == 'false' - - ENV['obj_and_extensions_prohibited'] || false - end - - def self.enable_lock_domain_with_new_statuses? - return false if ENV['enable_lock_domain_with_new_statuses'] == 'false' - - ENV['enable_lock_domain_with_new_statuses'] || false - end + # def self.obj_and_extensions_statuses_enabled? + # return false if ENV['obj_and_extensions_prohibited'] == 'false' + # + # ENV['obj_and_extensions_prohibited'] || false + # end + # + # def self.enable_lock_domain_with_new_statuses? + # return false if ENV['enable_lock_domain_with_new_statuses'] == 'false' + # + # ENV['enable_lock_domain_with_new_statuses'] || false + # end end diff --git a/config/application.yml.sample b/config/application.yml.sample index 644a98145..a0cf9fa9e 100644 --- a/config/application.yml.sample +++ b/config/application.yml.sample @@ -61,9 +61,6 @@ contact_org_enabled: 'false' # System default for legal document types is: pdf,asice,sce,asics,scs,adoc,edoc,bdoc,ddoc,zip,rar,gz,tar,7z,odt,doc,docx # legal_document_types: "pdf,asice,sce,asics,scs,adoc,edoc,bdoc,ddoc,zip,rar,gz,tar,7z,odt,doc,docx" -obj_and_extensions_prohibited: 'true' -enable_lock_domain_with_new_statuses: 'true' - # # REGISTRAR configuration (DEPP) # diff --git a/test/integration/epp/domain/update/base_test.rb b/test/integration/epp/domain/update/base_test.rb index fe60d9723..8800afecc 100644 --- a/test/integration/epp/domain/update/base_test.rb +++ b/test/integration/epp/domain/update/base_test.rb @@ -48,100 +48,6 @@ class EppDomainUpdateBaseTest < EppTestCase assert_epp_response :parameter_value_syntax_error end - def test_set_false_for_obj_and_extensions_prohibited - ENV['obj_and_extensions_prohibited'] = 'false' - @domain = domains(:shop) - @domain.statuses << DomainStatus::SERVER_OBJ_UPDATE_PROHIBITED - @domain.save - @dnskey = dnskeys(:one) - @dnskey.update(domain: @domain) - - request_xml = <<-XML - - - - - - shop.test - - - - #{nameservers(:shop_ns1).hostname} - - - #{nameservers(:shop_ns2).hostname} - - - - #{@dnskey.flags} - #{@dnskey.protocol} - #{@dnskey.alg} - #{@dnskey.public_key} - - - - - - - XML - - post epp_update_path, params: { frame: request_xml }, - headers: { 'HTTP_COOKIE' => 'session=api_bestnames' } - response_xml = Nokogiri::XML(response.body) - p response.body - assert_correct_against_schema response_xml - @domain.reload - - assert_epp_response :completed_successfully - ENV['obj_and_extensions_prohibited'] = nil - end - - def test_set_nil_for_obj_and_extensions_prohibited - ENV['obj_and_extensions_prohibited'] = nil - @domain = domains(:shop) - @domain.statuses << DomainStatus::SERVER_OBJ_UPDATE_PROHIBITED - @domain.save - @dnskey = dnskeys(:one) - @dnskey.update(domain: @domain) - - request_xml = <<-XML - - - - - - shop.test - - - - #{nameservers(:shop_ns1).hostname} - - - #{nameservers(:shop_ns2).hostname} - - - - #{@dnskey.flags} - #{@dnskey.protocol} - #{@dnskey.alg} - #{@dnskey.public_key} - - - - - - - XML - - post epp_update_path, params: { frame: request_xml }, - headers: { 'HTTP_COOKIE' => 'session=api_bestnames' } - response_xml = Nokogiri::XML(response.body) - assert_correct_against_schema response_xml - @domain.reload - - assert_epp_response :completed_successfully - end - def test_update_domain_data_out_of_extension_block_with_serverObjUpdateProhibited ENV['obj_and_extensions_prohibited'] = 'true' @domain = domains(:shop) diff --git a/test/models/feature_test.rb b/test/models/feature_test.rb index dd338b3c3..f71979f11 100644 --- a/test/models/feature_test.rb +++ b/test/models/feature_test.rb @@ -1,53 +1,53 @@ require 'test_helper' class FeatureTest < ActiveSupport::TestCase - setup do - @domain = domains(:shop) - @domain.apply_registry_lock(extensions_prohibited: false) - end - - def test_if_obj_and_extensions_prohibited_enabled - ENV['obj_and_extensions_prohibited'] = 'true' - - assert Feature.obj_and_extensions_statuses_enabled? - - statuses = DomainStatus.admin_statuses - assert statuses.include? DomainStatus::SERVER_OBJ_UPDATE_PROHIBITED - end - - def test_if_obj_and_extensions_prohibited_is_nil - ENV['obj_and_extensions_prohibited'] = nil - - assert_not Feature.obj_and_extensions_statuses_enabled? - - statuses = DomainStatus.admin_statuses - assert_not statuses.include? DomainStatus::SERVER_OBJ_UPDATE_PROHIBITED - end - - def test_if_obj_and_extensions_prohibited_is_false - ENV['obj_and_extensions_prohibited'] = 'false' - - assert_not Feature.obj_and_extensions_statuses_enabled? - - statuses = DomainStatus.admin_statuses - assert_not statuses.include? DomainStatus::SERVER_OBJ_UPDATE_PROHIBITED - end - - def test_if_enable_lock_domain_with_new_statuses_is_nil - ENV['enable_lock_domain_with_new_statuses'] = nil - - assert_not Feature.enable_lock_domain_with_new_statuses? - - assert_equal @domain.statuses, ["serverObjUpdateProhibited", "serverDeleteProhibited", "serverTransferProhibited"] - assert @domain.locked_by_registrant? - end - - def test_if_enable_lock_domain_with_new_statuses_is_false - ENV['enable_lock_domain_with_new_statuses'] = 'false' - - assert_not Feature.enable_lock_domain_with_new_statuses? - - assert_equal @domain.statuses, ["serverObjUpdateProhibited", "serverDeleteProhibited", "serverTransferProhibited"] - assert @domain.locked_by_registrant? - end + # setup do + # @domain = domains(:shop) + # @domain.apply_registry_lock(extensions_prohibited: false) + # end + # + # def test_if_obj_and_extensions_prohibited_enabled + # ENV['obj_and_extensions_prohibited'] = 'true' + # + # assert Feature.obj_and_extensions_statuses_enabled? + # + # statuses = DomainStatus.admin_statuses + # assert statuses.include? DomainStatus::SERVER_OBJ_UPDATE_PROHIBITED + # end + # + # def test_if_obj_and_extensions_prohibited_is_nil + # ENV['obj_and_extensions_prohibited'] = nil + # + # assert_not Feature.obj_and_extensions_statuses_enabled? + # + # statuses = DomainStatus.admin_statuses + # assert_not statuses.include? DomainStatus::SERVER_OBJ_UPDATE_PROHIBITED + # end + # + # def test_if_obj_and_extensions_prohibited_is_false + # ENV['obj_and_extensions_prohibited'] = 'false' + # + # assert_not Feature.obj_and_extensions_statuses_enabled? + # + # statuses = DomainStatus.admin_statuses + # assert_not statuses.include? DomainStatus::SERVER_OBJ_UPDATE_PROHIBITED + # end + # + # def test_if_enable_lock_domain_with_new_statuses_is_nil + # ENV['enable_lock_domain_with_new_statuses'] = nil + # + # assert_not Feature.enable_lock_domain_with_new_statuses? + # + # assert_equal @domain.statuses, ["serverObjUpdateProhibited", "serverDeleteProhibited", "serverTransferProhibited"] + # assert @domain.locked_by_registrant? + # end + # + # def test_if_enable_lock_domain_with_new_statuses_is_false + # ENV['enable_lock_domain_with_new_statuses'] = 'false' + # + # assert_not Feature.enable_lock_domain_with_new_statuses? + # + # assert_equal @domain.statuses, ["serverObjUpdateProhibited", "serverDeleteProhibited", "serverTransferProhibited"] + # assert @domain.locked_by_registrant? + # end end