mirror of
https://github.com/google/nomulus.git
synced 2025-06-28 23:33:36 +02:00
Correctly order RDAP domain searches by nameserver
Usually, the correct order happens automatically, because we are searching on either the key or a specific field like fullyQualifiedDomainName, and the results come back in that order. But when searching by nameserver, where we split the query into multiple "IN" chunks, we have to assemble the result set and order after the fact. The tests didn't pick up the problem, because the domains and hosts were created in alphabetical order, so it happened to work anyway. The tests have now been changed to create things in reverse order, to test the reordering. Also, the previous arbitrary limit of 1000 nameservers in the intermediate query has been reduced to 300, because we now loop through all nameservers no matter what, rather than stopping when we collect enough domains, so there's more of a penalty for having way too many nameservers. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=173163121
This commit is contained in:
mountford
jianglai
parent
1790914058
commit
52fd9d8c4e
2 changed files with 145 additions and 151 deletions
|
|
@ -516,7 +516,7 @@ public class RdapDomainSearchActionTest {
|
|||
ImmutableSet.Builder<Key<HostResource>> hostKeysBuilder = new ImmutableSet.Builder<>();
|
||||
ImmutableSet.Builder<String> subordinateHostnamesBuilder = new ImmutableSet.Builder<>();
|
||||
String mainDomainName = String.format("domain%d.lol", numTotalDomainsPerActiveDomain);
|
||||
for (int i = 1; i <= numHosts; i++) {
|
||||
for (int i = numHosts; i >= 1; i--) {
|
||||
String hostName = String.format("ns%d.%s", i, mainDomainName);
|
||||
subordinateHostnamesBuilder.add(hostName);
|
||||
HostResource host = makeAndPersistHostResource(
|
||||
|
|
@ -526,7 +526,7 @@ public class RdapDomainSearchActionTest {
|
|||
ImmutableSet<Key<HostResource>> hostKeys = hostKeysBuilder.build();
|
||||
// Create all the domains at once, then persist them in parallel, for increased efficiency.
|
||||
ImmutableList.Builder<DomainResource> domainsBuilder = new ImmutableList.Builder<>();
|
||||
for (int i = 1; i <= numActiveDomains * numTotalDomainsPerActiveDomain; i++) {
|
||||
for (int i = numActiveDomains * numTotalDomainsPerActiveDomain; i >= 1; i--) {
|
||||
String domainName = String.format("domain%d.lol", i);
|
||||
DomainResource.Builder builder =
|
||||
makeDomainResource(
|
||||
|
|
@ -624,6 +624,29 @@ public class RdapDomainSearchActionTest {
|
|||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
}
|
||||
|
||||
private void runSuccessfulTestWithFourDomains(
|
||||
RequestType requestType,
|
||||
String queryString,
|
||||
String domainRoid1,
|
||||
String domainRoid2,
|
||||
String domainRoid3,
|
||||
String domainRoid4,
|
||||
String fileName) {
|
||||
assertThat(generateActualJson(requestType, queryString))
|
||||
.isEqualTo(
|
||||
readMultiDomainFile(
|
||||
fileName,
|
||||
"domain1.lol",
|
||||
domainRoid1,
|
||||
"domain2.lol",
|
||||
domainRoid2,
|
||||
"domain3.lol",
|
||||
domainRoid3,
|
||||
"domain4.lol",
|
||||
domainRoid4));
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
}
|
||||
|
||||
private void runNotFoundTest(RequestType requestType, String fullName, String errorMessage) {
|
||||
assertThat(generateActualJson(requestType, fullName))
|
||||
.isEqualTo(generateExpectedJson(errorMessage, "rdap_error_404.json"));
|
||||
|
|
@ -997,11 +1020,11 @@ public class RdapDomainSearchActionTest {
|
|||
.isEqualTo(readMultiDomainFile(
|
||||
"rdap_incomplete_domain_result_set.json",
|
||||
"domain100.lol",
|
||||
"A6-LOL",
|
||||
"A7-LOL",
|
||||
"domain150.lol",
|
||||
"D8-LOL",
|
||||
"75-LOL",
|
||||
"domain200.lol",
|
||||
"10A-LOL",
|
||||
"43-LOL",
|
||||
"domainunused.lol",
|
||||
"unused-LOL"));
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
|
|
@ -1010,35 +1033,27 @@ public class RdapDomainSearchActionTest {
|
|||
@Test
|
||||
public void testDomainMatch_nontruncatedResultsSet() throws Exception {
|
||||
createManyDomainsAndHosts(4, 1, 2);
|
||||
assertThat(generateActualJson(RequestType.NAME, "domain*.lol"))
|
||||
.isEqualTo(readMultiDomainFile(
|
||||
"rdap_nontruncated_domains.json",
|
||||
"domain1.lol",
|
||||
"43-LOL",
|
||||
"domain2.lol",
|
||||
"44-LOL",
|
||||
"domain3.lol",
|
||||
"45-LOL",
|
||||
"domain4.lol",
|
||||
"46-LOL"));
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
runSuccessfulTestWithFourDomains(
|
||||
RequestType.NAME,
|
||||
"domain*.lol",
|
||||
"46-LOL",
|
||||
"45-LOL",
|
||||
"44-LOL",
|
||||
"43-LOL",
|
||||
"rdap_nontruncated_domains.json");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testDomainMatch_truncatedResultsSet() throws Exception {
|
||||
createManyDomainsAndHosts(5, 1, 2);
|
||||
assertThat(generateActualJson(RequestType.NAME, "domain*.lol"))
|
||||
.isEqualTo(readMultiDomainFile(
|
||||
"rdap_domains_four_truncated.json",
|
||||
"domain1.lol",
|
||||
"43-LOL",
|
||||
"domain2.lol",
|
||||
"44-LOL",
|
||||
"domain3.lol",
|
||||
"45-LOL",
|
||||
"domain4.lol",
|
||||
"46-LOL"));
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
runSuccessfulTestWithFourDomains(
|
||||
RequestType.NAME,
|
||||
"domain*.lol",
|
||||
"47-LOL",
|
||||
"46-LOL",
|
||||
"45-LOL",
|
||||
"44-LOL",
|
||||
"rdap_domains_four_truncated.json");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -1046,18 +1061,14 @@ public class RdapDomainSearchActionTest {
|
|||
// Don't use 10 or more domains for this test, because domain10.lol will come before
|
||||
// domain2.lol, and you'll get the wrong domains in the result set.
|
||||
createManyDomainsAndHosts(9, 1, 2);
|
||||
assertThat(generateActualJson(RequestType.NAME, "domain*.lol"))
|
||||
.isEqualTo(readMultiDomainFile(
|
||||
"rdap_domains_four_truncated.json",
|
||||
"domain1.lol",
|
||||
"43-LOL",
|
||||
"domain2.lol",
|
||||
"44-LOL",
|
||||
"domain3.lol",
|
||||
"45-LOL",
|
||||
"domain4.lol",
|
||||
"46-LOL"));
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
runSuccessfulTestWithFourDomains(
|
||||
RequestType.NAME,
|
||||
"domain*.lol",
|
||||
"4B-LOL",
|
||||
"4A-LOL",
|
||||
"49-LOL",
|
||||
"48-LOL",
|
||||
"rdap_domains_four_truncated.json");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -1067,13 +1078,13 @@ public class RdapDomainSearchActionTest {
|
|||
.isEqualTo(readMultiDomainFile(
|
||||
"rdap_domains_four_truncated.json",
|
||||
"domain12.lol",
|
||||
"4E-LOL",
|
||||
"55-LOL",
|
||||
"domain18.lol",
|
||||
"54-LOL",
|
||||
"4F-LOL",
|
||||
"domain24.lol",
|
||||
"5A-LOL",
|
||||
"49-LOL",
|
||||
"domain30.lol",
|
||||
"60-LOL"));
|
||||
"43-LOL"));
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
}
|
||||
|
||||
|
|
@ -1244,7 +1255,7 @@ public class RdapDomainSearchActionTest {
|
|||
runNotFoundTest(RequestType.NS_LDH_NAME, "ns1.missing.com", "No matching nameservers found");
|
||||
}
|
||||
|
||||
// todo (b/27378695): reenable or delete this test
|
||||
// TODO(b/27378695): reenable or delete this test
|
||||
@Ignore
|
||||
@Test
|
||||
public void testNameserverMatchDomainsInTestTld_notFound() throws Exception {
|
||||
|
|
@ -1354,52 +1365,40 @@ public class RdapDomainSearchActionTest {
|
|||
@Test
|
||||
public void testNameserverMatch_nontruncatedResultsSet() throws Exception {
|
||||
createManyDomainsAndHosts(4, 1, 2);
|
||||
assertThat(generateActualJson(RequestType.NS_LDH_NAME, "ns1.domain1.lol"))
|
||||
.isEqualTo(readMultiDomainFile(
|
||||
"rdap_nontruncated_domains.json",
|
||||
"domain1.lol",
|
||||
"43-LOL",
|
||||
"domain2.lol",
|
||||
"44-LOL",
|
||||
"domain3.lol",
|
||||
"45-LOL",
|
||||
"domain4.lol",
|
||||
"46-LOL"));
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
runSuccessfulTestWithFourDomains(
|
||||
RequestType.NS_LDH_NAME,
|
||||
"ns1.domain1.lol",
|
||||
"46-LOL",
|
||||
"45-LOL",
|
||||
"44-LOL",
|
||||
"43-LOL",
|
||||
"rdap_nontruncated_domains.json");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNameserverMatch_truncatedResultsSet() throws Exception {
|
||||
createManyDomainsAndHosts(5, 1, 2);
|
||||
assertThat(generateActualJson(RequestType.NS_LDH_NAME, "ns1.domain1.lol"))
|
||||
.isEqualTo(readMultiDomainFile(
|
||||
"rdap_domains_four_truncated.json",
|
||||
"domain1.lol",
|
||||
"43-LOL",
|
||||
"domain2.lol",
|
||||
"44-LOL",
|
||||
"domain3.lol",
|
||||
"45-LOL",
|
||||
"domain4.lol",
|
||||
"46-LOL"));
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
runSuccessfulTestWithFourDomains(
|
||||
RequestType.NS_LDH_NAME,
|
||||
"ns1.domain1.lol",
|
||||
"47-LOL",
|
||||
"46-LOL",
|
||||
"45-LOL",
|
||||
"44-LOL",
|
||||
"rdap_domains_four_truncated.json");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNameserverMatch_reallyTruncatedResultsSet() throws Exception {
|
||||
createManyDomainsAndHosts(9, 1, 2);
|
||||
assertThat(generateActualJson(RequestType.NS_LDH_NAME, "ns1.domain1.lol"))
|
||||
.isEqualTo(readMultiDomainFile(
|
||||
"rdap_domains_four_truncated.json",
|
||||
"domain1.lol",
|
||||
"43-LOL",
|
||||
"domain2.lol",
|
||||
"44-LOL",
|
||||
"domain3.lol",
|
||||
"45-LOL",
|
||||
"domain4.lol",
|
||||
"46-LOL"));
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
runSuccessfulTestWithFourDomains(
|
||||
RequestType.NS_LDH_NAME,
|
||||
"ns1.domain1.lol",
|
||||
"4B-LOL",
|
||||
"4A-LOL",
|
||||
"49-LOL",
|
||||
"48-LOL",
|
||||
"rdap_domains_four_truncated.json");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -1412,13 +1411,13 @@ public class RdapDomainSearchActionTest {
|
|||
.isEqualTo(readMultiDomainFile(
|
||||
"rdap_nontruncated_domains.json",
|
||||
"domain1.lol",
|
||||
"B7-LOL",
|
||||
"BA-LOL",
|
||||
"domain2.lol",
|
||||
"B8-LOL",
|
||||
"domain3.lol",
|
||||
"B9-LOL",
|
||||
"domain3.lol",
|
||||
"B8-LOL",
|
||||
"domain4.lol",
|
||||
"BA-LOL"));
|
||||
"B7-LOL"));
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
}
|
||||
|
||||
|
|
@ -1429,9 +1428,9 @@ public class RdapDomainSearchActionTest {
|
|||
.isEqualTo(readMultiDomainFile(
|
||||
"rdap_incomplete_domains.json",
|
||||
"domain1.lol",
|
||||
"13C7-LOL",
|
||||
"domain2.lol",
|
||||
"13C8-LOL",
|
||||
"domain2.lol",
|
||||
"13C7-LOL",
|
||||
"x",
|
||||
"x",
|
||||
"x",
|
||||
|
|
@ -1473,7 +1472,7 @@ public class RdapDomainSearchActionTest {
|
|||
runNotFoundTest(RequestType.NS_IP, "127.0.0.1", "No domains found");
|
||||
}
|
||||
|
||||
// todo (b/27378695): reenable or delete this test
|
||||
// TODO(b/27378695): reenable or delete this test
|
||||
@Ignore
|
||||
@Test
|
||||
public void testAddressMatchDomainsInTestTld_notFound() throws Exception {
|
||||
|
|
@ -1547,51 +1546,39 @@ public class RdapDomainSearchActionTest {
|
|||
@Test
|
||||
public void testAddressMatch_nontruncatedResultsSet() throws Exception {
|
||||
createManyDomainsAndHosts(4, 1, 2);
|
||||
assertThat(generateActualJson(RequestType.NS_IP, "5.5.5.1"))
|
||||
.isEqualTo(readMultiDomainFile(
|
||||
"rdap_nontruncated_domains.json",
|
||||
"domain1.lol",
|
||||
"43-LOL",
|
||||
"domain2.lol",
|
||||
"44-LOL",
|
||||
"domain3.lol",
|
||||
"45-LOL",
|
||||
"domain4.lol",
|
||||
"46-LOL"));
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
runSuccessfulTestWithFourDomains(
|
||||
RequestType.NS_IP,
|
||||
"5.5.5.1",
|
||||
"46-LOL",
|
||||
"45-LOL",
|
||||
"44-LOL",
|
||||
"43-LOL",
|
||||
"rdap_nontruncated_domains.json");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testAddressMatch_truncatedResultsSet() throws Exception {
|
||||
createManyDomainsAndHosts(5, 1, 2);
|
||||
assertThat(generateActualJson(RequestType.NS_IP, "5.5.5.1"))
|
||||
.isEqualTo(readMultiDomainFile(
|
||||
"rdap_domains_four_truncated.json",
|
||||
"domain1.lol",
|
||||
"43-LOL",
|
||||
"domain2.lol",
|
||||
"44-LOL",
|
||||
"domain3.lol",
|
||||
"45-LOL",
|
||||
"domain4.lol",
|
||||
"46-LOL"));
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
runSuccessfulTestWithFourDomains(
|
||||
RequestType.NS_IP,
|
||||
"5.5.5.1",
|
||||
"47-LOL",
|
||||
"46-LOL",
|
||||
"45-LOL",
|
||||
"44-LOL",
|
||||
"rdap_domains_four_truncated.json");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testAddressMatch_reallyTruncatedResultsSet() throws Exception {
|
||||
createManyDomainsAndHosts(9, 1, 2);
|
||||
assertThat(generateActualJson(RequestType.NS_IP, "5.5.5.1"))
|
||||
.isEqualTo(readMultiDomainFile(
|
||||
"rdap_domains_four_truncated.json",
|
||||
"domain1.lol",
|
||||
"43-LOL",
|
||||
"domain2.lol",
|
||||
"44-LOL",
|
||||
"domain3.lol",
|
||||
"45-LOL",
|
||||
"domain4.lol",
|
||||
"46-LOL"));
|
||||
assertThat(response.getStatus()).isEqualTo(200);
|
||||
runSuccessfulTestWithFourDomains(
|
||||
RequestType.NS_IP,
|
||||
"5.5.5.1",
|
||||
"4B-LOL",
|
||||
"4A-LOL",
|
||||
"49-LOL",
|
||||
"48-LOL",
|
||||
"rdap_domains_four_truncated.json");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue