Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

fix(ec2): persist default egress as SecurityGroupRule and fix DescribeSecurityGroupRules filter parsing (#1525)

Prakhar Kapoor0b2855462693
diff --git a/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2QueryHandler.java b/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2QueryHandler.java
index 48b57fd05d..9a54ebfb83 100644
--- a/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2QueryHandler.java
+++ b/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2QueryHandler.java
@@ -913,10 +913,15 @@ public class Ec2QueryHandler {
}
private Response handleDescribeSecurityGroupRules(MultivaluedMap<String, String> p, String region) {
- String groupId = p.getFirst("Filter.1.Value.1");
+ Map<String, List<String>> filters = getFilters(p);
+ // The AWS SDK sends the security group id as a filter with name "group-id"
+ String groupId = "";
+ List<String> groupIdFilter = filters.get("group-id");
+ if (groupIdFilter != null && !groupIdFilter.isEmpty()) {
+ groupId = groupIdFilter.get(0);
+ }
List<String> ruleIds = getList(p, "SecurityGroupRuleId");
- List<SecurityGroupRule> rules = service.describeSecurityGroupRules(region,
- groupId != null ? groupId : "", ruleIds);
+ List<SecurityGroupRule> rules = service.describeSecurityGroupRules(region, groupId, ruleIds);
XmlBuilder xml = new XmlBuilder()
.start("DescribeSecurityGroupRulesResponse", AwsNamespaces.EC2)
.elem("requestId", UUID.randomUUID().toString())
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.java
index 96bc2d078a..b7b7ba9eca 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
@@ -299,6 +299,9 @@ public class Ec2Service {
egressAll.getIpRanges().add(new IpRange("0.0.0.0/0"));
defaultSg.getIpPermissionsEgress().add(egressAll);
securityGroups.put(key(region, securityGroupId), defaultSg);
+ // Persist the default egress rule as a SecurityGroupRule so that
+ // DescribeSecurityGroupRules can find it immediately (#1093).
+ createRules(region, securityGroupId, egressAll, true);
}
private String createMainRouteTable(String region, Vpc vpc, String routeTableId, String associationId) {
@@ -1110,6 +1113,9 @@ public class Ec2Service {
egressAll.getIpRanges().add(new IpRange("0.0.0.0/0"));
sg.getIpPermissionsEgress().add(egressAll);
securityGroups.put(key(region, sgId), sg);
+ // Persist the default egress rule as a SecurityGroupRule so that
+ // DescribeSecurityGroupRules can find it immediately (#1093).
+ createRules(region, sgId, egressAll, true);
return sg;
}
@@ -1228,8 +1234,9 @@ public class Ec2Service {
public List<SecurityGroupRule> describeSecurityGroupRules(String region, String groupId, List<String> ruleIds) {
ensureDefaultResources(region);
- return securityGroupRules.scan(k -> true).stream()
- .filter(r -> r.getGroupId().equals(groupId))
+ String regionPrefix = region + "::";
+ return securityGroupRules.scan(k -> k.startsWith(regionPrefix)).stream()
+ .filter(r -> groupId.isEmpty() || groupId.equals(r.getGroupId()))
.filter(r -> ruleIds.isEmpty() || ruleIds.contains(r.getSecurityGroupRuleId()))
.collect(Collectors.toList());
}
diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2IntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2IntegrationTest.java
index 0fd6fa1b60..e97d587f02 100644
--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2IntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2IntegrationTest.java
@@ -576,6 +576,67 @@ class Ec2IntegrationTest {
.statusCode(200);
}
+ @Test
+ @Order(34)
+ void describeSecurityGroupRulesReturnsDefaultEgress() {
+ // Issue #1093: default egress rule must be visible via DescribeSecurityGroupRules
+ // immediately after CreateSecurityGroup. Terraform relies on this.
+ given()
+ .formParam("Action", "DescribeSecurityGroupRules")
+ .formParam("Filter.1.Name", "group-id")
+ .formParam("Filter.1.Value.1", securityGroupId)
+ .header("Authorization", AUTH_HEADER)
+ .when()
+ .post("/")
+ .then()
+ .statusCode(200)
+ .contentType("application/xml")
+ // Must contain at least the default egress-all rule plus the authorized
+ // ingress (ssh/22) and egress (tcp/443) rules
+ .body("DescribeSecurityGroupRulesResponse.securityGroupRuleSet.item.size()",
+ greaterThanOrEqualTo(3))
+ .body("DescribeSecurityGroupRulesResponse.securityGroupRuleSet.item.groupId",
+ everyItem(equalTo(securityGroupId)));
+ }
+
+ @Test
+ @Order(35)
+ void describeSecurityGroupRulesIncludesIngressRule() {
+ // Verify authorized ingress rule (tcp/22) is present in the rules list
+ given()
+ .formParam("Action", "DescribeSecurityGroupRules")
+ .formParam("Filter.1.Name", "group-id")
+ .formParam("Filter.1.Value.1", securityGroupId)
+ .header("Authorization", AUTH_HEADER)
+ .when()
+ .post("/")
+ .then()
+ .statusCode(200)
+ .body(containsString("<fromPort>22</fromPort>"))
+ .body(containsString("<ipProtocol>tcp</ipProtocol>"))
+ .body(containsString("<cidrIpv4>0.0.0.0/0</cidrIpv4>"));
+ }
+
+ @Test
+ @Order(36)
+ void describeSecurityGroupRulesDefaultVpcEgressVisible() {
+ // Issue #1093: default VPC security group must also have its egress rule visible
+ given()
+ .formParam("Action", "DescribeSecurityGroupRules")
+ .formParam("Filter.1.Name", "group-id")
+ .formParam("Filter.1.Value.1", "sg-default")
+ .header("Authorization", AUTH_HEADER)
+ .when()
+ .post("/")
+ .then()
+ .statusCode(200)
+ .contentType("application/xml")
+ .body("DescribeSecurityGroupRulesResponse.securityGroupRuleSet.item.size()",
+ greaterThanOrEqualTo(1))
+ .body(containsString("<isEgress>true</isEgress>"))
+ .body(containsString("<ipProtocol>-1</ipProtocol>"));
+ }
+
// =========================================================================
// Key Pairs
// =========================================================================