Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cookie_encode(digestmod=None) -> (digestmod=hashlib.sha256) #1302

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

cookie_encode(digestmod=None) -> (digestmod=hashlib.sha256) #1302

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions bottle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3069,24 +3069,22 @@ def _lscmp(a, b):
for x, y in zip(a, b)) and len(a) == len(b)


def cookie_encode(data, key, digestmod=None):
def cookie_encode(data, key, digestmod=hashlib.sha256):
""" Encode and sign a pickle-able object. Return a (byte) string """
depr(0, 13, "cookie_encode() will be removed soon.",
"Do not use this API directly.")
digestmod = digestmod or hashlib.sha256
msg = base64.b64encode(pickle.dumps(data, -1))
sig = base64.b64encode(hmac.new(tob(key), msg, digestmod=digestmod).digest())
return tob('!') + sig + tob('?') + msg


def cookie_decode(data, key, digestmod=None):
def cookie_decode(data, key, digestmod=hashlib.sha256):
""" Verify and decode an encoded string. Return an object or None."""
depr(0, 13, "cookie_decode() will be removed soon.",
"Do not use this API directly.")
data = tob(data)
if cookie_is_encoded(data):
sig, msg = data.split(tob('?'), 1)
digestmod = digestmod or hashlib.sha256
hashed = hmac.new(tob(key), msg, digestmod=digestmod).digest()
if _lscmp(sig[1:], base64.b64encode(hashed)):
return pickle.loads(base64.b64decode(msg))
Expand Down