Skip to content

add missing digestmod arg to HMAC #3399

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

Merged
takluyver merged 2 commits into from
Mar 7, 2018
Merged

add missing digestmod arg to HMAC #3399

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
934e480
add missing digestmod='sha256' in cookie_secret
minrk Mar 5, 2018
f16b073
python2 requires digestmod to be the module
minrk Mar 5, 2018
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
14 changes: 7 additions & 7 deletions notebook/notebookapp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import datetime
import errno
import gettext
import hashlib
import hmac
import importlib
import io
import json
Expand All @@ -27,7 +29,6 @@
import time
import warnings
import webbrowser
import hmac

try: #PY3
from base64 import encodebytes
Expand Down Expand Up @@ -687,27 +688,26 @@ def _valdate_ip(self, proposal):
@default('cookie_secret_file')
def _default_cookie_secret_file(self):
return os.path.join(self.runtime_dir, 'notebook_cookie_secret')

cookie_secret = Bytes(b'', config=True,
help="""The random bytes used to secure cookies.
By default this is a new random number every time you start the Notebook.
Set it to a value in a config file to enable logins to persist across server sessions.

Note: Cookie secrets should be kept private, do not share config files with
cookie_secret stored in plaintext (you can read the value from a file).
"""
)

@default('cookie_secret')
def _default_cookie_secret(self):
if os.path.exists(self.cookie_secret_file):
with io.open(self.cookie_secret_file, 'rb') as f:
key = f.read()
else:
key = encodebytes(os.urandom(1024))
key = encodebytes(os.urandom(32))
self._write_cookie_secret_file(key)
h = hmac.HMAC(key)
h.digest_size = len(key)
h = hmac.new(key, digestmod=hashlib.sha256)
h.update(self.password.encode())
return h.digest()

Expand Down