mirror of
https://github.com/google/nomulus.git
synced 2025-07-25 12:08:36 +02:00
Return all applicable reserved list entries associated with a label
Instead of only returning the most severe one, return all applicable ones. This is because the reserved list has grown to a list of types that are not strictly comparable but orthogonal to each other. We can no longer depend on the fact that the most severe type incorporates all properties of those beneath it. Therefore returning all of them and treat them one by one in the calling site is the correct behavior. Due to constraint imposed in eppcom.xsd, during domain checks the response can only contain a reservation reason of fewer than 32 characters, therefore we are returning the message for the type with highest severity, in case of multiple reservation types for a label. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=149776106
This commit is contained in:
jianglai
Ben McIlwain
parent
9a11f125ff
commit
ebcdae7361
8 changed files with 199 additions and 86 deletions
|
|
@ -115,6 +115,24 @@ public class DomainCheckFlowTest
|
|||
create(true, "example3.tld", null));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSuccess_domainWithMultipleReservationType_useMostSevereMessage()
|
||||
throws Exception {
|
||||
persistResource(
|
||||
Registry.get("tld")
|
||||
.asBuilder()
|
||||
.setReservedLists(
|
||||
createReservedList(),
|
||||
persistReservedList("tld-collision", "allowedinsunrise,NAME_COLLISION"))
|
||||
.build());
|
||||
setEppInput("domain_check_one_tld_reserved.xml");
|
||||
doCheckTest(
|
||||
create(false, "reserved.tld", "Reserved"),
|
||||
create(false, "allowedinsunrise.tld", "Cannot be delegated"),
|
||||
create(true, "example2.tld", null),
|
||||
create(true, "example3.tld", null));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSuccess_anchorTenantReserved() throws Exception {
|
||||
setEppInput("domain_check_anchor.xml");
|
||||
|
|
@ -398,6 +416,19 @@ public class DomainCheckFlowTest
|
|||
runFlowAssertResponse(readFile("domain_check_fee_response_v06.xml"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFeeExtension_multipleReservations() throws Exception {
|
||||
persistResource(
|
||||
Registry.get("tld")
|
||||
.asBuilder()
|
||||
.setReservedLists(
|
||||
persistReservedList("example-sunrise", "allowedinsunrise,ALLOWED_IN_SUNRISE"))
|
||||
.build());
|
||||
persistActiveDomain("example1.tld");
|
||||
setEppInput("domain_check_fee_v06.xml");
|
||||
runFlowAssertResponse(readFile("domain_check_fee_response_v06.xml"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFeeExtension_v11() throws Exception {
|
||||
persistActiveDomain("example1.tld");
|
||||
|
|
|
|||
|
|
@ -18,9 +18,10 @@ import static com.google.common.truth.Truth.assertThat;
|
|||
import static com.google.common.truth.Truth.assertWithMessage;
|
||||
import static google.registry.model.registry.label.ReservationType.ALLOWED_IN_SUNRISE;
|
||||
import static google.registry.model.registry.label.ReservationType.FULLY_BLOCKED;
|
||||
import static google.registry.model.registry.label.ReservationType.NAME_COLLISION;
|
||||
import static google.registry.model.registry.label.ReservationType.RESERVED_FOR_ANCHOR_TENANT;
|
||||
import static google.registry.model.registry.label.ReservationType.UNRESERVED;
|
||||
import static google.registry.model.registry.label.ReservedList.getReservation;
|
||||
import static google.registry.model.registry.label.ReservedList.getReservationTypes;
|
||||
import static google.registry.model.registry.label.ReservedList.matchesAnchorTenantReservation;
|
||||
import static google.registry.testing.DatastoreHelper.createTld;
|
||||
import static google.registry.testing.DatastoreHelper.persistReservedList;
|
||||
|
|
@ -71,20 +72,20 @@ public class ReservedListTest {
|
|||
@Test
|
||||
public void testGetReservation_allLabelsAreUnreserved_withNoReservedLists() throws Exception {
|
||||
assertThat(Registry.get("tld").getReservedLists()).isEmpty();
|
||||
assertThat(getReservation("doodle", "tld")).isEqualTo(UNRESERVED);
|
||||
assertThat(getReservation("access", "tld")).isEqualTo(UNRESERVED);
|
||||
assertThat(getReservation("rich", "tld")).isEqualTo(UNRESERVED);
|
||||
assertThat(getReservationTypes("doodle", "tld")).containsExactly(UNRESERVED);
|
||||
assertThat(getReservationTypes("access", "tld")).containsExactly(UNRESERVED);
|
||||
assertThat(getReservationTypes("rich", "tld")).containsExactly(UNRESERVED);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testZeroReservedLists_doesNotCauseError() throws Exception {
|
||||
assertThat(getReservation("doodle", "tld")).isEqualTo(UNRESERVED);
|
||||
assertThat(getReservationTypes("doodle", "tld")).containsExactly(UNRESERVED);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetReservation_twoLetterCodesAreAvailable() {
|
||||
for (String sld : ImmutableList.of("aa", "az", "zz", "91", "1n", "j5")) {
|
||||
assertThat(getReservation(sld, "tld")).isEqualTo(UNRESERVED);
|
||||
assertThat(getReservationTypes(sld, "tld")).containsExactly(UNRESERVED);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -92,7 +93,7 @@ public class ReservedListTest {
|
|||
public void testGetReservation_singleCharacterDomainsAreAllowed() {
|
||||
// This isn't quite exhaustive but it's close.
|
||||
for (char c = 'a'; c <= 'z'; c++) {
|
||||
assertThat(getReservation("" + c, "tld")).isEqualTo(UNRESERVED);
|
||||
assertThat(getReservationTypes("" + c, "tld")).containsExactly(UNRESERVED);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -107,8 +108,8 @@ public class ReservedListTest {
|
|||
"lol,RESERVED_FOR_ANCHOR_TENANT,foobar1",
|
||||
"lol2,RESERVED_FOR_ANCHOR_TENANT,abcdefg # This is a comment")))
|
||||
.build());
|
||||
assertThat(getReservation("lol", "tld")).isEqualTo(RESERVED_FOR_ANCHOR_TENANT);
|
||||
assertThat(getReservation("lol2", "tld")).isEqualTo(RESERVED_FOR_ANCHOR_TENANT);
|
||||
assertThat(getReservationTypes("lol", "tld")).containsExactly(RESERVED_FOR_ANCHOR_TENANT);
|
||||
assertThat(getReservationTypes("lol2", "tld")).containsExactly(RESERVED_FOR_ANCHOR_TENANT);
|
||||
assertThat(matchesAnchorTenantReservation(InternetDomainName.from("lol.tld"), "foobar1"))
|
||||
.isTrue();
|
||||
assertThat(matchesAnchorTenantReservation(InternetDomainName.from("lol.tld"), "foobar"))
|
||||
|
|
@ -139,6 +140,21 @@ public class ReservedListTest {
|
|||
assertThat(matchesAnchorTenantReservation(InternetDomainName.from("lol5.tld"), "")).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testMatchesAnchorTenantReservation_duplicatingAuthCodes()
|
||||
throws Exception {
|
||||
ReservedList rl1 = persistReservedList("reserved1", "lol,RESERVED_FOR_ANCHOR_TENANT,foo");
|
||||
ReservedList rl2 = persistReservedList("reserved2", "lol,RESERVED_FOR_ANCHOR_TENANT,foo");
|
||||
createTld("tld");
|
||||
persistResource(Registry.get("tld").asBuilder().setReservedLists(rl1, rl2).build());
|
||||
assertThat(matchesAnchorTenantReservation(InternetDomainName.from("lol.tld"), "foo")).isTrue();
|
||||
assertThat(matchesAnchorTenantReservation(InternetDomainName.from("lol.tld"), "bar")).isFalse();
|
||||
persistReservedList("reserved2", "lol,RESERVED_FOR_ANCHOR_TENANT,bar");
|
||||
thrown.expect(
|
||||
IllegalStateException.class, "There are conflicting auth codes for domain: lol.tld");
|
||||
matchesAnchorTenantReservation(InternetDomainName.from("lol.tld"), "bar");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetReservation_concatsMultipleListsCorrectly() throws Exception {
|
||||
ReservedList rl1 = persistReservedList(
|
||||
|
|
@ -152,13 +168,30 @@ public class ReservedListTest {
|
|||
createTld("tld");
|
||||
persistResource(Registry.get("tld").asBuilder().setReservedLists(rl1, rl2).build());
|
||||
|
||||
assertThat(getReservation("lol", "tld")).isEqualTo(FULLY_BLOCKED);
|
||||
assertThat(getReservation("cat", "tld")).isEqualTo(FULLY_BLOCKED);
|
||||
assertThat(getReservation("roflcopter", "tld")).isEqualTo(FULLY_BLOCKED);
|
||||
assertThat(getReservation("snowcrash", "tld")).isEqualTo(FULLY_BLOCKED);
|
||||
assertThat(getReservation("doge", "tld")).isEqualTo(UNRESERVED);
|
||||
assertThat(getReservationTypes("lol", "tld")).containsExactly(FULLY_BLOCKED);
|
||||
assertThat(getReservationTypes("cat", "tld")).containsExactly(FULLY_BLOCKED);
|
||||
assertThat(getReservationTypes("roflcopter", "tld")).containsExactly(FULLY_BLOCKED);
|
||||
assertThat(getReservationTypes("snowcrash", "tld")).containsExactly(FULLY_BLOCKED);
|
||||
assertThat(getReservationTypes("doge", "tld")).containsExactly(UNRESERVED);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetReservation_returnsAllReservationTypesFromMultipleListsForTheSameLabel()
|
||||
throws Exception {
|
||||
ReservedList rl1 =
|
||||
persistReservedList("reserved1", "lol,NAME_COLLISION # yup", "cat,FULLY_BLOCKED");
|
||||
ReservedList rl2 =
|
||||
persistReservedList("reserved2", "lol,ALLOWED_IN_SUNRISE", "snowcrash,FULLY_BLOCKED");
|
||||
createTld("tld");
|
||||
persistResource(Registry.get("tld").asBuilder().setReservedLists(rl1, rl2).build());
|
||||
|
||||
assertThat(getReservationTypes("lol", "tld"))
|
||||
.containsExactly(NAME_COLLISION, ALLOWED_IN_SUNRISE);
|
||||
assertThat(getReservationTypes("cat", "tld")).containsExactly(FULLY_BLOCKED);
|
||||
assertThat(getReservationTypes("snowcrash", "tld")).containsExactly(FULLY_BLOCKED);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testGetReservation_worksAfterReservedListRemovedUsingSet() throws Exception {
|
||||
ReservedList rl1 = persistReservedList(
|
||||
|
|
@ -167,23 +200,24 @@ public class ReservedListTest {
|
|||
"reserved2", "roflcopter,FULLY_BLOCKED", "snowcrash,FULLY_BLOCKED");
|
||||
createTld("tld");
|
||||
persistResource(Registry.get("tld").asBuilder().setReservedLists(rl1, rl2).build());
|
||||
assertThat(getReservation("roflcopter", "tld")).isEqualTo(FULLY_BLOCKED);
|
||||
assertThat(getReservationTypes("roflcopter", "tld")).containsExactly(FULLY_BLOCKED);
|
||||
persistResource(Registry.get("tld").asBuilder().setReservedLists(rl1).build());
|
||||
assertWithMessage(
|
||||
"roflcopter.tld should be unreserved after unsetting the registry's second reserved list")
|
||||
.that(getReservation("roflcopter", "tld"))
|
||||
.isEqualTo(UNRESERVED);
|
||||
"roflcopter.tld should be unreserved"
|
||||
+ " after unsetting the registry's second reserved list")
|
||||
.that(getReservationTypes("roflcopter", "tld"))
|
||||
.containsExactly(UNRESERVED);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetReservation_combinesMultipleLists_handlesSeverityCorrectly() throws Exception {
|
||||
public void testGetReservation_combinesMultipleLists() throws Exception {
|
||||
ReservedList rl1 = persistReservedList(
|
||||
"reserved1", "lol,NAME_COLLISION", "roflcopter,ALLOWED_IN_SUNRISE");
|
||||
ReservedList rl2 = persistReservedList("reserved2", "lol,FULLY_BLOCKED");
|
||||
createTld("tld");
|
||||
persistResource(Registry.get("tld").asBuilder().setReservedLists(rl1, rl2).build());
|
||||
assertThat(getReservation("lol", "tld")).isEqualTo(FULLY_BLOCKED);
|
||||
assertThat(getReservation("roflcopter", "tld")).isEqualTo(ALLOWED_IN_SUNRISE);
|
||||
assertThat(getReservationTypes("lol", "tld")).containsExactly(FULLY_BLOCKED, NAME_COLLISION);
|
||||
assertThat(getReservationTypes("roflcopter", "tld")).containsExactly(ALLOWED_IN_SUNRISE);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -191,7 +225,7 @@ public class ReservedListTest {
|
|||
ReservedList rl = persistReservedList("tld-reserved", "lol,FULLY_BLOCKED # yup");
|
||||
createTld("tld");
|
||||
persistResource(Registry.get("tld").asBuilder().setReservedLists(rl).build());
|
||||
assertThat(getReservation("lol", "tld")).isEqualTo(FULLY_BLOCKED);
|
||||
assertThat(getReservationTypes("lol", "tld")).containsExactly(FULLY_BLOCKED);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue