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

get rid of single-user cookie_name

Browse Source 
it's unused now that single-user uses OAuth
This commit is contained in:
Min RK
2017-05-04 12:20:02 +02:00
parent 5e55753baa
commit 1069799ea7
3 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jupyterhub/handlers/base.py
View File

@@ -246,8 +246,6 @@ class BaseHandler(RequestHandler):
kwargs = {} kwargs = {}
if self.subdomain_host: if self.subdomain_host:
kwargs['domain'] = self.domain kwargs['domain'] = self.domain
if user and user.server:
self.clear_cookie(user.server.cookie_name, path=user.server.base_url, **kwargs)
self.clear_cookie(self.hub.cookie_name, path=self.hub.base_url, **kwargs) self.clear_cookie(self.hub.cookie_name, path=self.hub.base_url, **kwargs)
self.clear_cookie('jupyterhub-services', path=url_path_join(self.base_url, 'services')) self.clear_cookie('jupyterhub-services', path=url_path_join(self.base_url, 'services'))

6
jupyterhub/singleuser.py
View File

@@ -228,12 +228,6 @@ class SingleUserNotebookApp(NotebookApp):
value = value + '/' value = value + '/'
return value return value
@default('cookie_name')
def _cookie_name_default(self):
if os.environ.get('JUPYTERHUB_SERVICE_NAME'):
# if I'm a service, use the services cookie name
return 'jupyterhub-services'
@default('port') @default('port')
def _port_default(self): def _port_default(self):
if os.environ.get('JUPYTERHUB_SERVICE_URL'): if os.environ.get('JUPYTERHUB_SERVICE_URL'):

10
jupyterhub/user.py
View File

@@ -112,23 +112,20 @@ class User(HasTraits):
def spawner_class(self): def spawner_class(self):
return self.settings.get('spawner_class', LocalProcessSpawner) return self.settings.get('spawner_class', LocalProcessSpawner)
def __init__(self, orm_user, settings, **kwargs): def __init__(self, orm_user, settings=None, **kwargs):
self.orm_user = orm_user self.orm_user = orm_user
self.settings = settings self.settings = settings or {}
super().__init__(**kwargs) super().__init__(**kwargs)
self.allow_named_servers = self.settings.get('allow_named_servers', False) self.allow_named_servers = self.settings.get('allow_named_servers', False)
hub = self.settings['hub']
self.cookie_name = '%s-%s' % (hub.cookie_name, quote(self.name, safe=''))
self.base_url = url_path_join( self.base_url = url_path_join(
self.settings.get('base_url', '/'), 'user', self.escaped_name) self.settings.get('base_url', '/'), 'user', self.escaped_name)
self.spawner = self.spawner_class( self.spawner = self.spawner_class(
user=self, user=self,
db=self.db, db=self.db,
hub=hub, hub=self.settings.get('hub'),
authenticator=self.authenticator, authenticator=self.authenticator,
config=self.settings.get('config'), config=self.settings.get('config'),
) )
@@ -233,7 +230,6 @@ class User(HasTraits):
orm_server = orm.Server( orm_server = orm.Server(
name=server_name, name=server_name,
cookie_name=self.cookie_name,
base_url=base_url, base_url=base_url,
) )
self.servers.append(orm_server) self.servers.append(orm_server)