diff options
author | TilmanSchaefer <tilman.schaefer@fieldaware.com> | 2020-07-22 16:13:48 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-22 16:13:48 +0100 |
commit | 84ee50a0b62a1b3206b5894b397a1aa0bb12deb2 (patch) | |
tree | 3e244d7ce4d30deda28d7a0b05596b1631ceef5d | |
parent | e7cf572eea5ca433ee80528d4d86cddca77f5ffb (diff) | |
download | paste-git-84ee50a0b62a1b3206b5894b397a1aa0bb12deb2.tar.gz |
Patching auth ticket to be python3 compatible (#56)
* Patching auth ticket to be python3 compatible
-rw-r--r-- | paste/auth/auth_tkt.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/paste/auth/auth_tkt.py b/paste/auth/auth_tkt.py index 24fc2cb..5364b2c 100644 --- a/paste/auth/auth_tkt.py +++ b/paste/auth/auth_tkt.py @@ -168,22 +168,22 @@ def parse_ticket(secret, ticket, ip, digest_algo=DEFAULT_DIGEST): # correct specification of digest from hashlib or fail digest_algo = getattr(hashlib, digest_algo) digest_hexa_size = digest_algo().digest_size * 2 - ticket = ticket.strip('"') + ticket = ticket.strip(b'"') digest = ticket[:digest_hexa_size] try: timestamp = int(ticket[digest_hexa_size:digest_hexa_size + 8], 16) except ValueError as e: raise BadTicket('Timestamp is not a hex integer: %s' % e) try: - userid, data = ticket[digest_hexa_size + 8:].split('!', 1) + userid, data = ticket[digest_hexa_size + 8:].split(b'!', 1) except ValueError: raise BadTicket('userid is not followed by !') - userid = url_unquote(userid) - if '!' in data: - tokens, user_data = data.split('!', 1) + userid = url_unquote(userid.decode()) + if b'!' in data: + tokens, user_data = data.split(b'!', 1) else: # @@: Is this the right order? - tokens = '' + tokens = b'' user_data = data expected = calculate_digest(ip, timestamp, secret, @@ -194,7 +194,7 @@ def parse_ticket(secret, ticket, ip, digest_algo=DEFAULT_DIGEST): raise BadTicket('Digest signature is not correct', expected=(expected, digest)) - tokens = tokens.split(',') + tokens = tokens.split(b',') return (timestamp, userid, tokens, user_data) |