mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-04-18 07:15:29 +00:00
Code Issues Releases Wiki Activity

Add some changes related to RDAP Feb 2024 profile (#2759)

Browse Source 
This implements two type of changes:
1. changing the link type for things like the terms of service
2. adding the request URL to each and every link with the "value" field.
   This is a bit tricky to implement because the links are generated in
various places, but we can implement it by adding it to the results
after generation.

See b/418782147 for more information
This commit is contained in:
gbrodman
2025-06-11 16:30:15 -04:00
committed by GitHub
parent a0eff00031
commit 1f6a09182d
63 changed files with 1326 additions and 949 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/google/registry/rdap/AbstractJsonableObject.java
View File

@@ -336,7 +336,7 @@ abstract class AbstractJsonableObject implements Jsonable {
// According to RFC 9083 section 3, the syntax of dates and times is defined in RFC3339.
//
// According to RFC3339, we should use ISO8601, which is what DateTime.toString does!
return new JsonPrimitive(((DateTime) object).toString());
return new JsonPrimitive(object.toString());
}
if (object == null) {
return JsonNull.INSTANCE;

40
core/src/main/java/google/registry/rdap/RdapActionBase.java
View File

@@ -24,10 +24,14 @@ import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND;
import static jakarta.servlet.http.HttpServletResponse.SC_OK;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.common.collect.Streams;
import com.google.common.flogger.FluentLogger;
import com.google.common.net.MediaType;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import google.registry.config.RegistryConfig.Config;
import google.registry.model.EppResource;
import google.registry.model.registrar.Registrar;
@@ -41,6 +45,7 @@ import google.registry.request.HttpException;
import google.registry.request.Parameter;
import google.registry.request.RequestMethod;
import google.registry.request.RequestPath;
import google.registry.request.RequestUrl;
import google.registry.request.Response;
import google.registry.util.Clock;
import jakarta.inject.Inject;
@@ -75,6 +80,7 @@ public abstract class RdapActionBase implements Runnable {
@Inject Response response;
@Inject @RequestMethod Action.Method requestMethod;
@Inject @RequestPath String requestPath;
@Inject @RequestUrl String requestUrl;
@Inject RdapAuthorization rdapAuthorization;
@Inject RdapJsonFormatter rdapJsonFormatter;
@Inject @Parameter("includeDeleted") Optional<Boolean> includeDeletedParam;
@@ -198,7 +204,9 @@ public abstract class RdapActionBase implements Runnable {
TopLevelReplyObject topLevelObject =
TopLevelReplyObject.create(replyObject, rdapJsonFormatter.createTosNotice());
Gson gson = formatOutputParam.orElse(false) ? FORMATTED_OUTPUT_GSON : GSON;
response.setPayload(gson.toJson(topLevelObject.toJson()));
JsonObject jsonResult = topLevelObject.toJson();
addLinkValuesRecursively(jsonResult);
response.setPayload(gson.toJson(jsonResult));
}
/**
@@ -264,4 +272,34 @@ public abstract class RdapActionBase implements Runnable {
return rdapJsonFormatter.getRequestTime();
}
/**
* Adds a request-referencing "value" to each link object.
*
* <p>This is the "context URI" as described in RFC 8288. Basically, this contains a reference to
* the request URL that generated this RDAP response.
*
* <p>This is required per the RDAP February 2024 response profile sections 2.6.3 and 2.10, and
* the technical implementation guide sections 3.2 and 3.3.2.
*
* <p>We must do this here (instead of where the links are generated) because many of the links
* (e.g. terms of service) are static constants, and thus cannot by default know what the request
* URL was.
*/
private void addLinkValuesRecursively(JsonElement jsonElement) {
if (jsonElement instanceof JsonArray jsonArray) {
jsonArray.forEach(this::addLinkValuesRecursively);
} else if (jsonElement instanceof JsonObject jsonObject) {
if (jsonObject.get("links") instanceof JsonArray linksArray) {
addLinkValues(linksArray);
}
jsonObject.entrySet().forEach(entry -> addLinkValuesRecursively(entry.getValue()));
}
}
private void addLinkValues(JsonArray linksArray) {
Streams.stream(linksArray)
.map(JsonElement::getAsJsonObject)
.filter(o -> !o.has("value"))
.forEach(o -> o.addProperty("value", requestUrl));
}
}

4
core/src/main/java/google/registry/rdap/RdapIcannStandardInformation.java
View File

@@ -44,7 +44,7 @@ public class RdapIcannStandardInformation {
+ " https://icann.org/epp")
.addLink(
Link.builder()
.setRel("alternate")
.setRel("glossary")
.setHref("https://icann.org/epp")
.setType("text/html")
.build())
@@ -57,7 +57,7 @@ public class RdapIcannStandardInformation {
.setDescription("URL of the ICANN RDDS Inaccuracy Complaint Form: https://icann.org/wicf")
.addLink(
Link.builder()
.setRel("alternate")
.setRel("help")
.setHref("https://icann.org/wicf")
.setType("text/html")
.build())

2
core/src/main/java/google/registry/rdap/RdapJsonFormatter.java
View File

@@ -271,7 +271,7 @@ public class RdapJsonFormatter {
URI htmlUri = htmlBaseURI.resolve(rdapTosStaticUrl);
noticeBuilder.addLink(
Link.builder()
.setRel("alternate")
.setRel("terms-of-service")
.setHref(htmlUri.toString())
.setType("text/html")
.build());

2
core/src/main/java/google/registry/rdap/RdapSearchActionBase.java
View File

@@ -31,7 +31,6 @@ import google.registry.request.HttpException.BadRequestException;
import google.registry.request.HttpException.UnprocessableEntityException;
import google.registry.request.Parameter;
import google.registry.request.ParameterMap;
import google.registry.request.RequestUrl;
import jakarta.inject.Inject;
import jakarta.persistence.criteria.CriteriaBuilder;
import java.io.UnsupportedEncodingException;
@@ -54,7 +53,6 @@ public abstract class RdapSearchActionBase extends RdapActionBase {
private static final int RESULT_SET_SIZE_SCALING_FACTOR = 30;
@Inject @RequestUrl String requestUrl;
@Inject @ParameterMap ImmutableListMultimap<String, String> parameterMap;
@Inject @Parameter("cursor") Optional<String> cursorTokenParam;
@Inject @Parameter("registrar") Optional<String> registrarParam;

6
core/src/test/java/google/registry/rdap/RdapActionBaseTest.java
View File

@@ -90,12 +90,6 @@ class RdapActionBaseTest extends RdapActionBaseTestCase<RdapActionBaseTest.RdapT
assertThat(response.getStatus()).isEqualTo(500);
}
@Test
void testValidName_works() {
assertThat(generateActualJson("no.thing")).isEqualTo(loadJsonFile("rdapjson_toplevel.json"));
assertThat(response.getStatus()).isEqualTo(200);
}
@Test
void testContentType_rdapjson_utf8() {
generateActualJson("no.thing");

181
core/src/test/java/google/registry/rdap/RdapActionBaseTestCase.java
View File

@@ -22,7 +22,12 @@ import static google.registry.request.Action.Method.GET;
import static google.registry.request.Action.Method.HEAD;
import static org.mockito.Mockito.mock;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import google.registry.model.console.User;
import google.registry.model.console.UserRoles;
import google.registry.persistence.transaction.JpaTestExtensions;
@@ -35,6 +40,7 @@ import google.registry.util.Idn;
import google.registry.util.TypeUtils;
import java.util.HashMap;
import java.util.Optional;
import javax.annotation.Nullable;
import org.joda.time.DateTime;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -43,6 +49,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
abstract class RdapActionBaseTestCase<A extends RdapActionBase> {
protected final FakeClock clock = new FakeClock(DateTime.parse("2000-01-01TZ"));
static final Gson GSON = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();
@RegisterExtension
final JpaIntegrationTestExtension jpa =
@@ -107,18 +114,13 @@ abstract class RdapActionBaseTestCase<A extends RdapActionBase> {
metricRole = ADMINISTRATOR;
}
JsonObject generateActualJson(String domainName) {
action.requestPath = actionPath + domainName;
action.requestMethod = GET;
action.run();
return RdapTestHelper.parseJsonObject(response.getPayload());
JsonObject generateActualJson(String name) {
return RdapTestHelper.parseJsonObject(runAction(name));
}
String generateHeadPayload(String domainName) {
action.requestPath = actionPath + domainName;
String generateHeadPayload(String name) {
action.requestMethod = HEAD;
action.run();
return response.getPayload();
return runAction(name);
}
JsonObject generateExpectedJsonError(String description, int code) {
@@ -138,16 +140,135 @@ abstract class RdapActionBaseTestCase<A extends RdapActionBase> {
"TITLE",
title,
"CODE",
String.valueOf(code));
String.valueOf(code),
"REQUEST_URL",
action.requestUrl);
}
static JsonFileBuilder jsonFileBuilder() {
return new JsonFileBuilder();
JsonFileBuilder jsonFileBuilder() {
return new JsonFileBuilder(action.requestUrl);
}
private String runAction(String name) {
action.requestPath = actionPath + name;
action.requestUrl = "https://example.tld" + actionPath + name;
action.run();
return response.getPayload();
}
JsonElement createTosNotice() {
return JsonParser.parseString(
"""
{
"title": "RDAP Terms of Service",
"description": [
"By querying our Domain Database, you are agreeing to comply with these terms so please read \
them carefully.",
"Any information provided is 'as is' without any guarantee of accuracy.",
"Please do not misuse the Domain Database. It is intended solely for query-based access.",
"Don't use the Domain Database to allow, enable, or otherwise support the transmission of mass \
unsolicited, commercial advertising or solicitations.",
"Don't access our Domain Database through the use of high volume, automated electronic \
processes that send queries or data to the systems of any ICANN-accredited registrar.",
"You may only use the information contained in the Domain Database for lawful purposes.",
"Do not compile, repackage, disseminate, or otherwise use the information contained in the \
Domain Database in its entirety, or in any substantial portion, without our prior written \
permission.",
"We may retain certain details about queries to our Domain Database for the purposes of \
detecting and preventing misuse.",
"We reserve the right to restrict or deny your access to the database if we suspect that you \
have failed to comply with these terms.",
"We reserve the right to modify this agreement at any time."
],
"links": [
{
"rel": "self",
"href": "https://example.tld/rdap/help/tos",
"type": "application/rdap+json",
"value": "%REQUEST_URL%"
},
{
"rel": "terms-of-service",
"href": "https://www.example.tld/about/rdap/tos.html",
"type": "text/html",
"value": "%REQUEST_URL%"
}
]
}
"""
.replaceAll("%REQUEST_URL%", action.requestUrl));
}
JsonObject addPermanentBoilerplateNotices(JsonObject jsonObject) {
if (!jsonObject.has("notices")) {
jsonObject.add("notices", new JsonArray());
}
JsonArray notices = jsonObject.getAsJsonArray("notices");
notices.add(createTosNotice());
notices.add(
JsonParser.parseString(
"""
{
"description": [
"This response conforms to the RDAP Operational Profile for gTLD Registries and Registrars \
version 1.0"
]
}
"""));
return jsonObject;
}
JsonObject addDomainBoilerplateNotices(JsonObject jsonObject) {
addPermanentBoilerplateNotices(jsonObject);
JsonArray notices = jsonObject.getAsJsonArray("notices");
notices.add(
JsonParser.parseString(
"""
{
"title": "Status Codes",
"description": [
"For more information on domain status codes, please visit https://icann.org/epp"
],
"links": [
{
"rel": "glossary",
"href": "https://icann.org/epp",
"type": "text/html",
"value": "%REQUEST_URL%"
}
]
}
"""
.replaceAll("%REQUEST_URL%", action.requestUrl)));
notices.add(
JsonParser.parseString(
"""
{
"title": "RDDS Inaccuracy Complaint Form",
"description": [
"URL of the ICANN RDDS Inaccuracy Complaint Form: https://icann.org/wicf"
],
"links": [
{
"rel": "help",
"href": "https://icann.org/wicf",
"type": "text/html",
"value": "%REQUEST_URL%"
}
]
}
"""
.replaceAll("%REQUEST_URL%", action.requestUrl)));
return jsonObject;
}
protected static final class JsonFileBuilder {
private final HashMap<String, String> substitutions = new HashMap<>();
private JsonFileBuilder(String requestUrl) {
substitutions.put("REQUEST_URL", requestUrl);
}
public JsonObject load(String filename) {
return RdapTestHelper.loadJsonFile(filename, substitutions);
}
@@ -158,6 +279,14 @@ abstract class RdapActionBaseTestCase<A extends RdapActionBase> {
return this;
}
public JsonFileBuilder putAll(String... keysAndValues) {
checkArgument(keysAndValues.length % 2 == 0);
for (int i = 0; i < keysAndValues.length; i += 2) {
put(keysAndValues[i], keysAndValues[i + 1]);
}
return this;
}
public JsonFileBuilder put(String key, int index, String value) {
return put(String.format("%s%d", key, index), value);
}
@@ -189,10 +318,38 @@ abstract class RdapActionBaseTestCase<A extends RdapActionBase> {
return putNext("REGISTRAR_FULL_NAME_", fullName);
}
JsonFileBuilder addFullRegistrar(
String handle, @Nullable String fullName, String status, @Nullable String address) {
if (fullName != null) {
putNext("REGISTRAR_FULLNAME_", fullName);
}
if (address != null) {
putNext("REGISTRAR_ADDRESS_", address);
}
return putNext("REGISTRAR_HANDLE_", handle, "STATUS_", status);
}
JsonFileBuilder addContact(String handle) {
return putNext("CONTACT_HANDLE_", handle);
}
JsonFileBuilder addFullContact(
String handle,
@Nullable String status,
@Nullable String fullName,
@Nullable String address) {
if (fullName != null) {
putNext("CONTACT_FULLNAME_", fullName);
}
if (address != null) {
putNext("CONTACT_ADDRESS_", address);
}
if (status != null) {
putNext("STATUS_", status);
}
return putNext("CONTACT_HANDLE_", handle);
}
JsonFileBuilder setNextQuery(String nextQuery) {
return put("NEXT_QUERY", nextQuery);
}

5
core/src/test/java/google/registry/rdap/RdapDataStructuresTest.java
View File

@@ -59,9 +59,12 @@ final class RdapDataStructuresTest {
.setRel("myRel")
.setTitle("myTitle")
.setType("myType")
.setValue("myValue")
.build();
assertThat(link.toJson())
.isEqualTo(createJson("{'href':'myHref','rel':'myRel','title':'myTitle','type':'myType'}"));
.isEqualTo(
createJson(
"{'href':'myHref','rel':'myRel','title':'myTitle','type':'myType','value':'myValue'}"));
assertRestrictedNames(link, "links[]");
}

41
core/src/test/java/google/registry/rdap/RdapDomainActionTest.java
View File

@@ -230,16 +230,11 @@ class RdapDomainActionTest extends RdapActionBaseTestCase<RdapDomainAction> {
clock.nowUtc().minusMonths(6)));
}
private JsonObject addBoilerplate(JsonObject obj) {
RdapTestHelper.addDomainBoilerplateNotices(obj, "https://example.tld/rdap/");
return obj;
}
private void assertProperResponseForCatLol(String queryString, String expectedOutputFile) {
assertAboutJson()
.that(generateActualJson(queryString))
.isEqualTo(
addBoilerplate(
addDomainBoilerplateNotices(
jsonFileBuilder()
.addDomain("cat.lol", "C-LOL")
.addContact("4-ROID")
@@ -357,7 +352,7 @@ class RdapDomainActionTest extends RdapActionBaseTestCase<RdapDomainAction> {
assertAboutJson()
.that(generateActualJson("cat.みんな"))
.isEqualTo(
addBoilerplate(
addDomainBoilerplateNotices(
jsonFileBuilder()
.addDomain("cat.みんな", "1D-Q9JYB4C")
.addContact("19-ROID")
@@ -376,7 +371,7 @@ class RdapDomainActionTest extends RdapActionBaseTestCase<RdapDomainAction> {
assertAboutJson()
.that(generateActualJson("cat.%E3%81%BF%E3%82%93%E3%81%AA"))
.isEqualTo(
addBoilerplate(
addDomainBoilerplateNotices(
jsonFileBuilder()
.addDomain("cat.みんな", "1D-Q9JYB4C")
.addContact("19-ROID")
@@ -395,7 +390,7 @@ class RdapDomainActionTest extends RdapActionBaseTestCase<RdapDomainAction> {
assertAboutJson()
.that(generateActualJson("cat.xn--q9jyb4c"))
.isEqualTo(
addBoilerplate(
addDomainBoilerplateNotices(
jsonFileBuilder()
.addDomain("cat.みんな", "1D-Q9JYB4C")
.addContact("19-ROID")
@@ -414,7 +409,7 @@ class RdapDomainActionTest extends RdapActionBaseTestCase<RdapDomainAction> {
assertAboutJson()
.that(generateActualJson("cat.1.tld"))
.isEqualTo(
addBoilerplate(
addDomainBoilerplateNotices(
jsonFileBuilder()
.addDomain("cat.1.tld", "25-1_TLD")
.addContact("21-ROID")
@@ -473,7 +468,7 @@ class RdapDomainActionTest extends RdapActionBaseTestCase<RdapDomainAction> {
assertAboutJson()
.that(generateActualJson("dodo.lol"))
.isEqualTo(
addBoilerplate(
addDomainBoilerplateNotices(
jsonFileBuilder()
.addDomain("dodo.lol", "15-LOL")
.addContact("11-ROID")
@@ -493,7 +488,7 @@ class RdapDomainActionTest extends RdapActionBaseTestCase<RdapDomainAction> {
assertAboutJson()
.that(generateActualJson("dodo.lol"))
.isEqualTo(
addBoilerplate(
addDomainBoilerplateNotices(
jsonFileBuilder()
.addDomain("dodo.lol", "15-LOL")
.addContact("11-ROID")
@@ -512,7 +507,9 @@ class RdapDomainActionTest extends RdapActionBaseTestCase<RdapDomainAction> {
"addgraceperiod", "lol", clock.nowUtc(), clock.nowUtc().plusYears(1));
assertAboutJson()
.that(generateActualJson("addgraceperiod.lol"))
.isEqualTo(addBoilerplate(jsonFileBuilder().load("rdap_domain_add_grace_period.json")));
.isEqualTo(
addDomainBoilerplateNotices(
jsonFileBuilder().load("rdap_domain_add_grace_period.json")));
}
@Test
@@ -522,7 +519,8 @@ class RdapDomainActionTest extends RdapActionBaseTestCase<RdapDomainAction> {
assertAboutJson()
.that(generateActualJson("autorenew.lol"))
.isEqualTo(
addBoilerplate(jsonFileBuilder().load("rdap_domain_auto_renew_grace_period.json")));
addDomainBoilerplateNotices(
jsonFileBuilder().load("rdap_domain_auto_renew_grace_period.json")));
}
@Test
@@ -545,7 +543,7 @@ class RdapDomainActionTest extends RdapActionBaseTestCase<RdapDomainAction> {
assertAboutJson()
.that(generateActualJson("redemption.lol"))
.isEqualTo(
addBoilerplate(
addDomainBoilerplateNotices(
jsonFileBuilder().load("rdap_domain_pending_delete_redemption_grace_period.json")));
}
@@ -568,7 +566,8 @@ class RdapDomainActionTest extends RdapActionBaseTestCase<RdapDomainAction> {
assertAboutJson()
.that(generateActualJson("renew.lol"))
.isEqualTo(
addBoilerplate(jsonFileBuilder().load("rdap_domain_explicit_renew_grace_period.json")));
addDomainBoilerplateNotices(
jsonFileBuilder().load("rdap_domain_explicit_renew_grace_period.json")));
}
@Test
@@ -590,7 +589,8 @@ class RdapDomainActionTest extends RdapActionBaseTestCase<RdapDomainAction> {
assertAboutJson()
.that(generateActualJson("transfer.lol"))
.isEqualTo(
addBoilerplate(jsonFileBuilder().load("rdap_domain_transfer_grace_period.json")));
addDomainBoilerplateNotices(
jsonFileBuilder().load("rdap_domain_transfer_grace_period.json")));
}
@Test
@@ -631,12 +631,15 @@ class RdapDomainActionTest extends RdapActionBaseTestCase<RdapDomainAction> {
"rel",
"alternate",
"type",
"text/html")));
"text/html",
"value",
"https://example.tld/rdap/domain/example.lol")));
JsonObject actuaResponse = generateActualJson("example.lol");
JsonObject expectedErrorResponse = generateExpectedJsonError("example.lol blocked by BSA", 404);
expectedErrorResponse
.getAsJsonArray("notices")
.add(RdapTestHelper.GSON.toJsonTree(expectedBsaNotice));
assertAboutJson().that(generateActualJson("example.lol")).isEqualTo(expectedErrorResponse);
assertAboutJson().that(actuaResponse).isEqualTo(expectedErrorResponse);
assertThat(response.getStatus()).isEqualTo(404);
}

3
core/src/test/java/google/registry/rdap/RdapDomainSearchActionTest.java
View File

@@ -473,8 +473,7 @@ class RdapDomainSearchActionTest extends RdapSearchActionTestCase<RdapDomainSear
private JsonObject wrapInSearchReply(JsonObject obj) {
obj = RdapTestHelper.wrapInSearchReply("domainSearchResults", obj);
RdapTestHelper.addDomainBoilerplateNotices(obj, "https://example.tld/rdap/");
return obj;
return addDomainBoilerplateNotices(obj);
}
private void runSuccessfulTest(RequestType requestType, String queryString, JsonObject expected) {

286
core/src/test/java/google/registry/rdap/RdapEntityActionTest.java
View File

@@ -15,7 +15,6 @@
package google.registry.rdap;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.rdap.RdapTestHelper.loadJsonFile;
import static google.registry.testing.DatabaseHelper.createTld;
import static google.registry.testing.DatabaseHelper.persistResource;
import static google.registry.testing.DatabaseHelper.persistSimpleResources;
@@ -28,7 +27,6 @@ import static google.registry.testing.GsonSubject.assertAboutJson;
import static org.mockito.Mockito.verify;
import com.google.common.collect.ImmutableList;
import com.google.gson.JsonObject;
import google.registry.model.contact.Contact;
import google.registry.model.host.Host;
import google.registry.model.registrar.Registrar;
@@ -39,13 +37,15 @@ import google.registry.rdap.RdapSearchResults.IncompletenessWarningType;
import google.registry.request.Action;
import google.registry.testing.FullFieldsTestEntityHelper;
import java.util.Optional;
import javax.annotation.Nullable;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
/** Unit tests for {@link RdapEntityAction}. */
class RdapEntityActionTest extends RdapActionBaseTestCase<RdapEntityAction> {
private static final String CONTACT_NAME = "(◕‿◕)";
private static final String CONTACT_ADDRESS = "\"1 Smiley Row\", \"Suite みんな\"";
RdapEntityActionTest() {
super(RdapEntityAction.class);
}
@@ -67,7 +67,7 @@ class RdapEntityActionTest extends RdapActionBaseTestCase<RdapEntityAction> {
registrant =
FullFieldsTestEntityHelper.makeAndPersistContact(
"8372808-REG",
"(◕‿◕)",
CONTACT_NAME,
"lol@cat.みんな",
ImmutableList.of("1 Smiley Row", "Suite みんな"),
clock.nowUtc(),
@@ -75,7 +75,7 @@ class RdapEntityActionTest extends RdapActionBaseTestCase<RdapEntityAction> {
adminContact =
FullFieldsTestEntityHelper.makeAndPersistContact(
"8372808-ADM",
"(◕‿◕)",
CONTACT_NAME,
"lol@cat.みんな",
ImmutableList.of("1 Smiley Row", "Suite みんな"),
clock.nowUtc(),
@@ -83,7 +83,7 @@ class RdapEntityActionTest extends RdapActionBaseTestCase<RdapEntityAction> {
techContact =
FullFieldsTestEntityHelper.makeAndPersistContact(
"8372808-TEC",
"(◕‿◕)",
CONTACT_NAME,
"lol@cat.みんな",
ImmutableList.of("1 Smiley Row", "Suite みんな"),
clock.nowUtc(),
@@ -110,7 +110,7 @@ class RdapEntityActionTest extends RdapActionBaseTestCase<RdapEntityAction> {
disconnectedContact =
FullFieldsTestEntityHelper.makeAndPersistContact(
"8372808-DIS",
"(◕‿◕)",
CONTACT_NAME,
"lol@cat.みんな",
ImmutableList.of("1 Smiley Row", "Suite みんな"),
clock.nowUtc(),
@@ -123,186 +123,191 @@ class RdapEntityActionTest extends RdapActionBaseTestCase<RdapEntityAction> {
clock.nowUtc().minusMonths(6));
}
private JsonObject generateExpectedJson(
String handle,
String fullName,
String status,
@Nullable String address,
String expectedOutputFile) {
return loadJsonFile(
expectedOutputFile,
"NAME", handle,
"FULLNAME", fullName,
"ADDRESS", (address == null) ? "\"1 Smiley Row\", \"Suite みんな\"" : address,
"TYPE", "entity",
"STATUS", status);
}
private JsonObject generateExpectedJsonWithTopLevelEntries(
String handle,
String expectedOutputFile) {
return generateExpectedJsonWithTopLevelEntries(
handle, "(◕‿◕)", "active", null, expectedOutputFile);
}
private JsonObject generateExpectedJsonWithTopLevelEntries(
String handle,
String fullName,
String status,
String address,
String expectedOutputFile) {
JsonObject obj = generateExpectedJson(handle, fullName, status, address, expectedOutputFile);
RdapTestHelper.addNonDomainBoilerplateNotices(obj, "https://example.tld/rdap/");
return obj;
}
private void runSuccessfulHandleTest(String handleQuery, String fileName) {
runSuccessfulHandleTest(handleQuery, "(◕‿◕)", "active", null, fileName);
}
private void runSuccessfulHandleTest(String handleQuery, String fullName, String fileName) {
runSuccessfulHandleTest(handleQuery, fullName, "active", null, fileName);
}
private void runSuccessfulHandleTest(
String handleQuery,
String fullName,
String rdapStatus,
String address,
String fileName) {
@Test
void testUnknownEntity_RoidPattern_notFound() {
assertAboutJson()
.that(generateActualJson(handleQuery))
.isEqualTo(
generateExpectedJsonWithTopLevelEntries(
handleQuery, fullName, rdapStatus, address, fileName));
assertThat(response.getStatus()).isEqualTo(200);
}
private void runNotFoundTest(String handleQuery) {
assertAboutJson()
.that(generateActualJson(handleQuery))
.isEqualTo(generateExpectedJsonError(handleQuery + " not found", 404));
.that(generateActualJson("_MISSING-ENTITY_"))
.isEqualTo(generateExpectedJsonError("_MISSING-ENTITY_ not found", 404));
assertThat(response.getStatus()).isEqualTo(404);
}
@Test
void testUnknownEntity_RoidPattern_notFound() {
runNotFoundTest("_MISSING-ENTITY_");
}
@Test
void testUnknownEntity_IanaPattern_notFound() {
runNotFoundTest("123");
assertAboutJson()
.that(generateActualJson("123"))
.isEqualTo(generateExpectedJsonError("123 not found", 404));
assertThat(response.getStatus()).isEqualTo(404);
}
@Test
void testUnknownEntity_notRoidNotIana_notFound() {
// Since we allow search by registrar name, every string is a possible name
runNotFoundTest("some,random,string");
assertAboutJson()
.that(generateActualJson("some,random,string"))
.isEqualTo(generateExpectedJsonError("some,random,string not found", 404));
assertThat(response.getStatus()).isEqualTo(404);
}
@Test
void testValidRegistrantContact_works() {
login("evilregistrar");
runSuccessfulHandleTest(registrant.getRepoId(), "rdap_associated_contact.json");
assertAboutJson()
.that(generateActualJson(registrant.getRepoId()))
.isEqualTo(
addPermanentBoilerplateNotices(
jsonFileBuilder()
.addFullContact(registrant.getRepoId(), null, CONTACT_NAME, CONTACT_ADDRESS)
.load("rdap_associated_contact.json")));
}
@Test
void testValidRegistrantContact_found_asAdministrator() {
loginAsAdmin();
runSuccessfulHandleTest(registrant.getRepoId(), "rdap_associated_contact.json");
assertAboutJson()
.that(generateActualJson(registrant.getRepoId()))
.isEqualTo(
addPermanentBoilerplateNotices(
jsonFileBuilder()
.addFullContact(registrant.getRepoId(), null, CONTACT_NAME, CONTACT_ADDRESS)
.load("rdap_associated_contact.json")));
}
@Test
void testValidRegistrantContact_found_notLoggedIn() {
runSuccessfulHandleTest(
registrant.getRepoId(),
"(◕‿◕)",
"active",
null,
"rdap_associated_contact_no_personal_data.json");
assertAboutJson()
.that(generateActualJson(registrant.getRepoId()))
.isEqualTo(
addPermanentBoilerplateNotices(
jsonFileBuilder()
.addFullContact(registrant.getRepoId(), "active", CONTACT_NAME, CONTACT_ADDRESS)
.load("rdap_associated_contact_no_personal_data.json")));
}
@Test
void testValidRegistrantContact_found_loggedInAsOtherRegistrar() {
login("otherregistrar");
runSuccessfulHandleTest(
registrant.getRepoId(),
"(◕‿◕)",
"active",
null,
"rdap_associated_contact_no_personal_data.json");
assertAboutJson()
.that(generateActualJson(registrant.getRepoId()))
.isEqualTo(
addPermanentBoilerplateNotices(
jsonFileBuilder()
.addFullContact(registrant.getRepoId(), "active", CONTACT_NAME, CONTACT_ADDRESS)
.load("rdap_associated_contact_no_personal_data.json")));
}
@Test
void testValidAdminContact_works() {
login("evilregistrar");
runSuccessfulHandleTest(adminContact.getRepoId(), "rdap_associated_contact.json");
assertAboutJson()
.that(generateActualJson(adminContact.getRepoId()))
.isEqualTo(
addPermanentBoilerplateNotices(
jsonFileBuilder()
.addFullContact(adminContact.getRepoId(), null, CONTACT_NAME, CONTACT_ADDRESS)
.load("rdap_associated_contact.json")));
}
@Test
void testValidTechContact_works() {
login("evilregistrar");
runSuccessfulHandleTest(techContact.getRepoId(), "rdap_associated_contact.json");
assertAboutJson()
.that(generateActualJson(techContact.getRepoId()))
.isEqualTo(
addPermanentBoilerplateNotices(
jsonFileBuilder()
.addFullContact(techContact.getRepoId(), null, CONTACT_NAME, CONTACT_ADDRESS)
.load("rdap_associated_contact.json")));
}
@Test
void testValidDisconnectedContact_works() {
login("evilregistrar");
runSuccessfulHandleTest(disconnectedContact.getRepoId(), "rdap_contact.json");
assertAboutJson()
.that(generateActualJson(disconnectedContact.getRepoId()))
.isEqualTo(
addPermanentBoilerplateNotices(
jsonFileBuilder()
.addFullContact(
disconnectedContact.getRepoId(), "active", CONTACT_NAME, CONTACT_ADDRESS)
.load("rdap_contact.json")));
}
@Test
void testDeletedContact_notFound() {
runNotFoundTest(deletedContact.getRepoId());
String repoId = deletedContact.getRepoId();
assertAboutJson()
.that(generateActualJson(repoId))
.isEqualTo(generateExpectedJsonError(repoId + " not found", 404));
assertThat(response.getStatus()).isEqualTo(404);
}
@Test
void testDeletedContact_notFound_includeDeletedSetFalse() {
action.includeDeletedParam = Optional.of(false);
runNotFoundTest(deletedContact.getRepoId());
String repoId = deletedContact.getRepoId();
assertAboutJson()
.that(generateActualJson(repoId))
.isEqualTo(generateExpectedJsonError(repoId + " not found", 404));
assertThat(response.getStatus()).isEqualTo(404);
}
@Test
void testDeletedContact_notFound_notLoggedIn() {
action.includeDeletedParam = Optional.of(true);
runNotFoundTest(deletedContact.getRepoId());
String repoId = deletedContact.getRepoId();
assertAboutJson()
.that(generateActualJson(repoId))
.isEqualTo(generateExpectedJsonError(repoId + " not found", 404));
assertThat(response.getStatus()).isEqualTo(404);
}
@Test
void testDeletedContact_notFound_loggedInAsDifferentRegistrar() {
login("idnregistrar");
action.includeDeletedParam = Optional.of(true);
runNotFoundTest(deletedContact.getRepoId());
String repoId = deletedContact.getRepoId();
assertAboutJson()
.that(generateActualJson(repoId))
.isEqualTo(generateExpectedJsonError(repoId + " not found", 404));
assertThat(response.getStatus()).isEqualTo(404);
}
@Test
void testDeletedContact_found_loggedInAsCorrectRegistrar() {
login("evilregistrar");
action.includeDeletedParam = Optional.of(true);
runSuccessfulHandleTest(
deletedContact.getRepoId(),
"",
"inactive",
"",
"rdap_contact_deleted.json");
assertAboutJson()
.that(generateActualJson(deletedContact.getRepoId()))
.isEqualTo(
addPermanentBoilerplateNotices(
jsonFileBuilder()
.addContact(deletedContact.getRepoId())
.load("rdap_contact_deleted.json")));
}
@Test
void testDeletedContact_found_loggedInAsAdmin() {
loginAsAdmin();
action.includeDeletedParam = Optional.of(true);
runSuccessfulHandleTest(
deletedContact.getRepoId(),
"",
"inactive",
"",
"rdap_contact_deleted.json");
assertAboutJson()
.that(generateActualJson(deletedContact.getRepoId()))
.isEqualTo(
addPermanentBoilerplateNotices(
jsonFileBuilder()
.addContact(deletedContact.getRepoId())
.load("rdap_contact_deleted.json")));
}
@Test
void testRegistrar_found() {
runSuccessfulHandleTest("101", "Yes Virginia <script>", "rdap_registrar.json");
assertAboutJson()
.that(generateActualJson("101"))
.isEqualTo(
addPermanentBoilerplateNotices(
jsonFileBuilder()
.addFullRegistrar("101", "Yes Virginia <script>", "active", null)
.load("rdap_registrar.json")));
assertThat(response.getStatus()).isEqualTo(200);
}
@Test
@@ -310,58 +315,97 @@ class RdapEntityActionTest extends RdapActionBaseTestCase<RdapEntityAction> {
assertAboutJson()
.that(generateActualJson("IDN%20Registrar"))
.isEqualTo(
generateExpectedJsonWithTopLevelEntries(
"102", "IDN Registrar", "active", null, "rdap_registrar.json"));
addPermanentBoilerplateNotices(
jsonFileBuilder()
.addFullRegistrar("102", "IDN Registrar", "active", null)
.load("rdap_registrar.json")));
assertThat(response.getStatus()).isEqualTo(200);
}
@Test
void testRegistrar102_works() {
runSuccessfulHandleTest("102", "IDN Registrar", "rdap_registrar.json");
assertAboutJson()
.that(generateActualJson("102"))
.isEqualTo(
addPermanentBoilerplateNotices(
jsonFileBuilder()
.addFullRegistrar("102", "IDN Registrar", "active", null)
.load("rdap_registrar.json")));
}
@Test
void testRegistrar103_works() {
runSuccessfulHandleTest("103", "Multilevel Registrar", "rdap_registrar.json");
assertAboutJson()
.that(generateActualJson("103"))
.isEqualTo(
addPermanentBoilerplateNotices(
jsonFileBuilder()
.addFullRegistrar("103", "Multilevel Registrar", "active", null)
.load("rdap_registrar.json")));
assertThat(response.getStatus()).isEqualTo(200);
}
@Test
void testRegistrar104_notFound() {
runNotFoundTest("104");
assertAboutJson()
.that(generateActualJson("104"))
.isEqualTo(generateExpectedJsonError("104 not found", 404));
assertThat(response.getStatus()).isEqualTo(404);
}
@Test
void testRegistrar104_notFound_deletedFlagWhenNotLoggedIn() {
action.includeDeletedParam = Optional.of(true);
runNotFoundTest("104");
assertAboutJson()
.that(generateActualJson("104"))
.isEqualTo(generateExpectedJsonError("104 not found", 404));
assertThat(response.getStatus()).isEqualTo(404);
}
@Test
void testRegistrar104_found_deletedFlagWhenLoggedIn() {
login("deletedregistrar");
action.includeDeletedParam = Optional.of(true);
runSuccessfulHandleTest(
"104", "Yes Virginia <script>", "inactive", null, "rdap_registrar.json");
assertAboutJson()
.that(generateActualJson("104"))
.isEqualTo(
addPermanentBoilerplateNotices(
jsonFileBuilder()
.addFullRegistrar("104", "Yes Virginia <script>", "inactive", null)
.load("rdap_registrar.json")));
assertThat(response.getStatus()).isEqualTo(200);
}
@Test
void testRegistrar104_notFound_deletedFlagWhenLoggedInAsOther() {
login("1tldregistrar");
action.includeDeletedParam = Optional.of(true);
runNotFoundTest("104");
assertAboutJson()
.that(generateActualJson("104"))
.isEqualTo(generateExpectedJsonError("104 not found", 404));
assertThat(response.getStatus()).isEqualTo(404);
}
@Test
void testRegistrar104_found_deletedFlagWhenLoggedInAsAdmin() {
loginAsAdmin();
action.includeDeletedParam = Optional.of(true);
runSuccessfulHandleTest(
"104", "Yes Virginia <script>", "inactive", null, "rdap_registrar.json");
assertAboutJson()
.that(generateActualJson("104"))
.isEqualTo(
addPermanentBoilerplateNotices(
jsonFileBuilder()
.addFullRegistrar("104", "Yes Virginia <script>", "inactive", null)
.load("rdap_registrar.json")));
assertThat(response.getStatus()).isEqualTo(200);
}
@Test
void testRegistrar105_doesNotExist() {
runNotFoundTest("105");
assertAboutJson()
.that(generateActualJson("105"))
.isEqualTo(generateExpectedJsonError("105 not found", 404));
assertThat(response.getStatus()).isEqualTo(404);
}
@Test
@@ -370,8 +414,10 @@ class RdapEntityActionTest extends RdapActionBaseTestCase<RdapEntityAction> {
assertAboutJson()
.that(generateActualJson(techContact.getRepoId() + "?key=value"))
.isEqualTo(
generateExpectedJsonWithTopLevelEntries(
techContact.getRepoId(), "rdap_associated_contact.json"));
addPermanentBoilerplateNotices(
jsonFileBuilder()
.addFullContact(techContact.getRepoId(), null, CONTACT_NAME, CONTACT_ADDRESS)
.load("rdap_associated_contact.json")));
assertThat(response.getStatus()).isEqualTo(200);
}

486
core/src/test/java/google/registry/rdap/RdapEntitySearchActionTest.java
View File

@@ -15,7 +15,6 @@
package google.registry.rdap;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.rdap.RdapTestHelper.loadJsonFile;
import static google.registry.rdap.RdapTestHelper.parseJsonObject;
import static google.registry.request.Action.Method.GET;
import static google.registry.testing.DatabaseHelper.createTld;
@@ -30,7 +29,6 @@ import static google.registry.testing.GsonSubject.assertAboutJson;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableListMultimap;
import com.google.common.collect.ImmutableMap;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
@@ -45,13 +43,15 @@ import google.registry.testing.FakeResponse;
import google.registry.testing.FullFieldsTestEntityHelper;
import java.net.URLDecoder;
import java.util.Optional;
import javax.annotation.Nullable;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
/** Unit tests for {@link RdapEntitySearchAction}. */
class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySearchAction> {
private static final String BINKY_ADDRESS = "\"123 Blinky St\", \"Blinkyland\"";
private static final String BINKY_FULL_NAME = "Blinky (赤ベイ)";
RdapEntitySearchActionTest() {
super(RdapEntitySearchAction.class);
}
@@ -128,7 +128,7 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
FullFieldsTestEntityHelper.makeAndPersistContact(
"blinky",
"Blinky (赤ベイ)",
BINKY_FULL_NAME,
"blinky@b.tld",
ImmutableList.of("123 Blinky St", "Blinkyland"),
clock.nowUtc(),
@@ -150,45 +150,9 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
action.subtypeParam = Optional.empty();
}
private JsonObject generateExpectedJson(String expectedOutputFile) {
return loadJsonFile(expectedOutputFile, "TYPE", "entity");
}
private JsonObject generateExpectedJson(
String handle,
String expectedOutputFile) {
return generateExpectedJson(handle, null, "active", null, expectedOutputFile);
}
private JsonObject generateExpectedJson(
String handle,
@Nullable String fullName,
String status,
@Nullable String address,
String expectedOutputFile) {
ImmutableMap.Builder<String, String> builder = new ImmutableMap.Builder<>();
builder.put("NAME", handle);
if (fullName != null) {
builder.put("FULLNAME", fullName);
}
if (address != null) {
builder.put("ADDRESS", address);
}
builder.put("TYPE", "entity");
builder.put("STATUS", status);
return loadJsonFile(expectedOutputFile, builder.build());
}
private JsonObject generateExpectedJsonForEntity(
String handle,
String fullName,
String status,
@Nullable String address,
String expectedOutputFile) {
JsonObject obj = generateExpectedJson(handle, fullName, status, address, expectedOutputFile);
obj = RdapTestHelper.wrapInSearchReply("entitySearchResults", obj);
RdapTestHelper.addNonDomainBoilerplateNotices(obj, "https://example.tld/rdap/");
return obj;
private JsonObject addBoilerplate(JsonObject jsonObject) {
jsonObject = RdapTestHelper.wrapInSearchReply("entitySearchResults", jsonObject);
return addPermanentBoilerplateNotices(jsonObject);
}
private void createManyContactsAndRegistrars(
@@ -259,38 +223,6 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
verifyMetrics(numContactsRetrieved);
}
private void runSuccessfulNameTestWithBlinky(String queryString, String fileName) {
runSuccessfulNameTest(
queryString,
"2-ROID",
"Blinky (赤ベイ)",
"active",
"\"123 Blinky St\", \"Blinkyland\"",
fileName);
}
private void runSuccessfulNameTest(
String queryString,
String handle,
@Nullable String fullName,
String fileName) {
runSuccessfulNameTest(queryString, handle, fullName, "active", null, fileName);
}
private void runSuccessfulNameTest(
String queryString,
String handle,
@Nullable String fullName,
String status,
@Nullable String address,
String fileName) {
rememberWildcardType(queryString);
assertAboutJson()
.that(generateActualJsonWithFullName(queryString))
.isEqualTo(generateExpectedJsonForEntity(handle, fullName, status, address, fileName));
assertThat(response.getStatus()).isEqualTo(200);
}
private void runNotFoundNameTest(String queryString) {
rememberWildcardType(queryString);
assertAboutJson()
@@ -299,38 +231,6 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
assertThat(response.getStatus()).isEqualTo(404);
}
private void runSuccessfulHandleTestWithBlinky(String queryString, String fileName) {
runSuccessfulHandleTest(
queryString,
"2-ROID",
"Blinky (赤ベイ)",
"active",
"\"123 Blinky St\", \"Blinkyland\"",
fileName);
}
private void runSuccessfulHandleTest(
String queryString,
String handle,
@Nullable String fullName,
String fileName) {
runSuccessfulHandleTest(queryString, handle, fullName, "active", null, fileName);
}
private void runSuccessfulHandleTest(
String queryString,
String handle,
@Nullable String fullName,
String status,
@Nullable String address,
String fileName) {
rememberWildcardType(queryString);
assertAboutJson()
.that(generateActualJsonWithHandle(queryString))
.isEqualTo(generateExpectedJsonForEntity(handle, fullName, status, address, fileName));
assertThat(response.getStatus()).isEqualTo(200);
}
private void runNotFoundHandleTest(String queryString) {
rememberWildcardType(queryString);
assertAboutJson()
@@ -470,7 +370,7 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
void testInvalidSubtype_rejected() {
action.subtypeParam = Optional.of("Space Aliens");
assertAboutJson()
.that(generateActualJsonWithFullName("Blinky (赤ベイ)"))
.that(generateActualJsonWithFullName(BINKY_FULL_NAME))
.isEqualTo(
generateExpectedJsonError(
"Subtype parameter must specify contacts, registrars or all", 400));
@@ -482,23 +382,44 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
@Test
void testNameMatchContact_found() {
login("2-RegistrarTest");
runSuccessfulNameTestWithBlinky("Blinky (赤ベイ)", "rdap_contact.json");
rememberWildcardType(BINKY_FULL_NAME);
assertAboutJson()
.that(generateActualJsonWithFullName(BINKY_FULL_NAME))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullContact("2-ROID", "active", BINKY_FULL_NAME, BINKY_ADDRESS)
.load("rdap_contact.json")));
verifyMetrics(1);
}
@Test
void testNameMatchContact_found_subtypeAll() {
login("2-RegistrarTest");
rememberWildcardType(BINKY_FULL_NAME);
action.subtypeParam = Optional.of("aLl");
runSuccessfulNameTestWithBlinky("Blinky (赤ベイ)", "rdap_contact.json");
assertAboutJson()
.that(generateActualJsonWithFullName(BINKY_FULL_NAME))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullContact("2-ROID", "active", BINKY_FULL_NAME, BINKY_ADDRESS)
.load("rdap_contact.json")));
verifyMetrics(1);
}
@Test
void testNameMatchContact_found_subtypeContacts() {
login("2-RegistrarTest");
rememberWildcardType(BINKY_FULL_NAME);
action.subtypeParam = Optional.of("cONTACTS");
runSuccessfulNameTestWithBlinky("Blinky (赤ベイ)", "rdap_contact.json");
assertAboutJson()
.that(generateActualJsonWithFullName(BINKY_FULL_NAME))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullContact("2-ROID", "active", BINKY_FULL_NAME, BINKY_ADDRESS)
.load("rdap_contact.json")));
verifyMetrics(1);
}
@@ -506,15 +427,22 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
void testNameMatchContact_notFound_subtypeRegistrars() {
login("2-RegistrarTest");
action.subtypeParam = Optional.of("Registrars");
runNotFoundNameTest("Blinky (赤ベイ)");
runNotFoundNameTest(BINKY_FULL_NAME);
verifyErrorMetrics(0);
}
@Test
void testNameMatchContact_found_specifyingSameRegistrar() {
login("2-RegistrarTest");
rememberWildcardType(BINKY_FULL_NAME);
action.registrarParam = Optional.of("2-RegistrarTest");
runSuccessfulNameTestWithBlinky("Blinky (赤ベイ)", "rdap_contact.json");
assertAboutJson()
.that(generateActualJsonWithFullName(BINKY_FULL_NAME))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullContact("2-ROID", "active", BINKY_FULL_NAME, BINKY_ADDRESS)
.load("rdap_contact.json")));
verifyMetrics(1);
}
@@ -522,35 +450,48 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
void testNameMatchContact_notFound_specifyingOtherRegistrar() {
login("2-RegistrarTest");
action.registrarParam = Optional.of("2-RegistrarInact");
runNotFoundNameTest("Blinky (赤ベイ)");
runNotFoundNameTest(BINKY_FULL_NAME);
verifyErrorMetrics(0);
}
@Test
void testNameMatchContact_found_asAdministrator() {
loginAsAdmin();
rememberWildcardType("Blinky (赤ベイ)");
runSuccessfulNameTestWithBlinky("Blinky (赤ベイ)", "rdap_contact.json");
rememberWildcardType(BINKY_FULL_NAME);
assertAboutJson()
.that(generateActualJsonWithFullName(BINKY_FULL_NAME))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullContact("2-ROID", "active", BINKY_FULL_NAME, BINKY_ADDRESS)
.load("rdap_contact.json")));
verifyMetrics(1);
}
@Test
void testNameMatchContact_notFound_notLoggedIn() {
runNotFoundNameTest("Blinky (赤ベイ)");
runNotFoundNameTest(BINKY_FULL_NAME);
verifyErrorMetrics(0);
}
@Test
void testNameMatchContact_notFound_loggedInAsOtherRegistrar() {
login("2-Registrar");
runNotFoundNameTest("Blinky (赤ベイ)");
runNotFoundNameTest(BINKY_FULL_NAME);
verifyErrorMetrics(0);
}
@Test
void testNameMatchContact_found_wildcard() {
login("2-RegistrarTest");
runSuccessfulNameTestWithBlinky("Blinky*", "rdap_contact.json");
rememberWildcardType("Blinky*");
assertAboutJson()
.that(generateActualJsonWithFullName("Blinky*"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullContact("2-ROID", "active", BINKY_FULL_NAME, BINKY_ADDRESS)
.load("rdap_contact.json")));
verifyMetrics(1);
}
@@ -558,7 +499,14 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
void testNameMatchContact_found_wildcardSpecifyingSameRegistrar() {
login("2-RegistrarTest");
action.registrarParam = Optional.of("2-RegistrarTest");
runSuccessfulNameTestWithBlinky("Blinky*", "rdap_contact.json");
rememberWildcardType("Blinky*");
assertAboutJson()
.that(generateActualJsonWithFullName("Blinky*"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullContact("2-ROID", "active", BINKY_FULL_NAME, BINKY_ADDRESS)
.load("rdap_contact.json")));
verifyMetrics(1);
}
@@ -576,7 +524,7 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
rememberWildcardType("Blin*");
assertAboutJson()
.that(generateActualJsonWithFullName("Blin*"))
.isEqualTo(generateExpectedJson("rdap_multiple_contacts2.json"));
.isEqualTo(jsonFileBuilder().load("rdap_multiple_contacts2.json"));
assertThat(response.getStatus()).isEqualTo(200);
verifyMetrics(2);
}
@@ -615,8 +563,14 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
@Test
void testNameMatchRegistrar_found() {
login("2-RegistrarTest");
runSuccessfulNameTest(
"Yes Virginia <script>", "20", "Yes Virginia <script>", "rdap_registrar.json");
rememberWildcardType("Yes Virginia <script>");
assertAboutJson()
.that(generateActualJsonWithFullName("Yes Virginia <script>"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullRegistrar("20", "Yes Virginia <script>", "active", null)
.load("rdap_registrar.json")));
verifyMetrics(0);
}
@@ -624,8 +578,14 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
void testNameMatchRegistrar_found_subtypeAll() {
login("2-RegistrarTest");
action.subtypeParam = Optional.of("all");
runSuccessfulNameTest(
"Yes Virginia <script>", "20", "Yes Virginia <script>", "rdap_registrar.json");
rememberWildcardType("Yes Virginia <script>");
assertAboutJson()
.that(generateActualJsonWithFullName("Yes Virginia <script>"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullRegistrar("20", "Yes Virginia <script>", "active", null)
.load("rdap_registrar.json")));
verifyMetrics(0);
}
@@ -633,8 +593,14 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
void testNameMatchRegistrar_found_subtypeRegistrars() {
login("2-RegistrarTest");
action.subtypeParam = Optional.of("REGISTRARS");
runSuccessfulNameTest(
"Yes Virginia <script>", "20", "Yes Virginia <script>", "rdap_registrar.json");
rememberWildcardType("Yes Virginia <script>");
assertAboutJson()
.that(generateActualJsonWithFullName("Yes Virginia <script>"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullRegistrar("20", "Yes Virginia <script>", "active", null)
.load("rdap_registrar.json")));
verifyMetrics(0);
}
@@ -649,8 +615,14 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
@Test
void testNameMatchRegistrar_found_specifyingSameRegistrar() {
action.registrarParam = Optional.of("2-Registrar");
runSuccessfulNameTest(
"Yes Virginia <script>", "20", "Yes Virginia <script>", "rdap_registrar.json");
rememberWildcardType("Yes Virginia <script>");
assertAboutJson()
.that(generateActualJsonWithFullName("Yes Virginia <script>"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullRegistrar("20", "Yes Virginia <script>", "active", null)
.load("rdap_registrar.json")));
verifyMetrics(0);
}
@@ -666,10 +638,9 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
login("2-RegistrarTest");
createManyContactsAndRegistrars(4, 0, registrarTest);
rememberWildcardType("Entity *");
// JsonObject foo = generateActualJsonWithFullName("Entity *");
assertAboutJson()
.that(generateActualJsonWithFullName("Entity *"))
.isEqualTo(generateExpectedJson("rdap_nontruncated_contacts.json"));
.isEqualTo(jsonFileBuilder().load("rdap_nontruncated_contacts.json"));
assertThat(response.getStatus()).isEqualTo(200);
verifyMetrics(4);
}
@@ -682,8 +653,9 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
assertAboutJson()
.that(generateActualJsonWithFullName("Entity *"))
.isEqualTo(
generateExpectedJson(
"fn=Entity+*&cursor=YzpFbnRpdHkgNA%3D%3D", "rdap_truncated_contacts.json"));
jsonFileBuilder()
.put("NAME", "fn=Entity+*&cursor=YzpFbnRpdHkgNA%3D%3D")
.load("rdap_truncated_contacts.json"));
assertThat(response.getStatus()).isEqualTo(200);
verifyMetrics(5, IncompletenessWarningType.TRUNCATED);
}
@@ -696,8 +668,9 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
assertAboutJson()
.that(generateActualJsonWithFullName("Entity *"))
.isEqualTo(
generateExpectedJson(
"fn=Entity+*&cursor=YzpFbnRpdHkgNA%3D%3D", "rdap_truncated_contacts.json"));
jsonFileBuilder()
.put("NAME", "fn=Entity+*&cursor=YzpFbnRpdHkgNA%3D%3D")
.load("rdap_truncated_contacts.json"));
assertThat(response.getStatus()).isEqualTo(200);
// For contacts, we only need to fetch one result set's worth (plus one).
verifyMetrics(5, IncompletenessWarningType.TRUNCATED);
@@ -728,7 +701,7 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
rememberWildcardType("Entity *");
assertAboutJson()
.that(generateActualJsonWithFullName("Entity *"))
.isEqualTo(generateExpectedJson("rdap_nontruncated_registrars.json"));
.isEqualTo(jsonFileBuilder().load("rdap_nontruncated_registrars.json"));
assertThat(response.getStatus()).isEqualTo(200);
verifyMetrics(0);
}
@@ -740,8 +713,9 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
assertAboutJson()
.that(generateActualJsonWithFullName("Entity *"))
.isEqualTo(
generateExpectedJson(
"fn=Entity+*&cursor=cjpFbnRpdHkgNA%3D%3D", "rdap_truncated_registrars.json"));
jsonFileBuilder()
.put("NAME", "fn=Entity+*&cursor=cjpFbnRpdHkgNA%3D%3D")
.load("rdap_truncated_registrars.json"));
assertThat(response.getStatus()).isEqualTo(200);
verifyMetrics(0, IncompletenessWarningType.TRUNCATED);
}
@@ -753,8 +727,9 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
assertAboutJson()
.that(generateActualJsonWithFullName("Entity *"))
.isEqualTo(
generateExpectedJson(
"fn=Entity+*&cursor=cjpFbnRpdHkgNA%3D%3D", "rdap_truncated_registrars.json"));
jsonFileBuilder()
.put("NAME", "fn=Entity+*&cursor=cjpFbnRpdHkgNA%3D%3D")
.load("rdap_truncated_registrars.json"));
assertThat(response.getStatus()).isEqualTo(200);
verifyMetrics(0, IncompletenessWarningType.TRUNCATED);
}
@@ -815,8 +790,9 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
assertAboutJson()
.that(generateActualJsonWithFullName("Entity *"))
.isEqualTo(
generateExpectedJson(
"fn=Entity+*&cursor=cjpFbnRpdHkgNA%3D%3D", "rdap_truncated_mixed_entities.json"));
jsonFileBuilder()
.put("NAME", "fn=Entity+*&cursor=cjpFbnRpdHkgNA%3D%3D")
.load("rdap_truncated_mixed_entities.json"));
assertThat(response.getStatus()).isEqualTo(200);
verifyMetrics(3, IncompletenessWarningType.TRUNCATED);
}
@@ -845,7 +821,7 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
rememberWildcardType("Entity *");
assertAboutJson()
.that(generateActualJsonWithFullName("Entity *"))
.isEqualTo(generateExpectedJson("rdap_nontruncated_contacts.json"));
.isEqualTo(jsonFileBuilder().load("rdap_nontruncated_contacts.json"));
assertThat(response.getStatus()).isEqualTo(200);
verifyMetrics(4);
}
@@ -855,8 +831,14 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
login("2-RegistrarTest");
action.subtypeParam = Optional.of("registrars");
createManyContactsAndRegistrars(1, 1, registrarTest);
runSuccessfulNameTest(
"Entity *", "301", "Entity 2", "rdap_registrar.json");
rememberWildcardType("Entity *");
assertAboutJson()
.that(generateActualJsonWithFullName("Entity *"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullRegistrar("301", "Entity 2", "active", null)
.load("rdap_registrar.json")));
verifyMetrics(0);
}
@@ -878,7 +860,14 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
void testNameMatchRegistrar_found_inactiveAsSameRegistrar() {
action.includeDeletedParam = Optional.of(true);
login("2-RegistrarInact");
runSuccessfulNameTest("No Way", "21", "No Way", "inactive", null, "rdap_registrar.json");
rememberWildcardType("No Way");
assertAboutJson()
.that(generateActualJsonWithFullName("No Way"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullRegistrar("21", "No Way", "inactive", null)
.load("rdap_registrar.json")));
verifyMetrics(0);
}
@@ -886,7 +875,14 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
void testNameMatchRegistrar_found_inactiveAsAdmin() {
action.includeDeletedParam = Optional.of(true);
loginAsAdmin();
runSuccessfulNameTest("No Way", "21", "No Way", "inactive", null, "rdap_registrar.json");
rememberWildcardType("No Way");
assertAboutJson()
.that(generateActualJsonWithFullName("No Way"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullRegistrar("21", "No Way", "inactive", null)
.load("rdap_registrar.json")));
verifyMetrics(0);
}
@@ -908,8 +904,14 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
void testNameMatchRegistrar_found_testAsSameRegistrar() {
action.includeDeletedParam = Optional.of(true);
login("2-RegistrarTest");
runSuccessfulNameTest(
"Da Test Registrar", "not applicable", "Da Test Registrar", "rdap_registrar_test.json");
rememberWildcardType("Da Test Registrar");
assertAboutJson()
.that(generateActualJsonWithFullName("Da Test Registrar"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullRegistrar("not applicable", "Da Test Registrar", "active", null)
.load("rdap_registrar_test.json")));
verifyMetrics(0);
}
@@ -917,15 +919,28 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
void testNameMatchRegistrar_found_testAsAdmin() {
action.includeDeletedParam = Optional.of(true);
loginAsAdmin();
runSuccessfulNameTest(
"Da Test Registrar", "not applicable", "Da Test Registrar", "rdap_registrar_test.json");
rememberWildcardType("Da Test Registrar");
assertAboutJson()
.that(generateActualJsonWithFullName("Da Test Registrar"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullRegistrar("not applicable", "Da Test Registrar", "active", null)
.load("rdap_registrar_test.json")));
verifyMetrics(0);
}
@Test
void testHandleMatchContact_found() {
login("2-RegistrarTest");
runSuccessfulHandleTestWithBlinky("2-ROID", "rdap_contact.json");
rememberWildcardType("2-ROID");
assertAboutJson()
.that(generateActualJsonWithHandle("2-ROID"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullContact("2-ROID", "active", BINKY_FULL_NAME, BINKY_ADDRESS)
.load("rdap_contact.json")));
verifyMetrics(1);
}
@@ -933,7 +948,14 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
void testHandleMatchContact_found_subtypeAll() {
login("2-RegistrarTest");
action.subtypeParam = Optional.of("all");
runSuccessfulHandleTestWithBlinky("2-ROID", "rdap_contact.json");
rememberWildcardType("2-ROID");
assertAboutJson()
.that(generateActualJsonWithHandle("2-ROID"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullContact("2-ROID", "active", BINKY_FULL_NAME, BINKY_ADDRESS)
.load("rdap_contact.json")));
verifyMetrics(1);
}
@@ -941,7 +963,14 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
void testHandleMatchContact_found_subtypeContacts() {
login("2-RegistrarTest");
action.subtypeParam = Optional.of("contacts");
runSuccessfulHandleTestWithBlinky("2-ROID", "rdap_contact.json");
rememberWildcardType("2-ROID");
assertAboutJson()
.that(generateActualJsonWithHandle("2-ROID"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullContact("2-ROID", "active", BINKY_FULL_NAME, BINKY_ADDRESS)
.load("rdap_contact.json")));
verifyMetrics(1);
}
@@ -956,7 +985,12 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
@Test
void testHandleMatchContact_found_specifyingSameRegistrar() {
action.registrarParam = Optional.of("2-RegistrarTest");
runSuccessfulHandleTestWithBlinky("2-ROID", "rdap_contact_no_personal_data_with_remark.json");
rememberWildcardType("2-ROID");
assertAboutJson()
.that(generateActualJsonWithHandle("2-ROID"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder().load("rdap_contact_no_personal_data_with_remark.json")));
verifyMetrics(1);
}
@@ -986,13 +1020,12 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
void testHandleMatchContact_found_deletedWhenLoggedInAsSameRegistrar() {
login("2-Registrar");
action.includeDeletedParam = Optional.of(true);
runSuccessfulHandleTest(
"6-ROID",
"6-ROID",
"",
"inactive",
"",
"rdap_contact_deleted.json");
rememberWildcardType("6-ROID");
assertAboutJson()
.that(generateActualJsonWithHandle("6-ROID"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder().addContact("6-ROID").load("rdap_contact_deleted.json")));
verifyMetrics(1);
}
@@ -1000,13 +1033,12 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
void testHandleMatchContact_found_deletedWhenLoggedInAsAdmin() {
loginAsAdmin();
action.includeDeletedParam = Optional.of(true);
runSuccessfulHandleTest(
"6-ROID",
"6-ROID",
"",
"inactive",
"",
"rdap_contact_deleted.json");
rememberWildcardType("6-ROID");
assertAboutJson()
.that(generateActualJsonWithHandle("6-ROID"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder().addContact("6-ROID").load("rdap_contact_deleted.json")));
verifyMetrics(1);
}
@@ -1029,13 +1061,12 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
void testHandleMatchContact_found_deletedWildcardWhenLoggedInAsSameRegistrar() {
login("2-Registrar");
action.includeDeletedParam = Optional.of(true);
runSuccessfulHandleTest(
"6-ROI*",
"6-ROID",
"",
"inactive",
"",
"rdap_contact_deleted.json");
rememberWildcardType("6-ROI*");
assertAboutJson()
.that(generateActualJsonWithHandle("6-ROI*"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder().addContact("6-ROID").load("rdap_contact_deleted.json")));
verifyMetrics(1);
}
@@ -1043,33 +1074,53 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
void testHandleMatchContact_found_deletedWildcardWhenLoggedInAsAdmin() {
loginAsAdmin();
action.includeDeletedParam = Optional.of(true);
runSuccessfulHandleTest(
"6-ROI*",
"6-ROID",
"",
"inactive",
"",
"rdap_contact_deleted.json");
rememberWildcardType("6-ROI*");
assertAboutJson()
.that(generateActualJsonWithHandle("6-ROI*"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder().addContact("6-ROID").load("rdap_contact_deleted.json")));
verifyMetrics(1);
}
@Test
void testHandleMatchRegistrar_found() {
runSuccessfulHandleTest("20", "20", "Yes Virginia <script>", "rdap_registrar.json");
rememberWildcardType("20");
assertAboutJson()
.that(generateActualJsonWithHandle("20"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullRegistrar("20", "Yes Virginia <script>", "active", null)
.load("rdap_registrar.json")));
verifyMetrics(0);
}
@Test
void testHandleMatchRegistrar_found_subtypeAll() {
action.subtypeParam = Optional.of("all");
runSuccessfulHandleTest("20", "20", "Yes Virginia <script>", "rdap_registrar.json");
rememberWildcardType("20");
assertAboutJson()
.that(generateActualJsonWithHandle("20"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullRegistrar("20", "Yes Virginia <script>", "active", null)
.load("rdap_registrar.json")));
verifyMetrics(0);
}
@Test
void testHandleMatchRegistrar_found_subtypeRegistrars() {
action.subtypeParam = Optional.of("registrars");
runSuccessfulHandleTest("20", "20", "Yes Virginia <script>", "rdap_registrar.json");
rememberWildcardType("20");
assertAboutJson()
.that(generateActualJsonWithHandle("20"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullRegistrar("20", "Yes Virginia <script>", "active", null)
.load("rdap_registrar.json")));
verifyMetrics(0);
}
@@ -1083,7 +1134,14 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
@Test
void testHandleMatchRegistrar_found_specifyingSameRegistrar() {
action.registrarParam = Optional.of("2-Registrar");
runSuccessfulHandleTest("20", "20", "Yes Virginia <script>", "rdap_registrar.json");
rememberWildcardType("20");
assertAboutJson()
.that(generateActualJsonWithHandle("20"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullRegistrar("20", "Yes Virginia <script>", "active", null)
.load("rdap_registrar.json")));
verifyMetrics(0);
}
@@ -1098,14 +1156,28 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
void testHandleMatchContact_found_wildcardWithResultSetSizeOne() {
login("2-RegistrarTest");
action.rdapResultSetMaxSize = 1;
runSuccessfulHandleTestWithBlinky("2-R*", "rdap_contact.json");
rememberWildcardType("2-R*");
assertAboutJson()
.that(generateActualJsonWithHandle("2-R*"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullContact("2-ROID", "active", BINKY_FULL_NAME, BINKY_ADDRESS)
.load("rdap_contact.json")));
verifyMetrics(1);
}
@Test
void testHandleMatchContact_found_wildcard() {
login("2-RegistrarTest");
runSuccessfulHandleTestWithBlinky("2-RO*", "rdap_contact.json");
rememberWildcardType("2-R*");
assertAboutJson()
.that(generateActualJsonWithHandle("2-R*"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullContact("2-ROID", "active", BINKY_FULL_NAME, BINKY_ADDRESS)
.load("rdap_contact.json")));
verifyMetrics(1);
}
@@ -1113,7 +1185,14 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
void testHandleMatchContact_found_wildcardSpecifyingSameRegistrar() {
action.registrarParam = Optional.of("2-RegistrarTest");
login("2-RegistrarTest");
runSuccessfulHandleTestWithBlinky("2-RO*", "rdap_contact.json");
rememberWildcardType("2-RO*");
assertAboutJson()
.that(generateActualJsonWithHandle("2-RO*"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullContact("2-ROID", "active", BINKY_FULL_NAME, BINKY_ADDRESS)
.load("rdap_contact.json")));
verifyMetrics(1);
}
@@ -1128,7 +1207,14 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
@Test
void testHandleMatchContact_found_deleted() {
login("2-RegistrarTest");
runSuccessfulHandleTestWithBlinky("2-RO*", "rdap_contact.json");
rememberWildcardType("2-R*");
assertAboutJson()
.that(generateActualJsonWithHandle("2-R*"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullContact("2-ROID", "active", BINKY_FULL_NAME, BINKY_ADDRESS)
.load("rdap_contact.json")));
verifyMetrics(1);
}
@@ -1245,7 +1331,14 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
void testHandleMatchRegistrar_found_inactiveAsSameRegistrar() {
action.includeDeletedParam = Optional.of(true);
login("2-RegistrarInact");
runSuccessfulHandleTest("21", "21", "No Way", "inactive", null, "rdap_registrar.json");
rememberWildcardType("21");
assertAboutJson()
.that(generateActualJsonWithHandle("21"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullRegistrar("21", "No Way", "inactive", null)
.load("rdap_registrar.json")));
verifyMetrics(0);
}
@@ -1253,7 +1346,14 @@ class RdapEntitySearchActionTest extends RdapSearchActionTestCase<RdapEntitySear
void testHandleMatchRegistrar_found_inactiveAsAdmin() {
action.includeDeletedParam = Optional.of(true);
loginAsAdmin();
runSuccessfulHandleTest("21", "21", "No Way", "inactive", null, "rdap_registrar.json");
rememberWildcardType("21");
assertAboutJson()
.that(generateActualJsonWithHandle("21"))
.isEqualTo(
addBoilerplate(
jsonFileBuilder()
.addFullRegistrar("21", "No Way", "inactive", null)
.load("rdap_registrar.json")));
verifyMetrics(0);
}
}

6
core/src/test/java/google/registry/rdap/RdapHelpActionTest.java
View File

@@ -48,13 +48,15 @@ class RdapHelpActionTest extends RdapActionBaseTestCase<RdapHelpAction> {
@Test
void testHelpActionDefault_getsIndex() {
assertThat(generateActualJson("")).isEqualTo(loadJsonFile("rdap_help_index.json"));
assertThat(generateActualJson(""))
.isEqualTo(loadJsonFile("rdap_help_index.json", "POSSIBLE_SLASH", ""));
assertThat(response.getStatus()).isEqualTo(200);
}
@Test
void testHelpActionSlash_getsIndex() {
assertThat(generateActualJson("/")).isEqualTo(loadJsonFile("rdap_help_index.json"));
assertThat(generateActualJson("/"))
.isEqualTo(loadJsonFile("rdap_help_index.json", "POSSIBLE_SLASH", "/"));
assertThat(response.getStatus()).isEqualTo(200);
}

167
core/src/test/java/google/registry/rdap/RdapNameserverActionTest.java
View File

@@ -15,15 +15,12 @@
package google.registry.rdap;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.rdap.RdapTestHelper.loadJsonFile;
import static google.registry.testing.DatabaseHelper.createTld;
import static google.registry.testing.DatabaseHelper.persistResource;
import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrar;
import static google.registry.testing.GsonSubject.assertAboutJson;
import static org.mockito.Mockito.verify;
import com.google.common.collect.ImmutableMap;
import com.google.gson.JsonObject;
import google.registry.model.registrar.Registrar;
import google.registry.rdap.RdapMetrics.EndpointType;
import google.registry.rdap.RdapMetrics.SearchType;
@@ -32,7 +29,6 @@ import google.registry.rdap.RdapSearchResults.IncompletenessWarningType;
import google.registry.request.Action;
import google.registry.testing.FullFieldsTestEntityHelper;
import java.util.Optional;
import javax.annotation.Nullable;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -72,37 +68,6 @@ class RdapNameserverActionTest extends RdapActionBaseTestCase<RdapNameserverActi
"ns1.domain.external", "9.10.11.12", clock.nowUtc().minusYears(1));
}
private JsonObject generateExpectedJson(
String name,
@Nullable ImmutableMap<String, String> otherSubstitutions,
String expectedOutputFile) {
ImmutableMap.Builder<String, String> builder = new ImmutableMap.Builder<>();
builder.put("TYPE", "nameserver");
builder.put("NAME", name);
boolean punycodeSet = false;
if (otherSubstitutions != null) {
builder.putAll(otherSubstitutions);
if (otherSubstitutions.containsKey("PUNYCODENAME")) {
punycodeSet = true;
}
}
if (!punycodeSet) {
builder.put("PUNYCODENAME", name);
}
return loadJsonFile(
expectedOutputFile,
builder.build());
}
private JsonObject generateExpectedJsonWithTopLevelEntries(
String name,
@Nullable ImmutableMap<String, String> otherSubstitutions,
String expectedOutputFile) {
JsonObject obj = generateExpectedJson(name, otherSubstitutions, expectedOutputFile);
RdapTestHelper.addNonDomainBoilerplateNotices(obj, "https://example.tld/rdap/");
return obj;
}
@Test
void testInvalidNameserver_returns400() {
assertAboutJson()
@@ -126,14 +91,11 @@ class RdapNameserverActionTest extends RdapActionBaseTestCase<RdapNameserverActi
assertAboutJson()
.that(generateActualJson("ns1.cat.lol"))
.isEqualTo(
generateExpectedJsonWithTopLevelEntries(
"ns1.cat.lol",
ImmutableMap.of(
"HANDLE", "2-ROID",
"ADDRESSTYPE", "v4",
"ADDRESS", "1.2.3.4",
"STATUS", "active"),
"rdap_host.json"));
addPermanentBoilerplateNotices(
jsonFileBuilder()
.addNameserver("ns1.cat.lol", "2-ROID")
.putAll("ADDRESSTYPE", "v4", "ADDRESS", "1.2.3.4", "STATUS", "active")
.load("rdap_host.json")));
assertThat(response.getStatus()).isEqualTo(200);
}
@@ -142,14 +104,11 @@ class RdapNameserverActionTest extends RdapActionBaseTestCase<RdapNameserverActi
assertAboutJson()
.that(generateActualJson("ns1.cat.lol."))
.isEqualTo(
generateExpectedJsonWithTopLevelEntries(
"ns1.cat.lol",
ImmutableMap.of(
"HANDLE", "2-ROID",
"ADDRESSTYPE", "v4",
"ADDRESS", "1.2.3.4",
"STATUS", "active"),
"rdap_host.json"));
addPermanentBoilerplateNotices(
jsonFileBuilder()
.addNameserver("ns1.cat.lol", "2-ROID")
.putAll("ADDRESSTYPE", "v4", "ADDRESS", "1.2.3.4", "STATUS", "active")
.load("rdap_host.json")));
assertThat(response.getStatus()).isEqualTo(200);
}
@@ -158,14 +117,11 @@ class RdapNameserverActionTest extends RdapActionBaseTestCase<RdapNameserverActi
assertAboutJson()
.that(generateActualJson("Ns1.CaT.lOl."))
.isEqualTo(
generateExpectedJsonWithTopLevelEntries(
"ns1.cat.lol",
ImmutableMap.of(
"HANDLE", "2-ROID",
"ADDRESSTYPE", "v4",
"ADDRESS", "1.2.3.4",
"STATUS", "active"),
"rdap_host.json"));
addPermanentBoilerplateNotices(
jsonFileBuilder()
.addNameserver("ns1.cat.lol", "2-ROID")
.putAll("ADDRESSTYPE", "v4", "ADDRESS", "1.2.3.4", "STATUS", "active")
.load("rdap_host.json")));
assertThat(response.getStatus()).isEqualTo(200);
}
@@ -174,14 +130,11 @@ class RdapNameserverActionTest extends RdapActionBaseTestCase<RdapNameserverActi
assertAboutJson()
.that(generateActualJson("ns1.cat.lol?key=value"))
.isEqualTo(
generateExpectedJsonWithTopLevelEntries(
"ns1.cat.lol",
ImmutableMap.of(
"HANDLE", "2-ROID",
"ADDRESSTYPE", "v4",
"ADDRESS", "1.2.3.4",
"STATUS", "active"),
"rdap_host.json"));
addPermanentBoilerplateNotices(
jsonFileBuilder()
.addNameserver("ns1.cat.lol", "2-ROID")
.putAll("ADDRESSTYPE", "v4", "ADDRESS", "1.2.3.4", "STATUS", "active")
.load("rdap_host.json")));
assertThat(response.getStatus()).isEqualTo(200);
}
@@ -190,15 +143,11 @@ class RdapNameserverActionTest extends RdapActionBaseTestCase<RdapNameserverActi
assertAboutJson()
.that(generateActualJson("ns1.cat.みんな"))
.isEqualTo(
generateExpectedJsonWithTopLevelEntries(
"ns1.cat.みんな",
ImmutableMap.of(
"PUNYCODENAME", "ns1.cat.xn--q9jyb4c",
"HANDLE", "5-ROID",
"ADDRESSTYPE", "v6",
"ADDRESS", "bad:f00d:cafe::15:beef",
"STATUS", "active"),
"rdap_host_unicode.json"));
addPermanentBoilerplateNotices(
jsonFileBuilder()
.addNameserver("ns1.cat.みんな", "5-ROID")
.putAll("ADDRESSTYPE", "v6", "ADDRESS", "bad:f00d:cafe::15:beef")
.load("rdap_host_unicode.json")));
assertThat(response.getStatus()).isEqualTo(200);
}
@@ -207,15 +156,11 @@ class RdapNameserverActionTest extends RdapActionBaseTestCase<RdapNameserverActi
assertAboutJson()
.that(generateActualJson("ns1.cat.xn--q9jyb4c"))
.isEqualTo(
generateExpectedJsonWithTopLevelEntries(
"ns1.cat.みんな",
ImmutableMap.of(
"PUNYCODENAME", "ns1.cat.xn--q9jyb4c",
"HANDLE", "5-ROID",
"ADDRESSTYPE", "v6",
"ADDRESS", "bad:f00d:cafe::15:beef",
"STATUS", "active"),
"rdap_host_unicode.json"));
addPermanentBoilerplateNotices(
jsonFileBuilder()
.addNameserver("ns1.cat.みんな", "5-ROID")
.putAll("ADDRESSTYPE", "v6", "ADDRESS", "bad:f00d:cafe::15:beef")
.load("rdap_host_unicode.json")));
assertThat(response.getStatus()).isEqualTo(200);
}
@@ -224,14 +169,11 @@ class RdapNameserverActionTest extends RdapActionBaseTestCase<RdapNameserverActi
assertAboutJson()
.that(generateActualJson("ns1.domain.1.tld"))
.isEqualTo(
generateExpectedJsonWithTopLevelEntries(
"ns1.domain.1.tld",
ImmutableMap.of(
"HANDLE", "8-ROID",
"ADDRESSTYPE", "v4",
"ADDRESS", "5.6.7.8",
"STATUS", "active"),
"rdap_host.json"));
addPermanentBoilerplateNotices(
jsonFileBuilder()
.addNameserver("ns1.domain.1.tld", "8-ROID")
.putAll("ADDRESSTYPE", "v4", "ADDRESS", "5.6.7.8", "STATUS", "active")
.load("rdap_host.json")));
assertThat(response.getStatus()).isEqualTo(200);
}
@@ -240,14 +182,11 @@ class RdapNameserverActionTest extends RdapActionBaseTestCase<RdapNameserverActi
assertAboutJson()
.that(generateActualJson("ns1.domain.external"))
.isEqualTo(
generateExpectedJsonWithTopLevelEntries(
"ns1.domain.external",
ImmutableMap.of(
"HANDLE", "C-ROID",
"ADDRESSTYPE", "v4",
"ADDRESS", "9.10.11.12",
"STATUS", "active"),
"rdap_host.json"));
addPermanentBoilerplateNotices(
jsonFileBuilder()
.addNameserver("ns1.domain.external", "C-ROID")
.putAll("ADDRESSTYPE", "v4", "ADDRESS", "9.10.11.12", "STATUS", "active")
.load("rdap_host.json")));
assertThat(response.getStatus()).isEqualTo(200);
}
@@ -287,14 +226,11 @@ class RdapNameserverActionTest extends RdapActionBaseTestCase<RdapNameserverActi
assertAboutJson()
.that(generateActualJson("nsdeleted.cat.lol"))
.isEqualTo(
generateExpectedJsonWithTopLevelEntries(
"nsdeleted.cat.lol",
ImmutableMap.of(
"HANDLE", "A-ROID",
"ADDRESSTYPE", "v4",
"ADDRESS", "1.2.3.4",
"STATUS", "inactive"),
"rdap_host.json"));
addPermanentBoilerplateNotices(
jsonFileBuilder()
.addNameserver("nsdeleted.cat.lol", "A-ROID")
.putAll("ADDRESSTYPE", "v4", "ADDRESS", "1.2.3.4", "STATUS", "inactive")
.load("rdap_host.json")));
assertThat(response.getStatus()).isEqualTo(200);
}
@@ -305,14 +241,11 @@ class RdapNameserverActionTest extends RdapActionBaseTestCase<RdapNameserverActi
assertAboutJson()
.that(generateActualJson("nsdeleted.cat.lol"))
.isEqualTo(
generateExpectedJsonWithTopLevelEntries(
"nsdeleted.cat.lol",
ImmutableMap.of(
"HANDLE", "A-ROID",
"ADDRESSTYPE", "v4",
"ADDRESS", "1.2.3.4",
"STATUS", "inactive"),
"rdap_host.json"));
addPermanentBoilerplateNotices(
jsonFileBuilder()
.addNameserver("nsdeleted.cat.lol", "A-ROID")
.putAll("ADDRESSTYPE", "v4", "ADDRESS", "1.2.3.4", "STATUS", "inactive")
.load("rdap_host.json")));
assertThat(response.getStatus()).isEqualTo(200);
}

