Reuse channel for 407 Proxy Auth, close AsyncHttpClient#795

Author: Stephane Landelle

providers/netty3/src/main/java/org/asynchttpclient/providers/netty3/handler/HttpProtocol.java

@@ -254,13 +254,11 @@ private boolean exitAfterHandling401(//
                             .build();
                 }
 
-                Realm nr = newRealm;
-                final Request nextRequest = new RequestBuilder(future.getRequest()).setHeaders(request.getHeaders()).setRealm(nr).build();
+                final Request nextRequest = new RequestBuilder(future.getRequest()).setHeaders(request.getHeaders()).setRealm(newRealm).build();
 
                 logger.debug("Sending authentication to {}", request.getUri());
                 if (future.isKeepAlive()) {
                     if (HttpHeaders.isTransferEncodingChunked(response)) {
-                        // we must first drain the channel, let's use a fresh one for performing auth
                         Channels.setAttribute(channel, new Callback(future) {
                             public void call() throws IOException {
                                 requestSender.drainChannelAndExecuteNextRequest(channel, future, nextRequest);
@@ -295,8 +293,8 @@ private boolean exitAfterHandling100(final Channel channel, final NettyResponseF
     }
 
     private boolean exitAfterHandling407(//
-            Channel channel,//
-            NettyResponseFuture<?> future,//
+            final Channel channel,//
+            final NettyResponseFuture<?> future,//
             HttpResponse response,//
             Request request,//
             int statusCode,//
@@ -319,10 +317,12 @@ private boolean exitAfterHandling407(//
                 if (!proxyAuthHeaders.contains("Kerberos") && ntlmAuthenticate != null) {
                     newRealm = ntlmProxyChallenge(ntlmAuthenticate, request, proxyServer, requestHeaders, realm, future, true);
                     // SPNEGO KERBEROS
+
                 } else if (negociate) {
                     newRealm = kerberosChallenge(channel, proxyAuthHeaders, request, proxyServer, requestHeaders, realm, future, true);
                     if (newRealm == null)
                         return true;
+
                 } else {
                     newRealm = new Realm.RealmBuilder().clone(realm)//
                             .setScheme(realm.getAuthScheme())//
@@ -334,10 +334,24 @@ private boolean exitAfterHandling407(//
                             .build();
                 }
 
-                future.setReuseChannel(true);
-                future.setConnectAllowed(true);
-                Request nextRequest = new RequestBuilder(future.getRequest()).setHeaders(requestHeaders).setRealm(newRealm).build();
-                requestSender.sendNextRequest(nextRequest, future);
+                final Request nextRequest = new RequestBuilder(future.getRequest()).setHeaders(request.getHeaders()).setRealm(newRealm).build();
+
+                logger.debug("Sending authentication to {}", request.getUri());
+                if (future.isKeepAlive()) {
+                    future.setReuseChannel(true);
+                    if (HttpHeaders.isTransferEncodingChunked(response)) {
+                        Channels.setAttribute(channel, new Callback(future) {
+                            public void call() throws IOException {
+                                requestSender.drainChannelAndExecuteNextRequest(channel, future, nextRequest);
+                            }
+                        });
+                    } else {
+                        requestSender.sendNextRequest(nextRequest, future);
+                    }
+                } else {
+                    channelManager.closeChannel(channel);
+                    requestSender.sendNextRequest(nextRequest, future);
+                }
                 return true;
             }
         }

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/handler/HttpProtocol.java

@@ -239,6 +239,7 @@ private boolean exitAfterHandling401(//
                         return true;
 
                 } else {
+                    // BASIC or DIGEST
                     newRealm = new Realm.RealmBuilder()//
                             .clone(realm)//
                             .setScheme(realm.getAuthScheme())//
@@ -249,20 +250,18 @@ private boolean exitAfterHandling401(//
                             .build();
                 }
 
-                Realm nr = newRealm;
-                final Request nextRequest = new RequestBuilder(future.getRequest()).setHeaders(request.getHeaders()).setRealm(nr).build();
+                final Request nextRequest = new RequestBuilder(future.getRequest()).setHeaders(request.getHeaders()).setRealm(newRealm).build();
 
                 logger.debug("Sending authentication to {}", request.getUri());
                 if (future.isKeepAlive()) {
+                    future.setReuseChannel(true);
                     if (HttpHeaders.isTransferEncodingChunked(response)) {
-                        // we must first drain the channel, let's use a fresh one for performing auth
                         Channels.setAttribute(channel, new Callback(future) {
                             public void call() throws IOException {
                                 requestSender.drainChannelAndExecuteNextRequest(channel, future, nextRequest);
                             }
                         });
                     } else {
-                        future.setReuseChannel(true);
                         requestSender.sendNextRequest(nextRequest, future);
                     }
                 } else {
@@ -312,13 +311,17 @@ private boolean exitAfterHandling407(//
                 boolean negociate = proxyAuthHeaders.contains("Negotiate");
                 String ntlmAuthenticate = getNTLM(proxyAuthHeaders);
                 if (!proxyAuthHeaders.contains("Kerberos") && ntlmAuthenticate != null) {
+                    // NTLM
                     newRealm = ntlmProxyChallenge(ntlmAuthenticate, request, proxyServer, requestHeaders, realm, future, true);
-                    // SPNEGO KERBEROS
+
                 } else if (negociate) {
+                    // SPNEGO KERBEROS
                     newRealm = kerberosChallenge(channel, proxyAuthHeaders, request, proxyServer, requestHeaders, realm, future, true);
                     if (newRealm == null)
                         return true;
+
                 } else {
+                    // BASIC or DIGEST
                     newRealm = new Realm.RealmBuilder().clone(realm)//
                             .setScheme(realm.getAuthScheme())//
                             .setUri(request.getUri())//