mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-09-06 16:17:13 +00:00
Code Issues Releases Wiki Activity

Use a TLD's configured TTLs if they are present (#1992)

Browse Source 
* Use tld's configured TTLs if they are present

* Change to optional

* Use optionals better
This commit is contained in:
sarahcaseybot
2023-04-21 13:47:10 -04:00
committed by GitHub
parent bd0cea0d87
commit 203c20c040
11 changed files with 300 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/test/java/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java
+45 -6
View File
@@ -42,6 +42,7 @@ import google.registry.model.domain.Domain;
import google.registry.model.domain.secdns.DomainDsData;
import google.registry.model.eppcommon.StatusValue;
import google.registry.model.host.Host;
import google.registry.model.tld.Tld;
import google.registry.persistence.VKey;
import google.registry.persistence.transaction.JpaTestExtensions;
import google.registry.persistence.transaction.JpaTestExtensions.JpaIntegrationTestExtension;
@@ -76,9 +77,6 @@ public class CloudDnsWriterTest {
private static final Inet4Address IPv4 = (Inet4Address) InetAddresses.forString("127.0.0.1");
private static final Inet6Address IPv6 = (Inet6Address) InetAddresses.forString("::1");
private static final Duration DEFAULT_A_TTL = Duration.standardSeconds(11);
private static final Duration DEFAULT_NS_TTL = Duration.standardSeconds(222);
private static final Duration DEFAULT_DS_TTL = Duration.standardSeconds(3333);
@Mock private Dns dnsConnection;
@Mock private Dns.ResourceRecordSets resourceRecordSets;
@@ -119,14 +117,21 @@ public class CloudDnsWriterTest {
@BeforeEach
void beforeEach() throws Exception {
createTld("tld");
persistResource(
Tld.get("tld")
.asBuilder()
.setDnsAPlusAaaaTtl(Duration.standardSeconds(11))
.setDnsNsTtl(Duration.standardSeconds(222))
.setDnsDsTtl(Duration.standardSeconds(3333))
.build());
writer =
new CloudDnsWriter(
dnsConnection,
"projectId",
"triple.secret.tld", // used by testInvalidZoneNames()
DEFAULT_A_TTL,
DEFAULT_NS_TTL,
DEFAULT_DS_TTL,
Duration.ZERO,
Duration.ZERO,
Duration.ZERO,
RateLimiter.create(20),
10, // max num threads
new SystemClock(),
@@ -383,6 +388,40 @@ public class CloudDnsWriterTest {
verifyZone(fakeDomainRecords("example.tld", 0, 1, 0, 0));
}
@Test
void testLoadDomain_defaultTtls() {
persistResource(
Tld.get("tld")
.asBuilder()
.setDnsAPlusAaaaTtl(null)
.setDnsNsTtl(null)
.setDnsDsTtl(null)
.build());
writer =
new CloudDnsWriter(
dnsConnection,
"projectId",
"triple.secret.tld",
Duration.standardSeconds(11),
Duration.standardSeconds(222),
Duration.standardSeconds(3333),
RateLimiter.create(20),
10,
new SystemClock(),
new Retrier(new SystemSleeper(), 5));
persistResource(
fakeDomain(
"example.tld",
ImmutableSet.of(persistResource(fakeHost("0.ip6.example.tld", IPv6))),
0)
.asBuilder()
.addSubordinateHost("0.ip6.example.tld")
.build());
writer.publishDomain("example.tld");
verifyZone(fakeDomainRecords("example.tld", 0, 1, 0, 0));
}
@Test
void testLoadDomain_withNameserveThatEndsWithDomainName() {
persistResource(
core/src/test/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java
+170 -18
View File
@@ -39,6 +39,7 @@ import google.registry.model.domain.Domain;
import google.registry.model.domain.secdns.DomainDsData;
import google.registry.model.eppcommon.StatusValue;
import google.registry.model.host.Host;
import google.registry.model.tld.Tld;
import google.registry.persistence.transaction.JpaTestExtensions;
import google.registry.persistence.transaction.JpaTestExtensions.JpaIntegrationTestExtension;
import google.registry.testing.DatabaseHelper;
@@ -110,7 +111,13 @@ public class DnsUpdateWriterTest {
Update update = updateCaptor.getValue();
assertThatUpdatedZoneIs(update, "tld.");
assertThatUpdateDeletes(update, "example.tld.", Type.ANY);
assertThatUpdateAdds(update, "example.tld.", Type.NS, "ns1.example.tld.", "ns2.example.tld.");
assertThatUpdateAdds(
update,
"example.tld.",
Type.NS,
Duration.ZERO.getStandardSeconds(),
"ns1.example.tld.",
"ns2.example.tld.");
assertThatTotalUpdateSetsIs(update, 2); // The delete and NS sets
}
@@ -166,13 +173,15 @@ public class DnsUpdateWriterTest {
assertThatUpdatedZoneIs(update, "tld.");
assertThatUpdateDeletes(update, "example1.tld.", Type.ANY);
assertThatUpdateDeletes(update, "example2.tld.", Type.ANY);
assertThatUpdateAdds(update, "example1.tld.", Type.NS, "ns.example1.tld.");
assertThatUpdateAdds(update, "example2.tld.", Type.NS, "ns.example2.tld.");
assertThatUpdateAdds(
update, "example1.tld.", Type.NS, Duration.ZERO.getStandardSeconds(), "ns.example1.tld.");
assertThatUpdateAdds(
update, "example2.tld.", Type.NS, Duration.ZERO.getStandardSeconds(), "ns.example2.tld.");
assertThatTotalUpdateSetsIs(update, 4); // The delete and NS sets for each TLD
}
@Test
void testPublishDomainCreate_publishesDelegationSigner() throws Exception {
void testPublishDomainCreate_publishesDelegationSigner_usesDefaultTtl() throws Exception {
Domain domain =
persistActiveDomain("example.tld")
.asBuilder()
@@ -189,8 +198,53 @@ public class DnsUpdateWriterTest {
Update update = updateCaptor.getValue();
assertThatUpdatedZoneIs(update, "tld.");
assertThatUpdateDeletes(update, "example.tld.", Type.ANY);
assertThatUpdateAdds(update, "example.tld.", Type.NS, "ns1.example.tld.");
assertThatUpdateAdds(update, "example.tld.", Type.DS, "1 3 1 0123456789ABCDEF");
assertThatUpdateAdds(
update, "example.tld.", Type.NS, Duration.ZERO.getStandardSeconds(), "ns1.example.tld.");
assertThatUpdateAdds(
update,
"example.tld.",
Type.DS,
Duration.ZERO.getStandardSeconds(),
"1 3 1 0123456789ABCDEF");
assertThatTotalUpdateSetsIs(update, 3); // The delete, the NS, and DS sets
}
@Test
void testPublishDomainCreate_publishesDelegationSigner_usesTldConfiguredTtl() throws Exception {
persistResource(
Tld.get("tld")
.asBuilder()
.setDnsNsTtl(Duration.millis(500))
.setDnsDsTtl(Duration.millis(400))
.build());
Domain domain =
persistActiveDomain("example.tld")
.asBuilder()
.setNameservers(ImmutableSet.of(persistActiveHost("ns1.example.tld").createVKey()))
.setDsData(
ImmutableSet.of(DomainDsData.create(1, 3, 1, base16().decode("0123456789ABCDEF"))))
.build();
persistResource(domain);
writer.publishDomain("example.tld");
writer.commit();
verify(mockResolver).send(updateCaptor.capture());
Update update = updateCaptor.getValue();
assertThatUpdatedZoneIs(update, "tld.");
assertThatUpdateDeletes(update, "example.tld.", Type.ANY);
assertThatUpdateAdds(
update,
"example.tld.",
Type.NS,
Duration.millis(500).getStandardSeconds(),
"ns1.example.tld.");
assertThatUpdateAdds(
update,
"example.tld.",
Type.DS,
Duration.millis(400).getStandardSeconds(),
"1 3 1 0123456789ABCDEF");
assertThatTotalUpdateSetsIs(update, 3); // The delete, the NS, and DS sets
}
@@ -229,7 +283,7 @@ public class DnsUpdateWriterTest {
}
@Test
void testPublishHostCreate_publishesAddressRecords() throws Exception {
void testPublishHostCreate_publishesAddressRecords_usesDefaultTtl() throws Exception {
Host host =
persistResource(
newHost("ns1.example.tld")
@@ -255,9 +309,76 @@ public class DnsUpdateWriterTest {
assertThatUpdatedZoneIs(update, "tld.");
assertThatUpdateDeletes(update, "example.tld.", Type.ANY);
assertThatUpdateDeletes(update, "ns1.example.tld.", Type.ANY);
assertThatUpdateAdds(update, "ns1.example.tld.", Type.A, "10.0.0.1", "10.1.0.1");
assertThatUpdateAdds(update, "ns1.example.tld.", Type.AAAA, "fd0e:a5c8:6dfb:6a5e:0:0:0:1");
assertThatUpdateAdds(update, "example.tld.", Type.NS, "ns1.example.tld.");
assertThatUpdateAdds(
update,
"ns1.example.tld.",
Type.A,
Duration.ZERO.getStandardSeconds(),
"10.0.0.1",
"10.1.0.1");
assertThatUpdateAdds(
update,
"ns1.example.tld.",
Type.AAAA,
Duration.ZERO.getStandardSeconds(),
"fd0e:a5c8:6dfb:6a5e:0:0:0:1");
assertThatUpdateAdds(
update, "example.tld.", Type.NS, Duration.ZERO.getStandardSeconds(), "ns1.example.tld.");
assertThatTotalUpdateSetsIs(update, 5);
}
@Test
void testPublishHostCreate_publishesAddressRecords_usesTldConfiguredTtl() throws Exception {
persistResource(
Tld.get("tld")
.asBuilder()
.setDnsAPlusAaaaTtl(Duration.millis(500))
.setDnsNsTtl(Duration.millis(400))
.build());
Host host =
persistResource(
newHost("ns1.example.tld")
.asBuilder()
.setInetAddresses(
ImmutableSet.of(
InetAddresses.forString("10.0.0.1"),
InetAddresses.forString("10.1.0.1"),
InetAddresses.forString("fd0e:a5c8:6dfb:6a5e:0:0:0:1")))
.build());
persistResource(
DatabaseHelper.newDomain("example.tld")
.asBuilder()
.addSubordinateHost("ns1.example.tld")
.addNameserver(host.createVKey())
.build());
writer.publishHost("ns1.example.tld");
writer.commit();
verify(mockResolver).send(updateCaptor.capture());
Update update = updateCaptor.getValue();
assertThatUpdatedZoneIs(update, "tld.");
assertThatUpdateDeletes(update, "example.tld.", Type.ANY);
assertThatUpdateDeletes(update, "ns1.example.tld.", Type.ANY);
assertThatUpdateAdds(
update,
"ns1.example.tld.",
Type.A,
Duration.millis(500).getStandardSeconds(),
"10.0.0.1",
"10.1.0.1");
assertThatUpdateAdds(
update,
"ns1.example.tld.",
Type.AAAA,
Duration.millis(500).getStandardSeconds(),
"fd0e:a5c8:6dfb:6a5e:0:0:0:1");
assertThatUpdateAdds(
update,
"example.tld.",
Type.NS,
Duration.millis(400).getStandardSeconds(),
"ns1.example.tld.");
assertThatTotalUpdateSetsIs(update, 5);
}
@@ -294,7 +415,8 @@ public class DnsUpdateWriterTest {
assertThatUpdatedZoneIs(update, "tld.");
assertThatUpdateDeletes(update, "example.tld.", Type.ANY);
assertThatUpdateDeletes(update, "ns1.example.tld.", Type.ANY);
assertThatUpdateAdds(update, "example.tld.", Type.NS, "ns1.example.com.");
assertThatUpdateAdds(
update, "example.tld.", Type.NS, Duration.ZERO.getStandardSeconds(), "ns1.example.com.");
assertThatTotalUpdateSetsIs(update, 3);
}
@@ -329,9 +451,26 @@ public class DnsUpdateWriterTest {
assertThatUpdatedZoneIs(update, "tld.");
assertThatUpdateDeletes(update, "example.tld.", Type.ANY);
assertThatUpdateDeletes(update, "ns1.example.tld.", Type.ANY);
assertThatUpdateAdds(update, "example.tld.", Type.NS, "ns1.example.com.", "ns1.example.tld.");
assertThatUpdateAdds(update, "ns1.example.tld.", Type.A, "10.0.0.1", "10.1.0.1");
assertThatUpdateAdds(update, "ns1.example.tld.", Type.AAAA, "fd0e:a5c8:6dfb:6a5e:0:0:0:1");
assertThatUpdateAdds(
update,
"example.tld.",
Type.NS,
Duration.ZERO.getStandardSeconds(),
"ns1.example.com.",
"ns1.example.tld.");
assertThatUpdateAdds(
update,
"ns1.example.tld.",
Type.A,
Duration.ZERO.getStandardSeconds(),
"10.0.0.1",
"10.1.0.1");
assertThatUpdateAdds(
update,
"ns1.example.tld.",
Type.AAAA,
Duration.ZERO.getStandardSeconds(),
"fd0e:a5c8:6dfb:6a5e:0:0:0:1");
assertThatTotalUpdateSetsIs(update, 5);
}
@@ -365,9 +504,21 @@ public class DnsUpdateWriterTest {
assertThatUpdateDeletes(update, "example.tld.", Type.ANY);
assertThatUpdateDeletes(update, "ns1.example.tld.", Type.ANY);
assertThatUpdateDeletes(update, "foo.example.tld.", Type.ANY);
assertThatUpdateAdds(update, "example.tld.", Type.NS, "ns1.example.tld.");
assertThatUpdateAdds(update, "ns1.example.tld.", Type.A, "10.0.0.1", "10.1.0.1");
assertThatUpdateAdds(update, "ns1.example.tld.", Type.AAAA, "fd0e:a5c8:6dfb:6a5e:0:0:0:1");
assertThatUpdateAdds(
update, "example.tld.", Type.NS, Duration.ZERO.getStandardSeconds(), "ns1.example.tld.");
assertThatUpdateAdds(
update,
"ns1.example.tld.",
Type.A,
Duration.ZERO.getStandardSeconds(),
"10.0.0.1",
"10.1.0.1");
assertThatUpdateAdds(
update,
"ns1.example.tld.",
Type.AAAA,
Duration.ZERO.getStandardSeconds(),
"fd0e:a5c8:6dfb:6a5e:0:0:0:1");
assertThatTotalUpdateSetsIs(update, 6);
}
@@ -430,13 +581,14 @@ public class DnsUpdateWriterTest {
}
private static void assertThatUpdateAdds(
Update update, String resourceName, int recordType, String... resourceData) {
Update update, String resourceName, int recordType, Long ttl, String... resourceData) {
ArrayList<String> expectedData = new ArrayList<>();
Collections.addAll(expectedData, resourceData);
ArrayList<String> actualData = new ArrayList<>();
for (Record record : findUpdateRecords(update, resourceName, recordType)) {
actualData.add(record.rdataToString());
assertThat(record.getTTL()).isEqualTo(ttl);
}
assertThat(actualData).containsExactlyElementsIn(expectedData);
}
core/src/test/java/google/registry/tools/CreateTldCommandTest.java
+3 -3
View File
@@ -87,9 +87,9 @@ class CreateTldCommandTest extends CommandTestCase<CreateTldCommand> {
"--dns_ns_ttl=PT180S");
Tld registry = Tld.get("xn--q9jyb4c");
assertThat(registry).isNotNull();
assertThat(registry.getDnsAPlusAaaaTtl()).isEqualTo(standardMinutes(5));
assertThat(registry.getDnsDsTtl()).isEqualTo(standardMinutes(4));
assertThat(registry.getDnsNsTtl()).isEqualTo(standardMinutes(3));
assertThat(registry.getDnsAPlusAaaaTtl().get()).isEqualTo(standardMinutes(5));
assertThat(registry.getDnsDsTtl().get()).isEqualTo(standardMinutes(4));
assertThat(registry.getDnsNsTtl().get()).isEqualTo(standardMinutes(3));
}
@Test
core/src/test/java/google/registry/tools/UpdateTldCommandTest.java
+4 -4
View File
@@ -1111,10 +1111,10 @@ class UpdateTldCommandTest extends CommandTestCase<UpdateTldCommand> {
"--dns_ds_ttl=PT240S",
"--dns_ns_ttl=PT180S",
"xn--q9jyb4c");
Tld registry = Tld.get("xn--q9jyb4c");
assertThat(registry.getDnsAPlusAaaaTtl()).isEqualTo(standardMinutes(5));
assertThat(registry.getDnsDsTtl()).isEqualTo(standardMinutes(4));
assertThat(registry.getDnsNsTtl()).isEqualTo(standardMinutes(3));
Tld tld = Tld.get("xn--q9jyb4c");
assertThat(tld.getDnsAPlusAaaaTtl().get()).isEqualTo(standardMinutes(5));
assertThat(tld.getDnsDsTtl().get()).isEqualTo(standardMinutes(4));
assertThat(tld.getDnsNsTtl().get()).isEqualTo(standardMinutes(3));
}
private void runSuccessfulReservedListsTest(String reservedLists) throws Exception {
core/src/test/java/google/registry/tools/server/GenerateZoneFilesActionTest.java
+21 -3
View File
@@ -35,6 +35,7 @@ import google.registry.gcs.GcsUtils;
import google.registry.model.domain.secdns.DomainDsData;
import google.registry.model.eppcommon.StatusValue;
import google.registry.model.host.Host;
import google.registry.model.tld.Tld;
import google.registry.persistence.VKey;
import google.registry.persistence.transaction.JpaTestExtensions;
import google.registry.persistence.transaction.JpaTestExtensions.JpaIntegrationTestExtension;
@@ -58,9 +59,26 @@ class GenerateZoneFilesActionTest {
private final GcsUtils gcsUtils = new GcsUtils(LocalStorageHelper.getOptions());
@Test
void testGenerate() throws Exception {
DateTime now = DateTime.now(DateTimeZone.UTC).withTimeAtStartOfDay();
void testGenerate_defaultTtls() throws Exception {
createTlds("tld", "com");
testGenerate("tld.zone");
}
@Test
void testGenerate_customTldTtls() throws Exception {
createTlds("tld", "com");
persistResource(
Tld.get("tld")
.asBuilder()
.setDnsAPlusAaaaTtl(Duration.standardSeconds(300))
.setDnsNsTtl(Duration.standardSeconds(400))
.setDnsDsTtl(Duration.standardSeconds(500))
.build());
testGenerate("tldCustomTtl.zone");
}
void testGenerate(String goldenFileName) throws Exception {
DateTime now = DateTime.now(DateTimeZone.UTC).withTimeAtStartOfDay();
ImmutableSet<InetAddress> ips =
ImmutableSet.of(InetAddress.getByName("127.0.0.1"), InetAddress.getByName("::1"));
@@ -145,7 +163,7 @@ class GenerateZoneFilesActionTest {
// files with literal tabs irritate our build tools.
Splitter splitter = Splitter.on('\n').omitEmptyStrings();
Iterable<String> generatedFileLines = splitter.split(generatedFile.replaceAll("\t", " "));
Iterable<String> goldenFileLines = splitter.split(loadFile(getClass(), "tld.zone"));
Iterable<String> goldenFileLines = splitter.split(loadFile(getClass(), goldenFileName));
// The first line needs to be the same as the golden file.
assertThat(generatedFileLines.iterator().next()).isEqualTo(goldenFileLines.iterator().next());
// The remaining lines can be in any order.
core/src/test/java/google/registry/tools/server/tldCustomTtl.zone
+14
View File
@@ -0,0 +1,14 @@
$ORIGIN tld.
bar 400 IN NS ns.bar.tld.
bar 400 IN NS ns.foo.tld.
ns.bar 300 IN A 127.0.0.1
ns.bar 300 IN AAAA 0:0:0:0:0:0:0:1
ns-only 400 IN NS ns.foo.tld.
ns-only 400 IN NS ns.bar.tld.
ns-and-ds 400 IN NS ns.foo.tld.
ns-and-ds 400 IN NS ns.bar.tld.
ns-and-ds 500 IN DS 1 2 3 000102