105
core/src/test/java/google/registry/rdap/RdapNameserverSearchActionTest.java
View File

@@ -158,26 +158,9 @@ class RdapNameserverSearchActionTest extends RdapSearchActionTestCase<RdapNamese
action.nameParam = Optional.empty();
}
private JsonObject generateExpectedJsonForNameserver(
String name,
String punycodeName,
String handle,
String ipAddressType,
String ipAddress,
String expectedOutputFile) {
JsonObject obj =
loadJsonFile(
expectedOutputFile,
"NAME", name,
"PUNYCODENAME", punycodeName,
"HANDLE", handle,
"ADDRESSTYPE", ipAddressType,
"ADDRESS", ipAddress,
"STATUS", "active",
"TYPE", "nameserver");
obj = RdapTestHelper.wrapInSearchReply("nameserverSearchResults", obj);
RdapTestHelper.addNonDomainBoilerplateNotices(obj, "https://example.tld/rdap/");
return obj;
private JsonObject addBoilerplate(JsonObject jsonObject) {
jsonObject = RdapTestHelper.wrapInSearchReply("nameserverSearchResults", jsonObject);
return addPermanentBoilerplateNotices(jsonObject);
}
private void createManyHosts(int numHosts) {
@@ -318,8 +301,11 @@ class RdapNameserverSearchActionTest extends RdapSearchActionTestCase<RdapNamese
assertAboutJson()
.that(generateActualJsonWithName("ns1.cat.lol"))
.isEqualTo(
generateExpectedJsonForNameserver(
"ns1.cat.lol", null, "2-ROID", "v4", "1.2.3.4", "rdap_host_linked.json"));
addBoilerplate(
jsonFileBuilder()
.addNameserver("ns1.cat.lol", "2-ROID")
.putAll("ADDRESSTYPE", "v4", "ADDRESS", "1.2.3.4")
.load("rdap_host_linked.json")));
assertThat(response.getStatus()).isEqualTo(200);
verifyMetrics(1);
}
@@ -329,8 +315,11 @@ class RdapNameserverSearchActionTest extends RdapSearchActionTestCase<RdapNamese
assertAboutJson()
.that(generateActualJsonWithName("Ns1.CaT.lOl"))
.isEqualTo(
generateExpectedJsonForNameserver(
"ns1.cat.lol", null, "2-ROID", "v4", "1.2.3.4", "rdap_host_linked.json"));
addBoilerplate(
jsonFileBuilder()
.addNameserver("ns1.cat.lol", "2-ROID")
.putAll("ADDRESSTYPE", "v4", "ADDRESS", "1.2.3.4")
.load("rdap_host_linked.json")));
assertThat(response.getStatus()).isEqualTo(200);
verifyMetrics(1);
}
@@ -356,13 +345,11 @@ class RdapNameserverSearchActionTest extends RdapSearchActionTestCase<RdapNamese
assertAboutJson()
.that(generateActualJsonWithName("ns2.cat.lol"))
.isEqualTo(
generateExpectedJsonForNameserver(
"ns2.cat.lol",
null,
"4-ROID",
"v6",
"bad:f00d:cafe::15:beef",
"rdap_host_linked.json"));
addBoilerplate(
jsonFileBuilder()
.addNameserver("ns2.cat.lol", "4-ROID")
.putAll("ADDRESSTYPE", "v6", "ADDRESS", "bad:f00d:cafe::15:beef")
.load("rdap_host_linked.json")));
assertThat(response.getStatus()).isEqualTo(200);
verifyMetrics(1);
}
@@ -380,8 +367,10 @@ class RdapNameserverSearchActionTest extends RdapSearchActionTestCase<RdapNamese
assertAboutJson()
.that(generateActualJsonWithName("ns1.cat.external"))
.isEqualTo(
generateExpectedJsonForNameserver(
"ns1.cat.external", null, "8-ROID", null, null, "rdap_host_external.json"));
addBoilerplate(
jsonFileBuilder()
.addNameserver("ns1.cat.external", "8-ROID")
.load("rdap_host_external.json")));
assertThat(response.getStatus()).isEqualTo(200);
verifyMetrics(1);
}
@@ -391,13 +380,11 @@ class RdapNameserverSearchActionTest extends RdapSearchActionTestCase<RdapNamese
assertAboutJson()
.that(generateActualJsonWithName("ns1.cat.みんな"))
.isEqualTo(
generateExpectedJsonForNameserver(
"ns1.cat.みんな",
"ns1.cat.xn--q9jyb4c",
"B-ROID",
"v4",
"1.2.3.5",
"rdap_host_unicode.json"));
addBoilerplate(
jsonFileBuilder()
.addNameserver("ns1.cat.みんな", "B-ROID")
.putAll("ADDRESSTYPE", "v4", "ADDRESS", "1.2.3.5")
.load("rdap_host_unicode.json")));
metricWildcardType = WildcardType.NO_WILDCARD;
metricPrefixLength = 19;
assertThat(response.getStatus()).isEqualTo(200);
@@ -409,13 +396,11 @@ class RdapNameserverSearchActionTest extends RdapSearchActionTestCase<RdapNamese
assertAboutJson()
.that(generateActualJsonWithName("ns1.cat.xn--q9jyb4c"))
.isEqualTo(
generateExpectedJsonForNameserver(
"ns1.cat.みんな",
"ns1.cat.xn--q9jyb4c",
"B-ROID",
"v4",
"1.2.3.5",
"rdap_host_unicode.json"));
addBoilerplate(
jsonFileBuilder()
.addNameserver("ns1.cat.みんな", "B-ROID")
.putAll("ADDRESSTYPE", "v4", "ADDRESS", "1.2.3.5")
.load("rdap_host_unicode.json")));
assertThat(response.getStatus()).isEqualTo(200);
verifyMetrics(1);
}
@@ -425,8 +410,11 @@ class RdapNameserverSearchActionTest extends RdapSearchActionTestCase<RdapNamese
assertAboutJson()
.that(generateActualJsonWithName("ns1.cat.1.test"))
.isEqualTo(
generateExpectedJsonForNameserver(
"ns1.cat.1.test", null, "E-ROID", "v4", "1.2.3.6", "rdap_host.json"));
addBoilerplate(
jsonFileBuilder()
.addNameserver("ns1.cat.1.test", "E-ROID")
.putAll("ADDRESSTYPE", "v4", "ADDRESS", "1.2.3.6", "STATUS", "active")
.load("rdap_host.json")));
assertThat(response.getStatus()).isEqualTo(200);
verifyMetrics(1);
}
@@ -553,13 +541,11 @@ class RdapNameserverSearchActionTest extends RdapSearchActionTestCase<RdapNamese
assertAboutJson()
.that(generateActualJsonWithName("ns*.cat.lol"))
.isEqualTo(
generateExpectedJsonForNameserver(
"ns2.cat.lol",
null,
"4-ROID",
"v6",
"bad:f00d:cafe::15:beef",
"rdap_host_linked.json"));
addBoilerplate(
jsonFileBuilder()
.addNameserver("ns2.cat.lol", "4-ROID")
.putAll("ADDRESSTYPE", "v6", "ADDRESS", "bad:f00d:cafe::15:beef")
.load("rdap_host_linked.json")));
assertThat(response.getStatus()).isEqualTo(200);
verifyMetrics(2);
}
@@ -749,8 +735,11 @@ class RdapNameserverSearchActionTest extends RdapSearchActionTestCase<RdapNamese
assertAboutJson()
.that(generateActualJsonWithIp("1.2.3.4"))
.isEqualTo(
generateExpectedJsonForNameserver(
"ns1.cat.lol", null, "2-ROID", "v4", "1.2.3.4", "rdap_host_linked.json"));
addBoilerplate(
jsonFileBuilder()
.addNameserver("ns1.cat.lol", "2-ROID")
.putAll("ADDRESSTYPE", "v4", "ADDRESS", "1.2.3.4")
.load("rdap_host_linked.json")));
assertThat(response.getStatus()).isEqualTo(200);
verifyMetrics(1);
}

103
core/src/test/java/google/registry/rdap/RdapTestHelper.java
View File

@@ -45,107 +45,6 @@ class RdapTestHelper {
CONTACT
}
private static JsonObject createTosNotice(String linkBase) {
return GSON.toJsonTree(
ImmutableMap.of(
"title", "RDAP Terms of Service",
"description",
ImmutableList.of(
"By querying our Domain Database, you are agreeing to comply with these"
+ " terms so please read them carefully.",
"Any information provided is 'as is' without any guarantee of accuracy.",
"Please do not misuse the Domain Database. It is intended solely for"
+ " query-based access.",
"Don't use the Domain Database to allow, enable, or otherwise support the"
+ " transmission of mass unsolicited, commercial advertising or"
+ " solicitations.",
"Don't access our Domain Database through the use of high volume, automated"
+ " electronic processes that send queries or data to the systems of"
+ " any ICANN-accredited registrar.",
"You may only use the information contained in the Domain Database for"
+ " lawful purposes.",
"Do not compile, repackage, disseminate, or otherwise use the information"
+ " contained in the Domain Database in its entirety, or in any"
+ " substantial portion, without our prior written permission.",
"We may retain certain details about queries to our Domain Database for the"
+ " purposes of detecting and preventing misuse.",
"We reserve the right to restrict or deny your access to the database if we"
+ " suspect that you have failed to comply with these terms.",
"We reserve the right to modify this agreement at any time."),
"links",
ImmutableList.of(
ImmutableMap.of(
"rel", "self",
"href", linkBase + "help/tos",
"type", "application/rdap+json"),
ImmutableMap.of(
"rel", "alternate",
"href", "https://www.registry.tld/about/rdap/tos.html",
"type", "text/html"))))
.getAsJsonObject();
}
static void addNonDomainBoilerplateNotices(JsonObject jsonObject, String linkBase) {
if (!jsonObject.has("notices")) {
jsonObject.add("notices", new JsonArray());
}
JsonArray notices = jsonObject.getAsJsonArray("notices");
notices.add(createTosNotice(linkBase));
notices.add(
GSON.toJsonTree(
ImmutableMap.of(
"description",
ImmutableList.of(
"This response conforms to the RDAP Operational Profile for gTLD"
+ " Registries and Registrars version 1.0"))));
}
static void addDomainBoilerplateNotices(JsonObject jsonObject, String linkBase) {
if (!jsonObject.has("notices")) {
jsonObject.add("notices", new JsonArray());
}
JsonArray notices = jsonObject.getAsJsonArray("notices");
notices.add(createTosNotice(linkBase));
notices.add(
GSON.toJsonTree(
ImmutableMap.of(
"description",
ImmutableList.of(
"This response conforms to the RDAP Operational Profile for gTLD"
+ " Registries and Registrars version 1.0"))));
notices.add(
GSON.toJsonTree(
ImmutableMap.of(
"title",
"Status Codes",
"description",
ImmutableList.of(
"For more information on domain status codes, please visit"
+ " https://icann.org/epp"),
"links",
ImmutableList.of(
ImmutableMap.of(
"rel", "alternate",
"href", "https://icann.org/epp",
"type", "text/html")))));
notices.add(
GSON.toJsonTree(
ImmutableMap.of(
"title",
"RDDS Inaccuracy Complaint Form",
"description",
ImmutableList.of(
"URL of the ICANN RDDS Inaccuracy Complaint Form: https://icann.org/wicf"),
"links",
ImmutableList.of(
ImmutableMap.of(
"rel", "alternate",
"href", "https://icann.org/wicf",
"type", "text/html")))));
}
static RdapJsonFormatter getTestRdapJsonFormatter(Clock clock) {
RdapJsonFormatter rdapJsonFormatter = new RdapJsonFormatter();
rdapJsonFormatter.rdapAuthorization = RdapAuthorization.PUBLIC_AUTHORIZATION;
@@ -174,7 +73,7 @@ class RdapTestHelper {
"We reserve the right to restrict or deny your access to the database if we"
+ " suspect that you have failed to comply with these terms.",
"We reserve the right to modify this agreement at any time.");
rdapJsonFormatter.rdapTosStaticUrl = "https://www.registry.tld/about/rdap/tos.html";
rdapJsonFormatter.rdapTosStaticUrl = "https://www.example.tld/about/rdap/tos.html";
return rdapJsonFormatter;
}

