Skip to content

Commit a8a8bf4

Browse files
committed
Disable SSlv2ClientHello by default, close AsyncHttpClient#934
1 parent 5439d2e commit a8a8bf4

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

src/main/java/com/ning/http/client/AsyncHttpClientConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ public static class Builder {
506506
private int maxRequestRetry = defaultMaxRequestRetry();
507507
private boolean disableUrlEncodingForBoundedRequests = defaultDisableUrlEncodingForBoundRequests();
508508
private int ioThreadMultiplier = defaultIoThreadMultiplier();
509-
private String[] enabledProtocols;
509+
private String[] enabledProtocols = defaultEnabledProtocols();
510510
private String[] enabledCipherSuites;
511511
private Integer sslSessionCacheSize = defaultSslSessionCacheSize();
512512
private Integer sslSessionTimeout = defaultSslSessionTimeout();

src/main/java/com/ning/http/client/AsyncHttpClientConfigDefaults.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,16 @@ public static boolean defaultDisableUrlEncodingForBoundRequests() {
108108
public static boolean defaultAcceptAnyCertificate() {
109109
return getBoolean(ASYNC_CLIENT + "acceptAnyCertificate", false);
110110
}
111-
111+
112112
public static Integer defaultSslSessionCacheSize() {
113113
return Integer.getInteger(ASYNC_CLIENT + "sslSessionCacheSize");
114114
}
115115

116116
public static Integer defaultSslSessionTimeout() {
117117
return Integer.getInteger(ASYNC_CLIENT + "sslSessionTimeout");
118118
}
119+
120+
public static String[] defaultEnabledProtocols() {
121+
return new String[] { "TLSv1.2", "TLSv1.1", "TLSv1" };
122+
}
119123
}

src/main/java/com/ning/http/client/SSLEngineFactory.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
*/
1414
package com.ning.http.client;
1515

16+
import static com.ning.http.util.MiscUtils.isNonEmpty;
17+
1618
import com.ning.http.util.SslUtils;
1719

1820
import javax.net.ssl.SSLContext;
@@ -54,10 +56,10 @@ public SSLEngine newSSLEngine(String peerHost, int peerPort) throws GeneralSecur
5456
}
5557
sslEngine.setUseClientMode(true);
5658

57-
if (config.getEnabledProtocols() != null)
59+
if (isNonEmpty(config.getEnabledProtocols()))
5860
sslEngine.setEnabledProtocols(config.getEnabledProtocols());
5961

60-
if (config.getEnabledCipherSuites() != null)
62+
if (isNonEmpty(config.getEnabledCipherSuites()))
6163
sslEngine.setEnabledCipherSuites(config.getEnabledCipherSuites());
6264

6365
return sslEngine;

0 commit comments

Comments
 (0)