Remove Tld.allowedRegistrantContactIds field (#2867)

We no longer need this now that no contacts can be applied to any domains at all. A follow-up PR in subsequent weeks will delete the column from the DB schema. BUG= http://b/448619572
2026-01-08 15:21:46 +00:00 · 2025-10-31 11:52:10 -04:00
parent d9349be18e
commit 847ef12a4f
23 changed files with 0 additions and 151 deletions
--- a/core/src/main/java/google/registry/config/files/tld/example.yaml
+++ b/core/src/main/java/google/registry/config/files/tld/example.yaml
@@ -5,7 +5,6 @@

 addGracePeriodLength: "PT432000S"
 allowedFullyQualifiedHostNames: []
-allowedRegistrantContactIds: []
 anchorTenantAddGracePeriodLength: "PT2592000S"
 autoRenewGracePeriodLength: "PT3888000S"
 automaticTransferLength: "PT432000S"
--- a/core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java
+++ b/core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java
@@ -195,7 +195,6 @@ import org.joda.time.Duration;
 * @error {@link DomainFlowUtils.NameserversNotAllowedForTldException}
 * @error {@link DomainFlowUtils.NameserversNotSpecifiedForTldWithNameserverAllowListException}
 * @error {@link DomainFlowUtils.PremiumNameBlockedException}
- * @error {@link DomainFlowUtils.RegistrantNotAllowedException}
 * @error {@link RegistrantProhibitedException}
 * @error {@link DomainFlowUtils.RegistrarMustBeActiveForThisOperationException}
 * @error {@link DomainFlowUtils.TldDoesNotExistException}
--- a/core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java
+++ b/core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java
@@ -553,17 +553,6 @@ public class DomainFlowUtils {
    }
  }

-  static void validateRegistrantAllowedOnTld(String tld, Optional<String> registrantContactId)
-      throws RegistrantNotAllowedException {
-    ImmutableSet<String> allowedRegistrants = Tld.get(tld).getAllowedRegistrantContactIds();
-    // Empty allow list or null registrantContactId are ignored.
-    if (registrantContactId.isPresent()
-        && !allowedRegistrants.isEmpty()
-        && !allowedRegistrants.contains(registrantContactId.get())) {
-      throw new RegistrantNotAllowedException(registrantContactId.get());
-    }
-  }
-
  static void validateNameserversAllowedOnTld(String tld, Set<String> fullyQualifiedHostNames)
      throws EppException {
    ImmutableSet<String> allowedHostNames = Tld.get(tld).getAllowedFullyQualifiedHostNames();
@@ -1091,7 +1080,6 @@ public class DomainFlowUtils {
        command.getContacts(), command.getRegistrant(), command.getNameservers());
    validateContactsHaveTypes(command.getContacts());
    String tldStr = tld.getTldStr();
-    validateRegistrantAllowedOnTld(tldStr, command.getRegistrantContactId());
    validateNoDuplicateContacts(command.getContacts());
    validateCreateContactData(command.getRegistrant(), command.getContacts());
    ImmutableSet<String> hostNames = command.getNameserverHostNames();
@@ -1630,13 +1618,6 @@ public class DomainFlowUtils {
    }
  }

-  /** Registrant is not allow-listed for this TLD. */
-  public static class RegistrantNotAllowedException extends StatusProhibitsOperationException {
-    public RegistrantNotAllowedException(String contactId) {
-      super(String.format("Registrant with id %s is not allow-listed for this TLD", contactId));
-    }
-  }
-
  /** Nameservers are not allow-listed for this TLD. */
  public static class NameserversNotAllowedForTldException
      extends StatusProhibitsOperationException {
--- a/core/src/main/java/google/registry/flows/domain/DomainUpdateFlow.java
+++ b/core/src/main/java/google/registry/flows/domain/DomainUpdateFlow.java
@@ -36,7 +36,6 @@ import static google.registry.flows.domain.DomainFlowUtils.validateFeesAckedIfPr
 import static google.registry.flows.domain.DomainFlowUtils.validateNameserversAllowedOnTld;
 import static google.registry.flows.domain.DomainFlowUtils.validateNameserversCountForTld;
 import static google.registry.flows.domain.DomainFlowUtils.validateNoDuplicateContacts;
-import static google.registry.flows.domain.DomainFlowUtils.validateRegistrantAllowedOnTld;
 import static google.registry.flows.domain.DomainFlowUtils.validateUpdateContactData;
 import static google.registry.flows.domain.DomainFlowUtils.verifyClientUpdateNotProhibited;
 import static google.registry.flows.domain.DomainFlowUtils.verifyNotInPendingDelete;
@@ -131,7 +130,6 @@ import org.joda.time.DateTime;
 * @error {@link DomainFlowUtils.NameserversNotAllowedForTldException}
 * @error {@link NameserversNotSpecifiedForTldWithNameserverAllowListException}
 * @error {@link DomainFlowUtils.NotAuthorizedForTldException}
- * @error {@link DomainFlowUtils.RegistrantNotAllowedException}
 * @error {@link RegistrantProhibitedException}
 * @error {@link DomainFlowUtils.SecDnsAllUsageException}
 * @error {@link DomainFlowUtils.TooManyDsRecordsException}
@@ -248,7 +246,6 @@ public final class DomainUpdateFlow implements MutatingFlow {
        add.getNameservers());
    validateContactsHaveTypes(add.getContacts());
    validateContactsHaveTypes(remove.getContacts());
-    validateRegistrantAllowedOnTld(tldStr, command.getInnerChange().getRegistrantContactId());
    validateNameserversAllowedOnTld(tldStr, add.getNameserverHostNames());
  }

