From 9b2a1085f4a3ed84776d820ff08a24605eab4819 Mon Sep 17 00:00:00 2001 From: Ben McIlwain Date: Tue, 13 Jan 2026 11:23:02 -0500 Subject: [PATCH] Remove contact as a supported object type in EPP This primarily affects the EPP greeting. We already were erroring out when any contact flows attempted to be run; this should just prevent registrars from even trying them at all. This PR is designed to be minimally invasive, and does not remove any of the contact flows or Jakarta XML/XJC objects/files themselves. That can be done later as a follow-up. Also note that the contact namespace urn:ietf:params:xml:ns:contact-1.0 is still present for now in RDE exports, but I'll remove that subsequently as well. BUG= http://b/475506288 --- .../google/registry/model/eppcommon/ProtocolDefinition.java | 5 +---- .../java/google/registry/model/eppinput/EppInputTest.java | 5 +---- core/src/test/resources/google/registry/flows/greeting.xml | 1 - core/src/test/resources/google/registry/flows/login.xml | 1 - .../google/registry/flows/login_update_password.xml | 1 - .../google/registry/flows/login_valid_fee_extension.xml | 1 - .../resources/google/registry/flows/login_wrong_case.xml | 1 - .../resources/google/registry/flows/session/greeting.xml | 1 - .../registry/flows/session/login_invalid_extension.xml | 1 - .../google/registry/flows/session/login_invalid_language.xml | 1 - .../google/registry/flows/session/login_invalid_types.xml | 1 - .../google/registry/flows/session/login_invalid_version.xml | 1 - .../google/registry/flows/session/login_set_new_password.xml | 1 - .../resources/google/registry/flows/session/login_valid.xml | 1 - .../test/resources/google/registry/flows/syntax_error.xml | 1 - .../resources/google/registry/model/eppinput/login_valid.xml | 1 - .../google/registry/model/eppinput/login_wrong_case.xml | 1 - .../src/main/java/google/registry/client/resources/login.xml | 1 - .../google/registry/monitoring/blackbox/message/greeting.xml | 1 - .../google/registry/monitoring/blackbox/message/login.xml | 1 - 20 files changed, 2 insertions(+), 26 deletions(-) diff --git a/core/src/main/java/google/registry/model/eppcommon/ProtocolDefinition.java b/core/src/main/java/google/registry/model/eppcommon/ProtocolDefinition.java index 7eeea88e0c2..0aa15471d39 100644 --- a/core/src/main/java/google/registry/model/eppcommon/ProtocolDefinition.java +++ b/core/src/main/java/google/registry/model/eppcommon/ProtocolDefinition.java @@ -44,10 +44,7 @@ public class ProtocolDefinition { public static final String LANGUAGE = "en"; public static final ImmutableSet SUPPORTED_OBJECT_SERVICES = - 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"); + ImmutableSet.of("urn:ietf:params:xml:ns:host-1.0", "urn:ietf:params:xml:ns:domain-1.0"); /** Enum representing which environments should have which service extensions enabled. */ private enum ServiceExtensionVisibility { diff --git a/core/src/test/java/google/registry/model/eppinput/EppInputTest.java b/core/src/test/java/google/registry/model/eppinput/EppInputTest.java index 68d824fdd8f..43da2566a85 100644 --- a/core/src/test/java/google/registry/model/eppinput/EppInputTest.java +++ b/core/src/test/java/google/registry/model/eppinput/EppInputTest.java @@ -68,10 +68,7 @@ void testUnmarshalling_login() throws Exception { 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", - "urn:ietf:params:xml:ns:contact-1.0"); + .containsExactly("urn:ietf:params:xml:ns:host-1.0", "urn:ietf:params:xml:ns:domain-1.0"); assertThat(loginCommand.services.serviceExtensions) .containsExactly("urn:ietf:params:xml:ns:launch-1.0", "urn:ietf:params:xml:ns:rgp-1.0"); } diff --git a/core/src/test/resources/google/registry/flows/greeting.xml b/core/src/test/resources/google/registry/flows/greeting.xml index f039bfca7bf..4482b7f2770 100644 --- a/core/src/test/resources/google/registry/flows/greeting.xml +++ b/core/src/test/resources/google/registry/flows/greeting.xml @@ -6,7 +6,6 @@ 1.0 en urn:ietf:params:xml:ns:host-1.0 - urn:ietf:params:xml:ns:contact-1.0 urn:ietf:params:xml:ns:domain-1.0 urn:ietf:params:xml:ns:launch-1.0 diff --git a/core/src/test/resources/google/registry/flows/login.xml b/core/src/test/resources/google/registry/flows/login.xml index 00dd038afee..922f68ca631 100644 --- a/core/src/test/resources/google/registry/flows/login.xml +++ b/core/src/test/resources/google/registry/flows/login.xml @@ -10,7 +10,6 @@ urn:ietf:params:xml:ns:host-1.0 urn:ietf:params:xml:ns:domain-1.0 - urn:ietf:params:xml:ns:contact-1.0 urn:ietf:params:xml:ns:launch-1.0 urn:ietf:params:xml:ns:rgp-1.0 diff --git a/core/src/test/resources/google/registry/flows/login_update_password.xml b/core/src/test/resources/google/registry/flows/login_update_password.xml index 07011f4e9f0..dc832cf970d 100644 --- 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,7 +11,6 @@ urn:ietf:params:xml:ns:host-1.0 urn:ietf:params:xml:ns:domain-1.0 - urn:ietf:params:xml:ns:contact-1.0 urn:ietf:params:xml:ns:launch-1.0 urn:ietf:params:xml:ns:rgp-1.0 diff --git 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 index 7f72adc17c1..d5278b542bd 100644 --- 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,7 +10,6 @@ urn:ietf:params:xml:ns:host-1.0 urn:ietf:params:xml:ns:domain-1.0 - urn:ietf:params:xml:ns:contact-1.0 urn:ietf:params:xml:ns:launch-1.0 urn:ietf:params:xml:ns:rgp-1.0 diff --git a/core/src/test/resources/google/registry/flows/login_wrong_case.xml b/core/src/test/resources/google/registry/flows/login_wrong_case.xml index c0c8716a192..5149098458c 100644 --- 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,7 +11,6 @@ urn:ietf:params:xml:ns:host-1.0 urn:ietf:params:xml:ns:domain-1.0 - urn:ietf:params:xml:ns:contact-1.0 urn:ietf:params:xml:ns:launch-1.0 urn:ietf:params:xml:ns:rgp-1.0 diff --git a/core/src/test/resources/google/registry/flows/session/greeting.xml b/core/src/test/resources/google/registry/flows/session/greeting.xml index f039bfca7bf..4482b7f2770 100644 --- a/core/src/test/resources/google/registry/flows/session/greeting.xml +++ b/core/src/test/resources/google/registry/flows/session/greeting.xml @@ -6,7 +6,6 @@ 1.0 en urn:ietf:params:xml:ns:host-1.0 - urn:ietf:params:xml:ns:contact-1.0 urn:ietf:params:xml:ns:domain-1.0 urn:ietf:params:xml:ns:launch-1.0 diff --git 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 index 45d022c2451..40fd1d3dee3 100644 --- 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,7 +10,6 @@ urn:ietf:params:xml:ns:host-1.0 urn:ietf:params:xml:ns:domain-1.0 - urn:ietf:params:xml:ns:contact-1.0 http://custom/obj1ext-1.0 diff --git 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 index 8e4a2290a2b..8324b1cb224 100644 --- 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,7 +10,6 @@ urn:ietf:params:xml:ns:host-1.0 urn:ietf:params:xml:ns:domain-1.0 - urn:ietf:params:xml:ns:contact-1.0 ABC-12345 diff --git 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 index 480ead56713..a3625b3efc9 100644 --- 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,7 +10,6 @@ urn:ietf:params:xml:ns:host-1.0 urn:ietf:params:xml:ns:domain-1.0 - urn:ietf:params:xml:ns:contact-1.0 urn:ietf:params:xml:ns:foo-1.0 diff --git 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 index 3469a5f79eb..2ce50ce3a30 100644 --- 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,7 +10,6 @@ urn:ietf:params:xml:ns:host-1.0 urn:ietf:params:xml:ns:domain-1.0 - urn:ietf:params:xml:ns:contact-1.0 ABC-12345 diff --git 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 index 2fd6ba91c95..eedc98b0998 100644 --- 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,7 +11,6 @@ urn:ietf:params:xml:ns:host-1.0 urn:ietf:params:xml:ns:domain-1.0 - urn:ietf:params:xml:ns:contact-1.0 ABC-12345 diff --git a/core/src/test/resources/google/registry/flows/session/login_valid.xml b/core/src/test/resources/google/registry/flows/session/login_valid.xml index 210c07aa37d..a854beb055f 100644 --- 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,7 +10,6 @@ urn:ietf:params:xml:ns:host-1.0 urn:ietf:params:xml:ns:domain-1.0 - urn:ietf:params:xml:ns:contact-1.0 ABC-12345 diff --git a/core/src/test/resources/google/registry/flows/syntax_error.xml b/core/src/test/resources/google/registry/flows/syntax_error.xml index b25f3360e93..858dde672ae 100644 --- a/core/src/test/resources/google/registry/flows/syntax_error.xml +++ b/core/src/test/resources/google/registry/flows/syntax_error.xml @@ -12,7 +12,6 @@ xsi:schemaLocation="urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd"> urn:ietf:params:xml:ns:domain-1.0 - urn:ietf:params:xml:ns:contact-1.0 urn:ietf:params:xml:ns:host-1.0 urn:ietf:params:xml:ns:secDNS-1.1 diff --git a/core/src/test/resources/google/registry/model/eppinput/login_valid.xml b/core/src/test/resources/google/registry/model/eppinput/login_valid.xml index 9844b2f7ac8..cbd3f8897cb 100644 --- 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,7 +10,6 @@ urn:ietf:params:xml:ns:host-1.0 urn:ietf:params:xml:ns:domain-1.0 - urn:ietf:params:xml:ns:contact-1.0 urn:ietf:params:xml:ns:launch-1.0 urn:ietf:params:xml:ns:rgp-1.0 diff --git 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 index c445ab41258..6b36afa25ab 100644 --- 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,7 +10,6 @@ urn:ietf:params:xml:ns:host-1.0 urn:ietf:params:xml:ns:domain-1.0 - urn:ietf:params:xml:ns:contact-1.0 urn:ietf:params:xml:ns:launch-1.0 urn:ietf:params:xml:ns:rgp-1.0 diff --git a/load-testing/src/main/java/google/registry/client/resources/login.xml b/load-testing/src/main/java/google/registry/client/resources/login.xml index 4ff8ac658eb..e8bb28637f3 100644 --- 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,7 +11,6 @@ urn:ietf:params:xml:ns:host-1.0 urn:ietf:params:xml:ns:domain-1.0 - urn:ietf:params:xml:ns:contact-1.0 epp-client-login-@@NOW@@-@@CHANNEL_NUMBER@@ diff --git a/prober/src/main/resources/google/registry/monitoring/blackbox/message/greeting.xml b/prober/src/main/resources/google/registry/monitoring/blackbox/message/greeting.xml index 775de6d002b..45d67c65627 100644 --- 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,7 +5,6 @@ 1.0 en - urn:ietf:params:xml:ns:contact-1.0 urn:ietf:params:xml:ns:domain-1.0 urn:ietf:params:xml:ns:host-1.0 diff --git a/prober/src/main/resources/google/registry/monitoring/blackbox/message/login.xml b/prober/src/main/resources/google/registry/monitoring/blackbox/message/login.xml index b4c72cd61dc..a0e87ff5426 100644 --- 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,7 +10,6 @@ urn:ietf:params:xml:ns:domain-1.0 - urn:ietf:params:xml:ns:contact-1.0 urn:ietf:params:xml:ns:host-1.0 urn:ietf:params:xml:ns:launch-1.0