2 files changed, 76 insertions, 18 deletions
diff --git a/netlib/http/authentication.py b/netlib/http/authentication.py
index 38ea46d6..58fc9bdc 100644
--- a/netlib/http/authentication.py
+++ b/netlib/http/authentication.py
@@ -50,9 +50,9 @@ class NullProxyAuth(object):
         return {}
 
 
-class BasicProxyAuth(NullProxyAuth):
-    CHALLENGE_HEADER = 'Proxy-Authenticate'
-    AUTH_HEADER = 'Proxy-Authorization'
+class BasicAuth(NullProxyAuth):
+    CHALLENGE_HEADER = None
+    AUTH_HEADER = None
 
     def __init__(self, password_manager, realm):
         NullProxyAuth.__init__(self, password_manager)
@@ -80,6 +80,16 @@ class BasicProxyAuth(NullProxyAuth):
         return {self.CHALLENGE_HEADER: 'Basic realm="%s"' % self.realm}
 
 
+class BasicWebsiteAuth(BasicAuth):
+    CHALLENGE_HEADER = 'WWW-Authenticate'
+    AUTH_HEADER = 'Authorization'
+
+
+class BasicProxyAuth(BasicAuth):
+    CHALLENGE_HEADER = 'Proxy-Authenticate'
+    AUTH_HEADER = 'Proxy-Authorization'
+
+
 class PassMan(object):
 
     def test(self, username_, password_token_):
diff --git a/netlib/http/cookies.py b/netlib/http/cookies.py
index dd0af99c..1421d8eb 100644
--- a/netlib/http/cookies.py
+++ b/netlib/http/cookies.py
@@ -26,6 +26,12 @@ variants. Serialization follows RFC6265.
     http://tools.ietf.org/html/rfc2965
 """
 
+_cookie_params = set((
+    'expires', 'path', 'comment', 'max-age',
+    'secure', 'httponly', 'version',
+))
+
+
 # TODO: Disallow LHS-only Cookie values
 
 
@@ -263,27 +269,69 @@ def refresh_set_cookie_header(c, delta):
     return ret
 
 
-def is_expired(cookie_attrs):
+def get_expiration_ts(cookie_attrs):
     """
-        Determines whether a cookie has expired.
+        Determines the time when the cookie will be expired.
 
-        Returns: boolean
-    """
+        Considering both 'expires' and 'max-age' parameters.
 
-    # See if 'expires' time is in the past
-    expires = False
+        Returns: timestamp of when the cookie will expire.
+                 None, if no expiration time is set.
+    """
     if 'expires' in cookie_attrs:
         e = email.utils.parsedate_tz(cookie_attrs["expires"])
         if e:
-            exp_ts = email.utils.mktime_tz(e)
+            return email.utils.mktime_tz(e)
+
+    elif 'max-age' in cookie_attrs:
+        try:
+            max_age = int(cookie_attrs['Max-Age'])
+        except ValueError:
+            pass
+        else:
             now_ts = time.time()
-            expires = exp_ts < now_ts
+            return now_ts + max_age
+
+    return None
 
-    # or if Max-Age is 0
-    max_age = False
-    try:
-        max_age = int(cookie_attrs.get('Max-Age', 1)) == 0
-    except ValueError:
-        pass
 
-    return expires or max_age
+def is_expired(cookie_attrs):
+    """
+        Determines whether a cookie has expired.
+
+        Returns: boolean
+    """
+
+    exp_ts = get_expiration_ts(cookie_attrs)
+    now_ts = time.time()
+
+    # If no expiration information was provided with the cookie
+    if exp_ts is None:
+        return False
+    else:
+        return exp_ts <= now_ts
+
+
+def group_cookies(pairs):
+    """
+    Converts a list of pairs to a (name, value, attrs) for each cookie.
+    """
+
+    if not pairs:
+        return []
+
+    cookie_list = []
+
+    # First pair is always a new cookie
+    name, value = pairs[0]
+    attrs = []
+
+    for k, v in pairs[1:]:
+        if k.lower() in _cookie_params:
+            attrs.append((k, v))
+        else:
+            cookie_list.append((name, value, CookieAttrs(attrs)))
+            name, value, attrs = k, v, []
+
+    cookie_list.append((name, value, CookieAttrs(attrs)))
+    return cookie_list