Skip to content

Commit 4dbfd61

Browse files
Fix #219: throw on blank AWS username/password secrets (#231)
1 parent c705447 commit 4dbfd61

File tree

4 files changed

+20
-4
lines changed

4 files changed

+20
-4
lines changed

ojdbc-provider-aws/src/main/java/oracle/jdbc/provider/aws/resource/ParameterStorePasswordProvider.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ public ParameterStorePasswordProvider() {
7373
*/
7474
@Override
7575
public char[] getPassword(Map<Parameter, CharSequence> parameterValues) {
76-
return getSecret(parameterValues).toCharArray();
76+
String password = getSecret(parameterValues);
77+
if (password == null || password.trim().isEmpty()) {
78+
throw new IllegalArgumentException("Password parameter content is blank.");
79+
}
80+
return password.toCharArray();
7781
}
7882
}

ojdbc-provider-aws/src/main/java/oracle/jdbc/provider/aws/resource/ParameterStoreUsernameProvider.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ public ParameterStoreUsernameProvider() {
7373
*/
7474
@Override
7575
public String getUsername(Map<Parameter, CharSequence> parameterValues) {
76-
return getSecret(parameterValues);
76+
String username = getSecret(parameterValues);
77+
if (username == null || username.trim().isEmpty()) {
78+
throw new IllegalArgumentException("Username parameter content is blank.");
79+
}
80+
return username;
7781
}
7882
}

ojdbc-provider-aws/src/main/java/oracle/jdbc/provider/aws/resource/SecretsManagerPasswordProvider.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ public SecretsManagerPasswordProvider() {
7272
*/
7373
@Override
7474
public char[] getPassword(Map<Parameter, CharSequence> parameterValues) {
75-
return getSecret(parameterValues).toCharArray();
75+
String password = getSecret(parameterValues);
76+
if (password == null || password.trim().isEmpty()) {
77+
throw new IllegalArgumentException("Password secret content is blank.");
78+
}
79+
return password.toCharArray();
7680
}
7781
}

ojdbc-provider-aws/src/main/java/oracle/jdbc/provider/aws/resource/SecretsManagerUsernameProvider.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ public SecretsManagerUsernameProvider() {
7272
*/
7373
@Override
7474
public String getUsername(Map<Parameter, CharSequence> parameterValues) {
75-
return getSecret(parameterValues);
75+
String username = getSecret(parameterValues);
76+
if (username == null || username.trim().isEmpty()) {
77+
throw new IllegalArgumentException("Username secret content is blank.");
78+
}
79+
return username;
7680
}
7781
}

0 commit comments

Comments
 (0)