11
core/src/test/resources/google/registry/rdap/rdap_associated_contact.json
View File

@@ -5,13 +5,14 @@
"icann_rdap_technical_implementation_guide_0"
],
"objectClassName": "entity",
"handle": "%NAME%",
"handle": "%CONTACT_HANDLE_1%",
"status": ["active", "associated"],
"links": [
{
"rel": "self",
"href": "https://example.tld/rdap/entity/%NAME%",
"type": "application/rdap+json"
"href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_1%",
"type": "application/rdap+json",
"value": "%REQUEST_URL%"
}
],
"events": [
@@ -25,13 +26,13 @@
"vcard",
[
["version", {}, "text", "4.0"],
["fn", {}, "text", "%FULLNAME%"],
["fn", {}, "text", "%CONTACT_FULLNAME_1%"],
["org", {}, "text", "GOOGLE INCORPORATED <script>"],
["adr", {}, "text",
[
"",
"",
[ %ADDRESS% ],
[ %CONTACT_ADDRESS_1% ],
"KOKOMO",
"BM",
"31337",

3
core/src/test/resources/google/registry/rdap/rdap_associated_contact_no_personal_data.json
View File

@@ -27,7 +27,8 @@
{
"type":"text\/html",
"href": "https:\/\/github.com\/google\/nomulus\/blob\/master\/docs\/rdap.md#authentication",
"rel": "alternate"
"rel": "alternate",
"value": "%REQUEST_URL%"
}
],
"description": [

13
core/src/test/resources/google/registry/rdap/rdap_contact.json
View File

@@ -5,14 +5,15 @@
"icann_rdap_technical_implementation_guide_0"
],
"objectClassName" : "entity",
"handle" : "%NAME%",
"status" : ["%STATUS%"],
"handle" : "%CONTACT_HANDLE_1%",
"status" : ["%STATUS_1%"],
"links" :
[
{
"rel" : "self",
"href": "https://example.tld/rdap/entity/%NAME%",
"type" : "application/rdap+json"
"href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_1%",
"type" : "application/rdap+json",
"value": "%REQUEST_URL%"
}
],
"events": [
@@ -26,13 +27,13 @@
"vcard",
[
["version", {}, "text", "4.0"],
["fn", {}, "text", "%FULLNAME%"],
["fn", {}, "text", "%CONTACT_FULLNAME_1%"],
["org", {}, "text", "GOOGLE INCORPORATED <script>"],
["adr", {}, "text",
[
"",
"",
[ %ADDRESS% ],
[ %CONTACT_ADDRESS_1% ],
"KOKOMO",
"BM",
"31337",

8
core/src/test/resources/google/registry/rdap/rdap_contact_deleted.json
View File

@@ -5,14 +5,15 @@
"icann_rdap_technical_implementation_guide_0"
],
"objectClassName" : "entity",
"handle" : "%NAME%",
"handle" : "%CONTACT_HANDLE_1%",
"status" : ["inactive"],
"links" :
[
{
"rel" : "self",
"href": "https://example.tld/rdap/entity/%NAME%",
"type" : "application/rdap+json"
"href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_1%",
"type" : "application/rdap+json",
"value": "%REQUEST_URL%"
}
],
"events":
@@ -38,5 +39,4 @@
]
}
]
}

3
core/src/test/resources/google/registry/rdap/rdap_contact_no_personal_data_with_remark.json
View File

@@ -32,7 +32,8 @@
{
"rel" : "alternate",
"href" : "https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
"type" : "text/html"
"type" : "text/html",
"value": "https://example.tld/rdap/entities"
}
]
},

