Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into elb-ssl-automation

This commit is contained in:
Jeremy Heffner 2015-08-21 14:29:03 -07:00
parent dbfd6b1e17 4b9a05198c
commit 3ff5cdf43f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lemur/auth/service.py
View File

@ -8,11 +8,12 @@
.. moduleauthor:: Kevin Glisson <kglisson@netflix.com>
"""
from __future__ import unicode_literals
from builtins import bytes
import jwt
import json
import base64
import binascii
from builtins import str
from functools import wraps
from datetime import datetime, timedelta
@ -34,19 +35,16 @@ from lemur.auth.permissions import CertificateCreatorNeed, \
def base64url_decode(data):
if isinstance(data, str):
data = str(data)
rem = len(data) % 4
if rem > 0:
data += b'=' * (4 - rem)
data += '=' * (4 - rem)
return base64.urlsafe_b64decode(data)
return base64.urlsafe_b64decode(bytes(data.encode('latin-1')))
def base64url_encode(data):
return base64.urlsafe_b64encode(data).replace(b'=', b'')
return base64.urlsafe_b64encode(data).replace('=', '')
def get_rsa_public_key(n, e):
@ -141,9 +139,11 @@ def fetch_token_header(token):
try:
return json.loads(base64url_decode(header_segment))
except TypeError:
except TypeError as e:
current_app.logger.exception(e)
raise jwt.DecodeError('Invalid header padding')
except binascii.Error:
except binascii.Error as e:
current_app.logger.exception(e)
raise jwt.DecodeError('Invalid header padding')