You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2013/05/03 20:34:50 UTC
svn commit: r1478903 - in /httpcomponents/httpclient/trunk: ./
httpclient/src/main/java/org/apache/http/conn/ssl/
httpclient/src/test/java/org/apache/http/conn/ssl/
httpclient/src/test/resources/
Author: olegk
Date: Fri May 3 18:34:49 2013
New Revision: 1478903
URL: http://svn.apache.org/r1478903
Log:
HTTPCLIENT-1349: SSLSocketFactory incorrectly identifies key passed with keystore as the keystore password
Contributed by David Graff <djgraff209 at gmail.com>
Added:
httpcomponents/httpclient/trunk/httpclient/src/test/resources/test-keypasswd.keystore
Modified:
httpcomponents/httpclient/trunk/RELEASE_NOTES.txt
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLContextBuilder.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java
Modified: httpcomponents/httpclient/trunk/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/RELEASE_NOTES.txt?rev=1478903&r1=1478902&r2=1478903&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/RELEASE_NOTES.txt (original)
+++ httpcomponents/httpclient/trunk/RELEASE_NOTES.txt Fri May 3 18:34:49 2013
@@ -1,6 +1,10 @@
Changes since release 4.3 BETA1
-------------------
+* [HTTPCLIENT-1349] SSLSocketFactory incorrectly identifies key passed with keystore as
+ the keystore password.
+ Contributed by David Graff <djgraff209 at gmail.com>
+
* [HTTPCLIENT-1346] Ensure propagation of SSL handshake exceptions.
Contributed by Pasi Eronen <pe at iki.fi>
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLContextBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLContextBuilder.java?rev=1478903&r1=1478902&r2=1478903&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLContextBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLContextBuilder.java Fri May 3 18:34:49 2013
@@ -113,11 +113,11 @@ public class SSLContextBuilder {
public SSLContextBuilder loadKeyMaterial(
final KeyStore keystore,
- final char[] keystorePassword)
+ final char[] keyPassword)
throws NoSuchAlgorithmException, KeyStoreException, UnrecoverableKeyException {
final KeyManagerFactory kmfactory = KeyManagerFactory.getInstance(
KeyManagerFactory.getDefaultAlgorithm());
- kmfactory.init(keystore, keystorePassword);
+ kmfactory.init(keystore, keyPassword);
this.keymanagers = kmfactory.getKeyManagers();
return this;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java?rev=1478903&r1=1478902&r2=1478903&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java Fri May 3 18:34:49 2013
@@ -158,14 +158,14 @@ public class SSLSocketFactory implements
public SSLSocketFactory(
final String algorithm,
final KeyStore keystore,
- final String keystorePassword,
+ final String keyPassword,
final KeyStore truststore,
final SecureRandom random,
final HostNameResolver nameResolver)
throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException {
this(SSLContexts.custom()
.useProtocol(algorithm)
- .loadKeyMaterial(keystore, keystorePassword != null ? keystorePassword.toCharArray() : null)
+ .loadKeyMaterial(keystore, keyPassword != null ? keyPassword.toCharArray() : null)
.loadTrustMaterial(truststore)
.build(),
nameResolver);
@@ -181,7 +181,7 @@ public class SSLSocketFactory implements
public SSLSocketFactory(
final String algorithm,
final KeyStore keystore,
- final String keystorePassword,
+ final String keyPassword,
final KeyStore truststore,
final SecureRandom random,
final TrustStrategy trustStrategy,
@@ -189,7 +189,7 @@ public class SSLSocketFactory implements
throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException {
this(SSLContexts.custom()
.useProtocol(algorithm)
- .loadKeyMaterial(keystore, keystorePassword != null ? keystorePassword.toCharArray() : null)
+ .loadKeyMaterial(keystore, keyPassword != null ? keyPassword.toCharArray() : null)
.loadTrustMaterial(truststore, trustStrategy)
.build(),
hostnameVerifier);
@@ -205,14 +205,14 @@ public class SSLSocketFactory implements
public SSLSocketFactory(
final String algorithm,
final KeyStore keystore,
- final String keystorePassword,
+ final String keyPassword,
final KeyStore truststore,
final SecureRandom random,
final X509HostnameVerifier hostnameVerifier)
throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException {
this(SSLContexts.custom()
.useProtocol(algorithm)
- .loadKeyMaterial(keystore, keystorePassword != null ? keystorePassword.toCharArray() : null)
+ .loadKeyMaterial(keystore, keyPassword != null ? keyPassword.toCharArray() : null)
.loadTrustMaterial(truststore)
.build(),
hostnameVerifier);
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java?rev=1478903&r1=1478902&r2=1478903&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java Fri May 3 18:34:49 2013
@@ -32,6 +32,7 @@ import java.net.InetSocketAddress;
import java.net.URL;
import java.security.KeyStore;
import java.security.NoSuchAlgorithmException;
+import java.security.UnrecoverableKeyException;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
@@ -195,4 +196,29 @@ public class TestSSLSocketFactory extend
socketFactory.connectSocket(0, socket, host, remoteAddress, null, context);
}
+ @Test
+ public void testKeyWithAlternatePassword() throws Exception {
+ String keystorePassword = "nopassword";
+ String keyPassword = "password";
+
+ ClassLoader cl = getClass().getClassLoader();
+ URL url = cl.getResource("test-keypasswd.keystore");
+ KeyStore keystore = KeyStore.getInstance("jks");
+ keystore.load(url.openStream(), keystorePassword.toCharArray());
+
+ new SSLSocketFactory(keystore, keyPassword, keystore);
+ }
+
+ @Test(expected=UnrecoverableKeyException.class)
+ public void testKeyWithAlternatePasswordInvalid() throws Exception {
+ String keystorePassword = "nopassword";
+ String keyPassword = "!password";
+
+ ClassLoader cl = getClass().getClassLoader();
+ URL url = cl.getResource("test-keypasswd.keystore");
+ KeyStore keystore = KeyStore.getInstance("jks");
+ keystore.load(url.openStream(), keystorePassword.toCharArray());
+
+ new SSLSocketFactory(keystore, keyPassword, keystore);
+ }
}
Added: httpcomponents/httpclient/trunk/httpclient/src/test/resources/test-keypasswd.keystore
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/resources/test-keypasswd.keystore?rev=1478903&view=auto
==============================================================================
Files httpcomponents/httpclient/trunk/httpclient/src/test/resources/test-keypasswd.keystore (added) and httpcomponents/httpclient/trunk/httpclient/src/test/resources/test-keypasswd.keystore Fri May 3 18:34:49 2013 differ