You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2016/04/01 11:15:21 UTC
svn commit: r1737327 - in /webservices/wss4j/branches/2_1_x-fixes:
policy/src/test/java/org/apache/wss4j/policy/tests/
ws-security-common/src/main/java/org/apache/wss4j/common/saml/
ws-security-common/src/test/java/org/apache/wss4j/common/crypto/ ws-se...
Author: coheigea
Date: Fri Apr 1 09:15:21 2016
New Revision: 1737327
URL: http://svn.apache.org/viewvc?rev=1737327&view=rev
Log:
Close some streams identified by static analysis
Modified:
webservices/wss4j/branches/2_1_x-fixes/policy/src/test/java/org/apache/wss4j/policy/tests/AbstractTestBase.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLBootstrap.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/AuthorityKeyIdentifierTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/SKITest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAKITest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java
webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLCallbackHandlerImpl.java
Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/test/java/org/apache/wss4j/policy/tests/AbstractTestBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/test/java/org/apache/wss4j/policy/tests/AbstractTestBase.java?rev=1737327&r1=1737326&r2=1737327&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/test/java/org/apache/wss4j/policy/tests/AbstractTestBase.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/test/java/org/apache/wss4j/policy/tests/AbstractTestBase.java Fri Apr 1 09:15:21 2016
@@ -57,16 +57,18 @@ public abstract class AbstractTestBase e
}
protected String loadPolicyFile(String classpathResource) throws Exception {
- BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(this.getClass().getClassLoader().getResourceAsStream(classpathResource), StandardCharsets.UTF_8));
- StringWriter writer = new StringWriter();
- char[] buf = new char[1024];
- int n;
- while ((n = bufferedReader.read(buf)) != -1) {
- writer.write(buf, 0, n);
+ try (InputStreamReader isReader = new InputStreamReader(this.getClass().getClassLoader().getResourceAsStream(classpathResource), StandardCharsets.UTF_8);
+ BufferedReader bufferedReader = new BufferedReader(isReader);
+ StringWriter writer = new StringWriter()) {
+ char[] buf = new char[1024];
+ int n;
+ while ((n = bufferedReader.read(buf)) != -1) {
+ writer.write(buf, 0, n);
+ }
+ writer.close();
+ bufferedReader.close();
+ return writer.toString();
}
- writer.close();
- bufferedReader.close();
- return writer.toString();
}
protected Policy loadPolicy(String policy) throws Exception {
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLBootstrap.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLBootstrap.java?rev=1737327&r1=1737326&r2=1737327&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLBootstrap.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLBootstrap.java Fri Apr 1 09:15:21 2016
@@ -19,6 +19,7 @@
package org.apache.wss4j.common.saml;
+import java.io.IOException;
import java.io.InputStream;
import org.opensaml.core.config.Configuration;
@@ -90,6 +91,11 @@ public final class OpenSAMLBootstrap {
}
if (ins != null) {
configurator.load(ins);
+ try {
+ ins.close();
+ } catch (IOException ex) { //NOPMD
+ // Do nothing
+ }
}
}
} finally {
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/AuthorityKeyIdentifierTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/AuthorityKeyIdentifierTest.java?rev=1737327&r1=1737326&r2=1737327&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/AuthorityKeyIdentifierTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/AuthorityKeyIdentifierTest.java Fri Apr 1 09:15:21 2016
@@ -102,6 +102,7 @@ public class AuthorityKeyIdentifierTest
ClassLoader loader = Loader.getClassLoader(AuthorityKeyIdentifierTest.class);
InputStream input = Merlin.loadInputStream(loader, path);
keyStore.load(input, password.toCharArray());
+ input.close();
return keyStore;
}
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/SKITest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/SKITest.java?rev=1737327&r1=1737326&r2=1737327&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/SKITest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-common/src/test/java/org/apache/wss4j/common/crypto/SKITest.java Fri Apr 1 09:15:21 2016
@@ -44,6 +44,7 @@ public class SKITest extends org.junit.A
ClassLoader loader = Loader.getClassLoader(SKITest.class);
InputStream input = Merlin.loadInputStream(loader, "keys/wss40_server.jks");
keyStore.load(input, "security".toCharArray());
+ input.close();
((Merlin)crypto).setKeyStore(keyStore);
CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS);
@@ -64,6 +65,7 @@ public class SKITest extends org.junit.A
ClassLoader loader = Loader.getClassLoader(SKITest.class);
InputStream input = Merlin.loadInputStream(loader, "keys/rsa2048.jks");
keyStore.load(input, "password".toCharArray());
+ input.close();
((Merlin)crypto).setKeyStore(keyStore);
CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS);
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoTest.java?rev=1737327&r1=1737326&r2=1737327&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoTest.java Fri Apr 1 09:15:21 2016
@@ -109,6 +109,7 @@ public class CryptoTest extends org.juni
ClassLoader loader = Loader.getClassLoader(CryptoTest.class);
InputStream input = Merlin.loadInputStream(loader, "keys/wss40.jks");
keyStore.load(input, "security".toCharArray());
+ input.close();
((Merlin)crypto).setKeyStore(keyStore);
Document signedDoc = builder.build(doc, crypto, secHeader);
@@ -117,6 +118,7 @@ public class CryptoTest extends org.juni
KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
input = Merlin.loadInputStream(loader, "keys/wss40CA.jks");
trustStore.load(input, "security".toCharArray());
+ input.close();
((Merlin)processCrypto).setTrustStore(trustStore);
WSSecurityEngine secEngine = new WSSecurityEngine();
@@ -127,6 +129,7 @@ public class CryptoTest extends org.juni
trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
input = Merlin.loadInputStream(loader, "keys/wss40badca.jks");
trustStore.load(input, "security".toCharArray());
+ input.close();
((Merlin)processCrypto).setTrustStore(trustStore);
try {
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAKITest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAKITest.java?rev=1737327&r1=1737326&r2=1737327&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAKITest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAKITest.java Fri Apr 1 09:15:21 2016
@@ -104,6 +104,7 @@ public class SignatureAKITest extends or
ClassLoader loader = Loader.getClassLoader(SignatureAKITest.class);
InputStream input = Merlin.loadInputStream(loader, "keys/wss40CADupl.jks");
keyStore.load(input, "security".toCharArray());
+ input.close();
caCrypto.setKeyStore(keyStore);
WSHandlerResult results = verify(signedDoc, caCrypto);
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java?rev=1737327&r1=1737326&r2=1737327&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java Fri Apr 1 09:15:21 2016
@@ -277,6 +277,7 @@ public class SignaturePartsTest extends
ClassLoader loader = Loader.getClassLoader(SignedSamlTokenHOKTest.class);
InputStream input = Merlin.loadInputStream(loader, "keys/wss40_server.jks");
keyStore.load(input, "security".toCharArray());
+ input.close();
((Merlin)issuerCrypto).setKeyStore(keyStore);
Crypto userCrypto = CryptoFactory.getInstance("wss40.properties");
@@ -322,6 +323,7 @@ public class SignaturePartsTest extends
KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
input = Merlin.loadInputStream(loader, "keys/wss40CA.jks");
trustStore.load(input, "security".toCharArray());
+ input.close();
((Merlin)trustCrypto).setTrustStore(trustStore);
WSHandlerResult results =
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java?rev=1737327&r1=1737326&r2=1737327&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java Fri Apr 1 09:15:21 2016
@@ -88,6 +88,7 @@ public class SamlNegativeTest extends or
ClassLoader loader = Loader.getClassLoader(SamlNegativeTest.class);
InputStream input = Merlin.loadInputStream(loader, "keys/wss40_server.jks");
keyStore.load(input, "security".toCharArray());
+ input.close();
((Merlin)issuerCrypto).setKeyStore(keyStore);
// Load the server truststore
@@ -95,6 +96,7 @@ public class SamlNegativeTest extends or
KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
input = Merlin.loadInputStream(loader, "keys/wss40CA.jks");
trustStore.load(input, "security".toCharArray());
+ input.close();
((Merlin)trustCrypto).setTrustStore(trustStore);
}
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java?rev=1737327&r1=1737326&r2=1737327&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java Fri Apr 1 09:15:21 2016
@@ -83,6 +83,7 @@ public class SamlReferenceTest extends o
ClassLoader loader = Loader.getClassLoader(SignedSamlTokenHOKTest.class);
InputStream input = Merlin.loadInputStream(loader, "keys/wss40_server.jks");
keyStore.load(input, "security".toCharArray());
+ input.close();
((Merlin)issuerCrypto).setKeyStore(keyStore);
// Load the server truststore
@@ -90,6 +91,7 @@ public class SamlReferenceTest extends o
KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
input = Merlin.loadInputStream(loader, "keys/wss40CA.jks");
trustStore.load(input, "security".toCharArray());
+ input.close();
((Merlin)trustCrypto).setTrustStore(trustStore);
}
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java?rev=1737327&r1=1737326&r2=1737327&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java Fri Apr 1 09:15:21 2016
@@ -81,6 +81,7 @@ public class SignedSamlTokenHOKTest exte
ClassLoader loader = Loader.getClassLoader(SignedSamlTokenHOKTest.class);
InputStream input = Merlin.loadInputStream(loader, "keys/wss40_server.jks");
keyStore.load(input, "security".toCharArray());
+ input.close();
((Merlin)issuerCrypto).setKeyStore(keyStore);
// Load the server truststore
@@ -88,6 +89,7 @@ public class SignedSamlTokenHOKTest exte
KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
input = Merlin.loadInputStream(loader, "keys/wss40CA.jks");
trustStore.load(input, "security".toCharArray());
+ input.close();
((Merlin)trustCrypto).setTrustStore(trustStore);
}
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java?rev=1737327&r1=1737326&r2=1737327&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/ext/AssertionSigningTest.java Fri Apr 1 09:15:21 2016
@@ -80,6 +80,7 @@ public class AssertionSigningTest extend
InputStream input = Merlin.loadInputStream(loader,
"keys/client_keystore.jks");
keyStore.load(input, "password".toCharArray());
+ input.close();
((Merlin) issuerCrypto).setKeyStore(keyStore);
dbf = DocumentBuilderFactory.newInstance();
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java?rev=1737327&r1=1737326&r2=1737327&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InboundWSSecurityContextImplTest.java Fri Apr 1 09:15:21 2016
@@ -18,6 +18,7 @@
*/
package org.apache.wss4j.stax.test;
+import java.io.InputStream;
import java.security.KeyStore;
import java.security.cert.Certificate;
import java.security.cert.X509Certificate;
@@ -723,7 +724,9 @@ public class InboundWSSecurityContextImp
private X509SecurityTokenImpl getX509Token(WSSecurityTokenConstants.TokenType tokenType) throws Exception {
final KeyStore keyStore = KeyStore.getInstance("jks");
- keyStore.load(this.getClass().getClassLoader().getResourceAsStream("transmitter.jks"), "default".toCharArray());
+ InputStream input = this.getClass().getClassLoader().getResourceAsStream("transmitter.jks");
+ keyStore.load(input, "default".toCharArray());
+ input.close();
X509SecurityTokenImpl x509SecurityToken =
new X509SecurityTokenImpl(tokenType, null, null, null, IDGenerator.generateID(null),
Modified: webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLCallbackHandlerImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLCallbackHandlerImpl.java?rev=1737327&r1=1737326&r2=1737327&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLCallbackHandlerImpl.java (original)
+++ webservices/wss4j/branches/2_1_x-fixes/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLCallbackHandlerImpl.java Fri Apr 1 09:15:21 2016
@@ -19,6 +19,7 @@
package org.apache.wss4j.stax.test.saml;
import java.io.IOException;
+import java.io.InputStream;
import java.security.KeyStore;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
@@ -85,7 +86,10 @@ public class SAMLCallbackHandlerImpl imp
try {
SAMLCallback samlCallback = (SAMLCallback) callbacks[0];
KeyStore keyStore = KeyStore.getInstance("jks");
- keyStore.load(this.getClass().getClassLoader().getResourceAsStream("saml/issuer.jks"), "default".toCharArray());
+ InputStream input = this.getClass().getClassLoader().getResourceAsStream("saml/issuer.jks");
+ keyStore.load(input, "default".toCharArray());
+ input.close();
+
Merlin crypto = new Merlin();
crypto.setKeyStore(keyStore);
samlCallback.setIssuerCrypto(crypto);