Skip to content
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

Add ability to load API key file from classpath via URI. #50

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add ability to load API key file from classpath via URI. #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11ba925
Add ability to load API key file from classpath via URI.
dpollastrini Oct 10, 2016
128210e
Fix CI error. Use method not support by target java sdk.
dpollastrini Oct 10, 2016
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
9 changes: 9 additions & 0 deletions java/src/main/java/com/cybersource/ws/client/MerchantConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package com.cybersource.ws.client;

import java.io.File;
import java.net.URI;
import java.text.MessageFormat;
import java.util.Properties;

Expand All @@ -38,6 +39,7 @@ public class MerchantConfig {
private final Properties props;

private final String merchantID;
private URI keyUri;
private String keysDirectory;
private String keyAlias;
private String keyPassword;
Expand Down Expand Up @@ -73,6 +75,10 @@ public String getMerchantID() {
return merchantID;
}

public URI getKeyUri() {
return keyUri;
}

public String getKeysDirectory() {
return keysDirectory;
}
Expand Down Expand Up @@ -231,6 +237,9 @@ public MerchantConfig(Properties _props, String _merchantID)
sendToProduction = getBooleanProperty(merchantID, "sendToProduction", false);
sendToAkamai = getBooleanProperty(merchantID, "sendToAkamai", false);
targetAPIVersion = getProperty(merchantID, "targetAPIVersion");
if (props.containsKey("keyFileUri")) {
keyUri = (URI) props.get("keyFileUri");
}
keyFilename = getProperty(merchantID, "keyFilename");
serverURL = getProperty(merchantID, "serverURL");
namespaceURI = getProperty(merchantID, "namespaceURI");
Expand Down
15 changes: 14 additions & 1 deletion java/src/main/java/com/cybersource/ws/client/SignedAndEncryptedMessageHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

import java.io.FileInputStream;
import java.io.IOException;
import java.net.URI;
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
Expand Down Expand Up @@ -96,7 +97,19 @@ private static void readAndStoreCertificateAndPrivateKey(
}

try {
merchantKeyStore.load(new FileInputStream(merchantConfig.getKeyFile()), merchantConfig.getKeyPassword().toCharArray());
URI keyUri = merchantConfig.getKeyUri();
if (keyUri != null) {
if ("classpath".equalsIgnoreCase(keyUri.getScheme())) {
merchantKeyStore.load(
SignedAndEncryptedMessageHandler.class.getResourceAsStream(keyUri.getPath()),
merchantConfig.getKeyPassword().toCharArray()
);
} else {
throw new IllegalArgumentException("Unsupported URI scheme for key file.");
}
} else {
merchantKeyStore.load(new FileInputStream(merchantConfig.getKeyFile()), merchantConfig.getKeyPassword().toCharArray());
}
} catch (IOException e) {
logger.log(Logger.LT_EXCEPTION, "Exception while loading KeyStore, '" + merchantConfig.getKeyFilename() + "'");
throw new SignException(e);
Expand Down