Light, fluffy, and always free - The AWS Local Emulator alternative
fix: reject explicit ports on gateway load balancer listeners (#6462)
Andre Kuraitfe9dce406140
diff --git a/docs/services/elb.md b/docs/services/elb.mdindex 34b4c05f5b..e23dc3594d 100644--- a/docs/services/elb.md+++ b/docs/services/elb.md@@ -47,6 +47,8 @@ Floci supports Application Load Balancers (ALB) and Network Load Balancers (NLB)HTTPS listeners require a default certificate. Supply one when creating a listener or changing an HTTP listener to HTTPS; an omitted certificate list on an existing HTTPS listener keeps its default.+Gateway Load Balancer listeners require an omitted `Port` on both create and modify requests. Their portless control-plane configuration does not provide GENEVE packet forwarding.+| Action | Description ||--------|-------------|| CreateListener | Creates a listener and its non-deletable default rule. |diff --git a/src/main/java/io/github/hectorvent/floci/services/elbv2/ElbV2Service.java b/src/main/java/io/github/hectorvent/floci/services/elbv2/ElbV2Service.javaindex fe1934de23..7db5772e90 100644--- a/src/main/java/io/github/hectorvent/floci/services/elbv2/ElbV2Service.java+++ b/src/main/java/io/github/hectorvent/floci/services/elbv2/ElbV2Service.java@@ -604,7 +604,7 @@ public class ElbV2Service implements ResourceProvider, ServerCertificateReferencList<Action> defaultActions, List<String> alpnPolicy,Map<String, String> initialTags) {validatePort(port, "port");- requireLoadBalancer(region, lbArn);+ requireGatewayListenerPort(requireLoadBalancer(region, lbArn), port);Map<String, Listener> regionListeners = listeners.computeIfAbsent(region, k -> new ConcurrentHashMap<>());@@ -747,6 +747,7 @@ public class ElbV2Service implements ResourceProvider, ServerCertificateReferencwhile (true) {Listener initial = requireListener(region, listenerArn);LoadBalancer initialLb = requireLoadBalancer(region, initial.getLoadBalancerArn());+ requireGatewayListenerPort(initialLb, port);ListenerState initialState = listenerState(initial, initialLb);requireAvailableListenerPort(listeners.getOrDefault(region, Map.of()), initial.getLoadBalancerArn(),listenerArn, port != null ? port : initialState.port());@@ -1229,6 +1230,13 @@ public class ElbV2Service implements ResourceProvider, ServerCertificateReferenc}}+ private static void requireGatewayListenerPort(LoadBalancer loadBalancer, Integer port) {+ if (port != null && "gateway".equals(loadBalancer.getType())) {+ throw new AwsException("InvalidConfigurationRequest",+ "You can't specify a port for a Gateway Load Balancer.", 400);+ }+ }+private void requireCompatibleListenerProtocol(String listenerArn, Integer port, String protocol) {if (port == null) {return;diff --git a/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2IntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2IntegrationTest.javaindex 599827a909..dfeed85e61 100644--- a/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2IntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2IntegrationTest.java@@ -71,6 +71,52 @@ class ElbV2IntegrationTest {+ "' at 'port' failed to satisfy constraint: Member must have value " + constraint));}+ @Test+ void gatewayListenerPortRejectionsPreservePortlessListener() {+ String gatewayArn = given().header("Authorization", AUTH)+ .formParam("Action", "CreateLoadBalancer")+ .formParam("Name", "gateway-listener-port")+ .formParam("Type", "gateway")+ .formParam("Subnets.member.1", Ec2Service.defaultSubnetId("us-east-1", "a"))+ .when().post("/").then().statusCode(200)+ .extract().path("CreateLoadBalancerResponse.CreateLoadBalancerResult.LoadBalancers.member.LoadBalancerArn");+ try {+ given().header("Authorization", AUTH)+ .formParam("Action", "CreateListener").formParam("LoadBalancerArn", gatewayArn)+ .formParam("Protocol", "GENEVE").formParam("Port", 6081)+ .when().post("/").then().statusCode(400)+ .body("ErrorResponse.Error.Code", equalTo("InvalidConfigurationRequest"));+ given().header("Authorization", AUTH)+ .formParam("Action", "DescribeListeners").formParam("LoadBalancerArn", gatewayArn)+ .when().post("/").then().statusCode(200)+ .body("DescribeListenersResponse.DescribeListenersResult.Listeners.member.size()", equalTo(0));+ String gatewayListener = given().header("Authorization", AUTH)+ .formParam("Action", "CreateListener").formParam("LoadBalancerArn", gatewayArn)+ .formParam("Protocol", "GENEVE")+ .when().post("/").then().statusCode(200)+ .extract().path("CreateListenerResponse.CreateListenerResult.Listeners.member.ListenerArn");+ given().header("Authorization", AUTH)+ .formParam("Action", "ModifyListener").formParam("ListenerArn", gatewayListener)+ .formParam("Protocol", "TCP").formParam("Port", 6081)+ .when().post("/").then().statusCode(400)+ .body("ErrorResponse.Error.Code", equalTo("InvalidConfigurationRequest"));+ given().header("Authorization", AUTH)+ .formParam("Action", "DescribeListeners").formParam("ListenerArns.member.1", gatewayListener)+ .when().post("/").then().statusCode(200)+ .body("DescribeListenersResponse.DescribeListenersResult.Listeners.member.Protocol", equalTo("GENEVE"))+ .body("DescribeListenersResponse.DescribeListenersResult.Listeners.member.Port.size()", equalTo(0));+ given().header("Authorization", AUTH)+ .formParam("Action", "ModifyListener").formParam("ListenerArn", gatewayListener)+ .when().post("/").then().statusCode(200)+ .body("ModifyListenerResponse.ModifyListenerResult.Listeners.member.Protocol", equalTo("GENEVE"))+ .body("ModifyListenerResponse.ModifyListenerResult.Listeners.member.Port.size()", equalTo(0));+ } finally {+ given().header("Authorization", AUTH)+ .formParam("Action", "DeleteLoadBalancer").formParam("LoadBalancerArn", gatewayArn)+ .when().post("/").then().statusCode(200);+ }+ }+// ── Load Balancers ────────────────────────────────────────────────────────@Testdiff --git a/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2ServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2ServiceTest.javaindex e5923d1d12..df41804e92 100644--- a/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2ServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2ServiceTest.java@@ -593,6 +593,49 @@ class ElbV2ServiceTest {assertTrue(newTargetGroup.getLoadBalancerArns().contains(lbArn));}+ @ParameterizedTest+ @ValueSource(ints = {1, 65535})+ void gatewayListenerRejectsExplicitPortWithoutPublication(int port) {+ String lbArn = service.createLoadBalancer(REGION, "gateway-port", "internal", "gateway", "ipv4",+ ALB_SUBNETS, List.of(), Map.of()).getLoadBalancerArn();+ clearInvocations(dataPlane);++ AwsException createError = assertThrows(AwsException.class, () -> service.createListener(+ REGION, lbArn, "GENEVE", port, null, List.of(), List.of(), List.of(), Map.of()));+ assertEquals("InvalidConfigurationRequest", createError.getErrorCode());+ assertTrue(service.describeListeners(REGION, lbArn, null).isEmpty());+ verifyNoInteractions(dataPlane);++ Listener listener = service.createListener(REGION, lbArn, "GENEVE", null, null,+ List.of(), List.of(), List.of(), Map.of());+ clearInvocations(dataPlane);+ AwsException modifyError = assertThrows(AwsException.class, () -> service.modifyListener(+ REGION, listener.getListenerArn(), "TCP", port, null, null, null, null));+ assertEquals("InvalidConfigurationRequest", modifyError.getErrorCode());+ assertNull(listener.getPort());+ assertEquals("GENEVE", listener.getProtocol());+ verifyNoInteractions(dataPlane);+ }++ @Test+ void gatewayListenerOmittedPortAllowsActionUpdate() {+ String lbArn = service.createLoadBalancer(REGION, "gateway-actions", "internal", "gateway", "ipv4",+ ALB_SUBNETS, List.of(), Map.of()).getLoadBalancerArn();+ String oldTarget = createTargetGroup("gateway-old");+ String newTarget = createTargetGroup("gateway-new");+ Listener listener = service.createListener(REGION, lbArn, "GENEVE", null, null,+ List.of(), List.of(forwardAction(oldTarget)), List.of(), Map.of());++ service.modifyListener(REGION, listener.getListenerArn(), null, null, null, null,+ List.of(forwardAction(newTarget)), null);++ assertNull(listener.getPort());+ assertEquals("GENEVE", listener.getProtocol());+ assertEquals(newTarget, listener.getDefaultActions().getFirst().getTargetGroupArn());+ assertEquals(newTarget, service.describeRules(REGION, listener.getListenerArn(), null).getFirst()+ .getActions().getFirst().getTargetGroupArn());+ }+@Testvoid modifyListenerPortRestartsListener() {String lbArn = service.createLoadBalancer(