Skip to content

armgit / floci

Public Imported from GitHub
0

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

fix(rds): reject malformed upgrade flags (#5329)

David Phillipsc8f16d24846f
diff --git a/src/main/java/io/github/hectorvent/floci/services/rds/RdsQueryHandler.java b/src/main/java/io/github/hectorvent/floci/services/rds/RdsQueryHandler.java
index 833d7b0808..fe5461e57b 100644
--- a/src/main/java/io/github/hectorvent/floci/services/rds/RdsQueryHandler.java
+++ b/src/main/java/io/github/hectorvent/floci/services/rds/RdsQueryHandler.java
@@ -211,10 +211,12 @@ public class RdsQueryHandler {
boolean multiAz = "true".equalsIgnoreCase(params.getFirst("MultiAZ"));
// AWS defaults this to true when the request omits it - unlike most boolean flags here,
// which default to false.
- boolean autoMinorVersionUpgrade = !"false".equalsIgnoreCase(params.getFirst("AutoMinorVersionUpgrade"));
+ boolean autoMinorVersionUpgrade;
Boolean publiclyAccessible;
Boolean deletionProtection;
try {
+ Boolean requestedAutoMinorVersionUpgrade = parseOptionalBoolean(params, "AutoMinorVersionUpgrade");
+ autoMinorVersionUpgrade = requestedAutoMinorVersionUpgrade == null || requestedAutoMinorVersionUpgrade;
publiclyAccessible = parseOptionalBoolean(params, "PubliclyAccessible");
deletionProtection = parseOptionalBoolean(params, "DeletionProtection");
} catch (AwsException e) {
@@ -599,12 +601,11 @@ public class RdsQueryHandler {
Boolean iamEnabled = iamStr != null ? Boolean.parseBoolean(iamStr) : null;
String dbSubnetGroupName = params.getFirst("DBSubnetGroupName");
String optionGroupName = params.getFirst("OptionGroupName");
- String autoMinorVersionUpgradeStr = params.getFirst("AutoMinorVersionUpgrade");
- Boolean autoMinorVersionUpgrade = autoMinorVersionUpgradeStr != null
- ? Boolean.parseBoolean(autoMinorVersionUpgradeStr) : null;
+ Boolean autoMinorVersionUpgrade;
Boolean publiclyAccessible;
Boolean deletionProtection;
try {
+ autoMinorVersionUpgrade = parseOptionalBoolean(params, "AutoMinorVersionUpgrade");
publiclyAccessible = parseOptionalBoolean(params, "PubliclyAccessible");
deletionProtection = parseOptionalBoolean(params, "DeletionProtection");
} catch (AwsException e) {
diff --git a/src/test/java/io/github/hectorvent/floci/services/rds/RdsQueryHandlerTest.java b/src/test/java/io/github/hectorvent/floci/services/rds/RdsQueryHandlerTest.java
index c58997c6a9..58426c22b1 100644
--- a/src/test/java/io/github/hectorvent/floci/services/rds/RdsQueryHandlerTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/rds/RdsQueryHandlerTest.java
@@ -59,6 +59,25 @@ class RdsQueryHandlerTest {
handler = new RdsQueryHandler(service, config, docDbHandler, neptuneHandler);
}
+ @Test
+ void invalidAutoMinorVersionUpgradeIsRejectedBeforeCreateOrModify() {
+ for (String action : List.of("CreateDBInstance", "ModifyDBInstance")) {
+ MultivaluedMap<String, String> p = params();
+ p.putSingle("DBInstanceIdentifier", "invalid-boolean");
+ p.putSingle("Engine", "postgres");
+ p.putSingle("MasterUsername", "admin");
+ p.putSingle("MasterUserPassword", "password");
+ p.putSingle("AutoMinorVersionUpgrade", "invalid");
+
+ Response response = handler.handle(action, p);
+
+ assertEquals(400, response.getStatus());
+ assertTrue(((String) response.getEntity()).contains("<Code>InvalidParameterValue</Code>"));
+ assertTrue(((String) response.getEntity()).contains("AutoMinorVersionUpgrade must be true or false."));
+ verifyNoInteractions(service);
+ }
+ }
+
@Test
void describeEvents_reconcilesOnlyTheRequestedDbInstance() {
DbInstance requested = makeInstance("requested");