Skip to content

armgit / floci

Public Imported from GitHub
0

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

fix(dynamodb): authorize every requested item return mode (#5652)

David Phillips4ea7e3da23bc
diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DynamoDbTransactionAuthorizationTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DynamoDbTransactionAuthorizationTest.java
index db00b0efc6..8638ca7424 100644
--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DynamoDbTransactionAuthorizationTest.java
+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/DynamoDbTransactionAuthorizationTest.java
@@ -13,6 +13,7 @@ import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
import software.amazon.awssdk.services.dynamodb.model.AttributeValue;
import software.amazon.awssdk.services.dynamodb.model.BillingMode;
import software.amazon.awssdk.services.dynamodb.model.ConditionCheck;
+import software.amazon.awssdk.services.dynamodb.model.ConditionalCheckFailedException;
import software.amazon.awssdk.services.dynamodb.model.Delete;
import software.amazon.awssdk.services.dynamodb.model.DynamoDbException;
import software.amazon.awssdk.services.dynamodb.model.Get;
@@ -147,6 +148,73 @@ class DynamoDbTransactionAuthorizationTest {
assertThat(admin.getItem(r -> r.tableName(table).key(key("forbidden"))).item()).isEmpty();
}
+ @ParameterizedTest
+ @ValueSource(strings = {"Put", "Update", "Delete"})
+ void standaloneReturnValuesConditionsRejectBeforeMutation(String operation) {
+ allow("dynamodb:" + operation + "Item", ",\"Condition\":{\"StringEquals\":{"
+ + "\"dynamodb:ReturnValues\":\"NONE\"}}");
+ assertThatThrownBy(() -> standaloneWrite(operation, "ALL_OLD"))
+ .isInstanceOfSatisfying(DynamoDbException.class,
+ error -> assertThat(error.awsErrorDetails().errorCode()).isEqualTo("AccessDeniedException"));
+ assertThat(read().get("value").s()).isEqualTo("original");
+ assertThat(standaloneWrite(operation, null)).isEmpty();
+ if ("Delete".equals(operation)) {
+ assertThat(read()).isEmpty();
+ } else {
+ assertThat(read().get("value").s()).isEqualTo("changed");
+ }
+ admin.putItem(r -> r.tableName(table).item(item("item", "original")));
+ allow("dynamodb:" + operation + "Item", ",\"Condition\":{\"StringEquals\":{"
+ + "\"dynamodb:ReturnValues\":\"ALL_OLD\"}}");
+ assertThat(standaloneWrite(operation, "ALL_OLD").get("value").s()).isEqualTo("original");
+ }
+
+ private Map<String, AttributeValue> standaloneWrite(String operation, String returnValues) {
+ return switch (operation) {
+ case "Put" -> caller.putItem(r -> r.tableName(table).item(item("item", "changed"))
+ .returnValues(returnValues)).attributes();
+ case "Update" -> caller.updateItem(r -> r.tableName(table).key(key("item"))
+ .updateExpression("SET #v = :v").expressionAttributeNames(Map.of("#v", "value"))
+ .expressionAttributeValues(Map.of(":v", AttributeValue.fromS("changed")))
+ .returnValues(returnValues)).attributes();
+ case "Delete" -> caller.deleteItem(r -> r.tableName(table).key(key("item"))
+ .returnValues(returnValues)).attributes();
+ default -> throw new IllegalArgumentException(operation);
+ };
+ }
+
+ @ParameterizedTest
+ @ValueSource(booleans = {true, false})
+ void differingStandaloneReturnModesRequireBothGrants(boolean succeeds) {
+ for (String grant : new String[]{"UPDATED_NEW", "ALL_OLD"}) {
+ allow("dynamodb:UpdateItem", ",\"Condition\":{\"StringEquals\":{"
+ + "\"dynamodb:ReturnValues\":\"" + grant + "\"}}");
+ assertThatThrownBy(() -> mixedReturnUpdate(succeeds))
+ .isInstanceOfSatisfying(DynamoDbException.class,
+ error -> assertThat(error.awsErrorDetails().errorCode()).isEqualTo("AccessDeniedException"));
+ assertThat(read().get("value").s()).isEqualTo("original");
+ }
+ allow("dynamodb:UpdateItem", ",\"Condition\":{\"StringEquals\":{"
+ + "\"dynamodb:ReturnValues\":[\"UPDATED_NEW\",\"ALL_OLD\"]}}");
+ if (succeeds) {
+ assertThat(mixedReturnUpdate(true).get("value").s()).isEqualTo("changed");
+ assertThat(read().get("value").s()).isEqualTo("changed");
+ } else {
+ assertThatThrownBy(() -> mixedReturnUpdate(false))
+ .isInstanceOfSatisfying(ConditionalCheckFailedException.class,
+ error -> assertThat(error.item().get("value").s()).isEqualTo("original"));
+ assertThat(read().get("value").s()).isEqualTo("original");
+ }
+ }
+
+ private Map<String, AttributeValue> mixedReturnUpdate(boolean succeeds) {
+ return caller.updateItem(r -> r.tableName(table).key(key("item"))
+ .updateExpression("SET #v = :v").expressionAttributeNames(Map.of("#v", "value"))
+ .expressionAttributeValues(Map.of(":v", AttributeValue.fromS("changed")))
+ .conditionExpression(succeeds ? "attribute_exists(PK)" : "attribute_not_exists(PK)")
+ .returnValues("UPDATED_NEW").returnValuesOnConditionCheckFailure("ALL_OLD")).attributes();
+ }
+
private void transaction(String operation) {
if ("Get".equals(operation)) {
assertThat(caller.transactGetItems(r -> r.transactItems(TransactGetItem.builder()
diff --git a/docs/services/iam.md b/docs/services/iam.md
index 69d16f1ae2..d05311bac1 100644
--- a/docs/services/iam.md
+++ b/docs/services/iam.md
@@ -1373,6 +1373,14 @@ floci populates:
`Null:false` when the policy must require a resolved key. Malformed requests that pass
authorization are still checked by the DynamoDB handler.
+- `dynamodb:ReturnValues`: standalone `PutItem`, `UpdateItem` and `DeleteItem` authorize each
+ distinct non-`NONE` mode requested by `ReturnValues` and `ReturnValuesOnConditionCheckFailure`
+ before execution. When neither requests a non-`NONE` mode, authorization uses `NONE`.
+ Each mode is checked separately, so a grant must cover both `UPDATED_NEW` and `ALL_OLD`
+ when they are requested together; `NONE` plus `ALL_OLD` needs only `ALL_OLD`. Omitted or
+ null parameters use the execution default. Read and batch operations do not acquire this
+ key from unrelated fields. Transaction failure-image context is described below.
+
**Any other condition key is absent from the request context.** A positive scalar operator
without `IfExists` on an absent key makes the whole statement *not apply*: it neither matches nor
blocks. A `DenyRootUser`-style guardrail keyed on `aws:PrincipalArn` therefore fires against
diff --git a/src/main/java/io/github/hectorvent/floci/core/common/IamConditionContextResolver.java b/src/main/java/io/github/hectorvent/floci/core/common/IamConditionContextResolver.java
index bb347532b8..30e40934c2 100644
--- a/src/main/java/io/github/hectorvent/floci/core/common/IamConditionContextResolver.java
+++ b/src/main/java/io/github/hectorvent/floci/core/common/IamConditionContextResolver.java
@@ -403,10 +403,25 @@ public class IamConditionContextResolver {
* One condition context per target after the first, for the EC2 actions that accept several
* resource ids in one request. An untagged target yields an empty context rather than none,
* so a policy scoped through {@code aws:ResourceTag} fails to match it. Requests naming a
- * single target, and every other service, get an empty list.
+ * single target get an empty list. Single-item DynamoDB writes also use separate contexts
+ * for distinct return modes, so every requested output must be authorized on the same resource.
*/
public List<Map<String, List<String>>> resolveRemainingTargets(String credentialScope, String action,
ContainerRequestContext ctx) {
+ if ("dynamodb".equals(credentialScope)) {
+ List<String> modes = singleItemReturnValues(action, bufferedJsonBody(ctx));
+ if (modes.size() < 2) {
+ return List.of();
+ }
+ Map<String, List<String>> primary = dynamoDbConditionContext(action, ctx);
+ List<Map<String, List<String>>> contexts = new ArrayList<>();
+ for (int i = 1; i < modes.size(); i++) {
+ Map<String, List<String>> context = new LinkedHashMap<>(primary);
+ context.put("dynamodb:ReturnValues", List.of(modes.get(i)));
+ contexts.add(context);
+ }
+ return contexts;
+ }
if (!"ec2".equals(credentialScope)) {
return List.of();
}
@@ -532,7 +547,7 @@ public class IamConditionContextResolver {
/**
* Populates {@code dynamodb:LeadingKeys}, {@code dynamodb:Attributes} and
- * {@code dynamodb:Select} from the buffered request body.
+ * {@code dynamodb:Select} and single-item write {@code dynamodb:ReturnValues} from the buffered request body.
*
* <p>A key that cannot be resolved (unknown table, a Key that omits the partition
* attribute, an unparseable KeyConditionExpression) is omitted rather than guessed.
@@ -560,9 +575,28 @@ public class IamConditionContextResolver {
if (keys.select() != null) {
conditions.put("dynamodb:Select", List.of(keys.select()));
}
+ List<String> returnValues = singleItemReturnValues(action, body);
+ if (!returnValues.isEmpty()) {
+ conditions.put("dynamodb:ReturnValues", List.of(returnValues.getFirst()));
+ }
return conditions.isEmpty() ? null : conditions;
}
+ private static List<String> singleItemReturnValues(String action, JsonNode body) {
+ if (!("dynamodb:PutItem".equals(action) || "dynamodb:UpdateItem".equals(action)
+ || "dynamodb:DeleteItem".equals(action)) || body == null || !body.isObject()) {
+ return List.of();
+ }
+ Set<String> modes = new LinkedHashSet<>();
+ for (String field : List.of("ReturnValues", "ReturnValuesOnConditionCheckFailure")) {
+ String mode = body.path(field).asText("NONE");
+ if (!"NONE".equals(mode)) {
+ modes.add(mode);
+ }
+ }
+ return modes.isEmpty() ? List.of("NONE") : List.copyOf(modes);
+ }
+
/** One transaction item keeps its action, table and condition keys together. */
record DynamoDbTransactionItem(String action, String resource, Map<String, List<String>> context) {
}
diff --git a/src/test/java/io/github/hectorvent/floci/core/common/IamConditionContextResolverTest.java b/src/test/java/io/github/hectorvent/floci/core/common/IamConditionContextResolverTest.java
index 78b00e7a5f..a07ba4cd9c 100644
--- a/src/test/java/io/github/hectorvent/floci/core/common/IamConditionContextResolverTest.java
+++ b/src/test/java/io/github/hectorvent/floci/core/common/IamConditionContextResolverTest.java
@@ -273,6 +273,66 @@ class IamConditionContextResolverTest {
assertEquals(List.of("COUNT"), conditions.get("dynamodb:Select"));
}
+ @Test
+ void singleItemWritesUseTheirReturnValuesAndExecutionDefault() {
+ for (String action : List.of("PutItem", "UpdateItem", "DeleteItem")) {
+ for (String value : List.of("NONE", "ALL_OLD", "UPDATED_OLD", "ALL_NEW", "UPDATED_NEW", "")) {
+ ContainerRequestContext request = mock(ContainerRequestContext.class);
+ when(request.getProperty("floci.bufferedJsonBody")).thenReturn(json(
+ "{\"ReturnValues\":\"" + value + "\"}"));
+ assertEquals(List.of(value), resolver.resolve("dynamodb", "dynamodb:" + action, request)
+ .get("dynamodb:ReturnValues"));
+ }
+ for (String body : List.of("{}", "{\"ReturnValues\":null}")) {
+ ContainerRequestContext request = mock(ContainerRequestContext.class);
+ when(request.getProperty("floci.bufferedJsonBody")).thenReturn(json(body));
+ assertEquals(List.of("NONE"), resolver.resolve("dynamodb", "dynamodb:" + action, request)
+ .get("dynamodb:ReturnValues"));
+ }
+ }
+ }
+
+ @Test
+ void unrelatedActionsDoNotAcquireSpoofedReturnValues() {
+ for (String action : List.of("GetItem", "Query", "Scan", "BatchGetItem", "BatchWriteItem",
+ "TransactGetItems", "TransactWriteItems")) {
+ ContainerRequestContext request = mock(ContainerRequestContext.class);
+ when(request.getProperty("floci.bufferedJsonBody")).thenReturn(json("{\"ReturnValues\":\"ALL_OLD\"}"));
+ Map<String, List<String>> context = resolver.resolve("dynamodb", "dynamodb:" + action, request);
+ assertFalse(context != null && context.containsKey("dynamodb:ReturnValues"));
+ }
+ }
+
+ @Test
+ void requestedReturnModesUseSeparateCompleteContextsWithoutNoneOrDuplicates() {
+ when(dynamoDbService.findTable("FgacTable", "us-east-1")).thenReturn(Optional.of(fgacTable()));
+ Map<String, List<String>> cases = Map.of(
+ "", List.of("NONE"),
+ ",\"ReturnValues\":null,\"ReturnValuesOnConditionCheckFailure\":null", List.of("NONE"),
+ ",\"ReturnValues\":\"NONE\",\"ReturnValuesOnConditionCheckFailure\":\"ALL_OLD\"", List.of("ALL_OLD"),
+ ",\"ReturnValues\":\"ALL_OLD\",\"ReturnValuesOnConditionCheckFailure\":\"NONE\"", List.of("ALL_OLD"),
+ ",\"ReturnValues\":\"ALL_OLD\",\"ReturnValuesOnConditionCheckFailure\":\"ALL_OLD\"", List.of("ALL_OLD"),
+ ",\"ReturnValues\":\"UPDATED_NEW\",\"ReturnValuesOnConditionCheckFailure\":\"ALL_OLD\"",
+ List.of("UPDATED_NEW", "ALL_OLD"));
+ for (Map.Entry<String, List<String>> entry : cases.entrySet()) {
+ ContainerRequestContext request = mock(ContainerRequestContext.class);
+ when(request.getProperty("floci.bufferedJsonBody")).thenReturn(json(
+ "{\"TableName\":\"FgacTable\",\"Key\":{\"PK\":{\"S\":\"USER_alice\"}}"
+ + entry.getKey() + "}"));
+ Map<String, List<String>> primary = resolver.resolve("dynamodb", "dynamodb:UpdateItem", request);
+ List<Map<String, List<String>>> remaining =
+ resolver.resolveRemainingTargets("dynamodb", "dynamodb:UpdateItem", request);
+ assertEquals(List.of(entry.getValue().getFirst()), primary.get("dynamodb:ReturnValues"));
+ assertEquals(entry.getValue().size() - 1, remaining.size());
+ assertEquals(List.of("USER_alice"), primary.get("dynamodb:LeadingKeys"));
+ for (int i = 0; i < remaining.size(); i++) {
+ assertEquals(List.of(entry.getValue().get(i + 1)), remaining.get(i).get("dynamodb:ReturnValues"));
+ assertEquals(primary.get("dynamodb:LeadingKeys"), remaining.get(i).get("dynamodb:LeadingKeys"));
+ assertEquals(primary.get("dynamodb:Attributes"), remaining.get(i).get("dynamodb:Attributes"));
+ }
+ }
+ }
+
@Test
void returnsNullWhenNoBodyWasBuffered() {
ContainerRequestContext containerRequest = mock(ContainerRequestContext.class);
diff --git a/src/test/java/io/github/hectorvent/floci/services/iam/DynamoDbReturnValuesAuthorizationIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/iam/DynamoDbReturnValuesAuthorizationIntegrationTest.java
new file mode 100644
index 0000000000..605cbec335
--- /dev/null
+++ b/src/test/java/io/github/hectorvent/floci/services/iam/DynamoDbReturnValuesAuthorizationIntegrationTest.java
@@ -0,0 +1,221 @@
+package io.github.hectorvent.floci.services.iam;
+
+import io.github.hectorvent.floci.testing.DynamoDbAuthorizationFixtures;
+import io.github.hectorvent.floci.testing.IamEnforcementProfile;
+import io.github.hectorvent.floci.testing.PartitionCleanup;
+import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;
+import io.quarkus.test.common.http.TestHTTPResource;
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.TestProfile;
+import io.restassured.response.ValidatableResponse;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.net.URI;
+
+import static io.github.hectorvent.floci.testing.DynamoDbAuthorizationFixtures.itemBody;
+import static io.github.hectorvent.floci.testing.DynamoDbAuthorizationFixtures.keyBody;
+import static io.github.hectorvent.floci.testing.DynamoDbAuthorizationFixtures.policy;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
+
+@QuarkusTest
+@TestProfile(IamEnforcementProfile.class)
+class DynamoDbReturnValuesAuthorizationIntegrationTest {
+
+ @RegisterExtension
+ final PartitionCleanup cleanup = new PartitionCleanup();
+
+ @TestHTTPResource
+ URI endpoint;
+
+ private DynamoDbAuthorizationFixtures fixtures;
+
+ @BeforeEach
+ void configureFixtures() {
+ fixtures = new DynamoDbAuthorizationFixtures(cleanup, endpoint.getPort(), "return-values-", "return-values");
+ }
+
+ @BeforeAll
+ static void configureContentType() {
+ RestAssuredJsonUtils.configureAwsContentTypes();
+ }
+
+ @ParameterizedTest
+ @ValueSource(strings = {"Put", "Update", "Delete"})
+ void disallowedReturnValuesAreRejectedBeforeChangingTheItem(String operation) {
+ String table = fixtures.table();
+ String caller = fixtures.user(policy("dynamodb:" + operation + "Item",
+ ",\"Condition\":{\"StringEqualsIfExists\":{\"dynamodb:ReturnValues\":\"NONE\"}}"));
+ fixtures.request(caller, operation + "Item", withReturnValues(operation, table, "\"ALL_OLD\""))
+ .statusCode(400).body(containsString("AccessDeniedException"));
+ assertOriginal(table);
+ fixtures.request(caller, operation + "Item", withReturnValues(operation, table, "\"NONE\""))
+ .statusCode(200);
+ assertChanged(operation, table);
+ }
+
+ @ParameterizedTest
+ @ValueSource(strings = {"Put", "Update", "Delete"})
+ void omittedAndNullReturnValuesUseTheSameNoneDefaultAsExecution(String operation) {
+ String caller = fixtures.user(policy("dynamodb:" + operation + "Item",
+ ",\"Condition\":{\"StringEquals\":{\"dynamodb:ReturnValues\":\"NONE\"}}"));
+ for (String value : new String[]{null, "null", "\"NONE\""}) {
+ String table = fixtures.table();
+ String body = value == null ? itemBody(operation, table) : withReturnValues(operation, table, value);
+ fixtures.request(caller, operation + "Item", body).statusCode(200);
+ assertChanged(operation, table);
+ }
+ }
+
+ @ParameterizedTest
+ @ValueSource(strings = {"Put", "Update", "Delete"})
+ void explicitOldImageIsAvailableOnlyWhenItsConditionMatches(String operation) {
+ String table = fixtures.table();
+ String caller = fixtures.user(policy("dynamodb:" + operation + "Item",
+ ",\"Condition\":{\"StringEquals\":{\"dynamodb:ReturnValues\":\"ALL_OLD\"},"
+ + "\"Null\":{\"dynamodb:ReturnValues\":\"false\"}}"));
+ fixtures.request(caller, operation + "Item", itemBody(operation, table))
+ .statusCode(400).body(containsString("AccessDeniedException"));
+ assertOriginal(table);
+ fixtures.request(caller, operation + "Item", withReturnValues(operation, table, "\"ALL_OLD\""))
+ .statusCode(200).body("Attributes.value.S", equalTo("original"));
+ assertChanged(operation, table);
+ }
+
+ @ParameterizedTest
+ @ValueSource(strings = {"ALL_NEW", "UPDATED_NEW", "UPDATED_OLD"})
+ void updateSpecificReturnModesReachTheHandlerUnchanged(String mode) {
+ String table = fixtures.table();
+ String caller = fixtures.user(policy("dynamodb:UpdateItem",
+ ",\"Condition\":{\"StringEquals\":{\"dynamodb:ReturnValues\":\"" + mode + "\"}}"));
+ fixtures.request(caller, "UpdateItem", withReturnValues("Update", table, "\"ALL_OLD\""))
+ .statusCode(400).body(containsString("AccessDeniedException"));
+ assertOriginal(table);
+ fixtures.request(caller, "UpdateItem", withReturnValues("Update", table, "\"" + mode + "\""))
+ .statusCode(200).body("Attributes.value.S", equalTo("UPDATED_OLD".equals(mode) ? "original" : "changed"));
+ assertChanged("Update", table);
+ }
+
+ @ParameterizedTest
+ @ValueSource(strings = {"Put", "Update", "Delete"})
+ void strictNonePolicyCannotExposeAConditionalFailureImage(String operation) {
+ String table = fixtures.table();
+ String caller = fixtures.user(policy("dynamodb:" + operation + "Item",
+ ",\"Condition\":{\"StringEquals\":{\"dynamodb:ReturnValues\":\"NONE\"}}"));
+ String body = withReturnValues(operation, table, "\"NONE\"");
+ body = body.substring(0, body.length() - 1)
+ + ",\"ReturnValuesOnConditionCheckFailure\":\"ALL_OLD\","
+ + "\"ConditionExpression\":\"attribute_not_exists(PK)\"}";
+ fixtures.request(caller, operation + "Item", body).statusCode(400)
+ .body(containsString("AccessDeniedException"));
+ assertOriginal(table);
+ }
+
+ @ParameterizedTest
+ @ValueSource(strings = {"Put", "Update", "Delete"})
+ void broadPolicyControlCanReceiveAConditionalFailureImage(String operation) {
+ String table = fixtures.table();
+ String caller = fixtures.user(policy("dynamodb:" + operation + "Item", ""));
+ String body = withReturnValues(operation, table, "\"NONE\"");
+ body = body.substring(0, body.length() - 1)
+ + ",\"ReturnValuesOnConditionCheckFailure\":\"ALL_OLD\","
+ + "\"ConditionExpression\":\"attribute_not_exists(PK)\"}";
+ fixtures.request(caller, operation + "Item", body).statusCode(400)
+ .body(containsString("ConditionalCheckFailedException"))
+ .body("Item.value.S", equalTo("original"));
+ assertOriginal(table);
+ }
+
+ @ParameterizedTest
+ @CsvSource({"UPDATED_NEW,true", "UPDATED_NEW,false", "ALL_OLD,true", "ALL_OLD,false"})
+ void differingModesCannotBeAuthorizedByOnlyOneGrant(String grant, boolean succeeds) {
+ String table = fixtures.table();
+ String caller = fixtures.user(policy("dynamodb:UpdateItem",
+ ",\"Condition\":{\"StringEquals\":{\"dynamodb:ReturnValues\":\"" + grant + "\"}}"));
+ fixtures.request(caller, "UpdateItem", conditionalBody("Update", table, "UPDATED_NEW", succeeds))
+ .statusCode(400).body(containsString("AccessDeniedException"));
+ assertOriginal(table);
+ }
+
+ @ParameterizedTest
+ @ValueSource(booleans = {true, false})
+ void aGrantCoveringBothModesAllowsTheActualResult(boolean succeeds) {
+ String table = fixtures.table();
+ String caller = fixtures.user(policy("dynamodb:UpdateItem",
+ ",\"Condition\":{\"StringEquals\":{\"dynamodb:ReturnValues\":[\"UPDATED_NEW\",\"ALL_OLD\"]}}"));
+ ValidatableResponse response = fixtures.request(caller, "UpdateItem",
+ conditionalBody("Update", table, "UPDATED_NEW", succeeds));
+ if (succeeds) {
+ response.statusCode(200).body("Attributes.value.S", equalTo("changed"));
+ assertChanged("Update", table);
+ } else {
+ response.statusCode(400).body(containsString("ConditionalCheckFailedException"))
+ .body("Item.value.S", equalTo("original"));
+ assertOriginal(table);
+ }
+ }
+
+ @ParameterizedTest
+ @ValueSource(strings = {"Put", "Update", "Delete"})
+ void noneSuccessAndOldFailureNeedOnlyTheOldGrant(String operation) {
+ String caller = fixtures.user(policy("dynamodb:" + operation + "Item",
+ ",\"Condition\":{\"StringEquals\":{\"dynamodb:ReturnValues\":\"ALL_OLD\"}}"));
+ for (boolean succeeds : new boolean[]{true, false}) {
+ String table = fixtures.table();
+ ValidatableResponse response = fixtures.request(caller, operation + "Item",
+ conditionalBody(operation, table, "NONE", succeeds));
+ if (succeeds) {
+ response.statusCode(200).body(equalTo("{}"));
+ assertChanged(operation, table);
+ } else {
+ response.statusCode(400).body(containsString("ConditionalCheckFailedException"))
+ .body("Item.value.S", equalTo("original"));
+ assertOriginal(table);
+ }
+ }
+ }
+
+ @ParameterizedTest
+ @ValueSource(booleans = {true, false})
+ void anExplicitDenyOfTheFailureModeOverridesTheBroadGrant(boolean succeeds) {
+ String table = fixtures.table();
+ String caller = fixtures.user("{\"Version\":\"2012-10-17\",\"Statement\":["
+ + "{\"Effect\":\"Allow\",\"Action\":\"dynamodb:UpdateItem\",\"Resource\":\"*\"},"
+ + "{\"Effect\":\"Deny\",\"Action\":\"dynamodb:UpdateItem\",\"Resource\":\"*\","
+ + "\"Condition\":{\"StringEquals\":{\"dynamodb:ReturnValues\":\"ALL_OLD\"}}}]}");
+ fixtures.request(caller, "UpdateItem", conditionalBody("Update", table, "UPDATED_NEW", succeeds))
+ .statusCode(400).body(containsString("AccessDeniedException"));
+ assertOriginal(table);
+ }
+
+ private static String conditionalBody(String operation, String table, String successfulMode, boolean succeeds) {
+ String body = withReturnValues(operation, table, "\"" + successfulMode + "\"");
+ return body.substring(0, body.length() - 1)
+ + ",\"ReturnValuesOnConditionCheckFailure\":\"ALL_OLD\",\"ConditionExpression\":\""
+ + (succeeds ? "attribute_exists(PK)" : "attribute_not_exists(PK)") + "\"}";
+ }
+
+ private void assertOriginal(String table) {
+ fixtures.request("test", "GetItem", keyBody(table)).statusCode(200).body("Item.value.S", equalTo("original"));
+ }
+
+ private void assertChanged(String operation, String table) {
+ ValidatableResponse response = fixtures.request("test", "GetItem", keyBody(table)).statusCode(200);
+ if ("Delete".equals(operation)) {
+ response.body(equalTo("{}"));
+ } else {
+ response.body("Item.value.S", equalTo("changed"));
+ }
+ }
+
+ private static String withReturnValues(String operation, String table, String value) {
+ String body = itemBody(operation, table);
+ return body.substring(0, body.length() - 1) + ",\"ReturnValues\":" + value + "}";
+ }
+
+}
diff --git a/src/test/java/io/github/hectorvent/floci/services/iam/DynamoDbTransactionAuthorizationIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/iam/DynamoDbTransactionAuthorizationIntegrationTest.java
index fc2d939e79..66dfd79bc5 100644
--- a/src/test/java/io/github/hectorvent/floci/services/iam/DynamoDbTransactionAuthorizationIntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/iam/DynamoDbTransactionAuthorizationIntegrationTest.java
@@ -1,5 +1,6 @@
package io.github.hectorvent.floci.services.iam;
+import io.github.hectorvent.floci.testing.DynamoDbAuthorizationFixtures;
import io.github.hectorvent.floci.testing.IamEnforcementProfile;
import io.github.hectorvent.floci.testing.PartitionCleanup;
import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;
@@ -8,6 +9,7 @@ import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
import io.restassured.response.ValidatableResponse;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.params.ParameterizedTest;
@@ -16,9 +18,9 @@ import org.junit.jupiter.params.provider.ValueSource;
import java.net.URI;
import java.util.UUID;
-import static io.github.hectorvent.floci.testing.EnforcementFixtures.auth;
-import static io.github.hectorvent.floci.testing.EnforcementFixtures.createUser;
-import static io.restassured.RestAssured.given;
+import static io.github.hectorvent.floci.testing.DynamoDbAuthorizationFixtures.itemBody;
+import static io.github.hectorvent.floci.testing.DynamoDbAuthorizationFixtures.keyBody;
+import static io.github.hectorvent.floci.testing.DynamoDbAuthorizationFixtures.policy;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
@@ -32,6 +34,13 @@ class DynamoDbTransactionAuthorizationIntegrationTest {
@TestHTTPResource
URI endpoint;
+ private DynamoDbAuthorizationFixtures fixtures;
+
+ @BeforeEach
+ void configureFixtures() {
+ fixtures = new DynamoDbAuthorizationFixtures(cleanup, endpoint.getPort(), "tx-auth-", "transaction");
+ }
+
@BeforeAll
static void configureContentType() {
RestAssuredJsonUtils.configureAwsContentTypes();
@@ -40,8 +49,8 @@ class DynamoDbTransactionAuthorizationIntegrationTest {
@ParameterizedTest
@ValueSource(strings = {"Put", "Update", "Delete", "Get", "ConditionCheck"})
void itemPermissionAloneAllowsItsTransactionalOperation(String operation) {
- String table = table();
- String user = user(policy("dynamodb:" + operation + "Item", ""));
+ String table = fixtures.table();
+ String user = fixtures.user(policy("dynamodb:" + operation + "Item", ""));
transaction(user, operation, table).statusCode(200);
assertResult(operation, table);
}
@@ -49,55 +58,55 @@ class DynamoDbTransactionAuthorizationIntegrationTest {
@ParameterizedTest
@ValueSource(strings = {"Put", "Update", "Delete", "Get", "ConditionCheck"})
void broadPermissionControlExecutesTheSameTransaction(String operation) {
- String table = table();
- transaction(user(policy("dynamodb:*", "")), operation, table).statusCode(200);
+ String table = fixtures.table();
+ transaction(fixtures.user(policy("dynamodb:*", "")), operation, table).statusCode(200);
assertResult(operation, table);
}
@ParameterizedTest
@ValueSource(strings = {"Put", "Update", "Delete", "Get", "ConditionCheck"})
void transactionVerbAloneDoesNotGrantItemPermission(String operation) {
- String table = table();
- String user = user(policy("dynamodb:" + enclosing(operation), ""));
+ String table = fixtures.table();
+ String user = fixtures.user(policy("dynamodb:" + enclosing(operation), ""));
transaction(user, operation, table).statusCode(400).body(containsString("AccessDeniedException"));
- request("test", "GetItem", keyBody(table)).statusCode(200).body("Item.value.S", equalTo("original"));
+ fixtures.request("test", "GetItem", keyBody(table)).statusCode(200).body("Item.value.S", equalTo("original"));
}
@ParameterizedTest
@ValueSource(strings = {"Put", "Get"})
void enclosingOperationConditionAllowsTransactionsButNotStandaloneCalls(String operation) {
- String table = table();
+ String table = fixtures.table();
String condition = ",\"Condition\":{\"ForAnyValue:StringEquals\":{"
+ "\"dynamodb:EnclosingOperation\":[\"" + enclosing(operation) + "\"]}}";
- String user = user(policy("dynamodb:" + operation + "Item", condition));
+ String user = fixtures.user(policy("dynamodb:" + operation + "Item", condition));
transaction(user, operation, table).statusCode(200);
- request(user, operation + "Item", itemBody(operation, table)).statusCode(400)
+ fixtures.request(user, operation + "Item", itemBody(operation, table)).statusCode(400)
.body(containsString("AccessDeniedException"));
}
@Test
void deniedLaterItemPreventsAllWrites() {
- String first = table();
- String second = table();
- String user = user("""
+ String first = fixtures.table();
+ String second = fixtures.table();
+ String user = fixtures.user("""
{"Version":"2012-10-17","Statement":[
{"Effect":"Allow","Action":"dynamodb:*","Resource":"*"},
{"Effect":"Deny","Action":"dynamodb:DeleteItem","Resource":"*"}]}
""");
- request(user, "TransactWriteItems", "{\"TransactItems\":[{\"Put\":" + itemBody("Put", first)
+ fixtures.request(user, "TransactWriteItems", "{\"TransactItems\":[{\"Put\":" + itemBody("Put", first)
+ "},{\"Delete\":" + itemBody("Delete", second) + "}]}")
.statusCode(400).body(containsString("AccessDeniedException"));
- request("test", "GetItem", keyBody(first)).statusCode(200).body("Item.value.S", equalTo("original"));
- request("test", "GetItem", keyBody(second)).statusCode(200).body("Item.value.S", equalTo("original"));
+ fixtures.request("test", "GetItem", keyBody(first)).statusCode(200).body("Item.value.S", equalTo("original"));
+ fixtures.request("test", "GetItem", keyBody(second)).statusCode(200).body("Item.value.S", equalTo("original"));
}
@Test
void eachTransactionalItemContributesItsLeadingKeyWithoutNullGuard() {
- String table = table();
- String user = user(policy("dynamodb:*", ",\"Condition\":{\"ForAllValues:StringEquals\":{"
+ String table = fixtures.table();
+ String user = fixtures.user(policy("dynamodb:*", ",\"Condition\":{\"ForAllValues:StringEquals\":{"
+ "\"dynamodb:LeadingKeys\":[\"allowed\"]}}"));
transaction(user, "Put", table).statusCode(400).body(containsString("AccessDeniedException"));
- request("test", "GetItem", keyBody(table)).statusCode(200).body("Item.value.S", equalTo("original"));
+ fixtures.request("test", "GetItem", keyBody(table)).statusCode(200).body("Item.value.S", equalTo("original"));
}
/**
@@ -108,34 +117,34 @@ class DynamoDbTransactionAuthorizationIntegrationTest {
@Test
void aTransactionItemCarriesTheCallersPrincipalKeys() {
String name = "tx-auth-" + UUID.randomUUID();
- String own = table();
- String caller = userNamed(name, policy("dynamodb:PutItem",
+ String own = fixtures.table();
+ String caller = fixtures.userNamed(name, policy("dynamodb:PutItem",
",\"Condition\":{\"StringEquals\":{\"aws:username\":\"" + name + "\"}}"));
transaction(caller, "Put", own).statusCode(200);
assertResult("Put", own);
- String other = table();
- String stranger = user(policy("dynamodb:PutItem",
+ String other = fixtures.table();
+ String stranger = fixtures.user(policy("dynamodb:PutItem",
",\"Condition\":{\"StringEquals\":{\"aws:username\":\"somebody-else\"}}"));
transaction(stranger, "Put", other).statusCode(400).body(containsString("AccessDeniedException"));
- request("test", "GetItem", keyBody(other)).statusCode(200).body("Item.value.S", equalTo("original"));
+ fixtures.request("test", "GetItem", keyBody(other)).statusCode(200).body("Item.value.S", equalTo("original"));
}
@ParameterizedTest
@ValueSource(strings = {"Put", "Update", "Delete", "Get", "ConditionCheck"})
void extraEnvelopeFieldCannotBypassItemAuthorization(String operation) {
- String table = table();
- String user = user(policy("dynamodb:" + enclosing(operation), ""));
- request(user, enclosing(operation), "{\"TransactItems\":[{\"Ignored\":true,\"" + operation
+ String table = fixtures.table();
+ String user = fixtures.user(policy("dynamodb:" + enclosing(operation), ""));
+ fixtures.request(user, enclosing(operation), "{\"TransactItems\":[{\"Ignored\":true,\"" + operation
+ "\":" + itemBody(operation, table) + "}]}")
.statusCode(400).body(containsString("AccessDeniedException"));
- request("test", "GetItem", keyBody(table)).statusCode(200).body("Item.value.S", equalTo("original"));
+ fixtures.request("test", "GetItem", keyBody(table)).statusCode(200).body("Item.value.S", equalTo("original"));
}
@Test
void eachItemUsesItsOwnActionAndTablePolicy() {
- String first = table();
- String second = table();
+ String first = fixtures.table();
+ String second = fixtures.table();
String policy = """
{"Version":"2012-10-17","Statement":[
{"Effect":"Allow","Action":"dynamodb:PutItem",
@@ -143,8 +152,8 @@ class DynamoDbTransactionAuthorizationIntegrationTest {
{"Effect":"Allow","Action":"dynamodb:DeleteItem",
"Resource":"arn:aws:dynamodb:us-east-1:000000000000:table/%s"}]}
""".formatted(first, second);
- String user = user(policy);
- request(user, "TransactWriteItems", "{\"TransactItems\":[{\"Put\":" + itemBody("Put", first)
+ String user = fixtures.user(policy);
+ fixtures.request(user, "TransactWriteItems", "{\"TransactItems\":[{\"Put\":" + itemBody("Put", first)
+ "},{\"Delete\":" + itemBody("Delete", second) + "}]}").statusCode(200);
assertResult("Put", first);
assertResult("Delete", second);
@@ -153,31 +162,31 @@ class DynamoDbTransactionAuthorizationIntegrationTest {
@ParameterizedTest
@ValueSource(strings = {"Put", "Update", "Delete", "ConditionCheck"})
void transactionFailureImagesRequireTheRequestedReturnValues(String operation) {
- String table = table();
- String user = user(policy("dynamodb:" + operation + "Item",
+ String table = fixtures.table();
+ String user = fixtures.user(policy("dynamodb:" + operation + "Item",
",\"Condition\":{\"StringEqualsIfExists\":{\"dynamodb:ReturnValues\":\"NONE\"}}"));
String item = itemBody(operation, table);
String disallowed = item.substring(0, item.length() - 1)
+ ",\"ReturnValuesOnConditionCheckFailure\":\"ALL_OLD\"}";
- request(user, enclosing(operation), "{\"TransactItems\":[{\"" + operation + "\":" + disallowed + "}]}")
+ fixtures.request(user, enclosing(operation), "{\"TransactItems\":[{\"" + operation + "\":" + disallowed + "}]}")
.statusCode(400).body(containsString("AccessDeniedException"));
- request("test", "GetItem", keyBody(table)).statusCode(200).body("Item.value.S", equalTo("original"));
+ fixtures.request("test", "GetItem", keyBody(table)).statusCode(200).body("Item.value.S", equalTo("original"));
transaction(user, operation, table).statusCode(200);
}
@ParameterizedTest
@ValueSource(strings = {"Put", "Update", "Delete", "ConditionCheck"})
void strictReturnValuesConditionRequiresAnExplicitValue(String operation) {
- String table = table();
- String user = user(policy("dynamodb:" + operation + "Item",
+ String table = fixtures.table();
+ String user = fixtures.user(policy("dynamodb:" + operation + "Item",
",\"Condition\":{\"StringEquals\":{\"dynamodb:ReturnValues\":\"NONE\"}}"));
transaction(user, operation, table).statusCode(400).body(containsString("AccessDeniedException"));
for (String value : new String[]{"null", "\"\"", "\"ALL_OLD\""}) {
- request(user, enclosing(operation), transactionWithReturnValues(operation, table, value))
+ fixtures.request(user, enclosing(operation), transactionWithReturnValues(operation, table, value))
.statusCode(400).body(containsString("AccessDeniedException"));
}
- request("test", "GetItem", keyBody(table)).statusCode(200).body("Item.value.S", equalTo("original"));
- request(user, enclosing(operation), transactionWithReturnValues(operation, table, "\"NONE\""))
+ fixtures.request("test", "GetItem", keyBody(table)).statusCode(200).body("Item.value.S", equalTo("original"));
+ fixtures.request(user, enclosing(operation), transactionWithReturnValues(operation, table, "\"NONE\""))
.statusCode(200);
assertResult(operation, table);
}
@@ -185,12 +194,12 @@ class DynamoDbTransactionAuthorizationIntegrationTest {
@ParameterizedTest
@ValueSource(strings = {"Put", "Update", "Delete", "ConditionCheck"})
void nullReturnValuesConditionDistinguishesMissingFromExplicitNone(String operation) {
- String table = table();
- String user = user(policy("dynamodb:" + operation + "Item",
+ String table = fixtures.table();
+ String user = fixtures.user(policy("dynamodb:" + operation + "Item",
",\"Condition\":{\"Null\":{\"dynamodb:ReturnValues\":\"true\"}}"));
- request(user, enclosing(operation), transactionWithReturnValues(operation, table, "\"NONE\""))
+ fixtures.request(user, enclosing(operation), transactionWithReturnValues(operation, table, "\"NONE\""))
.statusCode(400).body(containsString("AccessDeniedException"));
- request("test", "GetItem", keyBody(table)).statusCode(200).body("Item.value.S", equalTo("original"));
+ fixtures.request("test", "GetItem", keyBody(table)).statusCode(200).body("Item.value.S", equalTo("original"));
transaction(user, operation, table).statusCode(200);
assertResult(operation, table);
}
@@ -198,28 +207,28 @@ class DynamoDbTransactionAuthorizationIntegrationTest {
@ParameterizedTest
@ValueSource(strings = {"Put", "Update", "Delete", "ConditionCheck"})
void explicitFailureImageValueCanBeAuthorized(String operation) {
- String table = table();
- String user = user(policy("dynamodb:" + operation + "Item",
+ String table = fixtures.table();
+ String user = fixtures.user(policy("dynamodb:" + operation + "Item",
",\"Condition\":{\"StringEquals\":{\"dynamodb:ReturnValues\":\"ALL_OLD\"}}"));
- request(user, enclosing(operation), transactionWithReturnValues(operation, table, "\"ALL_OLD\""))
+ fixtures.request(user, enclosing(operation), transactionWithReturnValues(operation, table, "\"ALL_OLD\""))
.statusCode(200);
assertResult(operation, table);
}
@Test
void explicitReturnValuesOnOneItemCannotAuthorizeAnotherItem() {
- String first = table();
- String second = table();
- String user = user(policy("dynamodb:PutItem",
+ String first = fixtures.table();
+ String second = fixtures.table();
+ String user = fixtures.user(policy("dynamodb:PutItem",
",\"Condition\":{\"StringEquals\":{\"dynamodb:ReturnValues\":\"NONE\"}}"));
String firstItem = itemBody("Put", first);
firstItem = firstItem.substring(0, firstItem.length() - 1)
+ ",\"ReturnValuesOnConditionCheckFailure\":\"NONE\"}";
- request(user, "TransactWriteItems", "{\"TransactItems\":[{\"Put\":" + firstItem
+ fixtures.request(user, "TransactWriteItems", "{\"TransactItems\":[{\"Put\":" + firstItem
+ "},{\"Put\":" + itemBody("Put", second) + "}]}")
.statusCode(400).body(containsString("AccessDeniedException"));
- request("test", "GetItem", keyBody(first)).statusCode(200).body("Item.value.S", equalTo("original"));
- request("test", "GetItem", keyBody(second)).statusCode(200).body("Item.value.S", equalTo("original"));
+ fixtures.request("test", "GetItem", keyBody(first)).statusCode(200).body("Item.value.S", equalTo("original"));
+ fixtures.request("test", "GetItem", keyBody(second)).statusCode(200).body("Item.value.S", equalTo("original"));
}
private static String transactionWithReturnValues(String operation, String table, String value) {
@@ -231,7 +240,7 @@ class DynamoDbTransactionAuthorizationIntegrationTest {
@ParameterizedTest
@ValueSource(strings = {"Get", "Update", "ConditionCheck"})
void itemAttributesAreEnforcedWithoutNullGuard(String operation) {
- String table = table();
+ String table = fixtures.table();
String item = itemBody(operation, table);
if ("Get".equals(operation)) {
item = item.substring(0, item.length() - 1)
@@ -243,14 +252,14 @@ class DynamoDbTransactionAuthorizationIntegrationTest {
+ "\"ExpressionAttributeNames\":{\"#v\":\"value\"}}";
}
String request = "{\"TransactItems\":[{\"" + operation + "\":" + item + "}]}";
- String denied = user(policy("dynamodb:" + operation + "Item",
+ String denied = fixtures.user(policy("dynamodb:" + operation + "Item",
",\"Condition\":{\"ForAllValues:StringEquals\":{\"dynamodb:Attributes\":[\"PK\"]}}"));
- request(denied, enclosing(operation), request).statusCode(400)
+ fixtures.request(denied, enclosing(operation), request).statusCode(400)
.body(containsString("AccessDeniedException"));
- request("test", "GetItem", keyBody(table)).statusCode(200).body("Item.value.S", equalTo("original"));
- String allowed = user(policy("dynamodb:" + operation + "Item",
+ fixtures.request("test", "GetItem", keyBody(table)).statusCode(200).body("Item.value.S", equalTo("original"));
+ String allowed = fixtures.user(policy("dynamodb:" + operation + "Item",
",\"Condition\":{\"ForAllValues:StringEquals\":{\"dynamodb:Attributes\":[\"PK\",\"value\"]}}"));
- ValidatableResponse response = request(allowed, enclosing(operation), request).statusCode(200);
+ ValidatableResponse response = fixtures.request(allowed, enclosing(operation), request).statusCode(200);
if ("Get".equals(operation)) {
response.body("Responses[0].Item.value.S", equalTo("original"));
}
@@ -260,31 +269,31 @@ class DynamoDbTransactionAuthorizationIntegrationTest {
@ParameterizedTest
@ValueSource(booleans = {false, true})
void eachTableUsesItsOwnPartitionKeySchema(boolean forbiddenLaterKey) {
- String first = table();
- String second = table("tenant");
+ String first = fixtures.table();
+ String second = fixtures.table("tenant");
String secondItem = itemBody("Put", second).replace("\"PK\"", "\"tenant\"");
if (forbiddenLaterKey) {
secondItem = secondItem.replace("\"item\"", "\"forbidden\"");
}
- String caller = user(policy("dynamodb:PutItem", ",\"Condition\":{\"ForAllValues:StringEquals\":{"
+ String caller = fixtures.user(policy("dynamodb:PutItem", ",\"Condition\":{\"ForAllValues:StringEquals\":{"
+ "\"dynamodb:LeadingKeys\":[\"item\"]}}"));
- ValidatableResponse response = request(caller, "TransactWriteItems", "{\"TransactItems\":[{\"Put\":"
+ ValidatableResponse response = fixtures.request(caller, "TransactWriteItems", "{\"TransactItems\":[{\"Put\":"
+ itemBody("Put", first) + "},{\"Put\":" + secondItem + "}]}");
if (forbiddenLaterKey) {
response.statusCode(400).body(containsString("AccessDeniedException"));
- request("test", "GetItem", keyBody(second).replace("\"PK\"", "\"tenant\"")
+ fixtures.request("test", "GetItem", keyBody(second).replace("\"PK\"", "\"tenant\"")
.replace("\"item\"", "\"forbidden\"")).statusCode(200).body(equalTo("{}"));
} else {
response.statusCode(200);
}
String expected = forbiddenLaterKey ? "original" : "changed";
- request("test", "GetItem", keyBody(first)).statusCode(200).body("Item.value.S", equalTo(expected));
- request("test", "GetItem", keyBody(second).replace("\"PK\"", "\"tenant\""))
+ fixtures.request("test", "GetItem", keyBody(first)).statusCode(200).body("Item.value.S", equalTo(expected));
+ fixtures.request("test", "GetItem", keyBody(second).replace("\"PK\"", "\"tenant\""))
.statusCode(200).body("Item.value.S", equalTo(expected));
}
private void assertResult(String operation, String table) {
- ValidatableResponse response = request("test", "GetItem", keyBody(table)).statusCode(200);
+ ValidatableResponse response = fixtures.request("test", "GetItem", keyBody(table)).statusCode(200);
if ("Delete".equals(operation)) {
response.body(equalTo("{}"));
} else {
@@ -294,7 +303,7 @@ class DynamoDbTransactionAuthorizationIntegrationTest {
}
private ValidatableResponse transaction(String user, String operation, String table) {
- return request(user, enclosing(operation), "{\"TransactItems\":[{\"" + operation + "\":"
+ return fixtures.request(user, enclosing(operation), "{\"TransactItems\":[{\"" + operation + "\":"
+ itemBody(operation, table) + "}]}");
}
@@ -302,69 +311,4 @@ class DynamoDbTransactionAuthorizationIntegrationTest {
return "Get".equals(operation) ? "TransactGetItems" : "TransactWriteItems";
}
- private static String itemBody(String operation, String table) {
- if ("Put".equals(operation)) {
- return "{\"TableName\":\"" + table + "\",\"Item\":{\"PK\":{\"S\":\"item\"},"
- + "\"value\":{\"S\":\"changed\"}}}";
- }
- String base = keyBody(table);
- if ("Update".equals(operation)) {
- return base.substring(0, base.length() - 1) + ",\"UpdateExpression\":\"SET #v = :v\","
- + "\"ExpressionAttributeNames\":{\"#v\":\"value\"},"
- + "\"ExpressionAttributeValues\":{\":v\":{\"S\":\"changed\"}}}";
- }
- if ("ConditionCheck".equals(operation)) {
- return base.substring(0, base.length() - 1) + ",\"ConditionExpression\":\"attribute_exists(PK)\"}";
- }
- return base;
- }
-
- private static String keyBody(String table) {
- return "{\"TableName\":\"" + table + "\",\"Key\":{\"PK\":{\"S\":\"item\"}}}";
- }
-
- private String table() {
- return table("PK");
- }
-
- private String table(String partitionKey) {
- String table = "tx-auth-" + UUID.randomUUID();
- int port = endpoint.getPort();
- cleanup.register(() -> given().port(port).header("Authorization", auth("test", "dynamodb"))
- .header("X-Amz-Target", "DynamoDB_20120810.DeleteTable")
- .contentType("application/x-amz-json-1.0").body("{\"TableName\":\"" + table + "\"}")
- .post("/").then().statusCode(200));
- request("test", "CreateTable", """
- {"TableName":"%s","KeySchema":[{"AttributeName":"%s","KeyType":"HASH"}],
- "AttributeDefinitions":[{"AttributeName":"%s","AttributeType":"S"}],
- "BillingMode":"PAY_PER_REQUEST"}
- """.formatted(table, partitionKey, partitionKey)).statusCode(200);
- request("test", "PutItem", itemBody("Put", table).replace("changed", "original")
- .replace("\"PK\"", "\"" + partitionKey + "\"")).statusCode(200);
- return table;
- }
-
- private String user(String policy) {
- return userNamed("tx-auth-" + UUID.randomUUID(), policy);
- }
-
- /** A user whose name the caller chooses, for a policy that has to name it. */
- private String userNamed(String name, String policy) {
- String key = createUser(cleanup, endpoint.getPort(), auth("test", "iam"), name).accessKeyId();
- given().header("Authorization", auth("test", "iam")).formParam("Action", "PutUserPolicy")
- .formParam("UserName", name).formParam("PolicyName", "transaction")
- .formParam("PolicyDocument", policy).post("/").then().statusCode(200);
- return key;
- }
-
- private static String policy(String action, String condition) {
- return "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\""
- + action + "\",\"Resource\":\"*\"" + condition + "}]}";
- }
-
- private ValidatableResponse request(String key, String action, String body) {
- return given().header("Authorization", auth(key, "dynamodb"))
- .header("X-Amz-Target", "DynamoDB_20120810." + action)
- .contentType("application/x-amz-json-1.0").body(body).post("/").then();
- }
}
diff --git a/src/test/java/io/github/hectorvent/floci/testing/DynamoDbAuthorizationFixtures.java b/src/test/java/io/github/hectorvent/floci/testing/DynamoDbAuthorizationFixtures.java
new file mode 100644
index 0000000000..5153dfe7c1
--- /dev/null
+++ b/src/test/java/io/github/hectorvent/floci/testing/DynamoDbAuthorizationFixtures.java
@@ -0,0 +1,89 @@
+package io.github.hectorvent.floci.testing;
+
+import io.restassured.response.ValidatableResponse;
+
+import java.util.UUID;
+
+import static io.github.hectorvent.floci.testing.EnforcementFixtures.auth;
+import static io.github.hectorvent.floci.testing.EnforcementFixtures.createUser;
+import static io.restassured.RestAssured.given;
+
+/** Shared wire requests and cleanup for DynamoDB IAM enforcement tests. */
+public final class DynamoDbAuthorizationFixtures {
+ private final PartitionCleanup cleanup;
+ private final int port;
+ private final String prefix;
+ private final String policyName;
+
+ public DynamoDbAuthorizationFixtures(PartitionCleanup cleanup, int port, String prefix, String policyName) {
+ this.cleanup = cleanup;
+ this.port = port;
+ this.prefix = prefix;
+ this.policyName = policyName;
+ }
+
+ public static String itemBody(String operation, String table) {
+ if ("Put".equals(operation)) {
+ return "{\"TableName\":\"" + table + "\",\"Item\":{\"PK\":{\"S\":\"item\"},"
+ + "\"value\":{\"S\":\"changed\"}}}";
+ }
+ String base = keyBody(table);
+ if ("Update".equals(operation)) {
+ return base.substring(0, base.length() - 1) + ",\"UpdateExpression\":\"SET #v = :v\","
+ + "\"ExpressionAttributeNames\":{\"#v\":\"value\"},"
+ + "\"ExpressionAttributeValues\":{\":v\":{\"S\":\"changed\"}}}";
+ }
+ if ("ConditionCheck".equals(operation)) {
+ return base.substring(0, base.length() - 1) + ",\"ConditionExpression\":\"attribute_exists(PK)\"}";
+ }
+ return base;
+ }
+
+ public static String keyBody(String table) {
+ return "{\"TableName\":\"" + table + "\",\"Key\":{\"PK\":{\"S\":\"item\"}}}";
+ }
+
+ public String table() {
+ return table("PK");
+ }
+
+ public String table(String partitionKey) {
+ String table = prefix + UUID.randomUUID();
+ cleanup.register(() -> given().port(port).header("Authorization", auth("test", "dynamodb"))
+ .header("X-Amz-Target", "DynamoDB_20120810.DeleteTable")
+ .contentType("application/x-amz-json-1.0").body("{\"TableName\":\"" + table + "\"}")
+ .post("/").then().statusCode(200));
+ request("test", "CreateTable", """
+ {"TableName":"%s","KeySchema":[{"AttributeName":"%s","KeyType":"HASH"}],
+ "AttributeDefinitions":[{"AttributeName":"%s","AttributeType":"S"}],
+ "BillingMode":"PAY_PER_REQUEST"}
+ """.formatted(table, partitionKey, partitionKey)).statusCode(200);
+ request("test", "PutItem", itemBody("Put", table).replace("changed", "original")
+ .replace("\"PK\"", "\"" + partitionKey + "\"")).statusCode(200);
+ return table;
+ }
+
+ public String user(String policy) {
+ return userNamed(prefix + UUID.randomUUID(), policy);
+ }
+
+ /** A user whose name the caller chooses, for a policy that has to name it. */
+ public String userNamed(String name, String policy) {
+ String key = createUser(cleanup, port, auth("test", "iam"), name).accessKeyId();
+ given().port(port).header("Authorization", auth("test", "iam")).formParam("Action", "PutUserPolicy")
+ .formParam("UserName", name).formParam("PolicyName", policyName)
+ .formParam("PolicyDocument", policy).post("/").then().statusCode(200);
+ return key;
+ }
+
+ public static String policy(String action, String condition) {
+ return "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":\""
+ + action + "\",\"Resource\":\"*\"" + condition + "}]}";
+ }
+
+ public ValidatableResponse request(String key, String action, String body) {
+ return given().port(port).header("Authorization", auth(key, "dynamodb"))
+ .header("X-Amz-Target", "DynamoDB_20120810." + action)
+ .contentType("application/x-amz-json-1.0").body(body).post("/").then();
+ }
+}