Revert "Remove contact as a supported object type in EPP (#2932)" (#2938)

This reverts commit d8e647316e.
2026-02-05 04:21:07 +00:00 · 2026-01-22 00:05:07 +05:30
parent a7387e975b
commit 41393e5f8d
20 changed files with 26 additions and 2 deletions
--- a/core/src/main/java/google/registry/model/eppcommon/ProtocolDefinition.java
+++ b/core/src/main/java/google/registry/model/eppcommon/ProtocolDefinition.java
@@ -46,7 +46,10 @@ public class ProtocolDefinition {
  public static final String LANGUAGE = "en";

  public static final ImmutableSet<String> SUPPORTED_OBJECT_SERVICES =
-      ImmutableSet.of("urn:ietf:params:xml:ns:host-1.0", "urn:ietf:params:xml:ns:domain-1.0");
+      ImmutableSet.of(
+          "urn:ietf:params:xml:ns:host-1.0",
+          "urn:ietf:params:xml:ns:domain-1.0",
+          "urn:ietf:params:xml:ns:contact-1.0");

  /** Enum representing which environments should have which service extensions enabled. */
  private enum ServiceExtensionVisibility {
--- a/core/src/test/java/google/registry/model/eppinput/EppInputTest.java
+++ b/core/src/test/java/google/registry/model/eppinput/EppInputTest.java
@@ -68,7 +68,10 @@ class EppInputTest {
    assertThat(loginCommand.options.version).isEqualTo("1.0");
    assertThat(loginCommand.options.language).isEqualTo("en");
    assertThat(loginCommand.services.objectServices)
-        .containsExactly("urn:ietf:params:xml:ns:host-1.0", "urn:ietf:params:xml:ns:domain-1.0");
+        .containsExactly(
+            "urn:ietf:params:xml:ns:host-1.0",
+            "urn:ietf:params:xml:ns:domain-1.0",
+            "urn:ietf:params:xml:ns:contact-1.0");
    assertThat(loginCommand.services.serviceExtensions)
        .containsExactly("urn:ietf:params:xml:ns:launch-1.0", "urn:ietf:params:xml:ns:rgp-1.0");
  }
--- a/core/src/test/resources/google/registry/flows/greeting.xml
+++ b/core/src/test/resources/google/registry/flows/greeting.xml
@@ -6,6 +6,7 @@
      <version>1.0</version>
      <lang>en</lang>
      <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
+      <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
      <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
      <svcExtension>
        <extURI>urn:ietf:params:xml:ns:launch-1.0</extURI>
--- a/core/src/test/resources/google/registry/flows/login.xml
+++ b/core/src/test/resources/google/registry/flows/login.xml
@@ -10,6 +10,7 @@
      <svcs>
        <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
        <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
+        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
        <svcExtension>
          <extURI>urn:ietf:params:xml:ns:launch-1.0</extURI>
          <extURI>urn:ietf:params:xml:ns:rgp-1.0</extURI>
--- a/core/src/test/resources/google/registry/flows/login_update_password.xml
+++ b/core/src/test/resources/google/registry/flows/login_update_password.xml
@@ -11,6 +11,7 @@
      <svcs>
        <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
        <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
+        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
        <svcExtension>
          <extURI>urn:ietf:params:xml:ns:launch-1.0</extURI>
          <extURI>urn:ietf:params:xml:ns:rgp-1.0</extURI>
--- a/core/src/test/resources/google/registry/flows/login_valid_fee_extension.xml
+++ b/core/src/test/resources/google/registry/flows/login_valid_fee_extension.xml
@@ -10,6 +10,7 @@
      <svcs>
        <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
        <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
+        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
        <svcExtension>
          <extURI>urn:ietf:params:xml:ns:launch-1.0</extURI>
          <extURI>urn:ietf:params:xml:ns:rgp-1.0</extURI>
--- a/core/src/test/resources/google/registry/flows/login_wrong_case.xml
+++ b/core/src/test/resources/google/registry/flows/login_wrong_case.xml
@@ -11,6 +11,7 @@
      <svcs>
        <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
        <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
+        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
        <svcExtension>
          <extURI>urn:ietf:params:xml:ns:launch-1.0</extURI>
          <extURI>urn:ietf:params:xml:ns:rgp-1.0</extURI>
--- a/core/src/test/resources/google/registry/flows/session/greeting.xml
+++ b/core/src/test/resources/google/registry/flows/session/greeting.xml
@@ -6,6 +6,7 @@
      <version>1.0</version>
      <lang>en</lang>
      <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
+      <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
      <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
      <svcExtension>
        <extURI>urn:ietf:params:xml:ns:launch-1.0</extURI>
--- a/core/src/test/resources/google/registry/flows/session/login_invalid_extension.xml
+++ b/core/src/test/resources/google/registry/flows/session/login_invalid_extension.xml
@@ -10,6 +10,7 @@
      <svcs>
        <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
        <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
+        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
        <svcExtension>
          <extURI>http://custom/obj1ext-1.0</extURI>
        </svcExtension>
--- a/core/src/test/resources/google/registry/flows/session/login_invalid_language.xml
+++ b/core/src/test/resources/google/registry/flows/session/login_invalid_language.xml
@@ -10,6 +10,7 @@
      <svcs>
        <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
        <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
+        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
      </svcs>
    </login>
    <clTRID>ABC-12345</clTRID>
--- a/core/src/test/resources/google/registry/flows/session/login_invalid_types.xml
+++ b/core/src/test/resources/google/registry/flows/session/login_invalid_types.xml
@@ -10,6 +10,7 @@
      <svcs>
        <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
        <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
+        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
        <objURI>urn:ietf:params:xml:ns:foo-1.0</objURI>
      </svcs>
    </login>
--- a/core/src/test/resources/google/registry/flows/session/login_invalid_version.xml
+++ b/core/src/test/resources/google/registry/flows/session/login_invalid_version.xml
@@ -10,6 +10,7 @@
      <svcs>
        <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
        <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
+        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
      </svcs>
    </login>
    <clTRID>ABC-12345</clTRID>
--- a/core/src/test/resources/google/registry/flows/session/login_set_new_password.xml
+++ b/core/src/test/resources/google/registry/flows/session/login_set_new_password.xml
@@ -11,6 +11,7 @@
      <svcs>
        <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
        <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
+        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
      </svcs>
    </login>
    <clTRID>ABC-12345</clTRID>
--- a/core/src/test/resources/google/registry/flows/session/login_valid.xml
+++ b/core/src/test/resources/google/registry/flows/session/login_valid.xml
@@ -10,6 +10,7 @@
      <svcs>
        <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
        <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
+        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
      </svcs>
    </login>
    <clTRID>ABC-12345</clTRID>
--- a/core/src/test/resources/google/registry/flows/syntax_error.xml
+++ b/core/src/test/resources/google/registry/flows/syntax_error.xml
@@ -12,6 +12,7 @@ xsi:schemaLocation="urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd">
      </options>
      <svcs>
        <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
+        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
        <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
        <svcExtension>
          <extURI>urn:ietf:params:xml:ns:secDNS-1.1</extURI>
--- a/core/src/test/resources/google/registry/model/eppinput/login_valid.xml
+++ b/core/src/test/resources/google/registry/model/eppinput/login_valid.xml
@@ -10,6 +10,7 @@
      <svcs>
        <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
        <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
+        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
        <svcExtension>
          <extURI>urn:ietf:params:xml:ns:launch-1.0</extURI>
          <extURI>urn:ietf:params:xml:ns:rgp-1.0</extURI>
--- a/core/src/test/resources/google/registry/model/eppinput/login_wrong_case.xml
+++ b/core/src/test/resources/google/registry/model/eppinput/login_wrong_case.xml
@@ -10,6 +10,7 @@
      <svcs>
        <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
        <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
+        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
        <svcExtension>
          <extURI>urn:ietf:params:xml:ns:launch-1.0</extURI>
          <extURI>urn:ietf:params:xml:ns:rgp-1.0</extURI>
--- a/load-testing/src/main/java/google/registry/client/resources/login.xml
+++ b/load-testing/src/main/java/google/registry/client/resources/login.xml
@@ -11,6 +11,7 @@
    <svcs>
      <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
      <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
+      <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
    </svcs>
  </login>
  <clTRID>epp-client-login-@@NOW@@-@@CHANNEL_NUMBER@@</clTRID>
--- a/prober/src/main/resources/google/registry/monitoring/blackbox/message/greeting.xml
+++ b/prober/src/main/resources/google/registry/monitoring/blackbox/message/greeting.xml
@@ -5,6 +5,7 @@
    <svcMenu>
      <version>1.0</version>
      <lang>en</lang>
+      <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
      <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
      <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
    </svcMenu>
--- a/prober/src/main/resources/google/registry/monitoring/blackbox/message/login.xml
+++ b/prober/src/main/resources/google/registry/monitoring/blackbox/message/login.xml
@@ -10,6 +10,7 @@
      </options>
      <svcs>
        <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
+        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
        <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
        <svcExtension>
          <extURI>urn:ietf:params:xml:ns:launch-1.0</extURI>