27
core/src/test/resources/google/registry/rdap/rdap_domain.json
View File

@@ -17,17 +17,20 @@
{
"href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
},
{
"href": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related"
"rel": "related",
"value": "%REQUEST_URL%"
},
{
"href": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related"
"rel": "related",
"value": "%REQUEST_URL%"
}
],
"events": [
@@ -58,7 +61,8 @@
{
"href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"remarks": [
@@ -79,7 +83,8 @@
{
"href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_2%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"remarks": [
@@ -115,7 +120,8 @@
{
"href": "https://example.tld/rdap/entity/1",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"vcardArray" : [
@@ -160,7 +166,8 @@
{
"href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"vcardArray": [
@@ -197,7 +204,8 @@
{
"href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_2%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"vcardArray": [
@@ -236,7 +244,8 @@
{
"href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_3%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"vcardArray": [

12
core/src/test/resources/google/registry/rdap/rdap_domain_add_grace_period.json
View File

@@ -13,7 +13,8 @@
{
"href": "https://example.tld/rdap/entity/1",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/domain/addgraceperiod.lol"
}
],
"publicIds": [
@@ -65,7 +66,8 @@
{
"href": "https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
"rel": "alternate",
"type": "text/html"
"type": "text/html",
"value": "https://example.tld/rdap/domain/addgraceperiod.lol"
}
],
"title": "REDACTED FOR PRIVACY",
@@ -124,7 +126,8 @@
{
"href": "https://example.tld/rdap/domain/addgraceperiod.lol",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/domain/addgraceperiod.lol"
}
],
"nameservers": [
@@ -136,7 +139,8 @@
{
"href": "https://example.tld/rdap/nameserver/ns1.cat.lol",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/domain/addgraceperiod.lol"
}
],
"remarks": [

12
core/src/test/resources/google/registry/rdap/rdap_domain_auto_renew_grace_period.json
View File

@@ -13,7 +13,8 @@
{
"href": "https://example.tld/rdap/entity/1",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/domain/autorenew.lol"
}
],
"publicIds": [
@@ -65,7 +66,8 @@
{
"href": "https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
"rel": "alternate",
"type": "text/html"
"type": "text/html",
"value": "https://example.tld/rdap/domain/autorenew.lol"
}
],
"title": "REDACTED FOR PRIVACY",
@@ -128,7 +130,8 @@
{
"href": "https://example.tld/rdap/domain/autorenew.lol",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/domain/autorenew.lol"
}
],
"nameservers": [
@@ -140,7 +143,8 @@
{
"href": "https://example.tld/rdap/nameserver/ns1.cat.lol",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/domain/autorenew.lol"
}
],
"remarks": [

27
core/src/test/resources/google/registry/rdap/rdap_domain_cat2.json
View File

@@ -17,17 +17,20 @@
{
"href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domains"
},
{
"href": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related"
"rel": "related",
"value": "https://example.tld/rdap/domains"
},
{
"href": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related"
"rel": "related",
"value": "https://example.tld/rdap/domains"
}
],
"events": [
@@ -58,7 +61,8 @@
{
"href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domains"
}
],
"remarks": [
@@ -77,7 +81,8 @@
{
"href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_2%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domains"
}
],
"remarks": [
@@ -98,7 +103,8 @@
{
"href": "https://example.tld/rdap/entity/1",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domains"
}
],
"vcardArray" : [
@@ -149,7 +155,8 @@
{
"href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"vcardArray": [
@@ -186,7 +193,8 @@
{
"href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_2%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"vcardArray": [
@@ -223,7 +231,8 @@
{
"href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_3%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"vcardArray": [

27
core/src/test/resources/google/registry/rdap/rdap_domain_deleted.json
View File

@@ -18,17 +18,20 @@
{
"href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
},
{
"href": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related"
"rel": "related",
"value": "%REQUEST_URL%"
},
{
"href": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related"
"rel": "related",
"value": "%REQUEST_URL%"
}
],
"events": [
@@ -64,7 +67,8 @@
{
"href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"remarks": [
@@ -83,7 +87,8 @@
{
"href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_2%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"remarks": [
@@ -110,7 +115,8 @@
{
"href": "https://example.tld/rdap/entity/1",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"vcardArray" : [
@@ -155,7 +161,8 @@
{
"href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"vcardArray": [
@@ -192,7 +199,8 @@
{
"href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_2%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"vcardArray": [
@@ -229,7 +237,8 @@
{
"href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_3%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"vcardArray": [

12
core/src/test/resources/google/registry/rdap/rdap_domain_explicit_renew_grace_period.json
View File

@@ -13,7 +13,8 @@
{
"href": "https://example.tld/rdap/entity/1",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/domain/renew.lol"
}
],
"publicIds": [
@@ -65,7 +66,8 @@
{
"href": "https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
"rel": "alternate",
"type": "text/html"
"type": "text/html",
"value": "https://example.tld/rdap/domain/renew.lol"
}
],
"title": "REDACTED FOR PRIVACY",
@@ -124,7 +126,8 @@
{
"href": "https://example.tld/rdap/domain/renew.lol",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/domain/renew.lol"
}
],
"nameservers": [
@@ -136,7 +139,8 @@
{
"href": "https://example.tld/rdap/nameserver/ns1.cat.lol",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/domain/renew.lol"
}
],
"remarks": [

18
core/src/test/resources/google/registry/rdap/rdap_domain_no_contacts_exist_with_remark.json
View File

@@ -17,17 +17,20 @@
{
"href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domain/cat.lol"
},
{
"href": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related"
"rel": "related",
"value": "https://example.tld/rdap/domain/cat.lol"
},
{
"href": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related"
"rel": "related",
"value": "https://example.tld/rdap/domain/cat.lol"
}
],
"events": [
@@ -58,7 +61,8 @@
{
"href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domain/cat.lol"
}
],
"remarks": [
@@ -77,7 +81,8 @@
{
"href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_2%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domain/cat.lol"
}
],
"remarks": [
@@ -105,7 +110,8 @@
{
"rel" : "self",
"href" : "https://example.tld/rdap/entity/1",
"type" : "application/rdap+json"
"type" : "application/rdap+json",
"value": "https://example.tld/rdap/domain/cat.lol"
}
],
"publicIds" : [

24
core/src/test/resources/google/registry/rdap/rdap_domain_no_registrant_with_remark.json
View File

@@ -17,17 +17,20 @@
{
"href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domain/cat.lol"
},
{
"href": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related"
"rel": "related",
"value": "https://example.tld/rdap/domain/cat.lol"
},
{
"href": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related"
"rel": "related",
"value": "https://example.tld/rdap/domain/cat.lol"
}
],
"events": [
@@ -58,7 +61,8 @@
{
"href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domain/cat.lol"
}
],
"remarks": [
@@ -77,7 +81,8 @@
{
"href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_2%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domain/cat.lol"
}
],
"remarks": [
@@ -105,7 +110,8 @@
{
"rel" : "self",
"href" : "https://example.tld/rdap/entity/1",
"type" : "application/rdap+json"
"type" : "application/rdap+json",
"value": "https://example.tld/rdap/domain/cat.lol"
}
],
"publicIds" : [
@@ -164,7 +170,8 @@
{
"href":"https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
"rel":"alternate",
"type":"text/html"
"type":"text/html",
"value": "https://example.tld/rdap/domain/cat.lol"
}
]
},
@@ -200,7 +207,8 @@
{
"href":"https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
"rel":"alternate",
"type":"text/html"
"type":"text/html",
"value": "https://example.tld/rdap/domain/cat.lol"
}
]
},

12
core/src/test/resources/google/registry/rdap/rdap_domain_pending_delete_redemption_grace_period.json
View File

@@ -13,7 +13,8 @@
{
"href": "https://example.tld/rdap/entity/1",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/domain/redemption.lol"
}
],
"publicIds": [
@@ -65,7 +66,8 @@
{
"href": "https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
"rel": "alternate",
"type": "text/html"
"type": "text/html",
"value": "https://example.tld/rdap/domain/redemption.lol"
}
],
"title": "REDACTED FOR PRIVACY",
@@ -124,7 +126,8 @@
{
"href": "https://example.tld/rdap/domain/redemption.lol",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/domain/redemption.lol"
}
],
"nameservers": [
@@ -136,7 +139,8 @@
{
"href": "https://example.tld/rdap/nameserver/ns1.cat.lol",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/domain/redemption.lol"
}
],
"remarks": [

27
core/src/test/resources/google/registry/rdap/rdap_domain_redacted_contacts_with_remark.json
View File

@@ -17,17 +17,20 @@
{
"href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
},
{
"href": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related"
"rel": "related",
"value": "%REQUEST_URL%"
},
{
"href": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related"
"rel": "related",
"value": "%REQUEST_URL%"
}
],
"events": [
@@ -58,7 +61,8 @@
{
"href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"remarks": [
@@ -77,7 +81,8 @@
{
"href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_2%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"remarks": [
@@ -105,7 +110,8 @@
{
"rel" : "self",
"href" : "https://example.tld/rdap/entity/1",
"type" : "application/rdap+json"
"type" : "application/rdap+json",
"value": "%REQUEST_URL%"
}
],
"publicIds" : [
@@ -164,7 +170,8 @@
{
"href":"https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
"rel":"alternate",
"type":"text/html"
"type":"text/html",
"value": "%REQUEST_URL%"
}
]
},
@@ -200,7 +207,8 @@
{
"href":"https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
"rel":"alternate",
"type":"text/html"
"type":"text/html",
"value": "%REQUEST_URL%"
}
]
},
@@ -237,7 +245,8 @@
{
"href":"https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
"rel":"alternate",
"type":"text/html"
"type":"text/html",
"value": "%REQUEST_URL%"
}
]
},

12
core/src/test/resources/google/registry/rdap/rdap_domain_transfer_grace_period.json
View File

@@ -13,7 +13,8 @@
{
"href": "https://example.tld/rdap/entity/1",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/domain/transfer.lol"
}
],
"publicIds": [
@@ -65,7 +66,8 @@
{
"href": "https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
"rel": "alternate",
"type": "text/html"
"type": "text/html",
"value": "https://example.tld/rdap/domain/transfer.lol"
}
],
"title": "REDACTED FOR PRIVACY",
@@ -124,7 +126,8 @@
{
"href": "https://example.tld/rdap/domain/transfer.lol",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/domain/transfer.lol"
}
],
"nameservers": [
@@ -136,7 +139,8 @@
{
"href": "https://example.tld/rdap/nameserver/ns1.cat.lol",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/domain/transfer.lol"
}
],
"remarks": [

27
core/src/test/resources/google/registry/rdap/rdap_domain_unicode.json
View File

@@ -18,17 +18,20 @@
{
"href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
},
{
"href": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related"
"rel": "related",
"value": "%REQUEST_URL%"
},
{
"href": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related"
"rel": "related",
"value": "%REQUEST_URL%"
}
],
"events": [
@@ -60,7 +63,8 @@
"href":
"https://example.tld/rdap/nameserver/%NAMESERVER_NAME_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"remarks": [
@@ -80,7 +84,8 @@
"href":
"https://example.tld/rdap/nameserver/%NAMESERVER_NAME_2%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"remarks": [
@@ -108,7 +113,8 @@
{
"href": "https://example.tld/rdap/entity/1",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"vcardArray" : [
@@ -159,7 +165,8 @@
{
"href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"vcardArray": [
@@ -196,7 +203,8 @@
{
"href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_2%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"vcardArray": [
@@ -233,7 +241,8 @@
{
"href": "https://example.tld/rdap/entity/%CONTACT_HANDLE_3%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"vcardArray": [

27
core/src/test/resources/google/registry/rdap/rdap_domain_unicode_no_contacts_with_remark.json
View File

@@ -18,17 +18,20 @@
{
"href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domains"
},
{
"href": "https://rdap.example.com/withSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related"
"rel": "related",
"value": "https://example.tld/rdap/domains"
},
{
"href": "https://rdap.example.com/withoutSlash/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "related"
"rel": "related",
"value": "https://example.tld/rdap/domains"
}
],
"events": [
@@ -60,7 +63,8 @@
{
"href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domains"
}
],
"remarks": [
@@ -80,7 +84,8 @@
{
"href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_2%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domains"
}
],
"remarks": [
@@ -108,7 +113,8 @@
{
"rel" : "self",
"href" : "https://example.tld/rdap/entity/1",
"type" : "application/rdap+json"
"type" : "application/rdap+json",
"value": "https://example.tld/rdap/domains"
}
],
"publicIds" : [
@@ -167,7 +173,8 @@
{
"href":"https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
"rel":"alternate",
"type":"text/html"
"type":"text/html",
"value": "https://example.tld/rdap/domains"
}
]
},
@@ -203,7 +210,8 @@
{
"href":"https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
"rel":"alternate",
"type":"text/html"
"type":"text/html",
"value": "https://example.tld/rdap/domains"
}
]
},
@@ -239,7 +247,8 @@
{
"href":"https://github.com/google/nomulus/blob/master/docs/rdap.md#authentication",
"rel":"alternate",
"type":"text/html"
"type":"text/html",
"value": "https://example.tld/rdap/domains"
}
]
},

35
core/src/test/resources/google/registry/rdap/rdap_domains_four_truncated.json
View File

@@ -8,7 +8,8 @@
{
"href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domains"
}
],
"remarks": [
@@ -27,7 +28,8 @@
{
"href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_2%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domains"
}
],
"remarks": [
@@ -46,7 +48,8 @@
{
"href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_3%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domains"
}
],
"remarks": [
@@ -65,7 +68,8 @@
{
"href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_4%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domains"
}
],
"remarks": [
@@ -100,7 +104,8 @@
{
"type" : "application/rdap+json",
"rel" : "next",
"href" : "https://example.tld/rdap/domains?%NEXT_QUERY%"
"href" : "https://example.tld/rdap/domains?%NEXT_QUERY%",
"value": "https://example.tld/rdap/domains"
}
]
},
@@ -124,12 +129,14 @@
{
"href": "https://example.tld/rdap/help/tos",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/domains"
},
{
"href": "https://www.registry.tld/about/rdap/tos.html",
"rel": "alternate",
"type": "text/html"
"href": "https://www.example.tld/about/rdap/tos.html",
"rel": "terms-of-service",
"type": "text/html",
"value": "https://example.tld/rdap/domains"
}
]
},
@@ -148,9 +155,10 @@
"links" :
[
{
"rel" : "alternate",
"rel" : "glossary",
"href" : "https://icann.org/epp",
"type" : "text/html"
"type" : "text/html",
"value": "https://example.tld/rdap/domains"
}
]
},
@@ -160,9 +168,10 @@
"links" :
[
{
"rel" : "alternate",
"rel" : "help",
"href" : "https://icann.org/wicf",
"type" : "text/html"
"type" : "text/html",
"value": "https://example.tld/rdap/domains"
}
]
}

