Making Lemur py3 compatible

lemur/auth/permissions.py

@@ -1,5 +1,5 @@
 """
-.. module: permissions
+.. module: lemur.auth.permissions
     :platform: Unix
     :synopsis: This module defines all the permission used within Lemur
     :copyright: (c) 2015 by Netflix Inc., see AUTHORS for more
@@ -24,15 +24,15 @@ CertificateOwnerNeed = partial(CertificateOwner, 'certificateView')
 
 class ViewKeyPermission(Permission):
     def __init__(self, role_id, certificate_id):
-        c_need = CertificateCreatorNeed(unicode(certificate_id))
-        o_need = CertificateOwnerNeed(unicode(role_id))
+        c_need = CertificateCreatorNeed(str(certificate_id))
+        o_need = CertificateOwnerNeed(str(role_id))
         super(ViewKeyPermission, self).__init__(o_need, c_need, RoleNeed('admin'))
 
 
 class UpdateCertificatePermission(Permission):
     def __init__(self, role_id, certificate_id):
-        c_need = CertificateCreatorNeed(unicode(certificate_id))
-        o_need = CertificateOwnerNeed(unicode(role_id))
+        c_need = CertificateCreatorNeed(str(certificate_id))
+        o_need = CertificateOwnerNeed(str(role_id))
         super(UpdateCertificatePermission, self).__init__(o_need, c_need, RoleNeed('admin'))
 
 
@@ -42,7 +42,7 @@ ViewRoleCredentialsNeed = partial(RoleUser, 'roleView')
 
 class ViewRoleCredentialsPermission(Permission):
     def __init__(self, role_id):
-        need = ViewRoleCredentialsNeed(unicode(role_id))
+        need = ViewRoleCredentialsNeed(str(role_id))
         super(ViewRoleCredentialsPermission, self).__init__(need, RoleNeed('admin'))
 
 
@@ -55,8 +55,8 @@ AuthorityOwnerNeed = partial(AuthorityOwner, 'role')
 
 class AuthorityPermission(Permission):
     def __init__(self, authority_id, roles):
-        needs = [RoleNeed('admin'), AuthorityCreatorNeed(unicode(authority_id))]
+        needs = [RoleNeed('admin'), AuthorityCreatorNeed(str(authority_id))]
         for r in roles:
-            needs.append(AuthorityOwnerNeed(unicode(r)))
+            needs.append(AuthorityOwnerNeed(str(r)))
 
         super(AuthorityPermission, self).__init__(*needs)

lemur/auth/service.py

@@ -12,6 +12,8 @@ import jwt
 import json
 import base64
 import binascii
+from builtins import str
+
 from functools import wraps
 from datetime import datetime, timedelta
 
@@ -32,7 +34,7 @@ from lemur.auth.permissions import CertificateOwnerNeed, CertificateCreatorNeed,
 
 
 def base64url_decode(data):
-    if isinstance(data, unicode):
+    if isinstance(data, str):
         data = str(data)
 
     rem = len(data) % 4
@@ -139,7 +141,9 @@ def fetch_token_header(token):
 
     try:
         return json.loads(base64url_decode(header_segment))
-    except TypeError, binascii.Error:
+    except TypeError:
+        raise jwt.DecodeError('Invalid header padding')
+    except binascii.Error:
         raise jwt.DecodeError('Invalid header padding')
 
 
@@ -161,19 +165,19 @@ def on_identity_loaded(sender, identity):
     # identity with the roles that the user provides
     if hasattr(user, 'roles'):
         for role in user.roles:
-            identity.provides.add(CertificateOwnerNeed(unicode(role.id)))
-            identity.provides.add(ViewRoleCredentialsNeed(unicode(role.id)))
+            identity.provides.add(CertificateOwnerNeed(role.id))
+            identity.provides.add(ViewRoleCredentialsNeed(role.id))
             identity.provides.add(RoleNeed(role.name))
 
     # apply ownership for authorities
     if hasattr(user, 'authorities'):
         for authority in user.authorities:
-            identity.provides.add(AuthorityCreatorNeed(unicode(authority.id)))
+            identity.provides.add(AuthorityCreatorNeed(authority.id))
 
     # apply ownership of certificates
     if hasattr(user, 'certificates'):
         for certificate in user.certificates:
-            identity.provides.add(CertificateCreatorNeed(unicode(certificate.id)))
+            identity.provides.add(CertificateCreatorNeed(certificate.id))
 
     g.user = user