systematicProxyAuthorizationHeader should honor Real when targeting a proxy, close AsyncHttpClient#803

Author: Stephane Landelle

providers/netty3/src/main/java/org/asynchttpclient/providers/netty3/request/NettyRequestFactory.java

@@ -176,12 +176,32 @@ public String firstRequestOnlyProxyAuthorizationHeader(Request request, ProxySer
         return proxyAuthorization;
     }
 
-    private String systematicProxyAuthorizationHeader(Request request, ProxyServer proxyServer, HttpMethod method) {
+    private String systematicProxyAuthorizationHeader(Request request, ProxyServer proxyServer, Realm realm, HttpMethod method) {
 
         String proxyAuthorization = null;
 
         if (method != HttpMethod.CONNECT && proxyServer != null && proxyServer.getPrincipal() != null && proxyServer.getScheme() == AuthScheme.BASIC) {
             proxyAuthorization = computeBasicAuthentication(proxyServer);
+
+        } else if (realm != null && realm.getUsePreemptiveAuth() && realm.isTargetProxy()) {
+
+            switch (realm.getScheme()) {
+            case BASIC:
+                proxyAuthorization = computeBasicAuthentication(realm);
+                break;
+            case DIGEST:
+                if (isNonEmpty(realm.getNonce()))
+                    proxyAuthorization = computeDigestAuthentication(realm);
+                break;
+            case NTLM:
+            case KERBEROS:
+            case SPNEGO:
+                // NTLM, KERBEROS and SPNEGO are only set on the first request, see firstRequestOnlyAuthorizationHeader
+            case NONE:
+                break;
+            default:
+                throw new IllegalStateException("Invalid Authentication " + realm);
+            }
         }
 
         return proxyAuthorization;
@@ -328,7 +348,7 @@ public NettyRequest newNettyRequest(Request request, Uri uri, boolean forceConne
         // don't override authorization but append
         addAuthorizationHeader(headers, systematicAuthorizationHeader(request, uri, realm));
 
-        setProxyAuthorizationHeader(headers, systematicProxyAuthorizationHeader(request, proxyServer, method));
+        setProxyAuthorizationHeader(headers, systematicProxyAuthorizationHeader(request, proxyServer, realm, method));
 
         // Add default accept headers
         if (!headers.contains(HttpHeaders.Names.ACCEPT))

providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/request/NettyRequestFactory.java

@@ -177,12 +177,31 @@ public String firstRequestOnlyProxyAuthorizationHeader(Request request, ProxySer
         return proxyAuthorization;
     }
 
-    private String systematicProxyAuthorizationHeader(Request request, ProxyServer proxyServer, HttpMethod method) {
+    private String systematicProxyAuthorizationHeader(Request request, ProxyServer proxyServer, Realm realm, HttpMethod method) {
 
         String proxyAuthorization = null;
 
         if (method != HttpMethod.CONNECT && proxyServer != null && proxyServer.getPrincipal() != null && proxyServer.getScheme() == AuthScheme.BASIC) {
             proxyAuthorization = computeBasicAuthentication(proxyServer);
+        } else if (realm != null && realm.getUsePreemptiveAuth() && realm.isTargetProxy()) {
+
+            switch (realm.getScheme()) {
+            case BASIC:
+                proxyAuthorization = computeBasicAuthentication(realm);
+                break;
+            case DIGEST:
+                if (isNonEmpty(realm.getNonce()))
+                    proxyAuthorization = computeDigestAuthentication(realm);
+                break;
+            case NTLM:
+            case KERBEROS:
+            case SPNEGO:
+                // NTLM, KERBEROS and SPNEGO are only set on the first request, see firstRequestOnlyAuthorizationHeader
+            case NONE:
+                break;
+            default:
+                throw new IllegalStateException("Invalid Authentication " + realm);
+            }
         }
 
         return proxyAuthorization;
@@ -329,7 +348,7 @@ public NettyRequest newNettyRequest(Request request, Uri uri, boolean forceConne
         // don't override authorization but append
         addAuthorizationHeader(headers, systematicAuthorizationHeader(request, uri, realm));
 
-        setProxyAuthorizationHeader(headers, systematicProxyAuthorizationHeader(request, proxyServer, method));
+        setProxyAuthorizationHeader(headers, systematicProxyAuthorizationHeader(request, proxyServer, realm, method));
 
         // Add default accept headers
         if (!headers.contains(HttpHeaders.Names.ACCEPT))