32
core/src/test/resources/google/registry/rdap/rdap_domains_four_with_one_unicode.json
View File

@@ -8,7 +8,8 @@
{
"href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domains"
}
],
"remarks": [
@@ -27,7 +28,8 @@
{
"href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_2%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domains"
}
],
"remarks": [
@@ -46,7 +48,8 @@
{
"href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_3%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domains"
}
],
"remarks": [
@@ -66,7 +69,8 @@
{
"href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_4%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domains"
}
],
"remarks": [
@@ -105,12 +109,14 @@
{
"href": "https://example.tld/rdap/help/tos",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/domains"
},
{
"href": "https://www.registry.tld/about/rdap/tos.html",
"rel": "alternate",
"type": "text/html"
"href": "https://www.example.tld/about/rdap/tos.html",
"rel": "terms-of-service",
"type": "text/html",
"value": "https://example.tld/rdap/domains"
}
]
},
@@ -129,9 +135,10 @@
"links" :
[
{
"rel" : "alternate",
"rel" : "glossary",
"href" : "https://icann.org/epp",
"type" : "text/html"
"type" : "text/html",
"value": "https://example.tld/rdap/domains"
}
]
},
@@ -141,9 +148,10 @@
"links" :
[
{
"rel" : "alternate",
"rel" : "help",
"href" : "https://icann.org/wicf",
"type" : "text/html"
"type" : "text/html",
"value": "https://example.tld/rdap/domains"
}
]
}

