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

Merge pull request #1850 from minrk/connect_url

Browse Source 
Use URLs for config
This commit is contained in:
Carol Willing
2018-05-05 01:30:35 +02:00
committed by GitHub
parent 580e840165 fdbb1dad79
commit 10ea92dcea
5 changed files with 188 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

170
jupyterhub/app.py
View File

@@ -17,11 +17,13 @@ import re
import signal
import sys
from textwrap import dedent
from urllib.parse import urlparse
from urllib.parse import unquote, urlparse, urlunparse
if sys.version_info[:2] < (3, 3):
raise ValueError("Python < 3.3 not supported: %s" % sys.version)
from dateutil.parser import parse as parse_date
from jinja2 import Environment, FileSystemLoader, PrefixLoader, ChoiceLoader
from sqlalchemy.exc import OperationalError
@@ -33,6 +35,7 @@ from tornado.log import app_log, access_log, gen_log
import tornado.options
from tornado import gen, web
from tornado.platform.asyncio import AsyncIOMainLoop
from tornado.netutil import bind_unix_socket
from traitlets import (
Unicode, Integer, Dict, TraitError, List, Bool, Any,
@@ -84,6 +87,7 @@ aliases = {
'y': 'JupyterHub.answer_yes',
'ssl-key': 'JupyterHub.ssl_key',
'ssl-cert': 'JupyterHub.ssl_cert',
'url': 'JupyterHub.bind_url',
'ip': 'JupyterHub.ip',
'port': 'JupyterHub.port',
'pid-file': 'JupyterHub.pid_file',
@@ -304,9 +308,64 @@ class JupyterHub(Application):
This is the address on which the proxy will listen. The default is to
listen on all interfaces. This is the only address through which JupyterHub
should be accessed by users. """
should be accessed by users.
.. deprecated: 0.9
"""
).tag(config=True)
port = Integer(8000,
help="""The public facing port of the proxy.
This is the port on which the proxy will listen.
This is the only port through which JupyterHub
should be accessed by users.
.. deprecated: 0.9
Use JupyterHub.bind_url
"""
).tag(config=True)
@observe('ip', 'port')
def _ip_port_changed(self, change):
urlinfo = urlparse(self.bind_url)
urlinfo = urlinfo._replace(netloc='%s:%i' % (self.ip, self.port))
self.bind_url = urlunparse(urlinfo)
bind_url = Unicode(
"http://127.0.0.1:8000",
help="""The public facing URL of the whole JupyterHub application.
This is the address on which the proxy will bind.
Sets protocol, ip, base_url
.. deprecated: 0.9
Use JupyterHub.bind_url
"""
).tag(config=True)
@observe('bind_url')
def _bind_url_changed(self, change):
urlinfo = urlparse(change.new)
self.base_url = urlinfo.path
base_url = URLPrefix('/',
help="""The base URL of the entire application.
Add this to the beginning of all JupyterHub URLs.
Use base_url to run JupyterHub within an existing website.
.. deprecated: 0.9
Use JupyterHub.bind_url
"""
).tag(config=True)
@default('base_url')
def _default_base_url(self):
# call validate to ensure leading/trailing slashes
print(self.bind_url)
return JupyterHub.base_url.validate(self, urlparse(self.bind_url).path)
subdomain_host = Unicode('',
help="""Run single-user servers on subdomains of this host.
@@ -338,21 +397,6 @@ class JupyterHub(Application):
return ''
return urlparse(self.subdomain_host).hostname
port = Integer(8000,
help="""The public facing port of the proxy.
This is the port on which the proxy will listen.
This is the only port through which JupyterHub
should be accessed by users.
"""
).tag(config=True)
base_url = URLPrefix('/',
help="""The base URL of the entire application.
Add this to the begining of all JupyterHub URLs.
Use base_url to run JupyterHub within an existing website.
"""
).tag(config=True)
logo_file = Unicode('',
help="Specify path to a logo image to override the Jupyter logo in the banner."
).tag(config=True)
@@ -440,14 +484,49 @@ class JupyterHub(Application):
"""
).tag(config=True)
hub_connect_url = Unicode(
help="""
The URL for connecting to the Hub.
Spawners, services, and the proxy will use this URL
to talk to the Hub.
Only needs to be specified if the default hub URL is not
connectable (e.g. using a unix+http:// bind url).
.. seealso::
JupyterHub.hub_connect_ip
JupyterHub.hub_bind_url
.. versionadded:: 0.9
"""
)
hub_bind_url = Unicode(
help="""
The URL on which the Hub will listen.
This is a private URL for internal communication.
Typically set in combination with hub_connect_url.
If a unix socket, hub_connect_url **must** also be set.
For example:
"http://127.0.0.1:8081"
"unix+http://%2Fsrv%2Fjupyterhub%2Fjupyterhub.sock"
.. versionadded:: 0.9
""",
config=True,
)
hub_connect_port = Integer(
0,
help="""
The port for proxies & spawners to connect to the hub on.
DEPRECATED
Used alongside `hub_connect_ip` and only when different from hub_port.
Use hub_connect_url
.. versionadded:: 0.8
.. deprecated:: 0.9
Use hub_connect_url
"""
).tag(config=True)
@@ -842,10 +921,6 @@ class JupyterHub(Application):
logger.parent = self.log
logger.setLevel(self.log.level)
def init_ports(self):
if self.hub_port == self.port:
raise TraitError("The hub and proxy cannot both listen on port %i" % self.port)
@staticmethod
def add_url_prefix(prefix, handlers):
"""add a url prefix to handlers"""
@@ -986,17 +1061,30 @@ class JupyterHub(Application):
self.exit(e)
def init_hub(self):
"""Load the Hub config into the database"""
self.hub = Hub(
ip=self.hub_ip,
port=self.hub_port,
"""Load the Hub URL config"""
hub_args = dict(
base_url=self.hub_prefix,
public_host=self.subdomain_host,
)
if self.hub_bind_url:
hub_args['bind_url'] = self.hub_bind_url
else:
hub_args['ip'] = self.hub_ip
hub_args['port'] = self.hub_port
self.hub = Hub(**hub_args)
if self.hub_connect_ip:
self.hub.connect_ip = self.hub_connect_ip
if self.hub_connect_port:
self.hub.connect_port = self.hub_connect_port
self.log.warning(
"JupyterHub.hub_connect_port is deprecated as of 0.9."
" Use JupyterHub.hub_connect_url to fully specify"
" the URL for connecting to the Hub."
)
if self.hub_connect_url:
self.hub.connect_url = self.hub_connect_url
async def init_users(self):
"""Load users into and from the database"""
@@ -1363,15 +1451,9 @@ class JupyterHub(Application):
def init_proxy(self):
"""Load the Proxy config"""
# FIXME: handle deprecated config here
public_url = 'http{s}://{ip}:{port}{base_url}'.format(
s='s' if self.ssl_cert else '',
ip=self.ip,
port=self.port,
base_url=self.base_url,
)
self.proxy = self.proxy_class(
db_factory=lambda: self.db,
public_url=public_url,
public_url=self.bind_url,
parent=self,
app=self,
log=self.log,
@@ -1487,7 +1569,6 @@ class JupyterHub(Application):
self.update_config(cfg)
self.write_pid_file()
self.init_pycurl()
self.init_ports()
self.init_secrets()
self.init_db()
self.init_hub()
@@ -1644,13 +1725,26 @@ class JupyterHub(Application):
# start the webserver
self.http_server = tornado.httpserver.HTTPServer(self.tornado_application, xheaders=True)
bind_url = urlparse(self.hub.bind_url)
try:
self.http_server.listen(self.hub_port, address=self.hub_ip)
if bind_url.scheme.startswith('unix+'):
socket = bind_unix_socket(unquote(bind_url.netloc))
self.http_server.add_socket(socket)
else:
ip = bind_url.hostname
port = bind_url.port
if not port:
if bind_url.scheme == 'https':
port = 443
else:
port = 80
self.http_server.listen(port, address=ip)
self.log.info("Hub API listening on %s", self.hub.bind_url)
if self.hub.url != self.hub.bind_url:
self.log.info("Private Hub API connect url %s", self.hub.url)
except Exception:
self.log.error("Failed to bind hub to %s", self.hub.bind_url)
raise
else:
self.log.info("Hub API listening on %s", self.hub.bind_url)
# start the proxy
if self.proxy.should_start:

32
jupyterhub/objects.py
View File

@@ -33,6 +33,19 @@ class Server(HasTraits):
port = Integer()
base_url = URLPrefix('/')
cookie_name = Unicode('')
connect_url = Unicode('')
bind_url = Unicode('')
@default('bind_url')
def bind_url_default(self):
"""representation of URL used for binding
Never used in APIs, only logging,
since it can be non-connectable value, such as '', meaning all interfaces.
"""
if self.ip in {'', '0.0.0.0'}:
return self.url.replace(self._connect_ip, self.ip or '*', 1)
return self.url
@property
def _connect_ip(self):
@@ -107,6 +120,12 @@ class Server(HasTraits):
@property
def host(self):
if self.connect_url:
parsed = urlparse(self.connect_url)
return "{proto}://{host}".format(
proto=parsed.scheme,
host=parsed.netloc,
)
return "{proto}://{ip}:{port}".format(
proto=self.proto,
ip=self._connect_ip,
@@ -115,22 +134,13 @@ class Server(HasTraits):
@property
def url(self):
if self.connect_url:
return self.connect_url
return "{host}{uri}".format(
host=self.host,
uri=self.base_url,
)
@property
def bind_url(self):
"""representation of URL used for binding
Never used in APIs, only logging,
since it can be non-connectable value, such as '', meaning all interfaces.
"""
if self.ip in {'', '0.0.0.0'}:
return self.url.replace(self._connect_ip, self.ip or '*', 1)
return self.url
def wait_up(self, timeout=10, http=False):
"""Wait for this server to come up"""
if http:

1
jupyterhub/proxy.py
View File

@@ -305,7 +305,6 @@ class Proxy(LoggingConfigurable):
hub = self.app.hub
if '/' not in routes:
self.log.warning("Adding default route")
futures.append(self.add_hub_route(hub))
else:
route = routes['/']

12
jupyterhub/tests/mocking.py
View File

@@ -213,17 +213,21 @@ class MockHub(JupyterHub):
"""Hub with various mock bits"""
db_file = None
last_activity_interval = 2
base_url = '/@/space%20word/'
log_datefmt = '%M:%S'
@default('subdomain_host')
def _subdomain_host_default(self):
return os.environ.get('JUPYTERHUB_TEST_SUBDOMAIN_HOST', '')
@default('bind_url')
def _default_bind_url(self):
if self.subdomain_host:
port = urlparse(self.subdomain_host).port
else:
port = random_port()
return 'http://127.0.0.1:%i/@/space%%20word/' % port
@default('ip')
def _ip_default(self):
return '127.0.0.1'

23
jupyterhub/user.py
View File

@@ -401,15 +401,30 @@ class User:
f = maybe_future(spawner.start())
# commit any changes in spawner.start (always commit db changes before yield)
db.commit()
ip_port = await gen.with_timeout(timedelta(seconds=spawner.start_timeout), f)
if ip_port:
url = await gen.with_timeout(timedelta(seconds=spawner.start_timeout), f)
if url:
# get ip, port info from return value of start()
server.ip, server.port = ip_port
if isinstance(url, str):
# >= 0.9 can return a full URL string
pass
else:
# >= 0.7 returns (ip, port)
url = 'http://%s:%i' % url
urlinfo = urlparse(url)
server.proto = urlinfo.scheme
server.ip = urlinfo.hostname
port = urlinfo.port
if not port:
if urlinfo.scheme == 'https':
port = 443
else:
port = 80
server.port = port
db.commit()
else:
# prior to 0.7, spawners had to store this info in user.server themselves.
# Handle < 0.7 behavior with a warning, assuming info was stored in db by the Spawner.
self.log.warning("DEPRECATION: Spawner.start should return (ip, port) in JupyterHub >= 0.7")
self.log.warning("DEPRECATION: Spawner.start should return a url or (ip, port) tuple in JupyterHub >= 0.9")
if spawner.api_token and spawner.api_token != api_token:
# Spawner re-used an API token, discard the unused api_token
orm_token = orm.APIToken.find(self.db, api_token)