--- a/core/src/main/java/google/registry/model/tld/Tld.java
+++ b/core/src/main/java/google/registry/model/tld/Tld.java
@@ -521,11 +521,6 @@ public class Tld extends ImmutableObject implements Buildable, UnsafeSerializabl
  @Column(nullable = false)
  DateTime claimsPeriodEnd = END_OF_TIME;

-  /** An allowlist of clients allowed to be used on domains on this TLD (ignored if empty). */
-  @Nullable
-  @JsonSerialize(using = SortedSetSerializer.class)
-  Set<String> allowedRegistrantContactIds;
-
  /** An allowlist of hosts allowed to be used on domains on this TLD (ignored if empty). */
  @Nullable
  @JsonSerialize(using = SortedSetSerializer.class)
@@ -786,10 +781,6 @@ public class Tld extends ImmutableObject implements Buildable, UnsafeSerializabl
    return tldUnicode;
  }

-  public ImmutableSet<String> getAllowedRegistrantContactIds() {
-    return nullToEmptyImmutableCopy(allowedRegistrantContactIds);
-  }
-
  public ImmutableSet<String> getAllowedFullyQualifiedHostNames() {
    return nullToEmptyImmutableCopy(allowedFullyQualifiedHostNames);
  }
@@ -1077,12 +1068,6 @@ public class Tld extends ImmutableObject implements Buildable, UnsafeSerializabl
      return this;
    }

-    public Builder setAllowedRegistrantContactIds(
-        ImmutableSet<String> allowedRegistrantContactIds) {
-      getInstance().allowedRegistrantContactIds = allowedRegistrantContactIds;
-      return this;
-    }
-
    public Builder setAllowedFullyQualifiedHostNames(
        ImmutableSet<String> allowedFullyQualifiedHostNames) {
      getInstance().allowedFullyQualifiedHostNames = allowedFullyQualifiedHostNames;
--- a/core/src/test/java/google/registry/flows/domain/DomainCreateFlowTest.java
+++ b/core/src/test/java/google/registry/flows/domain/DomainCreateFlowTest.java
@@ -133,7 +133,6 @@ import google.registry.flows.domain.DomainFlowUtils.NameserversNotAllowedForTldE
 import google.registry.flows.domain.DomainFlowUtils.NameserversNotSpecifiedForTldWithNameserverAllowListException;
 import google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException;
 import google.registry.flows.domain.DomainFlowUtils.PremiumNameBlockedException;
-import google.registry.flows.domain.DomainFlowUtils.RegistrantNotAllowedException;
 import google.registry.flows.domain.DomainFlowUtils.RegistrantProhibitedException;
 import google.registry.flows.domain.DomainFlowUtils.RegistrarMustBeActiveForThisOperationException;
 import google.registry.flows.domain.DomainFlowUtils.TldDoesNotExistException;
@@ -2839,20 +2838,6 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
-  void testFailure_registrantNotAllowListed() {
-    persistActiveContact("someone");
-    persistContactsAndHosts();
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setAllowedRegistrantContactIds(ImmutableSet.of("someone"))
-            .build());
-    RegistrantNotAllowedException thrown =
-        assertThrows(RegistrantNotAllowedException.class, this::runFlow);
-    assertThat(thrown).hasMessageThat().contains("jd1234");
-  }
-
  @Test
  void testFailure_nameserverNotAllowListed() {
    persistContactsAndHosts();
@@ -2881,19 +2866,6 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
-  void testSuccess_nameserverAndRegistrantAllowListed() throws Exception {
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setAllowedRegistrantContactIds(ImmutableSet.of("jd1234"))
-            .setAllowedFullyQualifiedHostNames(
-                ImmutableSet.of("ns1.example.net", "ns2.example.net"))
-            .build());
-    persistContactsAndHosts();
-    doSuccessfulTest();
-  }
-
  @Test
  void testFailure_eapFee_combined() {
    setEppInput("domain_create_eap_combined_fee.xml", ImmutableMap.of("FEE_VERSION", "0.6"));
--- a/core/src/test/java/google/registry/flows/domain/DomainUpdateFlowTest.java
+++ b/core/src/test/java/google/registry/flows/domain/DomainUpdateFlowTest.java
@@ -89,7 +89,6 @@ import google.registry.flows.domain.DomainFlowUtils.MissingTechnicalContactExcep
 import google.registry.flows.domain.DomainFlowUtils.NameserversNotAllowedForTldException;
 import google.registry.flows.domain.DomainFlowUtils.NameserversNotSpecifiedForTldWithNameserverAllowListException;
 import google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException;
-import google.registry.flows.domain.DomainFlowUtils.RegistrantNotAllowedException;
 import google.registry.flows.domain.DomainFlowUtils.RegistrantProhibitedException;
 import google.registry.flows.domain.DomainFlowUtils.SecDnsAllUsageException;
 import google.registry.flows.domain.DomainFlowUtils.TooManyDsRecordsException;
@@ -1713,20 +1712,6 @@ class DomainUpdateFlowTest extends ResourceFlowTestCase<DomainUpdateFlow, Domain
    assertThat(thrown).hasMessageThat().contains("ns2.example.foo");
  }

