Author: coheigea
Date: Sun Sep 12 16:49:49 2010
New Revision: 996339
URL: http://svn.apache.org/viewvc?rev=996339&view=rev
Log:
[WSS-244] - Loading of Signature and Encryption property files not trimming
trailing whitespace
Modified:
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/components/crypto/AbstractCrypto.java
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/components/crypto/CryptoFactory.java
webservices/wss4j/branches/1_5_x-fixes/test/wssec/PackageTests.java
Modified:
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/components/crypto/AbstractCrypto.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/components/crypto/AbstractCrypto.java?rev=996339&r1=996338&r2=996339&view=diff
==============================================================================
---
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/components/crypto/AbstractCrypto.java
(original)
+++
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/components/crypto/AbstractCrypto.java
Sun Sep 12 16:49:49 2010
@@ -66,6 +66,9 @@ public abstract class AbstractCrypto ext
return;
}
String location =
this.properties.getProperty("org.apache.ws.security.crypto.merlin.file");
+ if (location != null) {
+ location = location.trim();
+ }
InputStream is = null;
if (location != null) {
java.net.URL url = Loader.getResource(loader, location);
@@ -98,16 +101,25 @@ public abstract class AbstractCrypto ext
try {
String provider =
properties.getProperty("org.apache.ws.security.crypto.merlin.keystore.provider");
+ if (provider != null) {
+ provider = provider.trim();
+ }
String passwd =
properties.getProperty(
"org.apache.ws.security.crypto.merlin.keystore.password",
"security"
);
+ if (passwd != null) {
+ passwd = passwd.trim();
+ }
String type =
properties.getProperty(
"org.apache.ws.security.crypto.merlin.keystore.type",
KeyStore.getDefaultType()
);
+ if (type != null) {
+ type = type.trim();
+ }
this.keystore = load(is, passwd, provider, type);
} finally {
if (is != null) {
@@ -123,6 +135,9 @@ public abstract class AbstractCrypto ext
"org.apache.ws.security.crypto.merlin.load.cacerts",
"true"
);
+ if (loadCacerts != null) {
+ loadCacerts = loadCacerts.trim();
+ }
if (Boolean.valueOf(loadCacerts).booleanValue()) {
String cacertsPath = System.getProperty("java.home") +
"/lib/security/cacerts";
InputStream cacertsIs = new FileInputStream(cacertsPath);
@@ -132,6 +147,9 @@ public abstract class AbstractCrypto ext
"org.apache.ws.security.crypto.merlin.cacerts.password",
"changeit"
);
+ if (cacertsPasswd != null) {
+ cacertsPasswd = cacertsPasswd.trim();
+ }
this.cacerts = load(cacertsIs, cacertsPasswd, null,
KeyStore.getDefaultType());
if (doDebug) {
log.debug("CA certs have been loaded");
@@ -192,7 +210,12 @@ public abstract class AbstractCrypto ext
if (properties == null) {
return null;
}
- return
properties.getProperty("org.apache.ws.security.crypto.merlin.cert.provider");
+ String provider =
+
properties.getProperty("org.apache.ws.security.crypto.merlin.cert.provider");
+ if (provider != null) {
+ provider = provider.trim();
+ }
+ return provider;
}
/**
@@ -208,6 +231,11 @@ public abstract class AbstractCrypto ext
if (properties == null) {
return null;
}
- return
properties.getProperty("org.apache.ws.security.crypto.merlin.keystore.alias");
+ String alias =
+
properties.getProperty("org.apache.ws.security.crypto.merlin.keystore.alias");
+ if (alias != null) {
+ alias = alias.trim();
+ }
+ return alias;
}
}
Modified:
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/components/crypto/CryptoFactory.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/components/crypto/CryptoFactory.java?rev=996339&r1=996338&r2=996339&view=diff
==============================================================================
---
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/components/crypto/CryptoFactory.java
(original)
+++
webservices/wss4j/branches/1_5_x-fixes/src/org/apache/ws/security/components/crypto/CryptoFactory.java
Sun Sep 12 16:49:49 2010
@@ -190,6 +190,10 @@ public abstract class CryptoFactory {
private static Crypto loadClass(String cryptoClassName, Map map,
ClassLoader loader) {
Class cryptogenClass = null;
Crypto crypto = null;
+
+ if (cryptoClassName != null) {
+ cryptoClassName = cryptoClassName.trim();
+ }
try {
// instruct the class loader to load the crypto implementation
cryptogenClass = Loader.loadClass(loader, cryptoClassName);
Modified: webservices/wss4j/branches/1_5_x-fixes/test/wssec/PackageTests.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_5_x-fixes/test/wssec/PackageTests.java?rev=996339&r1=996338&r2=996339&view=diff
==============================================================================
--- webservices/wss4j/branches/1_5_x-fixes/test/wssec/PackageTests.java
(original)
+++ webservices/wss4j/branches/1_5_x-fixes/test/wssec/PackageTests.java Sun Sep
12 16:49:49 2010
@@ -75,6 +75,7 @@ public class PackageTests extends TestCa
suite.addTestSuite(TestWSSecurityWSS194.class);
suite.addTestSuite(TestWSSecurityWSS199.class);
suite.addTestSuite(TestWSSecurityWSS234.class);
+ suite.addTestSuite(TestWSSecurityWSS245.class);
return suite;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: wss4j-dev-unsubscr...@ws.apache.org
For additional commands, e-mail: wss4j-dev-h...@ws.apache.org
