From 75d2400b6ca8b7fb748ccb50bb6a31bc90cbddf3 Mon Sep 17 00:00:00 2001 From: Min RK Date: Tue, 4 Nov 2014 12:53:43 -0800 Subject: [PATCH] fix 'Invalid cookie token' message when no cookie is set --- jupyterhub/handlers/base.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/jupyterhub/handlers/base.py b/jupyterhub/handlers/base.py index 8215563b..f0e6d87f 100644 --- a/jupyterhub/handlers/base.py +++ b/jupyterhub/handlers/base.py @@ -88,18 +88,17 @@ class BaseHandler(RequestHandler): if cookie_id is None: return cookie_id = cookie_id.decode('utf8', 'replace') - return self.db.query(orm.User).filter(orm.User.cookie_id==cookie_id).first() - - 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: + user = self.db.query(orm.User).filter(orm.User.cookie_id==cookie_id).first() + if user is None: # don't log the token itself self.log.warn("Invalid cookie token") # 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) + 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): """get current username"""