Light, fluffy, and always free - The AWS Local Emulator alternative
fix(networkfirewall): validate replacement before replacing state (#4114)
Daniël van Ziel865dd1d658bb
diff --git a/src/main/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallJsonHandler.javaindex f0ac3b7b22..cc26625204 100644--- a/src/main/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallJsonHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallJsonHandler.java@@ -21,14 +21,14 @@ public class NetworkFirewallJsonHandler {case "CreateRuleGroup" -> ok(service.createRuleGroup(request, region, accountId));case "DescribeRuleGroup" -> ok(service.describeRuleGroup(textOrNull(request, "RuleGroupArn"), textOrNull(request, "RuleGroupName")));- case "UpdateRuleGroup" -> ok(service.updateRuleGroup(request, region, accountId));+ case "UpdateRuleGroup" -> ok(service.updateRuleGroup(request));case "DeleteRuleGroup" -> ok(service.deleteRuleGroup(textOrNull(request, "RuleGroupArn"), textOrNull(request, "RuleGroupName")));case "ListRuleGroups" -> ok(service.listRuleGroups(textOrNull(request, "Type")));case "CreateFirewallPolicy" -> ok(service.createFirewallPolicy(request, region, accountId));case "DescribeFirewallPolicy" -> ok(service.describeFirewallPolicy(textOrNull(request, "FirewallPolicyArn"), textOrNull(request, "FirewallPolicyName")));- case "UpdateFirewallPolicy" -> ok(service.updateFirewallPolicy(request, region, accountId));+ case "UpdateFirewallPolicy" -> ok(service.updateFirewallPolicy(request));case "DeleteFirewallPolicy" -> ok(service.deleteFirewallPolicy(textOrNull(request, "FirewallPolicyArn"), textOrNull(request, "FirewallPolicyName")));case "ListFirewallPolicies" -> ok(service.listFirewallPolicies());diff --git a/src/main/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallService.java b/src/main/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallService.javaindex 7a7679e9ca..a7f0b2978f 100644--- a/src/main/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallService.java+++ b/src/main/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallService.java@@ -32,6 +32,16 @@ public class NetworkFirewallService {private static final Set<String> LOG_DESTINATION_TYPES =Set.of("S3", "CloudWatchLogs", "KinesisDataFirehose");+ /**+ * The response members an UpdateRuleGroup or UpdateFirewallPolicy request can set (botocore+ * 2020-11-12). Capacity and Tags have no update member, and the name and a rule group's type+ * can't change, so everything outside these sets carries over from the stored resource.+ */+ private static final Set<String> RULE_GROUP_UPDATE_FIELDS =+ Set.of("Description", "EncryptionConfiguration", "SourceMetadata", "SummaryConfiguration");+ private static final Set<String> FIREWALL_POLICY_UPDATE_FIELDS =+ Set.of("Description", "EncryptionConfiguration");+private final ObjectMapper objectMapper;private final StorageBackend<String, ObjectNode> ruleGroups;private final StorageBackend<String, ObjectNode> firewallPolicies;@@ -63,7 +73,8 @@ public class NetworkFirewallService {this.loggingConfigurations = loggingConfigurations;}- public ObjectNode createRuleGroup(JsonNode request, String region, String accountId) {+ /** @see #updateRuleGroup for why this is synchronized. */+ public synchronized ObjectNode createRuleGroup(JsonNode request, String region, String accountId) {return createNamed(request, "RuleGroupName", "RuleGroup", "RuleGroupResponse","RuleGroupArn", "RuleGroupId", ruleGroupArn(request, region, accountId), ruleGroups);}@@ -72,12 +83,46 @@ public class NetworkFirewallService {return describeNamed(ruleGroups, arn, name, "RuleGroup");}- public ObjectNode updateRuleGroup(JsonNode request, String region, String accountId) {- deleteIfPresent(ruleGroups, textOrNull(request, "RuleGroupArn"), textOrNull(request, "RuleGroupName"));- return createRuleGroup(request, region, accountId);+ /**+ * Rule group and firewall policy create, update and delete share the service lock. An update+ * reads the stored resource, checks the request and its UpdateToken against it and writes the+ * replacement back, so without a common lock a delete landing in between is undone by that+ * write, and two updates carrying the same token can both pass the token check.+ */+ public synchronized ObjectNode updateRuleGroup(JsonNode request) {+ String type = textOrNull(request, "Type");+ if (type != null) {+ requireEnum(type, RULE_GROUP_TYPES, "Type");+ }+ ObjectNode existing = requireForUpdate(ruleGroups, request, "RuleGroupArn", "RuleGroupName",+ "RuleGroup", "RuleGroupResponse");+ String storedType = existing.path("RuleGroupResponse").path("Type").asText(null);+ if (type != null && storedType != null && !storedType.equals(type)) {+ throw new AwsException("InvalidRequestException",+ "You can't change the type of a rule group after you create it.", 400);+ }+ boolean hasRules = request.hasNonNull("Rules");+ if (request.hasNonNull("RuleGroup") == hasRules) {+ throw new AwsException("InvalidRequestException",+ "You must provide either RuleGroup or Rules, but not both.", 400);+ }+ ObjectNode replacement = replacementOf(existing, request, "RuleGroup", "RuleGroupResponse",+ RULE_GROUP_UPDATE_FIELDS);+ // CreateRuleGroup keeps a Suricata Rules string on the response in place of a RuleGroup,+ // so the update replaces whichever of the two the rule group was stored with.+ if (replacement.path("RuleGroupResponse") instanceof ObjectNode response) {+ if (hasRules) {+ response.put("Rules", textOrNull(request, "Rules"));+ } else {+ response.remove("Rules");+ }+ }+ ruleGroups.put(resourceArn(existing), replacement);+ return replacement.deepCopy();}- public ObjectNode deleteRuleGroup(String arn, String name) {+ /** @see #updateRuleGroup for why this is synchronized. */+ public synchronized ObjectNode deleteRuleGroup(String arn, String name) {deleteRequired(ruleGroups, arn, name, "RuleGroup");return objectMapper.createObjectNode();}@@ -86,7 +131,8 @@ public class NetworkFirewallService {return listNamed(ruleGroups, "RuleGroups", "Arn", "Name", type, "Type");}- public ObjectNode createFirewallPolicy(JsonNode request, String region, String accountId) {+ /** @see #updateRuleGroup for why this is synchronized. */+ public synchronized ObjectNode createFirewallPolicy(JsonNode request, String region, String accountId) {String name = requiredText(request, "FirewallPolicyName");String arn = arn(region, accountId, "firewall-policy", name);return createNamed(request, "FirewallPolicyName", "FirewallPolicy", "FirewallPolicyResponse",@@ -97,13 +143,19 @@ public class NetworkFirewallService {return describeNamed(firewallPolicies, arn, name, "FirewallPolicy");}- public ObjectNode updateFirewallPolicy(JsonNode request, String region, String accountId) {- deleteIfPresent(firewallPolicies, textOrNull(request, "FirewallPolicyArn"),- textOrNull(request, "FirewallPolicyName"));- return createFirewallPolicy(request, region, accountId);+ /** @see #updateRuleGroup for why this is synchronized. */+ public synchronized ObjectNode updateFirewallPolicy(JsonNode request) {+ ObjectNode existing = requireForUpdate(firewallPolicies, request, "FirewallPolicyArn",+ "FirewallPolicyName", "FirewallPolicy", "FirewallPolicyResponse");+ requireObject(request, "FirewallPolicy");+ ObjectNode replacement = replacementOf(existing, request, "FirewallPolicy", "FirewallPolicyResponse",+ FIREWALL_POLICY_UPDATE_FIELDS);+ firewallPolicies.put(resourceArn(existing), replacement);+ return replacement.deepCopy();}- public ObjectNode deleteFirewallPolicy(String arn, String name) {+ /** @see #updateRuleGroup for why this is synchronized. */+ public synchronized ObjectNode deleteFirewallPolicy(String arn, String name) {deleteRequired(firewallPolicies, arn, name, "FirewallPolicy");return objectMapper.createObjectNode();}@@ -294,11 +346,13 @@ public class NetworkFirewallService {*/private void requireCurrentToken(ObjectNode firewall, JsonNode request) {String providedToken = textOrNull(request, "UpdateToken");- if (providedToken == null) {- return;+ if (providedToken != null) {+ requireMatchingToken(firewall, providedToken);}- String currentToken = firewall.path("UpdateToken").asText(null);- if (!providedToken.equals(currentToken)) {+ }++ private static void requireMatchingToken(JsonNode stored, String providedToken) {+ if (!providedToken.equals(stored.path("UpdateToken").asText(null))) {throw new AwsException("InvalidTokenException","The token you provided is stale or isn't valid for the operation.", 400);}@@ -471,6 +525,54 @@ public class NetworkFirewallService {return stored.deepCopy();}+ /**+ * Resolves the rule group or firewall policy an update targets. The ARN alone is enough, which+ * is how Terraform updates; a name sent alongside it must be the stored one, since the name+ * can't change. The required UpdateToken must match the stored token, or the resource has+ * changed since the caller read it.+ */+ private ObjectNode requireForUpdate(StorageBackend<String, ObjectNode> store, JsonNode request,+ String arnField, String nameField, String kind, String responseField) {+ String requestedName = textOrNull(request, nameField);+ ObjectNode existing = require(store, textOrNull(request, arnField), requestedName, kind,+ "ResourceArn", "ResourceName");+ String storedName = existing.path(responseField).path(nameField).asText(null);+ if (requestedName != null && !requestedName.isBlank() && !requestedName.equals(storedName)) {+ throw new AwsException("InvalidRequestException",+ "The " + kind + " ARN does not match the requested name.", 400);+ }+ requireMatchingToken(existing, requiredText(request, "UpdateToken"));+ return existing;+ }++ /**+ * Builds the replacement without touching the store, so a request rejected after this point+ * still leaves the stored resource as it was. The request replaces the definition in+ * {@code bodyField} and whichever of {@code updateFields} it carries; everything else, the+ * ARN, name, type, capacity and tags included, carries over from {@code existing}.+ */+ private ObjectNode replacementOf(ObjectNode existing, JsonNode request, String bodyField,+ String responseField, Set<String> updateFields) {+ ObjectNode replacement = existing.deepCopy();+ JsonNode body = request.get(bodyField);+ if (body == null || body.isNull()) {+ replacement.remove(bodyField);+ } else {+ replacement.set(bodyField, body.deepCopy());+ }+ ObjectNode response = replacement.path(responseField) instanceof ObjectNode stored+ ? stored+ : replacement.putObject(responseField);+ for (String field : updateFields) {+ JsonNode value = request.get(field);+ if (value != null && !value.isNull()) {+ response.set(field, value.deepCopy());+ }+ }+ replacement.put("UpdateToken", UUID.randomUUID().toString());+ return replacement;+ }+private ObjectNode describeNamed(StorageBackend<String, ObjectNode> store, String arn, String name,String bodyField) {ObjectNode stored = require(store, arn, name, bodyField, "ResourceArn", "ResourceName");@@ -599,13 +701,6 @@ public class NetworkFirewallService {store.delete(resourceArn(stored));}- private void deleteIfPresent(StorageBackend<String, ObjectNode> store, String arn, String name) {- ObjectNode stored = find(store, arn, name, "ResourceArn", "ResourceName");- if (stored != null) {- store.delete(resourceArn(stored));- }- }-private String resourceArn(JsonNode stored) {if (stored.hasNonNull("ResourceArn")) {return stored.path("ResourceArn").asText();@@ -672,6 +767,13 @@ public class NetworkFirewallService {return (ArrayNode) value;}+ private static void requireObject(JsonNode request, String field) {+ JsonNode value = request == null ? null : request.get(field);+ if (!(value instanceof ObjectNode)) {+ throw new AwsException("InvalidRequestException", field + " is required.", 400);+ }+ }+private static void requireIdentifier(String arn, String name) {if ((arn == null || arn.isBlank()) && (name == null || name.isBlank())) {throw new AwsException("InvalidRequestException",diff --git a/src/test/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallConcurrencyTest.java b/src/test/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallConcurrencyTest.javaindex 0790b01e22..d804dafad7 100644--- a/src/test/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallConcurrencyTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallConcurrencyTest.java@@ -184,6 +184,70 @@ class NetworkFirewallConcurrencyTest {}}+ /**+ * UpdateRuleGroup reads the stored rule group, checks the token and writes the replacement back.+ * Concurrent updates carrying the same current token must not all apply: exactly one validates+ * and rotates it, and the rest are stale.+ */+ @Test+ void concurrentUpdateRuleGroup_onlyOneCallerWithTheSameTokenSucceeds() throws Exception {+ ObjectMapper mapper = new ObjectMapper();+ NetworkFirewallService service = new NetworkFirewallService(mapper,+ new InMemoryStorage<>(), new InMemoryStorage<>(),+ new InMemoryStorage<>(), new InMemoryStorage<>());++ ObjectNode create = mapper.createObjectNode();+ create.put("RuleGroupName", "ConcurrentUpdateRuleGroup");+ create.put("Type", "STATEFUL");+ create.put("Capacity", 100);+ create.putObject("RuleGroup").putObject("RulesSource").put("RulesString", "pass ip any any");+ ObjectNode created = service.createRuleGroup(create, REGION, ACCOUNT);+ String ruleGroupArn = created.path("RuleGroupResponse").path("RuleGroupArn").asText();+ String currentToken = created.path("UpdateToken").asText();++ ExecutorService pool = Executors.newFixedThreadPool(CALLERS);+ CountDownLatch start = new CountDownLatch(1);+ List<Future<ObjectNode>> submitted = new ArrayList<>();+ try {+ for (int caller = 0; caller < CALLERS; caller++) {+ int callerIndex = caller;+ submitted.add(pool.submit(() -> {+ ObjectNode request = mapper.createObjectNode();+ request.put("RuleGroupArn", ruleGroupArn);+ request.put("UpdateToken", currentToken);+ request.putObject("RuleGroup").putObject("RulesSource")+ .put("RulesString", "drop ip any any # caller " + callerIndex);+ start.await();+ return service.updateRuleGroup(request);+ }));+ }+ start.countDown();++ AtomicInteger succeeded = new AtomicInteger();+ AtomicInteger rejected = new AtomicInteger();+ for (Future<ObjectNode> future : submitted) {+ try {+ future.get(30, TimeUnit.SECONDS);+ succeeded.incrementAndGet();+ } catch (ExecutionException e) {+ if (e.getCause() instanceof AwsException awsException+ && "InvalidTokenException".equals(awsException.getErrorCode())) {+ rejected.incrementAndGet();+ } else {+ throw e;+ }+ }+ }++ assertEquals(1, succeeded.get(),+ "exactly one caller may validate and rotate the shared current token; without "+ + "the service lock more than one update passes the check and applies");+ assertEquals(CALLERS - 1, rejected.get());+ } finally {+ pool.shutdownNow();+ }+ }+/*** A firewall persisted before UpdateToken support existed has no token field.* DescribeFirewall must backfill a real token rather than reporting the emptydiff --git a/src/test/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallIntegrationTest.javaindex 43a7023899..08d060990d 100644--- a/src/test/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallIntegrationTest.java@@ -543,6 +543,239 @@ class NetworkFirewallIntegrationTest {.body("__type", equalTo("InvalidRequestException"));}+ @Test+ void updateRuleGroup_whenReplacementIsRejected_keepsTheOriginal() {+ String tokenA = call("CreateRuleGroup", "{\"RuleGroupName\":\"atomic-keep-a\",\"Type\":\"STATEFUL\","+ + "\"Capacity\":100,\"RuleGroup\":{\"RulesSource\":{\"RulesString\":\"pass ip any any\"}}}")+ .statusCode(200)+ .extract().path("UpdateToken");+ call("CreateRuleGroup", "{\"RuleGroupName\":\"atomic-keep-b\",\"Type\":\"STATEFUL\","+ + "\"Capacity\":100,\"RuleGroup\":{\"RulesSource\":{\"RulesString\":\"drop ip any any\"}}}")+ .statusCode(200);++ String arnA = "arn:aws:network-firewall:us-east-1:723679240095:stateful-rulegroup/atomic-keep-a";++ call("UpdateRuleGroup", "{\"RuleGroupArn\":\"" + arnA + "\","+ + "\"RuleGroupName\":\"atomic-keep-b\",\"Type\":\"STATEFUL\",\"UpdateToken\":\"" + tokenA + "\","+ + "\"RuleGroup\":{\"RulesSource\":{\"RulesString\":\"drop tcp any any\"}}}")+ .statusCode(400)+ .body("__type", equalTo("InvalidRequestException"));++ call("DescribeRuleGroup", "{\"RuleGroupName\":\"atomic-keep-a\"}")+ .statusCode(200)+ .body("RuleGroup.RulesSource.RulesString", equalTo("pass ip any any"))+ .body("RuleGroupResponse.RuleGroupArn", equalTo(arnA));+ }++ @Test+ void updateRuleGroup_replacesTheStoredDefinitionAtomically() {+ String name = "atomic-replace-rule-group";+ String arn = "arn:aws:network-firewall:us-east-1:723679240095:stateful-rulegroup/" + name;+ String token = call("CreateRuleGroup", "{\"RuleGroupName\":\"" + name + "\",\"Type\":\"STATEFUL\","+ + "\"Capacity\":100,\"RuleGroup\":{\"RulesSource\":{\"RulesString\":\"pass ip any any\"}}}")+ .statusCode(200)+ .extract().path("UpdateToken");++ String newToken = call("UpdateRuleGroup", "{\"RuleGroupArn\":\"" + arn + "\","+ + "\"RuleGroupName\":\"" + name + "\",\"Type\":\"STATEFUL\",\"UpdateToken\":\"" + token + "\","+ + "\"RuleGroup\":{\"RulesSource\":{\"RulesString\":\"drop ip any any\"}}}")+ .statusCode(200)+ .body("UpdateToken", not(equalTo(token)))+ .extract().path("UpdateToken");++ call("DescribeRuleGroup", "{\"RuleGroupName\":\"" + name + "\"}")+ .statusCode(200)+ .body("RuleGroup.RulesSource.RulesString", equalTo("drop ip any any"))+ .body("RuleGroupResponse.Capacity", equalTo(100))+ .body("RuleGroupResponse.RuleGroupArn", equalTo(arn))+ .body("UpdateToken", equalTo(newToken));+ }++ @Test+ void updateRuleGroup_withAStaleOrMissingToken_isRejectedAndLeavesTheRuleGroupUntouched() {+ String name = "stale-token-rule-group";+ String arn = "arn:aws:network-firewall:us-east-1:723679240095:stateful-rulegroup/" + name;+ call("CreateRuleGroup", "{\"RuleGroupName\":\"" + name + "\",\"Type\":\"STATEFUL\","+ + "\"Capacity\":100,\"RuleGroup\":{\"RulesSource\":{\"RulesString\":\"pass ip any any\"}}}")+ .statusCode(200);++ call("UpdateRuleGroup", "{\"RuleGroupArn\":\"" + arn + "\","+ + "\"UpdateToken\":\"00000000-0000-0000-0000-000000000000\","+ + "\"RuleGroup\":{\"RulesSource\":{\"RulesString\":\"drop ip any any\"}}}")+ .statusCode(400)+ .body("__type", equalTo("InvalidTokenException"));++ call("UpdateRuleGroup", "{\"RuleGroupArn\":\"" + arn + "\","+ + "\"RuleGroup\":{\"RulesSource\":{\"RulesString\":\"drop ip any any\"}}}")+ .statusCode(400)+ .body("__type", equalTo("InvalidRequestException"));++ call("DescribeRuleGroup", "{\"RuleGroupArn\":\"" + arn + "\"}")+ .statusCode(200)+ .body("RuleGroup.RulesSource.RulesString", equalTo("pass ip any any"));+ }++ @Test+ void updateRuleGroup_changingTheType_isRejectedAndKeepsTheOriginal() {+ String name = "type-change-rule-group";+ String arn = "arn:aws:network-firewall:us-east-1:723679240095:stateful-rulegroup/" + name;+ String token = call("CreateRuleGroup", "{\"RuleGroupName\":\"" + name + "\",\"Type\":\"STATEFUL\","+ + "\"Capacity\":100,\"RuleGroup\":{\"RulesSource\":{\"RulesString\":\"pass ip any any\"}}}")+ .statusCode(200)+ .extract().path("UpdateToken");++ call("UpdateRuleGroup", "{\"RuleGroupArn\":\"" + arn + "\",\"Type\":\"STATELESS\","+ + "\"UpdateToken\":\"" + token + "\","+ + "\"RuleGroup\":{\"RulesSource\":{\"RulesString\":\"drop ip any any\"}}}")+ .statusCode(400)+ .body("__type", equalTo("InvalidRequestException"));++ call("DescribeRuleGroup", "{\"RuleGroupArn\":\"" + arn + "\"}")+ .statusCode(200)+ .body("RuleGroupResponse.Type", equalTo("STATEFUL"))+ .body("RuleGroup.RulesSource.RulesString", equalTo("pass ip any any"));+ }++ @Test+ void updateRuleGroup_withoutExactlyOneOfRuleGroupOrRules_isRejectedAndKeepsTheDefinition() {+ String name = "bodyless-update-rule-group";+ String arn = "arn:aws:network-firewall:us-east-1:723679240095:stateful-rulegroup/" + name;+ String token = call("CreateRuleGroup", "{\"RuleGroupName\":\"" + name + "\",\"Type\":\"STATEFUL\","+ + "\"Capacity\":100,\"RuleGroup\":{\"RulesSource\":{\"RulesString\":\"pass ip any any\"}}}")+ .statusCode(200)+ .extract().path("UpdateToken");++ call("UpdateRuleGroup", "{\"RuleGroupArn\":\"" + arn + "\",\"UpdateToken\":\"" + token + "\"}")+ .statusCode(400)+ .body("__type", equalTo("InvalidRequestException"));++ call("UpdateRuleGroup", "{\"RuleGroupArn\":\"" + arn + "\",\"UpdateToken\":\"" + token + "\","+ + "\"Rules\":\"drop ip any any\","+ + "\"RuleGroup\":{\"RulesSource\":{\"RulesString\":\"drop ip any any\"}}}")+ .statusCode(400)+ .body("__type", equalTo("InvalidRequestException"));++ call("DescribeRuleGroup", "{\"RuleGroupArn\":\"" + arn + "\"}")+ .statusCode(200)+ .body("RuleGroup.RulesSource.RulesString", equalTo("pass ip any any"))+ .body("UpdateToken", equalTo(token));+ }++ @Test+ void updateFirewallPolicy_whenReplacementIsRejected_keepsTheOriginal() {+ String arnA = "arn:aws:network-firewall:us-east-1:723679240095:firewall-policy/atomic-policy-a";+ String tokenA = call("CreateFirewallPolicy", "{\"FirewallPolicyName\":\"atomic-policy-a\","+ + "\"FirewallPolicy\":{\"StatelessDefaultActions\":[\"aws:pass\"],"+ + "\"StatelessFragmentDefaultActions\":[\"aws:pass\"]}}")+ .statusCode(200)+ .extract().path("UpdateToken");+ call("CreateFirewallPolicy", "{\"FirewallPolicyName\":\"atomic-policy-b\","+ + "\"FirewallPolicy\":{\"StatelessDefaultActions\":[\"aws:drop\"],"+ + "\"StatelessFragmentDefaultActions\":[\"aws:drop\"]}}")+ .statusCode(200);++ call("UpdateFirewallPolicy", "{\"FirewallPolicyArn\":\"" + arnA + "\","+ + "\"FirewallPolicyName\":\"atomic-policy-b\",\"UpdateToken\":\"" + tokenA + "\","+ + "\"FirewallPolicy\":{\"StatelessDefaultActions\":[\"aws:drop\"],"+ + "\"StatelessFragmentDefaultActions\":[\"aws:drop\"]}}")+ .statusCode(400)+ .body("__type", equalTo("InvalidRequestException"));++ call("DescribeFirewallPolicy", "{\"FirewallPolicyName\":\"atomic-policy-a\"}")+ .statusCode(200)+ .body("FirewallPolicy.StatelessDefaultActions[0]", equalTo("aws:pass"))+ .body("FirewallPolicyResponse.FirewallPolicyArn", equalTo(arnA));+ }++ @Test+ void updateFirewallPolicy_byArnAlone_replacesTheStoredDefinition() {+ String name = "arn-only-policy";+ String arn = "arn:aws:network-firewall:us-east-1:723679240095:firewall-policy/" + name;+ String token = call("CreateFirewallPolicy", "{\"FirewallPolicyName\":\"" + name + "\","+ + "\"Description\":\"original\",\"Tags\":[{\"Key\":\"team\",\"Value\":\"network\"}],"+ + "\"FirewallPolicy\":{\"StatelessDefaultActions\":[\"aws:pass\"],"+ + "\"StatelessFragmentDefaultActions\":[\"aws:pass\"]}}")+ .statusCode(200)+ .extract().path("UpdateToken");++ call("UpdateFirewallPolicy", "{\"FirewallPolicyArn\":\"" + arn + "\",\"UpdateToken\":\"" + token + "\","+ + "\"FirewallPolicy\":{\"StatelessDefaultActions\":[\"aws:drop\"],"+ + "\"StatelessFragmentDefaultActions\":[\"aws:drop\"]}}")+ .statusCode(200);++ call("DescribeFirewallPolicy", "{\"FirewallPolicyArn\":\"" + arn + "\"}")+ .statusCode(200)+ .body("FirewallPolicy.StatelessDefaultActions[0]", equalTo("aws:drop"))+ .body("FirewallPolicyResponse.FirewallPolicyName", equalTo(name))+ .body("FirewallPolicyResponse.Description", equalTo("original"))+ .body("FirewallPolicyResponse.Tags[0].Key", equalTo("team"));+ }++ @Test+ void updateFirewallPolicy_withAStaleToken_isRejectedAndLeavesThePolicyUntouched() {+ String name = "stale-token-policy";+ String arn = "arn:aws:network-firewall:us-east-1:723679240095:firewall-policy/" + name;+ call("CreateFirewallPolicy", "{\"FirewallPolicyName\":\"" + name + "\","+ + "\"FirewallPolicy\":{\"StatelessDefaultActions\":[\"aws:pass\"],"+ + "\"StatelessFragmentDefaultActions\":[\"aws:pass\"]}}")+ .statusCode(200);++ call("UpdateFirewallPolicy", "{\"FirewallPolicyArn\":\"" + arn + "\","+ + "\"UpdateToken\":\"00000000-0000-0000-0000-000000000000\","+ + "\"FirewallPolicy\":{\"StatelessDefaultActions\":[\"aws:drop\"],"+ + "\"StatelessFragmentDefaultActions\":[\"aws:drop\"]}}")+ .statusCode(400)+ .body("__type", equalTo("InvalidTokenException"));++ call("DescribeFirewallPolicy", "{\"FirewallPolicyArn\":\"" + arn + "\"}")+ .statusCode(200)+ .body("FirewallPolicy.StatelessDefaultActions[0]", equalTo("aws:pass"));+ }++ @Test+ void updateFirewallPolicy_withoutAPolicy_isRejectedAndKeepsTheDefinition() {+ String name = "bodyless-update-policy";+ String arn = "arn:aws:network-firewall:us-east-1:723679240095:firewall-policy/" + name;+ String token = call("CreateFirewallPolicy", "{\"FirewallPolicyName\":\"" + name + "\","+ + "\"FirewallPolicy\":{\"StatelessDefaultActions\":[\"aws:pass\"],"+ + "\"StatelessFragmentDefaultActions\":[\"aws:pass\"]}}")+ .statusCode(200)+ .extract().path("UpdateToken");++ call("UpdateFirewallPolicy", "{\"FirewallPolicyArn\":\"" + arn + "\",\"UpdateToken\":\"" + token + "\"}")+ .statusCode(400)+ .body("__type", equalTo("InvalidRequestException"));++ call("DescribeFirewallPolicy", "{\"FirewallPolicyArn\":\"" + arn + "\"}")+ .statusCode(200)+ .body("FirewallPolicy.StatelessDefaultActions[0]", equalTo("aws:pass"))+ .body("UpdateToken", equalTo(token));+ }++ @Test+ void updateRuleGroup_byArnAlone_keepsTheStoredNameTypeCapacityAndTags() {+ String name = "arn-only-rule-group";+ String arn = "arn:aws:network-firewall:us-east-1:723679240095:stateful-rulegroup/" + name;+ String token = call("CreateRuleGroup", "{\"RuleGroupName\":\"" + name + "\",\"Type\":\"STATEFUL\","+ + "\"Capacity\":100,\"Tags\":[{\"Key\":\"team\",\"Value\":\"network\"}],"+ + "\"RuleGroup\":{\"RulesSource\":{\"RulesString\":\"pass ip any any\"}}}")+ .statusCode(200)+ .extract().path("UpdateToken");++ call("UpdateRuleGroup", "{\"RuleGroupArn\":\"" + arn + "\",\"UpdateToken\":\"" + token + "\","+ + "\"RuleGroup\":{\"RulesSource\":{\"RulesString\":\"drop ip any any\"}}}")+ .statusCode(200);++ call("DescribeRuleGroup", "{\"RuleGroupArn\":\"" + arn + "\"}")+ .statusCode(200)+ .body("RuleGroup.RulesSource.RulesString", equalTo("drop ip any any"))+ .body("RuleGroupResponse.Capacity", equalTo(100))+ .body("RuleGroupResponse.Tags[0].Key", equalTo("team"))+ .body("RuleGroupResponse.RuleGroupName", equalTo(name))+ .body("RuleGroupResponse.Type", equalTo("STATEFUL"))+ .body("RuleGroupResponse.RuleGroupArn", equalTo(arn));+ }+@Testvoid createRuleGroup_withStatefulDomainType_usesTheStatefulArnPrefix() {call("CreateRuleGroup", "{\"RuleGroupName\":\"domain-list-rule-group\",\"Type\":\"STATEFUL_DOMAIN\","