Reformat, improve cookie parsing robusness

Author: jfarcand

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

@@ -163,6 +163,6 @@ public RequestBuilder setFollowRedirects(boolean followRedirects) {
 
     @Override
     public RequestBuilder addOrReplaceCookie(Cookie c) {
-	return super.addOrReplaceCookie(c);		
+        return super.addOrReplaceCookie(c);
     }
 }

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

@@ -23,15 +23,9 @@
 import java.io.File;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
 
 /**
@@ -563,23 +557,24 @@ private boolean allowBody(String method) {
             return true;
         }
     }
-    
-      public T addOrReplaceCookie(Cookie cookie) {
-    	String cookieKey=cookie.getName();
-    	boolean replace=false;
-    	int index=0;
-    	for(Cookie c : request.cookies) {
-    		if(c.getName().equals(cookieKey)){
-    			replace=true;
-    			break;
-    		};
-    		index++;
-    	}
-    	if(replace) {
-    		((ArrayList<Cookie>)request.cookies).set(index, cookie);
-    	} else {
+
+    public T addOrReplaceCookie(Cookie cookie) {
+        String cookieKey = cookie.getName();
+        boolean replace = false;
+        int index = 0;
+        for (Cookie c : request.cookies) {
+            if (c.getName().equals(cookieKey)) {
+                replace = true;
+                break;
+            }
+
+            index++;
+        }
+        if (replace) {
+            ((ArrayList<Cookie>) request.cookies).set(index, cookie);
+        } else {
             request.cookies.add(cookie);
-    	}
+        }
         return derived.cast(this);
     }
 }

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

@@ -1162,11 +1162,12 @@ public Object call() throws Exception {
 
                             log.debug("Redirecting to {}", newUrl);
                             for(String cookieStr : future.getHttpResponse().getHeaders(HttpHeaders.Names.SET_COOKIE)){
-                                Cookie c=AsyncHttpProviderUtils.parseCookie(cookieStr);
+                                Cookie c = AsyncHttpProviderUtils.parseCookie(cookieStr);
                                 nBuilder.addOrReplaceCookie(c);
                             }
+
                             for(String cookieStr : future.getHttpResponse().getHeaders(HttpHeaders.Names.SET_COOKIE2)){
-                                Cookie c=AsyncHttpProviderUtils.parseCookie(cookieStr);
+                                Cookie c = AsyncHttpProviderUtils.parseCookie(cookieStr);
                                 nBuilder.addOrReplaceCookie(c);
                             }
 

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

@@ -415,7 +415,7 @@ public static Cookie parseCookie(String value) {
                     try {
                         maxAge = convertExpireField(f[1]);
                     }
-                    catch (ParseException e) {
+                    catch (Exception e) {
                         // original behavior, is this correct at all (expires field with max-age semantics)?
                         try {
                             maxAge = Integer.valueOf(f[1]);
@@ -440,20 +440,33 @@ public static Cookie parseCookie(String value) {
         return new Cookie(domain, cookieName, cookieValue, path, maxAge, secure);
     }
 
-    private static int convertExpireField(String timestring) throws ParseException {
-        ParseException exception = null;
+    private static int convertExpireField(String timestring) throws Exception {
+        Exception exception = null;
         for (SimpleDateFormat sdf : RFC2822_LIKE_DATE_FORMATS) {
             try {
-                long expire = sdf.parse(timestring).getTime();
+                long expire = sdf.parse(removeQuote(timestring.trim())).getTime();
                 return (int) (expire - System.currentTimeMillis()) / 1000;
             } catch (ParseException e) {
                 exception = e;
+            } catch (NumberFormatException e) {
+                exception = e;
             }
         }
 
         throw exception;
     }
 
+    private final static String removeQuote(String s) {
+        if (s.startsWith("\"")) {
+            s = s.substring(1);
+        }
+
+        if (s.endsWith("\"")) {
+            s = s.substring(0,s.length() -1);
+        }
+        return s;
+    }
+
     public static void checkBodyParts(int statusCode, Collection<HttpResponseBodyPart> bodyParts) {
         if (bodyParts == null || bodyParts.size() == 0) {
 

src/test/java/com/ning/http/client/async/netty/NettyFollowingThreadTest.java

@@ -22,4 +22,6 @@ public class NettyFollowingThreadTest extends FollowingThreadTest {
     public AsyncHttpClient getAsyncHttpClient(AsyncHttpClientConfig config) {
         return ProviderUtil.nettyProvider(config);
     }
+
 }
+