Light, fluffy, and always free - The AWS Local Emulator alternative
fix(ec2): reject duplicate key pair names in ImportKeyPair (#1848)
Ankit1324f9360cbf864b
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.javaindex 99a113e8c0..99f8b28aa4 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@@ -1572,6 +1572,11 @@ public class Ec2Service {public KeyPair importKeyPair(String region, String keyName, String publicKeyMaterial) {ensureDefaultResources(region);+ boolean exists = keyPairs.scan(k -> true).stream()+ .anyMatch(k -> k.getRegion().equals(region) && k.getKeyName().equals(keyName));+ if (exists) {+ throw new AwsException("InvalidKeyPair.Duplicate", "The keypair '" + keyName + "' already exists", 400);+ }String keyPairId = "key-" + randomHex(17);KeyPair kp = new KeyPair();kp.setKeyPairId(keyPairId);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.javaindex 65e5ae0761..65d42f44ce 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@@ -895,6 +895,21 @@ class Ec2IntegrationTest {.body("ImportKeyPairResponse.keyPairId", startsWith("key-"));}+ @Test+ @Order(41)+ void importKeyPairRejectsDuplicateKeyName() {+ given()+ .formParam("Action", "ImportKeyPair")+ .formParam("KeyName", "imported-key")+ .formParam("PublicKeyMaterial", "c3NoLXJzYSBBQUFBQjNOemFDMXljMkVBQUFBREFRQUJBQUFCQVFD")+ .header("Authorization", AUTH_HEADER)+ .when()+ .post("/")+ .then()+ .statusCode(400)+ .body("Response.Errors.Error.Code", equalTo("InvalidKeyPair.Duplicate"));+ }+@Test@Order(42)void createLaunchTemplateRejectsMalformedUserData() {diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServiceTest.javaindex 1070022db2..16b96fa515 100644--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2ServiceTest.java@@ -265,6 +265,38 @@ class Ec2ServiceTest {assertEquals("InvalidAMIName.Duplicate", error.getErrorCode());}+ @Test+ void importKeyPairRejectsDuplicateKeyName() {+ Ec2Service service = new Ec2Service(mockConfig(true), mock(Ec2ContainerManager.class),+ mock(Ec2PortForwardManager.class),+ mock(AmiImageResolver.class), mock(Ec2ImageCatalog.class), new Ec2InstanceTypeCatalog(),+ new InMemoryStorageFactory());++ service.importKeyPair("us-east-1", "duplicate-key", "c3NoLXJzYSBBQUFB");++ AwsException error = assertThrows(AwsException.class,+ () -> service.importKeyPair("us-east-1", "duplicate-key", "c3NoLXJzYSBBQUFB"));+ assertEquals("InvalidKeyPair.Duplicate", error.getErrorCode());+ assertEquals(400, error.getHttpStatus());++ // same name in another region is allowed+ service.importKeyPair("us-west-2", "duplicate-key", "c3NoLXJzYSBBQUFB");+ }++ @Test+ void importKeyPairRejectsNameAlreadyUsedByCreateKeyPair() {+ Ec2Service service = new Ec2Service(mockConfig(true), mock(Ec2ContainerManager.class),+ mock(Ec2PortForwardManager.class),+ mock(AmiImageResolver.class), mock(Ec2ImageCatalog.class), new Ec2InstanceTypeCatalog(),+ new InMemoryStorageFactory());++ service.createKeyPair("us-east-1", "shared-key-name");++ AwsException error = assertThrows(AwsException.class,+ () -> service.importKeyPair("us-east-1", "shared-key-name", "c3NoLXJzYSBBQUFB"));+ assertEquals("InvalidKeyPair.Duplicate", error.getErrorCode());+ }+@Testvoid registerImageReusingSnapshotDoesNotOverwriteSnapshotMetadata() {Ec2Service service = new Ec2Service(mockConfig(true), mock(Ec2ContainerManager.class),