Merge pull request #47 from minrk/single-user-auth-failure

handle failure to check authorization
This commit is contained in:
Min RK
2014-09-21 15:17:17 -07:00

View File

@@ -44,8 +44,10 @@ def verify_token(self, token):
) )
if r.status_code == 404: if r.status_code == 404:
data = {'user' : ''} data = {'user' : ''}
elif r.status_code >= 400:
self.log.warn("Failed to check authorization: [%i] %s", r.status_code, r.reason)
data = None
else: else:
r.raise_for_status()
data = r.json() data = r.json()
token_cache[token] = data token_cache[token] = data
return data return data
@@ -123,8 +125,8 @@ class SingleUserNotebookApp(NotebookApp):
) )
s['token_cache'] = {} s['token_cache'] = {}
s['user'] = self.user s['user'] = self.user
s['hub_api_key'] = env.pop('JPY_API_TOKEN', '') s['hub_api_key'] = env['JPY_API_TOKEN']
s['cookie_secret'] = env.pop('JPY_COOKIE_SECRET', '') s['cookie_secret'] = env['JPY_COOKIE_SECRET']
s['cookie_name'] = self.cookie_name s['cookie_name'] = self.cookie_name
s['login_url'] = url_path_join(self.hub_prefix, 'login') s['login_url'] = url_path_join(self.hub_prefix, 'login')
s['hub_api_url'] = self.hub_api_url s['hub_api_url'] = self.hub_api_url