Skip to content

armgit / floci

Public Imported from GitHub
0

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

feat(kms): add RotateKeyOnDemand support (#990)

kyounghoonJang255b41bca86e
diff --git a/docs/services/kms.md b/docs/services/kms.md
index cef4017675..dc6ce1f169 100644
--- a/docs/services/kms.md
+++ b/docs/services/kms.md
@@ -30,6 +30,7 @@
| `GetKeyRotationStatus` | Check if automatic key rotation is enabled |
| `EnableKeyRotation` | Enable automatic key rotation (symmetric keys only) |
| `DisableKeyRotation` | Disable automatic key rotation |
+| `RotateKeyOnDemand` | Rotate key material on demand (symmetric keys only) |
## Configuration
diff --git a/src/main/java/io/github/hectorvent/floci/services/kms/KmsJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/kms/KmsJsonHandler.java
index 46dd02093a..7ee4c35d1b 100644
--- a/src/main/java/io/github/hectorvent/floci/services/kms/KmsJsonHandler.java
+++ b/src/main/java/io/github/hectorvent/floci/services/kms/KmsJsonHandler.java
@@ -60,6 +60,7 @@ public class KmsJsonHandler {
case "GetKeyRotationStatus" -> handleGetKeyRotationStatus(request, region);
case "EnableKeyRotation" -> handleEnableKeyRotation(request, region);
case "DisableKeyRotation" -> handleDisableKeyRotation(request, region);
+ case "RotateKeyOnDemand" -> handleRotateKeyOnDemand(request, region);
default -> Response.status(400)
.entity(new AwsErrorResponse("UnsupportedOperation", "Operation " + action + " is not supported."))
.build();
@@ -383,6 +384,13 @@ public class KmsJsonHandler {
return Response.ok(objectMapper.createObjectNode()).build();
}
+ private Response handleRotateKeyOnDemand(JsonNode request, String region) {
+ String keyId = service.rotateKeyOnDemand(request.path("KeyId").asText(), region);
+ ObjectNode response = objectMapper.createObjectNode();
+ response.put("KeyId", keyId);
+ return Response.ok(response).build();
+ }
+
private ObjectNode keyToNode(KmsKey k) {
ObjectNode node = objectMapper.createObjectNode();
node.put("AWSAccountId", regionResolver.getAccountId());
diff --git a/src/main/java/io/github/hectorvent/floci/services/kms/KmsService.java b/src/main/java/io/github/hectorvent/floci/services/kms/KmsService.java
index 2f55b5d23d..55b5b25007 100644
--- a/src/main/java/io/github/hectorvent/floci/services/kms/KmsService.java
+++ b/src/main/java/io/github/hectorvent/floci/services/kms/KmsService.java
@@ -290,6 +290,16 @@ public class KmsService {
LOG.infov("Disabled key rotation for KMS key: {0} in {1}", key.getKeyId(), region);
}
+ public String rotateKeyOnDemand(String keyId, String region) {
+ KmsKey key = resolveKey(keyId, region);
+ if (!key.isEnabled()) {
+ throw new AwsException("DisabledException",
+ "KMS key " + key.getKeyId() + " is disabled.", 400);
+ }
+ validateRotationSupported(key);
+ return key.getKeyId();
+ }
+
private void validateRotationSupported(KmsKey key) {
if (!"ENCRYPT_DECRYPT".equals(key.getKeyUsage())
|| !"SYMMETRIC_DEFAULT".equals(key.getCustomerMasterKeySpec())) {
diff --git a/src/test/java/io/github/hectorvent/floci/services/kms/KmsIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/kms/KmsIntegrationTest.java
index be19a94c17..a8ce8d9ca8 100644
--- a/src/test/java/io/github/hectorvent/floci/services/kms/KmsIntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/kms/KmsIntegrationTest.java
@@ -108,4 +108,28 @@ class KmsIntegrationTest {
.statusCode(400)
.body("__type", equalTo("KMSInvalidMacException"));
}
+
+ @Test
+ void rotateKeyOnDemandReturnsKeyId() {
+ String keyId = given()
+ .header("X-Amz-Target", "TrentService.CreateKey")
+ .contentType("application/x-amz-json-1.1")
+ .body("{\"Description\":\"rotate-on-demand\"}")
+ .when()
+ .post("/")
+ .then()
+ .statusCode(200)
+ .extract()
+ .path("KeyMetadata.KeyId");
+
+ given()
+ .header("X-Amz-Target", "TrentService.RotateKeyOnDemand")
+ .contentType("application/x-amz-json-1.1")
+ .body("{\"KeyId\":\"" + keyId + "\"}")
+ .when()
+ .post("/")
+ .then()
+ .statusCode(200)
+ .body("KeyId", equalTo(keyId));
+ }
}
diff --git a/src/test/java/io/github/hectorvent/floci/services/kms/KmsServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/kms/KmsServiceTest.java
index 4dcb08e56f..c4ddae6463 100644
--- a/src/test/java/io/github/hectorvent/floci/services/kms/KmsServiceTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/kms/KmsServiceTest.java
@@ -633,6 +633,36 @@ class KmsServiceTest {
assertFalse(kmsService.getKeyRotationStatus(key.getKeyId(), REGION));
}
+ // ── Issue #911 — RotateKeyOnDemand ──────────────────────────────────────
+
+ @Test
+ void rotateKeyOnDemandReturnsKeyId() {
+ KmsKey key = kmsService.createKey(null, REGION);
+ String keyId = kmsService.rotateKeyOnDemand(key.getKeyId(), REGION);
+ assertEquals(key.getKeyId(), keyId);
+ }
+
+ @Test
+ void rotateKeyOnDemandOnAsymmetricKeyThrows() {
+ KmsKey key = kmsService.createKey("rsa key", "SIGN_VERIFY", "RSA_2048", null, Map.of(), REGION);
+ AwsException ex = assertThrows(AwsException.class, () ->
+ kmsService.rotateKeyOnDemand(key.getKeyId(), REGION));
+
+ assertEquals("UnsupportedOperationException", ex.getErrorCode());
+ assertEquals(400, ex.getHttpStatus());
+ }
+
+ @Test
+ void rotateKeyOnDemandOnDisabledKeyThrows() {
+ KmsKey key = kmsService.createKey(null, REGION);
+ key.setEnabled(false);
+ AwsException ex = assertThrows(AwsException.class, () ->
+ kmsService.rotateKeyOnDemand(key.getKeyId(), REGION));
+
+ assertEquals("DisabledException", ex.getErrorCode());
+ assertEquals(400, ex.getHttpStatus());
+ }
+
// ── Issue #497 — HMAC key specs ─────────────────────────────────────────
@ParameterizedTest