Skip to content

Centralize Base64 decoding in AWS and GCP providers #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 3, 2025
Merged

Centralize Base64 decoding in AWS and GCP providers #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions ...c/main/java/oracle/jdbc/provider/aws/resource/SecretsManagerConnectionStringProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import java.util.Map;

import static oracle.jdbc.provider.util.CommonParameters.TNS_ALIAS;
import static oracle.jdbc.provider.util.FileUtils.decodeIfBase64;
import static oracle.jdbc.provider.util.FileUtils.isBase64Encoded;

/**
Expand Down Expand Up @@ -103,10 +104,7 @@ public SecretsManagerConnectionStringProvider() {
@Override
public String getConnectionString(Map<Parameter, CharSequence> parameterValues) {
String alias = parseParameterValues(parameterValues).getRequired(TNS_ALIAS);
byte[] secretBytes = getSecret(parameterValues).getBytes();

byte[] fileBytes = isBase64Encoded(secretBytes)
? Base64.getDecoder().decode(secretBytes) : secretBytes;
byte[] fileBytes = decodeIfBase64(getSecret(parameterValues).getBytes());

try (InputStream inputStream = new ByteArrayInputStream(fileBytes)) {
TNSNames tnsNames = TNSNames.read(inputStream);
Expand Down
10 changes: 2 additions & 8 deletions ...main/java/oracle/jdbc/provider/gcp/resource/GcpSecretManagerConnectionStringProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,16 @@
package oracle.jdbc.provider.gcp.resource;

import oracle.jdbc.provider.resource.ResourceParameter;
import oracle.jdbc.provider.util.FileUtils;
import oracle.jdbc.provider.util.TNSNames;
import oracle.jdbc.spi.ConnectionStringProvider;

import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Base64;
import java.util.Map;

import static oracle.jdbc.provider.util.CommonParameters.TNS_ALIAS;
import static oracle.jdbc.provider.util.FileUtils.decodeIfBase64;


/**
Expand Down Expand Up @@ -103,12 +102,7 @@ public GcpSecretManagerConnectionStringProvider() {
*/
@Override
public String getConnectionString(Map<Parameter, CharSequence> parameterValues) {

byte[] fileBytes = getSecret(parameterValues).toByteArray();

if (FileUtils.isBase64Encoded(fileBytes)) {
fileBytes = Base64.getDecoder().decode(fileBytes);
}
byte[] fileBytes = decodeIfBase64(getSecret(parameterValues).toByteArray());

TNSNames tnsNames;
try (InputStream inputStream = new ByteArrayInputStream(fileBytes)) {
Expand Down
10 changes: 2 additions & 8 deletions ...der-gcp/src/main/java/oracle/jdbc/provider/gcp/resource/GcpSecretManagerSEPSProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,15 @@

import oracle.jdbc.provider.parameter.ParameterSet;
import oracle.jdbc.provider.resource.ResourceParameter;
import oracle.jdbc.provider.util.FileUtils;
import oracle.jdbc.provider.util.WalletUtils;
import oracle.jdbc.spi.PasswordProvider;
import oracle.jdbc.spi.UsernameProvider;

import java.util.Base64;
import java.util.Map;

import static oracle.jdbc.provider.util.CommonParameters.CONNECTION_STRING_INDEX;
import static oracle.jdbc.provider.util.CommonParameters.PASSWORD;
import static oracle.jdbc.provider.util.FileUtils.decodeIfBase64;

/**
* <p>
Expand Down Expand Up @@ -112,12 +111,7 @@ private WalletUtils.Credentials getWalletCredentials(
Map<Parameter, CharSequence> parameterValues) {

ParameterSet parameterSet = parseParameterValues(parameterValues);

byte[] walletBytes = getSecret(parameterValues).toByteArray();

if (FileUtils.isBase64Encoded(walletBytes)) {
walletBytes = Base64.getDecoder().decode(walletBytes);
}
byte[] walletBytes = decodeIfBase64(getSecret(parameterValues).toByteArray());

char[] walletPassword = parameterSet.getOptional(PASSWORD) != null
? parameterSet.getOptional(PASSWORD).toCharArray()
Expand Down
10 changes: 2 additions & 8 deletions ...der-gcp/src/main/java/oracle/jdbc/provider/gcp/resource/GcpSecretManagerTCPSProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,15 @@

import oracle.jdbc.provider.parameter.ParameterSet;
import oracle.jdbc.provider.resource.ResourceParameter;
import oracle.jdbc.provider.util.FileUtils;
import oracle.jdbc.provider.util.TlsUtils;
import oracle.jdbc.spi.TlsConfigurationProvider;

import javax.net.ssl.SSLContext;
import java.util.Base64;
import java.util.Map;

import static oracle.jdbc.provider.util.CommonParameters.PASSWORD;
import static oracle.jdbc.provider.util.CommonParameters.TYPE;
import static oracle.jdbc.provider.util.FileUtils.decodeIfBase64;

/**
* <p>
Expand Down Expand Up @@ -110,12 +109,7 @@ public GcpSecretManagerTCPSProvider() {
public SSLContext getSSLContext(Map<Parameter, CharSequence> parameterValues) {
try {
ParameterSet parameterSet = parseParameterValues(parameterValues);

byte[] fileBytes = getSecret(parameterValues).toByteArray();

if (FileUtils.isBase64Encoded(fileBytes)) {
fileBytes = Base64.getDecoder().decode(fileBytes);
}
byte[] fileBytes = decodeIfBase64(getSecret(parameterValues).toByteArray());

char[] password = parameterSet.getOptional(PASSWORD) != null
? parameterSet.getOptional(PASSWORD).toCharArray()
Expand Down