35
core/src/test/resources/google/registry/rdap/rdap_domains_four_with_one_unicode_truncated.json
View File

@@ -8,7 +8,8 @@
{
"href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domains"
}
],
"remarks": [
@@ -27,7 +28,8 @@
{
"href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_2%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domains"
}
],
"remarks": [
@@ -46,7 +48,8 @@
{
"href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_3%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domains"
}
],
"remarks": [
@@ -66,7 +69,8 @@
{
"href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_4%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domains"
}
],
"remarks": [
@@ -101,7 +105,8 @@
{
"type" : "application/rdap+json",
"rel" : "next",
"href" : "https://example.tld/rdap/domains?%NEXT_QUERY%"
"href" : "https://example.tld/rdap/domains?%NEXT_QUERY%",
"value": "https://example.tld/rdap/domains"
}
]
},
@@ -125,12 +130,14 @@
{
"href": "https://example.tld/rdap/help/tos",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/domains"
},
{
"href": "https://www.registry.tld/about/rdap/tos.html",
"rel": "alternate",
"type": "text/html"
"href": "https://www.example.tld/about/rdap/tos.html",
"rel": "terms-of-service",
"type": "text/html",
"value": "https://example.tld/rdap/domains"
}
]
},
@@ -149,9 +156,10 @@
"links" :
[
{
"rel" : "alternate",
"rel" : "glossary",
"href" : "https://icann.org/epp",
"type" : "text/html"
"type" : "text/html",
"value": "https://example.tld/rdap/domains"
}
]
},
@@ -161,9 +169,10 @@
"links" :
[
{
"rel" : "alternate",
"rel" : "help",
"href" : "https://icann.org/wicf",
"type" : "text/html"
"type" : "text/html",
"value": "https://example.tld/rdap/domains"
}
]
}

26
core/src/test/resources/google/registry/rdap/rdap_domains_two.json
View File

@@ -13,7 +13,8 @@
{
"href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domains"
}
],
"remarks": [
@@ -34,7 +35,8 @@
{
"href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_2%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domains"
}
],
"remarks": [
@@ -69,12 +71,14 @@
{
"href": "https://example.tld/rdap/help/tos",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/domains"
},
{
"href": "https://www.registry.tld/about/rdap/tos.html",
"rel": "alternate",
"type": "text/html"
"href": "https://www.example.tld/about/rdap/tos.html",
"rel": "terms-of-service",
"type": "text/html",
"value": "https://example.tld/rdap/domains"
}
]
},
@@ -87,9 +91,10 @@
"links":
[
{
"rel": "alternate",
"rel": "glossary",
"href": "https://icann.org/epp",
"type": "text/html"
"type": "text/html",
"value": "https://example.tld/rdap/domains"
}
]
},
@@ -99,9 +104,10 @@
"links":
[
{
"rel": "alternate",
"rel": "help",
"href": "https://icann.org/wicf",
"type": "text/html"
"type": "text/html",
"value": "https://example.tld/rdap/domains"
}
]
}

10
core/src/test/resources/google/registry/rdap/rdap_error.json
View File

@@ -28,12 +28,14 @@
{
"href": "https://example.tld/rdap/help/tos",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "%REQUEST_URL%"
},
{
"href": "https://www.registry.tld/about/rdap/tos.html",
"rel": "alternate",
"type": "text/html"
"href": "https://www.example.tld/about/rdap/tos.html",
"rel": "terms-of-service",
"type": "text/html",
"value": "%REQUEST_URL%"
}
],
"title": "RDAP Terms of Service"

16
core/src/test/resources/google/registry/rdap/rdap_help_index.json
View File

@@ -27,12 +27,14 @@
{
"rel" : "alternate",
"type" : "text/html",
"href" : "https://github.com/google/nomulus/blob/master/docs/rdap.md"
"href" : "https://github.com/google/nomulus/blob/master/docs/rdap.md",
"value": "https://example.tld/rdap/help%POSSIBLE_SLASH%"
},
{
"rel": "self",
"type": "application/rdap+json",
"href": "https://example.tld/rdap/help"
"href": "https://example.tld/rdap/help",
"value": "https://example.tld/rdap/help%POSSIBLE_SLASH%"
}
]
},
@@ -56,12 +58,14 @@
{
"href": "https://example.tld/rdap/help/tos",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/help%POSSIBLE_SLASH%"
},
{
"href": "https://www.registry.tld/about/rdap/tos.html",
"rel": "alternate",
"type": "text/html"
"href": "https://www.example.tld/about/rdap/tos.html",
"rel": "terms-of-service",
"type": "text/html",
"value": "https://example.tld/rdap/help%POSSIBLE_SLASH%"
}
]
}

10
core/src/test/resources/google/registry/rdap/rdap_help_tos.json
View File

@@ -26,12 +26,14 @@
{
"href": "https://example.tld/rdap/help/tos",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/help/tos"
},
{
"href": "https://www.registry.tld/about/rdap/tos.html",
"rel": "alternate",
"type": "text/html"
"href": "https://www.example.tld/about/rdap/tos.html",
"rel": "terms-of-service",
"type": "text/html",
"value": "https://example.tld/rdap/help/tos"
}
]
}

12
core/src/test/resources/google/registry/rdap/rdap_host.json
View File

@@ -5,14 +5,15 @@
"icann_rdap_technical_implementation_guide_0"
],
"objectClassName": "nameserver",
"handle": "%HANDLE%",
"ldhName": "%NAME%",
"handle": "%NAMESERVER_HANDLE_1%",
"ldhName": "%NAMESERVER_NAME_1%",
"status": ["%STATUS%"],
"links": [
{
"href": "https://example.tld/rdap/nameserver/%NAME%",
"href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"ipAddresses": {
@@ -36,7 +37,8 @@
{
"rel" : "self",
"href" : "https://example.tld/rdap/entity/1",
"type" : "application/rdap+json"
"type" : "application/rdap+json",
"value": "%REQUEST_URL%"
}
],
"publicIds" :

12
core/src/test/resources/google/registry/rdap/rdap_host_external.json
View File

@@ -7,15 +7,16 @@
"status": [
"active"
],
"handle": "%HANDLE%",
"handle": "%NAMESERVER_HANDLE_1%",
"links": [
{
"href": "https://example.tld/rdap/nameserver/%NAME%",
"href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"ldhName": "%NAME%",
"ldhName": "%NAMESERVER_NAME_1%",
"events": [
{
"eventAction": "last update of RDAP database",
@@ -33,7 +34,8 @@
{
"rel" : "self",
"href" : "https://example.tld/rdap/entity/1",
"type" : "application/rdap+json"
"type" : "application/rdap+json",
"value": "%REQUEST_URL%"
}
],
"publicIds" :

12
core/src/test/resources/google/registry/rdap/rdap_host_linked.json
View File

@@ -5,17 +5,18 @@
"icann_rdap_technical_implementation_guide_0"
],
"objectClassName": "nameserver",
"handle": "%HANDLE%",
"ldhName": "%NAME%",
"handle": "%NAMESERVER_HANDLE_1%",
"ldhName": "%NAMESERVER_NAME_1%",
"status": [
"active",
"associated"
],
"links": [
{
"href": "https://example.tld/rdap/nameserver/%NAME%",
"href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"ipAddresses": {
@@ -39,7 +40,8 @@
{
"rel" : "self",
"href" : "https://example.tld/rdap/entity/1",
"type" : "application/rdap+json"
"type" : "application/rdap+json",
"value": "%REQUEST_URL%"
}
],
"publicIds" :

14
core/src/test/resources/google/registry/rdap/rdap_host_unicode.json
View File

@@ -5,15 +5,16 @@
"icann_rdap_technical_implementation_guide_0"
],
"objectClassName": "nameserver",
"handle": "%HANDLE%",
"ldhName": "%PUNYCODENAME%",
"unicodeName": "%NAME%",
"handle": "%NAMESERVER_HANDLE_1%",
"ldhName": "%NAMESERVER_NAME_1%",
"unicodeName": "%NAMESERVER_UNICODE_NAME_1%",
"status": ["active"],
"links": [
{
"href": "https://example.tld/rdap/nameserver/%PUNYCODENAME%",
"href": "https://example.tld/rdap/nameserver/%NAMESERVER_NAME_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "%REQUEST_URL%"
}
],
"ipAddresses": {
@@ -37,7 +38,8 @@
{
"rel" : "self",
"href" : "https://example.tld/rdap/entity/1",
"type" : "application/rdap+json"
"type" : "application/rdap+json",
"value": "%REQUEST_URL%"
}
],
"publicIds" :

29
core/src/test/resources/google/registry/rdap/rdap_incomplete_domain_result_set.json
View File

@@ -9,7 +9,8 @@
{
"rel":"self",
"href":"https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type":"application/rdap+json"
"type":"application/rdap+json",
"value": "https://example.tld/rdap/domains"
}
],
"remarks": [
@@ -31,7 +32,8 @@
{
"rel":"self",
"href":"https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_2%",
"type":"application/rdap+json"
"type":"application/rdap+json",
"value": "https://example.tld/rdap/domains"
}
],
"remarks": [
@@ -53,7 +55,8 @@
{
"rel":"self",
"href":"https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_3%",
"type":"application/rdap+json"
"type":"application/rdap+json",
"value": "https://example.tld/rdap/domains"
}
],
"remarks": [
@@ -97,12 +100,14 @@
{
"href": "https://example.tld/rdap/help/tos",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/domains"
},
{
"href": "https://www.registry.tld/about/rdap/tos.html",
"rel": "alternate",
"type": "text/html"
"href": "https://www.example.tld/about/rdap/tos.html",
"rel": "terms-of-service",
"type": "text/html",
"value": "https://example.tld/rdap/domains"
}
],
"title":"RDAP Terms of Service"
@@ -121,9 +126,10 @@
"links":
[
{
"rel":"alternate",
"rel":"glossary",
"href":"https://icann.org/epp",
"type":"text/html"
"type":"text/html",
"value": "https://example.tld/rdap/domains"
}
],
"title":"Status Codes"
@@ -134,9 +140,10 @@
"links":
[
{
"rel":"alternate",
"rel":"help",
"href":"https://icann.org/wicf",
"type":"text/html"
"type":"text/html",
"value": "https://example.tld/rdap/domains"
}
]
}

26
core/src/test/resources/google/registry/rdap/rdap_incomplete_domains.json
View File

@@ -17,7 +17,8 @@
{
"type":"application/rdap+json",
"rel":"self",
"href":"https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%"
"href":"https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
"value": "https://example.tld/rdap/domains"
}
]
},
@@ -38,7 +39,8 @@
{
"type":"application/rdap+json",
"rel":"self",
"href":"https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_2%"
"href":"https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_2%",
"value": "https://example.tld/rdap/domains"
}
]
}
@@ -69,12 +71,14 @@
{
"href": "https://example.tld/rdap/help/tos",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/domains"
},
{
"href": "https://www.registry.tld/about/rdap/tos.html",
"rel": "alternate",
"type": "text/html"
"href": "https://www.example.tld/about/rdap/tos.html",
"rel": "terms-of-service",
"type": "text/html",
"value": "https://example.tld/rdap/domains"
}
]
},
@@ -91,8 +95,9 @@
"links":[
{
"type":"text/html",
"rel":"alternate",
"href":"https://icann.org/epp"
"rel":"glossary",
"href":"https://icann.org/epp",
"value": "https://example.tld/rdap/domains"
}
]
},
@@ -102,8 +107,9 @@
"links":[
{
"type":"text/html",
"rel":"alternate",
"href":"https://icann.org/wicf"
"rel":"help",
"href":"https://icann.org/wicf",
"value": "https://example.tld/rdap/domains"
}
]
}

2
core/src/test/resources/google/registry/rdap/rdap_multiple_contacts.json
View File

@@ -129,7 +129,7 @@
"type": "application/rdap+json"
},
{
"href": "https://www.registry.tld/about/rdap/tos.html",
"href": "https://www.example.tld/about/rdap/tos.html",
"rel": "alternate",
"type": "text/html"
}

16
core/src/test/resources/google/registry/rdap/rdap_multiple_contacts2.json
View File

@@ -9,7 +9,8 @@
{
"rel" : "self",
"href": "https://example.tld/rdap/entity/4-ROID",
"type" : "application/rdap+json"
"type" : "application/rdap+json",
"value": "https://example.tld/rdap/entities"
}
],
"events": [
@@ -65,7 +66,8 @@
{
"rel" : "self",
"href": "https://example.tld/rdap/entity/2-ROID",
"type" : "application/rdap+json"
"type" : "application/rdap+json",
"value": "https://example.tld/rdap/entities"
}
],
"events": [
@@ -141,12 +143,14 @@
{
"href": "https://example.tld/rdap/help/tos",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/entities"
},
{
"href": "https://www.registry.tld/about/rdap/tos.html",
"rel": "alternate",
"type": "text/html"
"href": "https://www.example.tld/about/rdap/tos.html",
"rel": "terms-of-service",
"type": "text/html",
"value": "https://example.tld/rdap/entities"
}
]
},

16
core/src/test/resources/google/registry/rdap/rdap_multiple_hosts.json
View File

@@ -10,7 +10,8 @@
{
"rel" : "self",
"type" : "application/rdap+json",
"href" : "https://example.tld/rdap/nameserver/ns2.cat.lol"
"href" : "https://example.tld/rdap/nameserver/ns2.cat.lol",
"value": "https://example.tld/rdap/nameservers"
}
],
"ipAddresses" :
@@ -42,7 +43,8 @@
{
"rel" : "self",
"type" : "application/rdap+json",
"href" : "https://example.tld/rdap/nameserver/ns1.cat2.lol"
"href" : "https://example.tld/rdap/nameserver/ns1.cat2.lol",
"value": "https://example.tld/rdap/nameservers"
}
],
"ipAddresses" :
@@ -94,12 +96,14 @@
{
"href": "https://example.tld/rdap/help/tos",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/nameservers"
},
{
"href": "https://www.registry.tld/about/rdap/tos.html",
"rel": "alternate",
"type": "text/html"
"href": "https://www.example.tld/about/rdap/tos.html",
"rel": "terms-of-service",
"type": "text/html",
"value": "https://example.tld/rdap/nameservers"
}
]
},

22
core/src/test/resources/google/registry/rdap/rdap_nontruncated_contacts.json
View File

@@ -9,7 +9,8 @@
{
"rel" : "self",
"href": "https://example.tld/rdap/entity/0001-ROID",
"type" : "application/rdap+json"
"type" : "application/rdap+json",
"value": "https://example.tld/rdap/entities"
}
],
"events": [
@@ -65,7 +66,8 @@
{
"rel" : "self",
"href": "https://example.tld/rdap/entity/0002-ROID",
"type" : "application/rdap+json"
"type" : "application/rdap+json",
"value": "https://example.tld/rdap/entities"
}
],
"events": [
@@ -121,7 +123,8 @@
{
"rel" : "self",
"href": "https://example.tld/rdap/entity/0003-ROID",
"type" : "application/rdap+json"
"type" : "application/rdap+json",
"value": "https://example.tld/rdap/entities"
}
],
"events": [
@@ -177,7 +180,8 @@
{
"rel" : "self",
"href": "https://example.tld/rdap/entity/0004-ROID",
"type" : "application/rdap+json"
"type" : "application/rdap+json",
"value": "https://example.tld/rdap/entities"
}
],
"events": [
@@ -253,12 +257,14 @@
{
"href": "https://example.tld/rdap/help/tos",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/entities"
},
{
"href": "https://www.registry.tld/about/rdap/tos.html",
"rel": "alternate",
"type": "text/html"
"href": "https://www.example.tld/about/rdap/tos.html",
"rel": "terms-of-service",
"type": "text/html",
"value": "https://example.tld/rdap/entities"
}
]
},

