From 7fc61974a30f87829646fc8b311fd6146d37a86a Mon Sep 17 00:00:00 2001 From: gbrodman Date: Wed, 30 Sep 2026 00:14:44 +0000 Subject: [PATCH] Remove OT&E account creation domain restriction (#3242) we implemented this in https://github.com/google/nomulus/pull/3178/ as part of the security changes but as it turns out, we'll still want to use @registry.google email addresses in sandbox as well --- .../ui/server/console/ConsoleOteAction.java | 7 ------- .../server/console/ConsoleOteActionTest.java | 19 ------------------- 2 files changed, 26 deletions(-) diff --git a/core/src/main/java/google/registry/ui/server/console/ConsoleOteAction.java b/core/src/main/java/google/registry/ui/server/console/ConsoleOteAction.java index 301f49182..3e9dd2e56 100644 --- a/core/src/main/java/google/registry/ui/server/console/ConsoleOteAction.java +++ b/core/src/main/java/google/registry/ui/server/console/ConsoleOteAction.java @@ -64,7 +64,6 @@ public class ConsoleOteAction extends ConsoleApiAction { private final Optional oteCreateData; private final Optional maybeGroupEmailAddress; private final Optional consoleIapServiceId; - private final String gSuiteDomainName; private final String registrarId; @Inject @@ -75,7 +74,6 @@ public class ConsoleOteAction extends ConsoleApiAction { @Parameter("oteCreateData") Optional oteCreateData, @Config("gSuiteConsoleUserGroupEmailAddress") Optional maybeGroupEmailAddress, @Config("consoleIapServiceId") Optional consoleIapServiceId, - @Config("gSuiteDomainName") String gSuiteDomainName, @Parameter("registrarId") String registrarId) { super(consoleApiParams); this.iamClient = iamClient; @@ -83,7 +81,6 @@ public class ConsoleOteAction extends ConsoleApiAction { this.oteCreateData = oteCreateData; this.maybeGroupEmailAddress = maybeGroupEmailAddress; this.consoleIapServiceId = consoleIapServiceId; - this.gSuiteDomainName = gSuiteDomainName; this.registrarId = registrarId; } @@ -101,10 +98,6 @@ public class ConsoleOteAction extends ConsoleApiAction { && !this.oteCreateData.get().registrarId.isEmpty() && !this.oteCreateData.get().registrarEmail.isEmpty(); checkArgument(isBodyValid, "OT&E create body is invalid"); - checkArgument( - this.oteCreateData.get().registrarEmail.endsWith("@" + gSuiteDomainName), - "Email address must exist in the %s domain", - gSuiteDomainName); String password = passwordGenerator.createString(PASSWORD_LENGTH); diff --git a/core/src/test/java/google/registry/ui/server/console/ConsoleOteActionTest.java b/core/src/test/java/google/registry/ui/server/console/ConsoleOteActionTest.java index 6091b23e2..465ee9cb1 100644 --- a/core/src/test/java/google/registry/ui/server/console/ConsoleOteActionTest.java +++ b/core/src/test/java/google/registry/ui/server/console/ConsoleOteActionTest.java @@ -203,24 +203,6 @@ class ConsoleOteActionTest extends ConsoleActionBaseTestCase { ImmutableList.of("domain creates idn", "domain restores", "host deletes")); } - @Test - void testFailure_invalidEmailDomain() { - AuthResult authResult = AuthResult.createUser(fteUser); - consoleApiParams = ConsoleApiParamsUtils.createFake(authResult); - ConsoleOteAction action = - createAction( - Action.Method.POST, - authResult, - "theregistrar", - Optional.of("someRandomString@email.test"), - Optional.of(new OteCreateData("theregistrar", "contact@invalid.com"))); - action.cloudTasksUtils = cloudTasksHelper.getTestCloudTasksUtils(); - action.run(); - assertThat(response.getStatus()).isEqualTo(SC_BAD_REQUEST); - assertThat(response.getPayload()) - .isEqualTo("Email address must exist in the registry.example domain"); - } - private ConsoleOteAction createAction( Action.Method method, AuthResult authResult, @@ -237,7 +219,6 @@ class ConsoleOteActionTest extends ConsoleActionBaseTestCase { oteCreateData, maybeGroupEmailAddress, Optional.of("consoleIapServiceId"), - "registry.example", registrarId); } }