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

fix 'Invalid cookie token' message when no cookie is set

Browse Source
This commit is contained in:
Min RK
2014-11-04 12:53:43 -08:00
parent 5f7c6f8f26
commit 75d2400b6c
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
jupyterhub/handlers/base.py
View File

@@ -88,18 +88,17 @@ class BaseHandler(RequestHandler):
if cookie_id is None: if cookie_id is None:
return return
cookie_id = cookie_id.decode('utf8', 'replace') cookie_id = cookie_id.decode('utf8', 'replace')
return self.db.query(orm.User).filter(orm.User.cookie_id==cookie_id).first() user = self.db.query(orm.User).filter(orm.User.cookie_id==cookie_id).first()
if user is None:
def get_current_user_cookie(self):
"""get_current_user from a cookie token"""
user = self._user_for_cookie(self.hub.server.cookie_name)
if user:
return user
else:
# don't log the token itself # don't log the token itself
self.log.warn("Invalid cookie token") self.log.warn("Invalid cookie token")
# have cookie, but it's not valid. Clear it and start over. # have cookie, but it's not valid. Clear it and start over.
self.clear_cookie(self.hub.server.cookie_name, path=self.hub.server.base_url) self.clear_cookie(self.hub.server.cookie_name, path=self.hub.server.base_url)
return user
def get_current_user_cookie(self):
"""get_current_user from a cookie token"""
return self._user_for_cookie(self.hub.server.cookie_name)
def get_current_user(self): def get_current_user(self):
"""get current username""" """get current username"""