updated schemas

app/controllers/registrar/xml_consoles_controller.rb

@@ -49,7 +49,7 @@ class Registrar
       when 'contact-ee'
         insert_prefix_and_version(xml, pref, '1.1')
       else
-        insert_prefix_and_version(xml, pref, '1.1')
+        insert_prefix_and_version(xml, pref, '1.2')
       end
     end
 

app/models/domain.rb

@@ -225,7 +225,7 @@ class Domain < ApplicationRecord
   end
 
   def dnskey_update_enabled?
-    statuses.include? DomainStatus::SERVER_DNSKEY_UPDATE_ENABLED
+    statuses.include? DomainStatus::SERVER_OBJ_UPDATE_PROHIBITED
   end
 
   def admin_change_prohibited?

app/models/domain_status.rb

@@ -10,7 +10,7 @@ class DomainStatus < ApplicationRecord
   CLIENT_DELETE_PROHIBITED = 'clientDeleteProhibited'
   SERVER_DELETE_PROHIBITED = 'serverDeleteProhibited'
   SERVER_EXTENSION_UPDATE_PROHIBITED = 'serverExtensionUpdateProhibited'
-  SERVER_DNSKEY_UPDATE_ENABLED = 'serverDnskeyUpdateEnabled'
+  SERVER_OBJ_UPDATE_PROHIBITED = 'serverObjUpdateProhibited'
 
   # DNS delegation information MUST NOT be published for the object.
   CLIENT_HOLD = 'clientHold'
@@ -87,7 +87,7 @@ class DomainStatus < ApplicationRecord
     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_DNSKEY_UPDATE_ENABLED
+    SERVER_OBJ_UPDATE_PROHIBITED
   ].freeze
 
   CLIENT_STATUSES = [
@@ -99,7 +99,7 @@ class DomainStatus < ApplicationRecord
     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_EXTENSION_UPDATE_PROHIBITED, SERVER_DNSKEY_UPDATE_ENABLED
+    SERVER_EXTENSION_UPDATE_PROHIBITED, SERVER_OBJ_UPDATE_PROHIBITED
   ].freeze
 
   UPDATE_PROHIBIT_STATES = [
@@ -167,7 +167,7 @@ class DomainStatus < ApplicationRecord
         ['DeleteProhibited', SERVER_DELETE_PROHIBITED],
         ['ReleaseProhibited', SERVER_RELEASE_PROHIBITED],
         ['serverExtensionUpdateProhibited', SERVER_EXTENSION_UPDATE_PROHIBITED],
-        ['serverDnskeyUpdateEnabled', SERVER_DNSKEY_UPDATE_ENABLED],
+        ['serverObjUpdateProhibited', SERVER_OBJ_UPDATE_PROHIBITED],
       ]
     end
 

config/initializers/load_schemas.rb

@@ -1 +1 @@
-EPP_ALL_SCHEMA = Nokogiri::XML::Schema(File.read('lib/schemas/all-ee-1.2.xsd'))
+EPP_ALL_SCHEMA = Nokogiri::XML::Schema(File.read('lib/schemas/all-ee-1.3.xsd'))

lib/schemas/all-ee-1.3.xsd

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+  <!--
+  This schema imports other schemas used for Estonian ccTLD
+  .ee EPP queries and responses.
+  -->
+  <schema targetNamespace="https://epp.tld.ee/schema/all-ee-1.3"
+          xmlns:all="https://epp.tld.ee/schema/all-ee-1.3"
+          xmlns="http://www.w3.org/2001/XMLSchema"
+          elementFormDefault="qualified">
+
+    <!--
+    Import all schemas related to .ee EPP protocol.
+    Anytime the version of any imported schema is raised, the version of
+    'all' schema is also raised.
+    eppcom and epp schemas never change the version. This would result
+    in incompatibility with EPP standard.
+    -->
+    <import namespace="urn:ietf:params:xml:ns:eppcom-1.0"
+      schemaLocation="lib/schemas/eppcom-1.0.xsd"/>
+    <import namespace="https://epp.tld.ee/schema/epp-ee-1.0.xsd"
+      schemaLocation="lib/schemas/epp-ee-1.0.xsd"/>
+    <!-- EPP protocol extension: DNSSEC -->
+    <import namespace="urn:ietf:params:xml:ns:secDNS-1.1"
+      schemaLocation="lib/schemas/secDNS-1.1.xsd"/>
+    <import namespace="urn:ietf:params:xml:ns:host-1.0"
+      schemaLocation="lib/schemas/host-1.0.xsd"/>
+    <!-- EPP protocol extension: .ee specific -->
+    <import namespace="https://epp.tld.ee/schema/eis-1.0"
+      schemaLocation="lib/schemas/eis-1.0.xsd"/>
+    <import namespace="https://epp.tld.ee/schema/contact-ee-1.1"
+      schemaLocation="lib/schemas/contact-ee-1.1.xsd"/>
+    <import namespace="https://epp.tld.ee/schema/domain-ee-1.2"
+      schemaLocation="lib/schemas/domain-ee-1.2.xsd"/>
+
+    <annotation>
+      <documentation>
+        Extensible Provisioning Protocol v1.0
+        all schema's grouped together
+      </documentation>
+    </annotation>
+
+  </schema>

lib/schemas/domain-ee-1.2.xsd

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<schema targetNamespace="https://epp.tld.ee/schema/domain-ee-1.1.xsd"
+<schema targetNamespace="https://epp.tld.ee/schema/domain-ee-1.2.xsd"
-     xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.1.xsd"
+     xmlns:domain="https://epp.tld.ee/schema/domain-ee-1.2.xsd"
      xmlns:host="urn:ietf:params:xml:ns:host-1.0"
      xmlns:epp="https://epp.tld.ee/schema/epp-ee-1.0.xsd"
      xmlns:eppcom="urn:ietf:params:xml:ns:eppcom-1.0"
@@ -416,6 +416,8 @@ than English.
     <enumeration value="deleteCandidate"/>
     <enumeration value="disputed"/>
     <enumeration value="serverReleaseProhibited"/>
+    <enumeration value="serverExtensionUpdateProhibited"/>
+    <enumeration value="serverObjUpdateProhibited"/>
   </restriction>
 </simpleType>
 

test/integration/epp/domain/update/base_test.rb

@@ -50,7 +50,7 @@ class EppDomainUpdateBaseTest < EppTestCase
 
   def test_update_domain_data_out_of_extension_block_with_serverDnskeyUpdateEnabled
     @domain = domains(:shop)
-    @domain.statuses << DomainStatus::SERVER_DNSKEY_UPDATE_ENABLED
+    @domain.statuses << DomainStatus::SERVER_OBJ_UPDATE_PROHIBITED
     @domain.save
     @dnskey = dnskeys(:one)
     @dnskey.update(domain: @domain)
@@ -95,7 +95,7 @@ class EppDomainUpdateBaseTest < EppTestCase
 
   def test_update_domain_dns_with_serverDnskeyUpdateEnabled
     @domain = domains(:shop)
-    @domain.statuses << DomainStatus::SERVER_DNSKEY_UPDATE_ENABLED
+    @domain.statuses << DomainStatus::SERVER_OBJ_UPDATE_PROHIBITED
     @domain.save
     @dnskey = dnskeys(:one)
     @dnskey.update(domain: @domain)