Light, fluffy, and always free - The AWS Local Emulator alternative
fix(route53): reject record sets outside the hosted zone (#6412)
lex001b7bb80f36ef
diff --git a/src/main/java/io/github/hectorvent/floci/services/route53/Route53Service.java b/src/main/java/io/github/hectorvent/floci/services/route53/Route53Service.javaindex 85662be7a2..95433b66c6 100644--- a/src/main/java/io/github/hectorvent/floci/services/route53/Route53Service.java+++ b/src/main/java/io/github/hectorvent/floci/services/route53/Route53Service.java@@ -972,6 +972,13 @@ public class Route53Service implements Resettable {private void validateChange(String action, ResourceRecordSet rrs,List<ResourceRecordSet> current, String zoneName) {+ String recordName = normalizeRecordName(rrs.getName());+ String zone = normalizeRecordName(zoneName);+ if (!".".equals(zone) && !recordName.equals(zone) && !recordName.endsWith("." + zone)) {+ throw new AwsException("InvalidChangeBatch",+ "RRSet with DNS name " + normalizeName(rrs.getName()) + " is not permitted in zone "+ + normalizeName(zoneName), 400);+ }if ("DELETE".equals(action) && isApexSoaOrNs(rrs, zoneName)) {throw new AwsException("InvalidChangeBatch","Invalid resource record set: Deleting the SOA or NS record at the zone apex is not permitted.", 400);diff --git a/src/test/java/io/github/hectorvent/floci/services/route53/Route53ServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/route53/Route53ServiceTest.javaindex d9e9ac6776..179c719f08 100644--- a/src/test/java/io/github/hectorvent/floci/services/route53/Route53ServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/route53/Route53ServiceTest.java@@ -268,6 +268,56 @@ class Route53ServiceTest {return rrs;}+ @Test+ void recordOutsideTheHostedZoneIsRejected() {+ Route53Service service = newService();+ String zoneId = service.createHostedZone("datacite.org.", "ref-outside", null, null).zone().getId();++ AwsException e = assertThrows(AwsException.class, () -> service.changeResourceRecordSets(zoneId,+ List.of(change("CREATE", aRecord("_lovable.strategy", 300, "1.2.3.4"))), null));+ assertEquals("InvalidChangeBatch", e.getErrorCode());+ assertEquals("RRSet with DNS name _lovable.strategy. is not permitted in zone datacite.org.", e.getMessage());+ AwsException suffixOnly = assertThrows(AwsException.class, () -> service.changeResourceRecordSets(zoneId,+ List.of(change("CREATE", aRecord("notdatacite.org", 300, "1.2.3.4"))), null));+ assertEquals("InvalidChangeBatch", suffixOnly.getErrorCode());+ }++ @Test+ void recordInsideTheHostedZoneIsAcceptedRegardlessOfCaseDotOrWildcard() {+ Route53Service service = newService();+ String zoneId = service.createHostedZone("datacite.org.", "ref-inside", null, null).zone().getId();++ service.changeResourceRecordSets(zoneId, List.of(+ change("CREATE", aRecord("WWW.DataCite.org", 300, "1.2.3.4")),+ change("CREATE", aRecord("*.blog.datacite.org.", 300, "1.2.3.5")),+ change("CREATE", aRecord("datacite.org", 300, "1.2.3.6"))), null);++ assertEquals(5, service.listResourceRecordSets(zoneId, null, null, 0).size());+ }++ @Test+ void rootHostedZoneAcceptsAnyRecordName() {+ Route53Service service = newService();+ String zoneId = service.createHostedZone(".", "ref-root", null, null).zone().getId();++ service.changeResourceRecordSets(zoneId,+ List.of(change("CREATE", aRecord("www.example.", 300, "1.2.3.4"))), null);++ assertEquals(3, service.listResourceRecordSets(zoneId, null, null, 0).size());+ }++ @Test+ void zoneCheckFoldsOnlyAsciiLettersLikeRecordIdentity() {+ Route53Service service = newService();+ String zoneId = service.createHostedZone("k.example.", "ref-kelvin", null, null).zone().getId();++ service.changeResourceRecordSets(zoneId,+ List.of(change("CREATE", aRecord("www.K.example.", 300, "1.2.3.4"))), null);+ AwsException e = assertThrows(AwsException.class, () -> service.changeResourceRecordSets(zoneId,+ List.of(change("CREATE", aRecord("www.\u212A.example.", 300, "1.2.3.5"))), null));+ assertEquals("InvalidChangeBatch", e.getErrorCode());+ }+@Testvoid deleteFailsWithNotFoundMessageWhenNoRecordWithMatchingNameAndTypeExists() {Route53Service service = newService();