Merge remote-tracking branch 'origin/HEAD' into observability-provider

Author: fmeheust

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

@@ -107,6 +107,10 @@ public String getConnectionString(Map<Parameter, CharSequence> parameterValues)
       return connectionString;
     } catch (IOException e) {
       throw new IllegalStateException("Failed to read tnsnames.ora content", e);
+    } catch (StringIndexOutOfBoundsException | IllegalStateException parseException) {
+      throw new IllegalStateException(
+        "Invalid or corrupted tnsnames.ora content. Ensure the secret contains valid, complete tnsnames.ora data (base64-encoded or plain text).", parseException
+      );
     }
   }
 }

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

@@ -73,6 +73,10 @@ public ParameterStorePasswordProvider() {
    */
   @Override
   public char[] getPassword(Map<Parameter, CharSequence> parameterValues) {
-    return getSecret(parameterValues).toCharArray();
+    String password = getSecret(parameterValues);
+    if (password == null || password.trim().isEmpty()) {
+      throw new IllegalArgumentException("Password parameter content is blank.");
+    }
+    return password.toCharArray();
   }
 }

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

@@ -73,6 +73,10 @@ public ParameterStoreUsernameProvider() {
    */
   @Override
   public String getUsername(Map<Parameter, CharSequence> parameterValues) {
-    return getSecret(parameterValues);
+    String username = getSecret(parameterValues);
+    if (username == null || username.trim().isEmpty()) {
+      throw new IllegalArgumentException("Username parameter content is blank.");
+    }
+    return username;
   }
 }

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

@@ -113,6 +113,10 @@ public String getConnectionString(Map<Parameter, CharSequence> parameterValues)
       return connectionString;
     } catch (IOException e) {
       throw new IllegalStateException("Failed to read tnsnames.ora content", e);
+    } catch (StringIndexOutOfBoundsException | IllegalStateException parseException) {
+      throw new IllegalStateException(
+        "Invalid or corrupted tnsnames.ora content. Ensure the secret contains valid, complete tnsnames.ora data (base64-encoded or plain text).", parseException
+      );
     }
   }
 

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

@@ -72,6 +72,10 @@ public SecretsManagerPasswordProvider() {
    */
   @Override
   public char[] getPassword(Map<Parameter, CharSequence> parameterValues) {
-    return getSecret(parameterValues).toCharArray();
+    String password = getSecret(parameterValues);
+    if (password == null || password.trim().isEmpty()) {
+      throw new IllegalArgumentException("Password secret content is blank.");
+    }
+    return password.toCharArray();
   }
 }

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

@@ -72,6 +72,10 @@ public SecretsManagerUsernameProvider() {
    */
   @Override
   public String getUsername(Map<Parameter, CharSequence> parameterValues) {
-    return getSecret(parameterValues);
+    String username = getSecret(parameterValues);
+    if (username == null || username.trim().isEmpty()) {
+      throw new IllegalArgumentException("Username secret content is blank.");
+    }
+    return username;
   }
 }

ojdbc-provider-common/src/main/java/oracle/jdbc/provider/util/WalletUtils.java

@@ -194,7 +194,11 @@ public static Credentials getCredentials(
       wallet.setWalletArray(walletBytes, walletPassword);
     }
     catch (IOException ioException) {
-      throw new IllegalStateException("Failed to open wallet", ioException);
+      String message = "Failed to open wallet. The wallet content may be corrupted or incomplete.";
+      if (walletPassword != null) {
+        message += " If a walletPassword is required and was provided, it may be incorrect.";
+      }
+      throw new IllegalStateException(message, ioException);
     }
 
     try {

ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/resource/GcpSecretManagerPasswordProvider.java

@@ -63,6 +63,11 @@ public GcpSecretManagerPasswordProvider() {
   public char[] getPassword(Map<Parameter, CharSequence> 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();
   }
 

ojdbc-provider-gcp/src/main/java/oracle/jdbc/provider/gcp/resource/GcpSecretManagerUsernameProvider.java

@@ -60,7 +60,12 @@ public GcpSecretManagerUsernameProvider() {
 
   @Override
   public String getUsername(Map<Parameter, CharSequence> 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;
   }
 
 }

ojdbc-provider-oci/src/main/java/oracle/jdbc/provider/oci/resource/VaultConnectionStringProvider.java

@@ -119,7 +119,12 @@ public String getConnectionString(Map<Parameter, CharSequence> parameterValues)
     String secretValue = getVaultSecret(parameterValues)
                            .getBase64Secret();
 
-    byte[] fileBytes = Base64.getDecoder().decode(secretValue);
+    byte[] fileBytes;
+    try {
+      fileBytes = Base64.getDecoder().decode(secretValue);
+    } catch (IllegalArgumentException e) {
+      throw new IllegalStateException("Invalid base64 encoding in secret", e);
+    }
 
     TNSNames tnsNames;
     try (InputStream inputStream = new ByteArrayInputStream(fileBytes)) {