Merge pull request AsyncHttpClient#34 from haed/ahc-1.6.x

Ahc 1.6.x

Author: jfarcand

src/main/java/com/ning/http/client/Realm.java

@@ -37,6 +37,7 @@ public class Realm {
     private final String nonce;
     private final String algorithm;
     private final String response;
+    private final String opaque;
     private final String qop;
     private final String nc;
     private final String cnonce;
@@ -71,7 +72,8 @@ private Realm(AuthScheme scheme,
                   String uri,
                   String method,
                   boolean usePreemptiveAuth,
-                  String domain, String enc, String host, boolean messageType2Received) {
+                  String domain, String enc, String host, boolean messageType2Received,
+                  String opaque) {
 
         this.principal = principal;
         this.password = password;
@@ -80,6 +82,7 @@ private Realm(AuthScheme scheme,
         this.nonce = nonce;
         this.algorithm = algorithm;
         this.response = response;
+        this.opaque = opaque;
         this.qop = qop;
         this.nc = nc;
         this.cnonce = cnonce;
@@ -124,6 +127,10 @@ public String getAlgorithm() {
     public String getResponse() {
         return response;
     }
+    
+    public String getOpaque() {
+    	return opaque;
+    }
 
     public String getQop() {
         return qop;
@@ -261,6 +268,7 @@ public static class RealmBuilder {
         private String nonce = "";
         private String algorithm = "MD5";
         private String response = "";
+        private String opaque = "";
         private String qop = "auth";
         private String nc = "00000001";
         private String cnonce = "";
@@ -364,6 +372,15 @@ public RealmBuilder setResponse(String response) {
             this.response = response;
             return this;
         }
+        
+        public String getOpaque() {
+        	return this.opaque;
+        }
+        
+        public RealmBuilder setOpaque(String opaque) {
+        	this.opaque = opaque;
+        	return this;
+        }
 
         public String getQop() {
             return qop;
@@ -414,6 +431,7 @@ public RealmBuilder parseWWWAuthenticateHeader(String headerLine) {
             setRealmName(match(headerLine, "realm"));
             setNonce(match(headerLine, "nonce"));
             setAlgorithm(match(headerLine, "algorithm"));
+            setOpaque(match(headerLine, "opaque"));
             setQop(match(headerLine, "qop"));
             if (getNonce() != null && !getNonce().equalsIgnoreCase("")) {
                 setScheme(AuthScheme.DIGEST);
@@ -437,6 +455,7 @@ public RealmBuilder clone(Realm clone) {
             setPassword(clone.getPassword());
             setPrincipal(clone.getPrincipal());
             setEnconding(clone.getEncoding());
+            setOpaque(clone.getOpaque());
             setQop(clone.getQop());
             setScheme(clone.getScheme());
             setUri(clone.getUri());
@@ -580,7 +599,8 @@ public Realm build() {
                     domain,
                     enc,
                     host,
-                    messageType2Received);
+                    messageType2Received,
+                  	opaque);
         }
     }
 

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

@@ -1114,7 +1114,8 @@ public void messageReceived(final ChannelHandlerContext ctx, MessageEvent e) thr
                                 .build();
                     }
 
-                    final Realm nr = newRealm;
+                    final Realm nr = new Realm.RealmBuilder().clone(newRealm)
+                    		.setUri(request.getUrl()).build();
 
                     log.debug("Sending authentication to {}", request.getUrl());
                     AsyncCallable ac = new AsyncCallable(future) {

src/main/java/com/ning/http/util/AuthenticatorUtils.java

@@ -40,6 +40,8 @@ public static String computeDigestAuthentication(Realm realm) throws NoSuchAlgor
         builder.append("algorithm").append('=').append(realm.getAlgorithm()).append(", ");
 
         construct(builder, "response", realm.getResponse());
+        if (realm.getOpaque() != null && realm.getOpaque().isEmpty() == false)
+        	construct(builder, "opaque", realm.getOpaque());
         builder.append("qop").append('=').append(realm.getQop()).append(", ");
         builder.append("nc").append('=').append(realm.getNc()).append(", ");
         construct(builder, "cnonce", realm.getCnonce(), true);