Skip to content

Add UNIX socket support to notebook server. #4835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
May 15, 2020
Merged

Add UNIX socket support to notebook server. #4835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a9ed339
Add UNIX socket support to notebook server.
kwlzn Aug 21, 2019
20b5cb8
Fixup.
kwlzn Apr 28, 2020
8aad324
Fixup.
kwlzn Apr 28, 2020
b956751
Fixup tests.
kwlzn Apr 28, 2020
9bda4c6
Feedback: Improve stop server description.
kwlzn Apr 29, 2020
4af2258
Feedback: repair stop command port targeting.
kwlzn Apr 29, 2020
07deb1d
Feedback: remove error on --sock and --open-browser.
kwlzn Apr 29, 2020
328dca5
Feedback: file_to_run and sock mutual exclusion.
kwlzn Apr 29, 2020
592af9a
Feedback: opening.
kwlzn Apr 29, 2020
bbf6c77
Feedback: umask -> mode.
kwlzn Apr 29, 2020
8d9b8c6
Cleanup.
kwlzn Apr 29, 2020
3e28cfd
Feedback: improve test coverage.
kwlzn Apr 29, 2020
1a5eed8
Make integration test conditional for CI compatibility.
kwlzn Apr 29, 2020
ee509ad
Feedback: Demote log level on --open_browser and --sock.
kwlzn May 13, 2020
1af8283
Feedback: validate sock-mode.
kwlzn May 13, 2020
02cd1fa
Traitlets type handling fixup.
kwlzn May 13, 2020
5aa6e0d
Feedback: add socket usage check on bind and test.
kwlzn May 13, 2020
dcc8874
Feedback: remove socket on stop.
kwlzn May 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions notebook/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
os.path.join(os.path.dirname(__file__), "templates"),
]

DEFAULT_NOTEBOOK_PORT = 8888

del os

from .nbextensions import install_nbextension
Expand Down
19 changes: 12 additions & 7 deletions notebook/base/handlers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import notebook
from notebook._tz import utcnow
from notebook.i18n import combine_translations
from notebook.utils import is_hidden, url_path_join, url_is_absolute, url_escape
from notebook.utils import is_hidden, url_path_join, url_is_absolute, url_escape, urldecode_unix_socket_path
from notebook.services.security import csp_report_uri

#-----------------------------------------------------------------------------
Expand Down Expand Up @@ -471,13 +471,18 @@ def check_host(self):
if host.startswith('[') and host.endswith(']'):
host = host[1:-1]

try:
addr = ipaddress.ip_address(host)
except ValueError:
# Not an IP address: check against hostnames
allow = host in self.settings.get('local_hostnames', ['localhost'])
# UNIX socket handling
check_host = urldecode_unix_socket_path(host)
if check_host.startswith('/') and os.path.exists(check_host):
allow = True
else:
allow = addr.is_loopback
try:
addr = ipaddress.ip_address(host)
except ValueError:
# Not an IP address: check against hostnames
allow = host in self.settings.get('local_hostnames', ['localhost'])
else:
allow = addr.is_loopback

if not allow:
self.log.warning(
Expand Down
Loading