Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HTTPCLIENT-1119: SNI support (Oracle Java 1.7+ only). 

Contributed by Bruno Harbulot <bruno at distributedmatter.net>

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1544769 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2013-11-23 11:09:04 +00:00
parent 1cdbd4383a
commit 92b7e8cd97
3 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RELEASE_NOTES.txt
View File

@ -1,6 +1,9 @@
Changes since 4.3.1 Changes since 4.3.1
------------------- -------------------
* [HTTPCLIENT-1119] SNI support (Oracle Java 1.7+ only).
Contributed by Bruno Harbulot <bruno at distributedmatter.net>
* [HTTPCLIENT-1435] Fluent Executor ignores custom request properties. * [HTTPCLIENT-1435] Fluent Executor ignores custom request properties.
Contributed by Oleg Kalnichevski <olegk at apache.org> Contributed by Oleg Kalnichevski <olegk at apache.org>

23
httpclient/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java
View File

@ -34,6 +34,7 @@ import org.apache.http.protocol.HttpContext;
import org.apache.http.util.Args; import org.apache.http.util.Args;
import org.apache.http.util.TextUtils; import org.apache.http.util.TextUtils;
import javax.net.SocketFactory;
import javax.net.ssl.SSLContext; import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocket;
import java.io.IOException; import java.io.IOException;
@ -217,20 +218,8 @@ public class SSLConnectionSocketFactory implements LayeredConnectionSocketFactor
protected void prepareSocket(final SSLSocket socket) throws IOException { protected void prepareSocket(final SSLSocket socket) throws IOException {
} }
private void internalPrepareSocket(final SSLSocket socket) throws IOException {
if (supportedProtocols != null) {
socket.setEnabledProtocols(supportedProtocols);
}
if (supportedCipherSuites != null) {
socket.setEnabledCipherSuites(supportedCipherSuites);
}
prepareSocket(socket);
}
public Socket createSocket(final HttpContext context) throws IOException { public Socket createSocket(final HttpContext context) throws IOException {
final SSLSocket sock = (SSLSocket) this.socketfactory.createSocket(); return SocketFactory.getDefault().createSocket();
internalPrepareSocket(sock);
return sock;
} }
public Socket connectSocket( public Socket connectSocket(
@ -276,7 +265,13 @@ public class SSLConnectionSocketFactory implements LayeredConnectionSocketFactor
target, target,
port, port,
true); true);
internalPrepareSocket(sslsock); if (supportedProtocols != null) {
sslsock.setEnabledProtocols(supportedProtocols);
}
if (supportedCipherSuites != null) {
sslsock.setEnabledCipherSuites(supportedCipherSuites);
}
prepareSocket(sslsock);
sslsock.startHandshake(); sslsock.startHandshake();
verifyHostname(sslsock, target); verifyHostname(sslsock, target);
return sslsock; return sslsock;

32
httpclient/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java
View File

@ -126,10 +126,10 @@ public class TestSSLSocketFactory extends LocalServerTestBase {
final TestX509HostnameVerifier hostVerifier = new TestX509HostnameVerifier(); final TestX509HostnameVerifier hostVerifier = new TestX509HostnameVerifier();
final SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory( final SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(
clientSSLContext, hostVerifier); clientSSLContext, hostVerifier);
SSLSocket socket = (SSLSocket) socketFactory.createSocket(context); final Socket socket = socketFactory.createSocket(context);
final InetSocketAddress remoteAddress = this.localServer.getServiceAddress(); final InetSocketAddress remoteAddress = this.localServer.getServiceAddress();
socket = (SSLSocket) socketFactory.connectSocket(0, socket, host, remoteAddress, null, context); final SSLSocket sslSocket = (SSLSocket) socketFactory.connectSocket(0, socket, host, remoteAddress, null, context);
final SSLSession sslsession = socket.getSession(); final SSLSession sslsession = sslSocket.getSession();
Assert.assertNotNull(sslsession); Assert.assertNotNull(sslsession);
Assert.assertTrue(hostVerifier.isFired()); Assert.assertTrue(hostVerifier.isFired());
@ -156,10 +156,10 @@ public class TestSSLSocketFactory extends LocalServerTestBase {
final HttpContext context = new BasicHttpContext(); final HttpContext context = new BasicHttpContext();
final TestX509HostnameVerifier hostVerifier = new TestX509HostnameVerifier(); final TestX509HostnameVerifier hostVerifier = new TestX509HostnameVerifier();
final SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(clientSSLContext, hostVerifier); final SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(clientSSLContext, hostVerifier);
SSLSocket socket = (SSLSocket) socketFactory.createSocket(context); final Socket socket = socketFactory.createSocket(context);
final InetSocketAddress remoteAddress = this.localServer.getServiceAddress(); final InetSocketAddress remoteAddress = this.localServer.getServiceAddress();
socket = (SSLSocket) socketFactory.connectSocket(0, socket, host, remoteAddress, null, context); final SSLSocket sslSocket = (SSLSocket) socketFactory.connectSocket(0, socket, host, remoteAddress, null, context);
final SSLSession sslsession = socket.getSession(); final SSLSession sslsession = sslSocket.getSession();
Assert.assertNotNull(sslsession); Assert.assertNotNull(sslsession);
Assert.assertTrue(hostVerifier.isFired()); Assert.assertTrue(hostVerifier.isFired());
@ -185,10 +185,10 @@ public class TestSSLSocketFactory extends LocalServerTestBase {
final HttpContext context = new BasicHttpContext(); final HttpContext context = new BasicHttpContext();
final TestX509HostnameVerifier hostVerifier = new TestX509HostnameVerifier(); final TestX509HostnameVerifier hostVerifier = new TestX509HostnameVerifier();
final SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(clientSSLContext, hostVerifier); final SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(clientSSLContext, hostVerifier);
SSLSocket socket = (SSLSocket) socketFactory.createSocket(context); final Socket socket = socketFactory.createSocket(context);
final InetSocketAddress remoteAddress = this.localServer.getServiceAddress(); final InetSocketAddress remoteAddress = this.localServer.getServiceAddress();
socket = (SSLSocket) socketFactory.connectSocket(0, socket, host, remoteAddress, null, context); final SSLSocket sslSocket = (SSLSocket) socketFactory.connectSocket(0, socket, host, remoteAddress, null, context);
final SSLSession sslsession = socket.getSession(); final SSLSession sslsession = sslSocket.getSession();
Assert.assertNotNull(sslsession); Assert.assertNotNull(sslsession);
Assert.assertTrue(hostVerifier.isFired()); Assert.assertTrue(hostVerifier.isFired());
@ -227,10 +227,10 @@ public class TestSSLSocketFactory extends LocalServerTestBase {
final HttpContext context = new BasicHttpContext(); final HttpContext context = new BasicHttpContext();
final TestX509HostnameVerifier hostVerifier = new TestX509HostnameVerifier(); final TestX509HostnameVerifier hostVerifier = new TestX509HostnameVerifier();
final SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(clientSSLContext, hostVerifier); final SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(clientSSLContext, hostVerifier);
SSLSocket socket = (SSLSocket) socketFactory.createSocket(context); final Socket socket = socketFactory.createSocket(context);
final InetSocketAddress remoteAddress = this.localServer.getServiceAddress(); final InetSocketAddress remoteAddress = this.localServer.getServiceAddress();
socket = (SSLSocket) socketFactory.connectSocket(0, socket, host, remoteAddress, null, context); final SSLSocket sslSocket = (SSLSocket) socketFactory.connectSocket(0, socket, host, remoteAddress, null, context);
final SSLSession sslsession = socket.getSession(); final SSLSession sslsession = sslSocket.getSession();
Assert.assertNotNull(sslsession); Assert.assertNotNull(sslsession);
Assert.assertTrue(hostVerifier.isFired()); Assert.assertTrue(hostVerifier.isFired());
@ -243,10 +243,6 @@ public class TestSSLSocketFactory extends LocalServerTestBase {
.loadTrustMaterial(keystore) .loadTrustMaterial(keystore)
.loadKeyMaterial(keystore, "nopassword".toCharArray()) .loadKeyMaterial(keystore, "nopassword".toCharArray())
.build(); .build();
final SSLContext clientSSLContext = SSLContexts.custom()
.useProtocol("TLS")
.loadTrustMaterial(keystore)
.build();
this.localServer = new LocalTestServer(serverSSLContext); this.localServer = new LocalTestServer(serverSSLContext);
this.localServer.registerDefaultHandlers(); this.localServer.registerDefaultHandlers();
@ -260,7 +256,7 @@ public class TestSSLSocketFactory extends LocalServerTestBase {
final SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(defaultsslcontext, final SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(defaultsslcontext,
SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER); SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
final SSLSocket socket = (SSLSocket) socketFactory.createSocket(context); final Socket socket = socketFactory.createSocket(context);
final InetSocketAddress remoteAddress = this.localServer.getServiceAddress(); final InetSocketAddress remoteAddress = this.localServer.getServiceAddress();
socketFactory.connectSocket(0, socket, host, remoteAddress, null, context); socketFactory.connectSocket(0, socket, host, remoteAddress, null, context);
} }
@ -295,7 +291,7 @@ public class TestSSLSocketFactory extends LocalServerTestBase {
sslcontext, sslcontext,
SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER); SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
final SSLSocket socket = (SSLSocket) socketFactory.createSocket(context); final Socket socket = socketFactory.createSocket(context);
final InetSocketAddress remoteAddress = this.localServer.getServiceAddress(); final InetSocketAddress remoteAddress = this.localServer.getServiceAddress();
socketFactory.connectSocket(0, socket, host, remoteAddress, null, context); socketFactory.connectSocket(0, socket, host, remoteAddress, null, context);
} }