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

ensure user's own subdomain is in trusted alt names

Browse Source
This commit is contained in:
Min RK
2018-10-16 15:56:54 +02:00
parent e921354544
commit 15788bec67
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jupyterhub/spawner.py
View File

@@ -750,7 +750,8 @@ class Spawner(LoggingConfigurable):
""" """
from certipy import Certipy from certipy import Certipy
default_names = ["DNS:localhost", "IP:127.0.0.1"] default_names = ["DNS:localhost", "IP:127.0.0.1"]
alt_names = self.ssl_alt_names or [] alt_names = []
alt_names.extend(self.ssl_alt_names)
if self.ssl_alt_names_include_local: if self.ssl_alt_names_include_local:
alt_names = default_names + alt_names alt_names = default_names + alt_names

8
jupyterhub/user.py
View File

@@ -229,6 +229,12 @@ class User:
client_id = 'jupyterhub-user-%s' % quote(self.name) client_id = 'jupyterhub-user-%s' % quote(self.name)
if server_name: if server_name:
client_id = '%s-%s' % (client_id, quote(server_name)) client_id = '%s-%s' % (client_id, quote(server_name))
trusted_alt_names = []
trusted_alt_names.extend(self.settings.get('trusted_alt_names', []))
if self.settings.get('subdomain_host'):
trusted_alt_names.append('DNS:' + self.domain)
spawn_kwargs = dict( spawn_kwargs = dict(
user=self, user=self,
orm_spawner=orm_spawner, orm_spawner=orm_spawner,
@@ -239,7 +245,7 @@ class User:
db=self.db, db=self.db,
oauth_client_id=client_id, oauth_client_id=client_id,
cookie_options = self.settings.get('cookie_options', {}), cookie_options = self.settings.get('cookie_options', {}),
trusted_alt_names=self.settings.get('trusted_alt_names'), trusted_alt_names=trusted_alt_names,
) )
if self.settings.get('internal_ssl'): if self.settings.get('internal_ssl'):