-  @Test
-  void testFailure_newRegistrantNotAllowListed() throws Exception {
-    persistReferencedEntities();
-    persistDomain();
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setAllowedRegistrantContactIds(ImmutableSet.of("contact1234"))
-            .build());
-    clock.advanceOneMilli();
-    EppException thrown = assertThrows(RegistrantNotAllowedException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
  @Test
  void testFailure_addedNameserverDisallowedInTld() throws Exception {
    persistReferencedEntities();
@@ -1742,44 +1727,6 @@ class DomainUpdateFlowTest extends ResourceFlowTestCase<DomainUpdateFlow, Domain
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
-  void testSuccess_newNameserverAllowListed() throws Exception {
-    setEppInput("domain_update_add_nameserver.xml");
-    persistReferencedEntities();
-    persistDomain();
-    // No registrant is given but both nameserver and registrant allow list exist.
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setAllowedRegistrantContactIds(ImmutableSet.of("sh8013"))
-            .setAllowedFullyQualifiedHostNames(
-                ImmutableSet.of("ns1.example.foo", "ns2.example.foo"))
-            .build());
-    assertThat(reloadResourceByForeignKey().getNameservers())
-        .doesNotContain(
-            loadResource(Host.class, "ns2.example.foo", clock.nowUtc()).get().createVKey());
-    runFlow();
-    assertThat(reloadResourceByForeignKey().getNameservers())
-        .contains(loadResource(Host.class, "ns2.example.foo", clock.nowUtc()).get().createVKey());
-  }
-
-  @Test
-  void testSuccess_changeRegistrantAllowListed() throws Exception {
-    setEppInput("domain_update_registrant.xml");
-    persistReferencedEntities();
-    persistDomain();
-    // Only changes registrant, with both nameserver and registrant allow list on the TLD.
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setAllowedRegistrantContactIds(ImmutableSet.of("sh8013"))
-            .setAllowedFullyQualifiedHostNames(ImmutableSet.of("ns1.example.foo"))
-            .build());
-    runFlow();
-    assertThat(loadByKey(reloadResourceByForeignKey().getRegistrant().get()).getContactId())
-        .isEqualTo("sh8013");
-  }
-
  @Test
  void testSuccess_changeContactsAndRegistrant() throws Exception {
    setEppInput("domain_update_contacts_and_registrant.xml");
@@ -1805,19 +1752,6 @@ class DomainUpdateFlowTest extends ResourceFlowTestCase<DomainUpdateFlow, Domain
        .isEqualTo("sh8013");
  }

