hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-12 20:43:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Certipy's trust graph to set up internal_ssl

Browse Source 
With changes to CHP requiring a second, different
authority, the complexity of managing trust within
JupyterHub has risen. To solve this, Certipy now
has a feature to specify what components should
trust what and builds trust bundles accordingly.
This commit is contained in:
Thomas Mendoza
2018-09-12 17:46:39 -07:00
parent ca33ccd66d
commit 67f19a65b7
8 changed files with 142 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jupyterhub/user.py
View File

@@ -221,9 +221,10 @@ class User:
if self.settings.get('internal_ssl'):
ssl_kwargs = dict(
internal_ssl=self.settings.get('internal_ssl'),
internal_certs_location=self.settings.get('internal_certs_location'),
internal_authority_name=self.settings.get('internal_authority_name'),
internal_notebook_authority_name=self.settings.get('internal_notebook_authority_name'),
internal_trust_bundles=self.settings.get(
'internal_trust_bundles'),
internal_certs_location=self.settings.get(
'internal_certs_location'),
)
spawn_kwargs.update(ssl_kwargs)
@@ -505,9 +506,9 @@ class User:
db.commit()
spawner._waiting_for_response = True
try:
key = self.settings['internal_ssl_key']
cert = self.settings['internal_ssl_cert']
ca = self.settings['internal_ssl_ca']
key = self.settings.get('internal_ssl_key')
cert = self.settings.get('internal_ssl_cert')
ca = self.settings.get('internal_ssl_ca')
ssl_context = make_ssl_context(key, cert, cafile=ca)
resp = await server.wait_up(
http=True,