Better proxy auth

Stephane Landelle · Stephane Landelle · commit 683e24c86d7f · 2014-07-10T05:53:34.000+02:00
diff --git a/api/src/main/java/org/asynchttpclient/Realm.java b/api/src/main/java/org/asynchttpclient/Realm.java
@@ -53,14 +53,15 @@ public class Realm {
     private final Charset charset;
     private final boolean useAbsoluteURI;
     private final boolean omitQuery;
+    private final boolean targetProxy;
 
     public enum AuthScheme {
         DIGEST, BASIC, NTLM, SPNEGO, KERBEROS, NONE
     }
 
     private Realm(AuthScheme scheme, String principal, String password, String realmName, String nonce, String algorithm, String response,
             String qop, String nc, String cnonce, UriComponents uri, String method, boolean usePreemptiveAuth, String ntlmDomain, String enc,
-            String host, boolean messageType2Received, String opaque, boolean useAbsoluteURI, boolean omitQuery) {
+            String host, boolean messageType2Received, String opaque, boolean useAbsoluteURI, boolean omitQuery, boolean targetProxy) {
 
         this.principal = principal;
         this.password = password;
@@ -83,6 +84,7 @@ private Realm(AuthScheme scheme, String principal, String password, String realm
         this.charset = enc != null ? Charset.forName(enc) : null;
         this.useAbsoluteURI = useAbsoluteURI;
         this.omitQuery = omitQuery;
+        this.targetProxy = targetProxy;
     }
 
     public String getPrincipal() {
@@ -188,7 +190,11 @@ public boolean isUseAbsoluteURI() {
     public boolean isOmitQuery() {
         return omitQuery;
     }
-    
+
+    public boolean isTargetProxy() {
+        return targetProxy;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o)
@@ -271,20 +277,21 @@ public static class RealmBuilder {
         private String cnonce = "";
         private UriComponents uri;
         private String methodName = "GET";
-        private boolean usePreemptive = false;
-        private String domain = System.getProperty("http.auth.ntlm.domain", "");
+        private boolean usePreemptive;
+        private String ntlmDomain = System.getProperty("http.auth.ntlm.domain", "");
         private String enc = StandardCharsets.UTF_8.name();
         private String host = "localhost";
-        private boolean messageType2Received = false;
+        private boolean messageType2Received;
         private boolean useAbsoluteURI = true;
-        private boolean omitQuery = false;
+        private boolean omitQuery;
+        private boolean targetProxy;
 
         public String getNtlmDomain() {
-            return domain;
+            return ntlmDomain;
         }
 
-        public RealmBuilder setNtlmDomain(String domain) {
-            this.domain = domain;
+        public RealmBuilder setNtlmDomain(String ntlmDomain) {
+            this.ntlmDomain = ntlmDomain;
             return this;
         }
 
@@ -436,7 +443,16 @@ public RealmBuilder setOmitQuery(boolean omitQuery) {
             this.omitQuery = omitQuery;
             return this;
         }
-            
+
+        public boolean isTargetProxy() {
+            return targetProxy;
+        }
+        
+        public RealmBuilder setTargetProxy(boolean targetProxy) {
+            this.targetProxy = targetProxy;
+            return this;
+        }
+
         public RealmBuilder parseWWWAuthenticateHeader(String headerLine) {
             setRealmName(match(headerLine, "realm"));
             setNonce(match(headerLine, "nonce"));
@@ -464,6 +480,7 @@ public RealmBuilder parseProxyAuthenticateHeader(String headerLine) {
             } else {
                 setScheme(AuthScheme.BASIC);
             }
+            setTargetProxy(true);
             return this;
         }
 
@@ -484,6 +501,9 @@ public RealmBuilder clone(Realm clone) {
             setNtlmDomain(clone.getNtlmDomain());
             setNtlmHost(clone.getNtlmHost());
             setNtlmMessageType2Received(clone.isNtlmMessageType2Received());
+            setUseAbsoluteURI(clone.isUseAbsoluteURI());
+            setOmitQuery(clone.isOmitQuery());
+            setTargetProxy(clone.isTargetProxy());
             return this;
         }
 
@@ -511,8 +531,8 @@ private String match(String headerLine, String token) {
 
             // = to skip
             match += token.length() + 1;
-            int traillingComa = headerLine.indexOf(",", match);
-            String value = headerLine.substring(match, traillingComa > 0 ? traillingComa : headerLine.length());
+            int trailingComa = headerLine.indexOf(",", match);
+            String value = headerLine.substring(match, trailingComa > 0 ? trailingComa : headerLine.length());
             value = value.length() > 0 && value.charAt(value.length() - 1) == '"' ? value.substring(0, value.length() - 1) : value;
             return value.charAt(0) == '"' ? value.substring(1) : value;
         }
@@ -609,7 +629,7 @@ public Realm build() {
             }
 
             return new Realm(scheme, principal, password, realmName, nonce, algorithm, response, qop, nc, cnonce, uri, methodName,
-                    usePreemptive, domain, enc, host, messageType2Received, opaque, useAbsoluteURI, omitQuery);
+                    usePreemptive, ntlmDomain, enc, host, messageType2Received, opaque, useAbsoluteURI, omitQuery, targetProxy);
         }
     }
 }
diff --git a/api/src/main/java/org/asynchttpclient/uri/UriComponents.java b/api/src/main/java/org/asynchttpclient/uri/UriComponents.java
@@ -12,8 +12,6 @@
  */
 package org.asynchttpclient.uri;
 
-import static org.asynchttpclient.util.MiscUtils.isNonEmpty;
-
 import java.net.URI;
 import java.net.URISyntaxException;
 
@@ -121,15 +119,6 @@ public UriComponents withNewScheme(String newScheme) {
                 query);
     }
 
-    public UriComponents withNewPath(String newPath) {
-        return new UriComponents(scheme,//
-                userInfo,//
-                host,//
-                port,//
-                newPath,//
-                query);
-    }
-
     public UriComponents withNewQuery(String newQuery) {
         return new UriComponents(scheme,//
                 userInfo,//
diff --git a/api/src/main/java/org/asynchttpclient/util/AuthenticatorUtils.java b/api/src/main/java/org/asynchttpclient/util/AuthenticatorUtils.java
@@ -33,13 +33,17 @@ public static String computeBasicAuthentication(ProxyServer proxyServer) {
     }
 
     private static String computeRealmURI(Realm realm) {
-        UriComponents uri = realm.getUri();
-        boolean omitQuery = realm.isOmitQuery() && MiscUtils.isNonEmpty(uri.getQuery());
-        if (realm.isUseAbsoluteURI()) {
-            return omitQuery ? uri.withNewQuery(null).toUrl() : uri.toUrl();
+        if (realm.isTargetProxy()) {
+            return "/";
         } else {
-            String path = uri.getPath();
-            return omitQuery ? path : path + "?" + uri.getQuery();
+            UriComponents uri = realm.getUri();
+            boolean omitQuery = realm.isOmitQuery() && MiscUtils.isNonEmpty(uri.getQuery());
+            if (realm.isUseAbsoluteURI()) {
+                return omitQuery ? uri.withNewQuery(null).toUrl() : uri.toUrl();
+            } else {
+                String path = uri.getPath();
+                return omitQuery ? path : path + "?" + uri.getQuery();
+            }
         }
     }
 
diff --git a/providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/statushandler/ProxyAuthorizationHandler.java b/providers/grizzly/src/main/java/org/asynchttpclient/providers/grizzly/statushandler/ProxyAuthorizationHandler.java
@@ -60,7 +60,7 @@ public boolean handleStatus(final HttpResponsePacket responsePacket, final HttpT
                 .select(req.getURI());
         String principal = proxyServer.getPrincipal();
         String password = proxyServer.getPassword();
-        Realm realm = new Realm.RealmBuilder().setPrincipal(principal).setPassword(password).setUri(req.getURI().withNewPath("/")).setOmitQuery(true)
+        Realm realm = new Realm.RealmBuilder().setPrincipal(principal).setPassword(password).setUri(req.getURI()).setOmitQuery(true)
                 .setMethodName(Method.CONNECT.getMethodString()).setUsePreemptiveAuth(true).parseProxyAuthenticateHeader(proxyAuth).build();
         String proxyAuthLowerCase = proxyAuth.toLowerCase(Locale.ENGLISH);
         if (proxyAuthLowerCase.startsWith("basic")) {
diff --git a/providers/netty/src/main/java/org/asynchttpclient/providers/netty/handler/HttpProtocol.java b/providers/netty/src/main/java/org/asynchttpclient/providers/netty/handler/HttpProtocol.java
@@ -20,7 +20,6 @@
 import static io.netty.handler.codec.http.HttpResponseStatus.PROXY_AUTHENTICATION_REQUIRED;
 import static io.netty.handler.codec.http.HttpResponseStatus.UNAUTHORIZED;
 import static org.asynchttpclient.providers.netty.util.HttpUtil.isNTLM;
-import static org.asynchttpclient.util.AsyncHttpProviderUtils.getNonEmptyPath;
 import static org.asynchttpclient.util.MiscUtils.isNonEmpty;
 
 import org.asynchttpclient.AsyncHandler;
@@ -300,7 +299,7 @@ private boolean handleProxyAuthenticationRequiredAndExit(int statusCode,//
                 } else {
                     newRealm = new Realm.RealmBuilder().clone(realm)//
                             .setScheme(realm.getAuthScheme())//
-                            .setUri(request.getURI().withNewPath("/"))//
+                            .setUri(request.getURI())//
                             .setOmitQuery(true)//
                             .setMethodName(HttpMethod.CONNECT.name())//
                             .setUsePreemptiveAuth(true)//
