1
0
mirror of https://github.com/google/nomulus synced 2026-07-07 16:46:56 +00:00

Add TLD verification to GenerateZoneFilesAction (#3132)

1. this is a good idea in general
2. it can prevent GCS path traversal if someone somehow bypasses auth to
   add a weird path
This commit is contained in:
gbrodman
2026-07-06 15:26:42 -04:00
committed by GitHub
parent 160abef731
commit 22c867f3f2
2 changed files with 17 additions and 0 deletions
@@ -33,6 +33,7 @@ import google.registry.model.domain.Domain;
import google.registry.model.domain.secdns.DomainDsData;
import google.registry.model.host.Host;
import google.registry.model.tld.Tld;
import google.registry.model.tld.Tlds;
import google.registry.request.Action;
import google.registry.request.HttpException.BadRequestException;
import google.registry.request.JsonActionRunner;
@@ -119,6 +120,7 @@ public class GenerateZoneFilesAction implements Runnable, JsonActionRunner.JsonA
public Map<String, Object> handleJsonRequest(Map<String, ?> json) {
@SuppressWarnings("unchecked")
ImmutableSet<String> tlds = ImmutableSet.copyOf((List<String>) json.get("tlds"));
Tlds.assertTldsExist(tlds);
Instant exportTime = Instant.parse(json.get("exportTime").toString());
// We disallow exporting within the past 2 minutes because there might be outstanding writes.
// We can only reliably call loadAtPointInTime at times that are UTC midnight and >
@@ -23,6 +23,7 @@ import static google.registry.testing.DatabaseHelper.persistResource;
import static google.registry.testing.TestDataHelper.loadFile;
import static google.registry.util.DateTimeUtils.plusMinutes;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.jupiter.api.Assertions.assertThrows;
import com.google.cloud.storage.BlobId;
import com.google.cloud.storage.contrib.nio.testing.LocalStorageHelper;
@@ -56,6 +57,20 @@ class GenerateZoneFilesActionTest {
private final GcsUtils gcsUtils = new GcsUtils(LocalStorageHelper.getOptions());
@Test
void testGenerate_nonexistentTld_throwsException() {
GenerateZoneFilesAction action = new GenerateZoneFilesAction();
IllegalArgumentException thrown =
assertThrows(
IllegalArgumentException.class,
() ->
action.handleJsonRequest(
ImmutableMap.<String, Object>of(
"tlds", ImmutableList.of("nonexistent-tld"),
"exportTime", Instant.parse("2024-03-27T00:00:00Z"))));
assertThat(thrown).hasMessageThat().contains("TLDs do not exist: nonexistent-tld");
}
@Test
void testGenerate_defaultTtls() throws Exception {
createTlds("tld", "com");