Skip to content

armgit / floci

Public Imported from GitHub
0

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

fix(rds-data): reject invalid secret credentials (#3759)

Niels Kootstra3cf6c76811f1
diff --git a/docs/services/rds-data.md b/docs/services/rds-data.md
index c65263d0c5..275deaadcf 100644
--- a/docs/services/rds-data.md
+++ b/docs/services/rds-data.md
@@ -41,7 +41,7 @@ The deprecated `ExecuteSql` operation is recognized at `POST /ExecuteSql` and re
- `BatchExecuteStatement` runs the statement once per entry in `parameterSets` through a JDBC batch and returns one `updateResults` entry per set, each carrying the `generatedFields` that set produced under the same engine rules as `ExecuteStatement` — a set inserting several rows reports one field per generated key. On MySQL and MariaDB the sets are executed one at a time so each entry owns its own keys, because `getGeneratedKeys()` after a JDBC batch reports every key the batch generated with nothing tying a key back to the set that produced it. It accepts `transactionId`, so a batch can take part in a Data API transaction; without one the batch commits automatically. An absent or empty `parameterSets` runs nothing and returns an empty `updateResults`: AWS runs the statement once per parameter set provided and points a caller who wants a single parameterless execution at one empty set (`[[]]`, which runs once here) or at `ExecuteStatement`. A statement that returns rows rather than an update count — a `SELECT`, or a CTE ending in one — is rejected with `BadRequestException` before any set runs, because a batch reports one `UpdateResult` per set and has nowhere to carry a result set, and AWS documents the operation as taking a DML statement. The check reads the driver's description of the prepared statement, so nothing executes first, and a DML statement that also reports rows through a PostgreSQL `RETURNING` clause is left alone: the batch still performs its writes, and `generatedFields` is empty on PostgreSQL anyway.
- A PostgreSQL result set with a `point`, `box`, `circle`, `line`, `lseg`, `path`, `polygon`, `interval`, or `money` column is rejected with `UnsupportedResultException`, as on Aurora PostgreSQL. Cast the column to text to read it.
- SQL errors are returned as `DatabaseErrorException` so AWS SDK callers can handle database failures with normal AWS error decoding.
-- If `secretArn` points to a local Secrets Manager secret with JSON credentials (`username` or `user`, plus `password`), those credentials are used. If the secret is missing or cannot be parsed, Floci falls back to the resolved RDS resource's master credentials for local development convenience.
+- If `secretArn` points to a local Secrets Manager secret with JSON credentials (`username` or `user`, plus `password`), those credentials are used. A missing or unavailable secret returns `SecretsErrorException`; malformed or incomplete credentials return `InvalidSecretException`. Floci does not fall back to the resolved RDS resource's master credentials when a secret ARN was supplied.
- `formatRecordsAs=JSON`, `formattedRecords`, and `resultSetOptions` are not implemented yet, and `ExecuteStatement` requests asking for those result modes return `BadRequestException`. They are `ExecuteStatement`-only fields in the AWS API, so `BatchExecuteStatement` — whose input is limited to `resourceArn`, `secretArn`, `sql`, `database`, `schema`, `parameterSets`, and `transactionId` — ignores them as AWS does rather than rejecting them.
- RDS `HttpEndpointEnabled` control-plane gating is not modeled locally; availability is controlled by `FLOCI_SERVICES_RDS_DATA_ENABLED` and whether the target local RDS resource is running.
diff --git a/src/main/java/io/github/hectorvent/floci/services/rdsdata/RdsDataService.java b/src/main/java/io/github/hectorvent/floci/services/rdsdata/RdsDataService.java
index c671b75d94..2f1e09a7b1 100644
--- a/src/main/java/io/github/hectorvent/floci/services/rdsdata/RdsDataService.java
+++ b/src/main/java/io/github/hectorvent/floci/services/rdsdata/RdsDataService.java
@@ -506,16 +506,18 @@ public class RdsDataService implements Resettable {
private Credentials credentials(JsonNode request, RdsDataResourceResolver.DatabaseTarget target, String region) {
String secretArn = textOrNull(request, "secretArn");
if (secretArn != null && !secretArn.isBlank()) {
+ SecretVersion secret;
try {
- SecretVersion secret = secretsManagerService.getSecretValue(secretArn, null, null, region);
- Credentials fromSecret = parseSecretCredentials(secret.getSecretString());
- if (fromSecret != null) {
- return fromSecret;
- }
+ secret = secretsManagerService.getSecretValue(secretArn, null, null, region);
} catch (AwsException e) {
- LOG.debugv("Falling back to RDS master credentials for Data API secret {0}: {1}",
- secretArn, e.getMessage());
+ throw new AwsException("SecretsErrorException", e.getMessage(), 400);
+ }
+ Credentials fromSecret = parseSecretCredentials(secret.getSecretString());
+ if (fromSecret != null) {
+ return fromSecret;
}
+ throw new AwsException("InvalidSecretException",
+ "The secret must contain username and password fields.", 400);
}
String username = target.username() != null && !target.username().isBlank() ? target.username() : "root";
return new Credentials(username, target.password());
@@ -536,9 +538,11 @@ public class RdsDataService implements Resettable {
return new Credentials(username, password);
}
} catch (Exception e) {
- LOG.debugv("Could not parse RDS Data API secret credentials: {0}", e.getMessage());
+ throw new AwsException("InvalidSecretException",
+ "The secret must contain valid JSON credentials.", 400);
}
- return null;
+ throw new AwsException("InvalidSecretException",
+ "The secret must contain username and password fields.", 400);
}
private String databaseName(JsonNode request, RdsDataResourceResolver.DatabaseTarget target) {
diff --git a/src/test/java/io/github/hectorvent/floci/services/rdsdata/RdsDataServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/rdsdata/RdsDataServiceTest.java
index 13f5da9d42..b2798d1486 100644
--- a/src/test/java/io/github/hectorvent/floci/services/rdsdata/RdsDataServiceTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/rdsdata/RdsDataServiceTest.java
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import io.github.hectorvent.floci.core.common.AwsException;
import io.github.hectorvent.floci.services.rds.model.DatabaseEngine;
import io.github.hectorvent.floci.services.secretsmanager.SecretsManagerService;
+import io.github.hectorvent.floci.services.secretsmanager.model.SecretVersion;
import org.junit.jupiter.api.Test;
import java.lang.reflect.Proxy;
@@ -671,6 +672,46 @@ class RdsDataServiceTest {
harness.service.rollbackTransaction(harness.transactionRequest(tx), REGION);
}
+ @Test
+ void doesNotUseMasterCredentialsWhenSecretLookupFails() {
+ TestHarness harness = new TestHarness(missingSecrets());
+
+ AwsException error = assertThrows(AwsException.class,
+ () -> harness.service.executeStatement(harness.request("select 1"), REGION));
+
+ assertEquals("SecretsErrorException", error.getErrorCode());
+ }
+
+ @Test
+ void rejectsMalformedSecretInsteadOfUsingMasterCredentials() {
+ TestHarness harness = new TestHarness(secretWith("not-json"));
+
+ AwsException error = assertThrows(AwsException.class,
+ () -> harness.service.executeStatement(harness.request("select 1"), REGION));
+
+ assertEquals("InvalidSecretException", error.getErrorCode());
+ }
+
+ @Test
+ void rejectsEmptySecretInsteadOfUsingMasterCredentials() {
+ TestHarness harness = new TestHarness(secretWith(" "));
+
+ AwsException error = assertThrows(AwsException.class,
+ () -> harness.service.executeStatement(harness.request("select 1"), REGION));
+
+ assertEquals("InvalidSecretException", error.getErrorCode());
+ }
+
+ @Test
+ void rejectsSecretMissingCredentialsInsteadOfUsingMasterCredentials() {
+ TestHarness harness = new TestHarness(secretWith("{\"username\":\"sa\"}"));
+
+ AwsException error = assertThrows(AwsException.class,
+ () -> harness.service.executeStatement(harness.request("select 1"), REGION));
+
+ assertEquals("InvalidSecretException", error.getErrorCode());
+ }
+
@Test
void rejectsUnsupportedExecuteOptions() throws Exception {
TestHarness harness = new TestHarness();
@@ -735,7 +776,7 @@ class RdsDataServiceTest {
@Test
void closesConnectionWhenTransactionSetupFails() {
RdsDataResourceResolver resolver = mock(RdsDataResourceResolver.class);
- SecretsManagerService secrets = fallbackSecrets();
+ SecretsManagerService secrets = defaultSecrets();
RdsDataResourceResolver.DatabaseTarget target = target();
when(resolver.resolve(RESOURCE_ARN, REGION)).thenReturn(target);
AtomicBoolean closed = new AtomicBoolean(false);
@@ -806,7 +847,15 @@ class RdsDataServiceTest {
return param;
}
- private static SecretsManagerService fallbackSecrets() {
+ private static SecretsManagerService defaultSecrets() {
+ SecretsManagerService secrets = mock(SecretsManagerService.class);
+ SecretVersion version = new SecretVersion();
+ version.setSecretString("{\"username\":\"sa\",\"password\":\"\"}");
+ when(secrets.getSecretValue(any(), any(), any(), any())).thenReturn(version);
+ return secrets;
+ }
+
+ private static SecretsManagerService missingSecrets() {
SecretsManagerService secrets = mock(SecretsManagerService.class);
when(secrets.getSecretValue(any(), any(), any(), any()))
.thenThrow(new AwsException("ResourceNotFoundException",
@@ -814,6 +863,14 @@ class RdsDataServiceTest {
return secrets;
}
+ private static SecretsManagerService secretWith(String value) {
+ SecretsManagerService secrets = mock(SecretsManagerService.class);
+ SecretVersion version = new SecretVersion();
+ version.setSecretString(value);
+ when(secrets.getSecretValue(any(), any(), any(), any())).thenReturn(version);
+ return secrets;
+ }
+
private static RdsDataResourceResolver.DatabaseTarget target() {
return target(RESOURCE_ARN);
}
@@ -874,6 +931,10 @@ class RdsDataServiceTest {
this(DatabaseEngine.MYSQL, Duration.ofSeconds(60));
}
+ private TestHarness(SecretsManagerService secrets) {
+ this(secrets, DatabaseEngine.MYSQL, Duration.ofSeconds(60));
+ }
+
private TestHarness(DatabaseEngine engine) {
this(engine, Duration.ofSeconds(60));
}
@@ -883,10 +944,13 @@ class RdsDataServiceTest {
}
private TestHarness(DatabaseEngine engine, Duration transactionTtl) {
+ this(defaultSecrets(), engine, transactionTtl);
+ }
+
+ private TestHarness(SecretsManagerService secrets, DatabaseEngine engine, Duration transactionTtl) {
jdbcUrl = "jdbc:h2:mem:rdsdata_" + UUID.randomUUID() + ";MODE=" + h2Mode(engine)
+ ";DATABASE_TO_LOWER=TRUE;DB_CLOSE_DELAY=-1";
resolver = mock(RdsDataResourceResolver.class);
- SecretsManagerService secrets = fallbackSecrets();
target = target(RESOURCE_ARN, engine);
when(resolver.resolve(RESOURCE_ARN, REGION)).thenReturn(target);
when(resolver.resolve(FALLBACK_RESOURCE_ARN, REGION)).thenReturn(target);