diff --git a/ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/resource/GcpSecretManagerPasswordProvider.java b/ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/resource/GcpSecretManagerPasswordProvider.java index ef1d9d7d..20e5dd77 100644 --- a/ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/resource/GcpSecretManagerPasswordProvider.java +++ b/ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/resource/GcpSecretManagerPasswordProvider.java @@ -63,6 +63,11 @@ public GcpSecretManagerPasswordProvider() { public char[] getPassword(Map parameterValues) { ByteString secret = getSecret(parameterValues); String password = secret.toStringUtf8(); + + if (password == null || password.trim().isEmpty()) { + throw new IllegalArgumentException("Password secret content is blank."); + } + return password.toCharArray(); } diff --git a/ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/resource/GcpSecretManagerUsernameProvider.java b/ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/resource/GcpSecretManagerUsernameProvider.java index 01b08d24..41b5b16e 100644 --- a/ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/resource/GcpSecretManagerUsernameProvider.java +++ b/ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/resource/GcpSecretManagerUsernameProvider.java @@ -60,7 +60,12 @@ public GcpSecretManagerUsernameProvider() { @Override public String getUsername(Map parameterValues) { - return getSecret(parameterValues).toStringUtf8(); + String username = getSecret(parameterValues).toStringUtf8(); + + if (username == null || username.trim().isEmpty()) { + throw new IllegalArgumentException("Username secret content is blank"); + } + return username; } }