1 files changed, 80 insertions, 26 deletions

diff --git a/macaroonbakery/utils.py b/macaroonbakery/utils.py
index 3b5550b..43b0bf2 100644
--- a/macaroonbakery/utils.py
+++ b/macaroonbakery/utils.py
@@ -3,23 +3,39 @@
 import base64
 import json
 import webbrowser
+import six
+import six.moves.http_cookiejar as http_cookiejar
+from six.moves.urllib.parse import urlparse
 
 from pymacaroons import Macaroon
 from pymacaroons.serializers import json_serializer
 
 
-def deserialize(json_macaroon):
-    '''Deserialize a JSON macaroon into a macaroon object from pymacaroons.
+def to_bytes(s):
+    '''Return s as a bytes type, using utf-8 encoding if necessary.
+    @param s string or bytes
+    @return bytes
+    '''
+    if isinstance(s, six.binary_type):
+        return s
+    if isinstance(s, six.string_types):
+        return s.encode('utf-8')
+    raise TypeError('want string or bytes, got {}', type(s))
+
+
+def macaroon_from_dict(json_macaroon):
+    '''Return a pymacaroons.Macaroon object from the given
+    JSON-deserialized dict.
 
-    @param the JSON macaroon to deserialize as a dict.
+    @param JSON-encoded macaroon as dict
     @return the deserialized macaroon object.
     '''
     return Macaroon.deserialize(json.dumps(json_macaroon),
                                 json_serializer.JsonSerializer())
 
 
-def serialize_macaroon_string(macaroon):
-    '''Serialize macaroon object to string.
+def macaroon_to_json_string(macaroon):
+    '''Serialize macaroon object to a JSON-encoded string.
 
     @param macaroon object to be serialized.
     @return a string serialization form of the macaroon.
@@ -27,7 +43,7 @@ def serialize_macaroon_string(macaroon):
     return macaroon.serialize(json_serializer.JsonSerializer())
 
 
-def add_base64_padding(b):
+def _add_base64_padding(b):
     '''Add padding to base64 encoded bytes.
 
     pymacaroons does not give padded base64 bytes from serialization.
@@ -38,7 +54,7 @@ def add_base64_padding(b):
     return b + b'=' * (-len(b) % 4)
 
 
-def remove_base64_padding(b):
+def _remove_base64_padding(b):
     '''Remove padding from base64 encoded bytes.
 
     pymacaroons does not give padded base64 bytes from serialization.
@@ -46,39 +62,36 @@ def remove_base64_padding(b):
     @param bytes b to be padded.
     @return a padded bytes.
     '''
-
     return b.rstrip(b'=')
 
 
-def raw_b64decode(s):
-    '''Base64 decode with added padding with urlsafe or not.
+def b64decode(s):
+    '''Base64 decodes a base64-encoded string in URL-safe
+    or normal format, with or without padding.
+    The argument may be string or bytes.
 
-    @param s string decode
+    @param s bytes decode
     @return bytes decoded
     '''
+    # add padding if necessary.
+    s = to_bytes(s)
+    s = s + b'=' * (-len(s) % 4)
     if '_' or '-' in s:
-        return raw_urlsafe_b64decode(s)
+        return base64.urlsafe_b64decode(s)
     else:
-        return base64.b64decode(add_base64_padding(s))
-
-
-def raw_urlsafe_b64decode(s):
-    '''Base64 decode with added padding and convertion to bytes.
-
-    @param s string decode
-    @return bytes decoded
-    '''
-    return base64.urlsafe_b64decode(add_base64_padding(
-        s.encode('ascii')))
+        return base64.b64decode(s)
 
 
 def raw_urlsafe_b64encode(b):
-    '''Base64 encode with padding removed.
+    '''Base64 encode using URL-safe encoding with padding removed.
 
-    @param s string decode
+    @param b bytes to decode
     @return bytes decoded
     '''
-    return remove_base64_padding(base64.urlsafe_b64encode(b))
+    b = to_bytes(b)
+    b = base64.urlsafe_b64encode(b)
+    b = b.rstrip(b'=')  # strip padding
+    return b
 
 
 def visit_page_with_browser(visit_url):
@@ -87,3 +100,44 @@ def visit_page_with_browser(visit_url):
     @param visit_url: where to prove your identity.
     '''
     webbrowser.open(visit_url, new=1)
+    print('Opening an authorization web page in your browser.')
+    print('If it does not open, please open this URL:\n', visit_url, '\n')
+
+
+def cookie(
+        url,
+        name,
+        value,
+        expires=None):
+    '''Return a new Cookie using a slightly more
+    friendly API than that provided by six.moves.http_cookiejar
+    @param name The cookie name {str}
+    @param value The cookie value {str}
+    @param url The URL path of the cookie {str}
+    @param expires The expiry time of the cookie {datetime}
+    '''
+    u = urlparse(url)
+    domain = u.hostname or u.netloc
+    port = str(u.port) if u.port is not None else None
+    secure = u.scheme == 'https'
+    if expires is not None:
+        expires = expires.strftime("%s")
+    return http_cookiejar.Cookie(
+        version=0,
+        name=name,
+        value=value,
+        port=port,
+        port_specified=port is not None,
+        domain=domain,
+        domain_specified=True,
+        domain_initial_dot=False,
+        path=u.path,
+        path_specified=True,
+        secure=secure,
+        expires=expires,
+        discard=False,
+        comment=None,
+        comment_url=None,
+        rest=None,
+        rfc2109=False,
+    )