Light, fluffy, and always free - The AWS Local Emulator alternative
fix(ec2): reject reserved IPv4 ranges for VPC CIDR blocks (#5559)
Bharat Kaurav66b2ec05e9d1
diff --git a/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2Service.java b/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2Service.javaindex 7e14cd82bf..14534dc5f5 100644--- a/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2Service.java+++ b/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2Service.java@@ -4659,6 +4659,7 @@ public class Ec2Service implements ContainerTeardown, ResourceProvider, Resettab// AWS stores the CIDR in canonical form: "100.68.0.18/18" becomes "100.68.0.0/18".String cidrBlock = canonicalizeIpv4Cidr(requestedCidrBlock);rejectOutOfRangePrefix(cidrBlock, "InvalidVpc.Range");+ rejectReservedVpcRange(cidrBlock);ensureDefaultResources(region);String vpcId = "vpc-" + randomHex(8);Vpc vpc = new Vpc();@@ -4866,6 +4867,7 @@ public class Ec2Service implements ContainerTeardown, ResourceProvider, Resettabpublic VpcCidrBlockAssociation associateVpcCidrBlock(String region, String vpcId, String cidrBlock) {rejectOutOfRangePrefix(cidrBlock, "InvalidVpc.Range");+ rejectReservedVpcRange(cidrBlock);ensureDefaultResources(region);synchronized (attachmentTopologyLock(region)) {synchronized (lockFor(key(region, vpcId))) {@@ -5768,6 +5770,25 @@ public class Ec2Service implements ContainerTeardown, ResourceProvider, Resettab}}+ /** The ranges the VPC User Guide says "You can't specify ... for your VPCs". */+ private static final List<String> RESERVED_VPC_RANGES =+ List.of("0.0.0.0/8", "127.0.0.0/8", "169.254.0.0/16", "224.0.0.0/4");++ /**+ * The VPC User Guide's IPv4 VPC CIDR blocks section rules out 0.0.0.0/8, 127.0.0.0/8 (loopback),+ * 169.254.0.0/16 (link-local) and 224.0.0.0/4 (multicast) for any VPC block, primary or+ * secondary, and AWS answers with InvalidVpc.Range. Requests with no IPv4 CIDR, or one that+ * does not parse, are left to the checks that already handle them.+ */+ private static void rejectReservedVpcRange(String cidrBlock) {+ if (!Ipv4Cidrs.isIpv4(cidrBlock)) {+ return;+ }+ if (RESERVED_VPC_RANGES.stream().anyMatch(range -> Ipv4Cidrs.overlaps(cidrBlock, range))) {+ throw new AwsException("InvalidVpc.Range", "The CIDR '" + cidrBlock + "' is invalid.", 400);+ }+ }+/*** AWS refuses a subnet whose IPv4 CIDR overlaps another subnet's in the same VPC. CreateSubnet* carries no idempotency token, so this check is also what stops an SDK transport retry afterdiff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServiceTest.javaindex 8b5bd96203..0e8eb8e9db 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServiceTest.java@@ -940,6 +940,45 @@ class Ec2ServiceTest {.getCidrBlockAssociationSet().size());}+ @Test+ void createVpcAndAssociateVpcCidrBlockRejectReservedRanges() {+ // VPC User Guide: "You can't specify the following CIDR blocks for your VPCs": 0.0.0.0/8,+ // 127.0.0.0/8, 169.254.0.0/16 and 224.0.0.0/4.+ Ec2Service service = new Ec2Service(mockConfig(true), mock(Ec2ContainerManager.class),+ mock(Ec2PortForwardManager.class), mock(AmiImageResolver.class), mock(Ec2ImageCatalog.class),+ new Ec2InstanceTypeCatalog(), new InMemoryStorageFactory());+ long vpcsBefore = service.describeVpcs("us-east-1", List.of(), Map.of()).size();+ String vpcId = service.createVpc("us-east-1", "52.0.0.0/16", false).getVpcId();++ for (String cidr : List.of("0.0.0.0/16", "0.255.0.0/28", "127.0.0.0/16", "127.255.255.0/24",+ "169.254.0.0/16", "169.254.169.0/24", "224.0.0.0/16", "239.255.0.0/16")) {+ AwsException createError = assertThrows(AwsException.class,+ () -> service.createVpc("us-east-1", cidr, false), cidr);+ assertEquals("InvalidVpc.Range", createError.getErrorCode());+ assertEquals("The CIDR '" + cidr + "' is invalid.", createError.getMessage());+ assertEquals(400, createError.getHttpStatus());++ AwsException associateError = assertThrows(AwsException.class,+ () -> service.associateVpcCidrBlock("us-east-1", vpcId, cidr), cidr);+ assertEquals("InvalidVpc.Range", associateError.getErrorCode());+ assertEquals(400, associateError.getHttpStatus());+ }+ assertEquals(vpcsBefore + 1, service.describeVpcs("us-east-1", List.of(), Map.of()).size());+ assertEquals(1, service.describeVpcs("us-east-1", List.of(vpcId), Map.of()).getFirst()+ .getCidrBlockAssociationSet().size());+ }++ @Test+ void createVpcAcceptsBlocksNextToTheReservedRanges() {+ Ec2Service service = new Ec2Service(mockConfig(true), mock(Ec2ContainerManager.class),+ mock(Ec2PortForwardManager.class), mock(AmiImageResolver.class), mock(Ec2ImageCatalog.class),+ new Ec2InstanceTypeCatalog(), new InMemoryStorageFactory());+ for (String cidr : List.of("1.0.0.0/16", "126.255.0.0/16", "128.0.0.0/16", "169.253.0.0/16",+ "169.255.0.0/16", "223.255.0.0/16", "240.0.0.0/16")) {+ assertEquals(cidr, service.createVpc("us-east-1", cidr, false).getCidrBlock());+ }+ }+@Testvoid createVpcAndAssociateVpcCidrBlockAcceptTheSlash16AndSlash28PrefixBounds() {Ec2Service service = new Ec2Service(mockConfig(true), mock(Ec2ContainerManager.class),diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2VpcReservedRangeIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2VpcReservedRangeIntegrationTest.javanew file mode 100644index 0000000000..211ddfc4fc--- /dev/null+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2VpcReservedRangeIntegrationTest.java@@ -0,0 +1,57 @@+package io.github.hectorvent.floci.services.ec2;++import io.quarkus.test.junit.QuarkusTest;+import org.junit.jupiter.api.Test;++import static io.restassured.RestAssured.given;+import static org.hamcrest.Matchers.equalTo;++/**+ * The VPC User Guide rules out 0.0.0.0/8, 127.0.0.0/8, 169.254.0.0/16 and 224.0.0.0/4 for any VPC+ * block. CreateVpc and AssociateVpcCidrBlock answer a block from one of them with InvalidVpc.Range.+ */+@QuarkusTest+class Ec2VpcReservedRangeIntegrationTest {++ private static final String AUTH_HEADER =+ "AWS4-HMAC-SHA256 Credential=test/20261013/us-east-1/ec2/aws4_request";++ @Test+ void createVpcRejectsALinkLocalBlock() {+ given()+ .formParam("Action", "CreateVpc")+ .formParam("CidrBlock", "169.254.0.0/16")+ .header("Authorization", AUTH_HEADER)+ .when()+ .post("/")+ .then()+ .statusCode(400)+ .body("Response.Errors.Error.Code", equalTo("InvalidVpc.Range"))+ .body("Response.Errors.Error.Message", equalTo("The CIDR '169.254.0.0/16' is invalid."));+ }++ @Test+ void associateVpcCidrBlockRejectsALinkLocalBlock() {+ String vpcId = given()+ .formParam("Action", "CreateVpc")+ .formParam("CidrBlock", "10.96.0.0/24")+ .header("Authorization", AUTH_HEADER)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .extract().path("CreateVpcResponse.vpc.vpcId");++ given()+ .formParam("Action", "AssociateVpcCidrBlock")+ .formParam("VpcId", vpcId)+ .formParam("CidrBlock", "169.254.0.0/24")+ .header("Authorization", AUTH_HEADER)+ .when()+ .post("/")+ .then()+ .statusCode(400)+ .body("Response.Errors.Error.Code", equalTo("InvalidVpc.Range"))+ .body("Response.Errors.Error.Message", equalTo("The CIDR '169.254.0.0/24' is invalid."));+ }+}