Handle invalid or corrupted tnsnames secrets

Author: MouhsinElmajdouby

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/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-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)) {