32
core/src/test/resources/google/registry/rdap/rdap_nontruncated_domains.json
View File

@@ -8,7 +8,8 @@
{
"href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_1%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domains"
}
],
"remarks": [
@@ -29,7 +30,8 @@
{
"href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_2%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domains"
}
],
"remarks": [
@@ -50,7 +52,8 @@
{
"href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_3%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domains"
}
],
"remarks": [
@@ -71,7 +74,8 @@
{
"href": "https://example.tld/rdap/domain/%DOMAIN_PUNYCODE_NAME_4%",
"type": "application/rdap+json",
"rel": "self"
"rel": "self",
"value": "https://example.tld/rdap/domains"
}
],
"remarks": [
@@ -112,12 +116,14 @@
{
"href": "https://example.tld/rdap/help/tos",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/domains"
},
{
"href": "https://www.registry.tld/about/rdap/tos.html",
"rel": "alternate",
"type": "text/html"
"href": "https://www.example.tld/about/rdap/tos.html",
"rel": "terms-of-service",
"type": "text/html",
"value": "https://example.tld/rdap/domains"
}
]
},
@@ -136,9 +142,10 @@
"links" :
[
{
"rel" : "alternate",
"rel" : "glossary",
"href" : "https://icann.org/epp",
"type" : "text/html"
"type" : "text/html",
"value": "https://example.tld/rdap/domains"
}
]
},
@@ -148,9 +155,10 @@
"links" :
[
{
"rel" : "alternate",
"rel" : "help",
"href" : "https://icann.org/wicf",
"type" : "text/html"
"type" : "text/html",
"value": "https://example.tld/rdap/domains"
}
]
}

22
core/src/test/resources/google/registry/rdap/rdap_nontruncated_hosts.json
View File

@@ -10,7 +10,8 @@
{
"rel" : "self",
"type" : "application/rdap+json",
"href" : "https://example.tld/rdap/nameserver/nsx1.cat.lol"
"href" : "https://example.tld/rdap/nameserver/nsx1.cat.lol",
"value": "https://example.tld/rdap/nameservers"
}
],
"ipAddresses" :
@@ -42,7 +43,8 @@
{
"rel" : "self",
"type" : "application/rdap+json",
"href" : "https://example.tld/rdap/nameserver/nsx2.cat.lol"
"href" : "https://example.tld/rdap/nameserver/nsx2.cat.lol",
"value": "https://example.tld/rdap/nameservers"
}
],
"ipAddresses" :
@@ -74,7 +76,8 @@
{
"rel" : "self",
"type" : "application/rdap+json",
"href" : "https://example.tld/rdap/nameserver/nsx3.cat.lol"
"href" : "https://example.tld/rdap/nameserver/nsx3.cat.lol",
"value": "https://example.tld/rdap/nameservers"
}
],
"ipAddresses" :
@@ -106,7 +109,8 @@
{
"rel" : "self",
"type" : "application/rdap+json",
"href" : "https://example.tld/rdap/nameserver/nsx4.cat.lol"
"href" : "https://example.tld/rdap/nameserver/nsx4.cat.lol",
"value": "https://example.tld/rdap/nameservers"
}
],
"ipAddresses" :
@@ -157,12 +161,14 @@
{
"href": "https://example.tld/rdap/help/tos",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/nameservers"
},
{
"href": "https://www.registry.tld/about/rdap/tos.html",
"rel": "alternate",
"type": "text/html"
"href": "https://www.example.tld/about/rdap/tos.html",
"rel": "terms-of-service",
"type": "text/html",
"value": "https://example.tld/rdap/nameservers"
}
]
},

22
core/src/test/resources/google/registry/rdap/rdap_nontruncated_registrars.json
View File

@@ -9,7 +9,8 @@
{
"rel": "self",
"href": "https://example.tld/rdap/entity/301",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/entities"
}
],
"publicIds":
@@ -66,7 +67,8 @@
{
"rel": "self",
"href": "https://example.tld/rdap/entity/302",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/entities"
}
],
"publicIds":
@@ -123,7 +125,8 @@
{
"rel": "self",
"href": "https://example.tld/rdap/entity/303",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/entities"
}
],
"publicIds":
@@ -180,7 +183,8 @@
{
"rel": "self",
"href": "https://example.tld/rdap/entity/304",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/entities"
}
],
"publicIds":
@@ -257,12 +261,14 @@
{
"href": "https://example.tld/rdap/help/tos",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/entities"
},
{
"href": "https://www.registry.tld/about/rdap/tos.html",
"rel": "alternate",
"type": "text/html"
"href": "https://www.example.tld/about/rdap/tos.html",
"rel": "terms-of-service",
"type": "text/html",
"value": "https://example.tld/rdap/entities"
}
]
},

13
core/src/test/resources/google/registry/rdap/rdap_registrar.json
View File

@@ -5,22 +5,23 @@
"icann_rdap_technical_implementation_guide_0"
],
"objectClassName" : "entity",
"handle" : "%NAME%",
"status" : ["%STATUS%"],
"handle" : "%REGISTRAR_HANDLE_1%",
"status" : ["%STATUS_1%"],
"roles" : ["registrar"],
"links" :
[
{
"rel" : "self",
"href": "https://example.tld/rdap/entity/%NAME%",
"type" : "application/rdap+json"
"href": "https://example.tld/rdap/entity/%REGISTRAR_HANDLE_1%",
"type" : "application/rdap+json",
"value": "%REQUEST_URL%"
}
],
"publicIds" :
[
{
"type" : "IANA Registrar ID",
"identifier" : "%NAME%"
"identifier" : "%REGISTRAR_HANDLE_1%"
}
],
"events": [
@@ -34,7 +35,7 @@
"vcard",
[
["version", {}, "text", "4.0"],
["fn", {}, "text", "%FULLNAME%"],
["fn", {}, "text", "%REGISTRAR_FULLNAME_1%"],
["adr", {}, "text",
[
"",

6
core/src/test/resources/google/registry/rdap/rdap_registrar_test.json
View File

@@ -5,8 +5,8 @@
"icann_rdap_technical_implementation_guide_0"
],
"objectClassName" : "entity",
"handle" : "%NAME%",
"status" : ["%STATUS%"],
"handle" : "%REGISTRAR_HANDLE_1%",
"status" : ["%STATUS_1%"],
"roles" : ["registrar"],
"events": [
{
@@ -19,7 +19,7 @@
"vcard",
[
["version", {}, "text", "4.0"],
["fn", {}, "text", "%FULLNAME%"],
["fn", {}, "text", "%REGISTRAR_FULLNAME_1%"],
["adr", {}, "text",
[
"",

25
core/src/test/resources/google/registry/rdap/rdap_truncated_contacts.json
View File

@@ -9,7 +9,8 @@
{
"rel": "self",
"href": "https://example.tld/rdap/entity/0001-ROID",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/entities"
}
],
"events": [
@@ -65,7 +66,8 @@
{
"rel": "self",
"href": "https://example.tld/rdap/entity/0002-ROID",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/entities"
}
],
"events": [
@@ -121,7 +123,8 @@
{
"rel": "self",
"href": "https://example.tld/rdap/entity/0003-ROID",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/entities"
}
],
"events": [
@@ -177,7 +180,8 @@
{
"rel": "self",
"href": "https://example.tld/rdap/entity/0004-ROID",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/entities"
}
],
"events": [
@@ -248,7 +252,8 @@
{
"type": "application/rdap+json",
"href": "https://example.tld/rdap/entities?%NAME%",
"rel": "next"
"rel": "next",
"value": "https://example.tld/rdap/entities"
}
],
"description": [ "Links to related pages." ]
@@ -273,12 +278,14 @@
{
"href": "https://example.tld/rdap/help/tos",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/entities"
},
{
"href": "https://www.registry.tld/about/rdap/tos.html",
"rel": "alternate",
"type": "text/html"
"href": "https://www.example.tld/about/rdap/tos.html",
"rel": "terms-of-service",
"type": "text/html",
"value": "https://example.tld/rdap/entities"
}
]
},

25
core/src/test/resources/google/registry/rdap/rdap_truncated_hosts.json
View File

@@ -10,7 +10,8 @@
{
"rel" : "self",
"type" : "application/rdap+json",
"href" : "https://example.tld/rdap/nameserver/nsx1.cat.lol"
"href" : "https://example.tld/rdap/nameserver/nsx1.cat.lol",
"value": "https://example.tld/rdap/nameservers"
}
],
"ipAddresses" :
@@ -42,7 +43,8 @@
{
"rel" : "self",
"type" : "application/rdap+json",
"href" : "https://example.tld/rdap/nameserver/nsx2.cat.lol"
"href" : "https://example.tld/rdap/nameserver/nsx2.cat.lol",
"value": "https://example.tld/rdap/nameservers"
}
],
"ipAddresses" :
@@ -74,7 +76,8 @@
{
"rel" : "self",
"type" : "application/rdap+json",
"href" : "https://example.tld/rdap/nameserver/nsx3.cat.lol"
"href" : "https://example.tld/rdap/nameserver/nsx3.cat.lol",
"value": "https://example.tld/rdap/nameservers"
}
],
"ipAddresses" :
@@ -106,7 +109,8 @@
{
"rel" : "self",
"type" : "application/rdap+json",
"href" : "https://example.tld/rdap/nameserver/nsx4.cat.lol"
"href" : "https://example.tld/rdap/nameserver/nsx4.cat.lol",
"value": "https://example.tld/rdap/nameservers"
}
],
"ipAddresses" :
@@ -153,7 +157,8 @@
{
"type" : "application/rdap+json",
"rel" : "next",
"href" : "https://example.tld/rdap/nameservers?%QUERY%"
"href" : "https://example.tld/rdap/nameservers?%QUERY%",
"value": "https://example.tld/rdap/nameservers"
}
]
},
@@ -177,12 +182,14 @@
{
"href": "https://example.tld/rdap/help/tos",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/nameservers"
},
{
"href": "https://www.registry.tld/about/rdap/tos.html",
"rel": "alternate",
"type": "text/html"
"href": "https://www.example.tld/about/rdap/tos.html",
"rel": "terms-of-service",
"type": "text/html",
"value": "https://example.tld/rdap/nameservers"
}
]
},

25
core/src/test/resources/google/registry/rdap/rdap_truncated_mixed_entities.json
View File

@@ -9,7 +9,8 @@
{
"rel" : "self",
"href": "https://example.tld/rdap/entity/0001-ROID",
"type" : "application/rdap+json"
"type" : "application/rdap+json",
"value": "https://example.tld/rdap/entities"
}
],
"events": [
@@ -65,7 +66,8 @@
{
"rel" : "self",
"href": "https://example.tld/rdap/entity/0002-ROID",
"type" : "application/rdap+json"
"type" : "application/rdap+json",
"value": "https://example.tld/rdap/entities"
}
],
"events": [
@@ -121,7 +123,8 @@
{
"rel" : "self",
"href": "https://example.tld/rdap/entity/0003-ROID",
"type" : "application/rdap+json"
"type" : "application/rdap+json",
"value": "https://example.tld/rdap/entities"
}
],
"events": [
@@ -177,7 +180,8 @@
{
"rel" : "self",
"href": "https://example.tld/rdap/entity/301",
"type" : "application/rdap+json"
"type" : "application/rdap+json",
"value": "https://example.tld/rdap/entities"
}
],
"publicIds" :
@@ -249,7 +253,8 @@
{
"type" : "application/rdap+json",
"href" : "https://example.tld/rdap/entities?%NAME%",
"rel" : "next"
"rel" : "next",
"value": "https://example.tld/rdap/entities"
}
],
"description" : [ "Links to related pages." ]
@@ -274,12 +279,14 @@
{
"href": "https://example.tld/rdap/help/tos",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/entities"
},
{
"href": "https://www.registry.tld/about/rdap/tos.html",
"rel": "alternate",
"type": "text/html"
"href": "https://www.example.tld/about/rdap/tos.html",
"rel": "terms-of-service",
"type": "text/html",
"value": "https://example.tld/rdap/entities"
}
]
},

25
core/src/test/resources/google/registry/rdap/rdap_truncated_registrars.json
View File

@@ -9,7 +9,8 @@
{
"rel" : "self",
"href": "https://example.tld/rdap/entity/301",
"type" : "application/rdap+json"
"type" : "application/rdap+json",
"value": "https://example.tld/rdap/entities"
}
],
"publicIds" :
@@ -66,7 +67,8 @@
{
"rel" : "self",
"href": "https://example.tld/rdap/entity/302",
"type" : "application/rdap+json"
"type" : "application/rdap+json",
"value": "https://example.tld/rdap/entities"
}
],
"publicIds" :
@@ -123,7 +125,8 @@
{
"rel" : "self",
"href": "https://example.tld/rdap/entity/303",
"type" : "application/rdap+json"
"type" : "application/rdap+json",
"value": "https://example.tld/rdap/entities"
}
],
"publicIds" :
@@ -180,7 +183,8 @@
{
"rel" : "self",
"href": "https://example.tld/rdap/entity/304",
"type" : "application/rdap+json"
"type" : "application/rdap+json",
"value": "https://example.tld/rdap/entities"
}
],
"publicIds" :
@@ -252,7 +256,8 @@
{
"type" : "application/rdap+json",
"href" : "https://example.tld/rdap/entities?%NAME%",
"rel" : "next"
"rel" : "next",
"value": "https://example.tld/rdap/entities"
}
],
"description" : [ "Links to related pages." ]
@@ -277,12 +282,14 @@
{
"href": "https://example.tld/rdap/help/tos",
"rel": "self",
"type": "application/rdap+json"
"type": "application/rdap+json",
"value": "https://example.tld/rdap/entities"
},
{
"href": "https://www.registry.tld/about/rdap/tos.html",
"rel": "alternate",
"type": "text/html"
"href": "https://www.example.tld/about/rdap/tos.html",
"rel": "terms-of-service",
"type": "text/html",
"value": "https://example.tld/rdap/entities"
}
]
},

2
core/src/test/resources/google/registry/rdap/rdap_unformatted_output.json
View File

@@ -1 +1 @@
{"key":"value","rdapConformance":["rdap_level_0","icann_rdap_response_profile_0","icann_rdap_technical_implementation_guide_0"],"notices":[{"title":"RDAP Terms of Service","links":[{"href":"https:\/\/www.registry.tld\/about\/rdap\/tos.html","rel":"alternate","type":"text\/html","value":"http:\/\/myserver.example.com\/help\/tos"}],"description":["By querying our Domain Database, you are agreeing to comply with these terms so please read them carefully.","Any information provided is 'as is' without any guarantee of accuracy.","Please do not misuse the Domain Database. It is intended solely for query-based access.","Don't use the Domain Database to allow, enable, or otherwise support the transmission of mass unsolicited, commercial advertising or solicitations.","Don't access our Domain Database through the use of high volume, automated electronic processes that send queries or data to the systems of any ICANN-accredited registrar.","You may only use the information contained in the Domain Database for lawful purposes.","Do not compile, repackage, disseminate, or otherwise use the information contained in the Domain Database in its entirety, or in any substantial portion, without our prior written permission.","We may retain certain details about queries to our Domain Database for the purposes of detecting and preventing misuse.","We reserve the right to restrict or deny your access to the database if we suspect that you have failed to comply with these terms.","We reserve the right to modify this agreement at any time."]}]}
{"key":"value","rdapConformance":["rdap_level_0","icann_rdap_response_profile_0","icann_rdap_technical_implementation_guide_0"],"notices":[{"title":"RDAP Terms of Service","links":[{"href":"https:\/\/www.example.tld\/about\/rdap\/tos.html","rel":"alternate","type":"text\/html","value":"http:\/\/myserver.example.com\/help\/tos"}],"description":["By querying our Domain Database, you are agreeing to comply with these terms so please read them carefully.","Any information provided is 'as is' without any guarantee of accuracy.","Please do not misuse the Domain Database. It is intended solely for query-based access.","Don't use the Domain Database to allow, enable, or otherwise support the transmission of mass unsolicited, commercial advertising or solicitations.","Don't access our Domain Database through the use of high volume, automated electronic processes that send queries or data to the systems of any ICANN-accredited registrar.","You may only use the information contained in the Domain Database for lawful purposes.","Do not compile, repackage, disseminate, or otherwise use the information contained in the Domain Database in its entirety, or in any substantial portion, without our prior written permission.","We may retain certain details about queries to our Domain Database for the purposes of detecting and preventing misuse.","We reserve the right to restrict or deny your access to the database if we suspect that you have failed to comply with these terms.","We reserve the right to modify this agreement at any time."]}]}

4
core/src/test/resources/google/registry/rdap/rdapjson_toplevel.json
View File

@@ -30,8 +30,8 @@
"type": "application/rdap+json"
},
{
"href": "https://www.registry.tld/about/rdap/tos.html",
"rel": "alternate",
"href": "https://www.example.tld/about/rdap/tos.html",
"rel": "terms-of-service",
"type": "text/html"
}
]

8
core/src/test/resources/google/registry/rdap/rdapjson_toplevel_domain.json
View File

@@ -30,8 +30,8 @@
"type": "application/rdap+json"
},
{
"href": "https://www.registry.tld/about/rdap/tos.html",
"rel": "alternate",
"href": "https://www.example.tld/about/rdap/tos.html",
"rel": "terms-of-service",
"type": "text/html"
}
]
@@ -51,7 +51,7 @@
"links":
[
{
"rel": "alternate",
"rel": "glossary",
"href": "https://icann.org/epp",
"type": "text/html"
}
@@ -63,7 +63,7 @@
"links":
[
{
"rel": "alternate",
"rel": "help",
"href": "https://icann.org/wicf",
"type": "text/html"
}