-  @Test
-  void testSuccess_nameserverAndRegistrantAllowListed() throws Exception {
-    persistReferencedEntities();
-    persistDomain();
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setAllowedRegistrantContactIds(ImmutableSet.of("sh8013"))
-            .setAllowedFullyQualifiedHostNames(ImmutableSet.of("ns2.example.foo"))
-            .build());
-    doSuccessfulTest();
-  }
-
  @Test
  void testSuccess_tldWithNameserverAllowList_removeNameserver() throws Exception {
    setEppInput("domain_update_remove_nameserver.xml");
--- a/core/src/test/java/google/registry/model/tld/TldTest.java
+++ b/core/src/test/java/google/registry/model/tld/TldTest.java
@@ -186,7 +186,6 @@ public final class TldTest extends EntityTestCase {
            "dnsWriters",
            "idnTables",
            "reservedListNames",
-            "allowedRegistrantContactIds",
            "allowedFullyQualifiedHostNames",
            "defaultPromoTokens");
    assertThat(constructedTld.getDnsWriters())
@@ -194,8 +193,6 @@ public final class TldTest extends EntityTestCase {
    assertThat(constructedTld.getIdnTables()).containsExactlyElementsIn(existingTld.getIdnTables());
    assertThat(constructedTld.getReservedListNames())
        .containsExactlyElementsIn(existingTld.getReservedListNames());
-    assertThat(constructedTld.getAllowedRegistrantContactIds())
-        .containsExactlyElementsIn(existingTld.getAllowedRegistrantContactIds());
    assertThat(constructedTld.getAllowedFullyQualifiedHostNames())
        .containsExactlyElementsIn(existingTld.getAllowedFullyQualifiedHostNames());
    assertThat(constructedTld.getDefaultPromoTokens())
--- a/core/src/test/resources/google/registry/model/tld/tld.yaml
+++ b/core/src/test/resources/google/registry/model/tld/tld.yaml
@@ -1,7 +1,6 @@
 addGracePeriodLength: "PT432000S"
 allowedFullyQualifiedHostNames:
 - "foo"
-allowedRegistrantContactIds: []
 anchorTenantAddGracePeriodLength: "PT2592000S"
 autoRenewGracePeriodLength: "PT3888000S"
 automaticTransferLength: "PT432000S"
--- a/core/src/test/resources/google/registry/tools/1tld.yaml
+++ b/core/src/test/resources/google/registry/tools/1tld.yaml
@@ -1,6 +1,5 @@
 addGracePeriodLength: "PT2592000S"
 allowedFullyQualifiedHostNames: []
-allowedRegistrantContactIds: []
 anchorTenantAddGracePeriodLength: "PT2592000S"
 autoRenewGracePeriodLength: "PT2592000S"
 automaticTransferLength: "PT2592000S"
--- a/core/src/test/resources/google/registry/tools/badidn.yaml
+++ b/core/src/test/resources/google/registry/tools/badidn.yaml
@@ -1,6 +1,5 @@
 addGracePeriodLength: "PT2592000S"
 allowedFullyQualifiedHostNames: []
-allowedRegistrantContactIds: []
 anchorTenantAddGracePeriodLength: "PT2592000S"
 autoRenewGracePeriodLength: "PT2592000S"
 automaticTransferLength: "PT2592000S"
--- a/core/src/test/resources/google/registry/tools/badunicode.yaml
+++ b/core/src/test/resources/google/registry/tools/badunicode.yaml
@@ -1,6 +1,5 @@
 addGracePeriodLength: "PT2592000S"
 allowedFullyQualifiedHostNames: []
-allowedRegistrantContactIds: []
 anchorTenantAddGracePeriodLength: "PT2592000S"
 autoRenewGracePeriodLength: "PT2592000S"
 automaticTransferLength: "PT2592000S"
--- a/core/src/test/resources/google/registry/tools/diffcostmap.yaml
+++ b/core/src/test/resources/google/registry/tools/diffcostmap.yaml
@@ -1,6 +1,5 @@
 addGracePeriodLength: "PT432000S"
 allowedFullyQualifiedHostNames: []
-allowedRegistrantContactIds: []
 anchorTenantAddGracePeriodLength: "PT2592000S"
 autoRenewGracePeriodLength: "PT3888000S"
 automaticTransferLength: "PT432000S"
--- a/core/src/test/resources/google/registry/tools/extrafield.yaml
+++ b/core/src/test/resources/google/registry/tools/extrafield.yaml
@@ -1,6 +1,5 @@
 addGracePeriodLength: "PT2592000S"
 allowedFullyQualifiedHostNames: []
-allowedRegistrantContactIds: []
 anchorTenantAddGracePeriodLength: "PT2592000S"
 autoRenewGracePeriodLength: "PT2592000S"
 automaticTransferLength: "PT2592000S"
--- a/core/src/test/resources/google/registry/tools/idns.yaml
+++ b/core/src/test/resources/google/registry/tools/idns.yaml
@@ -4,7 +4,6 @@ allowedFullyQualifiedHostNames:
 - "beta"
 - "gamma"
 - "zeta"
-allowedRegistrantContactIds: []
 anchorTenantAddGracePeriodLength: "PT2592000S"
 autoRenewGracePeriodLength: "PT3888000S"
 automaticTransferLength: "PT432000S"
--- a/core/src/test/resources/google/registry/tools/jpy.yaml
+++ b/core/src/test/resources/google/registry/tools/jpy.yaml
@@ -1,6 +1,5 @@
 addGracePeriodLength: "PT432000S"
 allowedFullyQualifiedHostNames: []
-allowedRegistrantContactIds: []
 anchorTenantAddGracePeriodLength: "PT2592000S"
 autoRenewGracePeriodLength: "PT3888000S"
 automaticTransferLength: "PT432000S"
--- a/core/src/test/resources/google/registry/tools/missingnullablefields.yaml
+++ b/core/src/test/resources/google/registry/tools/missingnullablefields.yaml
@@ -1,6 +1,5 @@
 addGracePeriodLength: "PT2592000S"
 allowedFullyQualifiedHostNames: []
-allowedRegistrantContactIds: []
 anchorTenantAddGracePeriodLength: "PT2592000S"
 automaticTransferLength: "PT2592000S"
 autoRenewGracePeriodLength: "PT2592000S"
--- a/core/src/test/resources/google/registry/tools/nullablefieldsallnull.yaml
+++ b/core/src/test/resources/google/registry/tools/nullablefieldsallnull.yaml
@@ -46,7 +46,6 @@ renewBillingCostTransitions:
    amount: 11.00
 lordnUsername: null
 claimsPeriodEnd: "294247-01-10T04:00:54.775Z"
-allowedRegistrantContactIds: null
 allowedFullyQualifiedHostNames: null
 defaultPromoTokens: null
 idnTables: null
--- a/core/src/test/resources/google/registry/tools/outoforderfields.yaml
+++ b/core/src/test/resources/google/registry/tools/outoforderfields.yaml
@@ -42,7 +42,6 @@ renewBillingCostTransitions:
    amount: 11.00
 lordnUsername: null
 claimsPeriodEnd: "294247-01-10T04:00:54.775Z"
-allowedRegistrantContactIds: []
 allowedFullyQualifiedHostNames: []
 defaultPromoTokens: []
 idnTables: []
--- a/core/src/test/resources/google/registry/tools/tld.yaml
+++ b/core/src/test/resources/google/registry/tools/tld.yaml
@@ -1,6 +1,5 @@
 addGracePeriodLength: "PT432000S"
 allowedFullyQualifiedHostNames: []
-allowedRegistrantContactIds: []
 anchorTenantAddGracePeriodLength: "PT2592000S"
 autoRenewGracePeriodLength: "PT3888000S"
 automaticTransferLength: "PT432000S"
--- a/core/src/test/resources/google/registry/tools/wildcard.yaml
+++ b/core/src/test/resources/google/registry/tools/wildcard.yaml
@@ -1,6 +1,5 @@
 addGracePeriodLength: "PT432000S"
 allowedFullyQualifiedHostNames: []
-allowedRegistrantContactIds: []
 anchorTenantAddGracePeriodLength: "PT2592000S"
 autoRenewGracePeriodLength: "PT3888000S"
 automaticTransferLength: "PT432000S"
--- a/core/src/test/resources/google/registry/tools/wrongcurrency.yaml
+++ b/core/src/test/resources/google/registry/tools/wrongcurrency.yaml
@@ -46,7 +46,6 @@ renewBillingCostTransitions:
    amount: 11.00
 lordnUsername: null
 claimsPeriodEnd: "294247-01-10T04:00:54.775Z"
-allowedRegistrantContactIds: []
 allowedFullyQualifiedHostNames: []
 defaultPromoTokens: []
 idnTables: []
--- a/db/src/main/resources/sql/schema/db-schema.sql.generated
+++ b/db/src/main/resources/sql/schema/db-schema.sql.generated
@@ -763,7 +763,6 @@
        tld_name text not null,
        add_grace_period_length interval not null,
        allowed_fully_qualified_host_names text[],
-        allowed_registrant_contact_ids text[],
        anchor_tenant_add_grace_period_length interval not null,
        auto_renew_grace_period_length interval not null,
        automatic_transfer_length interval not null,