hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-07 10:04:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix jupyter/jupyterhub#520: exit if any errors parsing file; Also, fix abstraction use of getenv/os.environ (use one or the other, not both)

Browse Source
This commit is contained in:
robnagler
2016-04-18 15:35:31 +00:00
parent af1e253f8a
commit e02daf01ad
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
jupyterhub/app.py
View File

@@ -610,23 +610,27 @@ class JupyterHub(Application):
secret = self.cookie_secret
secret_from = 'config'
# load priority: 1. config, 2. env, 3. file
if not secret and os.environ.get(env_name):
secret_env = os.environ.get(env_name)
if not secret and secret_env:
secret_from = 'env'
self.log.info("Loading %s from env[%s]", trait_name, env_name)
secret = binascii.a2b_hex(os.environ[env_name])
secret = binascii.a2b_hex(secret_env)
if not secret and os.path.exists(secret_file):
secret_from = 'file'
perm = os.stat(secret_file).st_mode
if perm & 0o07:
self.log.error("Bad permissions on %s", secret_file)
else:
self.log.info("Loading %s from %s", trait_name, secret_file)
self.log.info("Loading %s from %s", trait_name, secret_file)
try:
perm = os.stat(secret_file).st_mode
assert not perm & 0o07, \
"cookie_secret_file can be read or written by anybody"
with open(secret_file) as f:
b64_secret = f.read()
try:
secret = binascii.a2b_base64(b64_secret)
except Exception as e:
self.log.error("%s does not contain b64 key: %s", secret_file, e)
secret = binascii.a2b_base64(b64_secret)
except Exception as e:
self.log.error(
'Refusing to run JuptyterHub with invalid cookie_secret_file.',
'%s error was: %s',
secret_file, e)
sys.exit(1)
if not secret:
secret_from = 'new'
self.log.debug("Generating new %s", trait_name)