diff --git a/core/src/main/java/google/registry/ui/server/registrar/RegistrarSettingsAction.java b/core/src/main/java/google/registry/ui/server/registrar/RegistrarSettingsAction.java index 7694cc51a..b999fdca4 100644 --- a/core/src/main/java/google/registry/ui/server/registrar/RegistrarSettingsAction.java +++ b/core/src/main/java/google/registry/ui/server/registrar/RegistrarSettingsAction.java @@ -336,10 +336,7 @@ public class RegistrarSettingsAction implements Runnable, JsonActionRunner.JsonA */ private boolean validateCertificate(String existingCertificate, String certificateString) { if ((existingCertificate == null) || !existingCertificate.equals(certificateString)) { - // TODO(sarhabot): remove this check after November 1, 2020 - if (tm().getTransactionTime().isAfter(DateTime.parse("2020-11-01T00:00:00Z"))) { certificateChecker.validateCertificate(certificateString); - } return true; } return false; diff --git a/core/src/test/java/google/registry/ui/server/registrar/RegistrarSettingsActionTest.java b/core/src/test/java/google/registry/ui/server/registrar/RegistrarSettingsActionTest.java index 2c9b1dd70..e5293da5d 100644 --- a/core/src/test/java/google/registry/ui/server/registrar/RegistrarSettingsActionTest.java +++ b/core/src/test/java/google/registry/ui/server/registrar/RegistrarSettingsActionTest.java @@ -376,84 +376,6 @@ class RegistrarSettingsActionTest extends RegistrarSettingsActionTestCase { (builder, s) -> builder.setClientCertificate(s, clock.nowUtc())); } - @Test - void testUpdate_clientCertificateWithViolationsBeforeNovemberSucceeds() { - // TODO(sarahbot): remove this test after November 1, 2020. - clock.setTo(DateTime.parse("2018-07-02T00:00:00Z")); - doTestUpdate( - Role.OWNER, - Registrar::getClientCertificate, - CertificateSamples.SAMPLE_CERT, - (builder, s) -> builder.setClientCertificate(s, clock.nowUtc())); - } - - @Test - void testUpdate_otherFieldsWhenClientCertificateWithViolationsAlreadyExistedSucceeds() { - // TODO(sarahbot): remove this test after November 1, 2020. - - // The frontend will always send the entire registrar entity back for an update, so the checks - // on the certificate should only run if a new certificate is being uploaded. All other updates - // after November 1st should still succeed even if a bad certificate is stored. - - // Set a bad certificate before checks on uploads are enforced - clock.setTo(DateTime.parse("2018-07-02T00:00:00Z")); - Registrar existingRegistrar = loadRegistrar(CLIENT_ID); - existingRegistrar = - existingRegistrar - .asBuilder() - .setClientCertificate(CertificateSamples.SAMPLE_CERT, clock.nowUtc()) - .build(); - persistResource(existingRegistrar); - - // Update the other registrar fields after enforcement begins should succeed - clock.setTo(DateTime.parse("2020-11-02T00:00:00Z")); - Map args = Maps.newHashMap(loadRegistrar(CLIENT_ID).toJsonMap()); - args.put("url", "test.url"); - args.put("phoneNumber", "+1.1234567890"); - Map response = - action.handleJsonRequest( - ImmutableMap.of( - "op", "update", - "id", CLIENT_ID, - "args", args)); - - assertThat(response).containsEntry("status", "SUCCESS"); - assertMetric(CLIENT_ID, "update", "[OWNER]", "SUCCESS"); - } - - @Test - void testUpdate_clientCertificateWithViolationsAlreadyExistedSucceeds() { - // TODO(sarahbot): remove this test after November 1, 2020. - - // The frontend will always send the entire registrar entity back for an update, so the checks - // on the certificate should only run if it is a new certificate - - // Set a bad certificate before checks on uploads are enforced - clock.setTo(DateTime.parse("2018-07-02T00:00:00Z")); - Registrar existingRegistrar = loadRegistrar(CLIENT_ID); - existingRegistrar = - existingRegistrar - .asBuilder() - .setClientCertificate(CertificateSamples.SAMPLE_CERT, clock.nowUtc()) - .build(); - persistResource(existingRegistrar); - - // Update with the same certificate after enforcement starts - clock.setTo(DateTime.parse("2020-11-02T00:00:00Z")); - Map args = Maps.newHashMap(loadRegistrar(CLIENT_ID).toJsonMap()); - args.put("clientCertificate", CertificateSamples.SAMPLE_CERT); - Map response = - action.handleJsonRequest( - ImmutableMap.of( - "op", "update", - "id", CLIENT_ID, - "args", args)); - - assertThat(response).containsEntry("status", "SUCCESS"); - assertMetric(CLIENT_ID, "update", "[OWNER]", "SUCCESS"); - assertNoTasksEnqueued("sheet"); - } - @Test void testUpdate_clientCertificateWithViolationsFails() { clock.setTo(DateTime.parse("2020-11-02T00:00:00Z"));