Make socks proxy work with https, fix AsyncHttpClient#1507

Motivation:

All requests to HTTPS URLs via a SOCKS proxy fail with ClosedChannelException due to SslHandler is added to the netty channel pipeline before Socks4ProxyHandler/Socks5ProxyHandler.

Modifications:

Make sure SslHandler is added into the channel pipeline after Socks4ProxyHandler/Socks5ProxyHandler.

Result:

Socks proxy works with HTTPS.

Author: user

client/src/main/java/org/asynchttpclient/netty/channel/ChannelManager.java

@@ -359,7 +359,7 @@ public void updatePipelineForHttpTunneling(ChannelPipeline pipeline, Uri request
     }
   }
 
-  public SslHandler addSslHandler(ChannelPipeline pipeline, Uri uri, String virtualHost) {
+  public SslHandler addSslHandler(ChannelPipeline pipeline, Uri uri, String virtualHost, boolean hasSocksProxyHandler) {
     String peerHost;
     int peerPort;
 
@@ -379,7 +379,10 @@ public SslHandler addSslHandler(ChannelPipeline pipeline, Uri uri, String virtua
     }
 
     SslHandler sslHandler = createSslHandler(peerHost, peerPort);
-    pipeline.addFirst(ChannelManager.SSL_HANDLER, sslHandler);
+    if (hasSocksProxyHandler)
+      pipeline.addAfter(ChannelManager.SOCKS_HANDLER, ChannelManager.SSL_HANDLER, sslHandler);
+    else
+      pipeline.addFirst(ChannelManager.SSL_HANDLER, sslHandler);
     return sslHandler;
   }
 

client/src/main/java/org/asynchttpclient/netty/channel/NettyConnectListener.java

@@ -112,7 +112,7 @@ public void onSuccess(Channel channel, InetSocketAddress remoteAddress) {
     if ((proxyServer == null || proxyServer.getProxyType().isSocks()) && uri.isSecured()) {
       SslHandler sslHandler;
       try {
-        sslHandler = channelManager.addSslHandler(channel.pipeline(), uri, request.getVirtualHost());
+        sslHandler = channelManager.addSslHandler(channel.pipeline(), uri, request.getVirtualHost(), proxyServer != null);
       } catch (Exception sslError) {
         onFailure(channel, sslError);
         return;