mirror of
https://github.com/google/nomulus.git
synced 2025-08-03 00:12:11 +02:00
Add an action to check the status of OT&E verification
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=228333195
This commit is contained in:
Shicong Huang
parent
c3de49130a
commit
a79e254e49
9 changed files with 346 additions and 10 deletions
|
|
@ -299,4 +299,53 @@ public final class OteAccountBuilderTest {
|
|||
assertContactExists("myclientid-3", "other@example.com");
|
||||
assertContactExists("myclientid-3", "email@example.com");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCreateClientIdToTldMap_validEntries() {
|
||||
assertThat(OteAccountBuilder.createClientIdToTldMap("myclientid"))
|
||||
.containsExactly(
|
||||
"myclientid-1", "myclientid-sunrise",
|
||||
"myclientid-2", "myclientid-landrush",
|
||||
"myclientid-3", "myclientid-ga",
|
||||
"myclientid-4", "myclientid-ga",
|
||||
"myclientid-5", "myclientid-eap");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCreateClientIdToTldMap_invalidId() {
|
||||
IllegalArgumentException exception =
|
||||
assertThrows(
|
||||
IllegalArgumentException.class, () -> OteAccountBuilder.createClientIdToTldMap("a"));
|
||||
assertThat(exception).hasMessageThat().isEqualTo("Invalid registrar name: a");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetBaseClientId_validOteId() {
|
||||
assertThat(OteAccountBuilder.getBaseClientId("myclientid-4")).isEqualTo("myclientid");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetBaseClientId_multipleDashesValid() {
|
||||
assertThat(OteAccountBuilder.getBaseClientId("two-dashes-3")).isEqualTo("two-dashes");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetBaseClientId_invalidInput_malformed() {
|
||||
assertThat(
|
||||
assertThrows(
|
||||
IllegalArgumentException.class,
|
||||
() -> OteAccountBuilder.getBaseClientId("myclientid")))
|
||||
.hasMessageThat()
|
||||
.isEqualTo("Invalid OT&E client ID: myclientid");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetBaseClientId_invalidInput_wrongForBase() {
|
||||
assertThat(
|
||||
assertThrows(
|
||||
IllegalArgumentException.class,
|
||||
() -> OteAccountBuilder.getBaseClientId("myclientid-7")))
|
||||
.hasMessageThat()
|
||||
.isEqualTo("ID myclientid-7 is not one of the OT&E client IDs for base myclientid");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
PATH CLASS METHODS OK AUTH_METHODS MIN USER_POLICY
|
||||
/_dr/epp EppTlsAction POST n INTERNAL,API APP PUBLIC
|
||||
/registrar ConsoleUiAction GET n INTERNAL,API,LEGACY NONE PUBLIC
|
||||
/registrar-ote-setup ConsoleOteSetupAction POST,GET n INTERNAL,API,LEGACY NONE PUBLIC
|
||||
/registrar-settings RegistrarSettingsAction POST n API,LEGACY USER PUBLIC
|
||||
/registrar-xhr EppConsoleAction POST n API,LEGACY USER PUBLIC
|
||||
PATH CLASS METHODS OK AUTH_METHODS MIN USER_POLICY
|
||||
/_dr/epp EppTlsAction POST n INTERNAL,API APP PUBLIC
|
||||
/registrar ConsoleUiAction GET n INTERNAL,API,LEGACY NONE PUBLIC
|
||||
/registrar-ote-setup ConsoleOteSetupAction POST,GET n INTERNAL,API,LEGACY NONE PUBLIC
|
||||
/registrar-ote-status OteStatusAction POST n API,LEGACY USER PUBLIC
|
||||
/registrar-settings RegistrarSettingsAction POST n API,LEGACY USER PUBLIC
|
||||
/registrar-xhr EppConsoleAction POST n API,LEGACY USER PUBLIC
|
||||
|
|
|
|||
|
|
@ -701,7 +701,7 @@ public class DatastoreHelper {
|
|||
|
||||
/** Persists and returns a {@link Registrar} with the specified attributes. */
|
||||
public static Registrar persistNewRegistrar(
|
||||
String clientId, String registrarName, Registrar.Type type, long ianaIdentifier) {
|
||||
String clientId, String registrarName, Registrar.Type type, @Nullable Long ianaIdentifier) {
|
||||
return persistSimpleResource(
|
||||
new Registrar.Builder()
|
||||
.setClientId(clientId)
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ java_library(
|
|||
"//java/google/registry/ui/server",
|
||||
"//java/google/registry/ui/server/registrar",
|
||||
"//java/google/registry/util",
|
||||
"//javatests/google/registry/model",
|
||||
"//javatests/google/registry/security",
|
||||
"//javatests/google/registry/testing",
|
||||
"//third_party/objectify:objectify-v4_1",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,149 @@
|
|||
// Copyright 2019 The Nomulus Authors. All Rights Reserved.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package google.registry.ui.server.registrar;
|
||||
|
||||
import static com.google.common.collect.ImmutableList.toImmutableList;
|
||||
import static com.google.common.collect.ImmutableSetMultimap.toImmutableSetMultimap;
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static google.registry.testing.DatastoreHelper.persistNewRegistrar;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.common.collect.ImmutableSetMultimap;
|
||||
import com.google.common.collect.Iterables;
|
||||
import google.registry.model.OteAccountBuilder;
|
||||
import google.registry.model.OteStats.StatType;
|
||||
import google.registry.model.OteStatsTestHelper;
|
||||
import google.registry.model.registrar.Registrar.Type;
|
||||
import google.registry.request.auth.AuthenticatedRegistrarAccessor;
|
||||
import google.registry.request.auth.AuthenticatedRegistrarAccessor.Role;
|
||||
import google.registry.testing.AppEngineRule;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.function.Function;
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.junit.runners.JUnit4;
|
||||
|
||||
/** Unit tests for {@link OteStatusAction} */
|
||||
@RunWith(JUnit4.class)
|
||||
public final class OteStatusActionTest {
|
||||
|
||||
private static final String CLIENT_ID = "blobio-1";
|
||||
private static final String BASE_CLIENT_ID = "blobio";
|
||||
|
||||
private final OteStatusAction action = new OteStatusAction();
|
||||
|
||||
@Rule public final AppEngineRule appEngine = AppEngineRule.builder().withDatastore().build();
|
||||
|
||||
@Before
|
||||
public void init() throws Exception {
|
||||
OteStatsTestHelper.setupHistoryEntries();
|
||||
persistNewRegistrar(CLIENT_ID, "SomeRegistrar", Type.OTE, null);
|
||||
|
||||
ImmutableSetMultimap<String, Role> authValues =
|
||||
OteAccountBuilder.createClientIdToTldMap("blobio").keySet().stream()
|
||||
.collect(toImmutableSetMultimap(Function.identity(), ignored -> Role.OWNER));
|
||||
action.registrarAccessor = AuthenticatedRegistrarAccessor.createForTesting(authValues);
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
public void testSuccess_finishedOte() {
|
||||
Map<String, ?> actionResult = action.handleJsonRequest(ImmutableMap.of("clientId", CLIENT_ID));
|
||||
assertThat(actionResult).containsEntry("status", "SUCCESS");
|
||||
assertThat(actionResult).containsEntry("message", "OT&E check completed successfully");
|
||||
Map<String, ?> results =
|
||||
Iterables.getOnlyElement((List<Map<String, ?>>) actionResult.get("results"));
|
||||
assertThat(results).containsEntry("clientId", BASE_CLIENT_ID);
|
||||
assertThat(results).containsEntry("completed", true);
|
||||
assertThat(getFailingResultDetails(results)).isEmpty();
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
public void testSuccess_unfinishedOte() {
|
||||
OteStatsTestHelper.deleteHostDeleteHistoryEntry();
|
||||
|
||||
Map<String, ?> actionResult = action.handleJsonRequest(ImmutableMap.of("clientId", CLIENT_ID));
|
||||
assertThat(actionResult).containsEntry("status", "SUCCESS");
|
||||
assertThat(actionResult).containsEntry("message", "OT&E check completed successfully");
|
||||
Map<String, ?> results =
|
||||
Iterables.getOnlyElement((List<Map<String, ?>>) actionResult.get("results"));
|
||||
assertThat(results).containsEntry("clientId", BASE_CLIENT_ID);
|
||||
assertThat(results).containsEntry("completed", false);
|
||||
assertThat(getFailingResultDetails(results))
|
||||
.containsExactly(
|
||||
ImmutableMap.of(
|
||||
"description", StatType.HOST_DELETES.getDescription(),
|
||||
"requirement", StatType.HOST_DELETES.getRequirement(),
|
||||
"timesPerformed", 0,
|
||||
"completed", false));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFailure_malformedInput() {
|
||||
assertThat(action.handleJsonRequest(null))
|
||||
.containsExactlyEntriesIn(errorResultWithMessage("Malformed JSON"));
|
||||
assertThat(action.handleJsonRequest(ImmutableMap.of()))
|
||||
.containsExactlyEntriesIn(errorResultWithMessage("Missing key for OT&E client: clientId"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFailure_noRegistrar() {
|
||||
assertThat(action.handleJsonRequest(ImmutableMap.of("clientId", "nonexistent-id-2")))
|
||||
.containsExactlyEntriesIn(
|
||||
errorResultWithMessage("TestUserId doesn't have access to registrar nonexistent-id-2"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFailure_notAuthorized() {
|
||||
action.registrarAccessor =
|
||||
AuthenticatedRegistrarAccessor.createForTesting(ImmutableSetMultimap.of());
|
||||
assertThat(action.handleJsonRequest(ImmutableMap.of("clientId", CLIENT_ID)))
|
||||
.containsExactlyEntriesIn(
|
||||
errorResultWithMessage("TestUserId doesn't have access to registrar blobio-1"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFailure_malformedRegistrarName() {
|
||||
assertThat(action.handleJsonRequest(ImmutableMap.of("clientId", "bad-client-id")))
|
||||
.containsExactlyEntriesIn(
|
||||
errorResultWithMessage(
|
||||
"ID bad-client-id is not one of the OT&E client IDs for base bad-client"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFailure_nonOteRegistrar() {
|
||||
persistNewRegistrar(CLIENT_ID, "SomeRegistrar", Type.REAL, 1L);
|
||||
assertThat(action.handleJsonRequest(ImmutableMap.of("clientId", CLIENT_ID)))
|
||||
.containsExactlyEntriesIn(
|
||||
errorResultWithMessage("Registrar with ID blobio-1 is not an OT&E registrar"));
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private List<Map<?, ?>> getFailingResultDetails(Map<String, ?> results) {
|
||||
return ((List<Map<?, ?>>) results.get("details"))
|
||||
.stream()
|
||||
.filter(result -> !Boolean.TRUE.equals(result.get("completed")))
|
||||
.collect(toImmutableList());
|
||||
}
|
||||
|
||||
private ImmutableMap<String, ?> errorResultWithMessage(String message) {
|
||||
return ImmutableMap.of("status", "ERROR", "message", message, "results", ImmutableList.of());
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue