Enable setting Netty SslHandler handshake timeout, close AsyncHttpClient#481

Author: Stephane Landelle

src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProvider.java

@@ -30,6 +30,7 @@
 import static com.ning.http.util.AsyncHttpProviderUtils.DEFAULT_CHARSET;
 import static com.ning.http.util.MiscUtil.isNonEmpty;
 import static org.jboss.netty.channel.Channels.pipeline;
+import static org.jboss.netty.handler.ssl.SslHandler.getDefaultBufferPool;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -97,6 +98,7 @@
 import org.jboss.netty.handler.codec.http.websocketx.WebSocket08FrameDecoder;
 import org.jboss.netty.handler.codec.http.websocketx.WebSocket08FrameEncoder;
 import org.jboss.netty.handler.codec.http.websocketx.WebSocketFrame;
+import org.jboss.netty.handler.ssl.ImmediateExecutor;
 import org.jboss.netty.handler.ssl.SslHandler;
 import org.jboss.netty.handler.stream.ChunkedFile;
 import org.jboss.netty.handler.stream.ChunkedWriteHandler;
@@ -129,7 +131,6 @@
 import com.ning.http.client.Request;
 import com.ning.http.client.RequestBuilder;
 import com.ning.http.client.Response;
-import com.ning.http.client.cookie.Cookie;
 import com.ning.http.client.cookie.CookieDecoder;
 import com.ning.http.client.cookie.CookieEncoder;
 import com.ning.http.client.filter.FilterContext;
@@ -215,6 +216,7 @@ public boolean remove(Object o) {
     private final Protocol webSocketProtocol = new WebSocketProtocol();
     private final boolean allowStopHashedWheelTimer;
     private final HashedWheelTimer hashedWheelTimer;
+    private final long handshakeTimeoutInMillis;
 
     private static boolean isNTLM(List<String> auth) {
         return isNonEmpty(auth) && auth.get(0).startsWith("NTLM");
@@ -262,6 +264,8 @@ public NettyAsyncHttpProvider(AsyncHttpClientConfig config) {
         hashedWheelTimer = allowStopHashedWheelTimer ? new HashedWheelTimer() : providerConfig.getHashedWheelTimer();
         hashedWheelTimer.start();
 
+        handshakeTimeoutInMillis = providerConfig.getHandshakeTimeoutInMillis();
+
         plainBootstrap = new ClientBootstrap(socketChannelFactory);
         secureBootstrap = new ClientBootstrap(socketChannelFactory);
         webSocketBootstrap = new ClientBootstrap(socketChannelFactory);
@@ -367,7 +371,10 @@ public ChannelPipeline getPipeline() throws Exception {
                 ChannelPipeline pipeline = pipeline();
 
                 try {
-                    pipeline.addLast(SSL_HANDLER, new SslHandler(createSSLEngine()));
+                    SSLEngine sslEngine = createSSLEngine();
+                    SslHandler sslHandler = handshakeTimeoutInMillis > 0 ? new SslHandler(sslEngine, getDefaultBufferPool(), false, ImmediateExecutor.INSTANCE, hashedWheelTimer,
+                            handshakeTimeoutInMillis) : new SslHandler(sslEngine);
+                    pipeline.addLast(SSL_HANDLER, sslHandler);
                 } catch (Throwable ex) {
                     abort(cl.future(), ex);
                 }
@@ -1060,8 +1067,8 @@ private <T> ListenableFuture<T> doConnect(final Request request, final AsyncHand
         }
 
         ChannelFuture channelFuture;
-        ClientBootstrap bootstrap = (request.getUrl().startsWith(WEBSOCKET) && !useProxy) ?
-                (useSSl ? secureWebSocketBootstrap : webSocketBootstrap) : (useSSl ? secureBootstrap : plainBootstrap);
+        ClientBootstrap bootstrap = (request.getUrl().startsWith(WEBSOCKET) && !useProxy) ? (useSSl ? secureWebSocketBootstrap : webSocketBootstrap) : (useSSl ? secureBootstrap
+                : plainBootstrap);
         bootstrap.setOption("connectTimeoutMillis", config.getConnectionTimeoutInMs());
 
         // Do no enable this with win.

src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProviderConfig.java

@@ -86,6 +86,8 @@ public class NettyAsyncHttpProviderConfig implements AsyncHttpProviderConfig<Str
     private boolean disableZeroCopy;
 
     private HashedWheelTimer hashedWheelTimer;
+    
+    private long handshakeTimeoutInMillis;
 
     public NettyAsyncHttpProviderConfig() {
         properties.put(REUSE_ADDRESS, "false");
@@ -163,4 +165,12 @@ public HashedWheelTimer getHashedWheelTimer() {
     public void setHashedWheelTimer(HashedWheelTimer hashedWheelTimer) {
         this.hashedWheelTimer = hashedWheelTimer;
     }
+
+    public long getHandshakeTimeoutInMillis() {
+        return handshakeTimeoutInMillis;
+    }
+
+    public void setHandshakeTimeoutInMillis(long handshakeTimeoutInMillis) {
+        this.handshakeTimeoutInMillis = handshakeTimeoutInMillis;
+    }
 }