Compare commits

..

6518 Commits
0.1.0 ... 4.1.0

Author SHA1 Message Date
Min RK
984a67932f Bump to 4.1.0 2024-03-20 13:38:27 +01:00
Min RK
133dda26cc sync publish workflow with main 2024-03-20 13:26:14 +01:00
Min RK
e797e31ef9 fix check links for unpublished advisories 2024-03-20 13:23:54 +01:00
Min RK
e2798a088f Merge pull request from GHSA-7r3h-4ph8-w38g
4.1.0
2024-03-20 13:19:29 +01:00
Min RK
3fa60e6849 4.1.0 2024-03-19 13:33:35 +01:00
Min RK
aeeabbee07 Merge pull request #4735 from meeseeksmachine/auto-backport-of-pr-4628-on-4.x
Backport PR #4628 on branch 4.x (Include LDAP groups in local spawner gids)
2024-03-19 12:48:49 +01:00
Min RK
999c58f584 Backport PR #4628: Include LDAP groups in local spawner gids 2024-03-19 09:34:16 +00:00
Min RK
513c61321f Merge pull request #4734 from meeseeksmachine/auto-backport-of-pr-4733-on-4.x
Backport PR #4733 on branch 4.x (Catch ValueError while waiting for server to be reachable)
2024-03-19 10:03:27 +01:00
Min RK
715c8599b3 Backport PR #4733: Catch ValueError while waiting for server to be reachable 2024-03-19 08:38:04 +00:00
Min RK
63e118f144 Merge pull request #4714 from meeseeksmachine/auto-backport-of-pr-4561-on-4.x
Backport PR #4561 on branch 4.x (Improve debugging when waiting for servers)
2024-02-29 15:13:16 +01:00
Erik Sundell
05e569cb42 Backport PR #4561: Improve debugging when waiting for servers 2024-02-28 13:49:35 +00:00
Min RK
d4c7d9748a Merge pull request #4707 from meeseeksmachine/auto-backport-of-pr-4563-on-4.x
Backport PR #4563 on branch 4.x (only set 'domain' field on session-id cookie)
2024-02-26 11:29:43 +01:00
Min RK
d8f404d25e Backport PR #4563: only set 'domain' field on session-id cookie 2024-02-13 14:08:01 +00:00
Min RK
4492b508a1 Merge pull request #4705 from minrk/backport-4679
Backport PR #4679 on branch 4.x (Unescape jinja username)
2024-02-12 15:41:50 +01:00
Min RK
6221f27c19 add missing init for jupyterhub.tests.browser 2024-02-12 14:24:11 +01:00
Min RK
77ae4401a1 Backport PR #4679 on branch 4.x (Unescape jinja username) 2024-02-12 14:03:17 +01:00
Min RK
df7ae422f6 Merge pull request #4687 from meeseeksmachine/auto-backport-of-pr-4560-on-4.x
Backport PR #4560 on branch 4.x (singleuser extension: persist token from ?token=... url in cookie)
2024-02-06 10:39:10 +01:00
Min RK
a0dd715bf7 Merge pull request #4689 from meeseeksmachine/auto-backport-of-pr-4542-on-4.x
Backport PR #4542 on branch 4.x (Fix include_stopped_servers in paginated next_url)
2024-02-06 10:16:59 +01:00
Min RK
bfccb9af73 Merge pull request #4698 from minrk/backport-quay
Backport quay.io publishing
2024-02-06 10:01:00 +01:00
Min RK
fd14165da3 Merge pull request #4692 from meeseeksmachine/auto-backport-of-pr-4677-on-4.x
Backport PR #4677 on branch 4.x (Improve validation, docs for token.expires_in)
2024-02-06 10:00:49 +01:00
Min RK
5778d8fa48 Merge pull request #4696 from minrk/backport-4632
Backport PR #4632: simplify, avoid errors in parsing accept headers
2024-02-06 10:00:40 +01:00
Min RK
cd51660eff IS_JUPYVERSE hasn't been backported
make it always False
2024-02-06 09:18:06 +01:00
Erik Sundell
6af20e79cf Backport PR #4560: singleuser extension: persist token from ?token=... url in cookie 2024-02-06 09:18:06 +01:00
Min RK
262557579f Merge pull request #4697 from minrk/backport-4630
Backport PR #4630: avoid setting unused oauth state cookies on API requests
2024-02-06 09:14:06 +01:00
Min RK
77a6d75d70 Bump to 4.1.0.dev 2024-02-06 09:13:05 +01:00
Min RK
6f3be4b697 Backport PR #4641: Publish to Docker Hub alongside Quay.io
Publish to Docker Hub alongside Quay.io

(cherry picked from commit 7613ba170f)
2024-02-06 09:09:14 +01:00
Min RK
d4bfbdfde2 Backport PR #4612: Move from dockerhub to quay.io
Move from dockerhub to quay.io

(cherry picked from commit 60802b2b76)
2024-02-06 09:08:07 +01:00
Min RK
10f507e83b Backport PR #4632: simplify, avoid errors in parsing accept headers 2024-02-06 09:02:39 +01:00
Min RK
0bbda9a45e Merge pull request #4691 from meeseeksmachine/auto-backport-of-pr-4570-on-4.x
Backport PR #4570 on branch 4.x (fix mutation of frozenset in scope intersection)
2024-02-06 09:00:38 +01:00
Min RK
c8bb3a3679 Merge pull request #4690 from meeseeksmachine/auto-backport-of-pr-4562-on-4.x
Backport PR #4562 on branch 4.x (Use `user.stop` to cleanup spawners that stopped while Hub was down)
2024-02-06 08:59:21 +01:00
Min RK
1a65858968 Merge pull request #4688 from meeseeksmachine/auto-backport-of-pr-4651-on-4.x
Backport PR #4651 on branch 4.x (avoid attempting to patch removed IPythonHandler with notebook v7)
2024-02-06 08:59:08 +01:00
Min RK
2aa28e1a1f Backport PR #4630: avoid setting unused oauth state cookies on API requests 2024-02-06 08:51:25 +01:00
Min RK
dbd90b1bfe Merge pull request #4695 from minrk/backport-pr-4617
Backport PR #4617: try to improve reliability of test_external_proxy
2024-02-06 08:49:34 +01:00
Min RK
7a3ff4028a Merge pull request #4694 from meeseeksmachine/auto-backport-of-pr-4618-on-4.x
Backport PR #4618 on branch 4.x (browser test: wait for token request to finish before reloading)
2024-02-06 08:42:06 +01:00
Erik Sundell
44518d00c2 Backport PR #4617: try to improve reliability of test_external_proxy 2024-02-06 08:35:57 +01:00
Erik Sundell
051848d1ef Backport PR #4618: browser test: wait for token request to finish before reloading 2024-02-06 07:24:50 +00:00
Erik Sundell
5e57e0141a Backport PR #4677: Improve validation, docs for token.expires_in 2024-02-05 14:30:06 +00:00
Min RK
6cfa789d6a Backport PR #4570: fix mutation of frozenset in scope intersection 2024-02-05 14:28:09 +00:00
Erik Sundell
55c3211ec2 Backport PR #4562: Use user.stop to cleanup spawners that stopped while Hub was down 2024-02-05 14:27:04 +00:00
Min RK
603ba309f5 Backport PR #4542: Fix include_stopped_servers in paginated next_url 2024-02-05 14:26:15 +00:00
Simon Li
6337b695bb Backport PR #4651: avoid attempting to patch removed IPythonHandler with notebook v7 2024-02-05 14:25:25 +00:00
Min RK
ee9e509ab5 Merge pull request #4685 from minrk/4.x
preparing 4.x branch
2024-01-31 11:01:51 +01:00
Min RK
f0e049226d BIDS Teaching video appears to be gone 2024-01-31 09:18:00 +01:00
Min RK
7ffb0b0719 skip linkcheck for linux.die.net
links work, but site seems to block linkcheck requests from CI with 403
2024-01-31 09:17:10 +01:00
YuviPanda
825e8aacea Remove links to okpy from docs
These were removed in
https://github.com/jupyterhub/oauthenticator/pull/691,
and now the link checker is not happy.
2024-01-31 09:16:24 +01:00
Min RK
55213f6f53 run pre-commit
black adds some blank lines
2024-01-30 14:32:25 +01:00
Min RK
32dfe70a01 update pre-commit 2024-01-30 14:30:51 +01:00
Min RK
9db326fb7a pin some test dependencies 2024-01-30 14:30:14 +01:00
Min RK
0e7689f277 Bump to 4.0.2 2023-08-10 11:27:56 +02:00
Min RK
b677655572 Merge pull request #4535 from meeseeksmachine/auto-backport-of-pr-4534-on-4.x
Backport PR #4534 on branch 4.x (Changelog for 4.0.2)
2023-08-10 11:26:50 +02:00
Min RK
9adc871448 Backport PR #4534: Changelog for 4.0.2 2023-08-10 09:19:16 +00:00
Min RK
29d6540333 Merge pull request #4533 from meeseeksmachine/auto-backport-of-pr-4489-on-4.x
Backport PR #4489 on branch 4.x (improve permission-denied errors for various cases)
2023-08-10 11:01:08 +02:00
Erik Sundell
5a4949faa5 Backport PR #4489: improve permission-denied errors for various cases 2023-08-10 08:13:44 +00:00
Min RK
f2ab23b376 Merge pull request #4531 from meeseeksmachine/auto-backport-of-pr-4475-on-4.x
Backport PR #4475 on branch 4.x (Allow setting custom log_function in tornado_settings in SingleUserServer)
2023-08-09 15:24:45 +02:00
Min RK
b61582420a Merge pull request #4532 from meeseeksmachine/auto-backport-of-pr-4522-on-4.x
Backport PR #4522 on branch 4.x (document how to use notebook v7 with jupyterhub)
2023-08-09 15:24:34 +02:00
Simon Li
f11ae34b73 Backport PR #4522: document how to use notebook v7 with jupyterhub 2023-08-09 11:12:50 +00:00
Min RK
e91ab50d1b Backport PR #4475: Allow setting custom log_function in tornado_settings in SingleUserServer 2023-08-09 11:03:55 +00:00
Min RK
4cb3a45ce4 Merge pull request #4529 from meeseeksmachine/auto-backport-of-pr-4523-on-4.x
Backport PR #4523 on branch 4.x (doc: update notebook config URL)
2023-08-09 12:40:11 +02:00
Min RK
4e8f9b4334 Merge pull request #4528 from meeseeksmachine/auto-backport-of-pr-4503-on-4.x
Backport PR #4503 on branch 4.x (set root_dir when using singleuser extension)
2023-08-09 12:31:33 +02:00
Min RK
6131f2dbaa Merge pull request #4530 from meeseeksmachine/auto-backport-of-pr-4491-on-4.x
Backport PR #4491 on branch 4.x (avoid counting failed requests to not-running servers as 'activity')
2023-08-09 12:31:07 +02:00
Min RK
a9dc588454 can't use f"{name=}" in Python 3.7 2023-08-09 11:56:03 +02:00
Erik Sundell
537b2eaff6 Backport PR #4491: avoid counting failed requests to not-running servers as 'activity' 2023-08-09 09:53:20 +00:00
Simon Li
7f8a981aed Backport PR #4523: doc: update notebook config URL 2023-08-09 09:52:41 +00:00
Erik Sundell
bc86e4c8f5 Backport PR #4503: set root_dir when using singleuser extension 2023-08-09 09:50:48 +00:00
Min RK
20f75c0018 Bump to 4.1.0.dev 2023-06-12 15:29:13 +02:00
Min RK
689dc5ba24 Bump to 4.0.1 2023-06-08 10:38:00 +02:00
Min RK
d42a7261a4 Merge pull request #4472 from minrk/401-cl
changelog for 4.0.1
2023-06-08 10:37:12 +02:00
Min RK
bcbf136de2 set date for 4.0.1
Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
2023-06-08 09:58:21 +02:00
Min RK
55e9a0f5b5 changelog for 4.0.1 2023-06-07 15:41:22 +02:00
Min RK
d64d916abc Merge pull request #4470 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2023-06-06 09:05:29 +02:00
pre-commit-ci[bot]
da668b5e9a [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/asottile/pyupgrade: v3.3.2 → v3.4.0](https://github.com/asottile/pyupgrade/compare/v3.3.2...v3.4.0)
2023-06-06 04:12:25 +00:00
Erik Sundell
d54442ecbf Merge pull request #4467 from minrk/main
Abort informatively on unrecognized CLI options
2023-06-05 10:30:31 +02:00
Min RK
c930d6bf6a Abort informatively on unrecognized CLI options
rather than ignoring them, leading to unexpected behavior
2023-06-02 13:26:31 +02:00
Min RK
2ce263d45f Merge pull request #4463 from minrk/prefer-runtime-token
Reorder token request docs
2023-06-02 11:48:23 +02:00
Min RK
68f81fdc30 Merge pull request #4457 from diocas/fix_4174
Delete server button on admin page
2023-06-02 11:46:24 +02:00
Min RK
e7ab18a720 Merge pull request #4464 from opoplawski/xsrf
Add xsrf to custom_html template context
2023-06-02 11:30:53 +02:00
Orion Poplawski
582467642c Add xsrf to custom_html template context 2023-06-01 10:00:57 -06:00
Min RK
d65e2daa15 Apply suggestions from code review
Co-authored-by: Simon Li <orpheus+devel@gmail.com>
2023-06-01 12:55:07 +02:00
Min RK
4eaa7c5eb3 Reorder token request docs
- suggest token page first
- remove caveat about JupyterHub 0.8, which can be assumed now
- undocument `jupyterhub token`
- refresh token page screenshots, and remove duplicate screenshot of the token page
- minor improvements to language in token page
2023-05-31 14:25:03 +02:00
Min RK
02de44e551 Merge pull request #4458 from tfmark/rest-api-docs-servers-as-dict
'servers' should be a dict of dicts, not a list of dicts in rest-api.yml
2023-05-25 13:37:01 +02:00
tfmark
4cdf0a65cd 'servers' should be a dict of dicts, not a list of dicts in rest-api.yml 2023-05-24 16:09:26 +01:00
pre-commit-ci[bot]
b0367c21f3 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-05-23 15:33:08 +00:00
Diogo Castro
9d68107722 Add test case for named servers
Adapt all tests
2023-05-23 17:30:23 +02:00
Diogo Castro
ad61c23873 Allow deletion of named servers 2023-05-23 17:30:23 +02:00
Min RK
c359221ef3 Merge pull request #4454 from goseind/gallery_cern
Add CERN to Gallery of JupyterHub Deployments
2023-05-22 13:45:48 +02:00
Min RK
cc94d290ab Merge pull request #4456 from manics/doc-config-ref
Config reference: link to nicer(?) API docs first
2023-05-22 13:45:33 +02:00
Min RK
da0a58cb9c Merge pull request #4451 from minrk/preserve-cli-port
preserve CLI > env priority config in jupyterhub-singleuser extension
2023-05-22 13:16:08 +02:00
Simon Li
7ddd3b0589 Config reference: link to nicer(?) API docs first
`Configuration Reference` sounds like it's the place to go to see the full list of JupyterHub config options.
However it's not very readable as it's a plain-text dump of the output of `jupyterhub --generate-config`.

This links to some of the API doc pages instead, which present most of the information in an easier to read format. Unfortunately it also includes a lot of non-traitlets documentation.
2023-05-18 16:23:21 +01:00
Domenic Gosein
ff71d09fd1 Add CERN to Gallery of JupyterHub Deployments 2023-05-16 16:57:40 +00:00
Min RK
1eb0b1b073 preserve CLI > env priority in jupyterhub-singleuser extension 2023-05-12 17:21:12 +02:00
Min RK
9ea9902c76 Merge pull request #4448 from minrk/collab-link
Fix link to collaboration accounts doc in example
2023-05-11 21:35:35 +02:00
Min RK
6494017ce2 Fix link to collaboration accounts doc in example 2023-05-11 15:08:14 +02:00
Simon Li
b0cd9eebe9 Merge pull request #4443 from manics/node18
Update jsx dependencies as much as possible
2023-05-11 00:35:43 +01:00
Min RK
c3d4885521 Merge pull request #4428 from minrk/faq-share
update sharing faq for 2023
2023-05-10 17:08:32 +02:00
Min RK
2919aaae79 Merge pull request #4444 from manics/remove-alpine
Remove Dockerfile.alpine
2023-05-08 14:24:20 +02:00
Simon Li
1986ba71c1 Remove Dockerfile.alpine 2023-05-06 12:49:02 +01:00
Simon Li
a2c39a4dbc Remove multi-arch cross-compilation debugging 2023-05-06 12:33:32 +01:00
Simon Li
1e847c8710 Reduce container build time to 20 2023-05-06 12:22:25 +01:00
Simon Li
83a8552a63 Clean-up FROM --platform leftover from debugging 2023-05-06 12:09:43 +01:00
Simon Li
f60c633320 Replace apt -q with apt-get -qq 2023-05-06 11:58:05 +01:00
Simon Li
a5c7384228 Completely seperate jupyterhub and other wheel stages 2023-05-06 11:44:42 +01:00
Simon Li
27de930978 More debugging 2023-05-06 10:40:07 +01:00
Simon Li
98e76d52bc Debugging BUILDPLATFORM TARGETPLATFORM 2023-05-06 00:51:53 +01:00
Simon Li
729aac9bd1 Why is BUILDPLATFORM linux/arm64 when buliding arm64 on a gh amd64 runner? 2023-05-06 00:38:05 +01:00
Simon Li
bc85c445ab Attempt to reduce container build time
JupyterHub is pure Python, so can be built in a native platform image and copied into the target platform image
2023-05-06 00:03:32 +01:00
Simon Li
9f708fa10c lodash per method packages are deprecated
https://lodash.com/per-method-packages
2023-05-05 23:36:53 +01:00
Simon Li
d26c7cd6fc Try increasing release container build time to 45 2023-05-05 22:54:20 +01:00
Simon Li
0174083439 regenerate yarn.lock 2023-05-05 21:04:03 +01:00
Simon Li
e6fc2aee4a Update package.json as much as possible without tests failing 2023-05-05 21:04:03 +01:00
Simon Li
47513cfbd0 npx npm-check-updates -u 2023-05-05 21:04:03 +01:00
Simon Li
4e7147a495 Update nodejs from 12 to 18 2023-05-05 21:04:00 +01:00
Min RK
5cfc0db0d5 Merge pull request #4441 from ryanlovett/support-bot-typo 2023-05-04 08:37:24 +02:00
ryanlovett
eb862e2cbb Fix "Thanks" typo. 2023-05-03 17:35:10 -07:00
Min RK
98799e4227 Merge pull request #4432 from huntdatacenter/add-research-institution
add HUNT into research institutions
2023-05-03 14:07:04 +02:00
Min RK
ea6a0e53cc Merge pull request #4440 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2023-05-02 09:14:20 +02:00
Min RK
f2b42a50c8 Merge pull request #4438 from yuvipanda/no-mo-admin
Remove old admin JS code
2023-05-02 09:13:33 +02:00
pre-commit-ci[bot]
43336f5b07 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-05-02 04:27:03 +00:00
pre-commit-ci[bot]
bf2d948366 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/asottile/pyupgrade: v3.3.1 → v3.3.2](https://github.com/asottile/pyupgrade/compare/v3.3.1...v3.3.2)
- [github.com/PyCQA/autoflake: v2.0.2 → v2.1.1](https://github.com/PyCQA/autoflake/compare/v2.0.2...v2.1.1)
- [github.com/pre-commit/mirrors-prettier: v3.0.0-alpha.6 → v3.0.0-alpha.9-for-vscode](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.0-alpha.6...v3.0.0-alpha.9-for-vscode)
2023-05-02 04:26:36 +00:00
YuviPanda
271fd35bce Remove old admin JS code
We have a new react based admin, and this JS was just loading
and doing nothing.
2023-05-01 11:35:22 -07:00
Min RK
1d70986c25 Merge pull request #4435 from mouse1203/playwright_more
Finish migrating browser tests from selenium to playwright
2023-04-28 12:50:52 +02:00
mouse1203
ec017d1f1d Update test_browser.py
added to test_start_stop_server_on_admin_page waiting to load page
2023-04-27 15:16:29 +02:00
mouse1203
a8c804de5b Finish to migrate tests from selenium to playwright
Removed selenium tests and configuration
Added the rest of playwright tests
2023-04-27 14:43:59 +02:00
Min RK
3578001fab Merge pull request #4431 from mouse1203/playwright_more
Migrate some tests from selenium to playwright
2023-04-27 12:59:53 +02:00
Matúš Košút
b199110276 add HUNT into research institutions 2023-04-26 16:13:13 +02:00
mouse1203
b69bba5a7d Adding new playwright tests and removing a part of Selenium tests
Added Playwright tests which are covered Login, Spawning, Home and Token pages
Removed Selenium cases which are covered Login, Spawning, Home and Token pages
2023-04-25 10:42:05 +02:00
Min RK
efdad701df Merge pull request #4420 from mouse1203/playwright_more 2023-04-24 08:49:13 +02:00
Min RK
8a074b12b5 Merge pull request #4429 from consideRatio/pr/fix-missing-redirects 2023-04-24 08:46:06 +02:00
Erik Sundell
b5e5fe630d docs: fix missing redirects for api to reference/api 2023-04-23 08:02:52 +02:00
mouse1203
5d23bf6da3 Update test.yml
remove stage:
- name: Install playwright module
2023-04-21 15:35:12 +02:00
mouse1203
e5a8939481 Update setup.py
Update setup.py
2023-04-20 14:42:37 +02:00
mouse1203
0eca901c65 Added playwright in setup.py
Added "playwright" in setup.py under test section
2023-04-20 14:37:40 +02:00
mouse1203
4a1964f881 Updated configuration for selenium/playwright
Renamed selenium/playwright to browser in markers and configuration
2023-04-20 14:19:46 +02:00
Min RK
131094b5ff Merge pull request #4426 from minrk/upgrade-note
add upgrade note for 4.0 to changelog
2023-04-20 14:16:04 +02:00
Min RK
4544a98fb9 put upgrade note to note heading
Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
2023-04-20 14:11:38 +02:00
Min RK
cbacdecb1e update sharing faq for 2023 2023-04-20 13:52:01 +02:00
Erik Sundell
64d8b2adc9 Merge pull request #4427 from minrk/rtd-internal-links
Fix some public URL links within the docs
2023-04-20 13:48:55 +02:00
Min RK
9c83c15f67 Fix some public URL links within the docs
there shouldn't be any links to jupyterhub.readthedocs.io
2023-04-20 13:36:16 +02:00
Min RK
d2a545a01e add upgrade note for 4.0 to changelog 2023-04-20 12:59:42 +02:00
Min RK
10e7ab96e5 Bump to 4.0.0 2023-04-20 12:18:26 +02:00
Min RK
40f519544f Merge pull request #4424 from minrk/changelog-4f
final changelog for 4.0.0
2023-04-20 12:17:56 +02:00
Min RK
076c14dce6 final changelog for 4.0.0 2023-04-20 11:17:52 +02:00
Erik Sundell
e223ce59e1 Merge pull request #4423 from minrk/diataxis-redirects
add remaining redirects for docs reorg
2023-04-20 10:59:36 +02:00
Min RK
ad833755e1 update comment for rediraffe check conditions 2023-04-20 09:14:57 +02:00
Min RK
142978b4d8 Merge pull request #4417 from manics/server-admin-list-as-table
Server admin: word-wrap lists
2023-04-20 09:11:21 +02:00
Min RK
e3cab48039 github.ref is always branch name on origin in PRs 2023-04-19 16:02:43 +02:00
Min RK
203f4a5855 test PRs against base ref
rather than making assumptions about checkouts and origins
2023-04-19 15:56:09 +02:00
Erik Sundell
cfc27db43d ci: fix failure getting latest tag for make rediraffecheckdiff 2023-04-19 15:48:23 +02:00
Erik Sundell
e2a8557083 ci: don't run make rediraffecheckdiff in forks 2023-04-19 15:41:24 +02:00
Erik Sundell
d5478b1f21 maint: let rediraffecheckdiff compare with origin/main, not main 2023-04-19 15:08:00 +02:00
Erik Sundell
cf19af6f1c ci: provide git history for make rediraffecheckdiff 2023-04-19 14:52:36 +02:00
Min RK
1342f00d8e move redirect line for 4.0 to bottom so rediraffewritediff adds in the right place 2023-04-19 13:40:17 +02:00
Min RK
1e49b4379b set rediraffe auto redirect percentage to 80% 2023-04-19 13:37:17 +02:00
Min RK
a5d563217c check redirects in test-docs
check all for:

- this PR
- latest tag
- longer term (3.0)
2023-04-19 13:27:51 +02:00
Min RK
b1ac3b82dc complete redirects for diataxis reorg
ran rediraffecheckdiff with rediraffe_branch=3.1.1

add a marker indicating that redirects are up-to-date for 4.0
2023-04-19 13:26:04 +02:00
mouse1203
a376f33af1 Update test.yml
Update test.yml
2023-04-17 10:25:26 +02:00
mouse1203
6f8a49569b Update test.yml
Update test.yml - added "if matrix.playwright"
2023-04-17 10:16:34 +02:00
mouse1203
a4c553a5c5 Merge remote-tracking branch 'upstream/main' into playwright_more 2023-04-17 10:07:20 +02:00
Erik Sundell
75ebe40f86 Merge pull request #4419 from manics/disable-dev-traitlets
Disable dev traitlets
2023-04-16 15:33:41 +02:00
Simon Li
69d711929a Disable dev traitlets
JupyterHub CI is currently broken with dev traitlets: https://github.com/jupyterhub/jupyterhub/issues/4418

This temporarily disables it
2023-04-16 14:00:04 +01:00
Simon Li
4c12872dbf Dockerfile uses nodejs 12- undo upgrade of packages in yarn.lock 2023-04-15 23:07:33 +01:00
Simon Li
21cee1be31 Render tabel cells with multiple data items as RowListItem 2023-04-14 23:41:36 +01:00
Simon Li
00c782fd40 Update yarn.lock 2023-04-14 23:40:54 +01:00
Simon Li
b3f9635ecc ReactObjectTableViewer can handle components 2023-04-14 23:29:53 +01:00
Simon Li
8c10fb285e Convert ReactObjectTableViewer to tsx, remove horizontal option 2023-04-14 19:39:20 +01:00
Simon Li
8a3f5d8f2e Copy f29827028f/src/ReactObjectTableViewer.tsx 2023-04-14 19:30:48 +01:00
Simon Li
7b496a5b4a Server admin: lists are displayed as word-wrapped CSV 2023-04-14 18:02:05 +01:00
mouse1203
41445cffb4 Update pytest.ini
Update pytest.ini
Adding "and not playwright"
2023-04-14 16:29:59 +02:00
Simon Li
64e7705053 Server admin: lists are displayed as tables not csv joined 2023-04-14 15:22:51 +01:00
mouse1203
dafd2d67f6 Update test.yml
Update test.yml
2023-04-14 16:09:57 +02:00
mouse1203
823ab58f3a update test.yml
update test.yml
2023-04-14 15:54:23 +02:00
mouse1203
ab7883e5c3 Update test.yml
Update test.yml: added install playwright
2023-04-14 15:45:14 +02:00
mouse1203
8fd1fb3234 added playwright with settings
added one case with settings
2023-04-14 15:22:16 +02:00
Min RK
6502b50576 Merge pull request #4416 from crazytan/patch-1
Remove bracket around link text without address
2023-04-14 07:15:03 +02:00
Jia Tan
861347cce0 Remove bracket around link text without address. 2023-04-13 15:35:11 -07:00
Erik Sundell
43d4b65250 Merge pull request #4409 from consideRatio/pr/dependabot-rename
dependabot: rename to .yaml
2023-04-07 16:00:22 +02:00
Erik Sundell
e53ce19fcc dependabot: rename to .yaml 2023-04-05 10:31:52 +02:00
Erik Sundell
e603ff8274 Merge pull request #4408 from consideRatio/pr/dependabot-syntax-fix
dependabot: fix syntax error of not using quotes for ##:##
2023-04-04 22:37:50 +02:00
Erik Sundell
22b15f0ecf dependabot: fix syntax error of not using quotes for ##:## 2023-04-04 22:36:43 +02:00
Erik Sundell
c48c5bce99 Merge pull request #4403 from consideRatio/pr/dependabot-monthly
dependabot: monthly updates of github actions
2023-04-04 22:35:15 +02:00
Erik Sundell
fa11d7e3c6 Add ci label to dependabot updates of github actions 2023-04-04 22:34:56 +02:00
Erik Sundell
7e3f29d033 Merge pull request #4404 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2023-04-04 08:47:53 +02:00
pre-commit-ci[bot]
b7827687a8 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/PyCQA/autoflake: v2.0.1 → v2.0.2](https://github.com/PyCQA/autoflake/compare/v2.0.1...v2.0.2)
- [github.com/psf/black: 23.1.0 → 23.3.0](https://github.com/psf/black/compare/23.1.0...23.3.0)
2023-04-04 06:21:53 +00:00
Erik Sundell
0beb4639a3 dependabot: monthly updates of github actions 2023-04-01 11:44:00 +02:00
Simon Li
b010c9501e Merge pull request #4402 from minrk/named-server-trailing-slash
make sure named server URLs include trailing slash
2023-03-30 20:07:55 +01:00
Min RK
295e92270b make sure named server URLs include trailing slash 2023-03-30 12:29:56 +02:00
Min RK
e42066f1c9 Merge pull request #4394 from alekseyolg/patch-1
Reduce size of jupyterhub image
2023-03-30 09:38:55 +02:00
Aleksey Karpov
1d29fcbfb2 Update Dockerfile
The same apt command in the entire file.
2023-03-29 14:46:28 +03:00
Aleksey Karpov
bdbfbb7e32 Update Dockerfile
Silently updating the list of available apt packages.
2023-03-29 14:44:00 +03:00
Aleksey Karpov
42314ed75b Apply suggestions from code review
Co-authored-by: Min RK <benjaminrk@gmail.com>
2023-03-29 14:15:20 +03:00
Aleksey Karpov
d8141692ab Update Dockerfile
Co-authored-by: Min RK <benjaminrk@gmail.com>
2023-03-29 14:12:12 +03:00
Aleksey Karpov
025db2f9f3 Update Dockerfile
removed the installation of apt packages from the cache due to the fact that the tests did not pass.
2023-03-24 15:22:01 +03:00
Aleksey Karpov
3985140377 Update test.yml
Add env DOCKER_BUILDKIT
2023-03-24 15:06:24 +03:00
Aleksey Karpov
6886384ca3 Update Dockerfile
Add mount cache
2023-03-24 14:49:11 +03:00
Erik Sundell
4a7fe8648a Merge pull request #4400 from minrk/intersect-server-scopes
add Spawner.server_token_scopes config
2023-03-23 11:48:52 +01:00
Min RK
7383c0cf60 esnure activity permissions are present in server tokens
with a warning

avoids case where custom server token permissions remove necessary permissions for posting activity updates
2023-03-23 10:58:19 +01:00
Min RK
83186e02a2 Do not give JUPYTERHUB_API_TOKEN access to other user servers
never intended, but limiting to server wasn't possible before

No change, except when one user has multiple servers running simultaneously.
2023-03-23 10:23:53 +01:00
Erik Sundell
c6b4577c0a Merge pull request #4399 from minrk/more-db-doc
add some more detail and examples to database doc
2023-03-22 14:19:59 +01:00
Min RK
73b1922c17 add Spawner.server_token_scopes config
consistent behavior with oauth_client_allowed_scopes,
where the _intersection_ of requested and owner-held permissions is granted,
instead of failing

Enables different users to have different permissions in $JUPTYERHUB_API_TOKEN,
either via callables or via requesting as much as you may want and only granting the subset.

Additionally, the !server filter can now be correctly applied to the server token

default behavior is unchanged
2023-03-22 13:56:58 +01:00
Min RK
1430e02fa8 fix db url for mysqlclient 2023-03-22 13:56:14 +01:00
Min RK
9ef09a288a add some more detail and examples to database doc
include actual configuration samples for postgres/mysql
2023-03-22 11:31:33 +01:00
Min RK
4a093be938 test with mysqlclient
as recommended by sqlalchemy
2023-03-22 10:33:51 +01:00
Simon Li
64a253dbef Merge pull request #4398 from ryanlovett/docs-managed-groups
Fix variable spelling.
2023-03-18 15:42:04 +00:00
ryanlovett
54877025ca Fix variable spelling.
The variable is `manage_groups`, although some method and function names use "managed".
2023-03-17 10:13:52 -07:00
Min RK
7793176b65 Bump to 4.0.0b2 2023-03-15 11:58:54 +01:00
Min RK
bf32599d5d Merge pull request #4396 from minrk/beta-2
Refresh 4.0 changelog
2023-03-15 11:57:46 +01:00
Min RK
01a31c894c CURC removed parallel tutorial 2023-03-15 11:51:44 +01:00
Min RK
1e9cf23302 Refresh 4.0 changelog 2023-03-15 10:21:07 +01:00
Aleksey Karpov
555969141e Update Dockerfile
Add env PYTHONDONTWRITEBYTECODE=1
2023-03-15 12:16:00 +03:00
Aleksey Karpov
a938982bdc Update Dockerfile
Divided the assembly image into parts
2023-03-15 12:10:28 +03:00
Min RK
17b54fee6a Merge pull request #4395 from jupyterhub/dependabot/npm_and_yarn/jsx/webpack-5.76.0
Bump webpack from 5.74.0 to 5.76.0 in /jsx
2023-03-15 09:26:08 +01:00
Aleksey Karpov
60a153718d Update Dockerfile
Add python-is-python3 
https://github.com/jupyterhub/jupyterhub/pull/4199
2023-03-15 08:20:46 +03:00
dependabot[bot]
9e1e382c37 Bump webpack from 5.74.0 to 5.76.0 in /jsx
Bumps [webpack](https://github.com/webpack/webpack) from 5.74.0 to 5.76.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.74.0...v5.76.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-15 04:12:11 +00:00
Aleksey Karpov
d72a96ec17 Update Dockerfile
Reduced the number of layers, optimized the assembly, reduced the size of the final image, removed the logs, removed unnecessary commands.
2023-03-14 21:43:48 +03:00
Min RK
5f845e78f1 Merge pull request #4393 from mouse1203/more_selenium
Selenium: updating test_oauth_page
2023-03-14 13:53:44 +01:00
mouse1203
0d7e608a64 Rewrite using parse_qs
Using parse_qs and urlparse instead of unquote for assertions
2023-03-14 12:10:53 +01:00
mouse1203
15c5f152f8 updating the assertion for client_id
updating the assertion for client_id: urllib.parse instead  of replace
2023-03-13 19:58:17 +01:00
mouse1203
6d13893f16 Changing in test_oauth_page
rewrote rows with assertions for client_id and redirect_url
2023-03-13 14:52:34 +01:00
Min RK
7e35de2577 Merge pull request #4390 from ryanlovett/ryanlovett-tutorial-collab-1
Add emphasis about role loading and hub restarts.
2023-03-10 15:22:15 +01:00
Erik Sundell
ec78503d1e Merge pull request #4392 from minrk/suppress-sqla-warning
avoid warning on engine_connect listener
2023-03-09 10:53:11 +01:00
Min RK
7d0bc1a112 avoid warning on engine_connect listener 2023-03-09 09:16:15 +01:00
Simon Li
98e4531b44 Merge pull request #4386 from minrk/get_users_link
Re-enable links to REST API
2023-03-08 21:09:54 +00:00
Ryan Lovett
bb92058fbf Add emphasis about role loading and hub restarts.
It may not be obvious that the load_roles code acts on existing groups, and one must have the hub re-run it to load_roles for new groups.
2023-03-08 11:12:46 -08:00
Min RK
a5c59d6550 Re-enable links to REST API
- fix path to oauth spec
- enable attrs_inline for external link handling to internal targets
2023-03-08 07:51:03 +01:00
Min RK
f14be3df65 Merge pull request #4387 from consideRatio/pr/fix-template-inclusion-in-wheel
fix inclusion of singleuser/templates/page.html in wheel
2023-03-07 16:20:31 +01:00
Erik Sundell
3f7a32c990 Merge pull request #4388 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2023-03-07 11:31:57 +01:00
pre-commit-ci[bot]
a8d8fc02e7 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/pre-commit/mirrors-prettier: v3.0.0-alpha.4 → v3.0.0-alpha.6](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.0-alpha.4...v3.0.0-alpha.6)
2023-03-07 03:44:16 +00:00
Erik Sundell
0713fa209e fix inclusion of singleuser/templates/page.html in wheel 2023-03-06 22:32:17 +01:00
Simon Li
850f430ad6 Merge pull request #4383 from minrk/exponential-max-wait
exponential_backoff: preserve jitter when max_wait is reached
2023-03-02 17:55:58 +00:00
Min RK
4026ed87e8 exponential_backoff: preserve jitter when max_wait is reached 2023-03-02 13:57:13 +01:00
Erik Sundell
f57d196e33 Merge pull request #4379 from minrk/unpin-singleuser
remove pin from singleuser
2023-03-01 14:16:12 +01:00
Min RK
ca9dc3a179 remove pin from singleuser
mysterious upstream image problem has been fixed just as mysteriously
2023-03-01 13:38:16 +01:00
Min RK
a348ba6536 Bump to 4.0.0b1 2023-03-01 11:09:39 +01:00
Min RK
c9e194f187 Merge pull request #4357 from minrk/singleuser-doc
add singleuser explanation doc
2023-03-01 11:06:30 +01:00
Min RK
5c6825f298 myst 0.19 changed intersphinx link syntax 2023-03-01 11:02:33 +01:00
Min RK
6bd0bb4b4a feedback from review in singleuser doc 2023-03-01 10:10:30 +01:00
Min RK
9422d2778f Merge pull request #4373 from minrk/collaboration-user-tutorial
add collaboration accounts tutorial
2023-03-01 09:46:29 +01:00
Min RK
ca760fc0df add singleuser explanation doc 2023-02-28 16:21:49 +01:00
Min RK
901904ecb8 Merge pull request #4375 from minrk/changelog-4
changelog for 4.0 beta
2023-02-28 16:15:38 +01:00
Min RK
33e173766f changelog: move breaking changes to the top 2023-02-28 15:54:49 +01:00
Min RK
6df40cd94b add changelog redirect 2023-02-28 15:53:52 +01:00
Min RK
6cc6be6c1c changelog for 4.0 beta 2023-02-28 15:02:55 +01:00
Min RK
44c7fe0fa6 Merge pull request #4377 from alwasega/updates
reduce nested hierarchy in docs organization
2023-02-28 15:00:24 +01:00
pre-commit-ci[bot]
533e97eaa9 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-02-28 13:33:00 +00:00
alwasega
e4dece9f24 Added redirect and modified api reference section 2023-02-28 16:34:52 +03:00
Min RK
08f9396017 add rtc screenshots 2023-02-28 11:47:50 +01:00
Min RK
c6598c797b Add collaboration-users example and tutorial 2023-02-28 11:35:03 +01:00
Min RK
6378592db9 Merge pull request #4363 from minrk/jupyterhub-sphinx-theme
JupyterHub sphinx theme
2023-02-28 11:01:55 +01:00
pre-commit-ci[bot]
fd598a0b97 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-02-28 08:58:18 +00:00
alwasega
bc3ef4403f Resolved items as guided by @minrk comments 2023-02-28 11:58:45 +03:00
Min RK
786196527b Merge pull request #4374 from 3coins/patch-1
Getting started link broken
2023-02-27 10:29:22 +01:00
Piyush Jain
93c488f840 Corrected Getting Started Link
Current getting started link in README is broken.
2023-02-24 16:15:42 -08:00
Min RK
23516e93f9 Merge pull request #4365 from minrk/admin-panel-button-condition
admin panel: fix condition for start/stop buttons on user servers
2023-02-24 15:59:29 +01:00
Min RK
112a79d7c6 try to simplify admin start/stop test
remove unused parameterization, excess variables
2023-02-24 15:32:50 +01:00
Sarah Gibson
ce7085b720 Merge pull request #4368 from alwasega/index 2023-02-22 14:06:18 +00:00
alwasega
e31e4f8cfc Incorporated heading suggestion 2023-02-22 15:34:55 +03:00
pre-commit-ci[bot]
177c6ea0ee [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-02-22 11:00:50 +00:00
alwasega
b0dbb055f4 Updated the top-level index file 2023-02-22 14:01:24 +03:00
Sarah Gibson
f245e933ee Merge pull request #4355 from alwasega/contributing 2023-02-21 13:00:11 +00:00
Min RK
e0cd07a9bb wait for admin page to load after clicking access-server button 2023-02-21 12:31:04 +01:00
Min RK
46052387bc admin panel: fix condition for start/stop buttons on user servers
`.ready` is the right switch for the links, not `.started` which can be defined even after they stop
2023-02-21 09:07:22 +01:00
Min RK
0b5a992605 update nav links for new theme 2023-02-20 15:08:47 +01:00
Min RK
3e9cd8acf8 use jupyterhub sphinx theme 2023-02-20 15:06:41 +01:00
Simon Li
bed466018c Merge pull request #4358 from pnasrat/remove-pdf-link
Remove PDF links from README.md
2023-02-17 17:39:39 +00:00
Pris Nasrat
6de12313e1 Remove PDF links from README.md
Fixes #4320
2023-02-17 08:25:46 -05:00
alwasega
ecc2108710 Reverted to previous toctree 2023-02-17 08:25:03 +03:00
Allan Wasega
b64ff64cc0 Merge branch 'jupyterhub:main' into contributing 2023-02-16 21:15:10 -08:00
Erik Sundell
63dcebadbe Merge pull request #4354 from minrk/server-extension-default
Make singleuser server-extension default
2023-02-16 19:28:13 +01:00
Simon Li
015dc03986 Merge pull request #4356 from minrk/cookie-error
avoid logging error when browsers send invalid cookies
2023-02-16 15:06:22 +00:00
Min RK
f1075b5a21 avoid error when browsers send invalid cookies 2023-02-16 15:07:35 +01:00
Min RK
403b5f1ffe subset tests for singleuser cases
saves some time for some matrix entries
2023-02-16 14:45:10 +01:00
Min RK
e9fd6e1c32 make sure ssl/subdomain are covered both for both mixin and serverextension 2023-02-16 14:45:10 +01:00
Min RK
18adfbbf30 add internal-ssl config for singleuser extension 2023-02-16 14:16:46 +01:00
Min RK
4c1df3f3fe fix hub_host links with subdomains
- fixes missing hub_host in singleuser mixins
- fixes test to match extension behavior, which is correct
2023-02-16 14:16:46 +01:00
Min RK
0ea813e6ad enable allow_remote access in singleuser extension
otherwise Host header validation prevents remote access
2023-02-16 14:16:45 +01:00
Min RK
09a595851e add test matrix entry for jupyter-server 1.x 2023-02-16 14:16:45 +01:00
Min RK
6ad6cf01c5 default to auth extensions with Jupyter Server 2 2023-02-16 14:16:45 +01:00
pre-commit-ci[bot]
bdfde0a256 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-02-16 10:12:40 +00:00
alwasega
ee2e830e03 Updates to the documentation Contribution section 2023-02-16 13:11:52 +03:00
Erik Sundell
c9d52ce6ff Merge pull request #3888 from minrk/server-extension
singleuser auth as server extension
2023-02-15 20:46:33 +01:00
Min RK
3b04f0872b extension: use jupyterhub log_request function
matches subclass log behavior
2023-02-15 11:30:18 +01:00
Min RK
61ac37500b Merge pull request #4341 from Sheila-nk/asyncio-doc
Document use of pytest-asyncio in JupyterHub test suite
2023-02-15 10:51:24 +01:00
Min RK
a43757bc1a fix hub api url in extension check_hub_version 2023-02-14 16:56:08 +01:00
Min RK
5f9283c7c0 Address review in singleuser extension
- more thorough docstrings, comments
- add missing `check_hub_version` call
- remove duplicate HubAuth instance on authorizer
2023-02-14 16:04:34 +01:00
Yuvi Panda
5d9e8b47c2 Merge pull request #4352 from shaneknapp/fix-spawn-timer-4351
add a few more buckets for server_spawn_duration_seconds
2023-02-13 12:51:48 -08:00
shane knapp
475548a3e2 add a few more buckets 2023-02-13 12:23:59 -08:00
Sheila Kahwai
f21743b751 add pytest-asyncio info under test organization 2023-02-13 10:48:37 +03:00
Sheila
b2a9a6d1c0 Merge branch 'jupyterhub:main' into asyncio-doc 2023-02-13 10:35:20 +03:00
Min RK
c93832cb33 Merge pull request #4343 from alwasega/references
Restructured references section of the docs
2023-02-10 13:42:26 +01:00
Min RK
46508a31d3 Merge pull request #4348 from minrk/build-push-temp
temporary fix: pin base-notebook tag
2023-02-10 12:00:51 +01:00
pre-commit-ci[bot]
b171608e26 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-02-10 10:05:54 +00:00
Min RK
d65064af74 set timeout on docker workflow
avoids six hour runaway jobs
2023-02-10 11:04:29 +01:00
Sheila Kahwai
493d856872 add pytest-asycnio doc to toctree 2023-02-10 13:01:21 +03:00
Sheila Kahwai
2adb341769 add pytest-asyncio document 2023-02-10 12:09:08 +03:00
pre-commit-ci[bot]
ac9682a4a7 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-02-10 09:02:12 +00:00
Sheila
057d32c166 Merge branch 'jupyterhub:main' into asyncio-doc 2023-02-10 12:01:42 +03:00
Min RK
037c3bc184 debug: try pinning singleuser base image 2023-02-10 08:53:03 +01:00
Min RK
9a49d06b21 consolidate disable_user_config implementation
found some fixes required to run on ServerApp to affect extensions,
which were not affected before
2023-02-10 08:21:02 +01:00
pre-commit-ci[bot]
dff1b0aca6 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-02-09 10:10:40 +00:00
alwasega
9535fa3af1 Re-pushed files after merging main into references 2023-02-09 13:12:42 +03:00
pre-commit-ci[bot]
fed4cd5e40 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-02-09 09:49:53 +00:00
Allan Wasega
587e5ebfff Merge branch 'jupyterhub:main' into references 2023-02-09 12:49:03 +03:00
alwasega
46be2c21e0 Pulled upstream changes and re-pushed files 2023-02-09 12:47:12 +03:00
alwasega
1837c33a56 Restructured references section of the docs 2023-02-09 12:25:07 +03:00
Min RK
40164e685f pre-commit; updated black 2023-02-08 16:40:41 +01:00
Min RK
3ad81f3bce sync with main 2023-02-08 16:39:59 +01:00
Min RK
155c8f664a singleuser: add some clarifying comments 2023-02-08 16:13:14 +01:00
Min RK
969084df98 Apply suggestions from code review
Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
2023-02-08 16:12:49 +01:00
Min RK
39d4d38b8b Merge pull request #4319 from minrk/require-sqla-14
require sqlalchemy 1.4
2023-02-08 15:31:14 +01:00
Sheila Kahwai
759c4c5ebc move information to tests.md 2023-02-08 17:24:15 +03:00
Min RK
2bc452a617 Merge pull request #4328 from mouse1203/more_selenium
Selenium: adding new cases that covered Admin UI page
2023-02-08 13:38:36 +01:00
Sarah Gibson
8ef43941e8 Merge pull request #4340 from alwasega/explanation 2023-02-08 10:23:51 +00:00
pre-commit-ci[bot]
defde67746 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-02-08 08:22:43 +00:00
alwasega
3abce3581c Added signpost comments in explanation/index and rbac/index files 2023-02-08 11:24:46 +03:00
pre-commit-ci[bot]
ec9e9c3b04 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-02-07 12:56:24 +00:00
alwasega
c766f5866e incorporated changes after review 2023-02-07 15:58:05 +03:00
Erik Sundell
27c44e44c3 Merge pull request #4342 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2023-02-07 08:59:56 +01:00
mouse1203
af1dd54470 selenium:updating cases are related to Admin UI
According to the review updated cases covered the Admin UI:
- rename the function,
- add docstring,
- add parametrization,
- use the fixture admin_user instead of the function
2023-02-07 08:55:11 +01:00
pre-commit-ci[bot]
be07c7ef31 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-02-07 04:40:23 +00:00
pre-commit-ci[bot]
637cafcf6e [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/PyCQA/autoflake: v2.0.0 → v2.0.1](https://github.com/PyCQA/autoflake/compare/v2.0.0...v2.0.1)
- [github.com/psf/black: 22.12.0 → 23.1.0](https://github.com/psf/black/compare/22.12.0...23.1.0)
2023-02-07 04:37:54 +00:00
Sheila Kahwai
977c5b7f0b add README on use of pytest-asyncio 2023-02-06 17:11:44 +03:00
pre-commit-ci[bot]
a084d23107 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-02-06 08:32:25 +00:00
alwasega
c4d5762608 Moved Explanation/Background files 2023-02-06 11:31:37 +03:00
Erik Sundell
270b619921 Merge pull request #4339 from jupyterhub/dependabot/github_actions/docker/build-push-action-4.0.0
build(deps): bump docker/build-push-action from 3.3.0 to 4.0.0
2023-02-06 06:09:47 +01:00
dependabot[bot]
f2ac996bc6 build(deps): bump docker/build-push-action from 3.3.0 to 4.0.0
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3.3.0 to 4.0.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](37abcedcc1...3b5e8027fc)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-06 05:06:42 +00:00
Sarah Gibson
8cb1e347da Merge pull request #4338 from alwasega/tutorials_2 2023-02-03 14:58:19 +00:00
alwasega
d1fba40f9a Added suggestion in tutorials/index.md 2023-02-03 16:54:24 +03:00
pre-commit-ci[bot]
195ec4c359 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-02-03 13:02:03 +00:00
alwasega
f857b17022 Moved last set of Tutorials 2023-02-03 15:57:35 +03:00
Min RK
58dccdb59b jupyterhub-singleuser as a Jupyter Server 2.0 extension
mostly a copy (fork) of singleuser app
using public APIs instead of lots of patching.

opt-in via `JUPYTERHUB_SINGLEUSER_EXTENSION=1`

related changes:

- stop running a test single-user server in a thread. It's complicated and fragile.
  Instead, run it normally, and get the info we need from a custom handler registered via an extension
  via the `full_spawn` fixture
2023-02-02 16:14:06 +01:00
Erik Sundell
63f164ca53 Merge pull request #4334 from minrk/fix-ref
fix a couple ref links in changelog
2023-02-02 11:30:03 +01:00
Min RK
39f1faa1df fix a couple ref links in changelog
maybe mangled in an rst2md migration
2023-02-02 11:11:35 +01:00
Georgiana
9de3757caa Merge pull request #4332 from minrk/simplify-async-app
simplify some async fixtures
2023-02-02 11:20:17 +02:00
Sarah Gibson
75e49ebdd3 Merge pull request #4331 from alwasega/rediraffe 2023-02-01 12:55:55 +00:00
alwasega
150b22aab9 fixed comments syntax 2023-02-01 14:15:24 +03:00
alwasega
842712171e Added comments in redirects.text file 2023-02-01 14:06:15 +03:00
alwasega
ce1264cd18 fixed typos in conf.py 2023-01-31 21:06:56 +03:00
pre-commit-ci[bot]
2755966adf [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-01-31 14:00:04 +00:00
alwasega
bea35a60df Added missed redirects manually and updated comments on conf.py 2023-01-31 17:01:38 +03:00
Min RK
bf560707b6 Merge pull request #4326 from bl-aire/a11y
Improve contrast on muted text
2023-01-31 14:42:59 +01:00
Ogoh Blessing
194ff5ee57 Increase contrast of muted text 2023-01-31 14:42:23 +01:00
mouse1203
bc751b0740 Selenium: add wait element into open_admin_page
adding a waiting for loading of element
2023-01-31 13:18:47 +01:00
Min RK
44cb302de0 simplify some async fixtures
use async fixtures for simpler event-loop integration

several of these fixtures were written before fixtures themselves could be async,
but now they can, which means we can use async/await instead of run_sync.
2023-01-31 11:17:40 +01:00
pre-commit-ci[bot]
da5183a6f8 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-01-31 08:01:26 +00:00
alwasega
dd0b49c8f4 Added rediraffe using auto redirect builder 2023-01-31 10:58:21 +03:00
Min RK
d5bc135d9b fix xsrfToken in react
caught now that we have browser tests
2023-01-30 15:42:07 +01:00
mouse1203
9884fa7127 selenium: update spawn_pending_server_ready
adding await wait_for_ready(browser)
replacing await in_thread(browser.get, home_page)

adding waiting start all/stop all buttons in case start_stop_all_servers_on_admin_page
2023-01-30 14:50:57 +01:00
Erik Sundell
e85b91cd9b Merge pull request #4322 from jupyterhub/dependabot/github_actions/docker/setup-buildx-action-2.3.0
build(deps): bump docker/setup-buildx-action from 2.2.1 to 2.3.0 (now v2)
2023-01-30 14:48:08 +01:00
Erik Sundell
1666342fc3 Merge pull request #4327 from minrk/gitignore-backups
also ignore sqlite backups
2023-01-30 14:17:53 +01:00
Min RK
2a13929e63 also ignore sqlite backups
not just the rename (in case of `jupyterhub upgrade-db`)
2023-01-30 14:11:01 +01:00
mouse1203
11cd8674c2 selenium:add cases that covered Admin page
Adding cases: search, paging, start all/stop all, start/stop user´s server
2023-01-30 12:54:54 +01:00
Erik Sundell
df3be4c770 Merge pull request #4325 from minrk/pcau
pre-commit: bump isort
2023-01-30 10:57:27 +01:00
Min RK
ceb1154e61 pre-commit: bump isort 2023-01-30 10:54:22 +01:00
Min RK
56e603bf0f Merge pull request #4324 from consideRatio/pr/remove-readme-notice
Remove no longer relevant notice in readme
2023-01-30 10:53:21 +01:00
Erik Sundell
7366fddb0c ci: reference actions with v2 over git commit hash 2023-01-30 08:09:49 +01:00
Erik Sundell
124ae60133 Remove no longer relevant notice in readme 2023-01-30 07:48:18 +01:00
dependabot[bot]
d2231cb683 build(deps): bump docker/setup-buildx-action from 2.2.1 to 2.3.0
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2.2.1 to 2.3.0.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](8c0edbc76e...5e716dcfd6)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-30 05:07:12 +00:00
Min RK
51b6376634 require sqlalchemy 1.4
removes some workarounds needed for sqlalchemy 1.1 + 2.0 support

1.4 backports most 2.0 behavior, keeping it off-by-default for an easier opt-in transition

opt-in with `session.future = True` flag
2023-01-27 14:15:02 +01:00
Sarah Gibson
95cf06a46e Merge pull request #4314 from alwasega/howto_2 2023-01-27 11:58:16 +00:00
Min RK
f658113b8c Merge pull request #4316 from minrk/cl-311
changelog for 3.1.1
2023-01-27 12:48:58 +01:00
Min RK
6911e2b052 changelog for 3.1.1 2023-01-27 11:56:04 +01:00
Min RK
3cf2ef7757 Merge pull request #4302 from minrk/sqla2
sqlalchemy 2 compatibility
2023-01-27 11:00:29 +01:00
Min RK
2db7c47fbf sqlalchemy 2 compatibility
- avoid backref warnings by adding objects to session explicitly before creating any relationships
- remove unnecessary `[]` around scalar query
- use `text()` wrapper on connection.execute
- engine.execute is removed
- update import of declarative_base
- ensure RemovedIn20Warning is available for warnings filters on sqlalchemy < 1.4 (needs editable install to avoid pytest path mismatch)
- explicitly relay password in engine.url to alembic
2023-01-27 10:42:03 +01:00
alwasega
680309e35d fixed MyST references 2023-01-27 11:58:03 +03:00
pre-commit-ci[bot]
62ceb9cc3d [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-01-27 08:43:30 +00:00
alwasega
f825973588 Moved second half of HowTo documentation 2023-01-27 11:32:41 +03:00
Sarah Gibson
0a84738fe9 Merge pull request #4311 from alwasega/howto_1 2023-01-26 18:02:00 +00:00
Min RK
a24608d445 Merge pull request #4309 from TaofeeqatDev/Jupyterhub1
Update authenticators-users-basics.md
2023-01-26 11:34:26 +01:00
Taofeeq Taofeeqat Olawumi
7f818a04ae Update authenticators-users-basics.md 2023-01-26 10:14:12 +01:00
alwasega
6340b1564e fixed outstanding MyST reference error in api/index.md file 2023-01-26 00:33:34 +03:00
alwasega
d2814c9c11 renamed MyST references in API docs to avoid duplication error 2023-01-26 00:29:23 +03:00
alwasega
49169dab2f fixed broken MyST references 2023-01-26 00:05:17 +03:00
pre-commit-ci[bot]
3f2d55474c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-01-25 20:54:03 +00:00
alwasega
ee43ebeab5 Moved first half of HowTo documentation 2023-01-25 23:51:36 +03:00
Erik Sundell
e255ada169 Merge pull request #4032 from minrk/rm-referer-check
Use XSRF tokens for cross-site checks
2023-01-25 16:21:31 +01:00
Min RK
a336a30cf8 remove outdated xsrf todo 2023-01-25 15:47:13 +01:00
Taofeeq Taofeeqat Olawumi
7b39790a86 Update authenticators-users-basics.md
1. Fix some typo errors
2. Fix some grammar issues.
2023-01-24 16:02:03 +01:00
Sarah Gibson
38ba275367 Merge pull request #4307 from alwasega/faqs 2023-01-24 13:17:12 +00:00
alwasega
c65779db56 fixed broken MyST reference 2023-01-24 12:53:39 +03:00
alwasega
d8a5034b16 transferred docs to FAQ folder 2023-01-24 12:13:18 +03:00
Sarah Gibson
cb0073e9b8 Merge pull request #4305 from alwasega/tutorials 2023-01-23 16:01:26 +00:00
alwasega
dd95201b90 corrected MyST anchors location and minor error 2023-01-23 18:19:49 +03:00
alwasega
f88695084b fixed more than one myst target found error 2023-01-23 16:24:49 +03:00
pre-commit-ci[bot]
61ad3812ce [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-01-23 12:59:56 +00:00
alwasega
7c8800c724 added myst references in files 2023-01-23 16:01:13 +03:00
alwasega
b691480e5f Added docs to the folder 2023-01-20 13:36:16 +03:00
Sarah Gibson
36f74689c4 Merge pull request #4301 from alwasega/create-folders 2023-01-19 14:54:31 +00:00
Min RK
043390afe1 Merge pull request #4304 from GeorgianaElena/fix-oauthenticator-links
Fix the oauthenticator docs api links
2023-01-19 15:34:31 +01:00
Georgiana Dolocan
c5cceb789a Fix the oauthenticator docs api links 2023-01-19 16:02:58 +02:00
alwasega
f434b7ea33 Edited source/index.md file 2023-01-19 14:04:52 +03:00
Erik Sundell
8b0258c4f5 Merge pull request #4303 from minrk/install-events
make sure event-schemas are installed
2023-01-19 10:16:46 +01:00
Min RK
5b5069af99 make sure event-schemas are installed 2023-01-19 09:59:53 +01:00
pre-commit-ci[bot]
08c14a03d7 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-01-18 14:15:09 +00:00
alwasega
70196a4721 Edited files and folders per comments 2023-01-18 17:16:25 +03:00
pre-commit-ci[bot]
1114736ae7 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-01-17 21:21:35 +00:00
alwasega
0873902a18 Created folders to house the restructured documentation 2023-01-18 00:10:36 +03:00
Erik Sundell
a245708eaf Merge pull request #4294 from minrk/form-color-scope
Move some common form CSS to page.less
2023-01-17 09:47:31 +01:00
Min RK
21ad59dc3c Merge pull request #4292 from minrk/doc-db
expand database docs
2023-01-16 10:56:35 +01:00
Min RK
c7f8895a95 Merge pull request #4300 from jupyterhub/dependabot/github_actions/docker/build-push-action-3.3.0
build(deps): bump docker/build-push-action from 3.2.0 to 3.3.0
2023-01-16 10:49:22 +01:00
Min RK
abe1136cba Use XSRF tokens for cross-site protections
Removes all Referer checks, which have proven unreliable and have never been particularly strong

We can use XSRF on paths for more robust inter-path protections.

- `_xsrf` is added for forms via hidden input
- xsrf check is additionally applied to GET requests on API endpoints
2023-01-16 09:35:33 +01:00
dependabot[bot]
d0f719b0e1 build(deps): bump docker/build-push-action from 3.2.0 to 3.3.0
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3.2.0 to 3.3.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](c56af95754...37abcedcc1)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-16 05:04:20 +00:00
Simon Li
c565835773 Merge pull request #4299 from minrk/group_property_feature
test and fix deprecated load_groups list
2023-01-13 14:58:46 +00:00
Min RK
663857a15f Merge pull request #4298 from mouse1203/more_selenium
Selenium testing: adding new case covered the authorisation page
2023-01-13 15:43:48 +01:00
Min RK
728b4e3dc7 test and fix deprecated load_groups list 2023-01-13 14:22:56 +01:00
mouse1203
6da46f36c9 Apply suggestions from code review
Co-authored-by: Min RK <benjaminrk@gmail.com>
2023-01-13 13:33:42 +01:00
Min RK
126f8d0115 Merge pull request #4297 from minrk/linkcheck-skip
docs: fix linkcheck in gallery
2023-01-13 11:37:53 +01:00
mouse1203
11f575568f working on test_oauth_page
updated the locator for "Authorize" button
reused functions from scopes.py
changed the part of comparing scopes on the service page
2023-01-13 11:10:05 +01:00
Min RK
57a22719a5 docs: fix linkcheck in gallery
- jupyter.chameleoncloud SSL is failing (I can reproduce with conda curl, but not /usr/bin/curl, so seems to be a CA issue)
- remove dead arnesund tag link (keep single article link)
2023-01-13 10:49:21 +01:00
Min RK
995264ffef Merge pull request #4288 from stevejpurves/docs-name-template
added note on `Spawner.name_template` setting
2023-01-12 11:45:43 +01:00
Steve Purves
f364c61d64 a more general statement on named server config 2023-01-11 16:59:37 +00:00
Erik Sundell
93926a564a Merge pull request #4295 from minrk/docstring-format
Fix formatting of load_groups help string
2023-01-11 16:49:44 +01:00
Min RK
5b743a147f Fix formatting of load_groups help string 2023-01-11 16:43:08 +01:00
Min RK
6abcbe8e37 Merge pull request #3651 from vladfreeze/group_property_feature
Dynamic table for changing customizable properties of groups
2023-01-11 16:34:45 +01:00
mouse1203
f4d8ad00a3 working on test_oauth_page
working on test_oauth_page case: added a check of scopes on the service page
2023-01-11 15:00:56 +01:00
Min RK
ad9b0095cb Move some common form CSS to page.less
so it affects other forms, such as the spawner form

results in more consistent style
2023-01-11 14:13:05 +01:00
Min RK
3c0467ebcf add group properties to rest api spec 2023-01-11 12:10:40 +01:00
Min RK
dfec64ab18 test group properties endpoint 2023-01-11 12:00:45 +01:00
Min RK
f65f429a4a avoid link myst can't seem to understand 2023-01-11 11:46:36 +01:00
Vlad Vifor
db9226d871 Added deprecation warning to jupyterhub/app.py
Co-authored-by: Min RK <benjaminrk@gmail.com>
2023-01-11 11:30:50 +01:00
pre-commit-ci[bot]
ced81d1a2e [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-01-11 09:42:51 +00:00
vpopescu
fec0cb1260 Fixed removals caused by merge, documentation 2023-01-11 10:42:03 +01:00
Min RK
52b8bc135f Apply suggestions from code review
Co-authored-by: Georgiana <georgiana.dolocan@gmail.com>
Co-authored-by: ajpower <122097973+ajpower@users.noreply.github.com>
2023-01-11 10:10:07 +01:00
Min RK
c7402676a8 expand database docs
add notes on what's in the database,
why there's a database,
and how it relates to performance
2023-01-09 15:40:00 +01:00
Min RK
336d7cfcfa Merge pull request #4290 from bl-aire/a11y
Fix skipped heading level across pages
2023-01-09 11:45:35 +01:00
Min RK
bf029d3c31 Merge pull request #4291 from jupyterhub/dependabot/npm_and_yarn/jsx/json5-2.2.3
build(deps): bump json5 from 2.2.1 to 2.2.3 in /jsx
2023-01-09 11:45:21 +01:00
Ogoh Blessing
ffb41b0164 Remove aria-hidden attribute 2023-01-09 10:26:49 +00:00
dependabot[bot]
86dcb51417 build(deps): bump json5 from 2.2.1 to 2.2.3 in /jsx
Bumps [json5](https://github.com/json5/json5) from 2.2.1 to 2.2.3.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v2.2.1...v2.2.3)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-09 02:24:16 +00:00
Ogoh Blessing
8613d43fe4 Fix skipped heading level 2023-01-08 00:05:02 +00:00
Ogoh Blessing
6b7061173f Add th cells to tables 2023-01-08 00:01:29 +00:00
pre-commit-ci[bot]
80368aad24 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-01-04 21:19:02 +00:00
Steve Purves
b17b073599 added note on Spawner.name_template setting 2023-01-04 21:14:16 +00:00
Vlad Vifor
e84359cc23 Merge branch 'jupyterhub:main' into group_property_feature 2023-01-03 16:00:45 +01:00
Erik Sundell
e4f72c9eeb Merge pull request #4286 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2023-01-03 15:05:21 +01:00
pre-commit-ci[bot]
7a94443a06 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/pycqa/isort: 5.11.1 → 5.11.4](https://github.com/pycqa/isort/compare/5.11.1...5.11.4)
2023-01-03 01:50:49 +00:00
mouse1203
ddf1ff03f5 Adding the test case for the oauth confirmation page
added draft version of the test case for the oauth confirmation page
2023-01-02 13:10:22 +01:00
Min RK
49c518940b Merge pull request #4274 from bl-aire/main
Fix reoccurring accessibility issues in JupyterHub's pages
2022-12-21 15:36:44 +01:00
Ogoh Blessing
bf0927685f accessibility improvements across pages
- Add html language attribute

- Rename logo's alt text so it clearly states the image's purpose

- Fix missing first level heading for Login, Home and Token page

- Fix missing header level 1 of Login page

- Fix low contrast issue of navbar

Co-authored-by: Min RK <benjaminrk@gmail.com>
2022-12-21 15:04:25 +01:00
Erik Sundell
30f5d9c8ce Merge pull request #4258 from minrk/rm-unused-cookie
Remove remnants of unused jupyterhub-services cookie
2022-12-21 12:52:01 +01:00
Min RK
e057e8696b Merge pull request #4278 from mouse1203/more_selenium
Refactored selenium tests for improved readability
2022-12-21 12:04:27 +01:00
mouse1203
e31b69863f Changed locator under token_table_body_as_dict function
Changed locator under token_table_body_as_dict function
2022-12-21 10:41:27 +01:00
mouse1203
bf85411f23 table-as-dict function, locators, menu-bar
Added table-as-dict function instead of few functions for working with the tokens table
replaced static value from locators.py by locator itself in test_browser
simplified menu-bar case
2022-12-20 09:28:00 +01:00
Erik Sundell
5977e7f092 Merge pull request #4245 from manics/docs-fix-spawner-env
doc: fix formatting of spawner env-vars
2022-12-15 16:35:57 +01:00
Erik Sundell
70e53f31d0 Merge pull request #4268 from minrk/pre-commit-monthly
pre-commit: autoupdate monthly
2022-12-15 16:33:39 +01:00
Simon Li
afe50ef96e Merge pull request #4269 from minrk/document-jupyter-env
Document JUPYTER_PREFER_ENV_PATH=0 for shared user environments
2022-12-15 14:25:22 +00:00
Simon Li
e580b907c3 spawners.md: format env vars as code (avoids prettier bug) 2022-12-15 14:05:24 +00:00
Simon Li
3491ad6816 Merge pull request #4273 from minrk/rm-pipes
remove deprecated import of pipes.quote
2022-12-15 13:59:15 +00:00
Min RK
d300eb2519 remove deprecated import of pipes.quote
This function has been shlex.quote since 3.3, and pipes is set to be deprecated.
2022-12-15 12:12:48 +01:00
Min RK
7f7463ac3c Merge pull request #4271 from minrk/testing-localhost
only run testing config on localhost
2022-12-14 19:45:29 +01:00
Erik Sundell
b3f121e3e4 Merge pull request #4259 from minrk/toctree-max-depth
set max depth on api/index toctree
2022-12-14 16:09:49 +01:00
Min RK
7358b4d4ea only run testing config on localhost
avoids listening on the network with dummy auth
2022-12-14 13:45:10 +01:00
Min RK
15a7e9406b Document JUPYTER_PREFER_ENV_PATH=0 for shared user environments 2022-12-14 13:09:12 +01:00
Min RK
d6965cca81 Merge pull request #4207 from mouse1203/more_selenium
more selenium test cases
2022-12-13 14:57:36 +01:00
Min RK
78e36db3e3 xfail progress test
unreliable on CI, need to deal with race conditions
2022-12-13 14:07:04 +01:00
Min RK
25a4ef36db finish spawn_pending test
simplify conditions to check, fix next url, add missing ready signal to spawn_pending.html

need slow_spawn to be even slower
2022-12-13 14:02:10 +01:00
Min RK
1a8d4c0e96 pre-commit: autoupdate monthly 2022-12-13 09:29:53 +01:00
Min RK
0627fe0bb3 Merge pull request #4267 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-12-13 09:28:25 +01:00
pre-commit-ci[bot]
2b0533fd8d [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/asottile/pyupgrade: v3.3.0 → v3.3.1](https://github.com/asottile/pyupgrade/compare/v3.3.0...v3.3.1)
- [github.com/pycqa/isort: 5.10.1 → 5.11.1](https://github.com/pycqa/isort/compare/5.10.1...5.11.1)
- [github.com/psf/black: 22.10.0 → 22.12.0](https://github.com/psf/black/compare/22.10.0...22.12.0)
2022-12-13 01:22:36 +00:00
mouse1203
fe81f4d72d Changing in menu_bar and start_pending
Additionally replaced Dict to dict, in some places int removed
2022-12-12 18:02:20 +01:00
Min RK
241f927e91 Merge pull request #4264 from minrk/selenium-firefox
remove unnecessary actions for firefox/geckodriver
2022-12-12 13:40:32 +01:00
Min RK
ea2c081f6d Merge pull request #4263 from jupyterhub/dependabot/github_actions/dessant/support-requests-3
build(deps): bump dessant/support-requests from 2 to 3
2022-12-12 12:41:18 +01:00
dependabot[bot]
4022a3d564 build(deps): bump dessant/support-requests from 2 to 3
Bumps [dessant/support-requests](https://github.com/dessant/support-requests) from 2 to 3.
- [Release notes](https://github.com/dessant/support-requests/releases)
- [Changelog](https://github.com/dessant/support-requests/blob/master/CHANGELOG.md)
- [Commits](https://github.com/dessant/support-requests/compare/v2...v3)

---
updated-dependencies:
- dependency-name: dessant/support-requests
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-12 05:07:36 +00:00
Min RK
7739890264 simplify token page tests
- remove db utilities
- simplify waits
2022-12-09 13:54:20 +01:00
Min RK
cf5999b048 tests: wait for javascript to finish loading before clicking
allows us to wait for the javascript to finish loading,
since clicking buttons won't do anything if we click before the js has registered click handlers
2022-12-09 13:11:42 +01:00
Min RK
868a571c73 set max depth on api/index toctree
default maxdepth seems to have changed?
2022-12-09 11:32:25 +01:00
Min RK
21ff1de87e remove unmaintained actions for firefox/geckodriver
geckodriver is already set up in the GHA environment!
2022-12-09 09:40:33 +01:00
Min RK
2dab6aed99 Remove remnants of unused jupyterhub-services cookie
We stopped being able to use it in 2.0, but we didn't stop setting it.
2022-12-09 09:22:17 +01:00
Min RK
a8549ddbe2 wait for js events on token page 2022-12-08 15:56:37 +01:00
Min RK
aa91a69bc8 use a single browser session for selenium tests
avoids instantiating firefox for each test
2022-12-08 15:41:15 +01:00
Min RK
0ed05edba2 selenium: make click async 2022-12-08 15:36:39 +01:00
mouse1203
bec7c8ad2d change user to user.name
change user to user.name under case test_open_url_login
2022-12-08 15:17:17 +01:00
mouse1203
9449e77cca remove empty and pyparsing module
remove empty and pyparsing module
2022-12-08 14:52:39 +01:00
pre-commit-ci[bot]
0bd20ba74b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-12-08 13:40:17 +00:00
mouse1203
98494b8c58 Merge branch 'main' into more_selenium 2022-12-08 14:39:42 +01:00
Min RK
7c5662ee52 Merge pull request #4256 from consideRatio/pr/update-makefile-make-bat
docs: refresh Makefile/make.bat
2022-12-08 09:21:57 +01:00
Erik Sundell
a9b6d7e51c docs: refresh Makefile/make.bat 2022-12-07 21:24:59 +01:00
Erik Sundell
ee45866afe Merge pull request #4251 from minrk/test-docs
Test docs, links on CI
2022-12-07 15:38:59 +01:00
Min RK
593112807b resolve linkcheck failures
- several http->https
- a few page moves
- miniconda->miniforge
- remove rochester from gallery, which doesn't apepar to be publicly documented (may be accessible internally, but that's not for a public gallery)
2022-12-07 15:10:42 +01:00
Min RK
0fa732a0a8 build docs, linkcheck on CI
RTD doesn't stop on warnings, but we should still notice
2022-12-07 15:10:42 +01:00
Min RK
4d0b37292d gitignore generated metrics.md 2022-12-07 15:10:42 +01:00
Min RK
d4a98738f1 Merge pull request #4249 from minrk/rst2myst
convert remaining rst files to myst
2022-12-07 14:35:19 +01:00
pre-commit-ci[bot]
3884d556b0 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-12-07 13:17:26 +00:00
Erik Sundell
71d5e604cb docs: use MyST fieldlist and substitution 2022-12-07 14:16:22 +01:00
Erik Sundell
f3bb3651b3 docs: remove redundant currentmodule directive, fix indentation 2022-12-07 13:11:23 +01:00
Erik Sundell
8bdd5a58a4 Merge pull request #4250 from minrk/figure-typo
fix bracket typo in capacity figures
2022-12-07 12:29:03 +01:00
Min RK
0085febc1c fix bracket typo in capacity figures 2022-12-07 09:43:04 +01:00
Min RK
8b988dc0be fix link targets after rst2myst 2022-12-07 09:42:26 +01:00
Min RK
b859818a9c switch generate-metrics to markdown 2022-12-07 09:02:09 +01:00
Min RK
832e8c0348 run rst2myst 2022-12-07 08:58:00 +01:00
Simon Li
5b7b9b5677 Merge pull request #4248 from consideRatio/pr/fix-py36-detail
maint: fix detail when removing support for py36
2022-12-06 19:05:19 +00:00
Erik Sundell
1d0496fc80 Merge pull request #4247 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-12-06 18:13:35 +01:00
Erik Sundell
4ff76d6d85 Merge pull request #4246 from jupyterhub/dependabot/npm_and_yarn/jsx/decode-uri-component-0.2.2
build(deps): bump decode-uri-component from 0.2.0 to 0.2.2 in /jsx
2022-12-06 18:13:15 +01:00
Erik Sundell
97e51fe54f maint: fix detail when removing support for py36 2022-12-06 18:06:40 +01:00
pre-commit-ci[bot]
19a375fba2 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/asottile/pyupgrade: v3.2.2 → v3.3.0](https://github.com/asottile/pyupgrade/compare/v3.2.2...v3.3.0)
2022-12-06 00:31:36 +00:00
dependabot[bot]
e5d48f419f build(deps): bump decode-uri-component from 0.2.0 to 0.2.2 in /jsx
Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2)

---
updated-dependencies:
- dependency-name: decode-uri-component
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-05 13:45:13 +00:00
Min RK
e9c0fc6eb7 Bump to 3.2.0.dev 2022-12-05 14:45:03 +01:00
Min RK
eca9c00872 Bump to 3.1.0 2022-12-05 14:44:43 +01:00
Min RK
e6e2a7d003 Merge pull request #4232 from minrk/changelog-3.1
changelog for 3.1.0
2022-12-05 14:44:02 +01:00
Min RK
b35a78240c changelog for 1.5.1 2022-12-05 14:02:36 +01:00
Min RK
d317c067d1 Update changelog for 3.1.0 2022-12-05 13:35:59 +01:00
Simon Li
cfc93d8555 doc: fix formatting of spawner env-vars 2022-12-02 17:39:11 +00:00
Erik Sundell
681ff09e06 Merge pull request #4233 from minrk/ci-db-versions
ci: update database image versions
2022-12-01 16:40:03 +01:00
Erik Sundell
0d72280e5d Merge pull request #4214 from yuvipanda/metricsss
Add active users prometheus metrics
2022-12-01 15:45:59 +01:00
mouse1203
ab8629642d token cases, updating cases according last review
adding checks token from db, adding some explanations to async sleep(still wip),  renamed few cases (spawn_panding, token), adding "cleanup_after" fixture into def browser()
2022-12-01 15:43:40 +01:00
Simon Li
dca8725876 Merge pull request #4240 from minrk/default-named-server-doc
clarify docstrings for default_server_name
2022-12-01 14:20:37 +00:00
Min RK
3bb1d640ee clearer descriptions of default_server_name behavior
Co-authored-by: Jörg Behrmann <behrmann@physik.fu-berlin.de>
2022-12-01 14:52:23 +01:00
Min RK
954e64e3ca clarify docstrings for default_server_name
and warn if default_server_name is specified but named servers not enabled
2022-12-01 14:39:19 +01:00
Min RK
58475ffcfd make active_users config and methods consistent
- use interval instead of period to match other interval config
- avoid redundant `metric` in both class and method/attr names
- interval is separate per metric group (only one for now)
2022-12-01 14:22:47 +01:00
Georgiana
181aec31af Merge pull request #4236 from minrk/deprecate-extra-handlers
deprecate JupyterHub.extra_handlers
2022-12-01 13:41:36 +02:00
Min RK
c6ac4e0d34 test active users metrics 2022-12-01 10:23:51 +01:00
Min RK
8fe875430a Merge pull request #4209 from ArafatAbdussalam/patch-2
avoid contraction in setup.rst
2022-12-01 09:01:23 +01:00
Min RK
f2dcf96bef remove unused monthy_active_users metric
just jupyterhub_active_users now

Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
2022-12-01 08:25:44 +01:00
Yuvi Panda
6e90059580 Merge pull request #4230 from minrk/logout-clear-user
make current_user available to handle_logout hook
2022-11-30 15:19:01 -08:00
Min RK
0a2e6a4042 Merge pull request #4127 from ArafatAbdussalam/branch1
update troubleshooting.md docs
2022-11-30 14:11:53 +01:00
Arafat Abdussalam
672ef34d9b update troubleshooting.md docs
I fixed the grammatical errors on the docs

address review

Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
2022-11-30 14:01:13 +01:00
Min RK
2d9285d447 Merge pull request #4156 from liliyao2022/patch-5
Update dockerfile README
2022-11-30 13:54:02 +01:00
Chris Holdgraf
859cff345c Merge pull request #4008 from minrk/capacity-planning 2022-11-30 12:10:16 +01:00
Min RK
4938ed66b6 set base jupyterhub db upgrade-from test version to 1.1
jupyterhub 1.0 is not compatible with more recent mysql
2022-11-30 11:58:37 +01:00
Min RK
770325f695 deprecate JupyterHub.extra_handlers
I don't think we should encourage in-memory extensions.

Point to services, instead.
2022-11-30 11:52:33 +01:00
Min RK
ec8e6e2e4a ci: update database image versions
mysql: 8.0
postgres: 15.1
2022-11-30 09:48:54 +01:00
Min RK
f7ce07ee9e changelog for 3.1.0 2022-11-30 09:45:11 +01:00
Min RK
2b70e768e5 Merge pull request #4229 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-11-29 14:59:21 +01:00
Min RK
6d7341b478 clear user before rendering logout page
instead of in clear_login_cookie

ensures current_user is accessible in `handle_logout` hook
2022-11-29 10:04:22 +01:00
pre-commit-ci[bot]
b76e308e71 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/PyCQA/autoflake: v1.7.7 → v2.0.0](https://github.com/PyCQA/autoflake/compare/v1.7.7...v2.0.0)
- [github.com/pre-commit/pre-commit-hooks: v4.3.0 → v4.4.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.3.0...v4.4.0)
- [github.com/PyCQA/flake8: 5.0.4 → 6.0.0](https://github.com/PyCQA/flake8/compare/5.0.4...6.0.0)
2022-11-29 01:55:14 +00:00
Min RK
eac96acadd Merge pull request #4150 from liliyao2022/patch-2
grammar improvements in quickstart.md
2022-11-24 11:26:40 +01:00
Min RK
9992e26a8c Merge pull request #4185 from lumenCodes/instFaq
Edits to institutional FAQ
2022-11-24 11:26:11 +01:00
Min RK
0ec4852800 add 'you will need' to dockerfile readme requirements 2022-11-24 11:25:46 +01:00
Min RK
fdf9fbb65b connect users with infrastructure 2022-11-24 11:23:59 +01:00
Min RK
2f81ea8fb1 Merge pull request #4172 from liliyao2022/patch-10
Deleted unused failRegexEvent
2022-11-24 11:22:40 +01:00
Min RK
cab9c1d9ab Merge pull request #4130 from lumenCodes/tempaltesdoc
refine text in template docs.
2022-11-24 11:20:58 +01:00
Lili Yao
fd172a56e0 grammer improvements in quickstart.md
Modified some grammar issues.
2022-11-24 11:20:23 +01:00
Min RK
6b6946fe8a Merge pull request #4136 from yamakat/Improve-on-documentation-websecurity.md
Update wording in web security docs
2022-11-24 11:18:51 +01:00
Min RK
e97d5c6662 Merge branch 'main' into tempaltesdoc 2022-11-24 11:15:49 +01:00
Min RK
343fe70393 Merge pull request #4072 from ruqayaahh/templates-docs-contributions
[doc] templates: updated obsolete links and made wordings clearer
2022-11-24 11:12:45 +01:00
Min RK
b048bbcd9e Merge pull request #4084 from melissakirabo/patch-1
Refine text in documentation index
2022-11-24 11:07:18 +01:00
Min RK
5639b3a622 Apply suggestions from code review 2022-11-24 11:04:16 +01:00
Min RK
08e6da7584 Merge pull request #4186 from emmanuella194/main
highlight "what is our actual goal" in faq
2022-11-24 10:11:34 +01:00
Min RK
385a4556a4 Merge pull request #4119 from PoorvajaRayas/PoorvajaRayas
Formatting changes to tests.rst
2022-11-24 10:10:00 +01:00
Min RK
40b8393c4b Merge pull request #4094 from Busayo-ojo/busayo-ojo
Fixed typos and added punctuations
2022-11-24 10:09:34 +01:00
Emmanuella Orioma
65464c7029 Updated faq.md
I think the *But what is our actual goal* should be an heading for better reading experience
2022-11-24 10:08:46 +01:00
PoorvajaRayas
869f2dd08d Reviewed documentation and fixed grammatical errors 2022-11-24 10:06:40 +01:00
Min RK
8b471624ee Merge branch 'main' into busayo-ojo 2022-11-24 10:04:08 +01:00
Min RK
51c1ea1f7f restore 'the'
Co-authored-by: Georgiana <georgiana.dolocan@gmail.com>
2022-11-24 10:02:53 +01:00
Min RK
d04c0c28c0 Merge pull request #2641 from ericdill/copyediting
Some suggestions from reading through the docs
2022-11-24 09:46:29 +01:00
pre-commit-ci[bot]
33fa9b953b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-11-24 08:41:13 +00:00
Min RK
de5fb1e7ce Merge branch 'main' into copyediting 2022-11-24 09:40:21 +01:00
Min RK
1cf13bea66 Merge pull request #4210 from ArafatAbdussalam/patch-3
grammar in security-basics.rst
2022-11-24 09:21:13 +01:00
pre-commit-ci[bot]
abe7150ffe [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-11-23 10:22:56 +00:00
Erik Sundell
95e5a5dea8 Merge pull request #4227 from consideRatio/pr/docs-cleanup
docs: refresh conf.py, add opengraph and rediraffe extensions
2022-11-23 10:45:42 +01:00
YuviPanda
f05778a1ae Add comment clarifying why we freeze time 2022-11-22 14:23:21 -08:00
YuviPanda
06fb211283 Make duration be a label on the metric
- Stops ambiguous wording on 'monthly', use more precise '30d'
- Add a 7d active users metric
- Allows us to make this configurable in the future if needed
2022-11-22 14:18:15 -08:00
Erik Sundell
f877588e52 docs: fix rST syntax error for italics 2022-11-22 17:47:37 +01:00
Erik Sundell
bfe0186ad2 docs: add rediraffe sphinx extension
This extension helps us restructure our documentation without creating
dead links. It requires us to explicitly declare what should be
redirected where though.

It seems better to have it in place ahead of time than to be something
we ask a contributor add just in time when its needed.
2022-11-22 17:47:37 +01:00
Erik Sundell
d23e095106 docs: add opengraph sphinx extension
This extension helps add metadata etc to the rendered HTML documentation
to help for example links on discourse.jupyter.org look good.
2022-11-22 17:47:37 +01:00
Erik Sundell
96d4486ae5 docs: refresh conf.py for readability 2022-11-22 17:47:37 +01:00
Erik Sundell
98710dbc8b Merge pull request #4223 from consideRatio/pr/requirements-details
maint: add test to extras_require, remove greenlet workaround, test final py311, misc cleanup
2022-11-22 17:24:23 +01:00
pre-commit-ci[bot]
8ac3a8e4e6 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-11-22 12:53:06 +00:00
Erik Sundell
0575022186 docs: install jupyterhub package and remove path setup steps
When we install the jupyterhub package, we don't have to put it on the
path explicitly.
2022-11-22 13:51:28 +01:00
Erik Sundell
1ac9c443b5 maint: add test to extras_require, remove dev-requirements.txt 2022-11-22 13:51:28 +01:00
Erik Sundell
08ed8443f2 maint: install html5lib via beautifulsoup4's extra_requires 2022-11-22 13:45:57 +01:00
Erik Sundell
0cdaa833c4 maint: remove unused urllib3 from test requirements 2022-11-22 13:45:57 +01:00
Erik Sundell
87ce2a9b2f maint: add jsonschema to test requirements and cleanup attrs constraint 2022-11-22 13:45:57 +01:00
Erik Sundell
f26b43f209 maint: remove no longer needed py311 greenlet workaround 2022-11-22 13:45:55 +01:00
Erik Sundell
e6e84eabb3 ci: focus tests towards py311 over py310 2022-11-22 13:43:11 +01:00
Erik Sundell
4fadfd42da Merge pull request #4225 from minrk/selenium-wait
selenium: update next_url after waiting for it to change
2022-11-22 09:56:03 +01:00
Min RK
29d84f4192 selenium: update next_url after waiting for it to change 2022-11-22 09:41:24 +01:00
Min RK
fc7ef39f21 Merge pull request #4211 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-11-21 15:21:02 +01:00
Min RK
d5d9cb204c Merge pull request #4219 from consideRatio/pr/stricter-flake8
pre-commit: add autoflake and make flake8 checks stricter
2022-11-21 15:10:14 +01:00
pre-commit-ci[bot]
9d592fff31 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-11-18 15:43:10 +00:00
Erik Sundell
12594631e0 maint: use __all__ statements where its reasonable to do
Co-authored-by: Simon Li <orpheus+devel@gmail.com>
2022-11-18 16:42:43 +01:00
Min RK
ffbc981bfe Merge pull request #4222 from consideRatio/pr/docs-maintenance
docs: sphinx config cleanup, removing epub build, fix build warnings
2022-11-17 14:43:33 +01:00
Erik Sundell
7f3fd7e3cc docs: fix broken links and formatting errors 2022-11-17 13:38:25 +01:00
Erik Sundell
1c9499e91e docs: remove epub documentation build 2022-11-17 13:09:06 +01:00
Erik Sundell
26e5efeec4 docs: cleanup unused config for htmlhelp, latex, manual 2022-11-17 13:08:17 +01:00
Erik Sundell
90811196d7 docs: remove unused alabaster_jupyterhub requirement 2022-11-17 13:00:22 +01:00
Min RK
a917de258f Merge pull request #4221 from jupyterhub/dependabot/npm_and_yarn/jsx/loader-utils-2.0.4
Bump loader-utils from 2.0.2 to 2.0.4 in /jsx
2022-11-17 09:24:04 +01:00
dependabot[bot]
5d7383278f Bump loader-utils from 2.0.2 to 2.0.4 in /jsx
Bumps [loader-utils](https://github.com/webpack/loader-utils) from 2.0.2 to 2.0.4.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v2.0.4/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v2.0.2...v2.0.4)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-17 04:52:44 +00:00
pre-commit-ci[bot]
865d5f7646 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-11-16 14:53:12 +00:00
Erik Sundell
5a5e0118b8 docs: comment about isort, black, tbump in pyproject.toml 2022-11-16 15:51:26 +01:00
Erik Sundell
b9596b2dee pre-commit: add autoflake 2022-11-16 15:51:26 +01:00
Erik Sundell
3b5b42e620 flake8: manual F408 fix, avoid indirect import of public_host / public_url 2022-11-16 15:51:26 +01:00
Erik Sundell
7a9491c323 flake8: check F408 about unused imports, manual fixes only 2022-11-16 15:51:26 +01:00
Erik Sundell
957fd9cc20 flake8: check F811 about redefinition of unused name 2022-11-16 15:51:26 +01:00
Erik Sundell
eaa096152a flake8: check F403 about import * 2022-11-16 15:51:26 +01:00
Min RK
5ea93add28 Merge pull request #4216 from consideRatio/pr/cleanup-flake8-config
ci: flake8, cleanup unused/redundant config
2022-11-16 09:06:43 +01:00
Erik Sundell
b77e9cbf08 ci: flake8, add back general ignore of pydocstyle warnings 2022-11-16 08:54:23 +01:00
Erik Sundell
24dfa5d228 ci: flake8, cleanup unused/redundant config
- E### warnings were already ignored by E
- Sorting of import warnings won't matter as we have black and isort
- D400: First line should end with a period

  This is not flake8 configuration, but related to `pydocstyle`, which
  isn't used.
2022-11-16 08:16:44 +01:00
Yuvi Panda
98603ef3e4 Merge pull request #4208 from ArafatAbdussalam/patch-1
improved the grammatical structure
2022-11-15 16:09:12 -08:00
YuviPanda
06aded4bce Fix some typos 2022-11-15 16:01:20 -08:00
YuviPanda
a2e80e5d6f Add daily & monthly active users prometheus metrics
These are *extremely useful* for people advocating for
more resources for their JupyterHubs, but a little difficult
to calculate without a full scale log ingestion and analytics
pipeline (such as ELK or equivalent). However, these are easy
to calculate on the JupyterHub side at any given instance -
these are fairly quick SQL queries. Prometheus can capture and
store this as a timeseries, and provide valuble advocacy data
that is hard to get otherwise.

This turns the metrics on by default, but only updates them every
hour - which seems fine for metrics that don't change that often.
This should reduce performance impact. Admins can also turn this
off if needed.

I've had to implement this in many different ways in many different
contexts, and it's also important to be able to *trust* these. Getting
this from other grafana data can be tricky to validate - we had an
experimental one in our grafana dashboards at some point in the past
that we had to kill due to it being hard to validate
(https://github.com/jupyterhub/grafana-dashboards/pull/45). This metric
will provide an authoritative source of truth for this.

Ref https://github.com/2i2c-org/infrastructure/issues/1888
2022-11-15 15:43:01 -08:00
pre-commit-ci[bot]
c993163f0b [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/asottile/pyupgrade: v3.2.0 → v3.2.2](https://github.com/asottile/pyupgrade/compare/v3.2.0...v3.2.2)
2022-11-15 00:12:51 +00:00
Arafat Abdussalam
e6e890b46c Update security-basics.rst 2022-11-14 11:22:12 +01:00
Arafat Abdussalam
d2c6ae925f modified setup.rst
When I needed to set up Linux on my windows, i found out the easier to do so was through Windows Subsystem for Linux. Hence, I needed to add the guide to the development setup
2022-11-14 10:45:14 +01:00
Arafat Abdussalam
32cddfbdfe Update docs.rst 2022-11-14 10:30:56 +01:00
mouse1203
7dee409218 Delete test_browser.py
Delete test_browser.py under jupyterhub/tests/ which was added to this folder accidentally
2022-11-11 12:59:11 +01:00
mouse1203
7dc230581c more selenium test cases
- revoking tokens
- logout
- token page
2022-11-11 10:53:33 +01:00
Simon Li
730fe5a446 Merge pull request #4204 from minrk/access-servers
[docs] typo in access:servers scope
2022-11-11 08:41:31 +00:00
Min RK
2ed84b0de1 typo in access:servers scope
it's not access:users:servers
2022-11-11 09:23:23 +01:00
pre-commit-ci[bot]
a5a61893fb [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-11-02 14:22:56 +00:00
vpopescu
67f5543e18 Merge branch 2022-11-02 15:22:21 +01:00
Your Name
de1757bf57 Deleted unused failRegexEvent 2022-11-02 09:23:45 +01:00
Min RK
54c06c33bd Merge pull request #4188 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-11-01 09:05:17 +01:00
Min RK
17119a273f Merge pull request #4187 from consideRatio/main
ci: use non-deprecated codecov uploader
2022-11-01 09:01:22 +01:00
Min RK
7effe53c28 Merge pull request #4139 from Joel-Ando/Joel-Ando-patch-1
highlight note about the docker image scope
2022-11-01 08:50:58 +01:00
Joel-Ando
59f14ad7c0 Update quickstart-docker.rst 2022-11-01 08:50:25 +01:00
pre-commit-ci[bot]
54a5d2c152 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/asottile/pyupgrade: v3.1.0 → v3.2.0](https://github.com/asottile/pyupgrade/compare/v3.1.0...v3.2.0)
- [github.com/pre-commit/mirrors-prettier: v3.0.0-alpha.3 → v3.0.0-alpha.4](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.0-alpha.3...v3.0.0-alpha.4)
2022-11-01 00:03:21 +00:00
Erik Sundell
b83a6250ba ci: use non-deprecated codecov uploader 2022-10-31 19:36:37 +01:00
pre-commit-ci[bot]
ca6aba7568 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-28 14:55:47 +00:00
lumenCodes
49ec485614 Merge branch 'main' of https://github.com/jupyterhub/jupyterhub into instFaq 2022-10-28 15:51:08 +01:00
lumenCodes
8de25d08a7 I fixed typo errors and structure 2022-10-28 15:50:47 +01:00
Min RK
a7cfc76a82 Merge pull request #4113 from EstherChristopher/patch-2
proofread upgrading docs
2022-10-28 15:14:32 +02:00
Esther Christopher
c19b3b540a Update upgrading.rst
Hopefully, it's all sorted now and gets merged. Sorry for the back and forth.
2022-10-28 13:50:02 +01:00
Chinwendu
5ec1cf86a7 Update docs/source/reference/templates.md
Co-authored-by: Min RK <benjaminrk@gmail.com>
2022-10-27 14:06:45 +01:00
Min RK
2594a7269e Merge pull request #4140 from Joel-Ando/Joel-Ando-patch-2
add link to rbac index from implementation
2022-10-27 15:00:22 +02:00
Min RK
f20021c068 Merge pull request #4173 from liliyao2022/patch-11
jsx: remove unused useState
2022-10-27 14:28:16 +02:00
Min RK
5708de05ff Merge pull request #4129 from lumenCodes/restapidoc
reorder REST API doc
2022-10-27 14:21:12 +02:00
Min RK
28f2ba9df9 Merge pull request #4168 from lumenCodes/proxy
clarify CHP downsides in proxy doc
2022-10-27 14:19:50 +02:00
Min RK
35297ce87f Merge pull request #4167 from lumenCodes/services
Proofread services.md
2022-10-27 14:17:09 +02:00
Min RK
73d97c0a82 Merge pull request #4109 from EstherChristopher/patch-1
Reviewed the documentation
2022-10-27 14:11:37 +02:00
Esther Christopher
f0957ad247 Resolve conflicts in event doc 2022-10-27 14:10:41 +02:00
pre-commit-ci[bot]
777bbe8e92 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-26 18:06:17 +00:00
lumenCodes
3eb6cd302c Applied PR Changes 2022-10-26 19:02:42 +01:00
lumenCodes
438b285670 I effected PR requested changes 2022-10-26 18:44:51 +01:00
pre-commit-ci[bot]
cf2ec324b7 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-26 17:23:20 +00:00
Chinwendu
b33b8772d3 Merge branch 'main' into restapidoc 2022-10-26 18:22:47 +01:00
pre-commit-ci[bot]
6a4078f977 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-26 17:17:20 +00:00
lumenCodes
12de64828c update to the proxy file. 2022-10-26 18:12:23 +01:00
lumenCodes
23506a25e5 applied PR change suggestions 2022-10-26 11:44:13 +01:00
lumenCodes
8ffa07e82d Update to the services.md 2022-10-26 11:44:13 +01:00
Esther Christopher
2019bd2797 Update upgrading.rst
Hi @minrk, I went through the reference files you sent and made the necessary adjustments. I think everything should be fine now. I also added a new correction. Please review and revert.
2022-10-26 11:24:53 +01:00
Min RK
88e2346bf2 Merge pull request #4171 from liliyao2022/patch-9
typos in example readme
2022-10-26 10:02:02 +02:00
Min RK
2bb7594cd1 Merge pull request #4170 from KaluBuikem/patch-2
Updated deployment gallery links
2022-10-26 10:01:12 +02:00
Min RK
36d596a4d3 Merge pull request #4169 from emmanuella194/main
typo in contributing doc
2022-10-26 09:42:05 +02:00
Min RK
d9c36ed725 Merge pull request #4166 from lumenCodes/contributing
Welcome first-time contributors to the forum
2022-10-26 09:39:38 +02:00
Lili Yao
cb5cc8c1b4 Update Groups.jsx
"useState" was not used in this file.
2022-10-26 17:58:26 +11:00
Lili Yao
76f7ff4721 Update README.md
Corrected some spelling errors.
2022-10-26 15:44:52 +11:00
pre-commit-ci[bot]
22d2bbe1ae [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-26 00:51:27 +00:00
Kalu Chibuikem Victor
d215248d8a Updated gallery-jhub-deployments.md
I embedded links into the text and updated minor text errors
2022-10-26 01:50:28 +01:00
Emmanuella Orioma
488331e033 Update docs.rst
I corrected the spelling error in line 21
2022-10-25 23:26:16 +03:00
Chinwendu
cde1b65252 Update docs/source/contributing/community.md
Co-authored-by: Min RK <benjaminrk@gmail.com>
2022-10-25 16:11:52 +01:00
Joel-Ando
5f32abeeba Update tech-implementation.md 2022-10-25 14:55:53 +01:00
Min RK
41cbcc9502 Merge pull request #4021 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-10-25 10:37:38 +02:00
Min RK
297c40195c Merge pull request #4106 from alwasega/server
Edited and restructured `server-api` file
2022-10-25 10:14:10 +02:00
Min RK
209eb4468e Merge pull request #4157 from Uzor13/rest-api-doc
Updated JupyterHub's REST API doc
2022-10-25 09:57:47 +02:00
pre-commit-ci[bot]
7c92902e48 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-24 23:10:47 +00:00
pre-commit-ci[bot]
d5beda293b [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/asottile/pyupgrade: v2.37.3 → v3.1.0](https://github.com/asottile/pyupgrade/compare/v2.37.3...v3.1.0)
- [github.com/psf/black: 22.6.0 → 22.10.0](https://github.com/psf/black/compare/22.6.0...22.10.0)
- [github.com/pre-commit/mirrors-prettier: v2.7.1 → v3.0.0-alpha.3](https://github.com/pre-commit/mirrors-prettier/compare/v2.7.1...v3.0.0-alpha.3)
2022-10-24 23:08:59 +00:00
pre-commit-ci[bot]
3b4c40e5e0 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-24 18:22:26 +00:00
Uzochukwu Precious
5cfa16dbfd review update 2022-10-24 19:21:43 +01:00
lumenCodes
7a22a2cf93 Addittion to the contributing .md 2022-10-24 17:36:38 +01:00
pre-commit-ci[bot]
eb72067ab3 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-24 14:46:42 +00:00
Allan Wasega
3da4dc66c9 Incorporated suggested edits 2022-10-24 17:44:57 +03:00
Allan Wasega
87c2d545df Merge branch 'jupyterhub:main' into server 2022-10-24 17:00:33 +03:00
Joel-Ando
3e4cc0b869 Update tech-implementation.md 2022-10-24 14:14:48 +01:00
Min RK
de8d1b71f8 Merge pull request #4153 from Teniola-theDev/patch-1
Consistent capitalization of Authenticator
2022-10-24 14:43:30 +02:00
Min RK
af7494c460 Merge pull request #4026 from mouse1203/main
Add browser-based tests with Selenium
2022-10-24 14:41:24 +02:00
Joel-Ando
d0a48c0655 Update tech-implementation.md 2022-10-24 13:28:28 +01:00
Teniola Olowookere
48fc74b9b4 removed extra text 2022-10-24 13:17:52 +01:00
Min RK
54ac5226b3 Merge pull request #4152 from emmanuella194/main
Link back to rbac from use-cases
2022-10-24 14:15:27 +02:00
Emmanuella Orioma
ce9feb5139 Update use-case.md
changed RBAC documentation url to the internal rbac jupyter documentation
2022-10-24 15:09:29 +03:00
Teniola Olowookere
ec0cb70f35 removed duplicate link 2022-10-24 13:08:52 +01:00
Teniola Olowookere
c0af08fabd Merge branch 'jupyterhub:main' into patch-1 2022-10-24 13:07:32 +01:00
Teniola Olowookere
a2e59e6867 Update docs/source/getting-started/authenticators-users-basics.md
Co-authored-by: Min RK <benjaminrk@gmail.com>
2022-10-24 13:03:04 +01:00
Min RK
4859c62381 Merge pull request #4154 from minrk/rm-redundant-roles-target
Remove redundant ref target for roles
2022-10-24 13:44:26 +02:00
mouse1203
9b7a77c36f selenium: added docstrings
added docstrings, parameter for open_url function, removed element function (unused)
2022-10-24 13:09:46 +02:00
Min RK
ab7ec8b33d Merge pull request #4160 from Christiandike/update/configsudo.md
Update/configsudo.md
2022-10-24 12:57:53 +02:00
Min RK
15c691b358 Merge pull request #4162 from liliyao2022/patch-8
Typo in institutional-faq
2022-10-24 12:44:03 +02:00
Christian Dike
1c95d94b96 Update config-sudo.md 2022-10-24 11:38:58 +01:00
Christian Dike
e76e9099c2 Update docs/source/reference/config-sudo.md
Co-authored-by: Min RK <benjaminrk@gmail.com>
2022-10-24 11:33:48 +01:00
Min RK
63cd63ffee Merge pull request #4161 from Christiandike/update/separate-proxy.md
Improve text in proxy docs
2022-10-24 12:33:07 +02:00
Min RK
2c4c5fc6fe Merge pull request #4159 from liliyao2022/patch-7
Update roadmap.md
2022-10-24 11:35:52 +02:00
Min RK
c788d6f087 Merge pull request #4158 from liliyao2022/patch-6
Update README.md
2022-10-24 11:35:14 +02:00
Min RK
a1c94a6e13 Merge pull request #4098 from NPDebs/main
Proofread and Improve security-basics.rst
2022-10-24 11:33:05 +02:00
Min RK
37bf8e0724 Merge pull request #4118 from falyne/main
Capitalization typo in troubleshooting.md
2022-10-24 10:52:39 +02:00
Min RK
56161c2aa6 Merge pull request #4155 from Christiandike/update/oauth.md
Add link to OAuth 2
2022-10-24 10:44:16 +02:00
Min RK
66a86f5db0 Merge pull request #4090 from alwasega/community
Restructured Community communication channels file
2022-10-24 10:28:20 +02:00
Min RK
ea0462de1a Merge pull request #4164 from jupyterhub/dependabot/github_actions/docker/setup-buildx-action-2.2.1
Bump docker/setup-buildx-action from 2.1.0 to 2.2.1
2022-10-24 09:21:51 +02:00
dependabot[bot]
37be9b4a5b Bump docker/setup-buildx-action from 2.1.0 to 2.2.1
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2.1.0 to 2.2.1.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](95cb08cb26...8c0edbc76e)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-24 05:27:46 +00:00
Lili Yao
c4d8be22b6 Update institutional-faq.md
Corrected a spelling error.
2022-10-24 12:51:48 +11:00
pre-commit-ci[bot]
ced408c205 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-23 19:18:11 +00:00
Christian Dike
5ce930324c Update separate-proxy.md 2022-10-23 20:16:46 +01:00
Christian Dike
36b15d7ce0 Update separate-proxy.md 2022-10-23 20:11:36 +01:00
Christian Dike
7b636b6f9c Update config-sudo.md 2022-10-23 19:26:24 +01:00
Christian Dike
35b06481e2 Update config-sudo.md 2022-10-23 19:03:32 +01:00
Joel-Ando
18b049e3c9 Update tech-implementation.md 2022-10-23 16:23:35 +01:00
Joel-Ando
6b62fe794e Update tech-implementation.md
did the necessary changes
2022-10-23 16:13:20 +01:00
Lili Yao
ad25ef8f87 Update roadmap.md
It seems that we don't need an "a" here, or should we change it to "an" instead?
2022-10-23 15:42:57 +11:00
Lili Yao
61369ea5da Update README.md
Modified some spelling and grammar errors.
2022-10-23 13:53:02 +11:00
Emmanuella Orioma
a17b4c5801 Updated use-cases.md
Added the RBAC jupyter documentation link
2022-10-22 22:23:26 +03:00
Deborah Udoh
750d36a8f7 Update security-basics.rst 2022-10-22 11:19:27 +01:00
Deborah Udoh
23fc2f42d0 Update security-basics.rst
Co-authored-by: Min RK <benjaminrk@gmail.com>
2022-10-22 10:41:10 +01:00
Deborah Udoh
29ba669c73 Update security-basics.rst 2022-10-22 10:32:16 +01:00
Uzochukwu Precious
eb8f338186 Updated JupyterHub's REST API doc 2022-10-22 10:02:39 +01:00
Melissa Kirabo
76f9cf00c4 Update index.rst 2022-10-22 10:55:50 +03:00
Ngobiri Falyne
fc5f55caf9 Update troubleshooting.md
I replaced the comma, 
adjusted jupyterhub to JuputerHub
and the others as adiced
2022-10-22 06:53:16 +01:00
Lili Yao
131da596c5 Update README.md 2022-10-22 11:26:18 +11:00
Christian Dike
70bfdd6d00 update oauth.md 2022-10-22 00:51:38 +01:00
Christian Dike
02f33073ad update oauth.md 2022-10-22 00:37:08 +01:00
Esther Christopher
411189e54c Update upgrading.rst 2022-10-22 00:32:18 +01:00
Allan Wasega
9f5f19cb26 Fixed minor errors 2022-10-22 01:06:56 +03:00
Allan Wasega
9d93df6baf Fixed a minor error 2022-10-22 00:57:04 +03:00
pre-commit-ci[bot]
39eb1f055f [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-21 21:40:42 +00:00
Allan Wasega
74b0ebefe9 Fixed minor issues in community communication channels file 2022-10-22 00:34:23 +03:00
pre-commit-ci[bot]
28867760a4 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-21 21:05:16 +00:00
Allan Wasega
7a0b98d9ce Updated the server-api file with all comments 2022-10-22 00:04:37 +03:00
Allan Wasega
14e9155eb8 Merge branch 'jupyterhub:main' into server 2022-10-21 23:53:47 +03:00
pre-commit-ci[bot]
7ce4b13998 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-21 20:41:36 +00:00
Allan Wasega
5a16d770da Updated the server-api file as per review comments 2022-10-21 23:41:06 +03:00
Teniola Olowookere
b741a30dc3 Update docs/source/getting-started/authenticators-users-basics.md
I committed your suggestion about changing the target for the "roles". Thank you!

Co-authored-by: Min RK <benjaminrk@gmail.com>
2022-10-21 20:25:21 +01:00
Min RK
aebe33b62b Remove redundant ref target for roles
it's already addressable at that same target name,
having this here results in ambiguous ref targets in MyST
2022-10-21 15:59:49 +02:00
pre-commit-ci[bot]
794a1aa70f [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-21 13:44:46 +00:00
Teniola Olowookere
4e45b89ed1 Capitalised some words 2022-10-21 14:40:24 +01:00
mtkmtk
cd969c5dc4 Update websecurity.md 2022-10-21 10:31:24 -03:00
mtkmtk
de4117cba9 Update docs/source/reference/websecurity.md
Co-authored-by: Min RK <benjaminrk@gmail.com>
2022-10-21 10:25:09 -03:00
Sarah Gibson
f4c129a649 Merge pull request #4148 from Christiandike/update/spawners.md 2022-10-21 14:08:15 +01:00
Emmanuella Orioma
69e973d53a Update use-case.md
Worked on the documentation page  (jupyterhub/docs/source/rbac/use-case.md)

Added a wikipedia reference to [RBCA framework] and also emphasized on the solution under the *service to cull idle servers*
2022-10-21 13:21:20 +01:00
mtkmtk
f566559f9a Merge branch 'main' into Improve-on-documentation-websecurity.md 2022-10-21 09:17:48 -03:00
Christian Dike
37b82f7c2a Update docs/source/reference/spawners.md
Co-authored-by: Sarah Gibson <44771837+sgibson91@users.noreply.github.com>
2022-10-21 12:05:12 +01:00
Christian Dike
a71f6be001 Update docs/source/reference/spawners.md
Co-authored-by: Sarah Gibson <44771837+sgibson91@users.noreply.github.com>
2022-10-21 12:04:45 +01:00
Min RK
3da7021faa Merge pull request #4147 from Teebarh/mychanges
Added punctuations and capitalized words where necessary.
2022-10-21 10:34:24 +02:00
Melissa Kirabo
7330babc7e Update index.rst 2022-10-21 11:34:12 +03:00
Min RK
eeb0e506f3 Merge pull request #4146 from lumenCodes/spawners-basic
Update to the spawner basic file
2022-10-21 10:31:03 +02:00
Min RK
d59d856fa6 Merge pull request #4145 from softkeldozy/configuration_branch
Added text to documentation for more readability
2022-10-21 10:30:08 +02:00
Min RK
a7df46ead7 Merge pull request #4126 from PoorvajaRayas/patch-1
Update troubleshooting.md
2022-10-21 10:15:25 +02:00
Min RK
cb03c6035a Merge pull request #4116 from Eshy10/main
Upgrading.rst (Fix Duplicate statement)
2022-10-21 10:11:20 +02:00
Melissa Kirabo
037943728f Update docs/source/index.rst
Co-authored-by: Min RK <benjaminrk@gmail.com>
2022-10-21 11:07:44 +03:00
Melissa Kirabo
42918352a8 Update docs/source/index.rst
Co-authored-by: Min RK <benjaminrk@gmail.com>
2022-10-21 11:06:55 +03:00
Melissa Kirabo
ec18f7b65a Update docs/source/index.rst
Co-authored-by: Min RK <benjaminrk@gmail.com>
2022-10-21 11:04:04 +03:00
Christian Dike
69869ee823 update spawners.md 2022-10-21 01:49:36 +01:00
Christian Dike
fedcd22b0c update spawners.md 2022-10-21 01:29:31 +01:00
Esther Christopher
2f4691e692 Merge branch 'main' into patch-2 2022-10-20 21:15:43 +01:00
mtkmtk
aaffb66bef Updating websecurity.md after first review 2022-10-20 16:42:51 -03:00
Esther Christopher
e228b017e9 Merge branch 'main' into patch-1 2022-10-20 20:30:50 +01:00
Toyibat Adele
8e111665cd Added Punctuations and Capitalized words where necessary. 2022-10-20 17:44:56 +01:00
Sarah Gibson
283d2b75b6 Merge pull request #4135 from Christiandike/update/websecurity 2022-10-20 17:37:36 +01:00
Sarah Gibson
3f73671adf Merge pull request #4114 from alexanderchosen/alexanderchosen 2022-10-20 17:36:00 +01:00
Adewale Modupe
459793010b Merge branch 'main' into main 2022-10-20 14:40:03 +01:00
Eshy10
248bf8ef83 chore: remove capitalize word and "This is" after the colon for environments 2022-10-20 14:25:36 +01:00
Kelvin Obidozie
f71388633f Added text to documentation for more readability 2022-10-20 13:38:12 +01:00
PoorvajaRayas
dd8259fb46 Updated the document by making necessary changes 2022-10-20 17:47:13 +05:30
pre-commit-ci[bot]
677895c3eb [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-20 11:55:29 +00:00
Alexander Chosen Okon
9fcaf8df52 further simplified the words in the document
I made changes to some of the words used by simplifying them to ensure that all users can easily understand the document.
2022-10-20 11:55:23 +00:00
PoorvajaRayas
cd3f37f6a6 Update troubleshooting.md 2022-10-20 17:24:55 +05:30
lumenCodes
91f06f49e0 update to the spawner basic file 2022-10-20 12:54:42 +01:00
Christian Dike
145ccfbd4f update websecurity.md 2022-10-20 10:36:59 +01:00
Ngobiri Falyne
141f5ea2b4 Update troubleshooting.md 2022-10-20 10:01:44 +01:00
pre-commit-ci[bot]
c3da12c195 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-20 09:00:35 +00:00
Ngobiri Falyne
439b96978e Update troubleshooting.md 2022-10-20 09:58:37 +01:00
Min RK
8ba57f9309 Merge pull request #4132 from ToobaJamal/edit
update spawners-basics.md
2022-10-20 10:56:15 +02:00
pre-commit-ci[bot]
1ea557c999 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-20 08:44:59 +00:00
Ngobiri Falyne
d5f5d837de Merge branch 'main' into main 2022-10-20 09:44:28 +01:00
Melissa Kirabo
462324bba8 Merge branch 'main' into patch-1 2022-10-20 11:42:10 +03:00
Min RK
1dd848e560 Merge pull request #4124 from AdrianaHelga/AdrianaHelga-patch-1
Update services-basics.md
2022-10-20 10:28:07 +02:00
Min RK
864f7dc0c1 Merge pull request #4111 from zeelyha/docs
Typo in templates.md
2022-10-20 10:00:19 +02:00
Min RK
817f6e9c35 Merge pull request #4095 from Goodiec/patch-2
Update config-proxy.md
2022-10-20 09:11:24 +02:00
Min RK
85c67dd05c Merge pull request #4088 from ToobaJamal/main
Grammatical/link fixes in upgrading doc
2022-10-20 09:05:15 +02:00
Min RK
b0c2dd01a1 Merge pull request #4097 from Mackenzie-OO7/fix-typos
Modifications to URLs docs
2022-10-20 09:03:20 +02:00
Christian Dike
281658ccce update websecurity.md
Delete erroneous text from merge conflict
2022-10-20 07:48:52 +01:00
pre-commit-ci[bot]
c14d8e3446 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-20 03:28:21 +00:00
Joel-Ando
d956563ff4 Merge branch 'main' into Joel-Ando-patch-2 2022-10-20 04:27:19 +01:00
pre-commit-ci[bot]
e389e7f6d4 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-19 20:35:22 +00:00
mtkmtk
634bd26ad4 Update websecurity.md 2022-10-19 17:32:58 -03:00
Levai Mackenzie Ágbàrà
e82bd5a96b Merge branch 'jupyterhub:main' into fix-typos 2022-10-19 18:43:22 +01:00
pre-commit-ci[bot]
9c044e863a [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-19 13:33:49 +00:00
Alexander Chosen Okon
0340e9d6ad Merge branch 'main' into alexanderchosen 2022-10-19 13:33:11 +00:00
pre-commit-ci[bot]
ecf486d678 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-19 11:59:10 +00:00
Christian Dike
587059da11 Merge branch 'main' into update/websecurity 2022-10-19 12:57:48 +01:00
Alexander Chosen Okon
6f25abac2e Update config-user-env.md
I made a few changes to the spacing used.
2022-10-19 11:49:55 +00:00
Christian Dike
7d73d5774e update websecurity.md
- fix typos/edit text
- add important links
2022-10-19 12:37:13 +01:00
Georgiana
30e652f59e Merge pull request #4081 from Christiandike/Update/docs
Migrate community channels to markdown, update text
2022-10-19 11:59:43 +02:00
Georgiana
00cc149b0d Merge pull request #4089 from Christiandike/update/tech-implementation.md
Update rbac tech-implementation docs
2022-10-19 11:51:58 +02:00
pre-commit-ci[bot]
d407c96ee8 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-19 09:47:27 +00:00
Christian Dike
84e1216dda Update docs/source/contributing/community.md
Co-authored-by: Georgiana <georgiana.dolocan@gmail.com>
2022-10-19 10:45:49 +01:00
Christian Dike
c8aae0ea1c Update docs/source/contributing/community.md
Co-authored-by: Georgiana <georgiana.dolocan@gmail.com>
2022-10-19 10:44:41 +01:00
Christian Dike
313623256f Update docs/source/contributing/community.md
Co-authored-by: Georgiana <georgiana.dolocan@gmail.com>
2022-10-19 10:44:15 +01:00
Georgiana
da7ac11605 Merge pull request #4069 from chicken-biryani/main
Update the testing docs
2022-10-19 11:29:36 +02:00
Goodness Chris-Ugari
eaeef65560 Update config-proxy.md
Update comment
2022-10-19 09:34:42 +01:00
Alexander Chosen okon
a4597a1c50 alexanderchosen 2022-10-18 23:47:20 +00:00
Alexander Chosen okon
390efc1c5a removed the logo image and resolved some conflicts 2022-10-18 23:24:53 +00:00
Goodness Chris-Ugari
853f8accf5 Update config-proxy.md
update
2022-10-18 15:09:44 +01:00
Goodness Chris-Ugari
1f66237a5a Merge branch 'jupyterhub:main' into patch-2 2022-10-18 15:04:47 +01:00
Georgiana
0881514988 Merge pull request #4096 from Christiandike/update/config-ghoauth
Link reference to github oauth config with jupyter
2022-10-18 15:03:04 +02:00
Georgiana
975a841cdc Merge pull request #4093 from Achele/Achele
fixed some typos and technical terms
2022-10-18 15:01:30 +02:00
Sarah Gibson
ef0a627e28 Merge pull request #4133 from Teniola-theDev/spawner/editone
I capitalized cli and added y to jupterhub
2022-10-18 12:22:22 +01:00
Teniola Olowookere
504ebe9012 capitalized cli and added y to jupterhub 2022-10-18 10:09:31 +01:00
Tooba Jamal
895d713370 update spawners-basics.md 2022-10-18 12:01:13 +05:00
Tooba Jamal
d1ad045335 update index.rst 2022-10-18 11:55:48 +05:00
Tooba Jamal
1041bc53b1 fix typo 2022-10-18 11:21:50 +05:00
lumenCodes
2636a9fff5 added section refrence 2022-10-18 03:26:36 +01:00
lumenCodes
b1dfac546d fix: typo errors 2022-10-18 03:20:34 +01:00
pre-commit-ci[bot]
28de35facd [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-18 01:25:28 +00:00
lumenCodes
10c54353da Rest Api doc update 2022-10-18 02:19:33 +01:00
pre-commit-ci[bot]
b890a7486d [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-17 20:33:17 +00:00
PoorvajaRayas
97c72dd779 Update troubleshooting.md
Improved the documentation to make it clearer
2022-10-18 02:01:50 +05:30
Christian Dike
ae833d4a51 Add link to gh oauth
Co-authored-by: Georgiana <georgiana.dolocan@gmail.com>
2022-10-17 18:09:49 +01:00
Shloka
15b8857728 Update docs/source/contributing/tests.rst
Co-authored-by: Min RK <benjaminrk@gmail.com>
2022-10-17 22:30:55 +05:30
Shloka
79ea4038e5 Update docs/source/contributing/tests.rst
Co-authored-by: Min RK <benjaminrk@gmail.com>
2022-10-17 22:30:47 +05:30
Sarah Gibson
e7284b65ad Merge pull request #4092 from Temidayo32/announcement 2022-10-17 17:33:52 +01:00
Ojoachele Onuh
deaccdc668 Resolved and updated corrections from previous pull request 2022-10-17 17:27:09 +01:00
pre-commit-ci[bot]
838719e7ab [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-17 15:11:38 +01:00
Christian Dike
6ca5c1a276 Update documentation
Fix structure of documentation to aid readability and flow.
2022-10-17 15:09:40 +01:00
dependabot[bot]
d3facd93f1 Merge pull request #4121 from jupyterhub/dependabot/github_actions/docker/setup-buildx-action-2.1.0 2022-10-17 12:46:35 +00:00
Simon Li
8d2a987c81 remove out of date commented tag version 2022-10-17 13:29:25 +01:00
Christian Dike
e7a325ed24 Update docs/source/rbac/tech-implementation.md
update text

Co-authored-by: Min RK <benjaminrk@gmail.com>
2022-10-17 13:20:37 +01:00
Christian Dike
fc6d93bbe3 Update docs/source/rbac/tech-implementation.md
Replace URLs with internal markdown link

Co-authored-by: Min RK <benjaminrk@gmail.com>
2022-10-17 13:20:02 +01:00
Goodness Chris-Ugari
e9f8459681 Merge branch 'jupyterhub:main' into patch-2 2022-10-17 13:06:29 +01:00
Min RK
8785ecd810 Merge pull request #4086 from ArafatAbdussalam/branch2
Updated log messages
2022-10-17 13:45:16 +02:00
Min RK
147f029bf6 Merge pull request #4091 from Goodiec/patch-1
Update config-user-env.md
2022-10-17 13:44:21 +02:00
Min RK
cd440b0f7d Merge pull request #4085 from Goodiec/Goodiec-troubleshooting-doc
Update troubleshooting.md
2022-10-17 13:43:41 +02:00
Min RK
0a9d2b7f76 Merge branch 'main' into branch2 2022-10-17 13:42:02 +02:00
Min RK
658a1fccfe Merge pull request #4083 from ArafatAbdussalam/branch1
updated websecirity.md
2022-10-17 13:10:40 +02:00
dependabot[bot]
ee578dd7b5 Merge pull request #4122 from jupyterhub/dependabot/github_actions/docker/build-push-action-3.2.0 2022-10-17 11:10:16 +00:00
Min RK
d2d9ce9d02 Merge pull request #4074 from ToobaJamal/edit
Update index.rst
2022-10-17 13:05:14 +02:00
Min RK
93529d11bc Merge pull request #4065 from chicken-biryani/community-channels
Modification in community channels docs
2022-10-17 13:01:00 +02:00
dependabot[bot]
9d630add9a Bump docker/setup-buildx-action from 2.0.0 to 2.1.0
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](dc7b9719a9...95cb08cb26)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-17 10:53:28 +00:00
dependabot[bot]
ea88427b7f Bump docker/build-push-action from 3.1.1 to 3.2.0
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3.1.1 to 3.2.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](c84f382811...c56af95754)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-17 10:53:28 +00:00
Simon Li
cc4a3da32c Merge pull request #4123 from jupyterhub/dependabot/github_actions/docker/setup-qemu-action-2.1.0
Bump docker/setup-qemu-action from 2.0.0 to 2.1.0
2022-10-17 11:52:42 +01:00
Goodness Chris-Ugari
c7f14eec14 Update troubleshooting.md
Removed static header items
2022-10-17 11:07:39 +01:00
Goodness Chris-Ugari
cf1dcd6f3a Update config-user-env.md
update
2022-10-17 10:59:20 +01:00
dependabot[bot]
bcaaaa2d35 Bump docker/setup-qemu-action from 2.0.0 to 2.1.0
Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/docker/setup-qemu-action/releases)
- [Commits](8b122486ce...e81a89b173)

---
updated-dependencies:
- dependency-name: docker/setup-qemu-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-17 05:20:46 +00:00
AdrianaHelga
7462cfa6fd Update services-basics.md 2022-10-16 11:01:21 +03:00
Arafat Abdussalam
a785b8d38a I made the correction to the PR
I resolved my previous commit as suggested
2022-10-14 02:59:34 -07:00
Arafat Abdussalam
714b5925f6 Correction of previous commit
I made a correction to my previous commit as suggested. I will def try to avoid such mistakes.
2022-10-14 02:51:40 -07:00
Ngobiri Falyne
de3210536f Update troubleshooting.md
Adjusted the Heading sudospawner - Sudospawner to suite sentence case
Under proxy Settings, i adjusted the sentence "a organization to an organization" also singleuser to single-user
under Toree intergration, the sentence is not clear so I adjusted to Toree kernel will raise and issue when running with jupyterHub,
2022-10-14 04:53:09 +01:00
Eshy10
e6e1e90386 chore: captitalize the first letter on explation of hub environment 2022-10-14 03:04:08 +01:00
Eshy10
0667451584 chore: remove duplicate version statement and add color to environments title 2022-10-14 02:55:27 +01:00
Alexander Chosen okon
35d26e75f4 Documentation reviewed, made concise & image added 2022-10-13 23:20:10 +00:00
pre-commit-ci[bot]
9f62c76a8e [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-13 22:41:04 +00:00
Esther Christopher
72096b5166 Edited for Clarity
Edited for sentence restructuring, sentence clarity, change of grammar, grammatical punctuation errors, and grammatical correctness.
2022-10-13 17:00:49 +01:00
Zeelyha
88906c2e1b Update templates.md
Fixed a typo
2022-10-13 15:13:30 +01:00
Esther Christopher
67b62db524 Reviewed the documentation
1. Edited the topic of the documentation to Pascal Case.
2. Completed a sentence for clarity
2022-10-13 13:04:42 +01:00
Allan Wasega
f9dbfd7275 Edited and restructured server-api file 2022-10-13 08:58:42 +03:00
Deborah Udoh
b15d56432d Proofread and improve security-basics.rst 2022-10-12 16:21:07 +01:00
Chidinma Udo
a10879f493 Modifications to URLs docs 2022-10-12 16:20:18 +01:00
Tooba Jamal
c2d1a21d32 update spawners-basics.md 2022-10-12 20:18:18 +05:00
Tooba Jamal
8060003fd6 update spawners-basics.md 2022-10-12 20:12:20 +05:00
Shloka
5018c13b81 Fixes 2022-10-12 19:31:04 +05:30
Tooba Jamal
99255b04ac fix typo 2022-10-12 18:59:56 +05:00
Christian Dike
2e6949c6e1 add reference for github oauth config with jupyter
add link to the reference documentation for github oauth configuration with jupyterhub. Fix typos
2022-10-12 14:59:31 +01:00
Tooba Jamal
0f5f0f0df9 update index.rst
Made the requested changes
2022-10-12 18:58:28 +05:00
Goodness Chris-Ugari
da302f5206 Update config-proxy.md
This PR improves the proxy configuration doc and is part of [issue 41](https://github.com/jupyterhub/outreachy/issues/41)
2022-10-12 14:51:22 +01:00
Shloka
b0f90a0f4b Update docs/source/contributing/tests.rst
Co-authored-by: Simon Li <orpheus+devel@gmail.com>
2022-10-12 19:08:01 +05:30
Shloka
7a915533a6 Update docs/source/contributing/tests.rst
Co-authored-by: Simon Li <orpheus+devel@gmail.com>
2022-10-12 19:07:50 +05:30
Shloka
733e018bdc Update docs/source/contributing/tests.rst
Co-authored-by: Simon Li <orpheus+devel@gmail.com>
2022-10-12 19:07:43 +05:30
Busayo-ojo
4380d1c15a Fixed typos and added punctuations 2022-10-12 14:33:58 +01:00
pre-commit-ci[bot]
a87872e7aa [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-12 13:28:00 +00:00
Shloka
578c78397a Modifications 2022-10-12 18:56:30 +05:30
Shloka
0820f4cfa1 Modifications 2022-10-12 18:52:58 +05:30
Ojoachele Onuh
f386da1b7a fixed some typos and technical terms 2022-10-12 13:12:08 +01:00
Goodness Chris-Ugari
71ce37b834 Update troubleshooting.md
Implement suggested changes.
2022-10-12 13:02:12 +01:00
Goodness Chris-Ugari
64965b7a2e Merge branch 'jupyterhub:main' into Goodiec-troubleshooting-doc 2022-10-12 12:53:25 +01:00
pre-commit-ci[bot]
ef7545fc75 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-12 11:34:19 +00:00
pre-commit-ci[bot]
af95d643b1 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-12 11:33:54 +00:00
Goodness Chris-Ugari
67bca186b4 Update config-user-env.md
This PR improves the 'Configuring user environments' doc and is part of [issue 41](https://github.com/jupyterhub/outreachy/issues/41)
2022-10-12 12:31:44 +01:00
Temidayo
08a125489d fixed a typo 2022-10-12 12:29:07 +01:00
Temidayo
1050dadda4 modified announcement README and config.py 2022-10-12 12:27:57 +01:00
Min RK
5997614f45 Merge pull request #4073 from ikeadeoyin/quickstart-docker-guide
improved the quickstart docker guide
2022-10-12 12:40:08 +02:00
Georgiana
7e78394eb2 Merge pull request #4079 from mahamtariq58/documentation
Improve the documentation about log messages
2022-10-12 12:39:53 +02:00
Min RK
fd2717c5ce Merge pull request #4071 from NPDebs/main
Improve Documentation
2022-10-12 12:35:09 +02:00
Tooba Jamal
dcd4e689aa update index.rst 2022-10-12 12:09:57 +05:00
Tooba Jamal
6ef8120f94 fix grammatical error 2022-10-12 10:58:13 +05:00
Joel-Ando
a697c80475 Update tech-implementation.md 2022-10-12 01:10:09 +01:00
mahamtariq58
c675c29fce Update docs/source/admin/log-messages.md
Co-authored-by: Georgiana <georgiana.dolocan@gmail.com>
2022-10-12 02:53:58 +05:00
mahamtariq58
9b44eec7f7 Update docs/source/admin/log-messages.md
Co-authored-by: Georgiana <georgiana.dolocan@gmail.com>
2022-10-12 02:53:43 +05:00
mahamtariq58
9cb4173042 Update docs/source/admin/log-messages.md
Co-authored-by: Georgiana <georgiana.dolocan@gmail.com>
2022-10-12 02:53:24 +05:00
Christian Dike
916a83a954 Update tech-implementation.md
Fix typos and grammatical errors. Improve sentence structure. Use appropriate technical terms.
2022-10-11 19:03:21 +01:00
mahamtariq58
6933e8fb33 Update docs/source/admin/log-messages.md
Co-authored-by: Georgiana <georgiana.dolocan@gmail.com>
2022-10-11 19:57:11 +05:00
Tooba Jamal
8f30f4afd9 update upgrading.rst 2022-10-11 19:40:15 +05:00
Tooba Jamal
d5790ce386 update upgrading.rst 2022-10-11 19:38:36 +05:00
Tooba Jamal
6b4c5e4bce update upgrading.rst 2022-10-11 19:36:04 +05:00
Tooba Jamal
15cf30156d update upgrading.rst 2022-10-11 19:12:03 +05:00
Georgiana
dff0f054d0 Merge pull request #4068 from Goodiec/Goodiec-improve-setup-doc-apge
Update setup.rst
2022-10-11 14:33:27 +02:00
Goodness Chris-Ugari
45b5a249c6 Update setup.rst
Corrected JupyterHub capitalization
2022-10-11 13:02:10 +01:00
Georgiana
e3a25a883f Merge pull request #4070 from Mackenzie-OO7/mackenzie-oo7
Update the Technical Overview Docs
2022-10-11 14:00:19 +02:00
pre-commit-ci[bot]
3ee21cc967 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-11 09:17:46 +00:00
Arafat Abdussalam
941e8c928a Updated log messages
I improved the log message subsection of the documentation by making the page more user friendly
2022-10-11 10:14:03 +01:00
pre-commit-ci[bot]
5d5a424aea [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-11 08:40:40 +00:00
Goodness Chris-Ugari
f2059c0d03 Update troubleshooting.md
This PR improves the troubleshooting doc and is part of [issue 41](https://github.com/jupyterhub/outreachy/issues/41)
2022-10-11 09:37:54 +01:00
Goodness Chris-Ugari
20f6b13e86 Merge branch 'jupyterhub:main' into Goodiec-improve-setup-doc-apge 2022-10-11 09:14:54 +01:00
Melissa Kirabo
eb6bf3f698 Update index.rst
I have made some changes to the flow of the documentation, added descriptions, and corrected grammatical errors
2022-10-11 10:06:24 +03:00
Arafat Abdussalam
b87b8c52d3 updated websecirity.md
I have the grammatical errors written on the page such as improving the abbreviated words with apostrophes and other typos
2022-10-11 07:21:19 +01:00
pre-commit-ci[bot]
a2852b1b2b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-10 22:41:59 +00:00
mahamtariq58
b98e981e6a Merge branch 'jupyterhub:main' into documentation 2022-10-11 03:38:52 +05:00
Maham Tariq
d223c0edff Fixed some confused Lines 2022-10-11 02:58:19 +05:00
pre-commit-ci[bot]
53bf7a18ae [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-10 17:03:46 +00:00
Deborah Udoh
835fe8be8f Update roles.md in line with review 2022-10-10 18:03:13 +01:00
Deborah Udoh
ed71aead2b Update roles.md
Co-authored-by: Min RK <benjaminrk@gmail.com>
2022-10-10 17:56:35 +01:00
Georgiana
5713e56fd1 Merge pull request #4067 from Uzor13/uzor-dev
Fixed some typos and add missing links
2022-10-10 14:39:24 +02:00
Uzochukwu Precious
eb65bd7dd6 role link added to note 2022-10-10 12:34:14 +01:00
Tooba Jamal
aa101a7aff Update index.rst 2022-10-10 15:36:10 +05:00
ikeadeoyin
743406e60d made the necessary changes 2022-10-10 10:50:49 +01:00
Chidinma Udo
7f191ea5e8 Applied suggestions from code review
Co-authored-by: Min RK <benjaminrk@gmail.com>
2022-10-10 10:41:57 +01:00
Tooba Jamal
915fab2d26 Update index.rst 2022-10-10 12:55:16 +05:00
ikeadeoyin
b961925bbc improved the quickstart docker guide 2022-10-10 08:48:43 +01:00
Tooba Jamal
3425269cb2 Update index.rst 2022-10-10 12:34:09 +05:00
Min RK
9280621ca8 Merge pull request #4063 from minrk/resolve-excluded-scopes
Fully resolve requested scopes in oauth
2022-10-10 09:24:43 +02:00
ruqayaahh
2661eab54b updated obsolete links and made wordings clearer 2022-10-10 06:07:38 +01:00
pre-commit-ci[bot]
18b1df8bc6 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-09 19:07:30 +00:00
Deborah Udoh
674c441935 Improve documentation 2022-10-09 19:37:59 +01:00
Uzochukwu Precious
e324d89f8a review update 2022-10-09 17:44:32 +01:00
Chidinma Udo
433bb09e9e fixed broken link 2022-10-09 17:13:53 +01:00
Chidinma Udo
facf8039c3 fixed some typos and embedded links 2022-10-09 17:02:27 +01:00
Shloka
395b1a5681 Modifications is testing docs 2022-10-09 19:07:20 +05:30
Goodness Chris-Ugari
65caf37d71 Update setup.rst
This PR improves the setup page and is part of issue #41
2022-10-09 12:37:52 +01:00
Uzochukwu Precious
f5cb617ce7 fixed some typos and also added links #41 2022-10-08 23:16:44 +01:00
pre-commit-ci[bot]
204bfaf8f4 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-10-08 17:13:41 +00:00
Shloka
f0c825cc1e Modification in community channels 2022-10-08 22:40:22 +05:30
Erik Sundell
fd5705b74b Align test variables' naming with tested function's terminology 2022-10-08 17:03:50 +02:00
Min RK
7585026f81 consistent naming, docstrings for disallowed scopes 2022-10-07 10:45:14 -07:00
Min RK
a4fd0980a3 Back off removal of read:servers -> read:users:name
Only remove it when using the !server filter, which doesn't make sense for read:users:name
2022-10-07 10:29:48 -07:00
Erik Sundell
c126cc3f9b Merge pull request #4064 from minrk/oauth-deprecado
set stacklevel for oauth_scopes deprecation warning
2022-10-06 12:51:04 +02:00
Min RK
f70b11af11 resolve full scope intersection for oauth
allows subset filters in oauth (e.g. server requests scope!server while user has scope!user)
2022-10-05 19:53:54 -07:00
Min RK
6024a9780f remove implicit grant of read:users:name from read:servers
results in weird extra permission that aren't needed
2022-10-05 19:53:54 -07:00
Min RK
63c391641a set stacklevel for oauth_scopes deprecation warning
so it's visible where the deprecated API is called
2022-10-05 18:49:32 -07:00
Erik Sundell
7a6c2038d8 Merge pull request #4061 from Temidayo32/main
modified the contributing documentation
2022-10-03 16:12:37 +02:00
Temidayo
83fb49e7cf Merge branch 'jupyterhub:main' into main 2022-10-02 14:52:24 +01:00
Temidayo
15bf61df2a modified the contributing documentation 2022-10-02 14:39:51 +01:00
Min RK
387e983543 Merge pull request #4053 from danilopeixoto/callable-named-server-limit
Set named_server_limit_per_user type as integer or callable
2022-09-30 09:44:15 +02:00
Danilo Peixoto
37d35953bc Set named_server_limit_per_user type as integer or callable 2022-09-30 09:28:04 +02:00
Min RK
666b3cb36e Merge pull request #4054 from jupyterhub/dependabot/github_actions/char0n/swagger-editor-validate-1.3.2
Bump char0n/swagger-editor-validate from 1.3.1 to 1.3.2
2022-09-30 09:24:41 +02:00
vpopescu
6f6d60297c Merge branch 'group_property_feature' of https://github.com/vladfreeze/jupyterhub into group_property_feature 2022-09-29 16:55:41 +02:00
vpopescu
c8f0bed963 Made error disappear if keys have been fixed 2022-09-29 16:55:27 +02:00
pre-commit-ci[bot]
a1212a8503 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-09-29 14:48:32 +00:00
vpopescu
40eae6c685 Changed error to alert.alert-danger 2022-09-29 16:46:08 +02:00
dependabot[bot]
2c897a7ca3 Bump char0n/swagger-editor-validate from 1.3.1 to 1.3.2
Bumps [char0n/swagger-editor-validate](https://github.com/char0n/swagger-editor-validate) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/char0n/swagger-editor-validate/releases)
- [Commits](https://github.com/char0n/swagger-editor-validate/compare/v1.3.1...v1.3.2)

---
updated-dependencies:
- dependency-name: char0n/swagger-editor-validate
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-26 05:27:06 +00:00
Min RK
1a0b46a5c8 Merge pull request #4046 from Neeraj-Natu/main
mentioning limitations of spawner.environment
2022-09-23 13:32:50 +02:00
pre-commit-ci[bot]
596f9669d7 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-09-23 11:25:40 +00:00
neerajnatu
55fbb0b5fe review comments address 2022-09-23 16:54:53 +05:30
Min RK
a3795ad672 Merge pull request #4035 from manics/docker-yarn
setup.py: require npm, check that NPM CSS JSX commands succeed
2022-09-23 10:49:44 +02:00
pre-commit-ci[bot]
e205d05ec8 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-09-22 13:36:49 +00:00
vpopescu
2cdba6f42a Added type checks 2022-09-22 15:36:17 +02:00
vpopescu
6219c206e9 Merge branch 'group_property_feature' of https://github.com/vladfreeze/jupyterhub into group_property_feature 2022-09-22 15:23:48 +02:00
vpopescu
9d82a64a85 Removed setpropkeys and setpropvalues for testing 2022-09-22 15:23:46 +02:00
pre-commit-ci[bot]
7a4a00e5c1 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-09-22 13:12:51 +00:00
vpopescu
f28b613ccb Merge branch 'group_property_feature' of https://github.com/vladfreeze/jupyterhub into group_property_feature 2022-09-22 15:11:42 +02:00
vpopescu
20f5c2690b Added check for current_propobject 2022-09-22 15:11:40 +02:00
Min RK
38afbcc0d0 Merge pull request #4045 from miwig/fix_crash_when_removing_scopes
Fix crash when removing scopes attribute from an existing role
2022-09-22 15:08:27 +02:00
pre-commit-ci[bot]
f9b3ff58f9 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-09-22 11:02:27 +00:00
vpopescu
0a1811e86c Made DynamicTable functional 2022-09-22 13:01:53 +02:00
Vlad Vifor
e8ae58f6b5 Merge branch 'jupyterhub:main' into group_property_feature 2022-09-22 12:34:30 +02:00
mouse1203
08b71e7f56 adding asyncio.sleep into test_invalid_credantials
added asyncio.sleep into test_invalid_credantials
2022-09-19 16:28:33 +02:00
mouse1203
9d90496549 updating regarding to the review
removed time.sleep(), removed inrelevant comments, removed unused packages, added few explanations for some functions (in progress), documenting  in progress, added to conftest.py package with Options class
2022-09-19 15:18:07 +02:00
Simon Li
df222de915 verify sdist can be installed without npm/yarn 2022-09-18 17:14:05 +01:00
pre-commit-ci[bot]
01e4f2b974 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-09-17 10:27:34 +00:00
neerajnatu
bffdf690d9 adding to contributor list 2022-09-17 15:49:26 +05:30
neerajnatu
0f06c9376a mentioning limitations of spawner.environment 2022-09-17 15:17:23 +05:30
pre-commit-ci[bot]
99eb8d6a2a [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-09-16 12:43:30 +00:00
Michael Wigard
3bb0d57e35 Fix crash when removing scopes attribute from an existing role 2022-09-16 14:27:12 +02:00
Min RK
29ffb23d67 Merge pull request #4039 from hjoliver/fix-launch-instance 2022-09-13 17:05:11 +02:00
Min RK
729099f87d test coverage for launch_instance(argv) 2022-09-13 12:02:02 +02:00
Hilary James Oliver
daf395c2c3 Pass launch_instance args on correctly. 2022-09-13 09:27:49 +12:00
Simon Li
8b68286486 setup.py: require npm, check that NPM CSS JSX commands succeed 2022-09-10 17:59:53 +01:00
Erik Sundell
ad44b16104 Merge pull request #4034 from manics/docker-yarn
Fix Dockerfile yarn JSX build
2022-09-10 16:42:04 +02:00
Simon Li
fa33faeefa Dockerfile: check static/js/admin-react.js exists 2022-09-10 12:31:27 +01:00
Simon Li
a3b20bb220 Dockerfile: install yarn with npm 2022-09-10 12:24:17 +01:00
Simon Li
b644052cb4 Dockerfile: Use python -m build to match release workflow 2022-09-10 12:12:58 +01:00
Min RK
02dead8ab1 Bump to 3.1.0.dev 2022-09-09 08:37:18 +02:00
Min RK
24506888ea Bump to 3.0.0 2022-09-09 08:32:58 +02:00
Min RK
457ad3ec85 Merge pull request #4029 from consideRatio/pr/update-changelog-for-3.0.0
Update changelog for 3.0.0
2022-09-09 08:16:24 +02:00
Min RK
75e8274a7b date for 3.0.0 2022-09-09 08:16:07 +02:00
Min RK
dd69213a3c [capacity doc]: add concurrent user section 2022-09-07 12:42:41 +02:00
Min RK
1aafdb1d1b doc: More suggestions from review
- add costs, links
- labels for use cases
- literal math formatting
2022-09-07 12:29:09 +02:00
pre-commit-ci[bot]
9a84b9d9a1 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-09-07 09:56:00 +00:00
Min RK
bf6786c55b Apply suggestions from code review
Co-authored-by: Chris Holdgraf <choldgraf@gmail.com>
2022-09-07 11:55:33 +02:00
Erik Sundell
2a3ceff29f Update changelog for 3.0.0 2022-09-07 09:58:17 +02:00
Min RK
1e9614b218 Add capacity planning doc 2022-09-06 12:25:39 +02:00
Erik Sundell
5e29605341 Merge pull request #4018 from minrk/reset-offset
reset offset to 0 on name filter change
2022-09-05 18:46:08 +02:00
Min RK
34b6bc3a3f call reducers in some tests
allows testing reducer functionality

workaround bug preventing mocked useSelector from behaving realistically
2022-09-05 15:09:11 +02:00
Min RK
485190e5af make selenium tests opt-in
avoids running them over and over again
2022-09-02 14:00:19 +02:00
Min RK
b90200667f fix headless firefox option 2022-09-02 14:00:19 +02:00
mouse1203
5885f88d79 Update jupyterhub/tests/selenium/conftest.py
Co-authored-by: Min RK <benjaminrk@gmail.com>
2022-09-02 13:43:20 +02:00
mouse1203
b87561d396 remove conditional for FireFox
removing conditionals for FF
2022-09-02 13:32:11 +02:00
mouse1203
10aba2c038 Merge branch 'main' of https://github.com/jupyterhub/jupyterhub 2022-09-02 13:14:28 +02:00
mouse1203
09c4fee780 add selenium tests 2022-09-02 13:12:31 +02:00
pre-commit-ci[bot]
4033dbbd3f [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-08-25 12:37:08 +00:00
vpopescu
85da3be6af Merge branch 'group_property_feature' of https://github.com/vladfreeze/jupyterhub into group_property_feature 2022-08-25 14:36:38 +02:00
vpopescu
59d43edea1 Removed redirect to /groups when clicking on apply 2022-08-25 14:36:35 +02:00
pre-commit-ci[bot]
4a93cffb52 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-08-25 12:33:48 +00:00
vpopescu
7fb6df1c18 Fixed bug where inputs remained in the fields after already being added 2022-08-25 14:31:17 +02:00
Erik Sundell
7a48da1916 Merge pull request #4022 from possiblyMikeB/token-template-correction
Use correct expiration labels in drop-down menu on token page.
2022-08-24 20:01:20 +02:00
possiblyMikeB
5eaf59dd72 correct token expiration time labels 2022-08-23 18:29:15 -04:00
Simon Li
73a33ed5fc Merge pull request #4019 from minrk/sync-groups-repeat
avoid database error on repeated group name in sync_groups
2022-08-19 16:54:06 +01:00
vpopescu
f17fb36501 fixed button naming 2022-08-19 16:04:35 +02:00
vpopescu
3ff1afa88b Merge branch 'group_property_feature' of https://github.com/vladfreeze/jupyterhub into group_property_feature 2022-08-19 16:03:09 +02:00
vpopescu
faf3b4b477 fixed button naming 2022-08-19 16:01:14 +02:00
pre-commit-ci[bot]
452891148e [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-08-19 13:51:05 +00:00
vpopescu
b76a9ff146 fixed redirect bug when adding properties 2022-08-19 15:50:25 +02:00
Min RK
0b9ae96a96 avoid database error on repeated group name in sync_groups 2022-08-19 10:53:21 +02:00
Min RK
2c9653bc0d reset offset to 0 on name filter change
move offset to redux state, rather than independent,
since it can come from two places (user_page and pagination footer). Keeps things in sync.

Adds reducers for setting offset, name filter explicitly.
2022-08-19 10:25:17 +02:00
vpopescu
08164fb0a7 Merge branch 'group_property_feature' of https://github.com/vladfreeze/jupyterhub into group_property_feature 2022-08-18 16:01:51 +02:00
vpopescu
ce4d8cf0f3 fixed typo 2022-08-18 16:01:48 +02:00
pre-commit-ci[bot]
224b14043a [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-08-18 14:00:40 +00:00
vpopescu
0fe08ad082 Fixed test issues 2022-08-18 15:59:39 +02:00
Vlad Vifor
516c394303 Merge branch 'jupyterhub:main' into group_property_feature 2022-08-18 15:40:35 +02:00
Erik Sundell
71e86f3064 Merge pull request #4016 from minrk/edituser-validate
admin: avoid redundant client-side username validation in edit-user
2022-08-16 14:13:49 +02:00
Min RK
8a1110f2c0 admin: avoid redundant client-side username validation
username validation is the server-side's responsibility
2022-08-16 13:48:36 +02:00
Min RK
bb52351a6e Merge pull request #4013 from minrk/test-311
Test 3.11
2022-08-10 11:36:14 +02:00
Min RK
87c745d3bf mock greenlet needs to raise ImportError 2022-08-10 11:02:53 +02:00
Min RK
374c6c848b it's actually greenlet 2022-08-10 10:45:57 +02:00
Min RK
af31ee8c94 condition brackets
Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
2022-08-10 10:28:30 +02:00
Min RK
26a9883b93 add mock-gevent to allow install on Python 3.11
gevent is not actually required, but sqlalchemy lists it as a dependency (on linux only)
2022-08-10 10:08:08 +02:00
Min RK
bda3e0c931 test on Python 3.11.0-rc.1 2022-08-10 10:06:37 +02:00
Min RK
f3d17eb77e Merge pull request #4012 from minrk/doc-oauth-no-confirm
document oauth_no_confirm in services
2022-08-10 09:30:48 +02:00
Erik Sundell
5f92cfcc0e Merge pull request #4011 from minrk/trim-form-input
restore trimming of username input
2022-08-10 09:05:34 +02:00
Min RK
b55eaae51f document oauth_no_confirm in services 2022-08-10 08:57:35 +02:00
Min RK
c9e6d6afa3 restore trimming of username input
continue to not trim password or custom fields

trailing/leading space is explicitly forbidden in validate_username
2022-08-10 08:45:50 +02:00
Erik Sundell
2f1d340c42 Merge pull request #4006 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-08-09 08:09:29 +02:00
pre-commit-ci[bot]
2ba99656c1 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/PyCQA/flake8: 5.0.2 → 5.0.4](https://github.com/PyCQA/flake8/compare/5.0.2...5.0.4)
2022-08-08 22:58:55 +00:00
Erik Sundell
635f63c1cd Merge pull request #4005 from jupyterhub/dependabot/github_actions/docker/build-push-action-3.1.1
Bump docker/build-push-action from 3.1.0 to 3.1.1
2022-08-08 09:50:23 +02:00
dependabot[bot]
b9b49ff306 Bump docker/build-push-action from 3.1.0 to 3.1.1
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](1cb9d22b93...c84f382811)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-08 05:29:25 +00:00
Min RK
5640a1506e Merge pull request #4002 from naatebarber/admin-with-pagination-api
Integrate Pagination API into Admin JSX
2022-08-05 12:07:12 +02:00
vpopescu
d4532c64aa fixed base.py 2022-08-04 17:59:06 +02:00
pre-commit-ci[bot]
4767cfa4e9 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-08-04 14:18:27 +00:00
Nathan Barber
309d687c26 Update jsx/src/components/Groups/Groups.jsx
Co-authored-by: Min RK <benjaminrk@gmail.com>
2022-08-04 10:17:43 -04:00
Nathan Barber
df25c09962 Update jsx/src/components/PaginationFooter/PaginationFooter.jsx
Co-authored-by: Min RK <benjaminrk@gmail.com>
2022-08-04 10:17:35 -04:00
pre-commit-ci[bot]
5e94759fde [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-08-04 14:17:26 +00:00
vpopescu
b6a4b702ac update tests 2022-08-04 16:16:39 +02:00
vpopescu
7d902e87cd Updated test roles and scopes to correspond to new group structure 2022-08-04 16:06:41 +02:00
vpopescu
d4213a98d0 fixed test_app 2022-08-04 15:55:32 +02:00
vpopescu
6b67a1b146 fixed test_api 2022-08-04 15:47:21 +02:00
vpopescu
463e1fb9d7 app and orm 2022-08-04 15:30:08 +02:00
vpopescu
4440e56aa1 Added alembic and apihandlers 2022-08-04 15:26:55 +02:00
vpopescu
f59727b39f Added front-end 2022-08-04 15:22:27 +02:00
Nathan Barber
09d0909878 Update unit tests to spec 2022-08-03 12:50:29 -04:00
Nathan Barber
72db4624e0 Move user/group queries from app to component uE's 2022-08-03 12:28:05 -04:00
Nathan Barber
e9eca22e3b add useEffect, new pagination style 2022-08-03 12:18:28 -04:00
Nathan Barber
33d4f382d5 Use data.items to display users 2022-08-03 10:59:38 -04:00
pre-commit-ci[bot]
aa1eb32b4c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-08-03 14:11:16 +00:00
vpopescu
d690cfad38 Updated test_app.py for load_groups feature 2022-08-03 16:08:24 +02:00
vpopescu
0b04bf1181 Merge branch 'group_property_feature' of https://github.com/vladfreeze/jupyterhub into group_property_feature 2022-08-03 15:09:58 +02:00
vpopescu
9450a69bd3 testing load_groups 2022-08-03 15:09:33 +02:00
pre-commit-ci[bot]
67573728ad [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-08-03 11:50:31 +00:00
vpopescu
7011bc12fe Updating test_load_groups 2022-08-03 13:48:51 +02:00
Vlad Vifor
9186594dc1 Merge branch 'jupyterhub:main' into group_property_feature 2022-08-03 12:24:35 +02:00
Min RK
562a24b651 Bump to 3.0.0b1 2022-08-02 15:10:28 +02:00
Simon Li
9318eb3fb2 Merge pull request #3994 from minrk/3.0-changelog
3.0 changelog
2022-08-02 14:05:38 +01:00
Min RK
0590b76cd0 3.0: refresh changelog entries 2022-08-02 14:42:33 +02:00
Min RK
8aac18c96d More documentation for 3.0 role/scope changes
a few more outdated `versionchanged` notes
2022-08-02 14:39:03 +02:00
Erik Sundell
6a6b8567c0 Merge pull request #3909 from minrk/include_stopped_servers
include stopped servers in user model
2022-08-02 14:31:14 +02:00
Min RK
78438bdfcc Begin 3.0 changelog
had to manually remove already-backported PRs
2022-08-02 14:29:16 +02:00
Erik Sundell
2096c956db Merge pull request #3877 from minrk/oauth_config
store scopes on oauth clients, too
2022-08-02 14:12:15 +02:00
Min RK
dfc2d4d4f1 Merge remote-tracking branch 'origin/main' into oauth_config 2022-08-02 13:53:51 +02:00
Min RK
5f57b72d6e fix version change in comment now that it's 3.0 2022-08-02 13:37:33 +02:00
Min RK
6a470b44e7 explicitly support async oauth_client_allowed_scopes 2022-08-02 13:37:32 +02:00
Min RK
a35a2ec8b7 less space
Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
2022-08-02 13:34:42 +02:00
Min RK
978b71c8bb Merge pull request #4001 from minrk/info-table-sort
admin: format user/server-info tables
2022-08-02 13:18:06 +02:00
Min RK
f3b328a4d8 format user/server-info tables
- sort keys for consistent presentation
- use text list for roles, groups, which aren't well rendered by the table-formatter (number index isn't helpful)
- render timestamps
- leave empty name for default server, instead of '[MAIN]' which isn't terminology used anywhere else
2022-08-02 12:28:13 +02:00
Min RK
9da78880e6 Merge pull request #4000 from minrk/jsx-deps
[admin] update, clean jsx deps
2022-08-02 12:27:12 +02:00
Vlad Vifor
4d38087fa8 Merge branch 'jupyterhub:main' into group_property_feature 2022-08-02 11:58:16 +02:00
Min RK
f2871cfc3c update to maintained recompose fork 2022-08-02 11:58:01 +02:00
Min RK
24efd12ab5 jsx: move dev dependencies to devDependencies
doesn't really make a difference since it's not a real package, but cleaner.

updates webpack-dev-server
2022-08-02 11:05:42 +02:00
Erik Sundell
9b2e6b1c1d Merge pull request #3992 from minrk/avoid-deprecated-clear-current-singleuser
Avoid IOLoop.current in singleuser mixins
2022-08-02 10:06:43 +02:00
Erik Sundell
9f62d83568 Merge pull request #3998 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-08-02 08:54:33 +02:00
pre-commit-ci[bot]
7eb3575502 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/asottile/pyupgrade: v2.37.2 → v2.37.3](https://github.com/asottile/pyupgrade/compare/v2.37.2...v2.37.3)
- [github.com/PyCQA/flake8: 4.0.1 → 5.0.2](https://github.com/PyCQA/flake8/compare/4.0.1...5.0.2)
2022-08-01 23:15:08 +00:00
Min RK
6afa0d6311 include stopped servers in user model
opt-in, behind ?include_stopped_servers

Adds `stopped` field to server model to more easily select stopped servers
2022-08-01 15:47:36 +02:00
Erik Sundell
d170601678 Merge pull request #3997 from minrk/inaccurate-cookie
Remove outdated cookie-secret note in security docs
2022-08-01 14:20:20 +02:00
Min RK
01a33d150f Remove outdated cookie-secret note in security docs
this was true when we used shared cookie auth long ago
2022-08-01 13:28:13 +02:00
Simon Li
28b11d2165 Merge pull request #3969 from consideRatio/pr/set-announcement-properly
Fix disabling of individual page template announcements
2022-07-30 17:38:47 +01:00
Erik Sundell
83b5e8f3da Only blank strings to disable a specific page's announcement
Co-authored-by: Min RK <benjaminrk@gmail.com>
2022-07-30 11:53:00 +02:00
Min RK
e4e4bf5ff4 next release is 3.0, not 2.4 2022-07-29 15:35:08 +02:00
Min RK
ab3a01b9f6 even latest jupyter-server requires current event loop
for nbconvert handler lock
2022-07-29 15:31:50 +02:00
Min RK
8548472b6e Avoid IOLoop.current in singleuser mixins
- define our own init_ioloop
- call it ASAP
- put init_httpserver in IOLoop.run_sync because instantiating a server accesses the current loop
- run cleanup via asyncio.run
2022-07-29 14:51:30 +02:00
Erik Sundell
ab776e3989 Merge pull request #3974 from minrk/avoid-deprecated-clear-current
Avoid deprecated 'IOLoop.current' method
2022-07-29 12:03:52 +02:00
Min RK
b0b7378e2b Avoid deprecated 'IOLoop.current' method
Deprecated in tornado 6.2, only access running loop from inside coroutines
2022-07-29 11:30:39 +02:00
Erik Sundell
75e03ef1d9 Merge pull request #3976 from minrk/bump-versions
Require Python 3.7
2022-07-29 10:42:15 +02:00
Min RK
986de0b5db use str-format for ssl.Purposes
rather than default, which is a weird repr
2022-07-29 09:26:21 +02:00
Min RK
6959c9dde3 Merge pull request #3985 from jupyterhub/dependabot/npm_and_yarn/jsx/terser-5.14.2
Bump terser from 5.12.1 to 5.14.2 in /jsx
2022-07-29 08:30:05 +02:00
Min RK
53087e50e4 Merge pull request #3989 from rpwagner/patch-1
bump moment.js 2.29.4
2022-07-29 08:27:46 +02:00
Erik Sundell
dee830a56f Merge pull request #3975 from minrk/dockerfile-base
Bump Dockerfile base image to 22.04
2022-07-27 20:38:42 +02:00
Rick Wagner
45179c53b7 bump moment.js 2.29.4 2022-07-26 10:21:55 -07:00
Erik Sundell
6c7cb65224 Merge pull request #3988 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-07-26 10:30:45 +02:00
pre-commit-ci[bot]
0038b3c2e8 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/asottile/pyupgrade: v2.37.1 → v2.37.2](https://github.com/asottile/pyupgrade/compare/v2.37.1...v2.37.2)
2022-07-25 22:16:38 +00:00
Erik Sundell
17bb8a9ba4 Unpin Dockerfile's ubuntu base image 2022-07-25 15:27:50 +02:00
Erik Sundell
9756c13f13 Merge pull request #3987 from jupyterhub/dependabot/github_actions/docker/build-push-action-3.1.0
Bump docker/build-push-action from 3.0.0 to 3.1.0
2022-07-25 10:03:26 +02:00
dependabot[bot]
be84b06ca6 Bump docker/build-push-action from 3.0.0 to 3.1.0
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](e551b19e49...1cb9d22b93)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-25 05:30:44 +00:00
dependabot[bot]
3ee88d99da Bump terser from 5.12.1 to 5.14.2 in /jsx
Bumps [terser](https://github.com/terser/terser) from 5.12.1 to 5.14.2.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/commits)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-20 22:58:57 +00:00
Erik Sundell
16b0a2ac3b Merge pull request #3978 from minrk/warn-stacklevel
Increase stacklevel for decorated warnings
2022-07-15 08:44:12 +02:00
Min RK
a82d2e4903 Merge pull request #3977 from minrk/unpin-nbclassic
unpin nbclassic
2022-07-14 21:16:54 -07:00
Min RK
cef241a80b test: handle possibility that notebook is unavailable
no longer a strict dependency of other test deps
2022-07-14 21:07:57 -07:00
Min RK
eab6a1a112 typo in jinja env name
use loop variable, not hardcoded string
2022-07-14 20:34:07 -07:00
Min RK
827bfc99ec Merge pull request #3962 from manics/ConfigurableHTTPProxy-log_level
Add ConfigurableHTTPProxy.log_level
2022-07-14 20:22:41 -07:00
Min RK
b5bd307999 urllib.quote doesn't escape ~ starting with Python 3.7
3.7 adds ~ to the 'unreserved' (always safe) set,
but it's not safe in domain names.
so do it ourselves. Formalize in a `_dns_quote` private function,
with notes about issues.

The only usernames that change in this PR are those containing `_` or `/`,
the latter of which would have failed.
2022-07-14 20:19:50 -07:00
Min RK
d02d029e88 adjust Python test order 2022-07-14 16:02:01 -07:00
Min RK
e41885c458 Increase stacklevel for decorated warnings
otherwise warning just shows as being triggered in the decorator function
2022-07-14 16:00:27 -07:00
Simon Li
78ac9946e3 Use CaselessStrEnum instead of Enum 2022-07-14 21:51:14 +01:00
Simon Li
bd8e8eaa09 Add ConfigurableHTTPProxy.log_level 2022-07-14 21:51:12 +01:00
Min RK
a2a01755ec simplify make_ssl_context
pass ssl.Purpose explicitly, deprecate verify/check_hostname

3.10 disallows 'purpose=SERVER_AUTH' from creating server sockets.
Instead:

- pass purpose directly
- always verify
- no need to set check_hostname, already covered by purpose defaults
2022-07-14 11:02:44 -07:00
Min RK
a593c6187f can't test 3.11 yet because greenlet cannot be installed
sqlalchemy requires greenlet on linux, even though we don't use it
2022-07-14 10:10:58 -07:00
Min RK
b159cbfeef unpin nbclassic
0.4.3 is out, see if it fixes things
2022-07-14 09:09:25 -07:00
Min RK
a7cced506b Remove 3.6 compatibility shims
- asyncio.all_tasks/current_task
- pytest-asyncio 0.17
- contextmanager.nullcontext
2022-07-14 09:05:01 -07:00
Min RK
e8469af763 fixup: remove redundant check 2022-07-14 09:05:01 -07:00
Min RK
d2c6b23bf9 update python versions in test matrix 2022-07-14 09:05:01 -07:00
Min RK
c657498d75 require Python 3.7
drops support for Python 3.6
2022-07-14 09:05:01 -07:00
Min RK
001d0c9af1 call legacy notebook matrix entry legacy_notebook
instead of nbclassic, which is explicitly classic nb ui on jupyter-server (the opposite of these tests)
2022-07-14 09:05:01 -07:00
Min RK
0d0368c042 Bump Dockerfile base image to 22.04 2022-07-14 09:03:53 -07:00
Min RK
6fdd0ff7c5 Merge pull request #3967 from minrk/validate-extra-routes
validate proxy.extra_routes
2022-07-14 09:01:12 -07:00
Vlad Vifor
6a8b1be940 Merge branch 'jupyterhub:main' into group_property_feature 2022-07-14 12:23:08 +02:00
Min RK
dee671b640 Merge pull request #3883 from minrk/async-hub-auth
allow HubAuth to be async
2022-07-13 20:38:36 -07:00
Min RK
c289a422c3 validate proxy.extra_routes
- add trailing slash if missing, and warn
- raise if leading slash is wrong (must not be present with host routing, must be present otherwise)
2022-07-13 20:33:39 -07:00
Erik Sundell
fa47529cf1 Merge pull request #3971 from minrk/nbclassic-renamed
nbclassic extension name has been renamed
2022-07-12 08:06:29 +02:00
Erik Sundell
6769de5b01 Merge pull request #3970 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-07-12 08:03:49 +02:00
Min RK
c8a8892292 nbclassic extension name has been renamed
our patches to the jinja env need updating to find the new env
2022-07-11 20:37:29 -07:00
pre-commit-ci[bot]
273b25cb6f [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/asottile/pyupgrade: v2.34.0 → v2.37.1](https://github.com/asottile/pyupgrade/compare/v2.34.0...v2.37.1)
2022-07-11 21:54:26 +00:00
Erik Sundell
71e06a4cd7 Merge pull request #3958 from minrk/autocomplete-annotation
add correct autocomplete fields for login form
2022-07-10 12:11:04 +02:00
Erik Sundell
827310aca6 Fix disabling of individual page template announcements 2022-07-10 12:05:48 +02:00
Min RK
b9c83cf7ab allow HubAuth to be async
Switches requests to tornado AsyncHTTPClient instead of requests

For backward-compatibility, use opt-in `sync=False` arg for all public methods that _may_ be async

When sync=True (default), async functions still used, but blocking via ThreadPool + asyncio run_until_complete
2022-07-09 16:45:41 -07:00
Min RK
8a44748324 Bump to 2.4.0.dev 2022-07-09 16:44:24 -07:00
Min RK
e4f469ef73 Merge pull request #3968 from minrk/test-nbclassic
pin nbclassic in dev requirements
2022-07-09 16:41:27 -07:00
Min RK
4cf4566fff pin nbclassic < 0.4
0.4 doesn't actually load at all
2022-07-09 10:05:15 -07:00
Min RK
55c866f340 note why we depend on nbclassic
Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
2022-07-08 12:15:41 -07:00
Min RK
fd550e223e add nbclassic to dev requirements
ensures `/tree/` handler is present
2022-07-08 10:32:13 -07:00
Min RK
225ace636a call client-allowed scopes JUPYTERHUB_OAUTH_CLIENT_ALLOWED_SCOPES 2022-07-08 10:18:59 -07:00
Erik Sundell
ee4c8b835b Merge pull request #3964 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-07-05 10:56:02 +02:00
pre-commit-ci[bot]
f43ad0c176 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/psf/black: 22.3.0 → 22.6.0](https://github.com/psf/black/compare/22.3.0...22.6.0)
2022-07-04 22:34:28 +00:00
Min RK
95de2618a3 Merge pull request #3960 from cqzlxl/cqzlxl-patch-1
Fix GET /api/proxy with pagination
2022-06-30 21:18:09 +02:00
Min RK
48c9f6ca50 Test proxy API endpoint with pagination 2022-06-30 12:09:20 -07:00
cqzlxl
2d56bb74eb FIX a bug
it's an obvious bug.
2022-06-27 22:42:33 +08:00
Min RK
42cc3cae8e add correct autocomplete fields for login form 2022-06-24 10:37:50 +02:00
Min RK
02da11e06e Merge pull request #3955 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-06-21 09:58:36 +02:00
pre-commit-ci[bot]
eb1061a910 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/pre-commit/mirrors-prettier: v2.6.2 → v2.7.1](https://github.com/pre-commit/mirrors-prettier/compare/v2.6.2...v2.7.1)
2022-06-20 21:02:45 +00:00
Vlad Vifor
5d9967d3bd Merge branch 'jupyterhub:main' into group_property_feature 2022-06-17 13:59:31 +02:00
Min RK
d852d9e37c Merge pull request #3953 from silenius/freebsd_pw
FreeBSD, missing -n for pw useradd
2022-06-16 11:33:06 +02:00
Julien Cigar
1392aee195 -n is required 2022-06-15 17:23:13 +02:00
pre-commit-ci[bot]
3b4c8fe827 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-06-14 14:44:41 +00:00
vpopescu
052bf17292 Simplified hasDuplicates function 2022-06-14 16:44:08 +02:00
vpopescu
8df935829d Merge branch 'group_property_feature' of https://github.com/vladfreeze/jupyterhub into group_property_feature 2022-06-14 16:35:21 +02:00
vpopescu
39479609ca Added key check on users 2022-06-14 16:35:19 +02:00
pre-commit-ci[bot]
4344b0c0b0 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-06-14 14:27:38 +00:00
vpopescu
13ea058bbb Merge branch 'group_property_feature' of https://github.com/vladfreeze/jupyterhub into group_property_feature 2022-06-14 16:26:59 +02:00
vpopescu
8fe4bc201e Added properties to documentation for load_groups + example 2022-06-14 16:25:04 +02:00
pre-commit-ci[bot]
f6a35de542 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-06-14 14:22:53 +00:00
vpopescu
d7fbe494dd Added properties support in app.py 2022-06-14 16:22:15 +02:00
vpopescu
1ccf282170 Merge commit '63b7defe1a40b3abc3582a65a0402c1e82a2e230' into group_property_feature 2022-06-14 14:57:06 +02:00
Erik Sundell
63b7defe1a Merge pull request #3950 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-06-14 00:43:29 +02:00
pre-commit-ci[bot]
00803f039a [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/asottile/pyupgrade: v2.32.1 → v2.34.0](https://github.com/asottile/pyupgrade/compare/v2.32.1...v2.34.0)
- [github.com/pre-commit/pre-commit-hooks: v4.2.0 → v4.3.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.2.0...v4.3.0)
2022-06-13 22:29:26 +00:00
Erik Sundell
2b1c246c13 Merge pull request #3947 from jupyterhub/dependabot/github_actions/char0n/swagger-editor-validate-8829b79e438e100191c1e6ec1519daf0b66fed34
Bump char0n/swagger-editor-validate from 182d1a5d26ff5c2f4f452c43bd55e2c7d8064003 to 1.3.1
2022-06-13 13:48:53 +02:00
Erik Sundell
4f6dd69cb1 Merge pull request #3949 from jupyterhub/dependabot/github_actions/actions/setup-python-4
Bump actions/setup-python from 2 to 4
2022-06-13 13:48:43 +02:00
Erik Sundell
4fde1d2b65 Apply suggestions from code review 2022-06-13 13:48:21 +02:00
Erik Sundell
ccceebe257 Merge pull request #3948 from jupyterhub/dependabot/github_actions/actions/upload-artifact-3
Bump actions/upload-artifact from 2 to 3
2022-06-13 13:47:09 +02:00
Erik Sundell
499dac9ee2 ci: fix typo in test-docs workflow triggers 2022-06-13 13:46:09 +02:00
Erik Sundell
1d26e61f7e Apply suggestions from code review 2022-06-13 13:46:09 +02:00
dependabot[bot]
c40e20a3e3 Bump actions/setup-python from 2 to 4
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2 to 4.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v2...v4)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-13 11:38:08 +00:00
dependabot[bot]
549b2b8e95 Bump actions/upload-artifact from 2 to 3
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-13 11:38:04 +00:00
Erik Sundell
15665c0363 Merge pull request #3944 from jupyterhub/dependabot/github_actions/actions/setup-node-3
Bump actions/setup-node from 1 to 3
2022-06-13 13:38:01 +02:00
dependabot[bot]
226f993e7d Bump char0n/swagger-editor-validate
Bumps [char0n/swagger-editor-validate](https://github.com/char0n/swagger-editor-validate) from 182d1a5d26ff5c2f4f452c43bd55e2c7d8064003 to 1.3.1. This release includes the previously tagged commit.
- [Release notes](https://github.com/char0n/swagger-editor-validate/releases)
- [Commits](182d1a5d26...8829b79e43)

---
updated-dependencies:
- dependency-name: char0n/swagger-editor-validate
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-13 11:38:00 +00:00
dependabot[bot]
9081265dab Bump actions/setup-node from 1 to 3
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 1 to 3.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v1...v3)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-13 11:37:44 +00:00
Erik Sundell
de14f18be8 Merge pull request #3946 from consideRatio/pr/weekly-05
ci: run dependabot updates weekly monday 05:00 UTC+0 time
2022-06-13 13:37:39 +02:00
Erik Sundell
da276f0c6b Merge pull request #3945 from jupyterhub/dependabot/github_actions/actions/checkout-3
Bump actions/checkout from 2 to 3
2022-06-13 13:36:59 +02:00
Erik Sundell
5a3c98a849 Merge pull request #3943 from jupyterhub/dependabot/github_actions/docker/setup-qemu-action-2
Bump docker/setup-qemu-action from 1.0.2 to 2
2022-06-13 13:35:53 +02:00
Erik Sundell
51fa0af3fe Merge pull request #3942 from jupyterhub/dependabot/github_actions/docker/setup-buildx-action-2
Bump docker/setup-buildx-action from 1.1.2 to 2
2022-06-13 13:35:37 +02:00
Erik Sundell
fcdce01ae6 Merge pull request #3941 from jupyterhub/dependabot/github_actions/docker/build-push-action-3
Bump docker/build-push-action from 2.4.0 to 3
2022-06-13 13:35:19 +02:00
dependabot[bot]
9af9a7bff7 Bump actions/checkout from 2 to 3
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-13 11:32:36 +00:00
dependabot[bot]
1eef021704 Bump docker/setup-qemu-action from 1.0.2 to 2
Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 1.0.2 to 2.
- [Release notes](https://github.com/docker/setup-qemu-action/releases)
- [Commits](25f0500ff2...8b122486ce)

---
updated-dependencies:
- dependency-name: docker/setup-qemu-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-13 11:32:27 +00:00
dependabot[bot]
a308a0c9b4 Bump docker/setup-buildx-action from 1.1.2 to 2
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1.1.2 to 2.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](2a4b53665e...dc7b9719a9)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-13 11:32:23 +00:00
dependabot[bot]
726b8243eb Bump docker/build-push-action from 2.4.0 to 3
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2.4.0 to 3.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](e1b7f96249...e551b19e49)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-13 11:32:17 +00:00
Erik Sundell
88cea51561 Run updates weekly monday 05:00 UTC+0 time 2022-06-13 13:32:12 +02:00
Erik Sundell
ec0bcb1f1b Merge pull request #3940 from turrisxyz/Dependabot-GitHub-Actions
chore: add dependabot config for github actions
2022-06-13 13:31:32 +02:00
naveen
2df1808c4e chore: Included githubactions in the dependabot config
This should help with keeping the GitHub actions updated on new releases. This will also help with keeping it secure.

Dependabot helps in keeping the supply chain secure https://docs.github.com/en/code-security/dependabot

GitHub actions up to date https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot

https://github.com/ossf/scorecard/blob/main/docs/checks.md#dependency-update-tool
Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>
2022-06-13 01:30:37 +00:00
Erik Sundell
c85e90a71b Merge pull request #3939 from turrisxyz/Pinned-Dependencies-GitHub
chore: Set permissions for GitHub actions
2022-06-12 10:19:14 +02:00
naveen
1013a49db2 chore: Set permissions for GitHub actions
Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.

- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions

https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions

https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs

[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/)

Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>
2022-06-12 00:30:04 +00:00
Erik Sundell
f6eec29aa2 Merge pull request #3937 from minrk/importlib
switch to importlib_metadata for entrypoints
2022-06-08 15:23:54 +02:00
Min RK
64b99d5587 switch to importlib_metadata for entrypoints
standalone entrypoints package is deprecated
now that similar functionality is in the stdlib

need importlib_metadata >= 3.6 backport on Python < 3.10
2022-06-08 15:14:50 +02:00
Erik Sundell
75b07fc0d6 Merge pull request #3936 from minrk/add-user-validate
admin: Hub is responsible for username validation
2022-06-08 14:55:52 +02:00
Erik Sundell
d64068da66 Merge pull request #3935 from minrk/spawn-page-url
admin: Fix spawn page link for default server
2022-06-08 14:51:26 +02:00
Min RK
62b38934e5 store scopes on oauth clients, too
rather than roles, matching tokens

because oauth clients are mostly involved with issuing tokens,
they don't have roles themselves (their owners do).

This deprecates the `oauth_roles` config on Spawners and Services, in favor of `oauth_allowed_scopes`.

The ambiguously named `oauth_scopes` is renamed to `oauth_access_scopes`.
2022-06-08 12:26:48 +02:00
Min RK
14d8e23135 trim user input forms 2022-06-08 12:09:11 +02:00
Min RK
0908a15848 Server is responsible for username validation
Don't reimplement in the client
2022-06-08 11:06:33 +02:00
Min RK
2e878fb5ca fix spawn page link 2022-06-08 10:48:04 +02:00
Min RK
62d24341ca fix static url in admin page 2022-06-08 10:47:14 +02:00
Yuvi Panda
f2085fdf0f Merge pull request #3931 from consideRatio/pr/add-changelog-to-main
Add changelog for 2.3.0 and 2.3.1
2022-06-06 19:53:56 +05:30
Erik Sundell
a19c211612 Add changelog for 2.3.1 2022-06-06 16:18:03 +02:00
Min RK
9bbcf594ea One more in the changelog 2022-06-06 16:17:55 +02:00
Min RK
da89155503 changelog for 2.3 2022-06-06 16:17:54 +02:00
Min RK
3b59c4861f Merge pull request #3904 from manics/named-servers-escape
Escape named server name
2022-06-03 17:09:58 +02:00
Min RK
6f5764fd3d Merge pull request #3921 from manics/pages-unreachable
pages.py: Remove unreachable code
2022-06-03 16:58:33 +02:00
Simon Li
3c059f3acf Need to escape URLs in spawn-pending too 2022-06-02 19:56:52 +01:00
Simon Li
3a022f1ae3 pages.py: Remove unreachable code 2022-06-02 19:13:25 +01:00
Min RK
049a59f2ed Merge pull request #3920 from jupyterhub/dependabot/npm_and_yarn/jsx/eventsource-1.1.1
Bump eventsource from 1.1.0 to 1.1.1 in /jsx
2022-06-02 09:51:36 +02:00
Min RK
ed9ea4e6cc Merge pull request #3914 from manics/setuppy-yarn-jsx
Build admin app in setup.py
2022-06-02 09:51:22 +02:00
dependabot[bot]
c415be2db3 Bump eventsource from 1.1.0 to 1.1.1 in /jsx
Bumps [eventsource](https://github.com/EventSource/eventsource) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/EventSource/eventsource/releases)
- [Changelog](https://github.com/EventSource/eventsource/blob/master/HISTORY.md)
- [Commits](https://github.com/EventSource/eventsource/compare/v1.1.0...v1.1.1)

---
updated-dependencies:
- dependency-name: eventsource
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-01 22:51:13 +00:00
Simon Li
2bc5061e22 Don't escape servername in json blobs 2022-06-01 22:21:00 +01:00
pre-commit-ci[bot]
cedf12baeb [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-06-01 20:28:55 +00:00
Simon Li
b403c41c15 Remove old comment, include description in servername error
Co-authored-by: Min RK <benjaminrk@gmail.com>
2022-06-01 21:28:24 +01:00
Simon Li
acd75d85c7 Move installed data file check to script 2022-06-01 20:44:40 +01:00
Simon Li
5e5dad9512 check sdist files in release workflow 2022-06-01 20:43:28 +01:00
Simon Li
95e343395d Ensure jsx is in sdist 2022-06-01 20:43:02 +01:00
Yuvi Panda
6a29e5193b Merge pull request #3919 from minrk/jupyter-server-templates
ensure custom template is loaded with jupyter-server notebook extension
2022-06-01 22:59:33 +05:30
Min RK
1cb7177597 ensure custom template is loaded with jupyter-server notebook extension
our patches to page.html didn't affect nbclassic,
which gets its own jinja environment

regression test included
2022-06-01 16:13:10 +02:00
Yuvi Panda
50e863ca52 Merge pull request #3910 from minrk/optimize-prefix-lookup
use equality to filter token prefixes
2022-06-01 19:05:45 +05:30
Yuvi Panda
8cdd7ca2d2 Merge pull request #3918 from minrk/default-url-priority
set default_url via config
2022-06-01 19:04:55 +05:30
Min RK
6fbf8411ec Merge pull request #3915 from manics/contrib-docs
Update Contributing documentation
2022-05-31 19:52:30 +02:00
Min RK
fa200fed98 set default_url via config
avoids accidental overrides of `@default('default_url')` in subclasses,
e.g. SingleUserLabApp
2022-05-31 17:05:58 +02:00
Simon Li
7d7d30bcae Don't build admin app on readthedocs 2022-05-29 19:23:57 +01:00
Simon Li
85a4bbc28e Update Contributing documentation
Adds yarn, moves most of CONTRIBUTING.md into https://jupyterhub.readthedocs.io/en/stable/contributing/index.html to reduce duplication
2022-05-29 19:11:57 +01:00
Simon Li
0b161627c2 yarn: allow jlpm to be used instead 2022-05-29 17:14:14 +01:00
Simon Li
36e7898ed4 Update CI so that setup.py can build admin app 2022-05-29 16:52:24 +01:00
Simon Li
3537722208 Include generated admin-react.js.LICENSE.txt 2022-05-29 16:52:24 +01:00
Simon Li
dfcaa29c8a Build react admin app in setup.py 2022-05-29 16:52:20 +01:00
Simon Li
92c6d69bc8 Remove share/jupyterhub/static/js/admin-react.js jsx/build 2022-05-29 16:12:29 +01:00
Simon Li
7b8a2ae57b Escape server-name in URLs returned by API 2022-05-27 23:06:55 +01:00
Simon Li
b444fe478c Ensure server-name is escaped in proxy add_route 2022-05-27 22:44:09 +01:00
Simon Li
50fb1a016c Move server-name / check to higher up, add test 2022-05-27 22:06:19 +01:00
Min RK
e229c63e11 use equality to filter token prefixes
otherwise, index isn't used

note: this means changing the token prefix size requires revoking all tokens,
where before only _increasing_ the token prefix size required doing that.
2022-05-25 15:54:34 +02:00
Erik Sundell
9649a57e34 Merge pull request #3908 from minrk/fail-fail-auth-state
allow auth_state_hook to halt spawn
2022-05-25 12:43:39 +02:00
Erik Sundell
ac85d63013 Merge pull request #3907 from minrk/bump-moment
bump moment.js 2.29.2
2022-05-25 12:39:34 +02:00
Min RK
4b2ba1f6c0 allow auth_state_hook to halt spawn
hooks prior to start should raise and stop the whole thing

only hooks during cleanup need to be passed over
2022-05-25 11:36:32 +02:00
Min RK
886d15b622 bump moment.js 2.29.2 2022-05-25 11:32:06 +02:00
Min RK
d517ce37e7 Merge pull request #3906 from fabianbaier/patch-1
Force add existing certificates
2022-05-25 11:23:58 +02:00
Min RK
85f0cec33e Merge pull request #3903 from manics/jupyter-troubleshoot
`jupyter troubleshooting` ➡️  `jupyter troubleshoot`
2022-05-25 11:18:35 +02:00
pre-commit-ci[bot]
5c37569b2a [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-05-25 05:04:07 +00:00
Fabian Baier
956b96967e Update app.py to fix certipy.CertExistsError 2022-05-24 21:58:33 -07:00
Simon Li
f51faa25ed Ban / from server-name 2022-05-24 17:46:08 +01:00
Simon Li
aa8c85f404 Test explicitly escaped servername from client 2022-05-24 17:08:21 +01:00
Simon Li
98540f0f6d Need to escape server name in part of proxy 2022-05-24 16:56:15 +01:00
Simon Li
841c89769a Add test for special chars in named servers 2022-05-24 16:55:48 +01:00
Simon Li
84cb9761e8 Escape named servers when used in URL paths 2022-05-22 23:31:47 +01:00
Simon Li
178e340223 jupyter troubleshooting ➡️ jupyter troubleshoot 2022-05-22 15:18:42 +01:00
Min RK
b18a05c2c8 Merge pull request #3895 from yuvipanda/document-display
Document the 'display' attribute of services
2022-05-13 11:56:58 +02:00
Min RK
3466de1473 Merge pull request #3899 from manics/admin_access_deprecated
`admin_access` no longer works as it is overridden by RBAC scopes
2022-05-13 11:53:58 +02:00
Simon Li
4be4e41fa7 admin_access no longer works as it is overridden by RBAC scopes
The `admin_access` variable is still referenced elsewhere and I considered removing it, but I couldn't work out exactly how/if it's used so this is just a docs change for now.
2022-05-12 12:31:50 +01:00
YuviPanda
3264463366 Document the 'display' attribute of services
Ref https://github.com/2i2c-org/infrastructure/issues/1301
2022-05-11 19:04:58 +05:30
Simon Li
8252504dad Merge pull request #3885 from minrk/deprecate-db
Deprecate Authenticator.db, Spawner.db
2022-05-10 17:48:20 +01:00
Min RK
ac3ef1efc1 Deprecate Authenticator.db, Spawner.db
These objects should not access the shared db session;
add a warning pointing to Issue about their removal if it is accessed
2022-05-10 10:24:32 +02:00
Min RK
54cb259882 Merge pull request #3891 from bbrauns/main
remove apache NE flag as it prevents opening folders and renaming fil…
2022-05-10 10:22:01 +02:00
Min RK
04d0291fa0 Merge pull request #3889 from johnkpark/jp--remove-admin-table-head
admin: make user-info table selectable
2022-05-10 10:21:06 +02:00
Erik Sundell
c8d6700406 Merge pull request #3892 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-05-10 07:01:25 +02:00
pre-commit-ci[bot]
e61f2d74a8 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/asottile/pyupgrade: v2.32.0 → v2.32.1](https://github.com/asottile/pyupgrade/compare/v2.32.0...v2.32.1)
2022-05-09 20:54:37 +00:00
Björn Braunschweig
a0b9a1fe86 remove apache NE flag as it prevents opening folders and renaming files with whitespace characters. apache returns Bad Request 2022-05-09 11:36:14 +02:00
John Park
27d2e95c43 add regeneratorRuntime back in 2022-05-06 14:03:05 -07:00
John Park
819e59292d yarn lint / place 2022-05-05 16:34:28 -07:00
John Park
f3ef16b948 remove admin-table-head class 2022-05-05 16:21:29 -07:00
Simon Li
5e1e44057d Merge pull request #3886 from minrk/cleanup-api-shutdown
Cleanup everything on API shutdown
2022-05-05 20:16:43 +01:00
Min RK
bf2e322c22 Cleanup everything on API shutdown
via app.stop()
2022-05-05 12:53:21 +02:00
Min RK
585b47051f Merge pull request #3882 from yuvipanda/mo-exceptions
Use log.exception when logging exceptions
2022-05-05 11:37:42 +02:00
Min RK
5ca96fa758 Merge pull request #3878 from minrk/admin-ui-scope
add 'admin-ui' scope for access to the admin ui
2022-05-03 11:20:23 +02:00
YuviPanda
aba6eb962f Use log.exception when logging exceptions
This provides the stack trace in the log file, incredibly
useful when debugging
2022-05-02 17:36:31 -07:00
Georgiana Elena
107dc02fd0 Merge pull request #3876 from minrk/disallow-next-check
don't confuse :// in next_url query params for a redirect hostname
2022-04-29 13:13:21 +03:00
Min RK
debac715bf add 'admin-ui' scope for access to the admin ui 2022-04-29 11:54:02 +02:00
Min RK
c6ed41e322 don't confuse :// in next_url query params for a redirect hostname 2022-04-28 13:35:37 +02:00
Min RK
ec2c90c73f Merge pull request #3874 from code-review-doctor/fix-probably-meant-fstring
Missing `f` prefix on f-strings fix
2022-04-26 15:15:55 +02:00
Min RK
6c2c5e5a90 Don't let spawner._log_name fail when running without user in tests 2022-04-26 14:27:39 +02:00
code-review-doctor
f0b2d8c4eb Fix issue probably-meant-fstring found at https://codereview.doctor 2022-04-24 17:30:49 +01:00
Min RK
a588a0bfa3 Merge pull request #3851 from minrk/service-filter
!service and !server filters
2022-04-21 12:32:31 +02:00
Simon Li
c07358a526 Merge pull request #3869 from jupyterhub/dependabot/npm_and_yarn/jsx/async-2.6.4
Bump async from 2.6.3 to 2.6.4 in /jsx
2022-04-15 21:06:19 +01:00
dependabot[bot]
9058fa42dd Bump async from 2.6.3 to 2.6.4 in /jsx
Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-15 19:08:43 +00:00
Min RK
55d7ebe006 Merge pull request #3867 from consideRatio/pr/black-detail
ci: update black configuration
2022-04-15 21:08:07 +02:00
Erik Sundell
6edbfdad89 ci: update black configuration 2022-04-15 19:16:51 +02:00
vpopescu
b2a6a5a82f Updated jsx-admin 2022-04-14 17:26:36 +02:00
pre-commit-ci[bot]
60cd4ff872 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-04-14 15:17:53 +00:00
Vlad Vifor
35f4c76982 Merge branch 'main' into group_property_feature 2022-04-14 17:17:21 +02:00
Erik Sundell
715a4a25cf Merge pull request #3864 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-04-12 11:04:12 +01:00
pre-commit-ci[bot]
e15447c8b8 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/asottile/pyupgrade: v2.31.1 → v2.32.0](https://github.com/asottile/pyupgrade/compare/v2.31.1...v2.32.0)
- [github.com/pre-commit/pre-commit-hooks: v4.1.0 → v4.2.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.1.0...v4.2.0)
2022-04-11 21:25:48 +00:00
Min RK
ab8eec164c Merge pull request #3863 from NarekA/narek/fix-search-bar
[Bug Fix] Search bar disabled on admin dashboard
2022-04-11 11:15:05 +02:00
Narek Amirbekian
b1177cd2ce Improve user search tests 2022-04-08 12:23:27 -07:00
Narek Amirbekian
40d95dc142 Fix search bar in admin dashboard 2022-04-08 11:27:41 -07:00
Min RK
d78bd42cfc call owner_name user_name since it's only defined when the owner is a user 2022-04-08 20:17:12 +02:00
Min RK
b6210dc225 add !service and !server scope filters
allows oauth clients to issue scopes that only grant access to the issuing service

e.g. access:service!service or access:servers!server

especially useful with custom scopes
2022-04-08 20:10:23 +02:00
Erik Sundell
b05a89a3e0 Merge pull request #3862 from cmd-ntrf/readme-rest-api
Fix typo in [rest api] link in README.md
2022-04-08 17:21:31 +02:00
Félix-Antoine Fortin
13e99b904b Fix typo in [rest api] link 2022-04-08 09:56:18 -04:00
Simon Li
01a4b9c4b4 Merge pull request #3859 from minrk/get_env_modify
Do not store Spawner.ip/port on spawner.server during get_env
2022-04-07 22:03:14 +01:00
Min RK
d6df1be272 Merge pull request #3850 from minrk/cache-scopes
memoize some scope functions
2022-04-07 12:56:19 +02:00
Min RK
85ef5cf807 Do not store Spawner.ip/port on spawner.server
This was part of an attempt to get the url from self.server.bind_url that didn't end up getting used

shouldn't mutate db state when getting the environment
2022-04-07 10:56:49 +02:00
Min RK
ff020cb5a4 needs_db typo
Co-authored-by: Simon Li <orpheus+devel@gmail.com>
2022-04-07 09:42:25 +02:00
Min RK
5c54ac9aa1 Merge pull request #3853 from jwclark/patch-1
Fix xsrf_cookie_kwargs ValueError
2022-04-05 20:28:03 +02:00
Erik Sundell
e48662423a Merge pull request #3856 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-04-05 01:00:08 +02:00
pre-commit-ci[bot]
f124f06c2d [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/psf/black: 22.1.0 → 22.3.0](https://github.com/psf/black/compare/22.1.0...22.3.0)
- [github.com/pre-commit/mirrors-prettier: v2.6.1 → v2.6.2](https://github.com/pre-commit/mirrors-prettier/compare/v2.6.1...v2.6.2)
2022-04-04 20:23:56 +00:00
Joseph Clark
f2faf0ee43 Fix ValueError
Fixes ValueError: too many values to unpack (expected 2)
2022-04-01 15:44:28 -06:00
Min RK
ab2913008e more docs, comments, asserts about immutable scope functions 2022-04-01 11:54:32 +02:00
Min RK
eebc0f485d Apply suggestions from code review
Co-authored-by: Simon Li <orpheus+devel@gmail.com>
2022-04-01 11:36:06 +02:00
Min RK
bb6427ea9b Add FrozenDict for caching parsed_scopes dicts
Since we need them to be immutable
2022-04-01 11:36:05 +02:00
Min RK
29b73563dc cache common scope operations
we expand/parse the same scopes _a lot_.
We can save time with some caching.

Main change: cached functions must return immutable frozenset instead of mutable set,
to avoid mutating the result of subsequent returns.

Some functions can only be cached _sometimes_ (e.g. group lookups in db cannot be cached),
for which we have a DoNotCache(result) exception
2022-04-01 11:35:05 +02:00
Erik Sundell
aa0ce1c88a Merge pull request #3852 from minrk/isort
Use isort for import formatting
2022-04-01 11:07:28 +02:00
Min RK
7a9778249f run pre-commit with isort 2022-03-31 12:33:26 +02:00
Min RK
c41b732fbd switch to isort for import formatting
isort produces nicer imports without wasting a huge amount of space
2022-03-31 12:32:11 +02:00
Vlad Vifor
6ede428990 Merge branch 'jupyterhub:main' into group_property_feature 2022-03-30 11:25:53 +02:00
Erik Sundell
d9b85a819e Merge pull request #3849 from huage1994/patch-1
The word `used` is duplicated in upgrade.md
2022-03-30 08:26:08 +02:00
nihua
6d00eb501a Update upgrade.md 2022-03-30 14:20:30 +08:00
Erik Sundell
318c95342d Merge pull request #3833 from minrk/token-scopes
Tokens have scopes instead of roles
2022-03-29 23:49:35 +02:00
Erik Sundell
cde0f12f07 Merge pull request #3848 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-03-28 22:41:22 +02:00
pre-commit-ci[bot]
6668fb39f9 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/pre-commit/mirrors-prettier: v2.6.0 → v2.6.1](https://github.com/pre-commit/mirrors-prettier/compare/v2.6.0...v2.6.1)
2022-03-28 19:36:33 +00:00
Min RK
4691fae90a Merge pull request #3845 from jupyterhub/dependabot/npm_and_yarn/jsx/minimist-1.2.6
Bump minimist from 1.2.5 to 1.2.6 in /jsx
2022-03-28 09:03:51 +02:00
Min RK
0fccbc69ff Merge pull request #3834 from NarekA/narek/server-details-in-dashboard
Admin Dashboard - Collapsible Details View
2022-03-28 09:03:26 +02:00
dependabot[bot]
d699f794ac Bump minimist from 1.2.5 to 1.2.6 in /jsx
Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-26 13:42:02 +00:00
Min RK
29a9ca18fe Merge pull request #3841 from minrk/asyncio-mode
adopt pytest-asyncio asyncio_mode='auto'
2022-03-26 14:41:29 +01:00
Erik Sundell
72ae21d6dc Merge pull request #3843 from minrk/doc-typos
Some typos in docs
2022-03-24 16:25:47 +01:00
Min RK
310d9621e5 limit server->read:users:name filter to read: scopes
it shouldn't be included in _access_ scopes, for instance
2022-03-24 16:13:57 +01:00
Min RK
0f4258d00c update more test expectations 2022-03-24 15:47:02 +01:00
Min RK
78b5aa150c avoid always-adding identify scope to everything
add it to token permissions _before_ intersecting with owner
2022-03-24 15:36:56 +01:00
Min RK
3cfb14b9e5 rerender rest-api 2022-03-24 15:16:21 +01:00
Min RK
7e22614a4e [squash me] token progress
tokens have scopes

    instead of roles, which allow tokens to change permissions over time

    This is mostly a low-level change,
    with little outward-facing effects.

    - on upgrade, evaluate all token role assignments to their current scopes,
      and store those scopes on the tokens
    - assigning roles to tokens still works, but scopes are evaluated and validated immediately,
      rather than lazily stored as roles
    - no longer need to check for role permission changes on startup, because token permissions aren't affected
    - move a few scope utilities from roles to scopes
    - oauth allows specifying scopes, not just roles.
      But these are still at the level specified in roles,
      not fully-resolved scopes.
    - more granular APIs for working with scopes and roles

    Still to do later:

    - expose scopes config for Spawner/service
    - compute 'full' intersection of requested scopes, rather than on the 'raw' scope list in roles
2022-03-24 15:05:50 +01:00
Min RK
66ecaf472a fix some outdated references to 'all' metascope
it is called 'inherit', but not all docs were updated
2022-03-24 14:06:05 +01:00
Min RK
3ba262f6f6 fix heading level in changelog
sphinx has started to error with this
2022-03-24 14:06:04 +01:00
vpopescu
bfc9c880b9 Removed duplicate files 2022-03-23 13:54:07 +01:00
vpopescu
ef113a9040 Merge branch 'group_property_feature' of https://github.com/vladfreeze/jupyterhub into group_property_feature 2022-03-23 13:52:04 +01:00
vpopescu
ca4342a010 Removed git error 2022-03-23 13:31:55 +01:00
Vlad Vifor
e627e91fa6 Merge branch 'jupyterhub:main' into group_property_feature 2022-03-23 13:21:25 +01:00
Min RK
b935190da8 adopt pytest-asyncio asyncio_mode
removes need for our own implementation of the same behavior

but keep it around while we still support Python 3.6,
since the version (0.17) introducing asyncio_mode drops support for Python 3.6
2022-03-23 09:25:22 +01:00
Erik Sundell
7cd5c1c12b Merge pull request #3840 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-03-22 06:35:53 +01:00
pre-commit-ci[bot]
4708fce4f8 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/pre-commit/mirrors-prettier: v2.5.1 → v2.6.0](https://github.com/pre-commit/mirrors-prettier/compare/v2.5.1...v2.6.0)
2022-03-21 23:39:32 +00:00
Narek Amirbekian
93fda7c96b Change layout 2022-03-21 13:05:56 -07:00
Erik Sundell
912e0ad53f Merge pull request #3839 from yuvipanda/log-docs-1
Document version mismatch log message
2022-03-21 11:40:49 +01:00
YuviPanda
3e9ce8bc03 Document version mismatch log message 2022-03-19 14:10:24 -07:00
Min RK
a08aa3398c ensure literal_binds is set in order
Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
2022-03-18 15:25:46 +01:00
Min RK
3076845927 tokens have scopes
instead of roles, which allow tokens to change permissions over time

This is mostly a low-level change,
with little outward-facing effects.

- on upgrade, evaluate all token role assignments to their current scopes,
  and store those scopes on the tokens
- assigning roles to tokens still works, but scopes are evaluated and validated immediately,
  rather than lazily stored as roles
- no longer need to check for role permission changes on startup, because token permissions aren't affected
- move a few scope utilities from roles to scopes
- oauth allows specifying scopes, not just roles.
  But these are still at the level specified in roles,
  not fully-resolved scopes.
- more granular APIs for working with scopes and roles
2022-03-18 14:13:16 +01:00
pre-commit-ci[bot]
b1c0ebd521 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-03-18 11:59:17 +00:00
Vlad Vifor
e6c4ca1f25 Merge branch 'jupyterhub:main' into group_property_feature 2022-03-18 12:58:20 +01:00
Erik Sundell
cb25d29b0b Merge pull request #3837 from minrk/fix-import-error
ensure _import_error is set when JUPYTERHUB_SINGLEUSER_APP is unavailable
2022-03-18 10:03:18 +01:00
Min RK
2e8d303ad8 ensure _import_error is set when JUPYTERHUB_SINGLEUSER_APP is unavailable 2022-03-18 09:24:22 +01:00
Erik Sundell
a754d56433 Merge pull request #3835 from minrk/rm-distutils
remove lingering reference to distutils
2022-03-17 13:28:43 +01:00
Min RK
775a16dc50 remove lingering reference to distutils 2022-03-17 12:16:44 +01:00
Narek Amirbekian
16824dcadb Use .toHaveClass instead of .contains 2022-03-16 16:42:17 -07:00
Narek Amirbekian
f949cda227 Add test for details view 2022-03-16 16:36:34 -07:00
Erik Sundell
454e356e4d Merge pull request #3713 from minrk/custom-scopes
allow user-defined custom scopes
2022-03-16 08:52:55 +01:00
Min RK
9a87b59e84 improve custom scope docstrings 2022-03-16 08:44:52 +01:00
Narek Amirbekian
93d82a9012 Fix tests 2022-03-15 17:09:26 -07:00
Narek Amirbekian
564458b106 Set defaults for name_filter 2022-03-15 15:13:04 -07:00
Narek Amirbekian
b38e9c45bf Improved layout 2022-03-15 13:40:44 -07:00
Narek Amirbekian
85d4c5bd7a Remove unused state object 2022-03-15 12:14:38 -07:00
Narek Amirbekian
6a9d27ceb4 Server details in server dashboard 2022-03-15 12:01:22 -07:00
Min RK
d2eaf90df2 authorize subsets of roles
- oauth clients can request a list of roles
- authorization will proceed with the _subset_ of those roles held by the user
- in the future, this subsetting will be refined to the scope level
2022-03-15 11:54:42 +01:00
Min RK
fa8cd90793 Merge pull request #3827 from NarekA/narek/admin-dashboard-search
[Admin Dash] Add search bar for user name
2022-03-15 11:35:57 +01:00
Narek Amirbekian
7dafae29fb Update compiled files 2022-03-15 02:40:27 -07:00
Narek Amirbekian
89a6c745b5 Add base_url to spawner 2022-03-15 02:33:17 -07:00
Erik Sundell
821d9e229d Merge pull request #3831 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-03-15 07:10:27 +01:00
Narek Amirbekian
db7619fa7a Fix server url 2022-03-14 21:02:18 -07:00
Narek Amirbekian
1ed9423530 Update compiled jsx 2022-03-14 18:06:10 -07:00
Narek Amirbekian
147a578f7a Fix index error on assertion 2022-03-14 18:03:56 -07:00
Narek Amirbekian
3a59a15164 Add front end tests for user search 2022-03-14 17:54:51 -07:00
pre-commit-ci[bot]
1b7aded7f9 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-03-14 23:25:52 +00:00
pre-commit-ci[bot]
bc45d77365 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/asottile/pyupgrade: v2.31.0 → v2.31.1](https://github.com/asottile/pyupgrade/compare/v2.31.0...v2.31.1)
- [github.com/asottile/reorder_python_imports: v2.7.1 → v3.0.1](https://github.com/asottile/reorder_python_imports/compare/v2.7.1...v3.0.1)
2022-03-14 23:24:13 +00:00
Narek Amirbekian
1b3b005ca4 Add test for name_filter 2022-03-14 13:33:05 -07:00
pre-commit-ci[bot]
e0be811b2c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-03-14 19:17:28 +00:00
Narek Amirbekian
3627251246 Merge branch 'main' into narek/admin-dashboard-search 2022-03-14 12:16:50 -07:00
Erik Sundell
8d056170d7 Bump to 2.3.0.dev 2022-03-14 12:32:56 +01:00
Erik Sundell
3590d16e30 Bump to 2.2.2 2022-03-14 12:32:25 +01:00
Erik Sundell
572d258cd2 Merge pull request #3828 from consideRatio/pr/changelog-2.2.2
Add changelog for 2.2.2
2022-03-14 12:30:27 +01:00
Min RK
11d0954551 Merge pull request #3826 from consideRatio/pr/add-dedicated-jsx-tests 2022-03-14 12:27:59 +01:00
Erik Sundell
650d47d5c1 Add changelog for 2.2.2 2022-03-14 12:15:54 +01:00
Erik Sundell
945fc824d8 Remove autoformat added new line for generated file 2022-03-12 01:12:29 +01:00
Erik Sundell
a8aa737b00 Don't autoformat generated admin-react.js 2022-03-12 01:12:29 +01:00
Erik Sundell
cd689a1fab ci: test jsx in a dedicated workflow along with src->dist check 2022-03-12 01:12:29 +01:00
Narek Amirbekian
b3f04e7c66 Add search bar for user name 2022-03-11 15:12:53 -08:00
Erik Sundell
fbcf857991 Add inline comments to .pre-commit-config.yaml 2022-03-12 00:00:27 +01:00
Erik Sundell
6c5e5452bc Merge pull request #3825 from NarekA/narek/fix-admin-table-sorting-2
Update admin-react.js
2022-03-11 18:33:33 +01:00
pre-commit-ci[bot]
2f5ba7ba30 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-03-11 17:15:21 +00:00
Narek Amirbekian
a045eefa64 React file not updated 2022-03-11 09:13:14 -08:00
Min RK
6ea4f2af0d Bump to 2.3.0.dev 2022-03-11 17:00:28 +01:00
Min RK
3d3ad2929c Bump to 2.2.1 2022-03-11 16:59:52 +01:00
Erik Sundell
00287ff5ba Merge pull request #3824 from minrk/221
changelog for 2.2.1
2022-03-11 16:17:11 +01:00
Min RK
805d063d1d changelog for 2.2.1 2022-03-11 15:52:41 +01:00
Min RK
e6bacf7109 Merge pull request #3822 from NarekA/narek/fix-admin-table-sorting
Fix admin dashboard table sorting
2022-03-11 15:48:45 +01:00
Min RK
33ccfa7963 handle null user.server
Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
2022-03-11 14:16:30 +01:00
Min RK
fdf23600c0 allow custom scopes
defined with

    c.JupyterHub.custom_scopes = {
        'custom:scope': {'description': "text shown on oauth confirm"}
    }

Allows injecting custom scopes to roles,
allowing extension of granular permissions to service-defined custom scopes.

Custom scopes:

- MUST start with `custom:`
- MUST only contain ascii lowercase, numbers, colon, hyphen, asterisk, underscore
- MUST define a `description`
- MAY also define `subscopes` list(s), each of which must also be explicitly defined

HubAuth can be used to retrieve and check for custom scopes to authorize requests.
2022-03-11 11:37:26 +01:00
Erik Sundell
593404f558 Merge pull request #3823 from minrk/clear-cookie-kwargs
Fix clearing cookie with custom xsrf cookie options
2022-03-11 09:53:43 +01:00
Min RK
e7bc282c80 clear_cookie only accepts path, domain cookie args 2022-03-11 09:24:31 +01:00
pre-commit-ci[bot]
b939b482a1 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-03-11 06:38:13 +00:00
Narek Amirbekian
8afc2c9ae9 Fix admin table sorting 2022-03-10 22:20:01 -08:00
Chris Holdgraf
d11eda14ed Merge pull request #3820 from yuvipanda/log-docs 2022-03-10 16:38:01 -08:00
Yuvi Panda
ab79251fe2 Reword for clarity
Co-authored-by: Chris Holdgraf <choldgraf@gmail.com>
2022-03-10 15:54:42 -08:00
Yuvi Panda
484dbf48de Merge pull request #3819 from minrk/raise-no-orm-spawner
allow Spawner.server to be mocked without underlying orm_spawner
2022-03-10 13:46:49 -08:00
YuviPanda
6eb526d08a Add a little more structure 2022-03-10 13:45:28 -08:00
YuviPanda
e0a17db5f1 Add some docs on common log messages
When debugging errors and outages, looking at the logs emitted by
JupyterHub is very helpful. This document tries to document some common
log messages, and what they mean.

I currently added just one log message, but we can add more
over time.

Ref https://github.com/2i2c-org/infrastructure/issues/1081
where this would've been useful troubleshooting
2022-03-10 12:45:09 -08:00
Min RK
45132b7244 allow Spawner.server to be mocked without underlying orm_spawner 2022-03-10 15:40:01 +01:00
Min RK
c23cddeb51 Bump to 2.2.0 2022-03-07 14:35:46 +01:00
Erik Sundell
672e19a22a Merge pull request #3815 from minrk/changelog-2.2
Changelog for 2.2
2022-03-07 14:32:56 +01:00
Min RK
4a6c9c3a01 Prepare changelog for 2.2 2022-03-07 14:27:31 +01:00
Erik Sundell
2b79bc44da Merge pull request #3802 from minrk/fresh-spawner
Replace failed spawners when starting new launch
2022-03-07 14:23:22 +01:00
Min RK
7861662e17 Replace failed spawners when starting new launch
Avoids leaving stale state when re-using a spawner that failed the last time it started

we keep failed spawners around to track their errors,
but we don't want to re-use them when it comes time to start a new launch.

adds User.get_spawner(server_name, replace_failed=True) to always get a non-failed Spawner
2022-03-07 14:03:48 +01:00
Simon Li
4a1842bf8a Merge pull request #3809 from minrk/page_config_hook
Add user token to JupyterLab PageConfig
2022-03-04 21:27:34 +00:00
Min RK
8f18303e50 fix some links revealed by myst
mostly pre-myst markdown links
2022-03-04 10:41:20 +01:00
Min RK
bcad6e287d Merge pull request #3812 from ktaletsk/patch-1
Update example to not reference an undefined scope
2022-03-04 10:03:53 +01:00
Min RK
9de1951952 Merge pull request #3813 from rzo1/apache-sec
Apache2 Documentation: Updates Reverse Proxy Configuration (TLS/SSL, Protocols, Headers)
2022-03-04 10:03:01 +01:00
pre-commit-ci[bot]
99cb1f17f0 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-03-03 15:41:17 +00:00
Richard Zowalla
10d5157e95 Apache2 Documentation: Updates Reverse Proxy Configuration (TLS/SSL, Protocols, Headers) 2022-03-03 16:40:38 +01:00
Konstantin Taletskiy
2fc4f26832 Update example to not reference an undefined scope
Fixes #3811
2022-03-01 12:25:54 -08:00
Simon Li
f6230001bb Merge pull request #3810 from minrk/server-trait
Keep Spawner.server in sync with underlying orm_spawner.server
2022-03-01 17:40:33 +00:00
Min RK
960f7cbeb9 Keep Spawner.server in sync with underlying orm_spawner.server
Rather than one-time sets of ._server allowing it to become out-of-sync
with underlying orm_spawner.server
2022-03-01 15:59:16 +01:00
Erik Sundell
76f06a6b55 Merge pull request #3808 from manics/apache-x-forwarded-proto
Apache: set X-Forwarded-Proto header
2022-03-01 14:14:34 +01:00
Min RK
9c498aa5d4 Document HubOAuth.get_token for requests on behalf of users 2022-03-01 10:05:17 +01:00
Min RK
a0b60f9118 place JupyterHub token in JupyterLab PageConfig
restores token field useful for javascript-originating API requests,
removed in 1.5 / 2.0 for security reasons because it was the wrong token.

This places the _user's_ token in PageConfig,
so it should have the right permissions.

requires jupyterlab_server 2.9, has no effect on earlier versions.
2022-03-01 09:45:14 +01:00
Min RK
27cb56429b HubAuth.get_token returns oauth token stored in cookie
Useful for backend services that want to use the user's token.

Added `in_cookie` bool argument to exclude cookies (previous behavior),
since notebook servers do some things differently when auth is in query param or header vs cookies
2022-03-01 09:43:01 +01:00
Simon Li
b1ffd4b10b Apache: set X-Forwarded-Proto header 2022-02-28 21:46:53 +00:00
dependabot[bot]
a9ea064202 Merge pull request #3807 from jupyterhub/dependabot/npm_and_yarn/jsx/url-parse-1.5.10 2022-02-28 09:56:10 +00:00
dependabot[bot]
687a41a467 Bump url-parse from 1.5.7 to 1.5.10 in /jsx
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.7 to 1.5.10.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.7...1.5.10)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-28 04:27:03 +00:00
Erik Sundell
5348451b2e Merge pull request #3803 from tmtabor/patch-1
idle-culler example config missing closing bracket
2022-02-22 23:09:15 +01:00
Thorin Tabor
55f0579dcc idle-culler example config missing closing bracket 2022-02-22 13:16:37 -08:00
Simon Li
a3ea0f0449 Merge pull request #3799 from jupyterhub/dependabot/npm_and_yarn/jsx/url-parse-1.5.7
Bump url-parse from 1.5.3 to 1.5.7 in /jsx
2022-02-19 08:11:52 +00:00
dependabot[bot]
78492a4a8e Bump url-parse from 1.5.3 to 1.5.7 in /jsx
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.3 to 1.5.7.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.3...1.5.7)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-19 07:35:42 +00:00
Vlad Vifor
0643b8280e Merge branch 'jupyterhub:main' into group_property_feature 2022-02-16 11:35:57 +01:00
Min RK
f22203f50e Merge pull request #3793 from satra/patch-1
show insecure-login-warning for all authenticators
2022-02-15 11:24:09 +01:00
Simon Li
500b354a00 Merge pull request #3795 from jupyterhub/dependabot/npm_and_yarn/jsx/follow-redirects-1.14.8
Bump follow-redirects from 1.14.7 to 1.14.8 in /jsx
2022-02-14 09:52:27 +00:00
dependabot[bot]
9d4093782f Bump follow-redirects from 1.14.7 to 1.14.8 in /jsx
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-14 08:52:00 +00:00
Min RK
43b3cebfff Merge pull request #3791 from rcthomas/async-options
Enable options_from_form(spawner, form_data) from configuration file
2022-02-14 09:45:04 +01:00
Min RK
63c381431d Merge pull request #3787 from minrk/stop_open_session_default
Stop opening PAM sessions by default
2022-02-14 09:43:12 +01:00
Min RK
bf41767b33 Merge pull request #3790 from NarekA/narek/admin-named-servers
Add Missing Features In Admin Console
2022-02-14 09:25:25 +01:00
Satrajit Ghosh
83d6e4e993 fix: insecure-login-warning for all authenticators 2022-02-11 22:19:39 -05:00
pre-commit-ci[bot]
d64a2ddd95 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-02-11 21:11:10 +00:00
Rollin Thomas
392176d873 Add tests for both forms of options_from_form 2022-02-11 12:55:09 -08:00
Narek Amirbekian
58420b3307 Merge remote-tracking branch 'origin' into narek/admin-named-servers 2022-02-11 10:52:21 -08:00
Narek Amirbekian
a5e3b66dee One edit user button per user 2022-02-11 10:50:58 -08:00
Rollin Thomas
a9fbe5c9f6 Enable options_from_form w/spawner from configuration 2022-02-11 10:06:38 -08:00
Erik Sundell
71bbbe4a67 Merge pull request #3792 from minrk/short-circuit
short-circuit token permission check if token and owner share role
2022-02-11 17:36:07 +01:00
Min RK
3843885382 short-circuit token permission check if token and owner share role
No need to compute intersection when we know it's a subset already
2022-02-11 15:20:14 +01:00
Narek Amirbekian
25ea559e0d Pull out button components 2022-02-09 15:21:12 -08:00
Narek Amirbekian
c18815de91 Fix failing tests 2022-02-09 14:04:38 -08:00
Narek Amirbekian
50d53667ce Add start server back 2022-02-09 13:15:27 -08:00
pre-commit-ci[bot]
68e2baf4aa [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-02-09 21:04:22 +00:00
Narek Amirbekian
6fc9d40e51 Merge remote-tracking branch 'origin/narek/admin-named-servers' into narek/admin-named-servers 2022-02-09 13:02:19 -08:00
Narek Amirbekian
0b25694b40 Add "spawn new" button 2022-02-09 12:59:34 -08:00
pre-commit-ci[bot]
bf750e488f [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-02-09 19:58:05 +00:00
Narek Amirbekian
359f9055fc Admin missing features 2022-02-09 11:43:06 -08:00
Min RK
b84dd5d735 Stop opening PAM sessions by default
We don't do it correctly, so don't try by default

It does work _sometimes_, but most of the time it does work, it's because it's a no-op.
Turning it off by default makes it more likely folks will see the caveat that it may not work.
2022-02-07 15:45:38 +01:00
pre-commit-ci[bot]
6e9ca0dc4a [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-02-02 10:41:47 +00:00
Vlad Vifor
42af51a1a5 Merge branch 'main' into group_property_feature 2022-02-02 11:40:50 +01:00
Vlad Vifor
0d90b81cb6 Removed test add properties 2022-02-02 11:38:24 +01:00
Erik Sundell
3ed345f496 Merge pull request #3784 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-01-31 23:57:45 +01:00
pre-commit-ci[bot]
6633f8ef28 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-01-31 22:17:11 +00:00
pre-commit-ci[bot]
757053a9ec [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/asottile/reorder_python_imports: v2.6.0 → v2.7.1](https://github.com/asottile/reorder_python_imports/compare/v2.6.0...v2.7.1)
- [github.com/psf/black: 21.12b0 → 22.1.0](https://github.com/psf/black/compare/21.12b0...22.1.0)
2022-01-31 22:16:31 +00:00
Erik Sundell
36cad38ddf Merge pull request #3781 from cqzlxl/cqzlxl-patch-1
Log proxy's public_url only when started by JupyterHub
2022-01-29 09:16:29 +01:00
pre-commit-ci[bot]
1e9a1cb621 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-01-29 05:59:52 +00:00
cqzlxl
9f051d3172 Update jupyterhub/app.py
Co-authored-by: Min RK <benjaminrk@gmail.com>
2022-01-29 13:59:20 +08:00
cqzlxl
53576c8f82 Update app.py
When we run the proxy separately,  defaults of `hub.bind_url` may be different from proxy's public url. Actually, the hub has no ways to know about which address the proxy is serving at if we do not configure its `bind_url` explicitly.
2022-01-27 21:05:05 +08:00
Min RK
bb5ec39b2f Merge pull request #3548 from C4IROcean/authenticator_user_group_management
Authenticator user group management
2022-01-25 14:36:41 +01:00
Min RK
4c54c6dcc8 Bump to 2.2.0.dev 2022-01-25 14:36:24 +01:00
Min RK
39da98f133 Bump to 2.1.1 2022-01-25 14:36:02 +01:00
Erik Sundell
29e69aa880 Merge pull request #3779 from minrk/changelog-211
changelog for 2.1.1
2022-01-25 12:18:37 +01:00
Min RK
0c315f31b7 specify nodejs, python versions in readthedocs
rather than use ancient system node

does v2 require the new .readthedocs.yaml filename?
Docs suggest it does.
2022-01-25 10:43:50 +01:00
Min RK
508842a68c changelog for 2.1.1 2022-01-25 09:37:58 +01:00
Min RK
4b31615a05 Merge pull request #3778 from minrk/missing-metrics
add missing read:metrics scope to admin role
2022-01-24 16:12:09 +01:00
Min RK
17b64280e8 add missing metrics scope to admin role
new scope defined, but not added to admin

In the future, the admin list should probably be derived automatically
2022-01-24 15:35:57 +01:00
Min RK
88be7a9967 test coverage for Authenticator.managed_groups
- tests
- docs
- ensure all group APIs are rejected when auth is in control
- use 'groups' field in return value of authenticate/refresh_user, instead of defining new method
- log group changes in sync_groups
2022-01-24 13:45:35 +01:00
Simon Li
4ca2344af7 Merge pull request #3777 from jupyterhub/dependabot/npm_and_yarn/jsx/nanoid-3.2.0
Bump nanoid from 3.1.23 to 3.2.0 in /jsx
2022-01-22 08:50:45 +00:00
dependabot[bot]
4c050cf165 Bump nanoid from 3.1.23 to 3.2.0 in /jsx
Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.23 to 3.2.0.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/3.1.23...3.2.0)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-22 04:38:13 +00:00
Min RK
5e2ccb81fa Bump to 2.2.0.dev 2022-01-21 11:36:55 +01:00
Min RK
b8dc3befab Bump to 2.1.0 2022-01-21 11:35:49 +01:00
Erik Sundell
2f29848757 Merge pull request #3776 from minrk/cl21
Changelog for 2.1.0
2022-01-21 10:54:09 +01:00
Min RK
4f3d6cdd0c changelog for 2.1.0 2022-01-21 10:42:25 +01:00
Min RK
67733ef928 Merge pull request #3773 from IgorBerman/issue-3772-user_options-returns-empty-jupyterhub-restart
Using orm_spawner in server model user_options
2022-01-21 09:38:37 +01:00
Erik Sundell
e657754e7f Merge pull request #3775 from minrk/on_rtd_edit
DOCS: Add github metadata for edit button
2022-01-20 19:39:35 +01:00
Igor Berman
2d6087959c issue-3772: populating user_options from orm_spawner; adding test 2022-01-20 20:07:43 +02:00
Min RK
08a913707f define html_context needed for edit_page_button 2022-01-20 18:56:41 +01:00
Igor Berman
9c8a4f287a issue-3772: populating user_options from orm_spawner, cleanup 2022-01-20 18:04:35 +02:00
Igor Berman
64d6f0222c issue-3772: populating user_options from orm_spawner 2022-01-20 18:01:57 +02:00
Erik Sundell
538abdf084 Merge pull request #3763 from minrk/page-scopes
apply scope checks to some admin-or-self situations
2022-01-20 16:21:51 +01:00
Thomas Li Fredriksen
144abcb965 Added authenticator hook for synchronizing user groups
- Added hook function stub to authenticator base class
- Added new config option `manage_groups` to base `Authenticator` class
- Call authenticator hook from `refresh_auth`-function in `Base` handler class
- Added example
2022-01-20 13:30:03 +01:00
Min RK
6e5c307edb apply scope checks to some admin-or-self pages
Some non-api spawn and redirect checks still had `self or admin`,
when they should have checked directly for the appropriate permissions

This removes the long-deprecated redirect from `/user/other` -> `/user/self` _if_ the other server is not running.
The result is a more consistent behavior whether the requested server is running or not,
and whether the user has _access_ to the running server or not.
2022-01-20 13:27:43 +01:00
Igor Berman
67ebe0b0cf Update base.py 2022-01-19 21:45:45 +02:00
Min RK
dcf21d53fd Merge pull request #3765 from twalcari/patch-2
Improve documentation about spawner exception handling
2022-01-19 10:01:51 +01:00
Erik Sundell
f5bb0a2622 Merge pull request #3770 from minrk/metrics-scope
Add `read:metrics` scope for metrics endpoint
2022-01-18 17:51:50 +01:00
Min RK
704712cc81 Add read:metrics scope for metrics endpoint
and ensure token auth is accepted
2022-01-18 15:02:24 +01:00
Erik Sundell
f86d53a234 Merge pull request #3764 from minrk/progress-error-message
relay custom messages in exception.jupyterhub_message in progress API
2022-01-18 13:18:29 +01:00
Thijs Walcarius
5466224988 Improve documentation about spawner error messages 2022-01-18 09:18:01 +01:00
Min RK
f9fa21bfd7 relay custom messages in exception.jupyterhub_message in progress API
matches the message shown on the HTML spawn-failed page

For consistency, also support `jupyterhub_html_message` to populate the `html_message` field
2022-01-18 09:15:58 +01:00
Simon Li
e4855c30f5 Merge pull request #3768 from jupyterhub/dependabot/npm_and_yarn/jsx/follow-redirects-1.14.7
Bump follow-redirects from 1.13.0 to 1.14.7 in /jsx
2022-01-15 13:56:47 +00:00
dependabot[bot]
f1c4fdd5a2 Bump follow-redirects from 1.13.0 to 1.14.7 in /jsx
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.13.0 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.13.0...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-15 08:58:31 +00:00
Vlad Vifor
020738a7ea Merge branch 'jupyterhub:main' into group_property_feature 2022-01-13 12:55:23 +01:00
Min RK
e58cf06706 Merge pull request #3762 from DougTrajano/main
Add the capability to inform a connection to Alembic Migration Script
2022-01-12 14:02:09 +01:00
pre-commit-ci[bot]
91f4918cff [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-01-11 11:55:37 +00:00
Douglas Trajano
b15ccfa4ae Add connection parameter 2022-01-11 08:50:20 -03:00
Min RK
5102fde2f0 Bump to 2.1.0.dev 2022-01-10 13:54:49 +01:00
Min RK
f5dc005a70 Bump to 2.0.2 2022-01-10 13:54:24 +01:00
Min RK
5fd8f0f596 Merge pull request #3759 from minrk/cl-202
changelog for 2.0.2
2022-01-10 13:53:34 +01:00
Min RK
26ceafa8a3 changelog for 2.0.2 2022-01-10 13:30:14 +01:00
Min RK
2e2ed8a4ff Merge pull request #3760 from minrk/admin-th-macro
remove unused macro with missing references
2022-01-10 13:28:10 +01:00
Min RK
6cc734f884 Merge pull request #3750 from consideRatio/pr/ci-refactor-docs-workflows
ci: refactor to avoid triggering all tests on changes to docs
2022-01-10 13:27:57 +01:00
Erik Sundell
4f7f07d3b7 Fix missing docs requirements 2022-01-10 11:18:22 +01:00
Min RK
d436c97e3d remove unused macro with missing references
The th macro is unused and doesn't work
because it references `sort` template variable,
which has been removed
2022-01-10 11:09:34 +01:00
Erik Sundell
807c5b8ff9 Make the generate-scope-table script autoformat its output 2022-01-10 10:48:01 +01:00
Erik Sundell
8da06d1259 Fix git CLI flag ordering 2022-01-10 10:33:23 +01:00
Erik Sundell
1c1be8a24b Generate yaml formatted to match prettier better 2022-01-10 10:31:30 +01:00
Min RK
897606b00c Merge pull request #3754 from jupyterhub/doc-theme-config
DOCS: Update theme configuration
2022-01-10 09:34:51 +01:00
Simon Li
615af5eb33 Merge pull request #3757 from minrk/get-browser-proto
use outermost proxied entry when looking up browser protocol
2022-01-09 22:44:07 +00:00
Erik Sundell
85f94c12fc Merge pull request #3748 from jupyterhub/DOC-allowed-users
DOC: Add note about allowed_users not being set
2022-01-08 18:59:24 +01:00
Min RK
ccfee4d235 use outermost proxied entry when checking for browser protocol
wee care about what the browser sees, so trust the outermost entry instead of the innermost

This is not secure _in general_, in that these values can be spoofed by malicious proxies,
but for CORS and cookie purposes, we only care about what the browser sees,
however many hops there may be.

A malicious proxy in the chain here isn't a concern because what matters is the immediate
hop from the _browser_, not the immediate hop from the _server_.
2022-01-07 14:03:11 +01:00
Min RK
a2ba55756d Merge pull request #3746 from manics/more-cors-tests
Extra test_cors_check tests
2022-01-07 12:37:37 +01:00
pre-commit-ci[bot]
515cadd079 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-01-07 09:42:31 +00:00
Vlad Vifor
5e5830185d Merge branch 'jupyterhub:main' into group_property_feature 2022-01-07 10:41:33 +01:00
pre-commit-ci[bot]
1b3e94db6c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-01-04 22:23:45 +00:00
Chris Holdgraf
614d9d89d0 DOCS: Update theme configuration 2022-01-04 14:22:45 -08:00
Chris Holdgraf
05a3f5aa9a Update docs/source/getting-started/authenticators-users-basics.md
Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
2022-01-04 13:32:39 -08:00
Erik Sundell
4f47153123 ci: cleanup comments for readability 2022-01-04 00:53:33 +01:00
Erik Sundell
a14d9ecaa1 ci: refactor to avoid triggering all tests on changes to docs 2022-01-04 00:53:33 +01:00
Erik Sundell
6815f30d36 Merge pull request #3749 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-01-03 22:33:13 +01:00
pre-commit-ci[bot]
13172e6856 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-01-03 21:06:46 +00:00
pre-commit-ci[bot]
ebc9fd7758 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/asottile/pyupgrade: v2.29.1 → v2.31.0](https://github.com/asottile/pyupgrade/compare/v2.29.1...v2.31.0)
2022-01-03 21:06:11 +00:00
Chris Holdgraf
0761a5db02 DOC: Add note about allowed_users not being set 2022-01-03 10:27:10 -08:00
Erik Sundell
46e7a231fe Merge pull request #3747 from minrk/https-typo
localhost URL is http, not https
2022-01-03 15:54:14 +01:00
Min RK
ffa5a20e2f localhost URL is not https 2022-01-03 15:41:54 +01:00
Simon Li
2088a57ffe Extra test_cors_check tests 2022-01-03 13:55:04 +00:00
Erik Sundell
345805781f Merge pull request #3740 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2021-12-27 22:53:25 +01:00
pre-commit-ci[bot]
9eb52ea788 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/pre-commit/pre-commit-hooks: v4.0.1 → v4.1.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.0.1...v4.1.0)
2021-12-27 21:10:45 +00:00
Vlad Vifor
26c65339a7 Merge branch 'jupyterhub:main' into group_property_feature 2021-12-23 12:54:23 +01:00
Min RK
fb1405ecd8 Bump to 2.1.0.dev 2021-12-22 14:16:34 +01:00
Min RK
3f01bf400b Bump to 2.0.1 2021-12-22 14:15:53 +01:00
Erik Sundell
c528751502 Merge pull request #3728 from minrk/changelog-2.0.1
Changelog for 2.0.1
2021-12-22 12:32:00 +01:00
Min RK
0018184150 Changelog for 2.0.1 2021-12-22 12:01:30 +01:00
Min RK
7903f76e11 Merge pull request #3723 from sgaist/use_login_url_from_authenticator
Use URL from authenticator on default login form
2021-12-22 10:50:26 +01:00
Samuel Gaist
d5551a2f32 Use URL from authenticator also for local authenticator
This patch is related to the implementation of the
MultiAuthenticator in jupyterhub/oauthenticator#459

The issue will be triggered when using more than one local provider
or mixing with oauth providers.

With multiple providers the template generates a set of buttons to
choose from to continue the login process.

For OAuth, the user will be sent to the provider login page and
the redirect at the end will continue nicely the process.

Now for the tricky part: using a local provider (e.g. PAM), the
user will be redirected to the "same page" thus the same template
will be rendered but this time to show the username/password dialog.

This will trip the workflow because of the action URL coming from
the settings and not from the authenticator. Therefore when the button
is clicked, the user will come back to the original multiple choice page
rather than continue the login.
2021-12-22 10:41:24 +01:00
Erik Sundell
ca564a5948 Merge pull request #3735 from minrk/admin-users-roles
initialize new admin users with default roles
2021-12-22 10:28:20 +01:00
Erik Sundell
0fcc559323 Merge pull request #3726 from minrk/service-whoami-update
update service-whoami example
2021-12-22 10:19:02 +01:00
Min RK
a746e8e7fb update service-whoami example
- update models with 2.0.0
- different scopes for oauth, api
  shows model depends on permissions
- update text with more details about scopes
- fix outdated reference to local-system credentials
2021-12-22 10:10:16 +01:00
Min RK
b2ce6023e1 initialize new admin users with default roles
it was possible for a user in `admin_users` to not get the `user` role
2021-12-22 10:00:08 +01:00
Erik Sundell
39b331df1b Merge pull request #3733 from manics/missing-f
Fix missing f-string modifier
2021-12-22 00:37:37 +01:00
Simon Li
a69140ae1b Fix missing f-string modifier 2021-12-21 23:26:45 +00:00
Erik Sundell
225ca9007a Merge pull request #3731 from minrk/allow-token-auth-user-url
accept token auth on `/hub/user/...`
2021-12-20 17:42:41 +01:00
Erik Sundell
11efebf1e2 Merge pull request #3722 from minrk/ensure-user-login
always assign default roles on login
2021-12-20 17:39:40 +01:00
Erik Sundell
3e5082f265 Merge pull request #3727 from minrk/grant-role-twice
clarify `role` argument in grant/strip_role
2021-12-20 17:38:27 +01:00
Min RK
36cb1df27e accept token auth on /hub/user/... which are probably requests to non-running servers
otherwise, requests get redirected to `/hub/login` instead of failing with 404/503
2021-12-20 13:37:47 +01:00
Min RK
fcad2d5695 clarify role argument in grant/strip_role
I got confused with a variable called `rolename` that was actually an orm.Role

casting types in a signature is confusing,
but now `role` input can be Role or name,
and in the body it will always be a Role that exists

Behavior is unchanged
2021-12-20 11:39:50 +01:00
Min RK
2ec722d3af Merge pull request #3708 from minrk/user-role-startup
Avoid clearing user role membership when defining custom user scopes
2021-12-20 10:48:03 +01:00
Min RK
390f50e246 Merge pull request #3705 from minrk/intersect-token-scopes
use intersect_scopes utility to check token permissions
2021-12-20 10:30:13 +01:00
Min RK
3276e4a58f Merge pull request #3720 from minrk/fix-initial-user-role
simplify default role assignment
2021-12-20 10:30:01 +01:00
pre-commit-ci[bot]
e59e7f534c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2021-12-16 14:50:38 +00:00
vpopescu
25b0133979 Merge commit '92c6a23a13cc75a45e750f25bc5d76ed5cb49445' into group_property_feature 2021-12-16 15:48:50 +01:00
Min RK
2a8428dbb0 always assign default roles on login
successful authentication of a user always grants 'user' role

rather than only on first user creation in db
2021-12-16 12:42:47 +01:00
Min RK
7febb3aa06 simplify default role assignment
- always assign 'user' role, not just when no other roles are assigned
- 'admin' role is in addition, not instead
2021-12-16 12:15:31 +01:00
Simon Li
92c6a23a13 Merge pull request #3716 from minrk/pre_spawn_start_msg
Fix error message about Authenticator.pre_spawn_start
2021-12-15 14:00:18 +00:00
Min RK
bb75081086 Fix error message about pre_spawn_start
This isn't the only or even main thing likely to raise here,
so don't blame it, which is confusing, especially in a message shown to users.

Log the full exception, and show a more opaque message to the user to avoid confusion
2021-12-15 12:44:14 +01:00
Min RK
915c244d02 Test loading user/admin role membership from config
Cover different combinations of:

- existing assignments in db
- additive allowed_users/admin_users config
- strict users membership assignment in load_roles
2021-12-15 12:40:54 +01:00
Min RK
b5e0f46796 rbac_upgrade detection only when users already exist in the db
Instead of just checking for absent roles, also check for present users

otherwise, this will run on all first launches post-2.0, which we don't want
2021-12-15 12:37:55 +01:00
Min RK
34e8e2d828 Avoid clearing user role membership when defining custom user role
If the user role was defined but did not specify a user membership list,
users granted access by the Authenticator would lose their status

Instead, do nothing on an undefined user membership list,
leaving any users with their existing default role assignment
2021-12-15 12:37:55 +01:00
Min RK
c2cbeda9e4 Merge pull request #3714 from team-monolith-product/main
Grant role after user creation during config load
2021-12-15 12:36:53 +01:00
이창환
92a33bd358 Use assign_default_role not grant_role 2021-12-15 20:27:18 +09:00
이창환
e19700348d Move grant role into _get_or_create_user 2021-12-15 19:05:16 +09:00
Simon Li
04ac02c09d Merge pull request #3717 from minrk/allowed-roles-type
fix Spawner.oauth_roles config
2021-12-14 15:46:07 +00:00
Min RK
2b61c16c06 fix Spawner.oauth_roles config
missing cast to orm.Role from config when populating oauth client

test included
2021-12-14 13:20:11 +01:00
Min RK
028722a5ac Merge pull request #3719 from minrk/dist-upgrade-apt
check for db clients before requesting install
2021-12-14 13:12:28 +01:00
Min RK
ca7e07de54 check for db clients before requesting install
workaround weird issue where mysql-client install fails because it's present with a weird pinning
2021-12-14 11:51:39 +01:00
Min RK
c523e74644 Merge pull request #3715 from naatebarber/pass-base-url
Pass Base Url
2021-12-14 10:43:40 +01:00
pre-commit-ci[bot]
dd932784ed [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2021-12-14 01:46:27 +00:00
Nathan Barber
4704217dc5 Fix bug with umwarranted error messages 2021-12-13 20:36:00 -05:00
Nathan Barber
3893fb6d2c Pass base_url 2021-12-13 19:55:23 -05:00
이창환
59b2b36a27 Grant role after user creation during config load 2021-12-13 21:32:25 +09:00
Vlad Vifor
3b7e4d8550 Updated alembic revision 2021-12-09 18:21:25 +01:00
vpopescu
2b6666e114 Cleaned the alembic revision 2021-12-09 16:56:36 +01:00
vpopescu
06b2b78ffc test 2021-12-09 16:53:04 +01:00
Min RK
f6eaaebdf4 use intersect_scopes utility to check token permissions
we didn't have this function when we started checking token scopes
2021-12-07 13:55:32 +01:00
Erik Sundell
bb20002aea Merge pull request #3704 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2021-12-06 22:18:08 +01:00
pre-commit-ci[bot]
d1995ba7eb [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/psf/black: 21.11b1 → 21.12b0](https://github.com/psf/black/compare/21.11b1...21.12b0)
- [github.com/pre-commit/mirrors-prettier: v2.5.0 → v2.5.1](https://github.com/pre-commit/mirrors-prettier/compare/v2.5.0...v2.5.1)
2021-12-06 21:09:54 +00:00
Yuvi Panda
b06f4cda33 Merge pull request #3697 from naatebarber/react-error-handling
React Error Handling
2021-12-03 12:22:22 +05:30
Erik Sundell
9d7a235107 Merge pull request #3701 from minrk/extra-cors-check
cors: handle mismatched implicit/explicit ports in host header
2021-12-02 12:46:26 +01:00
Vlad Vifor
2dd2b7d60c Merge branch 'jupyterhub:main' into group_property_feature 2021-12-02 12:32:49 +01:00
Erik Sundell
18459bad11 Merge pull request #3698 from minrk/separate-jest
run jsx tests in their own job
2021-12-02 12:30:43 +01:00
vladfreeze
c7cb4138ee Fixed bug where users where deleted when changing group properties 2021-12-02 11:29:31 +01:00
vladfreeze
d812d0f11c Removed a duplicate key error output for further testing 2021-12-02 11:29:29 +01:00
vladfreeze
7fe565cc05 updated test_scopes and access map in base.py to fit in group properties 2021-12-02 11:29:27 +01:00
vladfreeze
5aed99b4a6 Improved design 2021-12-02 11:29:26 +01:00
vladfreeze
4c30e9e1d1 Updated code to fit with latest version 2021-12-02 11:29:24 +01:00
vladfreeze
7a56cadfb5 Improved design of input fields to match template 2021-12-02 11:29:22 +01:00
vladfreeze
21231d2f23 Removed automatically generated comments from alembic 2021-12-02 11:29:20 +01:00
vladfreeze
b11814c95b Added alembic revision for upgrading databases with no properties columns. 2021-12-02 11:29:11 +01:00
vladfreeze
471e492c11 Added changes for group properties editing 2021-12-02 11:29:00 +01:00
Min RK
ced941a6aa cors: handle mismatched implicit/explicit ports in host header
http://host:80 should match http://host

cors tests are parametrized to make it easier to add more cases
2021-12-02 11:02:21 +01:00
Min RK
85e37e7f8c Merge pull request #3195 from kylewm/x-forwarded-host
add option to use a different Host header for referer checks
2021-12-02 10:03:33 +01:00
Min RK
53067de596 finalize forwarded_host_header tests 2021-12-02 09:37:02 +01:00
Kyle Mahan
9c13861eb8 add configuration value to use a different Host key for CORS checks 2021-12-02 09:18:38 +01:00
Min RK
b0ed9f5928 run jsx tests in their own job
no need to re-run them for each entry in our Python matrix
2021-12-02 08:57:45 +01:00
Min RK
ff0d15fa43 Bump to 2.1.0.dev 2021-12-02 08:53:50 +01:00
Nathan Barber
81bb05d0ef Merge branch 'jupyterhub:main' into react-error-handling 2021-12-01 10:27:40 -05:00
Min RK
95649a3ece Bump to 2.0.0 2021-12-01 14:58:11 +01:00
Erik Sundell
08288f5b0f Merge pull request #3696 from minrk/changelog-2.0
Changelog for 2.0
2021-12-01 14:56:30 +01:00
Min RK
01b1ce3995 Link to upgrading doc from the changelog 2021-12-01 14:36:07 +01:00
Min RK
cbe93810be remove redundant admin/upgrading ref target
confuses myst to have a ref: and doc: target with the same name
2021-12-01 14:36:06 +01:00
Min RK
75309d9dc4 Changelog for 2.0
ready to go!
2021-12-01 14:36:06 +01:00
pre-commit-ci[bot]
8594b3fa70 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2021-12-01 06:54:56 +00:00
Nathan Barber
1e956df4c7 Re-lint withAPI 2021-12-01 01:54:18 -05:00
Nathan Barber
8ba2bcdfd4 Merge branch 'react-error-handling' of github.com:naatebarber/jupyterhub into react-error-handling 2021-12-01 01:52:59 -05:00
Nathan Barber
999cc0a37c Clean and lint 2021-12-01 01:52:18 -05:00
pre-commit-ci[bot]
a6611e5999 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2021-12-01 06:45:29 +00:00
Nathan Barber
c0d5778d93 Merge branch 'jupyterhub:main' into react-error-handling 2021-12-01 01:35:14 -05:00
Nathan Barber
293fe4e838 Updated ServerDashboard to testing-library, added tests 2021-12-01 01:32:19 -05:00
Nathan Barber
dfee471e22 Updated Groups to testing-library 2021-12-01 00:20:16 -05:00
Nathan Barber
db7cdc4aa7 Updated GroupEdit to testing-library. Added tests 2021-12-01 00:03:56 -05:00
Nathan Barber
c048ad4aac Updated CreateGroup, EditUser to testing-library. Added tests 2021-11-30 23:23:52 -05:00
Nathan Barber
9e245379e8 Begin replacing enzyme with react-testing-library 2021-11-30 22:23:22 -05:00
Nathan Barber
496f414a2e Update structure for AddUser tests, add tests 2021-11-30 16:43:55 -05:00
Nathan Barber
df67a75893 Add UI error dialogues to api requests 2021-11-30 15:35:00 -05:00
Erik Sundell
249b4af59f Merge pull request #3695 from minrk/service-auth-doc
Service auth doc
2021-11-30 16:09:12 +01:00
Min RK
db3b2d8961 refine service auth docs
favor HubOAuth, as that should really be the default for most services

- Remove some outdated 'new in' text
- Remove docs for some deprecated features (hub_users, hub_groups)
- more detail on what's required
2021-11-30 10:48:53 +01:00
Min RK
7d44a0ffc8 add tornado to intersphinx 2021-11-30 10:45:38 +01:00
Min RK
202b2590e9 doc: remove redundant TOC from services doc
The same TOC is automatically generated on the sidebar, no need for a manual copy
2021-11-30 09:18:57 +01:00
Erik Sundell
c98ef547a8 Merge pull request #3693 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2021-11-29 22:16:35 +01:00
pre-commit-ci[bot]
8a866a9102 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/pre-commit/mirrors-prettier: v2.4.1 → v2.5.0](https://github.com/pre-commit/mirrors-prettier/compare/v2.4.1...v2.5.0)
2021-11-29 20:06:06 +00:00
Min RK
b186bdbce3 Bump to 2.0.0rc5 2021-11-26 09:07:15 +01:00
Min RK
36fe6c6f66 Merge pull request #3692 from minrk/clrc5
changelog for 2.0.0rc5
2021-11-26 09:06:21 +01:00
Min RK
8bf559db52 changelog for 2.0.0rc5 2021-11-26 09:05:21 +01:00
Simon Li
750085f627 Merge pull request #3690 from minrk/gha-singleuser
build jupyterhub/singleuser along with other images
2021-11-25 20:17:12 +00:00
Min RK
2dc2c99b4a Merge pull request #3640 from minrk/doc-api-only
add api-only doc
2021-11-25 20:26:25 +01:00
pre-commit-ci[bot]
e703555888 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2021-11-25 19:16:41 +00:00
Min RK
7e102f0511 Apply suggestions from code review
Co-authored-by: Carol Willing <carolcode@willingconsulting.com>
2021-11-25 20:16:10 +01:00
Min RK
facde96425 build jupyterhub/singleuser along with other images
got lost in the migration to GHA docker builds
2021-11-24 21:15:59 +01:00
Erik Sundell
608c746a59 Merge pull request #3689 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2021-11-22 22:26:25 +01:00
pre-commit-ci[bot]
a8c834410f [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/asottile/pyupgrade: v2.29.0 → v2.29.1](https://github.com/asottile/pyupgrade/compare/v2.29.0...v2.29.1)
- [github.com/psf/black: 21.10b0 → 21.11b1](https://github.com/psf/black/compare/21.10b0...21.11b1)
2021-11-22 20:51:45 +00:00
Min RK
bda14b487a Bump to 2.0.0rc4 2021-11-18 15:33:12 +01:00
Min RK
fd5cf8c360 Merge pull request #3687 from minrk/rc4-changelog
update 2.0 changelog
2021-11-18 15:32:27 +01:00
Min RK
03758e5b46 update 2.0 changelog
prep for rc4
2021-11-18 14:50:10 +01:00
Erik Sundell
e540d143bb Merge pull request #3685 from minrk/session-id-model
Add Session id to token/identify models
2021-11-18 13:39:34 +01:00
Erik Sundell
b2c5ad40c5 Merge pull request #3686 from minrk/login_with_token
Hub: only accept tokens in API requests
2021-11-18 13:27:41 +01:00
Min RK
edfdf672d8 Hub: only accept tokens in API requests
do not allow token-based access to pages

Tokens are only accepted via Authorization header, which doesn't make sense to pass to pages,
so disallow it explicitly to avoid surprises
2021-11-18 09:36:49 +01:00
Min RK
39f19aef49 add session_id to token model 2021-11-17 09:46:26 +01:00
Min RK
8813bb63d4 update to openapi 3.0
easier to implement oneOf schemas

document scopes, session_id in /api/user model
2021-11-17 09:44:38 +01:00
Yuvi Panda
7c18d6fe14 Merge pull request #3681 from minrk/log-app-versions
Log single-user app versions at startup
2021-11-16 00:11:32 +05:30
Erik Sundell
d1fe17d3cb Merge pull request #3682 from minrk/relpath
always use relative paths in data_files
2021-11-08 14:06:20 +01:00
Min RK
b8965c2017 always use relative paths in data_files
instead of absolute paths for sources

seems to have started failing on Windows
2021-11-08 13:29:26 +01:00
Min RK
733d7bc158 Log single-user app versions at startup
Reports jupyterlab, jupyter_server versions during startup
2021-11-08 09:21:32 +01:00
Min RK
88f31c29bb add api-only doc
Describe how to use JupyterHub as a "behind the scenes" implementation detail,
rather than a user-facing application.
2021-11-04 17:16:59 +01:00
Min RK
3caf3cfda8 Bump to 2.0.0rc3 2021-11-04 15:52:37 +01:00
Erik Sundell
d076c55cca Merge pull request #3679 from minrk/forward-1.5
Forward-port fixes from 1.5.0 security release
2021-11-04 15:30:04 +01:00
Min RK
3e185022c8 changelog for 1.5.0 2021-11-04 15:04:40 +01:00
Min RK
857ee2885f jupyterlab: don't use $JUPYTERHUB_API_TOKEN in PageConfig.token 2021-11-04 15:03:12 +01:00
Min RK
cd8dd56213 Revert "store tokens passed via url or header, not only url."
This reverts commit 53c3201c17.

Only tokens in URLs should be persisted in cookies.
Tokens in headers should not have any effect on cookies.
2021-11-04 15:03:12 +01:00
Erik Sundell
f06902aa8f Merge pull request #3675 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2021-11-02 01:56:07 +01:00
pre-commit-ci[bot]
bb109c6f75 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/psf/black: 21.9b0 → 21.10b0](https://github.com/psf/black/compare/21.9b0...21.10b0)
2021-11-01 20:25:25 +00:00
Erik Sundell
e525ec7b5b Merge pull request #3674 from minrk/verify-login-role
verify that successful login assigns default role
2021-10-30 17:50:01 +02:00
Min RK
356b98e19f verify that successful login assigns default role
and that repeated login after revoked role doesn't reassign role
2021-10-30 14:30:33 +02:00
Erik Sundell
8c803e7a53 Merge pull request #3673 from minrk/main
more calculators
2021-10-30 14:21:17 +02:00
Min RK
2e21a6f4e0 more calculators 2021-10-30 14:07:04 +02:00
Min RK
cfd31b14e3 Bump to 2.0.0rc2 2021-10-30 13:36:54 +02:00
Erik Sundell
f03a620424 Merge pull request #3672 from minrk/prerelease
use v2 of jupyterhub/action-major-minor-tag-calculator
2021-10-30 13:29:43 +02:00
Min RK
440ad77ad5 use v2 of jupyterhub/action-major-minor-tag-calculator
needed for handling of prerelease tags
2021-10-30 12:42:29 +02:00
Min RK
68835e97a2 Bump to 2.0.0rc1 2021-10-30 12:37:39 +02:00
Min RK
ce80c9c9cf Merge pull request #3669 from minrk/bumpversion
use tbump to tag versions
2021-10-30 12:34:28 +02:00
Min RK
3c299fbfb7 use tbump for bumping versions
avoids needing to manually keep files in sync,
and dramatically reduces RELEASE steps
2021-10-30 12:18:14 +02:00
Min RK
597f8ea6eb Merge pull request #3670 from manics/support-bot
Add support-bot
2021-10-30 12:17:47 +02:00
Erik Sundell
d1181085bf Merge pull request #3665 from minrk/openapi-test
Tests for our openapi spec
2021-10-29 16:05:05 +02:00
Simon Li
913832da48 Add support-bot
The old support-bot was disabled https://github.com/jupyterhub/.github/issues/15
This is the recommended replacement https://github.com/dessant/support-requests/issues/8
2021-10-29 14:09:49 +01:00
Min RK
42f57f4a72 Merge pull request #3662 from minrk/2.0rc-changelog
changelog for 2.0 release candidate
2021-10-29 13:40:34 +02:00
Min RK
d01a518c41 add updating rest-api version to release
and make real release checklist, to match other repos
2021-10-29 13:13:41 +02:00
Min RK
65ce06b116 test feedback
use global PYTEST_ARGS for nicer, simpler always-on arguments for pytest
2021-10-29 13:13:41 +02:00
Min RK
468aa5e93c render openapi spec client-side
- move spec to _static/rest-api.yml, since the original yaml must be served
- copy javascript rendering code from FastAPI (uses swagger-ui)
- remove link to pet store, since there isn't a big enough difference to duplicate it
- remove bootprint rendering with node
2021-10-29 13:13:41 +02:00
Min RK
5c01370e6f set version as long as we are rewriting the file 2021-10-29 13:13:41 +02:00
Min RK
21d08883a8 resolve rest-api validation errors
- regen scopes by running generate-scopes.py
2021-10-29 13:13:41 +02:00
Min RK
59de506f20 validate the rest-api
both with github action that runs openapi validation,
and a couple local tests to verify some maintenance tasks are done
2021-10-29 13:13:41 +02:00
Erik Sundell
b34120ed81 Merge pull request #3663 from minrk/clarify-default-roles
clarify some log messages during role assignment
2021-10-29 12:19:45 +02:00
Erik Sundell
617978179d Merge pull request #3667 from minrk/autodoc-traits
use stable autodoc-traits
2021-10-29 12:16:30 +02:00
Min RK
0985d6fdf2 use stable autodoc-traits 2021-10-29 11:32:02 +02:00
Min RK
2049fb0491 clarify some log messages during role assignment
and only commit on change
2021-10-29 11:22:12 +02:00
Erik Sundell
a58fc6534b Merge pull request #3664 from minrk/create-groups-on-startup
create groups declared in roles
2021-10-28 03:30:25 +02:00
Min RK
a14f97b7aa create groups declared in roles
matches behavior of users
2021-10-27 21:00:49 +02:00
Min RK
0a4cd5b4f2 add auto-changelog for 2.0rc 2021-10-27 16:22:43 +02:00
Min RK
dca6d372df Merge pull request #3661 from minrk/owner-metascope
Rename 'all' metascope to more descriptive 'inherit'
2021-10-27 16:20:29 +02:00
pre-commit-ci[bot]
3898c72921 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2021-10-27 14:01:05 +00:00
Min RK
b25517efe8 Rename 'all' metascope to more descriptive 'inherit'
since it means 'inheriting' the owner's permissions

'all' prompted the question 'all of what, exactly?'

Additionally, fix some NameErrors that should have been KeyErrors
2021-10-27 16:00:21 +02:00
Erik Sundell
392dffd11e Merge pull request #3659 from minrk/deprecate-admin-only
deprecate instead of remove `@admin_only` auth decorator
2021-10-25 23:32:01 +02:00
Erik Sundell
510f6ea7e6 Merge pull request #3660 from minrk/scope-error
minor refinement of excessive scopes error message
2021-10-25 15:53:43 +02:00
Min RK
296a0ad2f2 minor refinement of excessive scopes error message
show the role name
2021-10-25 14:10:57 +02:00
Min RK
487c4524ad deprecate instead of remove @admin_only auth decorator
no harm in keeping it around for a deprecation cycle
2021-10-25 13:00:45 +02:00
Erik Sundell
b2f0208fcc Merge pull request #3658 from minrk/better-timeout-message
improve timeout handling and messages
2021-10-20 22:15:26 +02:00
Min RK
84b9c3848c more detailed error messages for start timeouts
these are the most common error for any number of reasons spawn may fail
2021-10-20 20:08:34 +02:00
Min RK
9adbafdfb3 consistent handling of any timeout error
some things raise standard TimeoutError, others may raise tornado gen.TimeoutError (gen.with_timeout)

For consistency, add AnyTimeoutError tuple to allow catching any timeout, no matter what kind

Where we were raising `TimeoutError`,
we should have been raising `asyncio.TimeoutError`.

The base TimeoutError is an OSError for ETIMEO, which is for system calls
2021-10-20 20:07:45 +02:00
Erik Sundell
9cf2b5101e Merge pull request #3657 from edgarcosta/patch-1
docs: fix typo in proxy config example
2021-10-20 09:12:30 +02:00
Edgar Costa
725fa3a48a typo 2021-10-19 22:39:41 -04:00
Erik Sundell
534dda3dc7 Merge pull request #3653 from minrk/admin-no-such-user
raise 404 on admin attempt to spawn nonexistent user
2021-10-15 15:23:18 +02:00
Min RK
b0c7df04ac raise 404 on admin attempt to spawn nonexistent user 2021-10-15 14:40:47 +02:00
Min RK
61b0e8bef5 2.0.0b3 2021-10-14 12:49:20 +02:00
Erik Sundell
64f3938528 Merge pull request #3649 from minrk/cl-beta-3
add 424 status code change to changelog
2021-10-13 09:52:33 +02:00
Min RK
85bc92d88e Merge pull request #3646 from joegasewicz/joegasewicz-New-user-token-returns-200-instead-of-201-1
new user token returns 200 instead of 201
2021-10-13 09:24:30 +02:00
Min RK
7bcda18564 add 424 status code change to changelog 2021-10-13 09:17:47 +02:00
Erik Sundell
86da36857e Merge pull request #3647 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2021-10-12 00:13:22 +02:00
pre-commit-ci[bot]
530833e930 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/PyCQA/flake8: 3.9.2 → 4.0.1](https://github.com/PyCQA/flake8/compare/3.9.2...4.0.1)
2021-10-11 19:42:10 +00:00
Joe Gasewicz
3b0850fa9b Fixed test_roles 2021-10-07 23:14:10 +01:00
josefgasewicz
1366911be6 Fixed tests & set status after writing json 2021-10-07 22:21:16 +01:00
Joe Gasewicz
fe276eac64 Update users.py
New user token returns 200 instead of 201 Fixes #3642
2021-10-07 16:31:23 +01:00
Min RK
9209ccd0de Merge pull request #3636 from yuvipanda/404
Fail suspected API requests with 424, not 503
2021-10-05 15:16:18 +02:00
YuviPanda
3b2a1a37f9 Update tests that were looking for 503s 2021-10-05 18:10:52 +05:30
YuviPanda
6007ba78b0 Preserve older 503 behavior behind a flag 2021-10-05 17:56:51 +05:30
YuviPanda
9cb19cc342 Use 424 rather than 404 to indicate non-running server
404 is also used to identify that a particular resource
(like a kernel or terminal) is not present, maybe because
it is deleted. That comes from the notebook server, while
here we are responding from JupyterHub. Saying that the
user server they are trying to request the resource (kernel, etc)
from does not exist seems right.
2021-10-05 17:44:17 +05:30
YuviPanda
0f471f4e12 Fail suspected API requests with 404, not 503
Non-running user servers making requests is a fairly
common occurance - user servers get culled while their
browser tabs are left open. So we now have a background level
of 503s responses on the hub *all* the time, making it
very difficult to detect *real* 503s, which should ideally
be closely monitored and alerted on.

I *think* 404 is a more appropriate response, as the resource
(API) being requested is no longer present.
2021-10-05 03:00:16 +05:30
Erik Sundell
68db740998 Merge pull request #3635 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2021-10-04 22:38:05 +02:00
pre-commit-ci[bot]
9c0c6f25b7 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/asottile/pyupgrade: v2.28.0 → v2.29.0](https://github.com/asottile/pyupgrade/compare/v2.28.0...v2.29.0)
2021-10-04 19:48:13 +00:00
Min RK
5f0077cb5b Merge pull request #3445 from rpwagner/patch-1
Initial SECURITY.md
2021-09-29 09:42:59 +02:00
Min RK
a6a2056cca 2.0.0b2 2021-09-29 09:41:57 +02:00
Erik Sundell
fb1e81212f Merge pull request #3628 from minrk/beta-2
add latest changes to 2.0 changelog
2021-09-28 18:32:14 +02:00
Min RK
17f811d0b4 add latest changes to 2.0 changelog
- nullauthenticator
- lab by default
2021-09-28 15:28:59 +02:00
Min RK
34398d94de Merge pull request #3627 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2021-09-28 15:23:00 +02:00
Min RK
6bf94fde48 extend deadline for docker build test
it's building 4 images, 10 minutes isn't always enough, bump to 20
2021-09-28 14:46:33 +02:00
Min RK
ee18fed04b Merge pull request #3619 from manics/nullauthenticator
Add NullAuthenticator to jupyterhub
2021-09-28 11:36:41 +02:00
Simon Li
28f56ba510 Simplify NullAuthenticator, add test 2021-09-27 23:05:53 +01:00
pre-commit-ci[bot]
c8d3dbb7b1 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2021-09-27 19:45:58 +00:00
pre-commit-ci[bot]
a76a093638 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/asottile/pyupgrade: v2.26.0 → v2.28.0](https://github.com/asottile/pyupgrade/compare/v2.26.0...v2.28.0)
2021-09-27 19:43:18 +00:00
Erik Sundell
27908a8e17 Merge pull request #3616 from minrk/delete-scopes
add delete scopes for users, groups, servers
2021-09-27 14:01:51 +02:00
Erik Sundell
8a30f015c9 Merge pull request #3626 from minrk/token-log
server-api example typo: trim space in token file
2021-09-27 12:51:07 +02:00
Min RK
8cac83fc96 add delete scopes for users, groups, servers
e.g. cull-idle services do not need permission to start servers in order to be able to stop them
2021-09-27 12:43:56 +02:00
Min RK
9ade4bb9b2 server-api example: trim space in token file
avoids invalid newlines in the auth header
2021-09-27 12:42:23 +02:00
Min RK
874c91a086 Merge pull request #3615 from minrk/lab-by-default
2.0: jupyterlab by default
2021-09-27 12:39:31 +02:00
Min RK
a906677440 Merge pull request #3625 from albertmichaelj/main
Added base_url to path for jupyterhub-session-id cookie
2021-09-27 12:27:15 +02:00
pre-commit-ci[bot]
3f93942a24 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2021-09-26 19:55:05 +00:00
Michael Albert
aeb3130b25 Added base_url to path for jupyterhub_session_id cookie 2021-09-26 15:33:08 -04:00
Simon Li
8a6b364ca5 nullauthenticator: missing import 2021-09-23 20:40:00 +01:00
Simon Li
2ade7328d1 nullauthenticator: relative imports, entrypoint, doc 2021-09-23 20:39:54 +01:00
Min RK
2bb9f4f444 implement null authenticator 2021-09-23 19:14:07 +01:00
Simon Li
b029d983f9 Merge pull request #3607 from minrk/recommend-nodesource
update quickstart requirements
2021-09-23 17:31:18 +01:00
Min RK
4082006039 2.0: jupyterlab by default
swaps from default nbclassic and opt-in to lab, to now default to lab and opt-in to nbclassic

defaults to jupyterlab *if* lab 3.1 is available,
so should still work without configuration if lab is unavailable (or too old)
2021-09-23 14:52:14 +02:00
Min RK
69aa0eaa7a update quickstart requirements
- remove mention of outdated nodejs-legacy
- mention nodesource for more recent node
- mention jupyterlab
- initial localhost request will be on http, not https
2021-09-23 13:59:21 +02:00
Min RK
3674ada640 Merge pull request #3614 from jupyterhub/dependabot/npm_and_yarn/jsx/nth-check-2.0.1
Bump nth-check from 2.0.0 to 2.0.1 in /jsx
2021-09-23 13:56:00 +02:00
dependabot[bot]
48accb0a64 Bump nth-check from 2.0.0 to 2.0.1 in /jsx
Bumps [nth-check](https://github.com/fb55/nth-check) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/fb55/nth-check/releases)
- [Commits](https://github.com/fb55/nth-check/compare/v2.0.0...v2.0.1)

---
updated-dependencies:
- dependency-name: nth-check
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-22 09:01:52 +00:00
Simon Li
70ac143cfe Merge pull request #3613 from jupyterhub/dependabot/npm_and_yarn/jsx/tmpl-1.0.5
Bump tmpl from 1.0.4 to 1.0.5 in /jsx
2021-09-22 10:01:15 +01:00
dependabot[bot]
b1b2d531f8 Bump tmpl from 1.0.4 to 1.0.5 in /jsx
Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/daaku/nodejs-tmpl/releases)
- [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5)

---
updated-dependencies:
- dependency-name: tmpl
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-22 07:21:19 +00:00
Simon Li
e200783c59 Merge pull request #3610 from mriedem/patch-1
Fix 1.3 level
2021-09-20 21:28:54 +01:00
Erik Sundell
a7e57196c6 Merge pull request #3611 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2021-09-20 22:16:29 +02:00
pre-commit-ci[bot]
b5f05e6cd2 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/psf/black: 21.8b0 → 21.9b0](https://github.com/psf/black/compare/21.8b0...21.9b0)
- [github.com/pre-commit/mirrors-prettier: v2.4.0 → v2.4.1](https://github.com/pre-commit/mirrors-prettier/compare/v2.4.0...v2.4.1)
2021-09-20 19:57:49 +00:00
Matt Riedemann
5fe5b35f21 Fix 1.3 level
The 1.3 section was a sub-section of 1.4
which makes it harder to find 1.3 release notes
in the changelog from the navigation.
2021-09-20 13:40:45 -05:00
Min RK
4f6ef54b50 publish releases on push to tags 2021-09-17 12:29:48 +02:00
Min RK
601c144368 2.0.0b1 2021-09-17 12:00:59 +02:00
Erik Sundell
5e175f4b63 Merge pull request #3602 from minrk/2.0-changelog
2.0 changelog
2021-09-17 11:58:14 +02:00
Min RK
ee00ac227e expand detail about upgrade revoking tokens 2021-09-17 11:56:53 +02:00
Min RK
14997152b9 admonition about installing the beta 2021-09-17 10:54:43 +02:00
Min RK
5f19989467 suggest roles instead of admin_users
and make admin link permission check match admin page

it would be nice if this could be consolidated (maybe an `admin:ui` permission?)
2021-09-16 11:57:36 +02:00
Min RK
9d2ceaa156 Merge pull request #3604 from yuvipanda/debug
Reduce logging verbosity of 'checking routes'
2021-09-14 14:19:58 +02:00
YuviPanda
af1686dbe6 Reduce logging verbosity of 'checking routes'
Of 18355 lines of logs in a 5day old hub instance,
8228 are just this message. That's 44% of the logs! We now
have prometheus metrics to monitor performance of this if
needed, and people can always turn on debug logging.
2021-09-14 13:37:21 +05:30
Erik Sundell
ed6f2ada60 Merge pull request #3603 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2021-09-13 23:02:14 +02:00
Erik Sundell
cc8e5f351f Apply suggestions from code review 2021-09-13 22:16:34 +02:00
pre-commit-ci[bot]
2543c27035 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2021-09-13 19:39:37 +00:00
pre-commit-ci[bot]
8d5ec6577f [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/asottile/pyupgrade: v2.25.0 → v2.26.0](https://github.com/asottile/pyupgrade/compare/v2.25.0...v2.26.0)
- [github.com/pre-commit/mirrors-prettier: v2.3.2 → v2.4.0](https://github.com/pre-commit/mirrors-prettier/compare/v2.3.2...v2.4.0)
2021-09-13 19:39:06 +00:00
Min RK
12ab53fb37 changelog for 2.0
remove suggestions of `admin` permissions, in favor of roles and scopes
2021-09-13 13:44:32 +02:00
Min RK
559b626046 remove unused Pagination class
used only for 1.4 admin page, not api
2021-09-13 13:16:35 +02:00
Min RK
47292d9af2 make api_page_max_limit configurable 2021-09-13 12:59:47 +02:00
Erik Sundell
50e78fa7d6 Merge pull request #3601 from manics/update-readme
Update/cleanup README
2021-09-11 14:55:28 +02:00
Simon Li
cfd2ca9065 Update README
- circle CI no longer used
- ubuntu/debian nodejs may be too old (12.0+ required)
- remove mention of mailing list
- Python 3.6 required
- Emphasise JupyterLab over notebook
2021-09-11 13:39:41 +01:00
Simon Li
905b1b999b Merge pull request #3593 from minrk/email-typo
mailto link typo
2021-09-03 13:47:32 +01:00
Min RK
857f7271ca email-typo 2021-09-03 14:32:24 +02:00
Min RK
12c6ab4ca1 Merge pull request #3575 from VaishnaviHire/add_content_type
Validate Content-Type Header for api POST requests
2021-09-01 10:16:39 +02:00
Min RK
44988b626e move content-type check to base APIHandler
so it can be applied to all cookie-authenticated POST requests

also parse the content-type header to handle e.g. `Content-Type: application/json; charset`
2021-09-01 09:51:23 +02:00
Vaishnavi Hire
e59556f020 Validate Content-Type Header for api/users
The content-type of Hub API requests used for user management, specifically for creating a user
is not validated and so the ‘text/plain’ type is accepted, where it must be ‘application/json’.
This commit adds validation for `Content-type` header for the /hub/api/users endpoint to only
allow requests with content-type as `application/json`
2021-08-31 11:49:52 -04:00
Simon Li
2bc3a22acc Merge pull request #3591 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2021-08-31 10:00:12 +01:00
pre-commit-ci[bot]
77a79484c4 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/asottile/pyupgrade: v2.24.0 → v2.25.0](https://github.com/asottile/pyupgrade/compare/v2.24.0...v2.25.0)
- [github.com/psf/black: 21.7b0 → 21.8b0](https://github.com/psf/black/compare/21.7b0...21.8b0)
2021-08-30 19:24:04 +00:00
Erik Sundell
5d6eb642d8 Merge pull request #3586 from consideRatio/pr/pyupgrade-3-add-config
Add pyupgrade --py36-plus to pre-commit config
2021-08-26 17:38:38 +02:00
Erik Sundell
0644677a6a Add pyupgrade --py36-plus to pre-commit config 2021-08-26 16:56:51 +02:00
Erik Sundell
409b72ff23 Merge pull request #3585 from consideRatio/pr/pyupgrade-2-rest
pyupgrade: run pyupgrade --py36-plus and black on all but tests
2021-08-26 16:55:50 +02:00
Erik Sundell
bc71ad6d73 Apply suggestions from code review
Co-authored-by: Carol Willing <carolcode@willingconsulting.com>
2021-08-26 16:23:38 +02:00
Erik Sundell
d6c48b15fe pyupgrade: run pyupgrade --py36-plus and black on all but tests 2021-08-26 16:23:38 +02:00
Erik Sundell
580d8fd9e2 Merge pull request #3584 from consideRatio/pr/pyupgrade-1-tests
pyupgrade: run pyupgrade --py36-plus and black on jupyterhub/tests
2021-08-26 16:23:17 +02:00
Erik Sundell
c8c7418ed2 pyupgrade: run pyupgrade --py36-plus and black on jupyterhub/tests 2021-08-26 16:05:18 +02:00
Min RK
2c62c4f7ef Merge pull request #3535 from minrk/pagination-gate
add opt-in model for paginated list results
2021-08-26 15:21:55 +02:00
Min RK
b38e3a05f4 symmetry in description of list:services scope 2021-08-26 15:17:30 +02:00
Min RK
ebc3b6f4e5 set minimum pagination limit to 1 2021-08-26 14:42:09 +02:00
Min RK
50219764a0 make order_by explicit in list endpoints
when implicit, ordering is not guaranteed (at least with postgres)
2021-08-24 13:56:11 +02:00
Min RK
d0c2bc051a test pagination limits on users endpoint 2021-08-24 13:56:11 +02:00
Min RK
911d1b5081 default to max page size if pagination is not explicitly requested
improves backward compatibility for clients that haven't implemented pagination
by requesting the max page size by default instead of the new default page size
2021-08-24 13:56:11 +02:00
Min RK
7f480445f6 warn about truncated replies without pagination 2021-08-24 13:56:11 +02:00
Min RK
fd644476a7 add opt-in model for paginated list results
use `Accept: application/jupyterhub-pagination+json`  to opt-in to the new response format

With a paginated API, we need to return pagination info (next page arguments, whether a next page exists, etc.),
but a simple list response doesn't give a good way to do that.

We can follow precedents and use a dict with an `items` field for the actual items,
and a `_pagination` field for info about pagination, including offset, limit, url for the next request
2021-08-24 13:56:11 +02:00
Min RK
8603723dbb add list:users|groups|services scopes
and govern GET /users|groups|services endpoints with these

Greatly simplifies filtering and pagination,
because these filters can be expressed in db filters,
unlike the potentially complex `read:users`.

Now the query itself will never return a model that should be excluded.

While writing the tests, I added more cleanup between tests.
We now ensure cleanup of all users and groups after each test,
which required updating some group tests which relied on this state leaking
2021-08-24 13:56:11 +02:00
Min RK
9f3663769e Merge pull request #3574 from jupyterhub/dependabot/npm_and_yarn/jsx/url-parse-1.5.3
Bump url-parse from 1.5.1 to 1.5.3 in /jsx
2021-08-24 13:27:52 +02:00
Min RK
1b1980c6bf Merge pull request #3582 from minrk/user-model-debug
Remove a couple every-request debug statements
2021-08-24 13:27:28 +02:00
Min RK
3f82a8ff00 Merge pull request #3581 from minrk/doc-override-server-role
[doc] add example specifying scopes for a default role
2021-08-24 13:25:04 +02:00
Min RK
e4dbc22cdf Remove a couple every-request debug statements
logging all scopes every request and for every user model retrieval gets noisy
2021-08-24 09:44:23 +02:00
Min RK
7533cb7602 [doc] add example specifying scopes for a default role 2021-08-24 09:04:08 +02:00
Min RK
dd7f035158 Merge pull request #3543 from dolfinus/fix_zombie_process
Avoid zombie processes in case of using LocalProcessSpawner
2021-08-23 11:06:26 +02:00
Min RK
59b2581370 Merge pull request #3565 from minrk/doc-waiting-server
Add detailed doc for starting/waiting for servers via api
2021-08-18 10:36:26 +02:00
Min RK
1cb4078fed Merge pull request #3564 from minrk/no-rm-servers
don't omit server model if it's empty
2021-08-18 10:36:02 +02:00
Min RK
9a8fec4060 Merge pull request #3572 from eruditehassan/patch-1
Improved Grammar for the Documentation
2021-08-18 10:35:02 +02:00
dependabot[bot]
ed10ac2433 Bump url-parse from 1.5.1 to 1.5.3 in /jsx
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.1 to 1.5.3.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.1...1.5.3)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-18 08:34:41 +00:00
Min RK
c60ec5a18e Merge pull request #3573 from jupyterhub/dependabot/npm_and_yarn/jsx/path-parse-1.0.7
Bump path-parse from 1.0.6 to 1.0.7 in /jsx
2021-08-18 10:34:08 +02:00
Yuvi Panda
441d0f0e52 Merge pull request #3558 from minrk/rm-deprecated-db
remove very old backward-compat for LocalProcess subclasses
2021-08-18 04:24:24 +05:30
dependabot[bot]
0ac8930270 Bump path-parse from 1.0.6 to 1.0.7 in /jsx
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-13 01:44:01 +00:00
Hassan Raza Bukhari
56c10e8799 Update README.md 2021-08-13 01:16:05 +05:00
Hassan Raza Bukhari
f6178ae51d Improved Grammar for the Documentation
Slight improvements in grammar were done in the ReadMe file.
2021-08-12 21:43:42 +05:00
Min RK
17ba49117c Merge pull request #3566 from nsshah1288/feature/shahn3_explicitRollback
explicit DB rollback for 500 errors
2021-08-10 15:36:19 +02:00
Min RK
3bcc542e27 finish up db rollback checks
- move catch_db_error to utils
- tidy catch/propagate errors in prepare, get_current_user
2021-08-10 15:03:41 +02:00
SHAHN3
044fb23a70 add explicit db rollback
add context manager/decorator for db rollback

add db rollback in top level prepare method

Co-authored-by: Sarath Babu <sbreached@gmail.com>
2021-08-10 14:49:37 +02:00
Min RK
9d96997eae Merge pull request #3568 from paccorsi/proxy-statsd-cmd
Stop injecting statsd parameters into the configurable HTTP proxy
2021-08-10 14:35:45 +02:00
Erik Sundell
7c471fa7e6 Merge pull request #3569 from dolfinus/auth_state_hook_exception_log
Fix wrong name of auth_state_hook in the exception log
2021-08-10 12:00:34 +02:00
Maxim Martynov
c5272604f2 Fix wrong name of auth_state_hook in the exception log 2021-08-10 12:38:27 +03:00
Pierre Accorsi
75e7c95d5c Stop injecting statsd parameters into the configurable HTTP proxy command 2021-08-09 17:07:44 -04:00
Min RK
a32986e9cc server-api doc: final touches 2021-08-06 10:55:43 +02:00
Yuvi Panda
1a1a60b02b Merge pull request #3559 from minrk/support-show-config
support inherited `--show-config` flags from base Application
2021-08-04 21:22:53 +05:30
Min RK
2cad292103 support inherited --show-config args from base traitlets.config.Application
inherits flags & aliases from base classes
2021-08-04 14:34:30 +02:00
Min RK
4f6fa3ddf7 Apply suggestions from code review
Co-authored-by: Simon Li <orpheus+devel@gmail.com>
2021-08-04 14:11:17 +02:00
Min RK
b1b6a9e76c Add detailed doc for starting/stopping/waiting for servers via api
and complete implementation in examples/server-api
2021-08-04 12:49:12 +02:00
Min RK
add69e8b52 Merge pull request #3563 from minrk/404-user
ensure admin requests for missing users 404
2021-08-04 10:55:07 +02:00
Min RK
468738a3df don't omit server model if it's empty
if request has access to read servers, leave it present and empty

only omit it if there's no access to read server models
2021-08-03 20:44:09 +02:00
Min RK
e98890b9ca ensure admin requests for missing users 404 2021-08-03 20:23:12 +02:00
Erik Sundell
71e9767307 Merge pull request #3561 from minrk/rm-old-tasks
remove old, unused tasks.py
2021-08-03 12:38:06 +02:00
Erik Sundell
8c941d25cf Merge pull request #3562 from minrk/rm-distutils
remove use of deprecated distutils
2021-08-03 12:37:50 +02:00
Min RK
6082c1965a remove use of deprecated distutils
distutils is slated for deprecation in the stdlib

we can use packaging for version parsing and setuptools in setup.py

packaging is technically an extra dependency, but rarely missing because it's so widespread
2021-08-03 12:22:31 +02:00
Min RK
9475af1b69 remove old, unused tasks.py
we haven't used this for quite some time

releases are made on CI now
2021-08-03 12:13:33 +02:00
Min RK
d55518b1ca Merge pull request #3526 from dolfinus/allow_all
Fix allow_all check
2021-08-03 11:01:42 +02:00
Min RK
da4a2a43b6 remove very old backward-compat for LocalProcess subclasses
0.6 introduced start returning connection info instead of relying on db state
2021-08-02 14:45:14 +02:00
Min RK
4ad9af5832 Merge pull request #3546 from AbdealiJK/ajk-pyproxy
doc: Mention a list of known proxies available
2021-08-02 14:38:09 +02:00
Min RK
35204b725b Merge pull request #3552 from dolfinus/token_expire_date_ui
Add expiration date dropdown to Token page
2021-08-02 14:37:44 +02:00
Erik Sundell
95037ae534 Merge pull request #3539 from consideRatio/pr/changelog-for-1.4.2
Update changelog for 1.4.2 in main branch
2021-08-02 10:22:49 +02:00
Maxim Martynov
10c142c104 Add expiration date dropdown to Token page 2021-07-28 12:54:01 +03:00
Erik Sundell
3800ceaf9e Merge pull request #3550 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2021-07-26 21:39:05 +02:00
pre-commit-ci[bot]
3ba4bfff71 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/asottile/reorder_python_imports: v2.5.0 → v2.6.0](https://github.com/asottile/reorder_python_imports/compare/v2.5.0...v2.6.0)
2021-07-26 18:03:56 +00:00
AbdealiJK
d5d05b8777 doc: Mention a list of known proxies available 2021-07-22 07:13:56 +05:30
Erik Sundell
187fe911ed Merge pull request #3542 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2021-07-20 02:11:16 +02:00
pre-commit-ci[bot]
b55dafc445 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/psf/black: 21.6b0 → 21.7b0](https://github.com/psf/black/compare/21.6b0...21.7b0)
2021-07-19 22:12:44 +00:00
Maxim Martynov
9975b8001f Avoid zombie processes in case of using LocalProcessSpawner 2021-07-20 00:48:15 +03:00
Erik Sundell
017579afd1 docs: fix conda-forge badge link in README 2021-07-16 14:16:39 +02:00
Erik Sundell
00e927f60d changelog for 1.4.2 2021-07-16 14:14:59 +02:00
Min RK
d9860aa98c Merge pull request #3537 from consideRatio/pr/backport-changelog-for-1.4.1
Retrospectively update changelog for 1.4.1 in main branch
2021-07-14 11:20:26 +00:00
Min RK
262bb20dc5 changelog for 1.4.1 2021-07-14 13:13:08 +02:00
Martynov Maxim
60b13224c5 Merge branch 'main' into allow_all 2021-07-05 14:43:02 +03:00
Min RK
c0b9250376 Merge pull request #3531 from consideRatio/pr/reproduce-required-api-token
Fix regression where external services api_token became required
2021-07-02 06:31:56 +00:00
Erik Sundell
b8023cbd83 Fix regression where external services require api_token 2021-06-29 23:03:16 +02:00
Erik Sundell
d86612c8e5 Add test to reproduce regression, external services requires api_token 2021-06-29 23:02:29 +02:00
Erik Sundell
f7b26c02dc Merge pull request #3530 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2021-06-28 21:27:20 +02:00
pre-commit-ci[bot]
18c5b6a17a [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2021-06-28 17:44:35 +00:00
pre-commit-ci[bot]
63315feb56 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/asottile/reorder_python_imports: v1.9.0 → v2.5.0](https://github.com/asottile/reorder_python_imports/compare/v1.9.0...v2.5.0)
- [github.com/psf/black: 20.8b1 → 21.6b0](https://github.com/psf/black/compare/20.8b1...21.6b0)
- [github.com/pre-commit/mirrors-prettier: v2.2.1 → v2.3.2](https://github.com/pre-commit/mirrors-prettier/compare/v2.2.1...v2.3.2)
- https://gitlab.com/pycqa/flake8https://github.com/PyCQA/flake8
- [github.com/PyCQA/flake8: 3.8.4 → 3.9.2](https://github.com/PyCQA/flake8/compare/3.8.4...3.9.2)
- [github.com/pre-commit/pre-commit-hooks: v3.4.0 → v4.0.1](https://github.com/pre-commit/pre-commit-hooks/compare/v3.4.0...v4.0.1)
2021-06-28 17:44:07 +00:00
Min RK
c00c3fa287 Merge pull request #3438 from jupyterhub/rbac
Roles and Scopes (RBAC)
2021-06-25 07:40:54 +00:00
Min RK
e35dde8112 Merge pull request #3520 from IvanaH8/rbac-docs-update
[rbac] Docs updates
2021-06-25 07:15:29 +00:00
Min RK
8b4c146719 Merge pull request #3524 from minrk/rm-pre-commit-gha
Remove pre-commit from GHA
2021-06-24 07:01:28 +00:00
Martynov Maxim
c7c9990c3d Fix allow_all check 2021-06-23 14:47:05 +03:00
IvanaH8
a6471670c2 Update upgrade section 2021-06-23 11:44:40 +02:00
IvanaH8
8764f6493b Add scope variable nomenclature and update tech implementation 2021-06-23 11:33:48 +02:00
IvanaH8
024e8fca30 Add !user filter explanation 2021-06-22 17:16:06 +02:00
IvanaH8
eb0f995886 Add scope hierarchy duplicates explanation 2021-06-22 16:22:51 +02:00
Min RK
e5345514ab remove unused defaults.run
this is leftover and has no effect
2021-06-22 15:27:43 +02:00
Min RK
7c9a80b4f0 Remove pre-commit from GHA
we are trying out pre-commit.ci, which means these steps in GHA are redundant
2021-06-22 15:27:24 +02:00
Min RK
778231726b Merge pull request #3519 from sgaist/improve_scope_relationships_generation
Refactor scope relationships creation
2021-06-21 08:28:07 +00:00
Min RK
e38509ca42 Merge pull request #3521 from icankeep/fix-readme-link
Fix contributor documentation's link
2021-06-21 07:51:28 +00:00
passer
bab5532b98 Fix contributor documentation's link 2021-06-19 12:37:08 +08:00
IvanaH8
f767a082f8 Fix user/admin default role assignment in roles.md 2021-06-18 13:10:02 +02:00
IvanaH8
a137134d3a Update roles.md for rbac docs with role creation/deletion and assignment changes 2021-06-18 12:28:30 +02:00
IvanaH8
12ffc42114 Fix docstring indentation and reference to flask example in docs
example using flask for Implementing your own Auth with JupyterHub was not displayed
2021-06-18 11:07:33 +02:00
Samuel Gaist
5a4314ea8c Refactor scope relationships creation
This version reduces the number of access to dictionaries data.
2021-06-17 16:06:59 +02:00
Min RK
e9686376ca Merge pull request #3517 from 0mar/resolve_rbac_todos
[rbac] Resolve small issues
2021-06-17 13:00:07 +00:00
0mar
2f8f7ad0b0 Resolves sql warnings on 3.6 and fixes for scope expansion bug 2021-06-17 14:38:14 +02:00
0mar
0381b51648 Raise error if role_spec bearers are invalid 2021-06-16 14:32:31 +02:00
0mar
a6a048c546 WIP: dealing with users only in load_roles 2021-06-16 12:28:36 +02:00
0mar
1bfe4be634 Added test for admin pages scope guard 2021-06-16 11:59:48 +02:00
0mar
5094baf797 Added scope checker 2021-06-16 11:45:02 +02:00
0mar
528ab28871 Raise error when hub has no roles defined 2021-06-16 11:37:23 +02:00
0mar
4359b6dc3c Added test for service role defaults 2021-06-16 11:36:49 +02:00
Min RK
280c11ca73 Merge pull request #3514 from minrk/start-services
[rbac] ensure managed services work with internal ssl
2021-06-16 08:39:45 +00:00
Min RK
c3308b1fc6 Merge pull request #3515 from 0mar/revoke_exceeding_tokens
[rbac] Revoke tokens for OAuth services if roles expand permissions
2021-06-16 07:44:40 +00:00
Min RK
c7a3015f94 Merge pull request #3516 from 0mar/refactor_scopes
[rbac] Refactor scopes (additional fix)
2021-06-16 07:41:35 +00:00
Min RK
0a231fe8ba ensure managed services work with internal ssl
- ensure create_certs is called for managed services
- wait for services with http, which checks ssl connections (without http, only tcp was checked, which doesn't verify it works!)
2021-06-16 09:41:09 +02:00
0mar
684cac4dc9 Fixed newlines 2021-06-16 09:15:27 +02:00
0mar
f75df12648 Small db fix 2021-06-15 15:50:39 +02:00
0mar
ac7625306b Revoke tokens for oauth if their roles expand permissions 2021-06-15 15:50:39 +02:00
Min RK
360075c98c Merge pull request #3513 from 0mar/refactor_scopes
[rbac] Refactored scope names
2021-06-15 13:10:46 +00:00
0mar
ceed989e77 Generate REST API scope descriptions from source code 2021-06-15 13:49:24 +02:00
0mar
7a3b237bb3 Refactored scope names and updated docs to reflect this 2021-06-15 13:00:15 +02:00
Min RK
6988d74001 Merge pull request #3512 from jupyterhub/dependabot/npm_and_yarn/jsx/ini-1.3.8
Bump ini from 1.3.5 to 1.3.8 in /jsx
2021-06-15 09:07:12 +00:00
Min RK
e8a7704b42 Merge pull request #3511 from jupyterhub/dependabot/npm_and_yarn/jsx/y18n-4.0.3
Bump y18n from 4.0.0 to 4.0.3 in /jsx
2021-06-15 09:07:04 +00:00
Min RK
5789806cf7 Sync rbac with main 2021-06-15 11:06:11 +02:00
dependabot[bot]
7ae736b085 Bump ini from 1.3.5 to 1.3.8 in /jsx
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.8.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.8)

---
updated-dependencies:
- dependency-name: ini
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-15 07:26:58 +00:00
dependabot[bot]
8ed49e200b Bump y18n from 4.0.0 to 4.0.3 in /jsx
Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.3.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/y18n-v4.0.3/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/compare/v4.0.0...y18n-v4.0.3)

---
updated-dependencies:
- dependency-name: y18n
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-15 07:24:32 +00:00
Min RK
f2eb40cd1a Merge pull request #3501 from jupyterhub/dependabot/npm_and_yarn/jsx/postcss-8.3.0
Bump postcss from 8.1.8 to 8.3.0 in /jsx
2021-06-15 06:30:30 +00:00
Min RK
c9ea3d9e06 Merge pull request #3500 from jupyterhub/dependabot/npm_and_yarn/jsx/browserslist-4.16.6
Bump browserslist from 4.14.7 to 4.16.6 in /jsx
2021-06-15 06:30:13 +00:00
Min RK
cda9e3aa30 Merge pull request #3499 from jupyterhub/dependabot/npm_and_yarn/jsx/lodash-4.17.21
Bump lodash from 4.17.20 to 4.17.21 in /jsx
2021-06-15 06:30:00 +00:00
Min RK
1c25ad3cce Merge pull request #3502 from jupyterhub/dependabot/npm_and_yarn/jsx/hosted-git-info-2.8.9
Bump hosted-git-info from 2.8.8 to 2.8.9 in /jsx
2021-06-15 06:29:49 +00:00
Min RK
f5adfcd3d5 Merge pull request #3498 from jupyterhub/dependabot/npm_and_yarn/jsx/ws-6.2.2
Bump ws from 6.2.1 to 6.2.2 in /jsx
2021-06-15 06:29:37 +00:00
Min RK
e3a64e0114 Merge pull request #3497 from jupyterhub/dependabot/npm_and_yarn/jsx/url-parse-1.5.1
Bump url-parse from 1.4.7 to 1.5.1 in /jsx
2021-06-15 06:29:27 +00:00
Min RK
4d61bf6da2 Merge pull request #3496 from jupyterhub/dependabot/npm_and_yarn/jsx/dns-packet-1.3.4
Bump dns-packet from 1.3.1 to 1.3.4 in /jsx
2021-06-15 06:29:11 +00:00
Min RK
7fd3f280d4 Merge pull request #3495 from jupyterhub/dependabot/npm_and_yarn/jsx/ua-parser-js-0.7.28
Bump ua-parser-js from 0.7.22 to 0.7.28 in /jsx
2021-06-15 06:28:57 +00:00
Erik Sundell
c7b9b14724 Merge pull request #3510 from minrk/bump-autodoc
bump autodoc-traits
2021-06-15 08:20:41 +02:00
Min RK
b664f02f58 Merge pull request #3504 from 0mar/authorization-page
[rbac] Authorization page for OAuth services
2021-06-15 06:13:44 +00:00
Min RK
77e4e8aab7 bump autodoc-traits
for sphinx compatibility fix
2021-06-15 08:07:40 +02:00
0mar
244624579f Added tests for auth page 2021-06-14 14:54:27 +02:00
Min RK
744983e53f sync rbac with main
# Conflicts:
#	docs/rest-api.yml
#	jupyterhub/oauth/provider.py
2021-06-14 12:53:39 +02:00
Min RK
fc2081d9dd Merge pull request #3507 from minrk/service.allowed_roles
[rbac] fix allowed_role assignment from service config
2021-06-14 10:49:41 +00:00
Min RK
e097faff15 Merge pull request #3508 from minrk/user-role-list
[rbac] Fix self scope list
2021-06-14 10:49:14 +00:00
Erik Sundell
98ec8991f9 Merge pull request #3509 from manics/docker/release/check/branch/name
release docker workflow: 'branchRegex: ^\w[\w-.]*$'
2021-06-14 00:00:35 +02:00
Simon Li
f4cced06f9 release docker workflow: 'branchRegex: ^\w[\w-.]*$' 2021-06-13 22:21:22 +01:00
Min RK
be61bbc530 Fix self scope list
adding `read:` to everything isn't right because not everything has a `read:` counterpart and not every `read:` has a write counterpart

includes a test verifying that every scope has a definition
2021-06-11 15:17:52 +02:00
Min RK
e6810b7ec5 fix allowed_role assignment from service config
Service.oauth_roles is list of names, OAuthClient.allowed_roles is list of orm.Roles
2021-06-11 15:03:19 +02:00
0mar
1ecce476ea Outlined tests and updated oauth page 2021-06-11 14:41:46 +02:00
0mar
8864780bfb Adjusted documentation for auth pages 2021-06-11 13:32:20 +02:00
0mar
03e2e7f3b0 Fix auth page logic 2021-06-11 13:23:23 +02:00
Min RK
df0ca1069e Merge pull request #3506 from jupyterhub/sgibson91-patch-1
Add research study participation notice to readme
2021-06-11 11:17:10 +00:00
Sarah Gibson
c4e711178a Update README.md 2021-06-11 11:57:01 +01:00
Sarah Gibson
ba660cdeab Add research study participation notice to readme 2021-06-11 11:54:43 +01:00
Erik Sundell
8907943c70 Merge pull request #3505 from minrk/skip-dependabot-docker
exclude dependabot push events from release workflow
2021-06-11 12:52:31 +02:00
Min RK
1229965f30 exclude dependabot push events from release workflow 2021-06-11 12:37:36 +02:00
0mar
5e3201cfe3 Minor formatting change 2021-06-11 12:27:40 +02:00
0mar
73a6b3477a Fixed typos and formatting 2021-06-11 11:59:18 +02:00
0mar
d169359d51 Refactored scope description to be usable for both docs and authorization page 2021-06-11 11:44:10 +02:00
0mar
a605ad9c44 Merge branch 'rbac' into authorization-page 2021-06-11 10:34:20 +02:00
Min RK
06ce287747 Merge pull request #3492 from 0mar/read_roles
Read scopes
2021-06-11 06:46:19 +00:00
0mar
1023653aaf Fixed scopes and added tests 2021-06-10 17:45:25 +02:00
0mar
981ad5b05a Implemented suggestions and adjusted tests 2021-06-09 16:29:11 +02:00
dependabot[bot]
bb92e4f17d Bump hosted-git-info from 2.8.8 to 2.8.9 in /jsx
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9)

---
updated-dependencies:
- dependency-name: hosted-git-info
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-09 13:20:24 +00:00
dependabot[bot]
ed5a06ce1a Bump postcss from 8.1.8 to 8.3.0 in /jsx
Bumps [postcss](https://github.com/postcss/postcss) from 8.1.8 to 8.3.0.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.1.8...8.3.0)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-09 13:20:23 +00:00
dependabot[bot]
76a79c7ef5 Bump browserslist from 4.14.7 to 4.16.6 in /jsx
Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.14.7 to 4.16.6.
- [Release notes](https://github.com/browserslist/browserslist/releases)
- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/browserslist/browserslist/compare/4.14.7...4.16.6)

---
updated-dependencies:
- dependency-name: browserslist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-09 13:20:21 +00:00
dependabot[bot]
f713841b86 Bump lodash from 4.17.20 to 4.17.21 in /jsx
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

---
updated-dependencies:
- dependency-name: lodash
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-09 13:20:20 +00:00
dependabot[bot]
f301e2b16f Bump ws from 6.2.1 to 6.2.2 in /jsx
Bumps [ws](https://github.com/websockets/ws) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/6.2.1...6.2.2)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-09 13:20:19 +00:00
dependabot[bot]
91307715f8 Bump url-parse from 1.4.7 to 1.5.1 in /jsx
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.4.7 to 1.5.1.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.4.7...1.5.1)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-09 13:20:19 +00:00
dependabot[bot]
8069f50caa Bump dns-packet from 1.3.1 to 1.3.4 in /jsx
Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4.
- [Release notes](https://github.com/mafintosh/dns-packet/releases)
- [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mafintosh/dns-packet/compare/v1.3.1...v1.3.4)

---
updated-dependencies:
- dependency-name: dns-packet
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-09 13:20:18 +00:00
dependabot[bot]
ee959c1586 Bump ua-parser-js from 0.7.22 to 0.7.28 in /jsx
Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.22 to 0.7.28.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases)
- [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.22...0.7.28)

---
updated-dependencies:
- dependency-name: ua-parser-js
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-09 13:20:18 +00:00
Min RK
046df41f04 Merge pull request #3398 from naatebarber/master
Make JupyterHub Admin page into a React app
2021-06-09 13:19:33 +00:00
Min RK
b97b05343c WIP: show permissions on authorize page
incomplete because the current text isn't formatted appropriately for the "will be able to do..." framing of an authorization page
2021-06-09 15:07:51 +02:00
Min RK
deb03d4006 Fix user role list
adding `read:` to everything isn't right because not everything has a `read:` counterpart and not every `read:` has a write counterpart
2021-06-09 14:52:45 +02:00
Min RK
1d93d6e99b fix allowed_role assignment from service config
Service.oauth_roles is list of names, OAuthClient.allowed_roles is list of orm.Roles
2021-06-09 14:48:48 +02:00
0mar
b983445794 Merge branch 'rbac' into read_roles 2021-06-09 13:21:36 +02:00
Min RK
e6c307c19d Merge pull request #3493 from 0mar/rbac_service_default
Removed default service roles from upgrade and docs
2021-06-09 11:14:59 +00:00
Erik Sundell
81fa41574f Merge pull request #3494 from davidbrochart/typo
Fix typo
2021-06-09 11:34:32 +02:00
David Brochart
fb1ff5e644 Fix typo 2021-06-09 11:32:15 +02:00
0mar
c121a17310 Removed default service roles from upgrade and docs 2021-06-09 09:10:51 +02:00
0mar
bb577fca04 Resolved merge conflicts and updated tests 2021-06-08 15:55:49 +02:00
0mar
c92d39659b Merge branch 'rbac' into read_roles 2021-06-08 15:37:16 +02:00
0mar
32d1e3cbea Merge branch 'rbac' into read_roles 2021-06-08 15:31:30 +02:00
0mar
0233faf19d Added tests 2021-06-08 15:26:06 +02:00
0mar
18623dc9de Unified service model 2021-06-08 15:18:57 +02:00
0mar
2ac1cfe4ac finegrained service model access 2021-06-08 14:01:04 +02:00
Min RK
2113f3424b Merge pull request #3466 from minrk/access-scope
[rbac] Access scopes
2021-06-08 08:03:00 +00:00
Min RK
1dab57af6f remove invalid access scope test 2021-06-08 09:48:11 +02:00
Min RK
4a0fed1a5b address review in services doc 2021-06-08 09:35:45 +02:00
Min RK
3270bc76af readme typo
Co-authored-by: Ivana <IvanaH8@users.noreply.github.com>
2021-06-08 09:35:45 +02:00
Min RK
fbea31d00a support groups in _intersect_scopes
Requires db resolution
2021-06-08 09:35:45 +02:00
Min RK
40de16e0e1 Update service examples and documentation with access scopes and roles 2021-06-07 14:02:13 +02:00
Min RK
69d2839ba3 test access scopes in authorize handler
- provider.add_client returns the client
- fix Spawner access scopes
- debug logging in mock spawners
- Assign service access scopes
2021-06-07 14:02:10 +02:00
Min RK
0ba222b288 move role/scope fixtures to conftest
so they can be more easily reused
2021-06-07 14:01:38 +02:00
Min RK
72b1dd2204 oauth: use client_id for description if empty
that way description can never be empty on retrieval
2021-06-07 14:00:54 +02:00
Min RK
e2076e6c91 implement access scopes
- access:services for services
- access:users:servers for servers
- tokens automatically have access to their issuing client (if their owner does, too)
- Check access scope in HubAuth integration
2021-06-07 14:00:50 +02:00
Min RK
e5198b4039 create boolean columns with create_constraint=False
matches new default behavior in sqlalchemy 1.4
2021-06-07 13:58:27 +02:00
Min RK
57f4c08492 get upgrade working on sqlite with foreign key naming convention 2021-06-07 13:58:27 +02:00
Min RK
7e46d5d0fc store relationship between oauth client and service/spawner
so that we can look up the spawner/service from the oauth client and vice versa
2021-06-07 13:58:27 +02:00
Min RK
563146445f add scopes.check_scope_filter
Extracted from APIHandler.get_scope_filter for easier re-use

and mve get_scope_filter to BaseHandler from APIHandler since it will be needed on oauth
2021-06-07 13:58:27 +02:00
Min RK
8eaed91f79 Merge pull request #3444 from minrk/oauth-details
Oauth details docs
2021-06-07 11:56:49 +00:00
Min RK
657d7ed8c3 Merge pull request #3480 from IvanaH8/rbac-scope-naming-convention
[rbac] Synchronize variable nomenclature across rbac utils
2021-06-07 11:56:34 +00:00
IvanaH8
335320fd14 Rename raw_scopes attr for base handler to expanded_scopes 2021-06-04 09:26:48 +02:00
IvanaH8
e6845a68f5 Clarify some function names in rbac utils 2021-06-04 09:26:48 +02:00
IvanaH8
2ab6c61e9a Synchronize scope variable nomenclature and docstrings across rbac utils 2021-06-04 09:26:45 +02:00
Min RK
a7ac412b2f Merge pull request #3460 from 0mar/fix_role_init
Fix role assignment on startup
2021-06-04 07:19:14 +00:00
0mar
d6bb1e6318 Fixed upgrade test 2021-06-03 13:26:06 +02:00
Min RK
11f00dbbe7 Merge pull request #3488 from yuvipanda/oauth2-autologin
Support auto login when used as a OAuth2 provider
2021-06-03 09:55:03 +00:00
YuviPanda
f566ee1e4b Support auto login when used as a OAuth2 provider
Fixes #3487
2021-06-03 14:55:22 +05:30
Min RK
d4ae68267c Merge pull request #3484 from weisdd/bugfix/oauth-expires-at
Bug: save_bearer_token (provider.py) passes a float value to the expires_at field (int)
2021-06-02 07:01:45 +00:00
Igor Beliakov
ea5346bf8b Fixed expires_at for save_bearer_token
Signed-off-by: Igor Beliakov <demtis.register@gmail.com>
2021-06-02 09:00:17 +02:00
0mar
8f2bbd4d11 Test still fails, issue with emulating hub restart 2021-06-01 23:42:50 +02:00
Rick Wagner
3610454a12 adding initial security policy 2021-06-01 09:51:20 -07:00
0mar
246ce6797c Fixed some bugs and implemented suggestions, save one weird test case 2021-06-01 15:35:04 +02:00
0mar
2bf8e57e2c Fixed whitespace bug 2021-06-01 13:27:49 +02:00
0mar
9aac6b55ee Merge branch 'fix_role_init' of github.com:0mar/jupyterhub into fix_role_init 2021-06-01 12:42:05 +02:00
0mar
03f968fea0 wip: fixing errors and suggestions 2021-06-01 12:41:29 +02:00
0mar
2b36c662b6 Merge branch 'rbac' into fix_role_init 2021-06-01 12:33:13 +02:00
Min RK
2b1ed086a5 Merge pull request #3481 from IvanaH8/rbac-scope-hierarchy
[rbac] Use scopes.scope_definitions to expand scopes
2021-05-28 10:38:28 +00:00
IvanaH8
05f6892e37 Get subscopes directly from scopes.scope_definitions
no need for _get_scope_hierarchy()
2021-05-27 18:11:33 +02:00
Ivana
320ad75b12 Update jupyterhub/roles.py
Co-authored-by: Min RK <benjaminrk@gmail.com>
2021-05-27 11:04:46 +02:00
0mar
587ea28581 Added error for duplicate roles 2021-05-27 10:36:23 +02:00
Min RK
f1f95bd7d1 Merge pull request #3482 from ChameleonCloud/main
Add Chameleon to JupyterHub deployment gallery
2021-05-27 08:24:30 +00:00
Jason Anderson
20a3ba2b41 Add Chameleon to JupyterHub deployment gallery 2021-05-26 15:07:11 -05:00
0mar
290a697df2 Fixed service admin declaration 2021-05-26 16:55:20 +02:00
IvanaH8
b399158060 Create scope_hierarchy dict automatically from scope_definitions 2021-05-26 16:45:53 +02:00
0mar
3ba8e11553 Added tests and fixed bugs 2021-05-26 15:39:45 +02:00
Min RK
d39673eea2 Flesh out oauth details doc
adress review, add emoji, expand details, examlpes, and add discussion of caching and revocation.
2021-05-26 12:28:59 +02:00
0mar
c9188a67a9 Merge branch 'rbac' into fix_role_init 2021-05-25 13:54:30 +02:00
0mar
c13ad804fe Added default roles for users and unified admin check 2021-05-25 13:51:43 +02:00
0mar
1a01302e27 Fixed bug in scope test fixture teardown 2021-05-25 11:17:24 +02:00
Min RK
2ad80fd69c Merge pull request #3476 from IvanaH8/rbac-scope-table-makefile
[rbac] Generate scope table for docs
2021-05-25 09:18:08 +02:00
Min RK
1ba1ddfcf2 Merge pull request #3477 from minrk/group-extend-roles
fix appending group roles to user roles
2021-05-25 09:14:25 +02:00
0mar
d2f3020ae8 Merge branch 'rbac' into fix_role_init 2021-05-24 14:55:06 +02:00
0mar
5a5cdb418e (wip): update role init process 2021-05-24 14:53:20 +02:00
0mar
915fee2734 Added strict admin check to role assignment 2021-05-24 13:36:59 +02:00
Erik Sundell
e0439bc310 Apply suggestions from code review
Co-authored-by: Ivana <IvanaH8@users.noreply.github.com>
2021-05-23 11:38:53 +02:00
IvanaH8
800f3cf79f Add trigger to conf.py to call generate-scope-table 2021-05-21 17:03:24 +02:00
IvanaH8
4a1459195e Move scope_definitions dict to jupyterhub/scopes.py 2021-05-21 16:58:45 +02:00
Min RK
3fde458c07 fix appending group roles to user roles
ensure we are using a fresh list before calling extend

otherwise, we are extending the user's own roles
2021-05-21 16:43:51 +02:00
Min RK
be7ad39b10 Merge pull request #3475 from minrk/async-check-db-locks
handle async functions in check_db_locks
2021-05-21 15:36:20 +02:00
Min RK
478ae8a744 typo in comment
Co-authored-by: Ivana <IvanaH8@users.noreply.github.com>
2021-05-21 15:36:14 +02:00
Min RK
d2dc38d773 Sync with main 2021-05-21 12:53:37 +02:00
Min RK
5a9ca0c710 Merge pull request #3470 from kinow/patch-2
(docs) Fix DummyAuthenticator class reference
2021-05-21 12:01:26 +02:00
Min RK
05f47b14f3 Merge pull request #3381 from minrk/rm-redundant-args
Stop specifying `--ip` and `--port` on the command-line
2021-05-21 10:09:16 +02:00
IvanaH8
e61cacf5e8 Add message to run make clean before make html 2021-05-20 14:59:49 +02:00
IvanaH8
7914c01099 Call scope table generation in makefile and include in scopes.md 2021-05-20 14:52:28 +02:00
IvanaH8
948179ee0e Generate scope table in separate markdown file 2021-05-20 14:49:28 +02:00
IvanaH8
65f3933da4 Create scope dictionary 2021-05-20 14:36:21 +02:00
Bruno P. Kinoshita
5a10107da8 (docs) Fix DummyAuthenticator class 2021-05-21 00:19:44 +12:00
Min RK
02619b687f cleanup after failure to create token due to permisison errors
have to delete tokens explicitly if we fail to finish creating them
2021-05-20 13:48:37 +02:00
Min RK
af6884bb7d oldest suppported sqlalchemy doesn't have session context managers 2021-05-20 13:33:02 +02:00
Min RK
1cd37a1396 Merge pull request #3474 from datalayer-externals/rbac-external-oauth
[RBAC] Fixexternal oauth example
2021-05-20 13:29:10 +02:00
Min RK
6e2c4d8357 handle async functions in check_db_locks
check_db_locks checks for db lock state after the end of a function,
but wasn't properly waiting when it wrapped an async function,
meaning it would run the check while the async function was still outstanding,
causing possible spurious failures
2021-05-20 13:27:42 +02:00
Eric Charles
16636ce3c0 Fix Service oauth client ids must start with 'service-' in the service launcher 2021-05-20 12:00:56 +02:00
Eric Charles
fdf57b271e Fix Service oauth client ids must start with 'service-' 2021-05-20 11:58:42 +02:00
Nathan Barber
5db40d096d Pass front-end the api page limit with Jinja 2021-05-19 10:01:00 -04:00
Nathan Barber
21c14454cc Set webpack to build production 2021-05-17 13:43:45 -04:00
Nathan Barber
97b6b71983 Remove unused imports and variables 2021-05-17 13:37:54 -04:00
Nathan Barber
7e85b2ec3e Fix CreateGroup state update, add info alerts 2021-05-17 12:44:16 -04:00
Min RK
afe43f32f7 Merge pull request #3464 from minrk/intersect_scopes
add scopes.unparse_scopes, refine intersect_scopes
2021-05-12 16:08:36 +02:00
Min RK
4e41a39b30 Sync with main 2021-05-12 16:08:03 +02:00
Min RK
a13813e61f add scopes.unparse_scopes, refine intersect_scopes
and fix warning condition for intersection overlap

- only warn when there's a group only on one side and a user or server only on the other,
  otherwise there is no lost information to warn about (group and/or defined on both sides)
- correctly resolve servers as sub-scopes of user
2021-05-12 15:21:09 +02:00
Min RK
915fa4bfcc Apply suggestions from code review
thanks Carol!

Co-authored-by: Carol Willing <carolcode@willingconsulting.com>
2021-05-12 11:05:47 +02:00
Min RK
6be3160d74 Merge pull request #3462 from minrk/master-main
prepare to rename default branch to main
2021-05-12 11:00:30 +02:00
0mar
ae17a8c11c Merge branch 'rbac' into fix_role_init 2021-05-12 10:01:38 +02:00
Min RK
12316559f5 Merge pull request #3463 from minrk/rbac-merge
[rbac] Finish resync with master
2021-05-11 11:44:45 +02:00
Min RK
8408e3aa76 update tests after merge into rbac 2021-05-11 11:09:43 +02:00
Min RK
e7d249bb3d Sync with master 2021-05-11 10:52:46 +02:00
Min RK
63a61bcc2f prepare to rename default branch to main
- update references to default branch name in docs, workflows
- use HEAD in github urls, which always works regardless of default branch name
- fix petstore URLs since the old petstore links seem to have stopped working
2021-05-11 10:40:04 +02:00
Min RK
42c7ffe5cf Merge pull request #3443 from minrk/rm-deprecated-cookie-auth
Deprecate and remove some old auth bits (shared cookie auth for services)
2021-05-11 10:22:36 +02:00
Nathan Barber
b8dda5a088 Merge remote-tracking branch 'upstream/master' 2021-05-10 18:18:48 -04:00
Nathan Barber
f57a52e1a1 Merge pull request #4 from naatebarber/ui-pagination
UI pagination
2021-05-10 18:04:08 -04:00
Nathan Barber
a3794642f7 Latest bundle placed 2021-05-10 18:02:31 -04:00
Nathan Barber
d112863330 Updates to README, set pg. limit to 50 2021-05-10 18:00:29 -04:00
Nathan Barber
6378505305 Fix bug on validateUser / housekeeping 2021-05-10 17:59:06 -04:00
Nathan Barber
8d4c276652 Update unit tests for pagination 2021-05-10 17:48:46 -04:00
Nathan Barber
16c37cd5fe Improve GroupEdit, username input with validation and alerts 2021-05-10 12:02:19 -04:00
0mar
b2b040da6c Added scope for reading roles, test setup 2021-05-07 16:49:29 +02:00
0mar
988bc376ac Added tests for user role configuration 2021-05-07 16:20:16 +02:00
0mar
0eb5e3b6ce Split role creation and role assignment 2021-05-07 15:31:03 +02:00
Nathan Barber
5409983e4a Fix README 2021-05-05 18:51:34 -04:00
Nathan Barber
0439a0d274 Add UI pagination, update Redux and API service lib 2021-05-05 18:41:48 -04:00
Min RK
77691ae402 Merge pull request #3457 from consideRatio/pr/fix-ci-pipeline
ci: fix typo in environment variable
2021-05-05 20:58:53 +02:00
Erik Sundell
4be8e911ef ci: fix typo in environment variable 2021-05-05 20:46:43 +02:00
Erik Sundell
1ee71d51ba Merge pull request #3454 from minrk/more-delete-forever
define Spawner.delete_forever on base Spawner
2021-05-05 20:26:37 +02:00
Erik Sundell
77843303f6 Merge pull request #3456 from minrk/debug-loops
avoid re-using asyncio.Locks across event loops
2021-05-05 20:21:32 +02:00
Nathan Barber
5e2ca7bcff Update ServerDashboard unit test for async pagination check 2021-05-05 13:19:35 -04:00
Nathan Barber
f1ddb58d7d Add persistent URL / stateful pagination for users 2021-05-05 12:55:36 -04:00
Nathan Barber
144a018705 Merge branch 'master' of https://github.com/jupyterhub/jupyterhub 2021-05-05 10:17:54 -04:00
0mar
bbf251ed13 Merge branch 'rbac' into fix_role_init 2021-05-05 16:01:03 +02:00
Min RK
5b69564e86 avoid re-using asyncio.Locks across event loops
should never occur in real applications where only one loop is run,
but may occur in tests if the Proxy object lives longer than the loop in which it runs

I suspect this is the source of our intermittent test failures with

> got Future <Future pending> attached to a different loop
2021-05-05 14:27:59 +02:00
Min RK
863b4c7d50 Deprecate and remove some old auth bits
- remove long-deprecated `POST /api/authorizations/token` for creating tokens
- deprecate but do not remove `GET /api/authorizations/token/:token` in favor of GET /api/user
- remove shared-cookie auth for services from HubAuth, rely on OAuth for browser-auth instead
- use `/hub/api/user` to resolve user instead of `/authorizations/token` which is now deprecated
2021-05-05 14:07:14 +02:00
Min RK
3d3c84a2b3 Merge pull request #3448 from IvanaH8/rbac-update-scope-hierarchy
[rbac] Update scope hierarchy
2021-05-05 12:37:56 +02:00
Min RK
b9a7aa069f Merge pull request #3437 from minrk/always-patch-both
patch base handlers from both jupyter_server and notebook
2021-05-05 12:04:42 +02:00
Min RK
9f81ff5fb2 define Spawner.delete_forever on base Spawner
instead of on the test class

and fix the logic for when it is called a bit:

- call on *all* Spawners, not just the default
- call on named server deletion when remove=True
2021-05-05 12:03:09 +02:00
Min RK
1f7e54f652 Merge pull request #3413 from naatebarber/pagination
Support Pagination in the REST API
2021-05-05 11:27:27 +02:00
Min RK
e63eac4ad8 Merge pull request #3452 from davidbrochart/fix_doc
Fix documentation
2021-05-05 10:40:12 +02:00
Min RK
401f583c5a always pass JUPYTERHUB_SERVICE_URL
- default Spawner.ip is 127.0.0.1, matching earlier behavior when unspecified
- default Spawner.port is random (dynamic default instead of 0
2021-05-05 10:35:27 +02:00
Min RK
3602da550c more spawner docs for environment variables, cli args, ips and ports 2021-05-05 10:21:32 +02:00
David Brochart
49e10fdbe9 Fix documentation 2021-05-04 18:36:50 +02:00
Min RK
f28b92a99e remove all CLI args from default Spawner implementation
use only env variables, which are safer to ignore and easier to handle in multiple ways
2021-05-04 12:30:39 +02:00
0mar
c61b8e60c2 Removed configuration options to assign roles to tokens 2021-04-30 17:27:26 +02:00
IvanaH8
e3eac92da0 Resolve merge conflicts 2021-04-30 15:31:09 +02:00
IvanaH8
cc35d84f25 Revert "Change read:users(services):admin scope to read:users(services):roles"
read:users(services):roles scopes will be added together with changes to api handlers
2021-04-30 15:13:29 +02:00
Min RK
f45f1c250f Merge pull request #3446 from IvanaH8/rbac-fix-server-scope
[rbac] Add !user filter for "owner-only" scopes
2021-04-29 13:32:19 +02:00
Min RK
f30db42405 Merge branch 'rbac' into rbac-fix-server-scope 2021-04-29 13:17:25 +02:00
Min RK
ff9b9cdf8b Merge pull request #3439 from 0mar/oauth_allowed_roles
Add service.oauth_roles configuration
2021-04-29 13:11:06 +02:00
Min RK
1337a53a9f consistent docstrings, config for services/spawner oauth_roles 2021-04-29 12:58:16 +02:00
0mar
7022a4c558 Fixed review comments and added allowed roles to spawner configuration 2021-04-29 10:03:25 +02:00
IvanaH8
60c73de8b2 Change read:users(services):admin scope to read:users(services):roles 2021-04-29 09:23:43 +02:00
IvanaH8
b2c2866915 Update admin role scopes list 2021-04-29 09:14:24 +02:00
IvanaH8
cdc99580de Update scope hierarchy in roles.py and tests 2021-04-29 09:13:28 +02:00
IvanaH8
b3887b07ba Add more filter intersection tests, note and warning for containing filters 2021-04-28 16:52:59 +02:00
IvanaH8
91af87310e Add more tests for server role 2021-04-27 09:51:40 +02:00
IvanaH8
bf9ca1d3be Test server token posting activity 2021-04-24 13:02:16 +02:00
IvanaH8
71d3457adf Add test for resolving token scope permissions with horizontal filters 2021-04-24 12:10:25 +02:00
Rick Wagner
abc4bbebe4 Initial SECURITY.md
Proposing a basic security policy, similar to the README or contributors guide, based on the [GitHub documentation](https://docs.github.com/en/code-security/security-advisories/adding-a-security-policy-to-your-repository) and current Project Jupyter recommendations. This may be better as a [default file for the organization](https://docs.github.com/en/communities/setting-up-your-project-for-healthy-contributions/creating-a-default-community-health-file).
2021-04-23 23:12:51 -07:00
Erik Sundell
3fec19d191 Merge pull request #3433 from minrk/rm-oauth-client-0.8-handling
Remove handling of jupyterhub 0.8 oauth client ids
2021-04-23 23:20:14 +02:00
IvanaH8
0d637b49cb Include horizontal scope filters check in resolving token permissions
Avoids discarding token scopes with valid horizontal filters
2021-04-23 16:43:21 +02:00
Min RK
148257de12 DOC: details of oauth in jupyterhub 2021-04-23 14:12:46 +02:00
IvanaH8
f98dd0cdeb Test for no expansion when !user=username filter instead of !user filter 2021-04-23 11:01:16 +02:00
0mar
cb8c02366d Placeholder for roles in spawner 2021-04-23 09:46:42 +02:00
0mar
a5af48ef24 Added list of allowed roles to service 2021-04-23 09:30:02 +02:00
IvanaH8
b2ecbfd491 Stop server in test_server_token_role() 2021-04-22 18:32:19 +02:00
IvanaH8
b0479ea5e5 Test server token gets server role upon creation 2021-04-22 17:37:30 +02:00
IvanaH8
411ff954f1 Temporarily fix test_spawn_fails() test
Checking server token permissions against its owner was failing as the user is just manually added to db without role
2021-04-22 17:14:28 +02:00
IvanaH8
97a9ad76a8 Ignore horizontal scope filters in get_scopes_for() func
Avoids discarding token scopes such as users:activity!user=george for user george who has scope users:activity (e.g. if george is admin)
2021-04-22 17:11:26 +02:00
IvanaH8
3a183c1b55 Assign server token server role on creation 2021-04-22 16:58:34 +02:00
Min RK
cf4b25ac56 sync with master 2021-04-22 14:14:02 +02:00
Min RK
eb71e39c77 Merge pull request #3435 from 0mar/token_handler
Fixed scope checking in UserTokenListAPIHandler
2021-04-22 13:52:13 +02:00
Min RK
ad090560d0 Merge pull request #3366 from IvanaH8/rbac-docs
[rbac] Add RBAC documentation with myst-parser
2021-04-22 13:50:58 +02:00
Min RK
a2b76bceb9 minor copy-editing, TODOs in rbac docs 2021-04-22 13:39:36 +02:00
Min RK
a709df8042 patch base handlers from both jupyter_server and notebook
and clarify warning when a base handler isn't patched

- reorganize patch steps into functions for easier re-use
- patch notebook and jupyter_server handlers if they are already imported
- run patch after initialize to ensure extensions have done their importing before we check
2021-04-22 13:09:35 +02:00
IvanaH8
842ca75121 Resolve merge conflicts 2021-04-22 09:24:51 +02:00
Min RK
84d2e5de93 Merge pull request #3436 from consideRatio/pr/gha-security 2021-04-21 18:56:09 +02:00
Nathan Barber
7bd660d899 Revert documentation updates on /groups/{name} 2021-04-21 10:05:50 -04:00
Nathan Barber
ab130309ec Add get_api_pagination method to base handler, revert group.users pagination 2021-04-21 09:57:30 -04:00
Erik Sundell
5d18883543 ci: github workflow security, pin action to sha etc 2021-04-21 12:00:49 +02:00
0mar
103c6a406a Changed error code of UserTokenListAPIHandler back to 403 2021-04-21 09:43:24 +02:00
Min RK
fe37ff4ede Merge pull request #3431 from minrk/persist-roles
Persist roles through OAuth process
2021-04-21 07:50:24 +02:00
Nathan Barber
5d095c0234 Merge remote-tracking branch 'upstream/master' into pagination 2021-04-20 22:07:48 -04:00
IvanaH8
4687a76a6f Add role name conventions to docs/source/rbac/roles.md 2021-04-20 17:28:41 +02:00
IvanaH8
79b57b7f3b Add admin:users:auth_state/server_state to docs/rest-api.yml 2021-04-20 16:48:56 +02:00
IvanaH8
cab84500c5 Add !user filter to users:activity scope and its expansion 2021-04-20 16:39:22 +02:00
Min RK
0c7c1ed6b4 scopes.get_scopes_for is the only roles/scopes API to allow User wrapper
all else requires orm objects
2021-04-20 15:21:14 +02:00
Min RK
d8ded9aed8 resolve self in _get_subscopes
avoids inconsistent behavior in different uses of _get_subscopes where 'self' is left unmodified,
leading to errors
2021-04-20 14:58:34 +02:00
0mar
399203e5d3 Fixed scope checking in UserTokenListAPIHandler 2021-04-20 14:55:36 +02:00
Min RK
be76b5ebba tests for oauth roles 2021-04-20 14:49:42 +02:00
Min RK
4728325bf7 persist roles through oauth process
- Attach role limit to OAuthClient
- Attach authorized roles to OAuthCode
- pass roles from code to API token on completion

standard 'scopes' in oauth process are matched against our 'roles' instead of our low-level scopes
2021-04-20 14:29:29 +02:00
Min RK
53f0d88505 hook up oauthlib's logger to ours
for better debugging
2021-04-20 14:29:29 +02:00
Min RK
b9958e9069 Merge pull request #3434 from 0mar/server_permissions
Server permissions
2021-04-20 12:14:28 +02:00
0mar
8de2138566 Merge branch 'rbac' into server_permissions 2021-04-20 11:05:32 +02:00
0mar
ef1351b441 Added todo for future PR 2021-04-20 11:04:04 +02:00
Min RK
3b9e5b1cfe Remove handling of jupyterhub 0.8
These only affected servers upgrading directly from 0.8 or earlier with still-running servers

0.8 was a long time ago, it's okay to require restarting servers for an upgrade that long
2021-04-20 09:51:03 +02:00
Erik Sundell
1d83721117 Merge pull request #3432 from minrk/strict-role-names
be strict about role names
2021-04-19 17:30:35 +02:00
Min RK
639523a27c back to dev 2021-04-19 13:42:46 +02:00
Min RK
574d343881 release 1.4.0 2021-04-19 13:41:28 +02:00
Min RK
863ab1eb12 allow unreserved RFC3986 characters in role names: _-~. 2021-04-19 13:37:21 +02:00
Yuvi Panda
c205385023 Merge pull request #3424 from minrk/changelog-1.4
more changelog for 1.4
2021-04-19 17:06:23 +05:30
Min RK
9e0ac1594c more changelog for 1.4 2021-04-19 13:13:29 +02:00
Min RK
2fd434f511 Merge pull request #3430 from yuvipanda/additional_routes
Support Proxy.extra_routes
2021-04-19 13:12:11 +02:00
Min RK
24245a029f be strict about role names
- 3-255 characters
- ascii lowercase, numbers, -
- must start with letter
- must not end with -

this lets us avoid url escaping issues in e.g. oauth params
2021-04-19 13:10:43 +02:00
YuviPanda
af39f39082 Mark extra proxy routes properly 2021-04-19 16:27:05 +05:30
YuviPanda
ab751bda5c Accomodate for host based routing 2021-04-19 16:26:09 +05:30
YuviPanda
f84078627f Add a little more documentation to extra_routes 2021-04-19 16:16:03 +05:30
YuviPanda
3ec3dc5195 Support Proxy.extra_routes
When the hub is running in API-only mode, it's
very useful to have the proxy know where to send
URLs that would normally be serviced by the hub.
For example, / might go to a service that renders
a home page, while `/user` might go to a service that
tells the user their server is dead.

Right now, this happens 'out of band', with a process
that has to talk to the proxy directly. This is a
bit messy - the routes need to be re-added when the
proxy restarts, the hub might try to remove them, etc.
By adding support for this in the hub itself, all
this complexity is now removed and the hub continues
to own all the routes in the proxy
2021-04-19 16:14:28 +05:30
Simon Li
73102e7aeb Merge pull request #3429 from minrk/push-auth
typos in onbuild, demo images for push
2021-04-19 09:19:57 +01:00
Min RK
b039e2985b typos in onbuild, demo images for push
it's jupyterhub/jupyterhub-onbuild not jupyterthub-onbuild/jupyterhub
2021-04-19 09:09:49 +02:00
Min RK
6d7863d56a Merge pull request #3428 from Carreau/doc-1
DOC: Conform to numpydoc.
2021-04-19 08:56:42 +02:00
Min RK
aba32e7200 Merge pull request #3425 from manics/docker-arm64
Disable docker jupyterhub-demo arm64 build
2021-04-19 08:33:45 +02:00
Matthias Bussonnier
a71823c5ab DOC: Conform to numpydoc.
Minor syntax update
2021-04-18 21:23:03 -07:00
Nathan Barber
30e4972f34 Remove unused variable from groups.py 2021-04-16 13:16:09 -04:00
Nathan Barber
3c328385a4 Add default limit and max limit config vars 2021-04-16 13:11:57 -04:00
IvanaH8
5a95681853 Add %TODO: flag for generating the table in docs/source/rbac/scopes.md 2021-04-16 17:26:19 +02:00
IvanaH8
a6b9fb160e Resolve merge conflicts 2021-04-16 17:20:22 +02:00
IvanaH8
0638783939 Synchronize docs/rest-api.yml with Available scopes table in docs/source/rbac/scopes.md 2021-04-16 17:11:46 +02:00
IvanaH8
b0f4548753 Add read:users(services):roles scopes to docs/source/rbac/scopes.md 2021-04-16 16:49:15 +02:00
IvanaH8
c6e3e06af9 Add Upgrade section to docs/source/rbac/upgrade.md 2021-04-16 16:31:01 +02:00
0mar
46e2f72fa6 Test server start/stop 2021-04-16 14:54:04 +02:00
0mar
b233859028 Refactored scope_filter 2021-04-16 14:03:31 +02:00
Nathan Barber
100111ed2c Add pagination info to docs 2021-04-15 17:37:57 -04:00
Nathan Barber
ec4afa3e5e Add pagination tests for users/groups/group users 2021-04-15 16:42:33 -04:00
Simon Li
fcf9122519 jupyterhub/action-major-minor-tag-calculator@v1
Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
2021-04-15 20:35:21 +01:00
Nathan Barber
bc518f20ba Add pagination to /hub/api/proxy 2021-04-15 13:04:39 -04:00
Nathan Barber
63b53162f8 Change group.users pagination to use slices 2021-04-15 12:27:13 -04:00
Nathan Barber
7f006726e7 Add pagination for users in group 2021-04-15 12:05:25 -04:00
0mar
cb104ffe42 Fixed tests 2021-04-15 17:30:13 +02:00
Simon Li
6c3fc41176 jupyterhub/action-major-minor-tag-calculator@main 2021-04-15 16:14:51 +01:00
0mar
7544965145 Fixed server model, removed some auth decorators 2021-04-15 16:34:46 +02:00
Min RK
5eef89e5cd Merge pull request #3426 from IvanaH8/rbac-fix-log
[rbac] Fix log message for modifying existing roles
2021-04-15 14:26:06 +02:00
Simon Li
0bdb1bac4d GHW docker: use default tag for PRs
This allows testing with a localhost:5000 registry
2021-04-15 11:11:12 +01:00
Simon Li
35c76221fe Disable linux/arm64 jupyterhub-demo build
Installing notebook requires additional compilation dependencies
2021-04-15 10:21:32 +01:00
Simon Li
ffb092721c GHW docker: push to localhost if not releasing 2021-04-15 10:19:06 +01:00
IvanaH8
0e55064056 Remove duplicate scopes assignment for expand_roles_to_scopes() 2021-04-15 10:48:04 +02:00
IvanaH8
6093f9d444 Fix log message about modifying roles 2021-04-15 10:45:39 +02:00
Min RK
8758b3af27 Merge pull request #3422 from olifre/login-page-customization
login-template: Add a "login_container" block inside the div-container.
2021-04-15 09:31:23 +02:00
Min RK
5202cdff8c Merge pull request #3421 from manics/docker-arm64
Docker arm64 builds
2021-04-15 09:31:04 +02:00
Simon Li
ce0cb95282 docker release: fix build-arg BASE_IMAGE tag 2021-04-14 23:17:16 +01:00
Simon Li
ee421f6427 GHW: Remove unnecessary echo, add docker test timeout 2021-04-14 22:47:17 +01:00
Simon Li
268da21bbf GH workflow docker: 'input device is not a TTY' 2021-04-14 22:44:34 +01:00
Simon Li
4ad5f61bc7 Bump onbuild/README.md example version 2021-04-14 22:28:27 +01:00
Simon Li
3df3850b3a Remove Docker hub automated build hooks 2021-04-14 22:28:07 +01:00
Simon Li
50733efa1b Move circleci docker test to gh workflow 2021-04-14 22:27:28 +01:00
Simon Li
98230ee770 docker release: jupyterhub-onbuild jupyterhub-demo 2021-04-14 22:26:25 +01:00
Simon Li
37f250b4d7 Push some branches, use variable to determine whether to push 2021-04-14 22:26:21 +01:00
Oliver Freyermuth
869661bf25 login-template: Add a "login_container" block inside the div-container.
This allows for more flexible customization of the login page,
since it allows to re-use the login form in an extending template
by reusing the new block.

This was not cleanly possible before since the main container
was part of the very same block as the form code.

fixes #3414
2021-04-14 20:11:04 +02:00
Min RK
92c044eb79 Merge pull request #3380 from minrk/rm-oauth-tokens
Merge OAuth and API tokens
2021-04-14 16:27:14 +02:00
Min RK
75fc1544bc cleanup rbac db upgrade 2021-04-14 13:27:30 +02:00
Min RK
2d02a433fa Merge pull request #3397 from 0mar/roles_interface
Refactor scopes tests
2021-04-14 13:24:03 +02:00
Min RK
c8821b7700 init default oauth client in init_db
ensures jupyterhub client is present,
which is required for creation of tokens, etc.
2021-04-14 13:11:19 +02:00
0mar
834694ca7e Refactored names and suggested fixes 2021-04-13 18:08:51 +02:00
Simon Li
009fa955ed Add Docker multi-arch publish 2021-04-13 15:35:03 +01:00
Simon Li
7c8f7e9fcb Don't pin Dockerfile parent hash 2021-04-13 15:34:14 +01:00
Yuvi Panda
14539c4e0f Merge pull request #3373 from minrk/only-hub-route
allow the hub to not be the default route
2021-04-13 17:12:21 +05:30
Min RK
d85c316928 update db names in init-db.sh for generating upgrade databases
for new upgrade-from versions
2021-04-13 13:23:53 +02:00
Min RK
8f36e26b2d create initial oauth client in db fixture 2021-04-13 13:23:53 +02:00
Min RK
ad9ebdd60f add missing session_id to newly merged API tokens
and remove grant_type which is not a property of the tokens themselves
2021-04-13 13:23:53 +02:00
Min RK
e504fa4bf5 resolve special scopes for self in 'self' handler
instead of `_resolve_scopes` on all requests
2021-04-13 13:23:53 +02:00
Min RK
900c2f1ed3 Drop support for db upgrade from before 1.0
- define jupyterhub oauth client during token app
2021-04-13 13:23:53 +02:00
Min RK
0b56fd9e62 remove separate oauth tokens
- merge oauth token fields into APITokens
- create oauth client 'jupyterhub' which owns current API tokens
- db upgrade is currently to drop both token tables, and force recreation on next start
2021-04-13 13:23:45 +02:00
Min RK
2fdf820fe5 bump dev version to 2.0 2021-04-13 13:21:53 +02:00
Min RK
a11a292cd9 test custom hub routespecs 2021-04-13 13:16:59 +02:00
Min RK
5890064191 duplicate metrics, health handlers on /api/
these should probably have been on `/api/` all along,
but must be on /api/ for api-only hub routing
2021-04-13 13:16:59 +02:00
Min RK
1f30e693ad allow overriding JupyterHub.hub_routespec
Rare, but can make sense for api-only deployments

allows easier override of the default route,
e.g. for mybinder.org custom error pages
2021-04-13 13:16:59 +02:00
Min RK
ebb13ed39f Merge master into rbac 2021-04-13 13:07:30 +02:00
Min RK
32976f3d42 Merge pull request #3403 from kafonek/fastapi-example
Fastapi example
2021-04-13 12:58:43 +02:00
Min RK
30bc23f102 Merge pull request #3418 from jiajunjie/log-exception
Log the exception raised in Spawner.post_stop_hook instead of raising it
2021-04-13 12:56:38 +02:00
Jia Junjie
786c7039d6 Log the exception raised in Spawner.post_stop_hook instead of raising it 2021-04-13 08:01:59 +00:00
Erik Sundell
19c3b02155 Merge pull request #3417 from manics/fix-hard-way-link
Fix link to jupyterhub/jupyterhub-the-hard-way
2021-04-13 07:49:33 +02:00
Simon Li
1a80524772 Fix link to jupyterhub/jupyterhub-the-hard-way 2021-04-12 21:49:59 +01:00
Erik Sundell
699a1cc01b Merge pull request #3415 from minrk/changelog-1.4
Changelog for 1.4
2021-04-12 17:26:33 +02:00
0mar
a7f2247331 Minor fixes 2021-04-12 17:04:26 +02:00
0mar
4577266d95 Refactored scope test suite with proper fixtures and teardowns 2021-04-12 17:04:26 +02:00
0mar
be17ae68ee Upgraded to log warning, resolved comment 2021-04-12 17:04:26 +02:00
Min RK
29ae04c921 Changelog for 1.4 2021-04-12 16:57:26 +02:00
Matt Kafonek
62a1652cc9 Add files via upload 2021-04-11 21:41:45 -04:00
Kafonek, Matt
290e031034 updating gif 2021-04-11 21:40:11 -04:00
Nathan Barber
e72b13be3a Clean up offset/limit conditional 2021-04-09 17:14:13 -04:00
Nathan Barber
2fa331bd36 Paginate listing users and groups 2021-04-09 16:57:32 -04:00
Kafonek, Matt
7642302d17 docs 2021-04-09 15:01:59 +00:00
Kafonek, Matt
aebf833530 Hit /user instead of /authorizations/token/<token> 2021-04-09 15:01:48 +00:00
Kafonek, Matt
86b51804c1 comment update 2021-04-09 15:01:22 +00:00
Kafonek, Matt
aa12afa34d User groups is List[str] not List[Group] 2021-04-09 15:01:03 +00:00
Min RK
6121411aec Merge pull request #3393 from 0mar/additional_scopes
Added `auth_state` and `server_state` and fixed `self`
2021-04-09 15:51:47 +02:00
0mar
07436a0ff0 Added test for access through groups 2021-04-09 15:31:08 +02:00
Yuvi Panda
2ff6d2b36c Merge pull request #3411 from minrk/oauth-token-expiry-config
make oauth token expiry configurable
2021-04-09 18:14:56 +05:30
Min RK
e5f7aa6c2a default oauth token expiry to cookie_max_age_days
so changing cookie age changes oauth token expiry,
since these are what are stored in those cookies anyway,
it makes sense for them to expire at the same time
2021-04-09 14:35:09 +02:00
Min RK
e3811edd87 make oauth token expiry configurable
and default to 1 day instead of 1 hour
2021-04-09 14:06:38 +02:00
0mar
e67647c4c2 Added todo 2021-04-09 13:17:56 +02:00
0mar
95759b25f2 Fixed config role token assignment 2021-04-09 12:06:21 +02:00
Min RK
55cd9d806b Merge pull request #3407 from yuvipanda/upsert-oauth-clients
Don't delete all oauth clients on startup
2021-04-09 09:26:54 +02:00
YuviPanda
96789f5945 Add oauth client to orm only when it's new
- Existing orm_client objects are updated automatically
  in the session.
- Add some logging
- Remove TODO about safety in doing updates without upsert
  in JupyterHub, per @minrk:
  https://github.com/jupyterhub/jupyterhub/pull/3407#discussion_r610390785
2021-04-09 12:50:02 +05:30
Nathan Barber
204c7bf81d Merge pull request #3 from naatebarber/redux-hooks
Redux hooks
2021-04-08 18:40:49 -04:00
Nathan Barber
51deaa36f3 Combine API props, update tests for redux hooks 2021-04-08 18:28:49 -04:00
Nathan Barber
21f4988f24 Convert redux state access to hooks 2021-04-08 17:21:02 -04:00
Nathan Barber
c7dcb4db85 Fix /jsx with prettifier 2021-04-08 15:50:54 -04:00
0mar
70dbe2f049 Merge branch 'additional_scopes' of github.com:0mar/jupyterhub into additional_scopes 2021-04-08 17:39:11 +02:00
0mar
12dc231b1c Fixed code base and tests after merge 2021-04-08 17:36:18 +02:00
0mar
b0b1350ec0 Merge branch 'rbac' into additional_scopes 2021-04-08 16:55:25 +02:00
IvanaH8
c9f8141cb4 Fix rbac-api-request-chart in docs/source/images 2021-04-08 16:48:20 +02:00
IvanaH8
d38a7b9aa7 Change scope for PATCH /users API in rest-api.yml 2021-04-08 16:08:43 +02:00
IvanaH8
649524d357 Add available scopes table in docs/source/rbac/scopes.md 2021-04-08 16:03:17 +02:00
kafonek
81d481a110 pre-commit run -a 2021-04-08 09:28:46 -04:00
0mar
1b999b76f4 Merge branch 'rbac' of github.com:jupyterhub/jupyterhub into rbac 2021-04-08 14:53:54 +02:00
0mar
d38460bfa9 Added tests and removed model flags 2021-04-08 14:52:01 +02:00
YuviPanda
054c7f276e Don't delete all oauth clients on startup
When an oauth client changes, we delete all the tokens
associated with that client. This invalidates all user sessions
for that oauth client, and the oauth client's users will need to
go through the OAuth workflow again after the cache period (specified
by cache_max_age in HubAuth, 5min by default). This is fine in theory,
since oauth client information doesn't change frequently.

However, we were deleting and re-adding all oauth clients each time
the hub started! This was unnecessary, since the data was going to
be the same 99% of the time. Rest of the time, we should just update,
preventing unnecessary churn.

This PR does that.

Ref https://github.com/yuvipanda/jupyterhub-configurator/issues/2
Ref https://github.com/berkeley-dsep-infra/datahub/issues/2284
2021-04-08 17:55:28 +05:30
IvanaH8
f5bbe78dbd Resolve merge conflicts with rbac 2021-04-08 11:32:41 +02:00
Min RK
52885b68ea Merge pull request #3330 from IvanaH8/rbac-group-roles
[rbac] Group roles and scopes checking
2021-04-08 10:03:06 +02:00
IvanaH8
949ec5cc75 Add and update scopes, roles, charts and text in docs/source/rbac docs 2021-04-08 09:39:01 +02:00
Nathan Barber
89a430cc13 Update AdminHandler for React / fix missing auth 2021-04-07 22:51:08 -04:00
Nathan Barber
d267c6cc40 Install yarn with other node dependencies 2021-04-07 22:40:27 -04:00
Nathan Barber
557a2abaec Merge pull request #2 from naatebarber/naatebarber-patch-1
Delete admin-react.js
2021-04-07 22:35:18 -04:00
Nathan Barber
54d0e195bf Delete admin-react.js
Remove hot-testing bundle from repository
2021-04-07 22:34:16 -04:00
Nathan Barber
f06c4c0857 Merge pull request #1 from naatebarber/functional
Functional Components
2021-04-07 22:24:20 -04:00
Nathan Barber
fca5841a1a Add jest testing to github actions 2021-04-07 22:20:29 -04:00
Nathan Barber
cadcb686c9 Lint and make App (Component) functional 2021-04-07 15:36:17 -04:00
Nathan Barber
1d705193cb Remove unused testing libraries from modules 2021-04-07 15:30:27 -04:00
Nathan Barber
4768751125 Reconfigure tests to work with hook approach 2021-04-07 15:25:21 -04:00
Matt Kafonek
1220673e61 Add files via upload 2021-04-07 14:34:10 -04:00
Kafonek, Matt
815274e966 please to be deleted old gif. 2021-04-07 18:33:32 +00:00
Kafonek, Matt
f1503b5a21 trying to get this new gif up
Merge branch 'fastapi-example' of github.com:kafonek/jupyterhub into fastapi-example
2021-04-07 18:31:30 +00:00
Kafonek, Matt
4dcdf84d32 remove old gif 2021-04-07 18:27:40 +00:00
Matt Kafonek
dda0b611e2 Add files via upload 2021-04-07 14:26:09 -04:00
Kafonek, Matt
a23bfd1769 raise warning if PUBLIC_HOST is not set 2021-04-07 18:18:02 +00:00
Kafonek, Matt
a55ccce64e Use Pydantic models 2021-04-07 18:17:25 +00:00
Kafonek, Matt
42c5030b0e Add models, remove cookie auth
get_current_user returns a User model instead of a dict.
using cookies for Hub auth is deprecated, so removed
that option and refactored get_current_user
2021-04-07 18:15:48 +00:00
Kafonek, Matt
be3df52b4f Add Pydantic models for Hub objects and exceptions 2021-04-07 18:15:26 +00:00
Kafonek, Matt
0ca5eb4997 updated docs 2021-04-07 18:15:10 +00:00
Nathan Barber
b230745d64 Fix useState sort method assignment bug 2021-04-07 12:53:27 -04:00
Nathan Barber
405d78a9d4 Fix EditUser submit bug 2021-04-07 12:37:36 -04:00
Nathan Barber
7e132f22e6 Make ServerDashboard functional 2021-04-07 12:27:01 -04:00
Nathan Barber
c3fc549bd6 Make Multiselect functional 2021-04-07 12:15:23 -04:00
Nathan Barber
752d6305fd Remove component import from functional JSX 2021-04-07 12:11:04 -04:00
Nathan Barber
6a1a4de329 Make Groups functional 2021-04-07 12:06:38 -04:00
Nathan Barber
816eeeb2fc Make GroupEdit functional 2021-04-07 12:04:11 -04:00
Nathan Barber
0f5e86ff06 Make functional AddUser/CreateGroup/EditUser 2021-04-07 11:56:45 -04:00
IvanaH8
a512867a1e Update scopes in docs/rest-api.yml 2021-04-07 14:10:38 +02:00
Yuvi Panda
9eeb84158e Merge pull request #3401 from maxshowarth/master
Added Azure AD as a supported authenticator.
2021-04-07 17:37:32 +05:30
0mar
2f34557689 Resolve comments 2021-04-07 10:37:49 +02:00
Kafonek, Matt
37c2be778c pre-commit formatting 2021-04-07 02:14:54 +00:00
Kafonek, Matt
dc1b2c810d review 2021-04-07 02:13:12 +00:00
Kafonek, Matt
88c7f188e0 Merge branch 'fastapi-example' of github.com:kafonek/jupyterhub into fastapi-example 2021-04-07 02:06:45 +00:00
Kafonek, Matt
4181cc7065 add gif 2021-04-07 02:05:07 +00:00
Matt Kafonek
69e3fc2016 demo.gif 2021-04-06 22:00:42 -04:00
Kafonek, Matt
56269f0226 fastapi service example 2021-04-07 01:55:43 +00:00
Nathan Barber
dc4bbc01bb Fix ServerDashboard layout (container / noborder) 2021-04-06 14:38:36 -04:00
Nathan Barber
0141dc8fb0 Add create group / delete group functionality 2021-04-06 14:22:18 -04:00
Max
e446eff311 Added Azure AD as a supported authenticator. 2021-04-06 09:48:37 -07:00
Max
00042de04c remove 2021-04-06 09:41:29 -07:00
Max
82e0af763d Added AzureAD to list of supported authenticators. 2021-04-06 09:40:07 -07:00
IvanaH8
933e4d555b Add TO DO flag for users:activity scope in server role 2021-04-06 10:39:50 +02:00
Nathan Barber
30198306a8 Fix comma/semicolon typo in jsx root.css 2021-04-05 19:36:22 -04:00
Nathan Barber
5ebf652f47 Update readme, update license 2021-04-05 19:33:06 -04:00
Nathan Barber
11cb9523e8 Add React Admin and modify AdminHandler 2021-04-05 16:51:22 -04:00
0mar
5017ccc977 Merge branch 'roles_interface' into additional_scopes 2021-04-02 12:01:39 +02:00
0mar
71a5842ad2 Removed user model flags, scope-guarded server model with new scopes 2021-04-01 17:26:34 +02:00
Tim Head
c5bfd28005 Merge pull request #3394 from yuvipanda/secreter-secret 2021-03-31 13:47:07 +02:00
YuviPanda
0ffa5715fd Fix formatting to make pre-commit happy 2021-03-30 12:59:52 +05:30
0mar
db66443793 No more reinitialization of roles on each startup 2021-03-30 08:50:20 +02:00
0mar
1515747b1e Refactored role methods 2021-03-29 21:26:34 +02:00
Yuvi Panda
139312149e Merge pull request #3392 from minrk/deprecated-tablenames 2021-03-29 17:09:23 +05:30
Yuvi Panda
29740b0af6 Merge branch 'master' into secreter-secret 2021-03-29 17:08:17 +05:30
YuviPanda
9f6467be05 Use 'secrets' module to generate secrets
Python 3.6+ has this
2021-03-29 17:07:03 +05:30
0mar
036a4eb934 Revert to using user roles for services 2021-03-28 18:54:31 +02:00
0mar
c5c44f6dbe Replaced auth_state and server_state with scopes 2021-03-26 13:47:01 +01:00
Min RK
caae99aa09 avoid deprecated engine.table_names
deprecated in sqlalchemy 1.4

use recommended inspect(engine).get_table_names() instead
2021-03-26 12:54:40 +01:00
0mar
b74075d945 Fixed self scope for services with tests 2021-03-26 10:51:17 +01:00
0mar
37588fb780 Merge branch 'rbac' of github.com:jupyterhub/jupyterhub into additional_scopes 2021-03-24 19:23:12 +01:00
0mar
c9ca066060 prepull commit 2021-03-24 19:22:33 +01:00
IvanaH8
36b18c1571 Merge branch 'rbac' into rbac-group-roles to fix CircleCI test 2021-03-24 14:30:40 +01:00
IvanaH8
bdc4bd4763 Resolve merge conflicts with Vertical Filtering and improve tests 2021-03-24 13:39:59 +01:00
Min RK
9b81780a21 Merge master into rbac 2021-03-23 14:41:00 +01:00
Min RK
1ab6cbe824 Merge pull request #3388 from minrk/rbac-token-auth
[rbac] ensure /authorizations/token can read the owner model of the token itself
2021-03-23 14:39:54 +01:00
Min RK
97e1a5cb26 add scopes.identify_scopes helper 2021-03-23 13:56:46 +01:00
Min RK
58a80e5050 ensure MockAPIHandler has request.path defined 2021-03-23 13:27:00 +01:00
IvanaH8
e26e8f9c36 Prevent deleting default roles 2021-03-23 11:47:50 +01:00
Min RK
8f2b14429f Merge pull request #3386 from minrk/bump-alpine
alpine dockerfile: avoid compilation by getting some deps from apk
2021-03-23 09:28:48 +01:00
Min RK
5947a718f0 Merge pull request #3389 from IvanaH8/rbac-service-role
[rbac] Add temporary default service role (no scopes)
2021-03-22 20:00:50 +01:00
IvanaH8
64089b40bc Add temporary default service role (no scopes) 2021-03-22 17:14:05 +01:00
Min RK
665e5c7427 ensure /authorizations/token can read the owner model of the token itself 2021-03-22 16:32:14 +01:00
Min RK
43a6767276 run pre-commit after merge 2021-03-22 15:57:52 +01:00
Min RK
b552e364f3 Merge master into rbac 2021-03-22 12:29:48 +01:00
Min RK
af0d81436d alpine dockerfile: avoid compilation by getting some deps from apk
cryptography is the big one, which needs rust and is a huge pain
2021-03-22 12:17:47 +01:00
Min RK
410668d97c Merge pull request #3363 from 0mar/vertical_filtering
RBAC: Vertical filtering
2021-03-19 17:18:12 +01:00
Min RK
477ee23ad3 Merge pull request #3383 from IvanaH8/fix-sqlalchemy-interfaces-deprecation 2021-03-18 14:25:01 +01:00
IvanaH8
27bcac5e8b Fix sqlachemy.interfaces.PoolListener deprecation for testing older JupyterHub versions 2021-03-18 14:13:10 +01:00
IvanaH8
8064cda47a Update RBAC docs implementing review suggestions 2021-03-17 17:13:09 +01:00
0mar
6f6561122b Implemented revision and test suite bug 2021-03-17 16:01:22 +01:00
0mar
f3fc0e96de Fixed OAuth token behavior, invalid user handling and name clashes 2021-03-16 19:10:57 +01:00
IvanaH8
7d5fc27f7c Make some funcs in roles.py private 2021-03-16 11:03:18 +01:00
0mar
5997245cad Added tests to verify token scope behavior 2021-03-14 17:50:36 +01:00
IvanaH8
b6221f6cb1 Fix tests 2021-03-12 17:40:38 +01:00
IvanaH8
064e8f4000 Resolve merge conflicts 2021-03-12 16:45:13 +01:00
IvanaH8
bdc7b3ab8d Account for horizontal filtering in get_subscopes() 2021-03-12 16:09:23 +01:00
0mar
c5ebee0ca0 Fixed scope related tests 2021-03-12 09:40:36 +01:00
0mar
7496fda089 Implemented default token roles, self scope for users and tokens for mockservices 2021-03-11 19:33:05 +01:00
Min RK
e75dd1b79c Stop specifying --ip and --port on the command-line
JUPYTERHUB_SERVICE_URL env is already enough and has been around for some time

Specifying CLI args can cause some issues for custom entrypoints
2021-03-11 15:49:35 +01:00
IvanaH8
01f3286620 Add check that scopes exists when adding new/modifying existing role 2021-03-11 15:30:11 +01:00
IvanaH8
39fc501d50 Add warnings and errors when creating new roles 2021-03-10 10:32:50 +01:00
0mar
bf333d8e35 Changed metascope all meaning 2021-03-09 15:48:24 +01:00
Erik Sundell
6535cc6bab Merge pull request #3377 from minrk/count-redirects-differently
always start redirect count at 1 when redirecting /hub/user/:name -> /user/:name
2021-03-09 14:04:16 +01:00
0mar
9832a87ac4 Fixed some tests and unified scope read:user:name 2021-03-09 10:29:52 +01:00
Min RK
8173bbbf75 always start redirect count at 1 when redirecting /hub/user/:name -> /user/:name
/hub/user/:name is now only reasonably visited as a result of redirect from /user/:name
2021-03-09 09:57:04 +01:00
Min RK
2146eef150 Merge pull request #3375 from manics/remove-hard-way
Remove the hard way guide
2021-03-08 13:28:34 +01:00
0mar
9d19ffe457 Reimplemented scope logic to account for tokens 2021-03-07 15:29:50 +01:00
Simon Li
97b7ccbee4 Mark installation-guide-hard orphan 2021-03-05 19:13:55 +00:00
Simon Li
8eb98409d5 Remove installation-guide-hard 2021-03-05 19:08:26 +00:00
Min RK
a4390a1f4f Merge pull request #3370 from minrk/raise-failed-tokens
Always raise on failed token creation
2021-03-05 11:02:03 +01:00
0mar
0eb275e863 Removed regex. Fixed small bugs, changed status of scope module functions 2021-03-04 13:20:15 +01:00
Min RK
f42f7dd01f raise on failed token creation
the logic was there but at the wrong indentation level
causing it to only raise sometimes
2021-03-02 14:32:33 +01:00
0mar
9c6c688810 Moved scope parsing to scopes module, implemented filter caching and filters now take orm objects 2021-02-26 15:47:40 +01:00
Min RK
0ca2ef68f0 Merge pull request #3326 from dtaniwaki/docker-host
Allow to set spawner-specific hub connect URL
2021-02-26 12:57:22 +01:00
0mar
970e3a57fa Cleanup commit 2021-02-25 07:57:07 +01:00
0mar
8d1ec9f301 Merge branch 'vertical_filtering' of github.com:0mar/jupyterhub into vertical_filtering 2021-02-25 07:32:46 +01:00
0mar
1c789fcbb5 Removed database calls and made scope filter a callable 2021-02-25 07:30:41 +01:00
Ivana
5a15fba8b7 Applied text improvement suggestions from code review by @manics
Co-authored-by: Simon Li <orpheus+devel@gmail.com>
2021-02-23 15:05:41 +01:00
IvanaH8
c03ca796ab removed recommonmark from docs/source/conf.py 2021-02-19 14:07:25 +01:00
IvanaH8
bc1e370d7d updated tech implementation section 2021-02-19 12:37:20 +01:00
0mar
6123f34b80 Replaced implicit member call with dict 2021-02-19 09:49:09 +01:00
0mar
e198770c76 Merge branch 'vertical_filtering' of github.com:0mar/jupyterhub into vertical_filtering 2021-02-18 17:24:15 +01:00
0mar
f6c98f6aaf Caching database calls 2021-02-18 17:22:12 +01:00
IvanaH8
10c82d6272 resolved conflicts with rbac branch 2021-02-17 16:31:46 +01:00
IvanaH8
45a0945a6b updated requirements.txt 2021-02-17 15:46:10 +01:00
Min RK
c3ca924ba8 Merge pull request #3362 from consideRatio/pr/pre-commit-maintenance
Update pre-commit hooks versions
2021-02-17 13:11:40 +00:00
0mar
364baee355 Resolved todos and added docs 2021-02-15 16:49:31 +01:00
0mar
2ebd74e5d2 Test vertical and cross-filtering 2021-02-15 16:39:11 +01:00
IvanaH8
7d1b6a2021 split the docs in docs/source/rbac folder 2021-02-15 16:19:13 +01:00
0mar
6a3274e33c Fixed get_self OAuth test 2021-02-15 15:23:18 +01:00
0mar
746be73e56 Fixed vertical filtering in user models, but does not work for OAuth yet 2021-02-15 14:03:37 +01:00
Erik Sundell
0155e6dc34 Run pre-commit requirements-txt-fixer 2021-02-12 19:24:22 +01:00
Erik Sundell
727f9a0d49 Update pre-commit hook versions 2021-02-12 19:23:46 +01:00
Erik Sundell
d31af27888 Merge pull request #3360 from minrk/prettier
add (and run) prettier pre-commit hook
2021-02-12 19:21:29 +01:00
Min RK
9331dd13da run pre-commit (prettier) 2021-02-12 15:25:58 +01:00
Min RK
3c7203741f add prettier pre-commit hook
will autoformat md, js, yaml, etc.
2021-02-12 15:22:26 +01:00
IvanaH8
be34146d29 back-up with commenting out only 2021-02-12 09:55:21 +01:00
Erik Sundell
4e79360567 Merge pull request #3359 from minrk/move-custom-html
move get_custom_html to base Authenticator class
2021-02-11 22:41:17 +01:00
Min RK
529273d105 move get_custom_html to base Authenticator class
so it's always available

it was accidentally added to PAM instead of the base
2021-02-11 21:42:02 +01:00
0mar
de2e8ff355 Implemented vertical filtering in user method 2021-02-11 14:08:26 +01:00
0mar
d9e8c7fe48 Moved parsing, started implementation of vertical filtering 2021-02-08 18:51:17 +01:00
Min RK
2e198396c1 Merge pull request #3347 from minrk/mixin-get-user
make_singleuser_app: patch-in HubAuthenticatedHandler at lower priority
2021-02-04 13:41:39 +00:00
Daisuke Taniwaki
259c7512b8 Fix a lint issue 2021-02-02 00:30:59 +09:00
Daisuke Taniwaki
59b29f4c42 Refactor the code 2021-02-02 00:27:34 +09:00
Daisuke Taniwaki
bf3615aa96 Fix path 2021-02-02 00:11:43 +09:00
Daisuke Taniwaki
06a505f6df Fix comment 2021-02-02 00:09:25 +09:00
Daisuke Taniwaki
c8d6c6aaa8 Fix spawner hub connect URL 2021-02-02 00:04:42 +09:00
Daisuke Taniwaki
cc2859a826 Merge remote-tracking branch 'upstream/master' into docker-host 2021-02-01 22:35:46 +09:00
Daisuke Taniwaki
26ccf6fd57 Fix hub_connect_url 2021-02-01 22:29:43 +09:00
Min RK
f220bbca84 Merge pull request #3315 from dtaniwaki/improve-handler
Make Authenticator Custom HTML Flexible
2021-02-01 11:42:27 +00:00
Min RK
4fb3f02870 Merge pull request #3349 from minrk/pr-artifacts
publish release outputs as artifacts
2021-02-01 11:20:03 +00:00
Min RK
471d1f0a2f simplify and clarify override of methods that could be defined on BaseHandler 2021-02-01 11:40:11 +01:00
Min RK
1b12107c54 specify that mock.patch is temporary
Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
2021-02-01 07:05:24 +00:00
Min RK
b3a4adcbdd add link to action
Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
2021-02-01 07:03:31 +00:00
Min RK
12c69c6a94 publish release outputs as artifacts
makes testing a PR even easier since we build an sdist and wheel for every PR and push

since artifacts are double-archived, it's not quite as simple as giving a URL to install from,
but this at least makes it available. To use:

- download and unpack zip
- `pip install path/to/whl`
2021-01-29 14:32:18 +01:00
Min RK
d3147f3fb7 make_singleuser_app: patch-in HubAuthenticatedHandler at lower priority
apply patch directly to BaseHandler instead of each handler instance
so that overrides can still take effect (i.e. APIHandler raising 403 instead of redirecting)
2021-01-29 14:07:05 +01:00
Daisuke Taniwaki
47265786e3 Add versionadded 2021-01-27 20:49:47 +09:00
Min RK
1d9795c577 Merge pull request #3345 from stv0g/service-template
Allow customization of service menu via templates
2021-01-27 11:39:55 +00:00
Min RK
4dac580d3d Merge master into rbac 2021-01-27 12:39:02 +01:00
Min RK
490a6503cc Merge pull request #3323 from 0mar/merge_api_with_orm
Reconciliating API with scopes from database
2021-01-27 11:38:53 +00:00
Steffen Vogel
e35b84b419 convert tabs to whitespaces 2021-01-26 17:42:35 +01:00
Steffen Vogel
5a57b03b61 allow customization of service menu via templates 2021-01-26 17:39:48 +01:00
0mar
b160a0e344 Consistent messages regardless of whether resources exist or not 2021-01-26 16:08:23 +01:00
Min RK
e526f36b81 Merge pull request #3344 from minrk/no-auth-header-create
[TST] Do not implicitly create users in auth_header
2021-01-26 13:42:32 +00:00
0mar
590bd1a849 Fixed tests 2021-01-26 14:20:39 +01:00
Min RK
d289cd1e02 Merge pull request #3343 from consideRatio/pr/cookie-secret-as-hex
Allow cookie_secret to be set to a hexadecimal string
2021-01-26 12:11:10 +00:00
Erik Sundell
4c3a32b51f Apply suggestions from code review
Co-authored-by: Min RK <benjaminrk@gmail.com>
2021-01-26 12:44:17 +01:00
Min RK
6c65624942 [TST] Do not implicitly create users in auth_header
implicit user creation results in surprising behavior when the user shouldn't exist
2021-01-26 11:54:47 +01:00
0mar
89d7cdc882 Merge branch 'merge_api_with_orm' of github.com:0mar/jupyterhub into merge_api_with_orm 2021-01-26 09:25:06 +01:00
Erik Sundell
cba22751b4 Test setting cookie_secret to a hexadecimal string 2021-01-25 22:29:48 +01:00
Erik Sundell
c5d0265984 Allow cookie_secret to be a hexadecimal string
With this, we coerce hexadecimal strings into Bytes. This can be helpful
as YAML/JSON cannot represent raw bytes.
2021-01-25 22:28:50 +01:00
0mar
d0369197d4 Fixed a bug, added some docs, but running into DB/API issues 2021-01-25 21:36:52 +01:00
Daisuke Taniwaki
fc772e1c39 Fix a lint issue 2021-01-25 23:33:17 +09:00
Daisuke Taniwaki
d70157e72a Fix the spawner test 2021-01-25 23:30:11 +09:00
Min RK
91359bcaa7 Merge pull request #3337 from nsshah1288/feature/shahn3_pvcDeletion
Add Spawner.delete_forever
2021-01-25 13:59:54 +00:00
Min RK
22fc580275 Merge pull request #3341 from dtaniwaki/clear-cookie
Clear tornado xsrf cookie on logout
2021-01-25 13:58:36 +00:00
Daisuke Taniwaki
2f304bffcc Clear tornado cookie on logout 2021-01-24 20:21:17 +09:00
SHAHN3
162076c5dd added docstring 2021-01-23 15:58:32 -05:00
SHAHN3
9bd97db90b added try except, also changed to await and async 2021-01-21 16:21:18 -05:00
Daisuke Taniwaki
3a25b32ce6 Update Spawner.hub_connect_url help message 2021-01-21 10:32:37 +09:00
SHAHN3
8fcc4b48a5 removed await 2021-01-20 14:44:03 -05:00
SHAHN3
289dee5996 new method delete_forever 2021-01-20 14:34:32 -05:00
Min RK
b1b7954e93 Merge pull request #3338 from minrk/log-slow-responses
always log slow requests at least at info-level
2021-01-20 09:18:41 +00:00
Erik Sundell
35a55c6cbf Merge pull request #3339 from minrk/alembic-min
specify minimum alembic 1.4
2021-01-20 09:50:24 +01:00
Min RK
cd06f3fb12 specify minimum alembic
this gets us *older* alembic in the old-dependencies test

since alembic 1.5 doesn't support sqlalchemy 1.1
2021-01-20 09:34:42 +01:00
Min RK
796d22d0d8 Merge pull request #3335 from rcthomas/pagination-named-servers
Fix pagination with named servers
2021-01-20 08:29:44 +00:00
Min RK
be4357ad7a Merge pull request #3332 from jiajunjie/fix-help
Fix the help related to the proxy check
2021-01-20 08:27:25 +00:00
Min RK
202d6f93d4 always log slow requests at least at info-level
if health or static responses are taking longer than 1s, it's useful to know
2021-01-20 09:23:26 +01:00
SHAHN3
8b9b69ce22 trying to mock 2021-01-19 17:40:59 -05:00
SHAHN3
c40b3a4ad6 reformatted code 2021-01-19 16:32:59 -05:00
SHAHN3
c7f1b89f6c delete user's PVC when delete user is called 2021-01-19 16:08:33 -05:00
Rollin Thomas
dcff08ae13 Add back outerjoin that made spawner sorts work 2021-01-16 09:15:34 -08:00
Rollin Thomas
b0bf348908 Need to format as subquery 2021-01-15 22:53:12 -08:00
Rollin Thomas
b73eca91ca Fix pagination with named servers 2021-01-15 11:19:57 -08:00
IvanaH8
f90b4e13df added token role check during loading config file and logs for role creation/changes/assignements 2021-01-15 15:32:58 +01:00
Jia Junjie
3db5eae9a9 Run pre-commit 2021-01-14 20:52:59 +08:00
Min RK
adb5f6ab2a Merge pull request #3333 from trallard/trallard-patch-1
📝 Fix telemetry section
2021-01-14 12:01:24 +01:00
0mar
3f47860d17 Fixed test error 2021-01-14 10:25:17 +01:00
Min RK
2a84353a51 Merge pull request #3329 from Zsailer/docs-jupyter_server
Mention Jupyter Server as optional single-user backend in documentation
2021-01-13 15:04:48 +01:00
Jia Junjie
ca4fb3187f Fix the help related to the proxy check 2021-01-13 21:59:38 +08:00
Tania Allard
8ab25e7c3d 📝 Fix telemetry section 2021-01-13 11:43:05 +00:00
Zsailer
f69ef9f846 add docs describing jupyter_server 2021-01-12 09:11:23 -08:00
0mar
e9ad8ca8ac Stacking scope decorators works 2021-01-11 20:51:04 +01:00
0mar
7e30e1998c Fixed test 2021-01-11 20:39:22 +01:00
IvanaH8
a2378fe718 resolved merge conflicts 2021-01-11 12:57:11 +01:00
IvanaH8
1a513f8dd9 added roles to groups 2021-01-11 12:08:50 +01:00
Daisuke Taniwaki
ba2608c643 Allow to set spawner-specific hub connect URL 2021-01-08 23:39:05 +09:00
Erik Sundell
c3f5ad8b6d Merge pull request #3325 from andrewisplinghoff/master
Fix mixup in comment regarding the sync parameter
2021-01-08 11:46:37 +01:00
Andre Wisplinghoff
4dbe5490f8 Fix mixup in comment regarding the sync parameter 2021-01-08 11:39:09 +01:00
Erik Sundell
711080616e Merge pull request #3324 from consideRatio/pr/manually-trigger-tests-and-readme-badge
ci: github actions, allow for manual test runs and fix badge in readme
2021-01-08 01:28:27 +01:00
Erik Sundell
8e603e5212 docs: update README.md badge for github actions 2021-01-08 01:16:29 +01:00
Erik Sundell
147167e589 ci: allow tests to be run manually through github UI 2021-01-08 01:16:06 +01:00
Omar Richardson
82c837eb89 Refactored orm.get_class, improved resource filtereing 2021-01-05 19:58:39 +01:00
Omar Richardson
e21713c24f Improved group expansion by reducing SQL queries 2021-01-05 12:57:26 +01:00
Omar Richardson
662017f260 Refactored scope module. Implemented filter in *ListApiHandlers 2021-01-05 11:42:53 +01:00
Omar Richardson
82bebfaff2 Added unit tests and fixed bugs in scope filter 2021-01-04 22:44:23 +01:00
0mar
f4ba57b1d7 Implemented filter list skeleton 2021-01-04 16:24:50 +01:00
Erik Sundell
cebb1f3e22 Merge pull request #3314 from timgates42/bugfix_typo_function
docs: fix simple typo, funciton -> function
2020-12-23 10:24:50 +01:00
Daisuke Taniwaki
0b085a91b6 Fix format issues 2020-12-23 13:50:27 +09:00
Daisuke Taniwaki
ca3ceac4f3 Add comment 2020-12-23 13:42:51 +09:00
Daisuke Taniwaki
c833fae901 Allow to use base URL in custom HTML 2020-12-23 13:39:59 +09:00
Daisuke Taniwaki
8d3a7b704c Render custom html 2020-12-23 13:03:27 +09:00
Tim Gates
1e53fd1f8c docs: fix simple typo, funciton -> function
There is a small typo in jupyterhub/orm.py.

Should read `function` rather than `funciton`.
2020-12-23 11:54:51 +11:00
IvanaH8
5e8864f29d fixed default roles for mocked services 2020-12-18 15:04:14 +01:00
0mar
6ad757f7e7 Merge remote-tracking branch 'upstream/rbac' into merge_api_with_orm 2020-12-17 09:22:44 +01:00
Min RK
8c5cd005fa Merge pull request #3308 from IvanaH8/rbac-service-roles-fix
fixed default roles for mocked services
2020-12-17 08:44:23 +01:00
0mar
f10fc0f0c0 No more need for mock roles 2020-12-16 14:46:08 +01:00
IvanaH8
8a7320b318 fixed default roles for mocked services 2020-12-16 11:17:43 +01:00
0mar
3eccf7abdd Changed scopes from list to set and made filters additive 2020-12-14 17:39:06 +01:00
Erik Sundell
166b00867f Merge pull request #3305 from minrk/github-release
publish releases from github actions
2020-12-11 16:39:42 +01:00
Min RK
7c474396f1 publish releases from github actions 2020-12-11 12:27:34 +01:00
Min RK
f6f6b3afa3 back to dev 2020-12-11 12:08:22 +01:00
Min RK
a91197635a release 1.3.0 2020-12-11 12:07:55 +01:00
Min RK
88706d4c27 final changelog edits for 1.3.0 2020-12-11 12:07:06 +01:00
Min RK
29fac11bfe Merge pull request #3295 from minrk/changelog-1.3
begin changelog for 1.3
2020-12-11 12:02:15 +01:00
Erik Sundell
947ef67184 Merge pull request #3303 from Sangarshanan/patch-1
Remove the extra parenthesis in service.md
2020-12-11 09:39:28 +01:00
sangarshanan
8ede924956 Remove extra paranthesis 2020-12-11 13:15:13 +05:30
sangarshanan
55c2d3648e Add the missing parenthesis in service.md 2020-12-11 01:53:35 +05:30
0mar
62c56ec2c8 Started work on fixing tests 2020-12-09 17:34:49 +01:00
0mar
16657e0c88 Integrated scopes with roles 2020-12-09 17:34:33 +01:00
0mar
e47d96e016 Merge remote-tracking branch 'upstream/rbac' into merge_api_with_orm 2020-12-09 15:24:48 +01:00
Min RK
4cc2f0a363 Merge pull request #3215 from IvanaH8/implementing-default-roles
[RBAC] Implementing roles as collections of permission scopes
2020-12-09 15:02:01 +01:00
IvanaH8
9de9070641 fixed scope test attr error for older_requirements.txt test 2020-12-09 14:50:50 +01:00
Min RK
2cf8e48fb5 start changelog for 1.3
I noticed that our jinja async feature is new in 2.9, and matured in 2.11, so explicitly require that
2020-12-09 14:31:10 +01:00
Min RK
ae77038a64 Merge pull request #3293 from minrk/services-whoami
allow services to call /api/user to identify themselves
2020-12-09 13:25:46 +01:00
0mar
4ab2e3aa0a Fixed merge request after cherrypick 2020-12-09 12:25:33 +01:00
Min RK
ffed8f67a0 Merge pull request #3294 from minrk/paginate-per-page
fix increasing pagination limits
2020-12-08 10:03:51 +01:00
Ivana
f9a3eec147 Merge branch 'rbac' into implementing-default-roles 2020-12-08 08:41:04 +01:00
IvanaH8
c514259f1a addressed review comments from Omar 2020-12-08 08:28:23 +01:00
Erik Sundell
1efd7da6ee Merge pull request #3300 from mxjeff/fixed-doc-services
Fixed idle-culler references.
2020-12-04 11:46:04 +01:00
Geoffroy Youri Berret
6e161d0140 Fixed idle-culler references.
Merge request #3257 fixed #3256 only on getting-started/services-basics.md
There is still a reference to jupyterhub example cull-idle in reference/services.md
2020-12-04 09:28:02 +01:00
IvanaH8
ab297a7747 added scope expansion unit testing 2020-12-03 14:53:53 +01:00
Min RK
5f4144cc98 Merge pull request #3298 from coffeebenzene/master
Fix asyncio deprecation asyncio.Task.all_tasks
2020-12-03 11:16:46 +01:00
coffeebenzene
f866bbcf45 Use variable instead of monkey patching asyncio 2020-12-02 19:50:49 +00:00
coffeebenzene
ed6231d3aa Fix asyncio deprecation asyncio.Task.all_tasks 2020-12-02 17:57:28 +00:00
Min RK
9d38259ad7 fix increasing pagination limits
setting per_page in constructor resolves before max_per_page limit is updated from config,
preventing max_per_page from being increased beyond the default limit

we already loaded these values anyway in the first instance,
so remove the redundant Pagination object
2020-12-02 12:52:42 +01:00
Min RK
4b254fe5ed Merge pull request #3243 from agp8x/master
[Metrics] Add prefix to prometheus metrics to group all jupyterhub metrics
2020-12-02 12:22:32 +01:00
Min RK
f8040209b0 allow services to call /api/user to identify themselves 2020-12-02 12:21:25 +01:00
Min RK
e59ee33a6e note versionchanged in metrics module docstring 2020-12-02 11:36:13 +01:00
Min RK
ff15ced3ce Merge pull request #3225 from cbanek/configurable_options_from_form
Allow options_from_form to be configurable
2020-12-02 11:32:24 +01:00
Min RK
75acd6a67b Merge pull request #3264 from tlvu/add-user-agreement-to-login-screen
Add optional user agreement to login screen
2020-12-02 11:31:23 +01:00
Min RK
73ac6207af Merge pull request #3244 from mhwasil/fix-https-redirect-issues
[Docs] Fix https reverse proxy redirect issues
2020-12-02 11:30:09 +01:00
Min RK
6fc3dc4c01 Merge master into rbac 2020-12-02 11:28:53 +01:00
Min RK
e435fe66a5 Merge pull request #3292 from minrk/oldest-metrics
bump oldest-required prometheus-client
2020-12-02 11:27:27 +01:00
Min RK
5540859460 Merge pull request #3212 from 0mar/implement_scopes
Implementing RBAC scope checking in API handlers
2020-12-02 11:23:24 +01:00
Min RK
d7569d6f8e bump oldest-required prometheus-client
oldest-dependency tests caught an error with our base required version
2020-12-02 11:20:30 +01:00
Min RK
ba6c2cf854 Merge pull request #3266 from 0mar/reduce_ssl_testing
Test internal_ssl separately
2020-12-02 10:59:39 +01:00
0mar
970b25d017 Added docstrings 2020-12-01 10:49:10 +01:00
0mar
671ef0d5ef Moved ssl options to proxy 2020-12-01 10:30:44 +01:00
IvanaH8
de04ae1471 verifying api requested token roles permissions against the token owner permissions 2020-12-01 08:44:29 +01:00
Omar Richardson
73020a70f2 Mocked request.path 2020-11-30 23:16:00 +01:00
Erik Sundell
77220d6662 Merge pull request #3289 from minrk/user-count
fix and test TOTAL_USERS count
2020-11-30 15:21:48 +01:00
Min RK
7e469f911d fix and test TOTAL_USERS count
Don't assume UserDict contains all users

which assumption led to double-counting when a user in the db was loaded into the dict cache
2020-11-30 13:27:52 +01:00
Erik Sundell
18393ec6b4 Merge pull request #3287 from minrk/bump-black
bump black pre-commit hook to 20.8
2020-11-30 10:26:55 +01:00
Min RK
28fdbeb0c0 update back pre-commit hook
specify minimum target_version as py36

results in some churn
2020-11-30 10:13:10 +01:00
Tim Head
5664e4d318 Merge pull request #3286 from Sangarshanan/patch-1
Fix curl in jupyter announcements
2020-11-30 07:47:27 +01:00
sangarshanan
24c83e721f Fix curl in jupyter announcements
Running the Curl as is return a 500 with ```json.decoder.JSONDecodeError: Expecting property name enclosed in double quotes: line 1 column 2 (char 1)
```  Converting the payload to a proper Json
2020-11-28 17:50:44 +05:30
0mar
cc73ab711e Disabled ssl testing 2020-11-27 17:50:47 +01:00
0mar
2cfe4474ac Submitting reason for skiptest 2020-11-27 17:26:44 +01:00
0mar
74766e4786 Resolving merge conflichts 2020-11-27 17:18:40 +01:00
0mar
ed461ff4a7 Merge branch 'tmp' into reduce_ssl_testing
# Conflicts:
#	jupyterhub/tests/test_proxy.py
2020-11-27 17:05:26 +01:00
0mar
184d87ff2a Skip SSL-free tests if not on SSL matrix 2020-11-27 17:00:09 +01:00
Min RK
06ed7dc0cf Merge pull request #3284 from minrk/12-cl
Changelog for 1.2.2
2020-11-27 14:41:08 +01:00
Min RK
a0b229431c Update docs/source/changelog.md
Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
2020-11-27 14:40:59 +01:00
0mar
2a06c8a94c WIP: Attempt to access SSL parameters, failing due to self-signed certificate error 2020-11-27 13:26:32 +01:00
Min RK
91159d08d3 Changelog for 1.2.2 2020-11-27 10:09:54 +01:00
Erik Sundell
06a83f146b Merge pull request #3281 from olifre/patch-1
CONTRIBUTING: Fix contributor guide URL
2020-11-27 09:53:41 +01:00
Oliver Freyermuth
7b66d1656b CONTRIBUTING: Fix contributor guide URL
The link has been changed.
2020-11-27 09:39:29 +01:00
0mar
40176a667f Attempt to patch proxy, unsuccessful 2020-11-26 12:22:43 +01:00
Omar Richardson
e02345a4e8 WIP: Moved ssl options to new method 2020-11-26 09:24:44 +01:00
Long Vu
1408e9f5f4 Merge remote-tracking branch 'origin/master' into add-user-agreement-to-login-screen 2020-11-25 10:31:38 -05:00
Long Vu
b66d204d69 login page: no javascript needed for the optional accept terms and conditions feature
Bonus user gets a pop-up notification to check the checkbox.

Tested on Mozilla Firefox
(https://user-images.githubusercontent.com/11966697/100246404-18115e00-2f07-11eb-9061-d35434ace3aa.gif)
and Google Chrome.

Feedback from @minrk.
2020-11-25 10:30:22 -05:00
Omar Richardson
f6d635997c Changed logging call 2020-11-24 10:03:16 +01:00
Omar Richardson
d7d27ad97a Fixed scopes and added more specific logs/errors 2020-11-23 13:26:36 +01:00
Omar Richardson
164447717f Fix formulation 2020-11-20 15:30:23 +01:00
Omar Richardson
0472ef0533 Central internal_ssl switch 2020-11-20 15:27:50 +01:00
Erik Sundell
202efae6d8 Merge pull request #3177 from minrk/user-state-filter
add ?state= filter for GET /users
2020-11-20 11:06:15 +01:00
Min RK
2e043241fb Merge pull request #3261 from minrk/next-append-query
Only preserve params when ?next= is unspecified
2020-11-20 09:47:20 +01:00
Min RK
fa61f06fed Merge pull request #3237 from alexweav/cleanup-leftover-proxy
[proxy.py] Improve robustness when detecting and closing existing proxy processes
2020-11-20 09:45:53 +01:00
Min RK
8b19413fa1 Merge pull request #3242 from consideRatio/pr/py36-async-await
Assume py36 and remove @gen.coroutine etc.
2020-11-20 09:31:43 +01:00
Min RK
7c2e7692b0 Merge pull request #3265 from ideonate/master
Fix RootHandler when default_url is a callable
2020-11-20 09:14:46 +01:00
Min RK
31a99b5b2c Merge pull request #3169 from IvanaH8/yaml-adding-scopes
First step for implementing oauth scopes - update to rest-api.yml
2020-11-20 08:59:48 +01:00
Omar Richardson
d5e7a42135 More scope unit tests 2020-11-19 17:06:31 +01:00
Tim Head
ce11959b1a Merge pull request #3267 from slemonide/patch-1
Update services.md
2020-11-19 14:07:56 +01:00
fyrzbavqr
097974d57d Update services.md
Fix small typo
2020-11-19 04:14:54 -08:00
Omar Richardson
09ff03ca4f Superfluous import statement 2020-11-19 13:10:48 +01:00
Omar Richardson
313f050c42 Reduced ssl on for active tests only 2020-11-19 12:58:38 +01:00
Omar Richardson
4862831f71 Trying with different configuration 2020-11-19 12:08:10 +01:00
Omar Richardson
c46beb976a Moving ssl tests to testing matrix 2020-11-19 11:59:03 +01:00
Omar Richardson
71d99e1180 Update with expand group test 2020-11-19 09:57:50 +01:00
IvanaH8
18ed1b58cc added roles to token model and POST /users/{name}/tokens request body 2020-11-19 09:17:03 +01:00
IvanaH8
c0cadc384d adding roles to tokens 2020-11-19 08:22:52 +01:00
Long Vu
11a85d1dc5 login page: allow full override of the optional accept terms and conditions feature
The text was already overridable but the endblock was at the wrong
location.

Now the javascript can also be overridden.
2020-11-18 14:25:49 -05:00
0mar
54cb31b3a9 Removed circular import 2020-11-18 17:29:15 +01:00
Omar Richardson
99c3f77c58 WIP Implemented scopes 2020-11-18 17:12:26 +01:00
Dan Lester
67c4a86376 Fix RootHandler when default_url is a callable 2020-11-18 12:55:44 +00:00
Long Vu
e00ef1aef1 Merge remote-tracking branch 'origin/master' into add-user-agreement-to-login-screen 2020-11-17 17:27:30 -05:00
Long Vu
fb5f98f2fa login page: add optional feature to accept terms and conditions in order to login
The feature is disabled by default.

If enabled (by setting `login_term_url`), user will have to check the
checkbox to accept the terms and conditions in order to login.
2020-11-17 17:24:38 -05:00
Alex Weaver
82a1ba8402 Import psutil and perform cmdline check on Windows onlyy 2020-11-17 13:02:35 -06:00
Alex Weaver
7f53ad52fb Assume that fapermission errors when getting process metadata indicate a non-running proxy 2020-11-17 12:55:34 -06:00
agp8x
73cdd687e9 fix formatting 2020-11-17 15:36:30 +01:00
agp8x
af09bc547a change metric prefix to jupyterhub 2020-11-17 15:29:37 +01:00
Min RK
3ddc796068 verify that tornado gen.coroutine and run_on_executor are awaitable
- our APIs require that methods return 'awaitables'
- make sure that the older ways to create tornado 'yieldables' still produce 'awaitables'
2020-11-17 12:38:42 +01:00
Min RK
3c071467bb require tornado 5.1, async_generator 1.9
- maybe_future relies on changes in 5.1, not in 5.0
- async_generator.asynccontextmanager is new in 1.9
2020-11-17 12:23:39 +01:00
Min RK
0c43feee1b run tests with oldest-supported versions
to catch any cases where we make assumptions about more recent versions than we claim to support
2020-11-17 12:22:46 +01:00
Min RK
5bcbc8b328 Merge pull request #3252 from cmd-ntrf/signin
Standardize "Sign in" capitalization on the login page
2020-11-17 11:59:26 +01:00
Min RK
87e4f458fb only preserve params when ?next= is not specified 2020-11-17 11:58:28 +01:00
Min RK
808e8711e1 Merge pull request #3176 from yuvipanda/async_template
Enable async support in jinja2 templates
2020-11-17 11:46:23 +01:00
YuviPanda
19935254a7 Fix pre-commit errors 2020-11-17 15:58:38 +05:30
YuviPanda
a499940309 Remove extreneous coroutine creation
You can 'pass through' coroutines like this without
yield.
2020-11-17 15:41:40 +05:30
YuviPanda
74544009ca Remove extreneous print statement
Was a debugging aid
2020-11-17 15:41:22 +05:30
YuviPanda
665f9fa693 Drop Python 3.5 support
See https://github.com/jupyterhub/jupyterhub/pull/3176#issuecomment-694315759

For Travis, I push the version cascade down one step.
Should preserve our test coverage while conserving test
duration
2020-11-17 15:39:55 +05:30
YuviPanda
24b555185a Revert "Run templates synchronously for Python 3.5"
This reverts commit f1155d6c2afbcbd875c7addc88784313c77da8e9.

Instead, let's stop supporting 3.5!
2020-11-17 15:39:26 +05:30
YuviPanda
24f4b7b6b6 Run templates synchronously for Python 3.5
jinja2's async support requires Python 3.6+. That should
be an implementation detail - so we render it in the main
thread (current behavior) but pretend we did not
2020-11-17 15:39:26 +05:30
YuviPanda
217dffa845 Fix typo in format string 2020-11-17 15:39:26 +05:30
YuviPanda
a7b796fa57 Autoformat with black 2020-11-17 15:39:21 +05:30
YuviPanda
6c5fb5fe97 F-strings are Python 3.6, not 3.5 2020-11-17 15:38:29 +05:30
Yuvi Panda
20ea322e25 Fix typo
Co-authored-by: Tim Head <betatim@gmail.com>
2020-11-17 15:38:29 +05:30
YuviPanda
4f9664cfe2 Provide sync versions of render_template too
write_error is a synchronous method called by an async
method from inside the event loop. This means we can't just
schedule an async render_templates in the same loop and wait
for it - that would deadlock.

jinja2 compiled your code differently based on wether you
enable async support or not. Templates compiled with async
support can't be used in cases like ours, where we already
have an event loop running and calling a sync function. So
we maintain two almost identical jinja2 environments
2020-11-17 15:38:29 +05:30
YuviPanda
be211a48ef Enable async jinja2 template rendering
Follows https://jinja.palletsprojects.com/en/2.11.x/api/#async-support

- This blocks the main thread fewer times
- We can use async methods inside templates too
2020-11-17 15:38:29 +05:30
Min RK
553ee26312 preserve url params in ?next from root page 2020-11-17 10:45:11 +01:00
0mar
2e9ecfff02 WIP: implementing expanding groups 2020-11-17 09:56:48 +01:00
Erik Sundell
7e6111448a Merge pull request #3253 from minrk/wait-admin-form
wait for pending spawns in spawn_form_admin_access
2020-11-16 02:39:11 +01:00
Erik Sundell
ccc0294f2e Merge pull request #3257 from manics/jupyterhub_idle_culler
Update services-basics.md to ues jupyterhub_idle_culler
2020-11-14 17:37:17 +01:00
Simon Li
3232ad61aa Update services-basics.md to ues jupyterhub_idle_culler
Closes https://github.com/jupyterhub/jupyterhub/issues/3256
2020-11-14 15:59:56 +00:00
Min RK
202a5bf9a5 Merge pull request #3255 from fcollonval/patch-1
Environment marker on pamela
2020-11-13 10:28:28 +01:00
Frédéric Collonval
47136f6a3c Environment marker on pamela 2020-11-13 09:57:20 +01:00
Min RK
5d3161c6ef wait for pending spawns in spawn_form_admin_access
copy logic from test_spawn_admin_access
2020-11-12 10:16:48 +01:00
Félix-Antoine Fortin
9da4aa236e Standardize Sign in capitalization on the login page 2020-11-11 13:01:14 -05:00
Erik Sundell
d581cf54cb Retain an assertion and update comments 2020-11-11 15:40:54 +01:00
Erik Sundell
fca2528332 Retain explicit pytest mark asyncio of our coroutines 2020-11-11 14:47:41 +01:00
Erik Sundell
5edd246474 Replace @async_generator/yeild_ with async/yeild 2020-11-11 14:47:29 +01:00
Erik Sundell
77ed2faf31 Replace gen.multi(futures) with asyncio.gather(*futures) 2020-11-11 14:47:24 +01:00
Erik Sundell
4a17441e5a Replace gen.sleep with asyncio.sleep 2020-11-11 14:40:59 +01:00
Erik Sundell
e1166ec834 Replace @gen.coroutine/yield with async/await 2020-11-11 14:36:56 +01:00
Erik Sundell
2a1d341586 Merge pull request #3250 from minrk/test-condition
remove push-branch conditions for CI
2020-11-11 12:21:52 +01:00
Min RK
55a59a2e43 remove push-branch conditions for CI
testing other branches is useful, and there's little cost to removing the conditions:

- we don't run PRs from our repo, so test runs aren't duplicated on the repo
- testing on a fork without opening a PR is still useful (I use this often)
- if we push a branch, it should probably be tested (e.g. backport branch), and filters make this extra work
- the cost of running a few extra tests is low, especially given actions' current quotas and parallelism
2020-11-11 09:12:58 +01:00
Min RK
e019a33509 Merge pull request #3246 from consideRatio/pr/migrate-to-gh-actions-from-travis
Migrate from travis to GitHub actions
2020-11-11 09:06:58 +01:00
Erik Sundell
737dcf65eb Fix mysql/postgresql auth and comment struggles 2020-11-10 19:20:47 +01:00
Erik Sundell
9deaeb1fa9 Final variable name update 2020-11-10 16:19:22 +01:00
Erik Sundell
bcfc2c1b0d Cleanup use of database related environment variables 2020-11-10 16:16:28 +01:00
Erik Sundell
f71bacc998 Apply suggestions from code review
Co-authored-by: Min RK <benjaminrk@gmail.com>
2020-11-10 15:39:46 +01:00
Erik Sundell
ff14b1aa71 CI: use --maxfail=2 2020-11-10 11:14:59 +01:00
Erik Sundell
ebbbdcb2b1 Refactor ci/docker-db and ci/init-db 2020-11-10 11:14:40 +01:00
Erik Sundell
d0fca9e56b Reword comment 2020-11-10 10:03:53 +01:00
Erik Sundell
517737aa0b Add notes about not needing "set -e" etc. 2020-11-10 02:17:44 +01:00
Erik Sundell
5dadd34a87 Help GitHub UI present the job parameterization + inline comments 2020-11-10 02:17:40 +01:00
Erik Sundell
df134fefd0 Refactor pre-commit to its own job 2020-11-10 01:17:30 +01:00
Erik Sundell
47cec97e63 Let pytest fail on first error 2020-11-10 01:16:12 +01:00
0mar
9f6d37cf48 Parametrized scope test suite 2020-11-09 16:07:09 +01:00
0mar
14468b3849 Changed scopes 2020-11-09 16:06:53 +01:00
0mar
365921d162 Added filtering to decorator and added tests 2020-11-09 14:25:02 +01:00
Erik Sundell
0b8b87d7d0 Remove debugging trigger 2020-11-09 07:43:42 +01:00
Erik Sundell
3bf1d72905 Test in Ubuntu 20.04 2020-11-09 07:42:45 +01:00
Erik Sundell
8cdd449cca Unpin mysql-connector-python and resolve errors 2020-11-09 07:42:12 +01:00
Erik Sundell
6fc3c19763 For CI readability, exit on first failure 2020-11-09 07:41:05 +01:00
Erik Sundell
265dc07c78 Remove .travis.yml, add GitHub workflow 2020-11-09 07:40:15 +01:00
Erik Sundell
1ae039ddef Remove py3.7+ breaking test variation (has~x)
The jupyterhub/tests/test_spawner.py::test_spawner_routing[has~x] test
failed in py37+ but not in py36, and I think it is foundational to the
socket library of Python that has changed.

This is a stacktrace from Python/3.7.9/x64/lib/python3.7/site-packages/urllib3/util/connection.py:61

```
>       for res in _socket.getaddrinfo(host, port, family, type, proto, flags):
E       socket.gaierror: [Errno -2] Name or service not known
```

Here is relevant documentation about socket.getaddrinfo.

https://docs.python.org/3.7/library/socket.html#socket.getaddrinfo
2020-11-09 07:32:11 +01:00
Erik Sundell
378d34b213 Don't ignore outer env vars 2020-11-09 07:31:16 +01:00
0mar
fad0679ce4 Refactored api method param names 2020-11-05 16:35:42 +01:00
0mar
154edebbf4 Added scope utilities and tests for them 2020-11-05 15:40:00 +01:00
Mohammad Wasil
9657430cac Fix reverse proxy redirect from https 2020-11-04 17:59:28 +01:00
Mohammad Wasil
6271535f46 Merge pull request #1 from jupyterhub/master
Merge from jupyterhub/jupyterhub master
2020-11-04 17:02:28 +01:00
agp8x
2bef5ba981 Add prefix to prometheus metrics to group all jupyter metrics (see #1585) 2020-11-04 13:54:31 +01:00
Alex Weaver
efb1f3c824 Run precommit hooks, fix formatting issue 2020-10-30 12:35:01 -05:00
Alex Weaver
53050a5836 Merge branch 'master' of https://github.com/jupyterhub/jupyterhub into cleanup-leftover-proxy 2020-10-30 12:14:08 -05:00
Alex Weaver
6428ad9f0b Check proxy cmd before shutting down, cleaner shutdown on Windows 2020-10-30 12:13:50 -05:00
0mar
422fbf8dcc Fixed scoping and authentication 2020-10-30 15:07:10 +01:00
0mar
496832d7b4 Adjusted tests to allow for scopes 2020-10-30 15:06:48 +01:00
Min RK
9068ff2239 back to dev 2020-10-30 13:22:14 +01:00
Min RK
fc6cd33ce0 release 1.2.1 2020-10-30 13:20:43 +01:00
Erik Sundell
b0b8e2d058 Merge pull request #3235 from minrk/changelog-1.2.1
Changelog for 1.2.1
2020-10-30 13:19:52 +01:00
Erik Sundell
6bfa402bfa Apply suggestions from code review 2020-10-30 13:19:18 +01:00
Min RK
b51a0bba92 Changelog for 1.2.1 2020-10-30 13:15:19 +01:00
Erik Sundell
2d3f962a1d Merge pull request #3234 from gesiscss/master
Make external JupyterHub services' oauth_no_confirm configuration work as intentend
2020-10-30 13:07:39 +01:00
Kenan Erdogan
625242136a fix checking if oauth confirm is needed 2020-10-30 10:39:02 +01:00
Min RK
f92560fed0 back to dev 2020-10-29 14:06:20 +01:00
Min RK
8249ef69f0 release jupyterhub 1.2.0 2020-10-29 14:03:34 +01:00
Min RK
c63605425f Merge pull request #3233 from minrk/1.2.0-final
latest changelog since 1.2.0b1
2020-10-29 14:03:01 +01:00
Min RK
5b57900c0b 1.2.0 heading in changelog
Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
2020-10-29 14:02:35 +01:00
Erik Sundell
d0afdabd4c order changelog entries systematically 2020-10-29 13:13:02 +01:00
Min RK
618746fa00 latest changelog since 1.2.0b1 2020-10-29 13:02:04 +01:00
Min RK
e7bc6c2ba9 Merge pull request #3229 from minrk/configurable-pagination
make pagination configurable
2020-10-29 10:53:29 +01:00
Min RK
e9f86cd602 make pagination configurable
add some unittests for pagination

reorganize pagination a bit to make it easier to configure
2020-10-29 09:24:34 +01:00
Erik Sundell
6e8517f795 Merge pull request #3232 from consideRatio/pr/travis-badge
Update travis-ci badge in README.md
2020-10-28 23:01:04 +01:00
Erik Sundell
5fa540bea1 Update travis-ci badge in README.md 2020-10-28 22:59:44 +01:00
0mar
e26fa682c1 Implemented mock scopes in tests and fixed scopes 2020-10-28 17:45:58 +01:00
0mar
21ea4ad2b6 Implemented mock scopes 2020-10-28 16:23:21 +01:00
Min RK
99f597887c Merge pull request #3223 from consideRatio/pr/proxy-api_request-retries
Make api_request to CHP's REST API more reliable
2020-10-28 15:21:23 +01:00
IvanaH8
087c763d41 adding roles to services 2020-10-28 11:16:03 +01:00
Erik Sundell
352526c36a Merge pull request #3226 from xlotlu/patch-1
Fix typo in documentation
2020-10-28 08:09:11 +01:00
Ionuț Ciocîrlan
cbbed04eed fix typo 2020-10-28 03:00:31 +02:00
Christine Banek
b2e7b474ff Allow options_from_form to be configurable 2020-10-27 12:11:48 -07:00
Erik Sundell
b2756fb18c Retry on >=500 errors on hub to proxy REST API reqeusts 2020-10-27 16:53:53 +01:00
Erik Sundell
37b88029e4 Revert improved logging attempt 2020-10-27 16:28:56 +01:00
Erik Sundell
4b7413184e Adjust hub to proxy REST API requests' timeouts 2020-10-27 16:23:40 +01:00
Min RK
41ef0da180 Merge pull request #3219 from elgalu/patch-3
Fix #2284 must be sent from authorization page
2020-10-27 15:41:05 +01:00
Erik Sundell
a4a8b3fa2c Fix scope mistake 2020-10-27 13:38:34 +01:00
Erik Sundell
02e5984f34 Let API requests to CHP retry on 429,500,503,504 as well 2020-10-27 12:52:14 +01:00
0mar
dece64d248 Separated scope from other decorators 2020-10-27 09:43:43 +01:00
Erik Sundell
b91c5a489c Rely on HTTPError over pycurl assumed CurlError 2020-10-26 20:39:20 +01:00
Erik Sundell
c47c3b2f9e Make api_request to CHP's REST API more reliable 2020-10-25 02:35:36 +01:00
Min RK
eaa1353dcd typos in use of partition 2020-10-23 14:16:46 +02:00
Leo Gallucci
b9a3b0a66a Fix #2284 must be sent from authorization pageUpdate jupyterhub/apihandlers/auth.py
Co-authored-by: Min RK <benjaminrk@gmail.com>
2020-10-22 11:36:15 +02:00
Leo Gallucci
929b805fae Fix #2284 must be sent from authorization page
Fix #2284 Authorization form must be sent from authorization page
2020-10-21 17:57:14 +02:00
IvanaH8
4142dc1bc0 update to roles utils 2020-10-21 16:36:50 +02:00
IvanaH8
ced80f9e6b removing rest-api.yml changes 2020-10-20 08:11:42 +02:00
IvanaH8
10a1280f84 Include latest changes from master 2020-10-20 08:03:15 +02:00
IvanaH8
f1ed74bae1 creating roles module 2020-10-19 19:57:55 +02:00
IvanaH8
ff38a9e383 scope schema definitions for rest-api 2020-10-19 19:50:46 +02:00
0mar
b6fa353201 Implemented scope-based access in API handlers 2020-10-19 13:09:26 +02:00
Min RK
082f6516a1 1.2.0b1 2020-10-16 10:14:32 +02:00
Erik Sundell
1aa21f1d6c Merge pull request #3192 from consideRatio/pr/changelog-for-1.2.0b1
changelog for 1.2.0b1
2020-10-15 15:30:30 +02:00
Erik Sundell
cec9702796 changelog for 1.2.0b1 updated 2020-10-15 14:56:43 +02:00
Erik Sundell
f8cbda9c3c Merge pull request #3208 from minrk/traitlets-list-allow-none
avoid specifying default_value=None in Command traits
2020-10-15 14:47:36 +02:00
Min RK
71aee05bc0 use /api/status to test server
workaround 404 issue with /api/spec.yaml in jupyter-server 1.0.4
2020-10-15 13:23:02 +02:00
Erik Sundell
772de55a0d Merge pull request #3209 from minrk/rtd-docs
stop building docs on circleci
2020-10-15 12:14:40 +02:00
Min RK
e6f92238b1 stop building docs on circleci
RTD CI is enabled now
2020-10-15 11:41:11 +02:00
Min RK
db76b52e35 avoid specifying default_value=None in Command traits
causes issues with traitlets dev where 'unspecified' should be Undefined, not specified-None

Best to leave it out if it's really unspecified
2020-10-15 11:38:08 +02:00
Min RK
e6e994e843 add changelog highlights for 1.2.0 2020-10-15 11:01:26 +02:00
Min RK
284e379341 Merge pull request #3204 from kreuzert/exponential_backoff_overflow_exception
Prevent OverflowErrors in exponential_backoff()
2020-10-15 10:39:28 +02:00
Erik Sundell
3ce1cc63af Merge pull request #3207 from kinow/patch-2
[docs] Remove duplicate line in changelog for 1.1.0
2020-10-15 00:34:56 +02:00
Bruno P. Kinoshita
9945a7f7be Update changelog.md
Remove duplicate changelog from 1.1.0
2020-10-15 09:59:04 +13:00
Tim Kreuzer
004c964cc1 Update utils.py 2020-10-13 10:37:31 +02:00
Tim Kreuzer
0f0d6d12d3 Update jupyterhub/utils.py
Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
2020-10-13 10:30:05 +02:00
Tim Kreuzer
c97e4d4e2f Update utils.py
Prevent exponential_backoff() to crash with an Vverflow Error
2020-10-12 17:25:25 +02:00
IvanaH8
a220899bf9 fix for scope names in rest-api.yml 2020-10-08 13:49:04 +02:00
Erik Sundell
53d496aff5 changelog for 1.2.0b1 2020-10-04 07:04:42 +02:00
Min RK
032ae29066 Merge pull request #3184 from rainwoodman/patch-1
Mention the PAM pitfall on fedora.
2020-10-02 10:50:17 +02:00
Yu Feng
21caa57e7b remove sshauthenticator reference. 2020-10-01 09:13:37 -07:00
Yu Feng
37ee104afa Update docs/source/reference/config-sudo.md
Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
2020-10-01 09:11:15 -07:00
Erik Sundell
dac75ff996 Merge pull request #3019 from stv0g/remove-unused-imports
Remove unused imports
2020-10-01 13:17:36 +02:00
Erik Sundell
67e06e5a18 Fix order of imports 2020-10-01 12:44:51 +02:00
Erik Sundell
4cbc0bad34 Merge branch 'master' into remove-unused-imports 2020-10-01 12:07:37 +02:00
Erik Sundell
9f8c1decc4 Merge pull request #2891 from rajat404/auto-gen-docs
Generate prometheus metrics docs
2020-10-01 11:40:05 +02:00
Erik Sundell
1244533387 Merge pull request #3185 from rainwoodman/patch-2
Add SELinux configuration for nginx
2020-10-01 11:15:32 +02:00
Erik Sundell
8c30724f17 monitoring docs: fixes following monitoring section relocation 2020-10-01 10:45:11 +02:00
Erik Sundell
50868f5bb5 monitoring docs: relocate monitoring section under technical reference 2020-10-01 10:36:19 +02:00
Erik Sundell
e15b6ad52e Makefile: let make html depend on generated metrics.rst 2020-10-01 10:13:31 +02:00
Rajat Goyal
b194135a0f Generate list of prometheus metrics in reStructuredText rather than markdown 2020-09-30 23:52:29 +05:30
Rajat Goyal
5b8a7fd191 Remove unused dependency 2020-09-30 23:25:22 +05:30
Rajat Goyal
be272ffb2a Formatted text for better readability 2020-09-30 23:14:21 +05:30
Rajat Goyal
8ee60ce0c7 Add metrics documentation generation step in CircleCI & RTD configs
Also rename generated metrics documentation directory `_gen` from `gen`
2020-09-30 22:57:46 +05:30
Rajat Goyal
e553bcb7e2 Unpin dependencies from their patch versions 2020-09-30 22:08:50 +05:30
Rajat Goyal
c0288ec6f6 Update docs/source/monitoring/index.rst
- Fixes typo (eolving -> evolving)
- re-use the word current instead of momentary for comprehensibility
- references JupyterHubs current state with its instead of the for comprehensibility

Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
2020-09-30 22:08:50 +05:30
Rajat Goyal
65b83f5f00 Update docs/source/monitoring/index.rst
Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
2020-09-30 22:08:50 +05:30
Rajat Goyal
dcd520179c Made changes in monitoring docs as per the feedback on PR review 2020-09-30 22:08:50 +05:30
Rajat Goyal
c830d964d5 Apply suggestions from code review
Co-authored-by: Min RK <benjaminrk@gmail.com>
2020-09-30 22:08:50 +05:30
rajat404
9e5993f1da Docs: Fix typo; Add generate task as sub-task in html 2020-09-30 22:08:50 +05:30
rajat404
7ed3e0506b Extract doc generation logic in separate method 2020-09-30 22:08:50 +05:30
rajat404
7045e1116c Inspect metrics and generate metric list in docs; Add monitoring section in Docs 2020-09-30 22:08:50 +05:30
Yu Feng
fb56fd406f Add SELinux configuration for nginx
On a Fedora workstation these steps are needed.
2020-09-22 22:08:42 -07:00
Yu Feng
5489395272 Mention the PAM pitfall on fedora. 2020-09-22 21:51:08 -07:00
Yuvi Panda
6ecda96dd6 Merge pull request #3174 from AngelOnFira/upgrade-jquery-dep
Upgraded Jquery dep
2020-09-17 22:42:26 +05:30
Min RK
30b8bc3664 add ?state= filter for GET /users
allows selecting users based on the 'ready' 'active' or 'inactive' states of their servers

- ready: users who have any servers in the 'ready' state
- active: users who have any servers in the 'active' state (i.e. ready OR pending)
- inactive: users who have *no* servers in the 'active' state (inactive + active = all users, no overlap)

Does not change the user model, so a user with *any* ready servers will still return all their servers
2020-09-17 12:31:16 +02:00
Forest Anderson
80ad455fc7 Upgraded jquery dep 2020-09-14 13:01:27 -04:00
IvanaH8
3d7e4458fc correction of scope for GET /authorizations/token/{token} 2020-09-11 11:07:03 +02:00
IvanaH8
f1940c7c61 added read:all scope (whoami) to GET /authorizations/token/{token} 2020-09-09 15:12:06 +02:00
IvanaH8
eac2e75fe4 adding scopes on operational level for API endpoints 2020-09-09 10:38:00 +02:00
Min RK
21eaf0dd9f Merge pull request #3077 from kinow/add-config-reference
Add Configuration Reference section to docs
2020-09-08 16:40:10 +02:00
Min RK
84d2524025 jupyterhub_config.py filename typo 2020-09-08 16:39:51 +02:00
Min RK
959dfb145a Merge pull request #3121 from rkdarst/clear-state-after-post-stop-hook
jupyterhub/user: clear spawner state after post_stop_hook
2020-09-08 16:38:18 +02:00
Min RK
998c18df42 Merge pull request #3133 from ideonate/master
Allow JupyterHub.default_url to be a callable
2020-09-08 16:36:52 +02:00
Richard Darst
88b10aa2f5 jupyterhub/user: Remember to save the state in the database 2020-09-08 13:48:27 +03:00
Dan Lester
d8f5758e08 Fix rst in default_url docstring 2020-09-08 09:55:03 +01:00
Min RK
47e45a4d3f Merge pull request #3136 from pabepadu/add_footer_block
Add a footer block + wrap the admin footer in this block
2020-09-08 09:38:21 +02:00
Min RK
3e31ff4ac7 Merge pull request #3160 from rcthomas/control-service-display
Control service display
2020-09-08 09:37:12 +02:00
Min RK
ff30396a8e Merge pull request #3028 from possiblyMikeB/ui-feedback-onsubmit
UI Feedback on Submit
2020-09-08 09:36:39 +02:00
Min RK
196a7fbc65 Merge pull request #3072 from minrk/purge-expired
synchronize implementation of expiring values
2020-09-08 09:35:25 +02:00
IvanaH8
14ed312414 adding security definition (with scopes) for oauth 2020-09-07 16:44:18 +02:00
Richard Darst
c66e8bb4c9 jupyterhub/user: remuve extraneous = {}
- Thanks to review from @minrk
2020-09-07 17:21:23 +03:00
Min RK
5595146fe2 Merge pull request #3147 from jgwerner/fix/api-request-error
Get error description from error key vs error_description key
2020-09-07 16:18:21 +02:00
Min RK
76b688e574 Merge pull request #3137 from lydian/sort_on_spawner_last_activity
admin page sorts on spawner last_activity instead of user last_activity
2020-09-07 16:14:12 +02:00
Min RK
f00d0be4d6 Merge pull request #3156 from manics/docker-py38
Update Dockerfile to ubuntu:focal (Python 3.8)
2020-09-07 16:13:18 +02:00
Min RK
f9d815676f verify static files in docker tests 2020-09-07 16:06:48 +02:00
Min RK
94612d09a6 build wheel with setup.py bdist_wheel
pip wheel from scratch may not include files generated during build
2020-09-07 15:03:13 +02:00
Dan Lester
76ed65ed82 default_url takes handler object instead of user 2020-08-31 18:36:57 +01:00
Greg
560bab395b update based on pr suggestion
Signed-off-by: Greg <werner.greg@gmail.com>
2020-08-27 11:16:57 -04:00
Greg
c68b846eef get error key or error_description key if not available
Signed-off-by: Greg <werner.greg@gmail.com>
2020-08-27 11:12:18 -04:00
Greg
5896b2c9f7 get error description from error key vs error_description key
Signed-off-by: Greg <werner.greg@gmail.com>
2020-08-27 11:12:18 -04:00
Min RK
0317fd63fa Merge pull request #3103 from kinow/responsive-issues
Hide hamburger button menu in mobile/responsive mode and fix other minor issues
2020-08-27 11:15:50 +02:00
Min RK
7f6886c60f Merge pull request #3104 from cmd-ntrf/rest-api-version
Update version in docs/rest-api.yaml
2020-08-27 11:00:14 +02:00
Min RK
10bdca8901 Merge pull request #3142 from snickell/document-external-service-api-tokens-better
Document external service api_tokens better
2020-08-27 09:52:31 +02:00
Min RK
66cb2c0f3e Merge pull request #3128 from minrk/mix-it-in
Implement singleuser with mixins
2020-08-27 09:51:19 +02:00
Min RK
0152e29946 Merge pull request #3159 from synchronizing/patch-1
Added extra documentation for endpoint /users/{name}/servers/{server_name}.
2020-08-27 09:51:01 +02:00
Min RK
c6f0c07931 Merge pull request #3157 from manics/python-traitlets-latest
Don't allow 'python:3.8 + master dependencies' to fail
2020-08-27 09:45:50 +02:00
Min RK
51ceab9f6f Merge pull request #3149 from betatim/simplifiy-health-checks
Simplify code of the health check handler
2020-08-27 09:44:02 +02:00
Rollin Thomas
46ead8cd9d Add display variable to tests 2020-08-26 21:43:16 -07:00
Rollin Thomas
bfb3d50936 Reformat! 2020-08-26 21:29:28 -07:00
Rollin Thomas
962307475e Add service display to service API model 2020-08-26 19:15:21 -07:00
Rollin Thomas
80f4edcd20 Omit service if it is not OK to display 2020-08-26 18:57:17 -07:00
Rollin Thomas
1ad4035943 Control whether service is listed in UI or not 2020-08-26 18:56:03 -07:00
Felipe Faria
5ab735fea3 Added extra documentation for endpoint /users/{name}/servers/{server_name}. 2020-08-26 19:07:57 -04:00
Simon Li
e79cb0d376 Don't allow 'python:3.8 + master dependencies' to fail 2020-08-26 22:40:57 +01:00
Simon Li
f728cf89c6 Update Dockerfile to ubuntu:focal (Python 3.8) 2020-08-26 22:24:14 +01:00
Tim Head
8f719e21d2 Simplify code of the health check handler 2020-08-26 14:07:30 +02:00
Min RK
29de00ee3c Merge pull request #3140 from chancez/fix_ssl_http_client_master
jupyterhub/utils: Load system default CA certificates in make_ssl_context
2020-08-26 14:05:29 +02:00
Chance Zibolski
52291b0012 jupyterhub/utils: Load system default CA certificates in make_ssl_context
Fixes issues with OAuth flows when internal_ssl is enabled.
When internal_ssl was enabled requests to non-internal endpoints failed
because the system CAs were not being loaded.

This caused failures with public OAuth providers with public CAs since
they would fail to validate.
2020-08-25 09:09:58 -07:00
Georgiana Elena
e58c341290 Merge pull request #3150 from yhal-nesi/master
update prometheus metrics for server spawn when it fails with exception
2020-08-22 00:01:53 +03:00
yhal-nesi
f988a4939e Update jupyterhub/handlers/base.py
Ah makes sense, I was wandering why the tests fail.

Co-authored-by: Georgiana Elena <georgiana.dolocan@gmail.com>
2020-08-22 08:47:15 +12:00
Yuriy Halytskyy
60ee2bfc35 update prometheus metrics for server spawn when it fails with exception 2020-08-20 08:18:39 +12:00
Erik Sundell
42601c52cc Merge pull request #3151 from consideRatio/docs/move-cert-docstring
docs: please docs linter (move_cert docstring)
2020-08-19 14:10:54 +02:00
Erik Sundell
0679586b2c docs: please docs linter properly
We are users of the napoleon sphinx extension, which helps us parse our
Google Style Python Docstrings, and its syntax suggest we should use
indentation when we use more then one string for an entry in an
Arguments: or Returns: list.

For more details, see: https://github.com/jupyterhub/jupyterhub/pull/3151#issuecomment-676186565
2020-08-19 13:49:28 +02:00
Erik Sundell
be4201f7ee docs: please docs linter (move_cert docstring) 2020-08-19 13:14:46 +02:00
Min RK
11a73b5630 Merge pull request #3131 from rkevin-arch/healthcheck-head-request
Allow head requests for the health endpoint
2020-08-18 10:57:09 +02:00
Tim Head
f1efac41bf Merge pull request #3143 from basvandervlies/apache_reverse_proxy_doc
Needed NoEsacpe (NE)  option for apache
2020-08-14 14:54:23 +02:00
Bas van der Vlies
aa6921dd5a Needed NoEsacpe (NE) option for apache
Else %20 is esacped to %25%20 and we acan not rename "Untitled Folder'
or opening files with spaces or other special chars fails.
2020-08-14 11:24:27 +02:00
Seth Nickell
e94da17c3c Document external service api_tokens better
- Explicitly mention min-8-char constraint
- Connect the api_token in the configuration with the one mentioned in auth requests

Co-authored-by: Mike Situ <msitu@ceresimaging.net>
2020-08-13 12:28:17 -10:00
Min RK
e2ee18fa86 Merge pull request #3123 from alexweav/tornado-py38
app.py: Work around incompatibility between Tornado 6 and asyncio proactor event loop in python 3.8 on Windows
2020-08-10 09:18:24 +02:00
Lydian Lee
c5ec8ceba3 admin page sorts on spawner last_activity instead of user last_activity 2020-08-07 16:37:47 -07:00
pabepadu
3458c742cb Add a footer block + wrap the admin footer in this block 2020-08-07 02:19:21 +02:00
Georgiana Elena
d1a85e53dc Merge pull request #3132 from pabepadu/fix_services_dropdown_in_admin_page
Fix the services dropdown on the admin page
2020-08-07 00:13:37 +03:00
Dan Lester
d915cc3ff2 Allow JupyterHub.default_url to be a callable based on user 2020-08-05 11:59:25 +01:00
Georgiana Elena
b11c02c6e0 Merge pull request #3118 from minrk/tag-from-singleuser
only build tagged versions on docker tags
2020-08-05 12:44:23 +03:00
pabepadu
49f3bb53f4 Fix the services dropdown in the admin page 2020-08-05 05:29:21 +02:00
rkevin
9b7a94046b Allow head requests for the health endpoint 2020-08-03 00:20:17 -07:00
Min RK
62ef5ca2fe test with /api/spec.yaml
because /api/status is currently broken in jupyter_server
2020-07-31 12:44:42 +02:00
Min RK
028e0b0b77 include JUPYTERHUB_SINGLEUSER_APP in env_keep
since the child process is the one that inherits it anyway
2020-07-31 12:12:38 +02:00
Min RK
d2a42a69b0 simplify app mixin
get handler classes from instance attributes, rather than arguments

simplifies API
2020-07-31 12:12:11 +02:00
Min RK
1f21f283df Merge pull request #3127 from mriedem/3126-slow-spawn-timeout-warning
Don't log a warning when slow_spawn_timeout is disabled
2020-07-31 12:07:38 +02:00
Alex Weaver
7f35158575 Also apply patch before creating new event loop in atexit, just in case 2020-07-29 11:03:05 -05:00
Min RK
d0da677813 infer default mixins from $JUPYTERHUB_SINGLEUSER_APP
set to e.g. JUPYTERHUB_SINGLEUSER_APP=jupyterlab.labapp.LabApp for JupyterLab
2020-07-24 13:06:35 +02:00
Min RK
a0a02688c5 create singleuser app with mixins
for easier reuse with jupyter_server

mixins have a lot of assumptions about the NotebookApp structure.
Need to make sure these are met by jupyter_server (that's what tests are for!)
2020-07-24 12:57:05 +02:00
Min RK
2372842b8a Merge remote-tracking branch 'origin/master' into mix-it-in
# Conflicts:
#	.travis.yml
2020-07-24 09:53:02 +02:00
Matt Riedemann
7e205a9751 Don't log a warning when slow_spawn_timeout is disabled
When using the `KubeSpawner` it is typical to disable the
`slow_spawn_timeout` by setting it to 0. `zero-to-jupyterhub-k8s`
does this by default [1]. However, this causes an immediate `TimeoutError`
which gets logged as a warning like this:

>User hub-stress-test-123 is slow to start (timeout=0)

This avoids the warning by checking the value and if disabled simply
returns without logging the warning.

[1] https://github.com/jupyterhub/zero-to-jupyterhub-k8s/commit/b4738edc5

Closes #3126
2020-07-23 16:09:19 -05:00
Alex Weaver
e7fab5c304 Format and lint 2020-07-22 15:16:11 -05:00
Alex Weaver
8b8b512d06 Apply asyncio patch 2020-07-22 15:04:16 -05:00
Richard Darst
714072dbd8 jupyterhub/user: clear spawner state after post_stop_hook
- Related issue: #3120.  Closes: #3120.

- I realized that spawner.clear_state() is called before
  spawner.post_stop_hook().  This caused was a bit surprising to me,
  and caused some issues.

- I tried the naive strategy of moving clear_state to later and
  setting the orm_state to `{}` at the point where it used to be
  clear.

- This tries to maintain the exception behavior of clear_state and
  post_stop_hook, but is exactly identical.

- To review:

  - I'm not sure this is a good idea!

  - Carefully consider the implications of this.  I am not at all sure
    about unintended side-effects or what intended semantics are.
2020-07-22 10:06:21 +03:00
Min RK
6e8f39c22d only build tagged versions on docker tags
instead of building 'stable' from master
2020-07-20 10:14:35 +02:00
Erik Sundell
f3c3225124 Merge pull request #3114 from yuvipanda/no-cull-idle
Remove idle culler example
2020-07-14 17:03:12 +02:00
Georgiana Elena
614bfe77d8 Update examples/cull-idle/README.md 2020-07-14 14:22:51 +03:00
YuviPanda
1beea06ce5 Remove idle culler example
Has been moved to its own repo.

See https://github.com/jupyterhub/the-littlest-jupyterhub/pull/559
for more info
2020-07-12 17:14:14 +05:30
Erik Sundell
42adb44153 Merge pull request #3111 from mriedem/log-slow-stop-timeout
Log slow_stop_timeout when hit like slow_spawn_timeout
2020-07-11 02:56:13 +02:00
Matt Riedemann
d5a0202106 Log slow_stop_timeout when hit like slow_spawn_timeout
When `slow_spawn_timeout` is hit the configured timeout value
gets logged [1]. This does the same thing when `slow_stop_timeout`
is hit.

[1] https://github.com/jupyterhub/jupyterhub/blob/1.1.0/jupyterhub/handlers/base.py#L947
2020-07-10 11:38:26 -05:00
Georgiana Elena
3d524f2092 Merge pull request #3109 from kxiao-fn/proper_named_server_deletion
fix for stopping named server deleting default server and tests
2020-07-07 15:41:43 +03:00
Katherine Xiao
409835303e formatting 2020-07-06 17:45:08 -07:00
Katherine Xiao
acc8d15fec fixed test 2020-07-06 17:23:42 -07:00
Katherine Xiao
608cad6404 fix in base.py 2020-07-06 12:53:50 -07:00
Katherine Xiao
571a428375 fix deletion of default server when stopping named server and added corresponding test 2020-07-06 12:48:41 -07:00
Chris Holdgraf
1575adf272 Merge pull request #3107 from consideRatio/docs-logo-rem-unused-stuff
docs: unsqueeze logo, remove unused CSS and templates
2020-07-06 08:00:14 -07:00
Erik Sundell
4bc6d869f3 docs: unsqueeze logo, remove unused CSS and templates 2020-07-05 03:12:18 +02:00
Min RK
e5a6119505 Merge pull request #3090 from minrk/words-matter 2020-07-03 12:27:08 +02:00
Félix-Antoine Fortin
d80dab284d Update version in docs/rest-api.yaml 2020-06-30 08:59:29 -04:00
Bruno P. Kinoshita
9d556728bb Add padding for the span with user name and logout button (responsive mode only) 2020-06-25 23:31:54 +12:00
Bruno P. Kinoshita
4369e2cbfa Adjust jupyterhub logo margin-left in responsive mode 2020-06-25 23:31:54 +12:00
Bruno P. Kinoshita
ef4455bb67 Closes #2182 display hamburger menu only if user variable is present (in responsive mode) 2020-06-25 23:31:54 +12:00
Min RK
76c9111d80 Merge pull request #3089 from kinow/redirect-with-parameters 2020-06-25 11:08:17 +02:00
Bruno P. Kinoshita
946ed844c5 Update jupyterhub/handlers/base.py
Co-authored-by: Min RK <benjaminrk@gmail.com>
2020-06-25 19:41:46 +12:00
Min RK
cceb652039 TODO is TODONE
Co-authored-by: Georgiana Elena <georgiana.dolocan@gmail.com>
2020-06-24 20:19:44 +02:00
Min RK
6e988bf587 call it allowed_users
be clearer since it's users vs groups, etc.
2020-06-24 13:29:42 +02:00
Simon Li
dbc6998375 Merge pull request #3102 from minrk/unpin-telemetry
loosen jupyter-telemetry pin
2020-06-23 14:18:40 +01:00
Bruno P. Kinoshita
1bdc9aa297 Escape/encode parameters with the next URL, add more tests 2020-06-24 00:18:55 +12:00
Bruno P. Kinoshita
73f1211286 Update append_query_parameters to have exclude=["none"] by default,
and avoid using dicts with url_concat, to have consistent tests
as otherwise in Python 3.5 the generated URL's could have parameters
in random order.
2020-06-23 22:06:57 +12:00
Min RK
3fece09dda loosen jupyter-telemetry pin
we don't want strict pinning in package dependencies
2020-06-23 10:13:31 +02:00
Min RK
7ad4b0c7cb update allowed/blocked language in docs
our words matter, let's be more mindful
2020-06-23 10:10:07 +02:00
Min RK
252015f50d Merge pull request #3071 from minrk/userdict-get 2020-06-23 10:03:13 +02:00
Min RK
b3cc235c8a Merge pull request #3087 from fcollonval/patch-1 2020-06-23 10:02:34 +02:00
Min RK
47d7af8f48 Merge pull request #3100 from mriedem/remove-old-print 2020-06-23 09:58:00 +02:00
Matt Riedemann
8528684dc4 Remove old context-less print statement
This was added in PR #2721 and by default results in just printing
out "10" without any context when starting the hub service. This
simply removes the orphan print statement.

I'm open to changing this to a debug log statement with context if
someone finds that useful, e.g.:

`self.log.debug('Effective init_spawners_timeout: %s', init_spawners_timeout)`
2020-06-22 15:35:15 -05:00
Bruno P. Kinoshita
d4ce3aa731 Add unit tests 2020-06-20 22:51:16 +12:00
Min RK
ec710f4d90 test subclass priority when overriding old methods 2020-06-18 11:50:44 +02:00
Bruno P. Kinoshita
14378f4cc2 Include the query string parameters when redirecting to a new URL 2020-06-17 22:37:20 +12:00
Min RK
cc8e780653 rename white/blacklist allowed/blocked
- group_whitelist -> allowed_groups

still todo: handle deprecated signatures in check_whitelist methods while preserving subclass overrides
2020-06-15 14:40:44 +02:00
Frédéric Collonval
5bbf584cb7 Make delete_invalid_users configurable 2020-06-13 15:58:46 +02:00
Erik Sundell
b5defabf49 Merge pull request #3086 from manics/sshspawner
Replace zonca/remotespawner with NERSC/sshspawner
2020-06-13 14:05:05 +02:00
Simon Li
2d1f91e527 Replace zonca/remotespawner with NERSC/sshspawner
https://github.com/zonca/remotespawner is archived, the readme recommends https://github.com/jupyterhub/batchspawner
2020-06-13 11:47:34 +01:00
Tim Head
1653ee77ed Merge pull request #3084 from elgalu/patch-2
Remove already done named servers from roadmap
2020-06-13 09:55:26 +02:00
Leo Gallucci
10f09f4f70 Remove already done named servers from roadmap
Remove already done "UI for managing named servers" from the roadmap
2020-06-12 18:00:00 +02:00
Min RK
b7f277147b Merge pull request #3057 from GeorgianaElena/add_config_warn 2020-06-12 17:21:26 +02:00
Min RK
f3be735eeb Merge pull request #3082 from ChameleonCloud/fix-missing-static-files 2020-06-12 17:19:35 +02:00
Georgiana Elena
3e855eb1be Merge pull request #3083 from minrk/docker-demo-build
build jupyterhub/jupyterhub-demo image on docker hub
2020-06-12 12:10:27 +03:00
Min RK
98dc1f71db build jupyterhub/jupyterhub-demo image on docker hub 2020-06-12 10:03:34 +02:00
Jason Anderson
703703a648 Ensure client dependencies build before wheel
Bug #2852 describes an issue where templates cannot be found by
JupyterHub when using the Docker images built out of this repo. The
issue turned out to be due to missing node_modules at the time of build.

There is a hook in the `package.json` that causes node_modules to be
copied to the static/components directory post-install. If this is not
run, those components are not in the static directory and thus are not
included in the wheel when it is built.

Fix #2905 fixed one problem--the `bower-lite` hook script wasn't copied
to the Docker image, and so the hook couldn't run, but the other issue
is that the client dependencies are never explicitly built. They must be
built prior to the wheel build, and the hook script must have run so
they are copied to the ./static folder, which is included in the wheel
build thanks to [MANIFEST.in][1]

.. note::

   This removes the verbose flag from the wheel build command. The
   reason is that it generates a lot of writes to stdout. It seems that
   wheel can (or always) is switching to non-blocking mode, which can cause
   EAGAIN to be raised, which leads to fun errors like:

     BlockingIOError(.., 'write could not complete without blocking', ..)

   The wheels fail to build if this error is raised. Removing the verbosity
   flag is a quick solution (it drastically reduces writes to STDOUT), but
   comes at the cost of more trouble debugging a failed wheel build. Adding
   the "-v" back in the Dockerfile when debugging a build failure is still
   possible. [Credit: @vbraun][2]

.. note::

   This commit also removes some extraneous COPY operations during the
   Docker build, in particular the /src/jupyterhub/share directory is
   not used unless users have explicitly override their
   jupyterhub_config.py to include it somehow. If the default
   data_files_path behavior is used, JupyterHub should find the proper
   static directory when the application loads.

Fixes: #2852

[1]: https://packaging.python.org/guides/using-manifest-in/
[2]:
https://github.com/travis-ci/travis-ci/issues/4704#issuecomment-348435959
2020-06-11 15:15:56 -05:00
Yuvi Panda
8db8df6d7a Merge pull request #3081 from minrk/env-config-priority 2020-06-11 18:23:37 +05:30
Min RK
744430ba76 Merge pull request #3059 from GeorgianaElena/jh-demo-img 2020-06-11 10:45:01 +02:00
Min RK
45b858c5af Merge pull request #3055 from minrk/document-admin-service 2020-06-11 10:43:23 +02:00
Min RK
d4b5373c05 synchronize implementation of expiring values
- base Expiring class
- ensures expiring values (OAuthCode, OAuthAccessToken, APIToken) are not returned from `find`
- all expire appropriately via purge_expired
2020-06-11 10:40:06 +02:00
Min RK
aba55cc093 implement UserDict.get
behaves more like one would expect (same as try get-key, except: return default)
without relying on cache presence or underlying key type (integer only)
2020-06-11 10:32:55 +02:00
Min RK
5957a37933 Merge pull request #3079 from manics/allow_fail-masterdeps 2020-06-11 10:31:19 +02:00
Min RK
d20a33a0e4 Merge pull request #3078 from gatoniel/patch-1 2020-06-11 10:30:21 +02:00
Min RK
df35268bfe make Spawner.environment config highest priority
so that it can override 'default' env variables like JUPYTERHUB_API_URL

use with caution!
2020-06-11 09:45:18 +02:00
Simon Li
c357d02b56 Allow python:3.8 + master dependencies to fail
Follow-up from https://github.com/jupyterhub/jupyterhub/pull/3076
2020-06-10 14:53:58 +01:00
niklas netter
4eb22821f2 no_proxy does work 2020-06-10 14:51:37 +02:00
niklas netter
b92ea54eda proxy settings might cause authentication errors 2020-06-10 14:16:36 +02:00
Bruno P. Kinoshita
522ef3daea Add Configuration Reference 2020-06-08 23:49:31 +12:00
Tim Head
77edffd695 Merge pull request #3076 from Carreau/traitlets-master
Test with some master dependencies.
2020-06-07 09:33:23 +02:00
Matthias Bussonnier
a8bc4f8a4a Test with some master dependencies.
This does some of the test with the latest traitlets.
We are looking into making a 5.0 release and would like to have some
confidence that it does not break too many things.
2020-06-05 15:05:10 -07:00
Georgiana Elena
66c3760b02 Update jupyterhub/app.py
Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
2020-06-03 14:30:51 +03:00
Erik Sundell
fd28e224f2 Merge pull request #3067 from Zsailer/telemetry-dependency
pin jupyter_telemetry dependency
2020-06-01 23:03:30 +02:00
Zsailer
da3fedb5aa pin jupyter_telemetry dependency 2020-06-01 12:41:22 -07:00
GeorgianaElena
e4e4d472b8 Add JupyterHub Demo docker image 2020-05-28 17:35:42 +03:00
GeorgianaElena
bcbc68dd82 Warn if both bind_url and ip/port/base_url are set 2020-05-27 21:05:01 +03:00
Simon Li
c7df0587d2 Merge pull request #3056 from GeorgianaElena/remove_issue_templates
Use the issue templates from the central repo
2020-05-26 15:56:11 +01:00
GeorgianaElena
cd36733858 Remove the issue templates so that the ones from the central repo jupyterhub/.github take effect 2020-05-26 14:49:36 +03:00
Min RK
6bf4f3b2aa document upgrading from api_tokens to services config 2020-05-26 13:40:21 +02:00
Simon Li
12d81ac07a Merge pull request #3054 from jtpio/black-github-link
Update links to the black GitHub repository
2020-05-25 18:49:27 +01:00
Jeremy Tuloup
d60fa9a400 Update links to the black GitHub repository 2020-05-25 16:10:08 +02:00
Min RK
81d423d6c6 Merge pull request #3040 from romainx/#1018 2020-05-19 15:06:37 +02:00
Min RK
069b477ff3 Merge pull request #3013 from twalcari/feature/spawn_query_arguments 2020-05-19 15:06:17 +02:00
Min RK
cf9046ea47 Merge pull request #3046 from ceocoder/patch-1 2020-05-19 14:58:14 +02:00
Min RK
71a25d4514 Merge pull request #3042 from rabsr/2925_start_my_server_fails 2020-05-19 14:57:44 +02:00
Tim Head
2ff7d05b15 Merge pull request #3047 from consideRatio/health-endpoint-debug-log 2020-05-15 14:39:08 +02:00
Tim Head
bdb29df82a Merge pull request #3048 from mhwasil/disable-proxy-buffering 2020-05-15 14:38:28 +02:00
Mohammad Wasil
0dbad9bd99 Disable proxy_buffering to make the progress bar working when using nginx reverse proxy 2020-05-15 13:51:50 +02:00
Erik Sundell
2991d2d1f1 Log successful /health requests on the debug level
They are less relevant than other request and could very well end up
cluttering the logs. It is not uncomming for these requests to be made
every second or every other second.
2020-05-15 11:48:48 +02:00
dp
a36a56b4ff docs: add proxy_http_version 1.1
add proxy_http_version 1.1 as it is required for KeepAlive connections
2020-05-14 16:16:07 -07:00
romainx
0e59ab003a Readme updated according to review 2020-05-11 14:54:32 +02:00
ragar64
d67b71b7ae " #2925 : Changing start my server button link to spawn url once server is stopped" 2020-05-08 21:47:41 +05:30
romainx
8859bf8842 #1018 PAM added in prerequisites 2020-05-08 06:06:42 +02:00
Thijs Walcarius
4e29342711 Test error path when parsing query arguments 2020-05-06 11:27:04 +02:00
Min RK
8a3790b01f Adding pagination in the admin panel (#2929)
Adding pagination in the admin panel
2020-05-06 11:09:54 +02:00
Min RK
0d245fe4e4 move pagination info next to pagination links
at the bottom
2020-05-06 10:47:08 +02:00
Min RK
da34c6cb34 remove hardcoded path from pagination links
allows pagination of other pages
2020-05-06 10:44:53 +02:00
Min RK
9c0e5ba9c2 Merge pull request #2971 from mriedem/issues/2970-singleuser-version-logging
Only log hub / singleuser version mismatch once
2020-05-06 09:23:04 +02:00
Tim Head
289c3bc3c1 Merge pull request #3035 from vilhelmen/server_ver 2020-05-05 10:00:27 +02:00
Yuvi Panda
3adfec0693 Merge pull request #3020 from stv0g/ipv6-spawner-ip
Support kubespawner running on a IPv6 only cluster
2020-05-04 08:14:01 +05:30
Will Starms
137591f458 remove fixed position, causes Z ordering issues with the bottom of the users list 2020-05-01 19:09:19 -05:00
Michael Blackmon
debd297494 restrict submit handler to only operate on targeted form 2020-04-20 11:33:38 -04:00
Michael Blackmon
10bb5ef3c0 wrap button & widget in feedback-container; add js block with onsubmit handler 2020-04-20 11:00:40 -04:00
Michael Blackmon
42e7d1a3fb put submit button & widget in feedback-container; extend template to include script block with form onsubmit handler 2020-04-20 10:59:34 -04:00
Michael Blackmon
5fbd2838c9 add style class for feedback, widget and container 2020-04-20 10:39:57 -04:00
Michael Blackmon
17dde3a2a9 remove margin styling from submit button 2020-04-20 10:38:19 -04:00
Tim Head
8d50554849 Merge pull request #3022 from joshmeek/docs/index_verbage 2020-04-18 21:17:21 +02:00
Tim Head
493eb03345 Merge branch 'master' into docs/index_verbage 2020-04-18 21:04:11 +02:00
Tim Head
1beac49f4a Merge pull request #3015 from jtpio/admin-template 2020-04-18 19:01:39 +02:00
Tim Head
f230be5ede Merge branch 'master' into admin-template 2020-04-18 15:44:05 +02:00
Steffen Vogel
6283e7ec83 support kubespawner running on a IPv6 only cluster 2020-04-17 19:36:56 +02:00
Thijs Walcarius
2438766418 Show error message when spawning via query-arguments failed. Add options_from_query function 2020-04-17 16:47:55 +02:00
Thijs Walcarius
6f2e409fb9 Allow bypassing of spawn form by calling options in query arguments of /spawn 2020-04-17 16:47:55 +02:00
Carol Willing
aa459aeb39 Merge pull request #3021 from rkdarst/fix-docs
Fix docs CI test failure: duplicate object description
2020-04-17 07:35:24 -07:00
Richard Darst
9d6e8e6b6f Temporary patch autodoc-traits to fix build error [temporary]
- This commit should be removed later after autodoc-traits is fixed upstream
2020-04-17 11:43:49 +03:00
Richard Darst
e882e7954c docs: use recommonmark as an extension
- source_parsers deprecated in sphinx 3.0
- Since sphinx 1.4, it can (should) be used as a direct extension:
  https://github.com/readthedocs/recommonmark/pull/43
2020-04-17 11:11:24 +03:00
Richard Darst
c234463a67 sphinx conf.py: update add_stylesheet -> add_css_file
- Seems to be added in 1.0:
  https://www.sphinx-doc.org/en/latest/changes.html#release-1-0-jul-23-2010
2020-04-17 11:11:24 +03:00
Georgiana Elena
391320a590 Merge pull request #3025 from twalcari/patch-1
Fix broken test due to BeautifulSoup 4.9.0 behavior change
2020-04-17 11:10:25 +03:00
Thijs Walcarius
8648285375 Fix broken test due to BeautifulSoup 4.9.0 behavior change
cfr. https://bugs.launchpad.net/beautifulsoup/+bug/1871335
2020-04-17 10:00:25 +02:00
Josh Meek
485c7b72c2 Fix use of auxiliary verb on index.rst 2020-04-16 09:36:52 -04:00
Steffen Vogel
e93cc83d58 remove unused imports 2020-04-16 12:12:22 +02:00
Jeremy Tuloup
39b9f592b6 Fix user_row endblock in admin template 2020-04-08 17:22:25 +02:00
Tim Head
1f515464fe Merge pull request #3010 from GeorgianaElena/pip_for_docs
Use pip instead of conda for building the docs on RTD
2020-04-02 13:50:27 +02:00
GeorgianaElena
854d0cbb86 Add package requirements to docs build 2020-04-02 10:32:11 +03:00
GeorgianaElena
87212a7414 Remove comment referencing conda environment 2020-04-02 08:55:04 +03:00
GeorgianaElena
2338035df2 Use latest rtd docker image 2020-04-01 14:25:08 +03:00
GeorgianaElena
ea132ff88d Downgrade bootprint 2020-04-01 14:23:35 +03:00
GeorgianaElena
78c14c05f3 Switch to pip on rtd 2020-04-01 14:23:35 +03:00
Erik Sundell
1d2b36e9b0 Merge pull request #3001 from GeorgianaElena/update_issue_templates
Update issue templates
2020-03-26 19:16:40 +01:00
Georgiana Elena
a929ff84c7 Update .github/ISSUE_TEMPLATE/config.yml
Co-Authored-By: Simon Li <orpheus+devel@gmail.com>
2020-03-26 20:03:02 +02:00
GeorgianaElena
0d5bbc16cf Hide comments 2020-03-26 18:30:50 +02:00
GeorgianaElena
ee1fd5a469 Have less issue templates 2020-03-26 18:14:26 +02:00
GeorgianaElena
a702f36524 Update issue templates 2020-03-26 18:14:26 +02:00
GeorgianaElena
59edc6d369 Redirect support questions to Discourse 2020-03-26 18:14:26 +02:00
Georgiana Elena
907b77788d Merge pull request #2978 from danlester/master
SpawnHandler POST with user form options displays the spawn-pending page
2020-03-26 17:13:08 +02:00
Georgiana Elena
914a3eaba5 Merge pull request #2997 from thuvh/fix_typo_installation_guide_hard
fix docs firewall instructions
2020-03-26 16:32:09 +02:00
Hoai-Thu Vuong
b1f048f2ef fix wrong name on firewall 2020-03-24 00:03:26 +07:00
Carol Willing
53d76ad3a2 Merge pull request #2995 from jupyterhub/choldgraf-patch-1
updating docs theme
2020-03-23 08:49:26 -07:00
Chris Holdgraf
7af70b92e9 Update conf.py 2020-03-23 08:29:52 -07:00
Chris Holdgraf
3425eca4ff updating docs theme 2020-03-23 08:10:49 -07:00
Carol Willing
9e0bf9cd9f Merge pull request #2944 from minrk/one-to-one
make spawner:server relationship explicitly one to one
2020-03-22 09:22:46 -07:00
Carol Willing
3118918098 Update jupyterhub/app.py
Minor comment edit
2020-03-22 09:09:49 -07:00
Carol Willing
6a995c822c Merge pull request #2972 from mriedem/contributor-docs
Update contributor docs
2020-03-22 09:04:29 -07:00
Matt Riedemann
a09f535e8f Log hub/singleuser version mismatch once per combo
In case there are multiple singleuser notebooks at different
versions we want to log each of those mismatches as a warning
so this changes the global _version_mismatch_warning_logged flag
from a bool to a dict keyed by the hub/singleuser version mismatch
combination. A test wrinkle is added for that scenario.

Part of #2970
2020-03-16 11:10:13 -04:00
Dan Lester
a60ac53c87 black formatting 2020-03-12 12:44:34 +00:00
Min RK
d2c81bc1d0 Merge pull request #2966 from mriedem/issues/2965-doc-user-options
api-ref: document user_options for server resource
2020-03-12 13:04:25 +01:00
Dan Lester
3908c6d041 SpawnHandler POST with user form options displays the spawn-pending page just like the GET handler always did 2020-03-10 16:17:01 +00:00
Matt Riedemann
c50e1f9852 Update contributor doc wording around sqlite
sqlite3 should be available from the python standard library
so there shouldn't be a need to install native packages.
2020-03-09 15:11:45 -04:00
Matt Riedemann
6954e03bb4 Update contributor docs
As a new contributor to jupyterhub it took awhile to get
up and running locally mainly because I didn't have sqlite
installed but also because I was flipping between README,
CONTRIBUTING and the actual contributing docs which are all
a little bit different.

This does a few things:

- Updates the contributor sphinx docs to mention that how
  one chooses to isolate their development environment is
  up to them with a link to the detailed forum thread on
  that topic.
- Updates the contributor sphinx docs to mention sqlite and
  database setup in general. While in here some trailing
  whitespaces are cleaned up.
- Leave a comment in CONTRIBUTING.md about the redundant
  information in the docs on getting a development environment
  setup. Long-term we should really get those merged so there
  is a single authoritative document on how to get a dev env
  setup for contributing to jupyterhub.
- Link to the jupyterhub gitter channel for asking questions.
2020-03-04 13:09:48 -05:00
Matt Riedemann
08eee9309e Only log hub / singleuser version mismatch once
If your jupyterhub and jupyterhub-singleuser instances
are running at different minor or greater versions a
warning gets logged per active server which can be a lot
when you have hundreds of active servers.

This adds a flag to that version mismatch logging logic
such that the warning is only logged once per restart
of the hub server.

Closes issue #2970
2020-03-04 11:40:23 -05:00
Juan Cruz-Benito
6ed41b38ed Improving pagination for last pages, show always the last page 2020-03-03 14:50:06 +01:00
Matt Riedemann
6b521e0b86 api-ref: document user_options for server resource
APIHandler.server_model unconditionally returns the Spawner's
user_options dict but it wasn't mentioned in the API reference
so it's added here. The description is taken from the docstring
on Spawner.user_options.

Closes issue #2965
2020-03-02 12:12:29 -05:00
Tim Head
1bdc66c75b Merge pull request #2960 from jtpio/named-servers-enter
Start named servers by pressing the Enter key
2020-03-02 10:11:32 +01:00
Jeremy Tuloup
e30b2ca875 Remove unused variables in home.js 2020-03-02 10:02:38 +01:00
Juan Cruz-Benito
1f3ed58570 Fixing pagination numbers. We begin at page 1 not 0 2020-02-28 18:03:29 +01:00
Juan Cruz-Benito
6a31b640c1 Removing more f-strings 2020-02-28 17:56:13 +01:00
Juan Cruz-Benito
ed97150311 Fixing check 2020-02-28 17:53:54 +01:00
Juan Cruz-Benito
78eb77f157 Enforcing checks of page number 2020-02-28 17:47:12 +01:00
Juan Cruz-Benito
f152288d76 Replacing f strings 2020-02-28 17:46:50 +01:00
Juan Cruz-Benito
492c5072b7 Removing print statements 🤦‍♂️ 2020-02-28 17:31:19 +01:00
Juan Cruz-Benito
534e251f97 Adding links generation inside the Pagination class 2020-02-28 17:15:19 +01:00
Jeremy Tuloup
cfcd85a188 Start named servers by pressing the Enter key 2020-02-28 15:24:37 +01:00
Erik Sundell
fd3b5ebbad Merge pull request #2959 from jtpio/patch-1
Add .vscode to gitignore
2020-02-28 15:05:34 +01:00
Jeremy Tuloup
1a2d5913eb Add .vscode to gitignore 2020-02-28 14:55:41 +01:00
Juan Cruz-Benito
8f46d89ac0 Adding info method to pagination and related items in admin template 2020-02-28 13:19:53 +01:00
Juan Cruz-Benito
e82c06cf93 Removing display_msg and record name since it can be coded directly as they're needed in the templates 2020-02-28 12:31:53 +01:00
Juan Cruz-Benito
392525571f Documenting get_page_args method 2020-02-28 12:14:59 +01:00
Juan Cruz-Benito
53927f0490 Pre-commit fixes 2020-02-28 12:05:50 +01:00
Juan Cruz-Benito
ede71db11a Moving Pagination class to its own file 2020-02-28 12:04:53 +01:00
Juan Cruz-Benito
a2e2b1d512 As pointed out in the PR, Pagination isn't a Handler 2020-02-28 12:01:56 +01:00
Tim Head
cff18992ad Merge pull request #2953 from minrk/auth-bearer
preserve auth type when logging obfuscated auth header
2020-02-28 11:48:10 +01:00
Tim Head
b2c0b5024c Merge pull request #2956 from manics/pin-sphinx-theme
[MRG] Pin sphinx theme
2020-02-28 11:28:21 +01:00
Simon Li
996483de94 Pin sphinx theme (https://github.com/jupyterhub/binderhub/pull/1070)
Closes https://github.com/jupyterhub/jupyterhub/issues/2955
2020-02-27 17:35:52 +00:00
Min RK
f4b7b85b02 preserve auth type when logging obfuscated auth header
Authorization header has the form "<type> <credentials>"

rather than checking for "token" only, preserve type value, which could be Bearer, Basic, etc.
2020-02-27 13:49:47 +01:00
Min RK
b4391d0f79 Merge pull request #2952 from kinow/fix-spawn-url
Keep the URL fragments after spawning an application
2020-02-26 14:05:45 +01:00
Juan Cruz-Benito
f49cc1fcf0 Improving description of potential parameters 2020-02-26 10:40:44 +01:00
Juan Cruz-Benito
18205fbf4a Fixing black formatting issues 2020-02-26 10:36:36 +01:00
Bruno P. Kinoshita
2f6ea71106 Add not_running.js to modify button spawn_url 2020-02-26 09:28:12 +13:00
Juan Cruz-Benito
7b6ac158cc Removing python-paginate package and adding minimal Pagination class to enable a pagination API for AdminHandler 2020-02-25 19:11:09 +01:00
Juan Cruz-Benito
facf52f117 Removing unneeded pass of request to the template 2020-02-25 17:03:01 +01:00
Juan Cruz-Benito
f36796dd85 Merge branch 'master' into add_pagination_admin 2020-02-25 17:01:01 +01:00
Min RK
0427f8090f Merge pull request #2773 from kinow/fix-ssl-url-message
Handle the protocol when ssl is enabled and log the right URL
2020-02-25 13:35:32 +01:00
Tim Head
da86eaad97 Merge pull request #2951 from kinow/typos-2
[doc] Fix couple typos in the documentation
2020-02-24 09:21:31 +01:00
Bruno P. Kinoshita
3b05135f11 Fix couple typos 2020-02-24 20:48:42 +13:00
Bruno P. Kinoshita
76afec8adb Update app.bind_url and proxy.public_url when (external) SSL is enabled 2020-02-24 15:51:09 +13:00
Tim Head
06da90ac76 Merge pull request #2950 from alexdriedger/patch-2
Docs: Fixed grammar on landing page
2020-02-23 09:11:43 +01:00
Alex Driedger
7e3caf7f48 Fixed grammar on landing page 2020-02-22 16:37:34 -08:00
Tim Head
e08552eb99 Merge pull request #2941 from minrk/allow-implicit-spawn
Allow implicit spawn via javascript redirect
2020-02-22 07:27:17 +01:00
Tim Head
5fb403af4b Merge pull request #2946 from minrk/user-redirect-faq
add general faq
2020-02-22 07:24:24 +01:00
Min RK
84acdd5a7f handle uselist=False in our relationship expiry 2020-02-21 14:10:36 +01:00
Min RK
3e6abb7a5e add general faq
and put a first q about user-redirect
2020-02-21 13:52:03 +01:00
Min RK
0315f986db Merge pull request #2940 from kinow/add-more-docs-for-cookies
[doc] Add more docs about Cookies used for authentication in JupyterHub
2020-02-21 10:18:29 +01:00
Min RK
7735c7ddd4 make spawner:server backref explicitly one-to-one
using backref(uselist=False), single_parent=True
2020-02-21 10:09:08 +01:00
Bruno P. Kinoshita
239a4c63a2 Add note that not all proxy implementations use an auth token 2020-02-21 10:35:30 +13:00
Bruno P. Kinoshita
f5bd5b7751 Incorporate review feedback 2020-02-21 10:32:11 +13:00
Bruno P. Kinoshita
287b0302d9 Add more docs about authentication and cookies, using text posted by MinRK on Discourse 2020-02-21 10:22:10 +13:00
Tim Head
44e23aad78 Merge pull request #2936 from minrk/make-it-fast-break-everything-maybe
make init_spawners check O(running servers) not O(total users)
2020-02-20 17:06:24 +01:00
Tim Head
606775f72d Remove unused variable 2020-02-20 16:56:03 +01:00
Min RK
9a6308f8d9 docs: use metachannel for faster environment solve (#2943)
docs: use metachannel for faster environment solve
2020-02-20 15:55:36 +01:00
Min RK
0c4db2d99f docs: use metachannel for faster environment solve
rtd is having memory issues with conda-forge, which should hopefully be fixed by metachannel

this should also make things quicker for anyone
2020-02-20 15:54:43 +01:00
Min RK
938970817c update docs environments (#2942)
update docs environments
2020-02-20 15:36:10 +01:00
Min RK
d2a1b8e349 update docs environments
- python 3.7
- node 12
- sync recommonmark 0.6
2020-02-20 15:32:55 +01:00
Min RK
4477506345 Merge pull request #2930 from JohnPaton/patch-1
Add favicon to the base page template
2020-02-20 14:23:06 +01:00
Min RK
0787489e1b maybe_future needs a future! 2020-02-20 12:53:15 +01:00
Min RK
436757dd55 handle implicit spawn with a javascript redirect
less dangerous than using a Location redirect, so remove conflicts

delay is a user-configurable timer (0 = no implicit spawn, default)
2020-02-20 12:43:39 +01:00
Min RK
a0b6d8ec6f add allow_implicit_spawn setting
- warn that there are known issues associated with enabling it
- it is inherently incompatible with named servers
2020-02-20 12:12:55 +01:00
Min RK
b92efcd7b0 spawner test assumed app.users is populated 2020-02-20 09:37:08 +01:00
Erik Sundell
3e17b47ec3 Merge pull request #2939 from kinow/fix-services-link
[doc] Use fixed commit plus line number in github link
2020-02-19 01:09:51 +01:00
Bruno P. Kinoshita
31c0788bd9 Move cookies to the end of the list (ssl, proxy, and then cookies) 2020-02-19 12:56:02 +13:00
Bruno P. Kinoshita
dec3244758 Use fixed commit plus line number in github link 2020-02-19 12:39:23 +13:00
Erik Sundell
91e385efa7 Merge pull request #2938 from kinow/fix-link-to-ssl-doc
[doc] Fix link to SSL encryption from troubleshooting page
2020-02-18 22:55:07 +01:00
Bruno P. Kinoshita
13313abb37 Fix link to SSL encryption from troubleshooting page 2020-02-19 10:46:49 +13:00
Min RK
79a51dfdce make init_spawners check O(running servers) not O(total users)
query on Server objects instead of User objects

avoids lots of ORM work on startup since there are typically a small number of running servers
relative to the total number of users

this also means that the users dict is not fully populated. Is that okay? I hope so.
2020-02-18 17:10:19 +01:00
JohnPaton
a999ac8f07 Use only rel="icon"
This is the officially recommended method from MDN
https://developer.mozilla.org/en-US/docs/Learn/HTML/Introduction_to_HTML/The_head_metadata_in_HTML
2020-02-14 16:51:27 +01:00
John Paton
a3e3f24d2d Add favicon to the base page template
This was missing before. Giving it its own named block will let users customize it if they wish.
2020-02-14 16:35:48 +01:00
Juan Cruz-Benito
b2b85eb548 Improving comments 2020-02-14 11:47:43 +01:00
Juan Cruz-Benito
95c5ebb090 Fixing pre-commit errors 2020-02-14 11:14:07 +01:00
Juan Cruz-Benito
3d0da4f25a Adding python-paginate package and using it to paginate admin panel 2020-02-13 18:35:17 +01:00
Tim Head
bc7bb5076f Merge pull request #2914 from jgwerner/trouble-shooting
[MRG] Add troubleshooting topics
2020-02-13 08:06:20 +01:00
Greg
a80561bfc8 updates based on pr comments
Signed-off-by: Greg <werner.greg@gmail.com>
2020-02-05 16:13:15 -05:00
Erik Sundell
22f86ad76c Merge pull request #2917 from minrk/doc-remove
rest api: fix schema for remove parameter in rest api
2020-01-31 17:31:31 +01:00
Min RK
0ae9cfa42f fix schema for remove parameter in rest api
it wasn't showing up properly since it's a *property* of the body, not the body itself
2020-01-31 17:18:30 +01:00
Min RK
ff8c4ca8a3 update bootprint to v4 2020-01-31 17:16:57 +01:00
Greg
ed4ed4de9d simplify text
Signed-off-by: Greg <werner.greg@gmail.com>
2020-01-29 12:49:52 -05:00
Greg
d177b99f3a add trouble shooting topics
Signed-off-by: Greg <werner.greg@gmail.com>
2020-01-29 12:42:42 -05:00
Erik Sundell
65de8c4916 Merge pull request #2904 from reneluria/patch-doc
Several fixes to the doc
2020-01-24 17:25:36 +01:00
Min RK
178f9d4c51 Merge pull request #2905 from consideRatio/solve-docker-template-issue
Add what we need with some margin to Dockerfile's build stage
2020-01-23 09:57:12 +01:00
Min RK
9433564c5b bump reorder-imports hook (#2899)
bump reorder-imports hook
2020-01-23 09:54:46 +01:00
Erik Sundell
5deba0c4ba Copy all files to Dockerfile's build stage
Not exactly all though as some will be ignored by the .dockerignore
file. This change ensures we don't get future issues caused by a failure
to update what needs to be copied to the build stage and not like we've
had recently.
2020-01-23 07:20:53 +01:00
Erik Sundell
5234d4c7ae Add bower-lite script to Dockerfile
This fixes #2852 by adding a script part of package.json. But is this
enough? Should we perhaps look in MANIFEST.in and copy some more files
listed there?

This is all thanks to people coming together and helping out figuring
out the issue in https://github.com/jupyterhub/jupyterhub/issues/2852.
Thank you @shingo78 for spotting that we missed bower-lite and its role
and all others who reported and helped debug this!
2020-01-23 07:20:40 +01:00
Erik Sundell
1bea28026e Merge pull request #2907 from consideRatio/fix-generate-config-bug
Fix --generate-config bug when specifying a filename
2020-01-23 07:19:11 +01:00
Erik Sundell
9a5c8ff058 Fix --generate-config bug when specifying a filename
This commit fixes #2906 that was introduced due to #2824. See analysis
of issue in
https://github.com/jupyterhub/jupyterhub/issues/2906#issuecomment-577303510.
2020-01-22 19:30:16 +01:00
Rene Luria
2b183c9773 Several fixes to the doc
* sudo for configurable-http-proxy install
* fix sudo command for apt source
* fix $connection_upgrade variable in nginx configuration
2020-01-21 17:02:23 +01:00
Tim Head
5dee864afd fix: 'Non-ASCII character '\xc3' (#2901)
fix: 'Non-ASCII character '\xc3'
2020-01-20 09:15:56 +01:00
Greg
6fdf931515 update prometheus_log_method comments
Signed-off-by: Greg <werner.greg@gmail.com>
2020-01-17 12:32:50 -05:00
Greg
d126baa443 remove diaeresis
Signed-off-by: Greg <werner.greg@gmail.com>
2020-01-17 09:43:46 -05:00
Min RK
d1e2d593ff back to dev 2020-01-17 12:55:42 +01:00
Min RK
3663d7c8fc release 1.1.0 2020-01-17 12:54:06 +01:00
Min RK
a30e6b539f changelog for 1.1.0 (#2898)
changelog for 1.1.0
2020-01-17 12:54:04 +01:00
Min RK
800b6a6bc5 bump reorder-imports
removes (hopefully) unnecessarily specified language version
2020-01-17 12:48:17 +01:00
Min RK
ca3982337e changelog for 1.1.0 2020-01-17 12:40:38 +01:00
Min RK
159b3553a9 Merge pull request #2881 from minrk/auth-state-earlier
trigger auth_state_hook prior to options form, add auth_state to template namespace
2020-01-17 12:35:33 +01:00
Min RK
6821e63b71 Merge pull request #2897 from consideRatio/combine-py38-and-bionic-ci-test
Optimize CI jobs and default to bionic
2020-01-17 12:32:10 +01:00
Erik Sundell
c1c13930f7 Optimize CI jobs and default to bionic 2020-01-17 12:19:39 +01:00
Min RK
58f18bffff _render_form is async 2020-01-17 12:08:20 +01:00
Min RK
b80906b8c8 make auth_state available to page templates 2020-01-17 10:55:07 +01:00
Min RK
07aa077eae Merge pull request #2882 from ociule/master
LocalProcessSpawner should work on windows by using psutil.pid_exists
2020-01-17 09:47:37 +01:00
Min RK
3f74c30288 Merge pull request #2887 from krinsman/master
Fix implementation of default server name
2020-01-16 19:05:30 +01:00
Min RK
141cb04b27 fix assertion in custom user_redirect_hook
custom hook means overrides server_name insertion
2020-01-16 18:05:53 +01:00
Min RK
8769864f24 missing imports in test_named_servers 2020-01-14 22:16:06 +01:00
Min RK
8ee72dd80f define default_server_name fixture 2020-01-14 22:15:14 +01:00
William Krinsman
455475724a Attempt to add tests documenting default named server feature. 2020-01-14 10:20:18 -08:00
William Krinsman
794be0de8e Fix implementation of default server name 2020-01-14 10:02:50 -08:00
Ovidiu Ciule
1f633e188d Updated doc 2020-01-14 14:40:07 +01:00
Ovidiu Ciule
df0745985b Made _signal more readable 2020-01-14 14:38:00 +01:00
Ovidiu Ciule
cad027f3fc Use psutil on windows only. 2020-01-14 14:37:44 +01:00
Min RK
61a844b413 Merge pull request #2889 from minrk/openssl-error
catch connection error for ssl failures
2020-01-14 11:26:44 +01:00
Min RK
319b404ef4 misread which error propagates up
it's a ConnectionError (requests, not stdlib)
2020-01-14 11:05:19 +01:00
Min RK
19fb7eb7cc catch openssl error for ssl failures
python 3.8 with more recent openssl seems to raise a different error
2020-01-14 10:48:48 +01:00
Georgiana Elena
cb3b0ce266 Merge pull request #2842 from mangecoeur/master
Added guide 'install jupyterlab the hard way' #2110
2020-01-10 15:34:33 +02:00
Ovidiu Ciule
82d8e9c433 Reordered commits 2020-01-10 14:30:15 +01:00
mangecoeur
86ee4cad59 add newline 2020-01-10 14:28:13 +01:00
mangecoeur
add9666fcd Update installation-guide-hard.md
Updated capitalisation of names. Addressed revisions.

Fleshed out the prerequists and explanation of access control.

Added part of configuration section to set JupyterLab as the default interface.

corrected need for sudo

Added warning to reverse-proxy section to recommend use of HTTPS and firewall.
2020-01-10 12:28:00 +01:00
mangecoeur
c93687eaad Update docs/source/installation-guide-hard.md
Co-Authored-By: Georgiana Elena <GeorgianaElena@users.noreply.github.com>
2020-01-10 11:32:27 +01:00
mangecoeur
d848873685 Update docs/source/installation-guide-hard.md
Co-Authored-By: Georgiana Elena <GeorgianaElena@users.noreply.github.com>
2020-01-10 11:32:18 +01:00
mangecoeur
c27576a41f Update docs/source/installation-guide-hard.md
Co-Authored-By: Georgiana Elena <GeorgianaElena@users.noreply.github.com>
2020-01-10 11:31:59 +01:00
Ovidiu Ciule
6d3ed95b84 Added missing dependency psutil. Already used in proxy.py#L690 2020-01-10 11:14:51 +01:00
Ovidiu Ciule
ff7cd082ff Just use psutil.pid_exists, which uses os.kill(pid, 0) on Linux as
before and win-specific code on win
2020-01-10 11:09:10 +01:00
Ovidiu Ciule
3582ecc9cc Added _is_single_user_process_alive to allow subclasses to reimplement
this without reimplementing the whole poll method.
2020-01-09 16:39:44 +01:00
Min RK
5f626268ef trigger auth_state_hook prior to options form
- allow auth_state_hook to be async
- trigger it prior to start and options_form serving, rather than on home page
2020-01-09 13:04:45 +01:00
Min RK
6227f92b5f fixup allow_failures (#2880)
fixup allow_failures
2020-01-09 12:45:09 +01:00
Min RK
020ba08635 fixup allow_failures
jobs format doesn't create jobs under allow_failures

the old syntax used to do that. Instead, it uses key, value matches
2020-01-09 12:33:57 +01:00
Min RK
2ad175816a Pass tests on Python 3.8 (#2879)
Pass tests on Python 3.8
2020-01-09 12:28:09 +01:00
Min RK
3d46083dcc Stop allowing failures on Python 3.8
and simplify matrix without cross-references
2020-01-09 11:50:07 +01:00
Min RK
dad1417b23 loosen assertion for process exit
Python 3.8 captures exit codes differently.
All we care about is that it exited.
2020-01-09 11:18:26 +01:00
Min RK
9a3c2409d1 Update README's badges (#2867)
Update README's badges
2020-01-09 11:02:25 +01:00
Richard Darst
0efb16793e Bugfix: pam_normalize_username didn't return username
- A trivial bug caused by my last change to #2397 - made possible by
  the fact we didn't have a way to reliable test PAM stuff.
- Thanks to @narnish for noticing.
- Closes: #2875
2020-01-02 17:04:21 +02:00
Erik Sundell
68ad36e945 Try dist:bionic with py3.8 2019-12-28 18:51:10 +01:00
Erik Sundell
989ed216a7 Add travis-ci job names 2019-12-28 18:51:10 +01:00
Erik Sundell
319113024d Rework .travis.yml 2019-12-28 18:51:10 +01:00
Erik Sundell
399f7e7b80 Remove deprecated part in .travis.yml 2019-12-28 18:51:10 +01:00
Erik Sundell
b4a6e5c2fe Test docs only in CircleCI 2019-12-28 18:51:10 +01:00
Erik Sundell
1949ab892a Make TravisCI single out allowed-failuers 2019-12-28 18:51:10 +01:00
Erik Sundell
1ec34b256c Fixup .travis.yml
- We now default to ubuntu bionic (18.04) and try once with ubuntu xenial
(16.04).
- We now always test Python 3.8 but allow it to fail, as compared to not
allowing it to fail and only testing it on tagged commits. This is a
bugfix I'd say.
- We now no longer test Python 3.5 and Python 3.6 dedicatedly without
any custom configuration like usage of subdomain, which allows us to
reduce the number of build jobs in a way I think makes a great sense to
compromise.
2019-12-28 18:51:10 +01:00
Erik Sundell
3c12a99415 Update README's badges
Some notes:
- Added a conda-forge and DockerHub badge
- Added logo's and made us conform with the team-compass badges section
as can be found here:
  https://jupyterhub-team-compass.readthedocs.io/en/latest/building-blocks/readme-badges.html
- Concluded that our CircleCI badge is good because it let's us overview
the repo's build systems, but that it is bad because it is only is about
documentation preview in PRs which isn't useful in a README's header in
a way.
- Noted there was a CircleCI token in the badge, that I believe is meant
to be used with private repo access rather than public repo access. I'm
not sure we need that but I made it a markdown/html comment for now.
- Decided to not manually add a line break between badges. I figured it
could make sense to break manually before the social badges instead of
automatically letting it wrap at some point, but we don't really know
the size of the window viewing so it felt like a bad idea to hardcode
that.
2019-12-28 14:56:56 +01:00
Richard Darst
a8ced3a7ad Dockerfile: Copy share/ to the final image
- When the Dockerfile was turned into a multi-stage build, it seems
  the share/ directory was not copied to the final image.  This
  resulted in certain components (static/components/, static/css/)
  being missing, which resulted in the JupyterHub share directory not
  being findable (in jupyterhub/_data.py).  This led to all kinds of
  weird havoc, like templates not being findable (#2852).
- I am still unsure if this is the right fix, please check this well.
- Closes: #2852
2019-12-28 13:14:00 +01:00
Richard Darst
1af7deaeb3 Dockerfile: add build-essential to builder image
- While debugging another problem, I noticed some failures to build
  the C extensions in the logs.  Adding build-essential should fix
  that (also as mentioned in the logs themselves).
- Extensions failed for tornado, sqlalchemy, and pyrsistent(pvectorc)
  and can be found by searching the previous output for "fail".
2019-12-28 13:12:11 +01:00
Erik Sundell
861a7c5c5e back to dev 2019-12-26 18:20:06 +01:00
Erik Sundell
1d02915f26 release 1.1.0b1 2019-12-26 18:17:16 +01:00
Erik Sundell
90009f3c01 Set date and beta note in changelog 2019-12-26 18:05:17 +01:00
Erik Sundell
dbce653b5e Merge pull request #2830 from consideRatio/changelog-for-1.1
Changelog for 1.1.0
2019-12-18 14:46:40 +01:00
Georgiana Elena
b4443b1251 Merge pull request #2854 from minrk/startup-total-time
HUB_STARTUP_DURATION_SECONDS measures total startup time
2019-12-18 11:12:24 +02:00
Min RK
155c76b299 Merge branch 'master' into changelog-for-1.1 2019-12-18 10:07:52 +01:00
Min RK
553be3e1d4 add latest PRs 2019-12-18 09:56:39 +01:00
Min RK
e1e0a31afc add summary of 1.1 changes 2019-12-18 09:56:11 +01:00
Min RK
d78466507d HUB_STARTUP_DURATION_SECONDS measures total startup time
which is the main metric of interest for measuring disruptions due to restarts
2019-12-18 09:22:34 +01:00
Min RK
d9955a052d Merge pull request #2849 from gabber12/fix-ready
Cleanup if spawner stop fails
2019-12-18 09:06:18 +01:00
Min RK
2e40da09ea Merge pull request #2853 from jgwerner/dockerfile-updates
chore: Dockerfile updates
2019-12-18 09:05:38 +01:00
Greg
490cf2dd82 switch from container to base
Signed-off-by: Greg <werner.greg@gmail.com>
2019-12-16 12:59:50 -05:00
Greg
b0343ef8d8 update base version and add build stage alias
Signed-off-by: Greg <werner.greg@gmail.com>
2019-12-16 12:45:53 -05:00
mangecoeur
fb64b4f0a8 change title and small corrections 2019-12-13 10:41:42 +01:00
Shubham Sharma
5a747baeca Cleanup if spawner stop fails 2019-12-13 02:11:52 +05:30
Erik Sundell
c4ce7faea6 Update changelog 2019-12-11 23:34:23 +01:00
mangecoeur
3a810c4fc0 Added guide 'install jupyterlab the hard way' 2019-12-06 16:44:59 +01:00
Min RK
abb93ad799 Merge pull request #2840 from minrk/dockerfile-simplify
simplify Dockerfile
2019-12-05 15:34:11 +01:00
Min RK
f31101432e be consistent about $BASE_IMAGE arg 2019-12-03 15:36:57 +01:00
Min RK
a2c98d016e Greatly simplify Dockerfile
- use apt to get Python, nodejs
- use npm to get configurable-http-proxy
2019-12-03 14:53:12 +01:00
Min RK
5581a2ba7e changelog: recategorize a few PRs 2019-12-03 14:49:55 +01:00
Min RK
1fe01ae173 pin a couple versions in Dockerfile 2019-12-03 14:33:56 +01:00
Min RK
24706a1759 Merge pull request #2839 from minrk/dockerfile-quotes
docker: fix onbuild image arg
2019-12-03 14:32:54 +01:00
Min RK
182ac00e93 update 1.1 changelog
latest commit is now 92173c605
2019-12-03 14:31:30 +01:00
Min RK
ca81af2ae5 fix BASE_IMAGE arg in onbuild
BASE_IMAGE is a single arg, not two separate ones
2019-12-03 14:20:59 +01:00
Min RK
92173c6053 Add prometheus metric to measure hub startup time (#2799)
Add prometheus metric to measure hub startup time
2019-12-03 13:19:51 +01:00
Min RK
33e1a090d8 Merge pull request #2812 from jgwerner/update-tests-docs
docs: Update docs to run tests
2019-12-03 13:19:26 +01:00
Min RK
e407808f47 remove redundant pip package list in docs environment.yml (#2838)
remove redundant pip package list in docs environment.yml
2019-12-03 13:18:56 +01:00
Erik Sundell
7b53330b20 Prelim changelog for 1.1.0 2019-12-03 10:58:57 +01:00
Min RK
da02b024d6 remove redundant pip package list in docs environment.yml
instead rely on `-r requirements.txt`

should avoid "ERROR: Double requirement given" messages from pip
2019-12-03 10:24:44 +01:00
Min RK
5502367832 Merge pull request #2555 from rcthomas/auth-state-to-spawner
Add Spawner.auth_state_hook
2019-12-03 10:11:40 +01:00
Min RK
ddc61d2b62 Merge pull request #2828 from bitnik/patch-4
add block for scripts included in head
2019-12-03 10:10:06 +01:00
Min RK
dc049a88eb Merge pull request #2763 from rcthomas/link-services
Link services
2019-12-03 10:08:59 +01:00
Min RK
2b7a02697c Merge branch 'master' into hub-startup-times 2019-12-03 10:08:06 +01:00
Min RK
4e8acc71c6 updating to pandas docs theme (#2820)
updating to pandas docs theme
2019-12-03 10:03:27 +01:00
Min RK
3bc0c18974 Merge pull request #2798 from rajat404/proxy-poll-times
Add prometheus metric to measure proxy route poll times
2019-12-03 10:03:02 +01:00
rajat404
3004f04a34 Expose spawner initialization duration metric to prometheus 2019-12-01 19:37:04 +05:30
rajat404
e3f1fd0a16 Include Spawner initialization time in hub startup time 2019-12-01 19:32:14 +05:30
rajat404
8367606012 Add prometheus metric to measure hub startup time 2019-12-01 18:58:19 +05:30
Kenan Erdogan
6956ffd2a9 add block for scripts included in head 2019-11-22 10:56:49 +01:00
Chris Holdgraf
0b3ffe1a99 extra heading # to institutional faq for sidebar 2019-11-21 12:08:32 -08:00
Chris Holdgraf
e44ee6ed8a reordering requirements 2019-11-21 08:05:13 -08:00
Chris Holdgraf
45a4362bb3 fixing EOL 2019-11-21 08:04:20 -08:00
Chris Holdgraf
8e7df7ae7b index descriptions 2019-11-21 08:04:20 -08:00
Chris Holdgraf
676a0da5ff fixing links 2019-11-21 08:04:20 -08:00
Chris Holdgraf
e802df9668 updating hub logo 2019-11-21 08:04:20 -08:00
Chris Holdgraf
c8e4d68978 updating to pandas docs theme 2019-11-21 08:04:20 -08:00
Tim Head
5ee2994504 adding institutional faq (#2800)
adding institutional faq
2019-11-21 15:29:46 +01:00
Chris Holdgraf
c194cb079e single machine not vm in docs 2019-11-19 09:49:14 -08:00
Chris Holdgraf
1910bfacbd Update docs/source/getting-started/institutional-faq.md
Co-Authored-By: Tim Head <betatim@gmail.com>
2019-11-19 09:48:00 -08:00
Chris Holdgraf
e16ca97e1c Update docs/source/getting-started/institutional-faq.md
Co-Authored-By: Tim Head <betatim@gmail.com>
2019-11-19 09:45:06 -08:00
Min RK
4bcfd52bc7 Merge pull request #2816 from jgwerner/refactor_dockerfile
chore: Refactor Dockerfile
2019-11-19 14:58:19 +01:00
Tim Head
29df06f0b5 Merge pull request #2826 from consideRatio/inline-comment
Add inline comment to test
2019-11-18 20:01:03 +01:00
Erik Sundell
9ec4e6d1d1 Add inline comment to test 2019-11-18 18:56:08 +01:00
Tim Head
ce34c12349 Merge pull request #2824 from consideRatio/raise-error-on-missing-config
Raise error on missing specified config
2019-11-18 18:42:13 +01:00
Tim Head
7b5a5541cb chore: Update python versions in travis matrix (#2811)
chore: Update python versions in travis matrix
2019-11-18 09:30:34 +01:00
Greg
731faf29c8 revert to specify xenial with 3.7
Signed-off-by: Greg <werner.greg@gmail.com>
2019-11-17 21:16:09 -05:00
Erik Sundell
bef561511f Please reorder-python-imports 2019-11-17 14:38:40 +01:00
Erik Sundell
f0b5446ec3 Raise error on missing specified config
Closes #2819 by exiting JupyterHub directly with an error if a config
file has been specified for the config_file traitlet, for example
through the -f or --config flag, but isn't available on the file
system.
2019-11-17 14:32:40 +01:00
Erik Sundell
629e829f8a Test raise error on missing specified config 2019-11-17 14:32:17 +01:00
Chris Holdgraf
7c434adcb2 adding more organizations to institutional faq 2019-11-14 18:21:55 -08:00
Chris Holdgraf
3641abc70f more content for institutional faq 2019-11-14 18:14:15 -08:00
Chris Holdgraf
da790617e3 Update docs/source/getting-started/institutional-faq.md
Co-Authored-By: Tim Head <betatim@gmail.com>
2019-11-14 18:14:15 -08:00
Chris Holdgraf
35ba762c9c fleshing out institutional faq 2019-11-14 18:14:15 -08:00
Chris Holdgraf
42d9c31db7 adding institutional faq 2019-11-14 18:14:15 -08:00
Tim Head
703af1dd1e Merge pull request #2810 from jgwerner/pre-commit-config
chore: Bump package versions used in pre-commit config
2019-11-11 09:51:16 +01:00
Greg
1dd09094a5 commit files updated by black to avoid exiting out from build
Signed-off-by: Greg <werner.greg@gmail.com>
2019-11-10 11:52:53 -05:00
Greg
b8c9717862 add missing maintainer label
Signed-off-by: Greg <werner.greg@gmail.com>
2019-11-10 11:22:19 -05:00
Greg
06f89cb5ed remove lang layer
Signed-off-by: Greg <werner.greg@gmail.com>
2019-11-10 10:47:45 -05:00
Greg
b5602028e5 more updates
Signed-off-by: Greg <werner.greg@gmail.com>
2019-11-10 10:46:54 -05:00
Greg
b1e45cde1e dockerfile cleanup
Signed-off-by: Greg <werner.greg@gmail.com>
2019-11-10 10:03:48 -05:00
Greg
ca117c251c pre-commit updates 2019-11-09 20:15:43 -05:00
Rollin Thomas
e815210cc7 Make usable via config without subclassing 2019-11-08 13:45:08 -08:00
Rollin Thomas
f37864cfd3 Call hook in handler 2019-11-08 13:45:08 -08:00
Rollin Thomas
d05d92c03a Doesn't need this 2019-11-08 13:45:08 -08:00
Greg
948f4c44fd update docs
Signed-off-by: Greg <werner.greg@gmail.com>
2019-11-08 13:00:44 -05:00
Greg
5db76e6dcd remove async test setting
Signed-off-by: Greg <werner.greg@gmail.com>
2019-11-08 12:42:40 -05:00
Greg
c944c0e54a update python versions in matrix
Signed-off-by: Greg <werner.greg@gmail.com>
2019-11-08 12:14:13 -05:00
Greg
dd7fe85770 revert to 3.6
Signed-off-by: Greg <werner.greg@gmail.com>
2019-11-08 11:28:54 -05:00
Greg
b9c1831183 bump package versions used in pre-commit 2019-11-08 11:26:49 -05:00
Min RK
5bbb292ef5 Merge pull request #2794 from rkdarst/cull-idle-local-bind-vars
cull_idle_servers.py: rebind max_age and inactive_limit locally
2019-11-05 10:32:14 +01:00
Min RK
e589b5d82a Merge pull request #2795 from bnuhero/master
The proxy's REST API listens on port `8001`
2019-11-05 10:31:44 +01:00
Min RK
465fb0a686 Merge pull request #2803 from choldgraf/docs_theme
adding docs preview to circleci
2019-11-05 10:31:19 +01:00
Chris Holdgraf
9702c1756f adding docs preview to circleci 2019-10-31 16:48:17 -07:00
Georgiana Elena
9990100f89 Merge pull request #2788 from rajat404/master
Add prometheus metric to measure proxy route deletion times
2019-10-30 16:49:06 +02:00
rajat404
a611298f43 Add prometheus metric to measure proxy route poll times 2019-10-29 19:39:49 +05:30
Min RK
6a872b371e Merge pull request #2790 from yuvipanda/feat/custom-redirect
Allow admins to customize /user-redirect/ behavior
2019-10-28 22:09:43 +01:00
Raymond Liu
1e298fb053 The proxy's REST API listens on port 8001
By default, the proxy's REST API listens on port `8001` instead of `8081`.  The hub service listens on port `8081`.
2019-10-26 14:32:57 +08:00
YuviPanda
51e1a15d63 Reword docstring to appease linter 2019-10-25 11:11:18 -07:00
Yuvi Panda
46e6d95364 Fix typo
Co-Authored-By: Min RK <benjaminrk@gmail.com>
2019-10-25 10:20:29 -07:00
Richard Darst
52c099193d cull_idle_servers.py: rebind max_age and inactive_limit locally
- In the cull script, the max_age and inactive_limit are used from the
  outer scope.  In the case that you add extra logic, one may want to
  modify these values.
- In that case, you either have to rename them locally, or access the
  outer scope with "nonlocal", the first of which is too much work,
  the second of which has a high chance of introducing bugs (as it did
  for me).
- This change introduces a fix for everyone.  It doesn't change basic
  functionality, but makes local modifications simpler.
2019-10-25 14:36:16 +03:00
YuviPanda
9d5784efb9 Pass in base_url rather than app object
- Limits what we consider public API
- Still allows for redirects outside JupyterHub
2019-10-24 09:01:23 -07:00
Min RK
2847c3a90c Merge pull request #2755 from danielballan/expose-user-options-in-rest-api
Expose spawner.user_options in REST API.
2019-10-24 11:11:51 +02:00
YuviPanda
d66f0635a3 Add path and app as parameters 2019-10-22 11:27:41 -07:00
Min RK
244ad7d38c run black 2019-10-22 09:23:04 +02:00
YuviPanda
7fbf1826ea Don't use fstrings yet
We support older versions of python still
2019-10-21 15:17:29 -07:00
YuviPanda
b4a760234e Tweak user_redirect_hook API
- Pass in user object & request object only explicitly.
  Much better interface that is harder to break by internal
  refactoring. We can always add more  parameters if needed?
2019-10-21 14:29:59 -07:00
Min RK
72a38a599d Merge pull request #2789 from tirkarthi/fix-deprecation-warning
Fix deprecation warnings
2019-10-21 14:49:36 +02:00
Min RK
8134d3bfbc Merge pull request #2776 from vilhelmen/server_ver
Display server version on admin page
2019-10-21 14:47:58 +02:00
YuviPanda
3df4afe7af Add test for user_redirect_hook 2019-10-20 11:58:45 -07:00
YuviPanda
400c64b4ef Allow admins to customize /user-redirect/ behavior
/user-redirect/ is used to help link to a particular url
in the logged in user's authenticated notebook. For example,
if I'm logged in as user 'yuvipanda' and hit the URL
/hub/user-redirect/git-pull, it'll redirect me to
/user/yuvipanda/git-pull. This is extremely useful in
connecting hub links to notebook server extensions, such
as nbgitpuller.

Admins might want to customize how this redirection is done -
for example, redirect users to different running servers
based on the nbgitpuller repository they are linking from.
Adding a hook here helps accomplish that.
2019-10-20 11:33:24 -07:00
Rajat Goyal
44dccb292f Apply suggestions from code review: Re-raise error after measuring time; Catch Exception class
Co-Authored-By: Min RK <benjaminrk@gmail.com>
2019-10-20 16:00:33 +05:30
Karthikeyan Singaravelan
0070e68702 Use logger.warning since logger.warn is deprecated. 2019-10-19 20:25:36 +05:30
Karthikeyan Singaravelan
f3b1b5c7a6 Fix DeprecationWarning in escape sequences. 2019-10-19 20:25:07 +05:30
rajat404
175c8d0585 Add prometheus metric to measure proxy route deletion times 2019-10-19 11:47:55 +05:30
R. C. Thomas
bc425a78bb Keep admin-enabled services in the list 2019-10-17 18:27:47 -07:00
R. C. Thomas
e0c4f9fc23 No services accessible if user is None
Co-Authored-By: Min RK <benjaminrk@gmail.com>
2019-10-17 18:23:34 -07:00
Will Starms
2cac46fdb2 Remove server_tokens setting
Revert this if we decide this is a security issue, but we report the version through the API as well
2019-10-17 13:43:28 -05:00
Carol Willing
66f8d6a626 Merge pull request #2767 from minrk/oauth-whitelist
add `service.oauth_no_confirm` configuration
2019-10-17 11:07:30 +01:00
Min RK
f163559f4a Merge pull request #2774 from kinow/update-setupegg
Remove unused  setupegg.py
2019-10-17 11:10:38 +02:00
Bruno P. Kinoshita
a615f783a3 Remove unused setupegg.py 2019-10-17 22:07:46 +13:00
Min RK
3cafc7e49f remove versionadded from Service docstring
sphinx doesn't seem to like this here
2019-10-17 10:03:39 +02:00
Min RK
12ee42e8ae Merge pull request #2785 from rpwagner/master
chown jupyterhub dir in user home
2019-10-17 09:54:38 +02:00
Min RK
9e5c837d3d Merge pull request #2772 from gesiscss/master
fix named server checks
2019-10-17 09:45:37 +02:00
Min RK
91be46784e Merge pull request #2783 from GeorgianaElena/log_proxy_type
Log proxy class
2019-10-17 09:42:13 +02:00
Rick Wagner
60a1c93801 chown jupyterhub dir in user home 2019-10-16 16:45:25 -07:00
GeorgianaElena
3a0a581782 Log proxy class 2019-10-16 15:32:03 +03:00
Georgiana Elena
5cbf9399b2 Merge pull request #2782 from kinow/todo-contributing
Add docs for fixtures in CONTRIBUTING.md
2019-10-16 11:04:25 +03:00
Bruno P. Kinoshita
d942f52eeb Add docs for fixtures in CONTRIBUTING.md 2019-10-16 20:58:11 +13:00
Will Starms
8c1620e6c5 server version display
also tests
2019-10-15 19:23:08 -05:00
Tim Head
9fdab027da Merge pull request #2775 from kinow/fix-header-typo
Fix header project name typo
2019-10-12 11:11:24 +02:00
Bruno P. Kinoshita
bc32450005 Fix header project name typo 2019-10-12 13:54:01 +13:00
Kenan Erdogan
cc95d30dc1 fix test_named_server_spawn_form: add named_servers fixture 2019-10-11 16:10:09 +02:00
Kenan Erdogan
25ef67e8e0 fix: in SpawnHandler check if named servers are allowed before launching a named server, check also limit of named servers 2019-10-11 16:09:28 +02:00
Min RK
2ad1159f69 Apply suggestions from code review
Co-Authored-By: Carol Willing <carolcode@willingconsulting.com>
2019-10-10 10:49:55 +02:00
Min RK
561f4d0889 add service.oauth_no_confirm configuration
allows services to be explicitly blessed to skip the extra oauth confirmation page

added in 1.0

This confirmation page is unhelpful for many admin-managed services,
and is mainly intended for cross-user access.

The default behavior is unchanged, but services can now opt-out of confirmation
(as is done already for the user's own servers).

Use with caution, as this eliminates users' ability to confirm that a service
should be able to authenticate them.
2019-10-08 15:28:47 +02:00
Rollin Thomas
cd0b3e05e2 Add service links 2019-10-05 10:59:59 -07:00
Dan Allan
cdba57e96a Update expected test result to include user_options. 2019-10-01 20:13:05 -04:00
Dan Allan
f13bd59f6f Expose spawner.user_options in REST API. 2019-10-01 16:13:29 -04:00
Min RK
89b0c421d5 Merge pull request #2594 from vilhelmen/server_str_sanitization
WIP: Named server string sanitization and fixes
2019-09-27 12:44:11 +02:00
Min RK
83ddee10ed Merge pull request #2752 from consideRatio/log-version-on-startup
Log JupyterHub version on startup
2019-09-27 12:05:52 +02:00
Erik Sundell
8a03b73086 Log JupyterHub version on startup 2019-09-27 09:32:51 +02:00
Min RK
333b62f1fc Merge pull request #2751 from rkdarst/less_logging_2
Reduce verbosity for "Failing suspected API request to not-running server" (new)
2019-09-27 09:10:40 +02:00
Richard Darst
231d14e95d Reduce verbosity for "Failing suspected API request to not-running server"
- API requests to non-running servers are not uncommon when you cull
  servers and people leave tabs open and active. It returns with 503
  and logs all headers, which can take up half of our total log lines
- This avoids logging headers for all 502 and 503 return statuses.
  #2747 presented an alternative (more complex) implementation, but this
  turned out to be appropriate.
- Closes: #2747
2019-09-26 17:33:38 +03:00
Min RK
9817610dc3 Merge pull request #2687 from rgerkin/uid-track
Added support for consistent UIDs at user creation time
2019-09-26 15:35:39 +02:00
Erik Sundell
aaf365c907 Merge pull request #2750 from minrk/check-routes-first
wait for proxy before accepting requests
2019-09-26 15:34:00 +02:00
Min RK
0f93571ca5 verify proxy is accessible before listening on the hub
lighter weight than check_routes
2019-09-26 14:58:26 +02:00
Carol Willing
5b13f96162 Merge pull request #2744 from willingc/doc-build
Add missing package for json schema doc build
2019-09-24 13:22:18 -07:00
Carol Willing
b41a383eae fix trailing space in file 2019-09-24 12:20:42 -07:00
Carol Willing
1701149fd7 add missing package for json schema 2019-09-24 12:04:11 -07:00
Min RK
5f8664723e Merge pull request #2740 from kinow/remove-deprecated-tornado-asyncio-call
Remove tornado deprecated/unnecessary AsyncIOMainLoop().install() call
2019-09-24 15:51:50 +02:00
Min RK
18ce8eb5a6 Merge pull request #2739 from kinow/fix-deprecated
Fix deprecated call and true comparison
2019-09-24 15:51:30 +02:00
Min RK
d51d39728a Errant indentation 2019-09-24 14:40:34 +02:00
Min RK
2255de7847 Merge pull request #2743 from minrk/urllib3
blacklist urllib3 versions with encoding bug
2019-09-24 12:29:32 +02:00
Min RK
a8c0609eb9 blacklist urllib3 versions with encoding bug
I *think* this should only affect testing, not production
2019-09-24 11:32:23 +02:00
Min RK
66f29e0f5a Merge pull request #2735 from krinsman/master
Non empty default server names (useful for profiles?)
2019-09-24 11:09:57 +02:00
Min RK
ca00c0eab0 Merge pull request #2698 from Zsailer/eventlog-tests
Instrument JupyterHub to record events with jupyter_telemetry [Part II]
2019-09-24 11:08:45 +02:00
Min RK
54baa0c31a Merge pull request #2721 from minrk/async-init-spawners
Add JupyterHub.init_spawners_timeout
2019-09-24 11:08:16 +02:00
Bruno P. Kinoshita
5d3dc509bd Remove tornado deprecated/unnecessary call (>5) 2019-09-23 13:18:00 +12:00
Bruno P. Kinoshita
9cf22e4106 Replace deprecated calls 2019-09-22 23:07:53 +12:00
Zachary Sailer
898fea9fdc Minor typos found by @minrk 2019-09-19 11:23:41 -07:00
Min RK
f79495e6bf fix relative links for spawn 2019-09-19 16:12:29 +02:00
Min RK
f474b31c94 Merge branch 'master' into server_str_sanitization 2019-09-19 16:11:16 +02:00
Min RK
fafbe86b55 Merge pull request #2684 from GeorgianaElena/display_pre_spawn_start_exc
Handle pre_spawn_start possible exceptions
2019-09-19 15:53:08 +02:00
Min RK
82ad2dfbc6 Merge pull request #2705 from InfuseAI/clear-jupyterhub-user-when-logout
Reset _jupyterhub_user after login cookie cleared
2019-09-19 15:51:54 +02:00
Min RK
ac32ae496e run pre-commit hook 2019-09-19 15:51:02 +02:00
Min RK
949d8d0bfa avoid disabling existing loggers when invoking alembic
causes some weird behavior, such as event log not working
2019-09-19 15:46:09 +02:00
Min RK
7fd3271c9b rely on app fixture to get configured app
re-run init_eventlog to ensure event logging is hooked up
2019-09-19 15:16:51 +02:00
Georgiana Elena
6267b752ae Merge pull request #2736 from eslavich/remove-duplicate-spawner-traitlets
Remove duplicate hub and authenticator traitlets from Spawner
2019-09-19 14:42:40 +03:00
William Krinsman
7fcd6ad450 Added configurable default server name attribute to better match behavior described for user-redirect in urls.md in the docs 2019-09-18 15:49:35 -07:00
Ed Slavich
dcde9f6222 Remove duplicate hub and authenticator traitlets from Spawner 2019-09-18 18:34:05 -04:00
Carol Willing
2e8ddeb114 Merge pull request #2725 from willingc/update-templates
Update issue template
2019-09-08 20:17:37 +02:00
Carol Willing
e07aaa603a fix typo found by @blink1073 review 2019-09-08 15:59:58 +02:00
Carol Willing
0bcd6adde6 Edit bug report 2019-09-08 12:39:11 +02:00
Carol Willing
444029699a update the issue template 2019-09-08 12:30:44 +02:00
Carol Willing
b9bdc99c1d move pull request template 2019-09-08 12:14:59 +02:00
Min RK
c896fe05fd Merge pull request #2712 from chicocvenancio/master
ORM: allow removed MySQL variables to not exist
2019-09-07 15:09:29 +02:00
Min RK
424803bcd7 Merge pull request #2714 from bitnik/patch-3
Add New Server: change redirecting to relative to home page in js
2019-09-07 15:08:51 +02:00
Min RK
9024cf1614 Merge pull request #2723 from willingc/use-autodoc
Use autodoc-traits sphinx extension
2019-09-07 15:08:08 +02:00
Carol Willing
a239a25ae0 fix case 2019-09-07 02:19:19 +02:00
Carol Willing
36a1ad0078 remove sphinxext directory 2019-09-06 17:42:32 +02:00
Carol Willing
6d696758e4 use autodoc-traits extension for docbuild 2019-09-06 17:41:34 +02:00
Kenan Erdogan
2545cd9bb3 change redirecting to relative to home page in js 2019-09-02 19:04:59 +02:00
Chico Venancio
096b159c23 ORM: allow MySQL variables to not exist
In current versions of MySQL and MariaDB `innodb_file_format`
and `innodb_large_prefix` have been removed. This allows them to not
exist and makes sure the format for the rows are `Dynamic` (default
for current versions).
2019-08-30 13:00:56 -03:00
Min RK
74958d9397 catch some CancelledErrors
which can occur during app shutdown
2019-08-28 19:02:58 +02:00
Min RK
9db18439af Add JupyterHub.init_spawners_timeout
If init_spawners takes too long (default: 10 seconds) to complete,
app start will be allowed to continue while finishing in the background.

Adds new `check` pending state for the initial check.

Checking lots of spawners can take a long time,
so allowing this to be async limits the impact on startup time
at the expense of starting the Hub in a not-quite-fully-ready state.
2019-08-28 19:01:42 +02:00
Aaron Huang
2b6ad596d2 Remove user after login cookie cleared
Signed-off-by: Aaron Huang <aaroms9733@gmail.com>
2019-08-27 22:09:18 +08:00
Tim Head
917786f2f5 Merge pull request #2704 from katsar0v/master
Create a warning when creating a service implicitly from service_tokens
2019-08-24 17:12:30 +02:00
Katsarov
a800496f6c create a warning when creating a service implicitly from service_tokens 2019-08-24 11:58:37 +02:00
Tim Head
a92fee8a82 Merge pull request #2702 from rlukin/master
Fix mistypos
2019-08-23 22:04:18 +02:00
Richard C Gerkin
7b1c4aedcf Don't catch AttributeError 2019-08-23 08:19:32 -07:00
Roman Lukin
572e008f1d Fix mistypos 2019-08-23 16:14:11 +03:00
Georgiana Elena
0379727cc0 Merge pull request #2679 from katsar0v/master
Documentation update: hint for using services instead of service tokens.
2019-08-23 11:35:12 +03:00
Zsailer
c9d52bea43 verify test data was emitted 2019-08-22 12:19:46 -07:00
Zsailer
263c5e838e rename test fixture 2019-08-22 11:28:57 -07:00
Zsailer
439e4381f0 add tests for eventlog 2019-08-22 11:05:10 -07:00
Zsailer
c34bcabcb9 add docs for event-logging 2019-08-22 11:05:10 -07:00
yuvipanda
2b1bfa0ba7 Depend on the jupyter_telemetry package 2019-08-22 11:05:10 -07:00
yuvipanda
aea2eefa77 Add lots of documentation to event schema
Move it to YAML, since jupyter_telemetry supports these
natively.
2019-08-22 11:05:10 -07:00
yuvipanda
dcde4020c2 Use EventLog class from jupyter_telemetry
Full circle, since the code in jupyter_telemetry
came from here: https://github.com/jupyter/telemetry/pull/6
2019-08-22 11:05:10 -07:00
yuvipanda
1225ff47be Use dunder formatting for capsule 2019-08-22 11:05:10 -07:00
yuvipanda
5aaa5263fa Emitted schemas must be whitelisted by admins
Privacy by default!
2019-08-22 11:05:10 -07:00
yuvipanda
eca4f33afc Don't use f strings yet
jupyterhub still supports Python 3.5
2019-08-22 11:05:10 -07:00
yuvipanda
1e578a25d3 Add jsonschema and python-json-logger as dependencies
They're pure python, and should be ok
2019-08-22 11:05:10 -07:00
yuvipanda
41b2e6e401 Add eventlogging infrastructure
- Introduce the EventLog class from BinderHub for emitting
  structured event data
- Instrument server starts and stops to emit events
- Defaults to not saving any events anywhere
2019-08-22 11:05:10 -07:00
Richard C Gerkin
ced45d101a Update jupyterhub/auth.py
Co-Authored-By: Min RK <benjaminrk@gmail.com>
2019-08-22 09:33:15 -07:00
GeorgianaElena
03693c379e Removed unnecesary check 2019-08-22 15:53:40 +03:00
GeorgianaElena
0058ed803d Address feedback 2019-08-22 15:06:08 +03:00
Georgiana Elena
7d9a93ab5f Merge pull request #2696 from mattjshannon/community-link-in-readme
Add Jupyter community link
2019-08-22 14:19:57 +03:00
GeorgianaElena
8a61eb1738 Test pre_spawn_start exception 2019-08-22 14:11:08 +03:00
GeorgianaElena
cbbead3780 Fix uncaught exception in pre_spawn_start 2019-08-22 14:11:08 +03:00
Min RK
146aec7e0c Merge pull request #2695 from GeorgianaElena/fix_failing_tests
Fix failing travis tests
2019-08-22 11:24:55 +02:00
GeorgianaElena
f7e5904c5b No need to start mysql service 2019-08-22 10:04:11 +03:00
Matt Shannon
077727595c Add Jupyter community link 2019-08-21 13:05:04 -07:00
GeorgianaElena
4bfc69dc80 Pin mysql-connector-python to 8.0.11 on travis 2019-08-21 22:01:43 +03:00
GeorgianaElena
8d7f55ce92 Fix postgres test 2019-08-21 13:59:25 +03:00
Rick Gerkin
cda7f73cfa Added support for consistent UIDs at user creation time 2019-08-16 04:59:51 +00:00
Georgiana Elena
915664ede2 Merge pull request #2682 from rcthomas/fix-not-running-with-named-servers
Add `server_name` to `spawn_url`
2019-08-13 13:28:31 +03:00
Rollin Thomas
037730761c Reformat 2019-08-12 10:06:22 -07:00
Rollin Thomas
1d1e108e09 Add server_name to spawn_url 2019-08-12 09:14:25 -07:00
Katsarov
6e71e617ed update the pending deprecation message in api_tokens to recommend services, not service_tokens 2019-08-10 21:22:40 +02:00
Tim Head
9e0bb5cc71 Replace header logo: jupyter -> jupyterhub (#2672)
Replace header logo: jupyter -> jupyterhub
2019-08-08 23:48:28 +02:00
Erik Sundell
5fa268dab1 Apply black autoformatting 2019-08-07 00:37:30 +02:00
Tim Head
1a26c1fb81 Merge pull request #2670 from GeorgianaElena/redirect_admin_to_login
/hub/admin redirect to login
2019-08-05 22:03:38 +02:00
Erik Sundell
2cc0eb885a Replace header logo: jupyter -> jupyterhub 2019-08-05 13:54:37 +02:00
GeorgianaElena
749b9e0997 /hub/admin redirect to login 2019-08-05 14:42:48 +03:00
Georgiana Elena
669dbfd449 Merge pull request #2662 from kinow/patch-1
Update spawn-form example
2019-08-01 14:21:04 +03:00
Bruno P. Kinoshita
444f0ba00c Update spawn-form example 2019-07-26 14:29:29 +12:00
Tim Head
e46e724a70 Merge pull request #2658 from cmd-ntrf/fix_services_flask_doc
Update flask hub authentication services example in doc
2019-07-24 21:37:20 +02:00
Félix-Antoine Fortin
2e67a534cf Update flask hub authentication services example in doc
The flask example in the documentation was still using the
input argument `cookie_cache_max_age` when instantiating
`HubAuth` object. `cookie_cache_max_age` is deprecated since
JupyterHub 0.8 and should be replaced by `cache_max_age`.
2019-07-24 09:33:23 -04:00
Min RK
24c0829289 Merge pull request #2648 from nicorikken/feature/debug-403-error
fix: spawn redirect for users whose names need escaping
2019-07-22 14:49:57 +02:00
Min RK
60f5ce0ff8 Merge pull request #2640 from nicorikken/feature/user-url-encoding
Escape usernames in the frontend
2019-07-22 14:12:39 +02:00
Tim Head
0325be3e13 Merge pull request #2649 from bitnik/patch-2
close `<div class="container">` tag in home.html
2019-07-17 20:29:21 +02:00
Eric Dill
e243812745 Some suggestions from reading through the docs
Thanks to @willingc, @minrk and @manics for the review so far.
This commit is the PR so far rebased onto master and squashed.
2019-07-17 11:51:20 -04:00
Nico Rikken
b37b13a939 chore: satisfy black checker 2019-07-17 11:05:35 +02:00
Kenan Erdogan
37642408a4 close <div class="container"> tag in home.html 2019-07-17 10:44:44 +02:00
Nico Rikken
9d2823e84b fix: user.escaped_name in base.py urls 2019-07-17 09:37:10 +02:00
Nico Rikken
ae7974564c fix: use user.escaped_name in page urls 2019-07-17 09:37:00 +02:00
Nico Rikken
30c69f94c8 fix: spawn redirect for users with backslash
The 302 redirect served after the spawn POST was not escaping the backslash.
2019-07-17 08:28:43 +02:00
Carol Willing
47cf1915ff Merge pull request #2646 from ilee38/fix-typos-tech-reference
fix typos on technical reference documentation
2019-07-16 16:43:19 -07:00
Carol Willing
9f32fc1854 Merge pull request #2647 from Carreau/fix-theme
Some theme updates; no double NEXT/PREV buttons.
2019-07-16 16:41:31 -07:00
Matthias Bussonnier
8a2eba1156 Some theme updates; no double NEXT/PREV buttons.
- Install pip in the docs conda env (or conda complains).
- Do not override page.html, the next/previous buttons are now handled by
  alabaster_jupyterhub (this actually remove the duplicated next/prev
  buttons)
- use alabaster_jupyterhub when building locally, this make it easy for
  new contributor to get the _exact_ same appearance than on
  readthedocs.
2019-07-16 13:48:37 -07:00
Iram Lee
254687e841 fix typos on technical reference documentation 2019-07-16 14:33:54 -05:00
Carol Willing
aa59b1fca3 Merge pull request #2613 from rkdarst/cull_idle_state_hint
cull-idle: Include a hint on how to add custom culling logic
2019-07-16 10:29:28 -07:00
Nico Rikken
88bff9d03d chore: include proposed docstring fix 2019-07-16 19:25:36 +02:00
Carol Willing
3ca0f32ad3 Merge pull request #2645 from jcrist/update-hadoop-links
Update links for Hadoop-related subprojects
2019-07-16 10:23:09 -07:00
Nico Rikken
6a2876a9fa chore: satisfy Black 2019-07-16 19:23:06 +02:00
Jim Crist
fad6900779 Update a few links [ci skip]
These projects recently moved under the JupyterHub organization,
updated the links accordingly.
2019-07-16 12:06:19 -05:00
Nico Rikken
d8d58b2ebd chore: undo escape() functions 2019-07-16 18:52:31 +02:00
Nico Rikken
859dc34ea6 chore: rename to json_escaped_name and unittests 2019-07-16 18:45:48 +02:00
Nico Rikken
8a37d2daec chore: cleanup comments 2019-07-16 17:13:19 +02:00
Nico Rikken
41db9fe116 chore: cleanup debugging code 2019-07-16 16:47:06 +02:00
Nico Rikken
8dce5a87bc revert try ginfing spawn url 2019-07-16 16:46:00 +02:00
Min RK
266e82755a Merge pull request #2632 from bartolone/master
corrected docker network create instructions in dockerfiles README
2019-07-16 16:22:31 +02:00
Nico Rikken
b237ab9e7b feat: try fixing the spawn url 2019-07-16 14:39:19 +02:00
Nico Rikken
7c78e6c326 chore: try non-escaping user
Now the user was double-escaped, resulting in escaped % signs
2019-07-16 14:28:28 +02:00
Nico Rikken
f1ed6c95f0 chore: reverse url changes 2019-07-16 14:04:51 +02:00
Min RK
2f0ce2a431 Merge pull request #2631 from danlester/master
Fixed docs and testing code to use refactored SimpleLocalProcessSpawner
2019-07-16 13:47:32 +02:00
Min RK
adf3779d02 Merge pull request #2626 from lumbric/patch-1
Update doc: do not suggest depricated config key
2019-07-16 13:46:30 +02:00
Nico Rikken
73309b5741 feat: adopt unicode_escaped_name property 2019-07-16 13:33:49 +02:00
Min RK
2320d59bd1 Merge pull request #2637 from GeorgianaElena/master
Fix total_users prometheus metric
2019-07-16 13:30:27 +02:00
Nico Rikken
1915ecd0c2 feat: try unicoding in user model 2019-07-16 13:07:18 +02:00
Nico Rikken
d050242d0f chore: try splitting value coding 2019-07-16 12:55:26 +02:00
Nico Rikken
3d6d60b64e fix: passthrough in template 2019-07-16 12:34:07 +02:00
Nico Rikken
fc90be8424 fix: user user.name instead of user 2019-07-16 12:17:32 +02:00
Nico Rikken
1555abb2bf feat: unicode escaping method 2019-07-16 11:43:49 +02:00
Nico Rikken
8c8968c2b0 chore: correct handler
Probably this has introduced more errors
2019-07-16 11:06:13 +02:00
Nico Rikken
69d0a47734 chore: try conversion in template
Custom property in users.py didn't work, so try it in the templated file.
2019-07-16 11:04:35 +02:00
Nico Rikken
5ae1fdf621 chore: try custom property 2019-07-16 10:53:14 +02:00
Nico Rikken
c24f6b0a6a chore: add logging code 2019-07-16 10:39:29 +02:00
Nico Rikken
11e32588d7 chore: use most likely fix for custom username property 2019-07-16 10:17:26 +02:00
Nico Rikken
34e44f2eed feat: user function in page render function 2019-07-16 10:01:11 +02:00
Nico Rikken
c0464b2e47 feat: unicode_escape feature 2019-07-16 09:41:11 +02:00
Nico Rikken
d686ae1ae7 json_encode for Tornado framework 2019-07-13 10:49:06 +02:00
Nico Rikken
0dc3593661 Escape user variable to frontend 2019-07-13 10:25:32 +02:00
Nico Rikken
dc40cfe80e encodeURIComponent() instead of escape() 2019-07-13 09:35:41 +02:00
Nico Rikken
d541c17974 Escape usernames in the frontend
To cope with special characters like backslash, to address issue
https://github.com/jupyterhub/jupyterhub/issues/2128
2019-07-13 08:55:33 +02:00
GeorgianaElena
09cc8569b3 Set total_users at startup 2019-07-10 17:19:43 +03:00
Yuvi Panda
3089d441b4 Merge pull request #2629 from GeorgianaElena/master
Fix running_servers prometheus metric
2019-07-10 04:42:14 -07:00
GeorgianaElena
19806899f2 Set running_servers at startup 2019-07-10 11:16:34 +03:00
Yuvi Panda
553e31235e Merge pull request #2628 from jtpio/test-config
Update the config used for testing
2019-07-09 05:44:38 -07:00
Jake Bartolone
55323ec206 corrected docker network create instructions in dockerfiles README 2019-07-05 12:54:09 -05:00
Dan Lester
49a5f3a654 Fixed docs and testing code to use refactored SimpleLocalProcessSpawner 2019-07-05 10:53:47 +01:00
GeorgianaElena
97c27774b1 fixed running_servers count 2019-07-04 13:23:32 +03:00
Jeremy Tuloup
de11909a04 Update config used for testing 2019-07-04 11:56:34 +02:00
lumbric
2f15d5128e Update doc: do not suggest depricated config key
According to changelog JupyterHub.bind_url has been added in 0.9.0.
2019-07-03 12:05:41 +02:00
Tim Head
276ef26161 Merge pull request #2625 from remram44/patch-1
Add missing words
2019-07-02 07:18:26 +02:00
Remi Rampin
d5d315df08 Add missing words
Copied from https://jupyterhub.readthedocs.io/en/latest/reference/services.html
2019-07-01 20:40:02 -04:00
Tim Head
f7f82b8214 add activity_resolution config (#2605)
add activity_resolution config
2019-06-19 08:14:09 +02:00
Min RK
ddece49abb Merge pull request #2588 from cmd-ntrf/services_hubauth_ssl
Define default values for HubAuth ssl traitlets
2019-06-17 11:15:59 +02:00
Min RK
02192ee2d5 Merge pull request #2609 from kinow/use-tornado-addslash
Replace existing redirect code by Tornado's addslash decorator
2019-06-17 11:14:47 +02:00
Richard Darst
a6b7e303df cull-idle: Include a hint on how to add custom culling logic
- cull_idle_servers.py gets the full server state, so is capable of
  doing any kind of arbitrary logic on the profile in order to be more
  flexible in culling.
- This patch does not change anything, but gives an embedded
  (commented out) example of how you can easily add custom logic to
  the script.
- This was added as a tempate/demo for #2598.
2019-06-16 20:13:27 +03:00
Bruno P. Kinoshita
5e5a976ea6 Replace existing redirect code by Tornado's addslash decorator 2019-06-12 15:27:23 +12:00
Min RK
c20c07ec87 Merge pull request #2570 from consideRatio/announcements-css
Make announcements visible without custom HTML
2019-06-07 12:54:45 +02:00
Min RK
bac34e394b Merge pull request #2577 from InfuseAI/remove-stop-my-server-after-server-stopped
Hide Stop My Server red button after server stopped.
2019-06-07 11:53:06 +02:00
Min RK
2ce223c811 Merge pull request #2560 from adelcast/dev/adelcast/shutdown
Jupyterhub: use previous exit strategy for Windows
2019-06-07 11:49:34 +02:00
Min RK
e107c84162 Merge pull request #2590 from sbrunk/openapi-compliance
Change API description to be a valid OpenAPI spec
2019-06-07 11:47:48 +02:00
Min RK
1cea503292 add activity_resolution config
limits last_activity update interval to 30 seconds by default to avoid a db commit on every authenticated request
2019-06-07 11:44:57 +02:00
yuvipanda
e9bc25cce0 Run all tests for jupyter_server regardless of failure 2019-06-04 14:42:49 +02:00
yuvipanda
8f7e25f9a1 Don't make pip uninstall wait for human input 2019-06-04 14:24:30 +02:00
yuvipanda
399def182b Actually run jupyter_server test on Travis 2019-06-04 13:57:26 +02:00
yuvipanda
f830b2a417 Try to test notebook package is still uninstalled 2019-06-04 13:45:57 +02:00
yuvipanda
cab1bca6fb Use jupyter_server if notebook package isn't available 2019-06-04 13:42:52 +02:00
yuvipanda
5eb7a14a33 [WIP] Add support for Jupyter Server 2019-06-04 13:30:28 +02:00
Will Starms
19da170435 Correct empty string redirect to default 2019-05-31 17:49:24 -05:00
Sören Brunk
30cfdcaa83 Change API description to a valid OpenAPI spec
* Add missing responses (doesn't include all possible responses yet)
* Refactor invalid multi in body parameters into a single parameter
* Change form type into valid formData
* Fix use of required fields
* Apply a few other minor fixes
2019-05-28 18:04:17 +02:00
Félix-Antoine Fortin
e9c78422b5 Define default values for HubAuth ssl traitlets
The default values are taken from environment variables defined by Spawner.get_env.
2019-05-27 14:12:39 -04:00
Tim Head
844817297e Merge pull request #2584 from minrk/check-error
re-raise exceptions in launch_instance_async
2019-05-24 17:17:56 +02:00
Min RK
b624116be7 re-raise exceptions in launch_instance_async
avoids asyncio tracebacks in e.g. `jupyterhub --version`
2019-05-24 13:29:34 +02:00
Aaron Huang
38cf95523f Update script 2019-05-21 17:12:01 +08:00
Yuvi Panda
d6d8590acb Merge pull request #2565 from iblis17/patch-1
Update link of `changelog`
2019-05-21 00:37:45 -07:00
Erik Sundell
da460064ae Make announcements visible without custom HTML
Fixes https://github.com/jupyterhub/jupyterhub/issues/2566 to some
degree by making the announcement stand out using twitter-bootstrap
classes `alert` and `alert-warning`. Perhaps we could theme twitter
bootstrap or this alert specifically with jupyter related colors as well
though?
2019-05-16 18:31:10 +02:00
Erik Sundell
8a6de3006c Merge pull request #2564 from julienchastang/typo
typo
2019-05-15 08:11:29 +02:00
Iblis Lin
9e35ba5bef Update link of changelog 2019-05-15 11:29:35 +08:00
Julien Chastang
c83777ccdc typo 2019-05-14 16:54:08 -06:00
Alejandro Del Castillo
aaad55e076 Jupyterhub: use previous exit strategy for Windows
Windows doesn't have support for signal handling so it can't use the
signal handling capabilities of asyncio. Use the previous atexit
strategy on the Windows case instead.

Signed-off-by: Alejandro Del Castillo <alejandro.delcastillo@ni.com>
2019-05-13 10:07:50 -05:00
Min RK
c1e359bd38 Merge pull request #2546 from remyleone/dict_literal
Dict rewritten as literal
2019-05-13 10:54:15 +02:00
Min RK
53f5dbd902 Merge pull request #2558 from NikeNano/spawn_options
Update to simplify the language related to spawner options
2019-05-10 11:39:56 +02:00
NikeNano
9e7b0c0bfd update to simplyfi the language related to spawner options 2019-05-10 09:52:17 +02:00
Tim Head
0aca778a9e Merge pull request #2548 from IamViditAgarwal/add_elucidata_use_case
Adding the use case of the Elucidata: How Jupyter Notebook is used in…
2019-05-06 14:05:32 +02:00
viditagarwal
83af28c137 Adding the use case of the Elucidata: How Jupyter Notebook is used inside the Elucidata with Jupyterhub 2019-05-06 16:49:41 +05:30
Rémy Léone
bfbf2c0521 Dict rewritten as literal 2019-05-03 16:41:43 +02:00
Min RK
09edf38a35 back to dev 2019-05-03 16:16:19 +02:00
Min RK
e4d4e059bd Merge pull request #2545 from minrk/changelog-1.0
releasing 1.0
2019-05-03 16:12:51 +02:00
Min RK
2967383654 release 1.0.0 2019-05-03 13:50:45 +02:00
Min RK
85f5ae1a37 Merge pull request #2544 from minrk/autodoc-link-targets
[autodoc] move config sample to annotation
2019-05-03 13:49:31 +02:00
Min RK
ecafe4add9 [autodoc] move config sample to annotation
preserves link targets, which mangling the directive header does not
2019-05-03 13:00:25 +02:00
Min RK
9462511aa5 Merge pull request #2543 from minrk/pin-mysql-connector
pin mysql-connector-python on travis
2019-05-03 10:55:34 +02:00
Min RK
31736eea9a pin mysql-connector-python on travis
avoids bug in latest connector decoding: https://bugs.mysql.com/bug.php?id=94944
2019-05-03 10:33:28 +02:00
Min RK
f97ef7eaac Merge pull request #2534 from distortedsignal/refactor-logout-handler
Refactor Logout Handler
2019-05-03 10:11:43 +02:00
Min RK
2065099338 Merge pull request #2524 from minrk/fix-db-redact
test postgres with url-encoded password
2019-05-03 09:48:57 +02:00
Carol Willing
d4df579fa6 Merge pull request #2538 from labarba/patch-1
Update gallery-jhub-deployments.md
2019-05-02 12:14:58 -04:00
Lorena A. Barba
4378603e83 Update gallery-jhub-deployments.md 2019-04-26 07:32:35 -04:00
Min RK
40db4edc6d remove todo
order should be preserved between multiple steps
2019-04-25 13:51:27 +02:00
Min RK
ccf13979e9 Merge pull request #2536 from jcrist/add-jhub-hadoop-links
Add a few links for JupyterHub on Hadoop
2019-04-25 10:23:01 +02:00
Jim Crist
76f134c393 Add a few links for JupyterHub on Hadoop [skip ci]
- JupyterHub on Hadoop Guide: https://github.com/jcrist/jupyterhub-on-hadoop
- YarnSpawner: https://github.com/jcrist/yarnspawner
- KerberosAuthenticator: https://github.com/jcrist/kerberosauthenticator
2019-04-24 14:40:50 -05:00
Tom Kelley
77d4c1f23d Changes after CR Comments
Big thanks to Erik, Tim, and Min for the great comments!

Change names to be more clear, add function doc comments,
change scoping on some functions, add handle_logout to let
people take custom logout actions, extract
render_logout_page from get method, add TODO.
2019-04-23 09:59:56 -07:00
Min RK
5856f46e1d Merge pull request #2519 from dfeich/asyncio_signal_cleanup
asyncio signal handling and loop cleanup by task cancelling
2019-04-23 15:13:08 +02:00
Min RK
edfd1eb6cf Merge pull request #2526 from minrk/debug-entrypoints
demote entrypoint-loading warning to debug-level
2019-04-23 15:12:21 +02:00
Tom Kelley
1ae6678360 Refactor Logout Handler
AS A developer of a Logout handler
I WANT to be able to call a function to kill spawners and
do other backend logout stuff and a separate function to
forward the user along the logout chain.

I believe this PR adds (moderately private) methods to the
Logout Handler to do just that.
2019-04-22 12:14:55 -07:00
Min RK
7794eea3fb demote entrypoint-loading warning to debug-level 2019-04-16 15:30:04 +02:00
Derek Feichtinger
f51e6a1ca0 move event_loop closing to shutdown_cancel_tasks 2019-04-16 13:04:11 +02:00
Min RK
ab00a19be1 test postgres with url-encoded username+password 2019-04-16 12:57:49 +02:00
Min RK
7742bfdda5 Merge pull request #2514 from minrk/user-redirect-test
fix flaky test_user_redirect
2019-04-16 12:52:24 +02:00
Erik Sundell
f3878d8216 Merge pull request #2518 from leportella/add-new-jhub-fluxogram
Add new introduction to jhub on docs
2019-04-15 21:13:25 +02:00
Tim Head
d17cb637fe Merge pull request #2520 from parente/vul-reporting
Add vulnerability reporting info to docs
2019-04-15 16:38:58 +02:00
Peter Parente
5b63efe63c Add a newline for the linter 2019-04-15 07:52:55 -04:00
Peter Parente
54816b0a7c Add vulnerability reporting info
https://discourse.jupyter.org/t/responsible-vulnerability-reporting/655
2019-04-14 22:10:58 -04:00
Leticia Portella
41fc73db42 Add new introduction to jhub on docs 2019-04-13 20:55:36 +01:00
Derek Feichtinger
984d6be542 asyncio signal handling and loop cleanup by task cancelling
Also:
- No longer exits with 143 (128+15) on SIGTERM, but with 0
- Allows SIGUSR1 in addition to SIGINFO for dumping status
2019-04-13 20:17:53 +02:00
Min RK
d7d8459edb 1.0.0b2 2019-04-09 10:45:31 +02:00
Min RK
39a7116d16 npm run fmt
with latest prettier
2019-04-09 10:45:31 +02:00
Min RK
d27c970cc4 rev js dependencies 2019-04-09 10:45:31 +02:00
Min RK
cf56dbb97b latest changes in changelog 2019-04-09 10:36:33 +02:00
Min RK
a4ccfe4e11 Merge pull request #2511 from ryogesh/do-not-show-db-password
Redact DB password before logging connection string
2019-04-09 10:19:48 +02:00
Min RK
f1871bbe24 Merge pull request #2510 from minrk/fix-delete-named
ensure spawner for named servers is fully deleted
2019-04-09 10:17:07 +02:00
bdmon
1cc9153a91 Redact DB password before logging connection string 2019-04-09 09:26:54 +02:00
Tim Head
4258254c39 Merge pull request #2509 from minrk/sec-doc
Add security-reporting to docs
2019-04-05 17:33:44 +02:00
Min RK
f3aee9bd16 ensure spawner for named servers is fully deleted
if spawner wasn't running, the wrapper could have been left in the user.spawners dict
2019-04-05 16:50:55 +02:00
Min RK
5cb8ccf8b2 Merge pull request #2494 from minrk/retry-better
include retry link after failed spawn
2019-04-05 15:29:40 +02:00
Tim Head
1d63e417ca Merge pull request #2508 from minrk/discourse-link
add discourse link to communication doc
2019-04-05 12:06:02 +02:00
Min RK
ee0020e8fa add security-reporting to docs 2019-04-05 11:51:02 +02:00
Min RK
2d83575a24 add discourse link to communication docs 2019-04-05 11:46:44 +02:00
Min RK
33c168530e Merge pull request #2496 from minrk/all-users-admin
ensure default server exists in the db at user creation
2019-04-05 10:29:20 +02:00
Min RK
5d4d34b24d Merge pull request #2498 from minrk/oauthlib-3
allow oauthlib 3
2019-04-05 10:25:59 +02:00
Min RK
49cc794937 include exception in template vars
for custom templates
2019-04-05 10:25:40 +02:00
Min RK
7f9e77ce5b Allow Spawners to customize spawn-failed message
by raising an exception with a `jupyterhub_message` attribute.
This will be a string displayed as escaped HTML (HTML is not allowed).
2019-04-05 10:22:47 +02:00
Min RK
6fa3b429db include retry link after failed spawn 2019-04-01 17:05:58 +02:00
Min RK
e89836c035 Merge pull request #2495 from minrk/service-oauth-state-typo
typo raising error on missing oauth state
2019-04-01 17:05:44 +02:00
Min RK
784b5cb6f0 ensure default server exists in the db at user creation
avoids issues in e.g. all_spawners being empty
2019-04-01 17:05:23 +02:00
Min RK
daaa763c3b allow oauthlib 3
requires updating our is_absolute_uri check
2019-04-01 17:04:59 +02:00
Min RK
2b18c64081 Merge pull request #2497 from minrk/mysql-connector-python
[travis] trade mysql-connector for mysql-connector-python
2019-04-01 17:04:30 +02:00
Min RK
785addc245 mysql-connector-python in test_db 2019-04-01 16:47:46 +02:00
Min RK
b4758db017 specify native auth plugin for mysql testing
sha2 plugin isn't available on travis
2019-04-01 16:31:36 +02:00
Min RK
10fbfee157 travis: install mysql-connector-python
instead of mysql-connector, which is deprecated
2019-04-01 15:06:43 +02:00
Min RK
c58a251dbd typo raising error on missing oauth state
need to specify a status code
2019-04-01 14:53:35 +02:00
Min RK
27be5e4847 Changelog for 0.9.6
replace 0.9.5 which has only a partial fix

issue is now confirmed to affect all browsers
2019-04-01 12:30:16 +02:00
Min RK
be97a0c95b Further login redirect validation 2019-04-01 12:29:29 +02:00
Min RK
689a312756 Merge pull request #2490 from mathematicalmichael/patch-1
Fix 1.0 date in changelog
2019-03-29 17:08:49 +01:00
Michael Pilosov
1484869ee3 Update changelog.md
fix date
2019-03-29 08:16:55 -06:00
Min RK
74a457f6b5 guard against using get_page with full urls
since that was hard to debug
2019-03-28 17:02:41 +01:00
Min RK
137a044f96 fix flaky test_user_redirect
when re-fetching the same url, use `requests.get`, not `get_page`
2019-03-28 17:01:00 +01:00
Min RK
a090632a48 Merge pull request #2488 from minrk/post_push
Docker hook fixes
2019-03-28 16:02:50 +01:00
Min RK
451a16c57e changelog for 0.9.5 2019-03-28 13:34:22 +01:00
Min RK
6e14e86a1a protect against some browsers' buggy handling of backslash as slash 2019-03-28 13:33:23 +01:00
Min RK
a142f543ba [docker] tag stable releases with :latest 2019-03-28 13:06:18 +01:00
Min RK
0bb3996c30 [docker] fix unbound variable in post_push hook for stable releases 2019-03-28 13:05:05 +01:00
Min RK
2a23e8afea 1.0.0b1 2019-03-27 15:58:07 +01:00
Min RK
071e375d5f Merge pull request #2440 from minrk/changelog-1.0
changelog for 1.0
2019-03-27 14:45:11 +01:00
Min RK
ca2d0a58b9 add documentation for Hub page urls
with screenshots!
2019-03-27 12:03:26 +01:00
Min RK
1cfeee8808 Merge pull request #2484 from rcthomas/master
Fix server name parsing in UserUrlHandler
2019-03-27 10:40:09 +01:00
Rollin Thomas
6ff421061d Strip leading / and get server name 2019-03-26 08:17:39 -07:00
Min RK
2d049c39fc Merge pull request #2485 from bitnik/patch-1
fix dev-requirements file extension in contributing.md
2019-03-26 13:51:58 +01:00
Kenan Erdogan
5535804acb fix dev-requirements file extension in contributing.md 2019-03-26 13:45:25 +01:00
Rollin Thomas
0901fa255f Remove log testing messages 2019-03-25 15:05:45 -07:00
Rollin Thomas
3e5b272b80 Server name is second element 2019-03-25 14:50:39 -07:00
Rollin Thomas
693446dba9 Log messages 2019-03-25 13:35:29 -07:00
Min RK
12d6a744df documentation for named server UI 2019-03-25 14:14:01 +01:00
Min RK
45dcb3bd17 recommonmark 0.5
update several links (html targets don't work anymore)

had to add rest-api redirect so link would resolve,
since there isn't a ref for files in _static
2019-03-25 14:08:37 +01:00
Min RK
6de9414c2f Merge branch 'master' into changelog-1.0 2019-03-25 11:20:05 +01:00
Min RK
b1f8c31c80 More changes 2019-03-25 11:19:57 +01:00
Min RK
8032f874af Merge pull request #2434 from rkdarst/separate-proxy-docs
Add documentation on running the proxy separate from the hub [wip]
2019-03-25 10:01:23 +01:00
Min RK
c869bc34af Merge pull request #2460 from rcthomas/master
Fix to use `get_current_user()`
2019-03-25 10:00:20 +01:00
Rollin Thomas
d1c06ab603 Fix to use get_current_user() 2019-03-07 20:02:35 -08:00
Carol Willing
7653f75310 Update docs/source/changelog.md
Co-Authored-By: minrk <benjaminrk@gmail.com>
2019-03-07 16:44:13 +01:00
Carol Willing
de4ea150c0 Update docs/source/changelog.md
Co-Authored-By: minrk <benjaminrk@gmail.com>
2019-03-07 16:44:04 +01:00
Carol Willing
0fdb0df176 Update docs/source/changelog.md
Co-Authored-By: minrk <benjaminrk@gmail.com>
2019-03-07 16:43:38 +01:00
Carol Willing
6cefdba515 Update docs/source/changelog.md
Co-Authored-By: minrk <benjaminrk@gmail.com>
2019-03-07 16:43:31 +01:00
Carol Willing
b3bd236e15 Update docs/source/changelog.md
Co-Authored-By: minrk <benjaminrk@gmail.com>
2019-03-07 16:43:23 +01:00
Carol Willing
79a06fd9ac Update docs/source/changelog.md
Co-Authored-By: minrk <benjaminrk@gmail.com>
2019-03-07 16:43:13 +01:00
Carol Willing
3249574744 Update docs/source/changelog.md
Co-Authored-By: minrk <benjaminrk@gmail.com>
2019-03-07 16:42:58 +01:00
Carol Willing
7e04d1d756 Update docs/source/changelog.md
Co-Authored-By: minrk <benjaminrk@gmail.com>
2019-03-07 16:42:51 +01:00
Carol Willing
d63083bc17 Update docs/source/changelog.md
Co-Authored-By: minrk <benjaminrk@gmail.com>
2019-03-07 16:42:45 +01:00
Carol Willing
b93ec84822 Update docs/source/changelog.md
Co-Authored-By: minrk <benjaminrk@gmail.com>
2019-03-07 16:42:27 +01:00
Carol Willing
b1606f21e6 Merge pull request #2446 from minrk/persist-user-options
persist user_options
2019-03-07 07:09:52 -08:00
Min RK
437eb18dd2 Note that user_options shall be JSON+bytes
and document persistence, and no-side effects
2019-03-07 15:35:39 +01:00
Min RK
82c889861d limit special handling to bytes in user_options
uploaded form data can be bytes, which we base64-encode

don't persist any other unsupported data types, persist None instead
2019-03-07 15:30:00 +01:00
Carol Willing
6ba45ee389 Merge pull request #2457 from minrk/gitignore
ignore pip-wheel-metadata
2019-03-07 06:14:50 -08:00
Carol Willing
af0082a16b Merge pull request #2435 from minrk/named-options-form
Rework handling of /hub/user/:name
2019-03-07 05:52:48 -08:00
Min RK
4bdca83c94 ignore pip-wheel-metadata
a new temp file pip is creating
2019-03-07 10:38:14 +01:00
Min RK
4183d45ab3 create _upgrade_094 database for testing upgrades from 0.9.4 2019-03-07 10:37:16 +01:00
Min RK
674ae9b4fc Merge pull request #2455 from javabrett/javabrett-patch-1
Added -p 8000:8000 to jupyterhub Docker quick start command.
2019-03-07 10:35:37 +01:00
Min RK
ff283ae636 address review
and fix a mis-applied GitHub suggestion

suggestions can only replace one line
2019-03-07 10:33:37 +01:00
Carol Willing
76eabb2de8 comment
Co-Authored-By: minrk <benjaminrk@gmail.com>
2019-03-07 10:30:36 +01:00
Carol Willing
2fbcb16190 docstring formatting
Co-Authored-By: minrk <benjaminrk@gmail.com>
2019-03-07 10:27:54 +01:00
Carol Willing
5d5ebb2583 docstring clarification
Co-Authored-By: minrk <benjaminrk@gmail.com>
2019-03-07 10:27:20 +01:00
Carol Willing
49b9a9f017 spacing
Co-Authored-By: minrk <benjaminrk@gmail.com>
2019-03-07 10:26:53 +01:00
Carol Willing
aa60d948bb docstring formatting
Co-Authored-By: minrk <benjaminrk@gmail.com>
2019-03-07 10:26:19 +01:00
Carol Willing
37d4d0e140 Update jupyterhub/handlers/pages.py
Co-Authored-By: minrk <benjaminrk@gmail.com>
2019-03-07 10:25:28 +01:00
Carol Willing
e86622b921 quote options_form
Co-Authored-By: minrk <benjaminrk@gmail.com>
2019-03-07 10:24:01 +01:00
Min RK
0d86c4ecf5 allow arbitrary data types in JSONDicts in the db
via json default encoder and object hooks
2019-03-06 13:48:12 +01:00
Min RK
249f39cf46 Merge pull request #2447 from mpetroff/patch-1
Allow for proper logging of IP addresses when using separate TLS termination
2019-03-06 13:21:45 +01:00
Matthew Petroff
8f3532e191 Make list of trusted downstream IP addresses configurable. 2019-03-05 17:56:09 -05:00
Min RK
27d0f62cd2 Merge pull request #2444 from rkdarst/contributing-docs
Contributing: hint on pre-commiting commits that are already there
2019-03-05 09:42:16 +01:00
Matthew Petroff
a31dadacb2 Trust localhost X-headers.
Trusting localhost X-headers allows for properly logging IP addresses while
using separate TLS termination. Otherwise, they're recorded as 127.0.0.1.
2019-02-28 13:58:07 -05:00
Min RK
59fa95acf4 add 0.9.4 to list of old jupyterhub database versions to test 2019-02-28 14:42:14 +01:00
Min RK
32c3fb01d4 handle long upgrade (spawner table doesn't exist) 2019-02-28 14:41:02 +01:00
Min RK
ddc852d658 persist user_options
remember user_options from the previous run

this allows user options set via spawn form to be re-used when restarting e.g. a named server via the api
2019-02-28 14:27:47 +01:00
Brett Randall
01bc8584a2 Added -p 8000:8000 to jupyterhub Docker quick start command. 2019-02-28 11:27:54 +11:00
Richard Darst
6524f38125 Contributing: hint on pre-commiting commits that are already there 2019-02-27 19:38:04 +02:00
Richard Darst
50c16239d2 Fix extraneous bullet point at end of separate-proxy.mb 2019-02-27 19:29:36 +02:00
Richard Darst
bfdec8f22e Fix file ending, pre-commit check 2019-02-27 19:27:20 +02:00
Min RK
25aa892f86 Merge pull request #2443 from rcthomas/erase-link-on-stop
Hide/unhide link
2019-02-27 18:11:52 +01:00
Rollin Thomas
5dedfe2629 Hide/unhide link 2019-02-27 08:49:34 -08:00
Tim Head
699b317d54 Merge pull request #2438 from minrk/check-lists
suppress deprecation warnings when testing deprecations
2019-02-27 17:05:19 +01:00
Tim Head
b1622ec745 Merge pull request #2439 from minrk/catch-entrypoints
catch errors loading entrypoints when generating config
2019-02-27 16:55:52 +01:00
Min RK
3cbcddad83 [WIP] changelog for 1.0 2019-02-27 16:47:56 +01:00
Min RK
35d888e91e make sure new spawner methods are documented 2019-02-27 16:47:46 +01:00
Min RK
20be7f98f7 [doc] enable autostructify 2019-02-27 16:47:32 +01:00
Min RK
a39d8aca30 catch errors loading entrypoints when generating config
avoids an entrypoint with missing dependencies preventing help output / config file generation
2019-02-27 15:56:27 +01:00
Min RK
453ae6e97b one more wait through spawn-pending 2019-02-27 15:31:10 +01:00
Min RK
89c85aca37 if no referer is given, assume the worst
only way to avoid redirect loops if referers are not set (e.g. python requests)
2019-02-27 15:21:22 +01:00
Min RK
87c276f425 suppress deprecation warnings when testing deprecations 2019-02-27 15:09:48 +01:00
Richard Darst
4ec92f9f14 Add the separate-proxy documentation 2019-02-27 12:21:21 +02:00
Min RK
8d01b0356b test spawn-pending page 2019-02-27 11:15:15 +01:00
Min RK
81a43a588b enable debug logging in mocksu
for tests
2019-02-27 11:13:34 +01:00
Min RK
8ea5a957a6 only start ?redirects counter if we are starting from a /user/:name -> /hub/user/:name redirect 2019-02-27 11:13:10 +01:00
Min RK
fee81c7d33 handle spawn-pending in user-redirect tests 2019-02-27 09:57:58 +01:00
Min RK
0dd291ae5c one more time for the consistent test_login_redirect cases 2019-02-26 15:47:21 +01:00
Min RK
db3f62b79a try harder to make a useful error message when API requests are made to a not-running server
include link to spawn page
2019-02-26 11:57:36 +01:00
Min RK
f8add6ae6d fix local-redirect check for subdomains 2019-02-26 11:56:28 +01:00
Min RK
d1f115d951 wait for spawner to start before talking to it 2019-02-25 16:55:53 +01:00
Min RK
fab5c33796 handle spawn-pending redirects in some tests
avoids issues with assuming that spawn is quick
2019-02-25 16:10:51 +01:00
Min RK
4ab525ab5f test spawn form with named server 2019-02-25 15:57:32 +01:00
Min RK
1185619bf6 update tests for changed redirects
- handle 503 on not running /hub/user/:name
- handle new spawn-redirect page
2019-02-25 15:43:50 +01:00
Min RK
4b1d80203e redact cookie headers in error logs 2019-02-25 14:49:13 +01:00
Min RK
d8cabdb90f Merge pull request #2433 from Carreau/document_admin_group
document admin_group
2019-02-25 14:32:38 +01:00
Min RK
947b9b1a9e rework handing of /user/:name
- /user/:name no longer triggers implicit spawn at any point
- add /spawn-pending/:user/:server handler for pending page. This page has no side effects.
- spawn links point to /spawn/:user/:server to finish hooking up links for named servers and options_form handling
2019-02-25 14:21:34 +01:00
Min RK
6f63ac7831 simplify start-server links as pure links to /spawn/:user/:server
instead of API requests

this gets better progress-page loading and options form rendering
2019-02-25 13:45:02 +01:00
Min RK
0c028c7186 import parsing of Accept header
used to determine if a request expects JSON or not
2019-02-25 13:44:10 +01:00
Min RK
1498707ac9 nicer repr of Server objects
we had a nice repr on orm.Server, let's bring it back
2019-02-25 13:42:48 +01:00
Min RK
de20c3f3a7 accept default argument in get_next_url
allows different defaults for different contexts
2019-02-25 13:41:38 +01:00
Richard Darst
0df552e2a1 Add documentation on running the proxy separate from the hub.
- It took me a bit longer than I would have liked for me to figure out
  how to run the proxy separate from the hub.  When I had to do this a
  second time for a different hub, it also took me too long.
- This adds a page dedicated to running the proxy separate from the
  hub, since it is relatively easy and has a high usability
  improvement.
- Currently work in progress.
2019-02-22 16:30:14 +02:00
Matthias Bussonnier
b4c53a29a9 document admin_group 2019-02-21 21:53:29 -08:00
Matthias Bussonnier
ca67757269 Merge pull request #2432 from Carreau/entrypointsplural
Entrypoints is plural
2019-02-21 17:21:22 -08:00
Matthias Bussonnier
aaa4deeed0 Entrypoints is plural
Of course both package exists...
2019-02-21 17:19:59 -08:00
Matthias Bussonnier
bda8671807 Merge pull request #2431 from Carreau/fix-docs-builds
Entrypoint is necessary to build the API docs of most authenticators
2019-02-21 17:05:54 -08:00
Matthias Bussonnier
4d75c16335 Entrypoint is necessary to build the API docs of most authenticators 2019-02-21 11:28:02 -08:00
Min RK
b5f6547e64 Merge remote-tracking branch 'origin/master' into named-options-form 2019-02-21 13:25:20 +01:00
Carol Willing
17aee17c5f Merge pull request #2418 from minrk/autoformat
Adopt black, pre-commit
2019-02-21 02:50:04 -08:00
Min RK
2f99104f57 a couple fixups after autoformatting 2019-02-19 17:04:37 +01:00
Min RK
80519f4fd0 consistency in CONTRIBUTING.md 2019-02-19 17:01:09 +01:00
Min RK
1531e94cc7 pre-commit is a dev requirement 2019-02-19 17:00:13 +01:00
Min RK
43c3ac78fc run lint test early 2019-02-19 17:00:13 +01:00
Min RK
9cc6aa9b6d describe pre-commit setup in CONTRIBUTING.md 2019-02-19 17:00:13 +01:00
Min RK
031cb6076a run pre-commit on travis
to verify that autoformatting has been run

include hopefully helpful message if it fails
2019-02-19 17:00:13 +01:00
Min RK
5e60582ef3 run autoformat
apologies to anyone finding this commit via git blame or log

run the autoformatting by

    pre-commit run --all-files
2019-02-19 17:00:10 +01:00
Min RK
ca198e0363 add pre-commit config
various simple fixes (space, newlines), plus two big ones:

- reorder imports
- run black
2019-02-19 16:59:11 +01:00
Min RK
d14a4bbe2c add black configuration 2019-02-19 16:59:11 +01:00
Min RK
ada8582768 pass flake8 on examples
define flake8 builtins for config files (c, get_config)
2019-02-19 16:59:11 +01:00
Min RK
856923b35f Merge pull request #2308 from vilhelmen/post_auth_hook
post_auth_hook processor
2019-02-19 16:56:27 +01:00
Min RK
39902a7140 async fixes in post_auth_hook 2019-02-19 16:07:32 +01:00
Will Starms
8524556b33 Add croutine support, force dict return
Also fix weird typo in example code
2019-02-15 15:37:23 +01:00
Will Starms
7c36ac93ba post_auth_hook processor
Does what it sounds like, allows an arbitrary function to be called right before the return in `get_authenticated_user`
2019-02-15 15:36:03 +01:00
Min RK
fec3d959f2 Merge pull request #2268 from vilhelmen/auth_data_sharing
Share authenticated dict with auth functions
2019-02-15 15:33:36 +01:00
Min RK
52d8f74eb1 Merge pull request #2397 from rkdarst/pam_normalize_username
pam_normalize_username option: round-trip usernames through PAM to normalize
2019-02-15 15:17:28 +01:00
Min RK
701b93d226 check_group_whitelist is optional 2019-02-15 15:09:56 +01:00
Min RK
bb83bb47d8 auth: apply adaptation to deprecated signature in init
applies/warns in init, ensures compatibility with a wrapper

rather than warning/calling differently at call time, which won't take effect everywhere
2019-02-15 13:22:06 +01:00
Min RK
1ba47d4a3d Merge branch 'master' into auth_data_sharing 2019-02-15 13:03:09 +01:00
Min RK
8c76f2b30c Merge pull request #2414 from minrk/threads
add an additional case for idle ThreadPoolExecutor threads
2019-02-15 11:16:30 +01:00
Min RK
a7c3ea0906 Merge pull request #2346 from minrk/push-activity
push last_activity to the hub
2019-02-15 11:16:12 +01:00
Min RK
fa2cb33b27 Merge pull request #2415 from consideRatio/async-options-form
Allow callable options_form to return an empty form
2019-02-15 10:49:32 +01:00
Erik Sundell
32706963ae Add test for falsy callable options_form 2019-02-14 16:50:07 +01:00
Erik Sundell
fb4c920996 Allow callable options_form to return an empty form
Closes #2390

This is meant to allow us dynamically decide to bypass the option form
even though it is a async function that in itself evaluates truthy.
2019-02-14 16:49:27 +01:00
Min RK
370ec4f5c7 remove unused sp
we need to ensure the spawners exist,
but we do that when we set last_activity
2019-02-14 16:01:51 +01:00
Min RK
5e77e448bd add an additional case for idle ThreadPoolExecutor threads
this is what they look like in Python 3.7
2019-02-12 16:00:07 +01:00
Min RK
7c46fe74a5 Merge pull request #2413 from minrk/redirect
add missing trailing slash in / -> /hub/ redirect
2019-02-12 15:04:47 +01:00
Min RK
dcdb8d8a89 add missing trailing slash in / -> /hub/ redirect 2019-02-11 17:29:45 +01:00
Min RK
087dd0fcd2 Merge pull request #2330 from Deepakdubey90/jupyterhub-oracle-integration
Modified JSON-DICT Implementation from TEXT to Text
2019-02-11 16:41:47 +01:00
Min RK
33a139861b notmybestwork: avoid updating user activity with server api access
this isn't the most important metric (server.last_activity is),
but avoid *probable* server api access incrementing user.last_activity
2019-02-11 16:18:37 +01:00
Min RK
d8d1b6c149 test activity api 2019-02-11 16:17:23 +01:00
Min RK
a2f5a0bea9 tolerate mocks for user.name
lots of testing uses mock Users, so tolerate the absence of user.escaped_name
2019-02-11 15:34:46 +01:00
Min RK
0063752a7f push activity to hub via api
servers publish activity on a regular interval (default: 5m)
2019-02-11 15:03:17 +01:00
Min RK
297f6988bd debug logs at beginning/end of user.stop 2019-02-11 15:03:17 +01:00
Richard Darst
a6d217d113 pam_normalize_username: add docs 2019-02-07 01:35:18 +02:00
Min RK
e51ea3f2be s/TEXT/Text/ 2019-02-06 14:02:08 +01:00
Min RK
bf36f9fc9a use Text instead of TEXT
TEXT is wrong on Oracle, LargeBinary is wrong everywhere else.

Text seems to be the high-level type that maps to the right thing both places.
This results in no change on supported implementations, as Text == TEXT there.
2019-02-06 13:47:40 +01:00
Min RK
b196dd2bea add activity spec to rest api 2019-02-06 13:15:42 +01:00
Min RK
10191f43fe add alabaster_jupyterhub to docs/requirements.txt 2019-02-06 13:15:11 +01:00
Min RK
342f40c8d7 Merge pull request #2404 from minrk/deprecations
fix some deprecation warnings in tests
2019-02-05 13:49:12 +01:00
Min RK
895bc378df Merge branch 'master' into deprecations 2019-02-05 13:06:28 +01:00
Min RK
00cafc8392 Merge pull request #2342 from minrk/expire-auth
allow auth to expire
2019-02-05 13:05:00 +01:00
Min RK
a6d0c36594 allow bypassing proxy in api_request
needed when testing that the proxy is down
2019-02-05 12:40:55 +01:00
Min RK
71a8573fdb fix some deprecation warnings in tests
Calling HasTraits(attr=value) doesn't work for non-traits

1. remove one redundant assignment for a non-trait
2. make one attribute a trait
2019-02-05 11:38:42 +01:00
Min RK
2715607361 make api requests via public url
to ensure cookies are properly set
2019-02-05 11:27:49 +01:00
Min RK
f2bfe6cd96 set Referer when testing cookie-authenticated api requests
Referer is checked for cookie-authenticated requests
2019-02-04 16:10:09 +01:00
Min RK
9008d5eea4 import mock from stdlib 2019-02-04 15:46:12 +01:00
Min RK
d340fc056e import mock from stdlib 2019-02-04 15:45:47 +01:00
Min RK
f3e1b95147 Merge pull request #2402 from consideRatio/readme-badge
Opinionated update of badges
2019-02-04 15:42:48 +01:00
Min RK
b5aa53fe7b only refresh auth of Users 2019-02-04 12:57:10 +01:00
Min RK
96c16bfb85 missing escape in normalize_timestamp 2019-02-04 12:56:53 +01:00
Richard Darst
d33226f3c2 Don't use super() when normalizing username using PAM
- We don't need the extra normalization of that function.
- Also add in username_map support here.  It probably isn't needed
  most of the time with PAM, but it keeps things consistent and is
  easier than documenting an exception.
2019-02-03 00:37:06 +02:00
Erik Sundell
78fe52bfb8 Remove google group badge 2019-02-02 14:59:28 +01:00
Erik Sundell
383cd6e73d Add github/discourse/gitter badges 2019-02-02 14:59:16 +01:00
Erik Sundell
25fa0f739f Remove 0.7.2 docs badge 2019-02-02 14:58:45 +01:00
Min RK
919b6a8d6c Merge pull request #2375 from dtaniwaki/limit-nb-num-per-user
Limit max named server per user
2019-01-31 13:33:14 +00:00
Richard Darst
92223b1dde pam_normalize_username option: round-trip usernames through PAM to normalize 2019-01-28 13:43:29 +02:00
Daisuke Taniwaki
9a0f7286bc Add tests for named server limit 2019-01-19 16:27:30 +09:00
Daisuke Taniwaki
71f2b73c36 Update error message of named server limit 2019-01-19 15:48:35 +09:00
Daisuke Taniwaki
b34bdd2846 Limit max named server per user 2019-01-19 15:48:35 +09:00
Min RK
392e432071 Merge pull request #2377 from minrk/travis-upgrade
add upgrade to pip install
2019-01-16 16:40:10 +01:00
Min RK
09e48546ab pin oauthlib < 3
while we work out why 3 doesn't work anymore
2019-01-16 15:54:58 +01:00
Min RK
77ecdbe12a add upgrade to pip install
to ensure version compatibility
2019-01-08 14:38:39 +01:00
Min RK
1431c5a21a test coverage for auth expiry 2019-01-04 11:54:20 +01:00
Min RK
8c63f669a9 consolidate some test utilities in utils
instead of in test_api, test_pages

since they are used in a few places

also add user, username fixtures for generating test users
2019-01-04 11:03:20 +01:00
Min RK
c009b39795 auth_refresh_age is on Authenticator 2019-01-03 12:36:47 +01:00
Min RK
dfd808b90e Merge pull request #2344 from adelcast/dev/adelcast/quotes_fix
Spawner.py: do not quote Popen args
2019-01-03 11:58:34 +01:00
Min RK
75e46fc111 Merge pull request #2370 from dnelson86/patch-1
Update docs: deployments
2019-01-03 11:57:43 +01:00
Min RK
337a0118c0 Merge pull request #2365 from rcthomas/change-id-to-class-named-servers
Change id selector to class selector for named servers
2019-01-03 11:56:34 +01:00
Dylan Nelson
2ee355d6a4 Update docs: deployments
Add IllustrisTNG public data release deployment.

Also add link for MIT, and delete jcloud.io (seems to no longer exist).
2018-12-30 15:04:21 +01:00
Min RK
4fa0876d91 implement refresh_pre_spawn
- redirect to login if vanlig user spawn
- fail with 400 otherwise
2018-12-21 15:32:58 +01:00
Alejandro del Castillo
46d4e2898d get_args: only quote if necessary
Traitlets require quotes around literals, to avoid interpreting them as
as datatypes other than string. However, quotes are problematic on the
notebook_dir case. On Windows, Popen will mis-interpret the quotes and
escape them, which trips the process spawn. To avoid problems, only
quote if necessary.

Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
2018-12-20 17:24:47 -06:00
Rollin Thomas
4e410473cb Fix to find element 2018-12-20 13:35:36 -08:00
Rollin Thomas
fdddd7d58c Change select from id to class for multiple choice 2018-12-20 13:03:36 -08:00
Min RK
563106c0d2 allow auth to expire
adds Authenticator.auth_refresh_age and Authenticator.refresh_pre_spawn config

- auth_refresh_age allows auth to expire (default: 5 minutes) before calling Authenticator.refresh_user.
- refresh_pre_spawn forces refresh prior to spawn (in case of auth tokens, etc.)
2018-12-14 15:27:38 +01:00
Min RK
b6d8db5259 Merge pull request #2322 from ausecocloud/master
UserTokenListAPIHandler support Authenticator.authenticate returning a dict
2018-12-14 12:43:46 +01:00
Min RK
5e67bd773f Merge pull request #2205 from willingc/bump-dep
bump bootstrap version
2018-12-14 12:43:16 +01:00
Min RK
aaab44090d bootstrap 3.4.0 2018-12-14 10:58:21 +01:00
Min RK
7b154fcc45 Merge branch 'master' into master 2018-12-14 10:51:47 +01:00
Min RK
d2779061b0 Merge pull request #2358 from minrk/rm-pytest-tornado
switch from pytest-tornado to pytest-asyncio
2018-12-14 10:44:24 +01:00
Min RK
3e20642b31 Merge pull request #2359 from minrk/deprecated-event.listen
use non-deprecated event to register foreign_keys connection listener
2018-12-14 10:44:09 +01:00
Min RK
a46032b549 use non-deprecated event to register foreign_keys connection listener 2018-12-12 15:41:09 +01:00
Min RK
8ca8225cef Python 3.5-friendly async context manager 2018-12-12 13:45:36 +01:00
Min RK
0e6cf6a485 Merge pull request #2353 from vilhelmen/pam_admin_groups_fix
Fix PAMAuthenticator is_admin
2018-12-12 13:43:38 +01:00
Min RK
37cdba370f update tests for pytest-asyncio
- remove gen_test marker
- use async def
- find/replace yield->await approximately one million times
2018-12-12 13:06:10 +01:00
Min RK
d5f87fe09f update fixtures for pytest-asyncio
instead of pytest-tornado

verify that we don't make any async generator tests
which would pass silently without running any tests
2018-12-12 12:49:54 +01:00
Min RK
2930fa9cc9 Merge pull request #2355 from chang-zhijie/master
accept token in Authorization header in services, not just url
2018-12-11 15:34:48 +01:00
chang-zhijie
53c3201c17 store tokens passed via url or header, not only url. 2018-12-11 17:00:16 +08:00
Will Starms
4229d68d23 Fix bad tester/code 2018-12-06 15:32:49 -06:00
Tim Head
8b0bdc71bc Merge pull request #2347 from minrk/one-flakey-flake
Don’t mix no_patience and bad_spawn
2018-12-04 17:54:31 +01:00
Min RK
47e66580db Don’t mix no_patience and bad_spawn
this introduces a race between the early RuntimeError being tested
and the no_patience causing handlers to return early if async start isn’t complete.

With tornado coroutines, an early RuntimeError could be guaranteed to resolve promptly, but asyncio isn’t as consistent,
possibly causing some of the recent flaky tests.
2018-12-04 15:02:53 +01:00
Tim Head
c360777ee0 Merge pull request #2345 from jupyterhub/willingc-patch-1
Update incorrect anchor
2018-12-04 08:08:03 +01:00
Carol Willing
05874e9f81 Update incorrect anchor
Closes #2338
2018-12-03 20:33:22 -08:00
Tim Head
c3e1d5313d Merge pull request #2343 from clemens-tolboom/patch-1
Fix markdown link into rst
2018-12-03 22:09:54 +01:00
Clemens Tolboom
4b36dce29f Fix markdown link into rst 2018-12-03 19:05:50 +01:00
Chia-liang Kao
d84ad44b74 actually spawn with server_name 2018-12-02 21:28:05 +08:00
Chia-liang Kao
b60468d2b6 _render_form requires server_name as well 2018-12-02 21:07:45 +08:00
Chia-liang Kao
35d041a701 fix regex 2018-12-02 20:14:50 +08:00
Chia-liang Kao
045ba0671b Support named server with option form 2018-12-02 16:07:38 +08:00
Min RK
bbc2847530 Merge pull request #2297 from minrk/check-url-startup
handle partial launches on startup
2018-11-30 15:11:27 +01:00
Min RK
887f2a2c24 it's spawner.name 2018-11-29 17:14:29 +01:00
Min RK
2b265b2529 Check if a Spawner is running at the given URL on startup
avoids assuming partial spawns that may have resulted in running processes but not actually available servers
are treated as fully working servers.
2018-11-28 12:44:58 +01:00
Min RK
f0da8a75b0 Merge pull request #2333 from kinow/remove-auth-unused-dependency
Remove unused import
2018-11-28 12:43:29 +01:00
Bruno P. Kinoshita
9aa2110409 Remove unused dependency 2018-11-28 14:41:48 +13:00
pydeepak
047bd4e7cc Fixed incorrect import 2018-11-27 08:42:28 +05:30
pydeepak
10d781c570 Modified Json Implementation from Text to LargeBinary. 2018-11-27 08:39:46 +05:30
Gerhard Weis
c2aa7f1748 call base handler self.authenticate instead of accessing authenticator directly 2018-11-27 06:41:36 +10:00
Min RK
4ace113965 Merge pull request #2326 from minrk/document-api-options
Document specifying spawn options via api
2018-11-26 14:26:16 +01:00
Min RK
69933e240f document specifying options via rest api 2018-11-23 16:06:38 +01:00
Gerhard Weis
9ac6ed344c UserTokenListAPIHandler should support Authenticator.authenticate returning a dict 2018-11-22 14:33:48 +10:00
Min RK
c9c0d3723b Merge pull request #2309 from adelcast/dev/adelcast/refresh_user
refresh_user: add handler parameter
2018-11-16 14:52:55 +01:00
Min RK
c09876cbe2 Merge pull request #2315 from adelcast/dev/adelcast/move_pwd
LocalSpawner: move pwd module import inside functions
2018-11-16 14:52:38 +01:00
Min RK
6bb4d27a3f Merge pull request #2313 from adelcast/dev/adelcast/entry_points
setuptools entrypoints instead of scripts
2018-11-16 14:45:10 +01:00
Min RK
48c3a3a834 Merge pull request #2307 from vilhelmen/getpwnam_dedupe
getgrnam/getpwnam/getgrouplist refactor
2018-11-16 14:44:12 +01:00
Alejandro del Castillo
24dcb4b783 LocalSpawner: move pwd module import inside functions
Windows doesn't have a pwd module. To avoid an import error on Windows,
move import statement inside functions that use pwd.

Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
2018-11-15 16:08:30 -06:00
Will Starms
22d6f48bb8 Make functions private 2018-11-15 15:20:34 -06:00
Alejandro del Castillo
df98fb012e refresh_user: add handler parameter
The current request handler might be needed to determine if the auth
data needs to be refreshed.

Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
2018-11-15 13:21:24 -06:00
Min RK
ea44ab0c85 Merge pull request #2312 from choldgraf/roadmap
[MRG] moving the roadmap to this repo
2018-11-15 19:55:35 +01:00
Alejandro del Castillo
b1759c8882 setup.py: add automatic script generation
Use setuptools console_scripts functionality to create top level jupyter
& jupyterhub-single user entry point scripts on *nix, and executables on
Windows.

Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
2018-11-15 09:53:29 -06:00
Min RK
c633d87f1e Merge pull request #2296 from pelson/logo_in_page_template
Add a logo block, and update the docs regarding base.html.
2018-11-15 12:44:15 +01:00
Min RK
680e829824 Merge pull request #2303 from minrk/check-in-cache
HubAuth: allow caching None responses
2018-11-15 12:26:38 +01:00
Chris Holdgraf
891a352f42 updating circle for docs and adding a roadmap 2018-11-14 21:20:26 -08:00
Will Starms
df829e8927 Move getpwnam/grnam/grouplist to LocalAuthenticator
Also fix up an old test of mine
2018-11-13 14:48:12 -06:00
Will Starms
f2ae3af90e Switch to existing getpwnam function
To be honest, `getgrouplist`, `getpwnam`, and `getgrnam` should be static methods in LocalAuthenticator
2018-11-13 13:53:54 -06:00
Will Starms
62b991649b Share authenticated dict with auth functions
Adds a compatibility fix to be removed at a future date for the check_x functions.
2018-11-13 11:44:49 -06:00
Min RK
767dce29f4 Merge pull request #2301 from DataVictorEngineer/patch-1
Apache reverse proxy customization for jupyterhub
2018-11-12 14:41:19 +01:00
Min RK
7f1c91d8f4 Clear the auth cache when testing the same url twice with different results 2018-11-12 14:35:47 +01:00
Min RK
3a0bacde3a HubAuth: allow caching None responses
when a token doesn't identify a user, the response is None.
These results are cached, but the cache checked for `is None`,
causing failed-auth responses to effectively not be cached.
2018-11-12 12:56:41 +01:00
DataVictorEngineer
7f12418e4c Apache reverse proxy customization for jupyterhub
This is the modification to run the Jupyterhub using the custom url: http://127.0.0.1:8000/jhub/.
2018-11-11 22:45:30 +02:00
Min RK
40013f7292 Merge pull request #2298 from katsar0v/master
improve condition when failing api request, check if user exists, aft…
2018-11-09 20:56:07 +01:00
Kristiyan
2070c8c102 improve condition when failing api request, check if user exists, afterwards check if user is not active 2018-11-09 18:17:40 +01:00
Min RK
eb19a73044 add Spawner.get_url
for retrieving the spawner url. Occurs on startup.

Default is a no-op and no Spawner needs to implement this.
2018-11-09 13:22:08 +01:00
Phil Elson
87ce499840 Add a logo block, and update the docs regarding base.html. 2018-11-09 06:36:17 +00:00
Min RK
9a3dbedc52 Merge pull request #2290 from katsar0v/master
add configuration for shutting down all user spawners on logout
2018-11-08 14:50:47 +01:00
Min RK
0cebb4c9d7 disable pytest minversion check
because it doesn't work with current pytest
2018-11-08 14:36:00 +01:00
Yuvi Panda
fc25b0e10d Merge pull request #2289 from minrk/move-simple
make simplespawner importable
2018-11-07 10:44:17 -08:00
Min RK
006b89746a use stop_single_user wrapper to stop user servers
rather than lower-level spawner.stop
2018-11-06 14:31:42 +01:00
Min RK
1f7838ba5f ensure async-requests is awaitable
so we can use await, not just yield
2018-11-06 14:30:51 +01:00
Min RK
e5e6876cef test shutdown_on_logout 2018-11-06 14:30:26 +01:00
Kristiyan
2686615304 add configuration for shutting down all user spawners on logout 2018-11-05 11:47:46 +01:00
Min RK
e512847652 use simplespawner as base for testing 2018-11-05 11:01:21 +01:00
Min RK
4fb158933e no-op move_certs in simplespawner 2018-11-05 11:01:06 +01:00
Min RK
575af23e23 register simplespawner in setup.py 2018-11-05 10:57:10 +01:00
Min RK
52c468d89c make home_dir a traitlet
so the property is only evaluated once and overrideable via hooks
2018-11-05 10:57:02 +01:00
Min RK
80e241c86f move simplespawner into jupyterhub.spawner 2018-11-05 10:55:40 +01:00
Min RK
c8199c6303 Merge pull request #2244 from vilhelmen/pam_admin_groups
admin_groups for PAMAuthenticator
2018-11-05 10:49:38 +01:00
Min RK
090f68bb21 Merge pull request #2264 from minrk/better-local-error
explain create_system_users when system users do not exist
2018-11-05 10:47:14 +01:00
Tim Head
5b4f0d4304 Merge pull request #2282 from yuvipanda/real-async-pre-spawn-hook
Document that pre_spawn_hook maybe a coroutine
2018-11-03 08:38:42 +01:00
yuvipanda
1efb8c765b Document that pre_spawn_hook maybe a coroutine 2018-11-02 17:19:16 -07:00
Will Starms
1c0d0daef8 admin_groups for PAMAuthenticator
Hoist admin status determination from authentication to a secondary function called by get_authenticated_user
Create mock objects for struct_group and struct_passwd, migrate existing mock group objects to it
Remove old admin mock stuff for authenticate
2018-10-30 11:26:37 -05:00
Min RK
302573e860 Merge pull request #2224 from tuhina2020/jupyter_2105
add metrics_authentication decorator to /metrics API #2105
2018-10-26 10:47:36 +02:00
Min RK
5e58fc60d4 Merge pull request #2260 from madmax2012/master
[docker] Bumped Miniconda to 4.5.11
2018-10-26 10:47:12 +02:00
Min RK
1322926d9b explain create_system_user when system users do not exist 2018-10-26 10:05:23 +02:00
Max Mensing
a64fa15fee Bumped Miniconda to 4.5.11 2018-10-24 09:36:55 +02:00
Min RK
71c620f38f Merge branch 'master' into jupyter_2105 2018-10-23 10:10:31 +02:00
Min RK
65d9ac3c61 Merge pull request #2257 from tmshn/health-check
Added health check endpoint
2018-10-23 09:52:14 +02:00
tmshn
f752e6df1e Added health check endpoint 2018-10-20 15:41:52 +09:00
Carol Willing
19bcb9cea0 Merge pull request #2255 from minrk/parallel-coverage
unpin coverage
2018-10-19 10:28:53 -07:00
Min RK
7b22330583 unpin coverage
need run.parallel = True in coveragerc to fix database errors with coverage 5

exclude the resulting .coverage.host.pid files in gitignore
2018-10-19 14:03:13 +02:00
Min RK
1be2b3721a Merge pull request #2243 from vilhelmen/write_error_log_fix
Try to create exception str before logging
2018-10-19 10:27:16 +02:00
Min RK
e53488cd64 Merge pull request #2253 from Carreau/sudo-selinux
Cleanup the sudo/selinux section
2018-10-19 09:33:47 +02:00
Min RK
fe5ca1a67e Merge branch 'master' into jupyter_2105 2018-10-19 09:31:45 +02:00
Matthias Bussonnier
0670423a3d Cleanup the sudo/selinux section 2018-10-18 14:03:00 -07:00
Min RK
e9620df5b5 Merge pull request #2249 from adibaba/master
Added Paderborn University
2018-10-18 10:39:36 +02:00
tuhina2020
2a425f4344 fix tests for unauthorised call to metrics API 2018-10-18 12:42:24 +05:30
Adrian Wilke
ee63002f21 Added Paderborn University 2018-10-17 21:28:38 +02:00
Min RK
2d94b2999f Merge pull request #2055 from LLNL/end-to-end-ssl
End-to-end SSL
2018-10-17 13:27:03 +02:00
Min RK
7a055e65db Catch and print errors stopping hub
in case it failed to fully start
2018-10-17 13:05:20 +02:00
Min RK
e385214121 empty groups, too 2018-10-17 13:04:42 +02:00
Min RK
b0116ee539 avoid cleaning users when we are testing resume 2018-10-17 11:02:06 +02:00
Min RK
301fed30b2 Delete users in MockHub
avoids pollution from one test module to the next
2018-10-17 10:38:19 +02:00
tuhina2020
e449b9c193 fix the condiiton for authentation 2018-10-17 10:39:00 +05:30
Will Starms
bafcf6bd23 Try to create exception str before logging
The str() method of an InterfaceError can raise when trying to iterate over an integer, causing the logger to act up.
2018-10-16 14:00:03 -05:00
Min RK
15788bec67 ensure user's own subdomain is in trusted alt names 2018-10-16 15:57:45 +02:00
Min RK
e921354544 run internal-ssl tests with external http
to cover any protocol mismatches
2018-10-16 15:57:45 +02:00
Min RK
eb7648abc2 consolidate trusted alt names
- trust subdomain_host by default
- JupyterHub.trusted_alt_names is inherited by Spawners by default. Do we need Spawner.ssl_alt_names to be separately configurable?
2018-10-16 15:46:50 +02:00
Min RK
9a45f4a8c9 add user- prefix to user cert dirs
avoids possible conflict e.g. if a user had the name 'hub-internal'
2018-10-16 15:45:49 +02:00
Min RK
1f3165859f avoid unnecessarily recreating proxy certs 2018-10-16 15:45:20 +02:00
Min RK
2d6e7186aa Merge pull request #2240 from GeorgianaElena/master
Small improvement of test coverage
2018-10-16 13:58:29 +02:00
GeorgianaElena
efde40cbbd Small improvement of test coverage 2018-10-16 12:40:18 +03:00
Min RK
f3c2a15e53 ensure AsyncIOMainLoop is registered in tests 2018-10-15 16:29:00 +02:00
Min RK
d64853a6f5 fix ssl tmpdir in tests
must be module-scoped, not session-scoped, or it will get reused inconsistently
2018-10-15 15:35:21 +02:00
Min RK
b72d887dd7 register cleanup before start
avoids leaving lingering proxy if app fails to start
2018-10-15 15:33:59 +02:00
Min RK
49ebf969c1 Merge pull request #2237 from spacetelescope/master
Add handler to spawner so you can access query params in form
2018-10-15 13:56:41 +02:00
tuhina2020
1a6b16d493 fix metrics_authentication method 2018-10-15 11:27:11 +05:30
Carol Willing
6fd7e27e95 Merge pull request #2234 from minrk/proxy-entrypoint
add entrypoint for configuring proxies
2018-10-12 10:49:34 -07:00
Min RK
28c6377db7 avoid modifying headers in-place
can have consequences if args are re-used
2018-10-12 17:05:59 +02:00
Min RK
67f21bb518 ssl tests can use configproxy 2018-10-12 16:26:42 +02:00
Min RK
7c0e113fbc Revert "Set change-origin so certs behind proxy work"
This reverts commit bcebf0ee7b.

Setting change-origin introduces CORS problems
2018-10-12 16:24:10 +02:00
Min RK
bc3ace60dc Merge branch 'master' into end-to-end-ssl 2018-10-12 16:17:26 +02:00
Min RK
ce2310b1ae update proxy docs to mention entrypoints 2018-10-12 11:11:13 +02:00
Min RK
6979a11bfa Merge pull request #2236 from mpolidori/master
Fix missing spaces in if statement in bootstrap-script and README
2018-10-12 11:10:10 +02:00
mpolidori
10a4ac4809 Update README.md 2018-10-12 00:50:30 -04:00
mpolidori
34341e7aac Update bootstrap.sh 2018-10-12 00:48:49 -04:00
tuhina2020
ac7ff491e1 Add tests for metrics API 2018-10-12 09:26:52 +05:30
Min RK
abd3bc13d2 add entrypoint for proxy implementations 2018-10-11 16:54:25 +02:00
Jacob Matuskey
ebed5c2f4b Add handler to spawner here so you can access query params in form rendering 2018-10-10 20:25:14 -04:00
Thomas Mendoza
bcebf0ee7b Set change-origin so certs behind proxy work 2018-10-09 16:25:23 -07:00
Min RK
95ee2cb709 Merge pull request #2220 from tuhina2020/master
Add server_stop_duration_seconds prometheus metric #14
2018-10-09 11:23:18 +02:00
Min RK
9faecccc9c Merge pull request #2223 from DeepHorizons/process_options_form
Let the options_from_form function be async
2018-10-08 16:03:59 +02:00
Min RK
49babdcae9 Merge branch 'master' into 2220 2018-10-08 16:02:27 +02:00
Min RK
ef3b29bc5d Merge pull request #2226 from minrk/pin-coverage
pin coverage due to bug in coveragepy 5 prerelease
2018-10-08 13:34:40 +02:00
Min RK
a2da7a5080 pin coverage due to bug in coveragepy 5 prerelease 2018-10-08 13:22:37 +02:00
Min RK
f37e44a6f7 Merge pull request #2225 from kuriakinzeng/master
correcting time.pref_counter to time.perf_counter in proxy.py
2018-10-08 13:01:43 +02:00
Kuriakin Zeng
d45b2a7c70 change time.pref_counter to time.perf_counter in proxy.py as pref_counter is invalid 2018-10-07 21:53:35 +08:00
tuhina2020
b0b7e8d25d add metrics_authentication decorator to /metrics API 2018-10-07 13:38:32 +05:30
Joshua Milas
7eba029d1f Let the options_from_form function be async
This commit lets users who interact with spawners and use options_form
to use an async function to process the form.
2018-10-05 23:18:27 -04:00
Thomas Mendoza
82d12b3eeb Merge branch 'end-to-end-ssl' of github.com:LLNL/jupyterhub into end-to-end-ssl 2018-10-05 16:02:31 -07:00
Thomas Mendoza
dd07495624 Fix public_url call with ssl testing enabled 2018-10-05 15:59:10 -07:00
tuhina2020
8783df8d8d binary statuses for SERVER_STOP_DURATION_SECONDS metric 2018-10-06 00:01:03 +05:30
Min RK
d4cce8cdff Merge pull request #2219 from kshitija08/metric_addition
Adding CHECK_ROUTES_DURATION_SECONDS metric #2183
2018-10-05 14:18:02 +02:00
Min RK
8a17afb6e3 Merge pull request #2221 from minrk/html5lib
add html5lib to test requirements
2018-10-05 14:12:33 +02:00
Min RK
2bbfde40f0 add html5lib
this is needed for bs4.
I'm not sure why it was there before, but not anymore
2018-10-05 14:03:27 +02:00
Min RK
7cf230ec1f Merge pull request #2218 from Carreau/no-backticks-commands-substitution
Use $() for command substitution instead of backticks/quotes.
2018-10-05 14:01:56 +02:00
tuhina2020
c5e2789324 Add SERVER_STOP_SECONDS metric 2018-10-05 10:33:58 +05:30
kshitija08
5d96076587 metrics.py 2018-10-05 10:25:07 +05:30
Matthias Bussonnier
2e872069fb Use $() for command substitution instead of backticks/quotes.
One of the example was using quotes instead of backticks.
Backticks are the "older" way of doing things, which has a number of
disadvantes:

    http://mywiki.wooledge.org/BashFAQ/082

Here I'm more worried about readability as depending on font and "smart"
editor helping on the web, many people may confuse ` with ', it could
end up modifying formatting on makrdown powered website... etc...
2018-10-04 13:44:16 -07:00
kshitija08
ae51870db5 user.py 2018-10-04 20:29:30 +05:30
kshitija08
7409ccad66 base.py 2018-10-03 22:02:10 +05:30
Min RK
cff066a7be Merge pull request #2210 from nils-werner/service-sys-executable
Replace python with sys.executable in most service examples
2018-10-03 10:43:56 +02:00
Min RK
a198124894 ssl tests need CHP master for now 2018-10-02 18:40:01 +02:00
Min RK
58f6659e40 implement .move_certs in dummy MockSpawner 2018-10-02 18:16:47 +02:00
Min RK
bd16299ffb Merge pull request #2207 from GeorgianaElena/master
add server_poll_duration_seconds prometheus metric
2018-10-02 13:41:29 +02:00
Min RK
7656adc8b0 expand logging of ssl cert creation 2018-10-02 13:11:40 +02:00
Min RK
4b3f9e5f42 more descriptive 'internal-ssl' certs location
and update/clarify ssl-related docstrings
2018-10-02 11:23:26 +02:00
Min RK
febb7c32c1 make alt names attributes on Spawner instead of args to create_certs 2018-10-02 11:21:38 +02:00
Min RK
94bb9ed00d remove NOTEBOOK from internal ssl env 2018-10-02 11:20:36 +02:00
Min RK
5fbd4f2d4e call make/move certs at a higher level
mostly to allow them to be async
2018-10-02 11:20:36 +02:00
Min RK
50f1decee7 move local-process move_certs implementation to LocalProcessSpawner 2018-10-02 11:20:36 +02:00
Min RK
c3176b0ca3 Do not set ownership in create_certs
Most Authenticators do not have local users, so this doesn't make sense at this stage
2018-10-02 11:20:36 +02:00
Min RK
f29354e0f4 Merge branch 'master' into end-to-end-ssl 2018-10-02 11:15:53 +02:00
GeorgianaElena
67b774faca fix missing import and resolve class attributes 2018-10-02 11:58:33 +03:00
Nils Werner
a08a839385 Replace python with sys.executable in most service examples 2018-10-02 09:42:54 +02:00
GeorgianaElena
425078652e add status as a label for server_poll_duration_seconds metric 2018-10-02 09:38:00 +03:00
Thomas Mendoza
76a6959cf0 Test to ensure connections with improper certs fail 2018-10-01 16:48:03 -07:00
Thomas Mendoza
b7b5cf2f2d Fix spawner tests for running with internal_ssl 2018-10-01 16:48:03 -07:00
Thomas Mendoza
2ff067be6d Formatting change only 2018-10-01 16:48:03 -07:00
Thomas Mendoza
2cd6a9e720 Supply certs to individual async_requests 2018-10-01 16:48:03 -07:00
Thomas Mendoza
ca33692459 Only test internal_ssl if the value is set in request 2018-10-01 16:48:03 -07:00
Thomas Mendoza
32bd8aa105 Verify the self-signed certs for the proxy 2018-10-01 16:48:03 -07:00
Thomas Mendoza
080ff7043e Set appropriate protocol for bind_url 2018-10-01 16:48:03 -07:00
Thomas Mendoza
c5102452e4 Move turning ssl on into __init__ 2018-10-01 16:48:03 -07:00
Thomas Mendoza
99f2905cab Use certs if available for test_api 2018-10-01 16:48:03 -07:00
Thomas Mendoza
34d59f66d9 Setup mock services to use certs from env 2018-10-01 16:48:03 -07:00
Thomas Mendoza
88b2954c90 Missed change in mocksu to pick up certs from env 2018-10-01 16:48:03 -07:00
Thomas Mendoza
d1aeff7bbf Fix issue where Mockub was not seeing ssl_enabled flag 2018-10-01 16:48:03 -07:00
Thomas Mendoza
371ef6cad8 Spawn under name 'service' if no username exists 2018-10-01 16:48:03 -07:00
GeorgianaElena
053b038e74 Merge branch 'master' of https://github.com/jupyterhub/jupyterhub 2018-10-01 18:31:18 +03:00
Min RK
acdd9bb674 Merge pull request #2203 from minrk/entrypoints
allow spawners and authenticators to register via entry points
2018-10-01 17:22:11 +02:00
Tim Head
bc4844df3f Merge pull request #2208 from choldgraf/pip
pip command update
2018-10-01 10:29:39 +02:00
Chris Holdgraf
372af86250 rst code syntax in docs 2018-09-29 09:09:31 -07:00
Thomas Mendoza
a13f4197d4 Move proxy cert creation into .init_internal_ssl 2018-09-28 16:33:18 -07:00
Yuvi Panda
356e71709a Merge pull request #2197 from minrk/rm-null-string
Expand DummyAuthenticator docstring
2018-09-28 16:00:49 -07:00
Chris Holdgraf
c48988afcb pip command update 2018-09-28 12:00:28 -07:00
GeorgianaElena
48b0658a52 add server_poll_duration_seconds prometheus metric 2018-09-28 20:20:14 +03:00
Carol Willing
9fa4106c04 bump bootstrap version 2018-09-28 07:45:22 -07:00
Min RK
8a7ab7bc78 Merge pull request #2198 from kshitija08/master
spawners/simplespawner.py
2018-09-28 13:47:18 +02:00
Min RK
d3ae59eea6 Merge branch 'master' into master 2018-09-28 13:46:24 +02:00
kshitija08
6a7cb3dcc8 jupyterhub_config.py 2018-09-28 17:14:05 +05:30
Min RK
7f2050b522 expand docstring for DummyAuthenticator 2018-09-28 10:12:15 +02:00
Min RK
3c35aeb9a8 remove null password
preserve password type by using Falsy empty string for no password set
2018-09-28 10:11:03 +02:00
Min RK
c02ab23b3d allow spawners and authenticators to register via entrypoints
jupyterhub.authenticators for authenticators, jupyterhub.spawners for spawners

This has the effect that authenticators and spawners can be selected by name instead of full import string (e.g. 'github' or 'dummy' or 'kubernetes')
and, perhaps more importantly, the autogenerated configuration file will include a section for each installed and registered class.
2018-09-28 10:08:10 +02:00
Min RK
3a06310d37 Merge pull request #2201 from kyla-harper/master
Add DummyAuthenticator documentation
2018-09-28 10:05:27 +02:00
Kyla Harper
22b9a5e5dc Add DummyAuthenticator tests 2018-09-27 21:36:45 -05:00
kshitija08
75fd4b2525 jupyterhub_config.py 2018-09-27 23:04:36 +05:30
Kyla Harper
a78655c5a7 Add DummyAuthenticator documentation 2018-09-27 11:42:06 -05:00
Min RK
fa79e233b7 Merge pull request #2196 from choldgraf/copybutton
add a copy button to code cells
2018-09-27 14:13:56 +02:00
kshitija08
1e174e1abc tetsing/ 2018-09-27 16:48:22 +05:30
kshitija08
a87b2e680c init.py 2018-09-27 16:44:28 +05:30
Min RK
ec6123d39d include sphinx-copybutton in docs/requirements.txt 2018-09-27 12:58:51 +02:00
kshitija08
f381c2e649 spawners/simplespawner.py 2018-09-27 16:17:37 +05:30
Tim Head
5c3530cc7f Merge pull request #2195 from yuvipanda/better-upgrade
Expand & update documentation on upgrading JupyterHub
2018-09-27 09:56:08 +02:00
yuvipanda
6ca5b3aa70 Fixup upgrade toctree in index.rst 2018-09-27 00:16:24 -07:00
yuvipanda
e6a5dd1273 Fixes per @betatim & @choldgraf 2018-09-27 00:13:07 -07:00
yuvipanda
358b830747 Expand & consolidate upgrade documentation
- Expands the previous documentation on upgrading JupyterHub
  to include more information.
- Remove specific documentation on 0.7 -> 0.8 upgrade, since
  this seems to be a straight copy of the markdown version of
  upgrading docs. The important thing about the 0.7 -> 0.8 upgrade
  (requiring versions of JupyterHub to match) is now in the
  main document.
- Move from markdown to rst
2018-09-26 23:53:51 -07:00
yuvipanda
a91e94dd16 Re-order 'upgrading' section in main documentation page
Info on upgrading is important & relevant. This consolidates
the index to be a bit better. Next step is to consolidate the
documentation into one page.

Removes the 'tutorials' index page as well, since that only
had a reference to z2jh (which is now referenced from the
'distribution' section). The distribution section has
better visibility too
2018-09-26 23:53:19 -07:00
Chris Holdgraf
26f31a11f7 Merge pull request #2194 from yuvipanda/pip-cleanup
Use python3 -m pip explicitly in docs
2018-09-26 23:20:10 -04:00
Chris Holdgraf
3dc0a8388b copy button 2018-09-26 18:34:51 -04:00
Yuvi Panda
acc1fe9274 Merge pull request #2193 from kyla-harper/master
Add DummyAuthenticator
2018-09-26 12:17:08 -07:00
yuvipanda
7c273296c2 Use python3 -m pip explicitly in docs
- Add a documentation convention listing this too.

Fixes #2191
2018-09-26 12:14:43 -07:00
Kyla Harper
815034f0f1 Merge branch 'master' of https://github.com/jupyterhub/jupyterhub 2018-09-26 14:04:15 -05:00
Min RK
c8c39aa40d Merge pull request #2154 from minrk/named-ui
named-server UI
2018-09-26 14:28:30 +02:00
Min RK
b34119c908 Merge pull request #2190 from yuvipanda/contributing-docs
Expand contributing docs
2018-09-26 13:24:52 +02:00
yuvipanda
b9331dbd57 Reformat index.rst to get linkable sections
Currently, the sections in index.rst are using ** for bold,
rather than true section headers. This prevents them from being
linkable. Since we'd like to link to the 'contributing' section
from CONTRIBUTING.md, we change this by moving everything to
section headers. We also move to the toctree directive, since
it keeps the bullets aligned properly (they were hanging if
we used simple * markers)

This also replaces CONTRIBUTING.md content with a link to
the docs.
2018-09-25 18:35:38 -07:00
yuvipanda
c928d10316 Expand contributor documentation
- Move from CONTRIBUTING.md to a subdirectory in docs, so
  we can expand and add more documentation.
- Move from markdown to reStructuredTest
- Add a direct blurb in the JupyterHub docs index page on
  how contribution.
- More prominent link to the Code of Conduct
- Add section on getting in touch with the JupyterHub community
2018-09-25 18:19:09 -07:00
Kyla Harper
b43125e9e8 Add DummyAuthenticator 2018-09-25 15:44:05 -05:00
Min RK
451dccfbf4 Merge pull request #2181 from minrk/docs-ci
move docs to their own CI matrix
2018-09-24 16:49:05 +02:00
Min RK
eb8b9c4d98 implement server deletion client-side 2018-09-24 16:21:40 +02:00
Min RK
e79b43e906 support removing named servers 2018-09-24 16:21:40 +02:00
Min RK
a1dc73882a move helper properties onto orm.Spawner
since that's where they belong
2018-09-24 16:21:40 +02:00
Min RK
0fb78f19ec return future from stop_single_user
allows chaining actions when stop finally resolves via `spawner._stop_future`
2018-09-24 16:21:40 +02:00
Min RK
81a410db91 simplify admin UI for named servers 2018-09-24 16:21:40 +02:00
Min RK
924aeb4abb only include named spawners in all_spawner is named servers allowed 2018-09-24 16:21:40 +02:00
Min RK
b966258849 Simplify named-servers on home
- use a table for the list of servers
- support adding new servers
2018-09-24 16:21:40 +02:00
Min RK
9031b9aa57 add some re-usable APIs
define some pending/ready helpers as static constants on orm.Spawner

allows treating orm.Spawner the same as Spawner wrappers,
as long as `.active` etc. checks are performed first
2018-09-24 16:21:40 +02:00
Min RK
cbe4095533 use var instead of let
for better js compatibility
2018-09-24 16:21:40 +02:00
Min RK
1be278779d add npm run fmt for autoformatting js 2018-09-24 16:21:40 +02:00
Min RK
8c9d2f0c4f npm run fmt 2018-09-24 16:21:40 +02:00
Min RK
76fc077e3b Merge pull request #2180 from minrk/progress-cleanup
Fix intermittent failures in progress_bad_slow
2018-09-24 16:20:24 +02:00
Min RK
8e6d9de536 move docs to their own CI matrix
rather than building the docs after every test
2018-09-24 16:02:27 +02:00
Min RK
93045957a0 Warn instead of raising if spawner._generate_progress is called while spawn is not pending
and generate no events if not pending

Reason: race condition is unavoidable between first pending check and check inside _generate_progress.
In this event, return immediately.
2018-09-24 15:54:01 +02:00
Min RK
e71d181a23 slow down slow_bad_spawn
reduces likelihood of race condition in test
2018-09-24 15:54:01 +02:00
Min RK
fcbc6e06c8 stop keepalive loop promptly on finish
rather than waiting until keepalive_interval, which leaves idle coroutines for at least 8 seconds
2018-09-24 15:54:01 +02:00
Min RK
33c6e68b5e update changelog for 0.9.4 2018-09-24 14:01:23 +02:00
Min RK
a4d241524c Merge pull request #2177 from nils-werner/patch-1
Example homedir bootstrapping using `mkhomedir_helper`
2018-09-24 13:36:24 +02:00
Min RK
af1c71f7ff Merge pull request #2179 from minrk/disable-pdf
back to conda on rtd
2018-09-24 12:56:37 +02:00
Min RK
78c57805d5 omit pdf builds on rtd due to bug in sphinx 2018-09-24 12:48:11 +02:00
Min RK
cc324a6d4b back to conda for docs 2018-09-24 12:47:47 +02:00
Min RK
8437f47f36 Merge pull request #2165 from minrk/fix-content-type
Fix content-type on API endpoints
2018-09-24 11:03:19 +02:00
Min RK
89bde5db17 Merge pull request #2176 from GeorgianaElena/master
Issue #13 Outreachy: add running_servers metric
2018-09-24 10:37:20 +02:00
GeorgianaElena
f43ebe8d51 Rename metric 2018-09-24 11:05:01 +03:00
Nils Werner
341bc42d95 Example homedir bootstrapping using mkhomedir_helper 2018-09-24 10:01:57 +02:00
GeorgianaElena
493f9ab331 Issue #13 Outreachy: add running_servers metric 2018-09-23 18:31:37 +03:00
Yuvi Panda
e9753fd65d Merge pull request #2174 from jmfcodes/typofix
fixed a typo
2018-09-22 15:14:00 -07:00
Jennifer
3b136339af fixed a typo 2018-09-22 14:57:24 -07:00
Yuvi Panda
1821c21243 Merge pull request #2166 from minrk/testing-config
add sample configuration that loads dummyauthenticator and simplespawner
2018-09-21 10:58:44 -07:00
Min RK
e675ab85c7 Merge pull request #2164 from sashafierce/add-name-controlpanel
Add user name to control panel in JupyterHub
2018-09-21 15:16:19 +02:00
Min RK
58f005eea2 Fix content-type on API endpoints
and includes content-type header checks in tests to catch regressions
2018-09-21 15:12:53 +02:00
Min RK
d34e84ae9d add sample configuration that loads dummyauthenticator and simplespawner 2018-09-21 15:12:41 +02:00
Akanksha Bhardwaj
981ef2ca3b display username in control panel 2018-09-21 18:08:34 +05:30
Min RK
c87fcd9b71 Merge pull request #2155 from minrk/cleanup-client-fix
fix oauth client cleanup
2018-09-21 10:10:34 +02:00
Min RK
c69adfb506 Merge pull request #2161 from yuvipanda/better-contrib
Add notes on simplespawner & dummyauthenticator
2018-09-21 10:10:04 +02:00
Min RK
ac82f0f437 apply willingc's text proposals 2018-09-21 10:07:21 +02:00
Carol Willing
c975f7eb4a Merge pull request #2162 from yuvipanda/other-auth-cleanup
Link additional authenticators to wiki
2018-09-21 02:13:50 -04:00
yuvipanda
07b590e2c3 Link additional authenticators to wiki
The current list in the docs is out of date. The list
in the wiki is more up-to-date, and easier for folks
to change over time. In the long run, we should decide
where lists like this belong.
2018-09-20 22:49:00 -07:00
Erik Sundell
0b98be05fd Add links to default spawner & authenticator 2018-09-20 22:11:48 +00:00
yuvipanda
0a54b1aa99 Add notes on simplespawner & dummyauthenticator 2018-09-20 13:01:49 -07:00
Erik Sundell
e114f79e44 Merge pull request #2159 from yuvipanda/better-contrib
Expand 'Setting up Developer Environment' in CONTRIBUTING.md
2018-09-20 20:43:48 +02:00
yuvipanda
3ff046affa Expand 'Setting up Developer Environment' in CONTRIBUTING.md 2018-09-20 11:31:00 -07:00
Carol Willing
e26229c0b4 Merge pull request #2156 from willingc/pin-sphinx
Build docs with pip not conda
2018-09-19 20:25:39 -07:00
Carol Willing
6c000968c9 reset dependencies 2018-09-19 14:46:56 -07:00
Carol Willing
8d79be7cfb switch to requirements and pip 2018-09-19 14:46:36 -07:00
Carol Willing
25264a43cf update oauthlib dependency in docs 2018-09-19 14:45:00 -07:00
Min RK
4cd4fd1dff changelog for 0.9.4 2018-09-19 12:48:21 +02:00
Min RK
e2a899327f fix oauth client cleanup
- delete oauth clients for servers when they shutdown
- avoid deleting oauth clients for servers still running across an 0.8 -> 0.9 upgrade, when the oauth client ids changed from `user-NAME` to `jupyterhub-user-NAME`
2018-09-19 12:45:41 +02:00
Carol Willing
56601d93c3 Merge pull request #2149 from minrk/deprecate-maybe-future
stop using deprecated `gen.maybe_future`
2018-09-17 20:08:57 -07:00
Min RK
f2fa067025 Merge pull request #2089 from krinsman/master
UI for Named Servers (Home and Admin Pages)
2018-09-17 13:04:42 +02:00
William Krinsman
02cb5ec076 Handle named servers in UserSpawnHandler, home, admin pages
Made CSS and HTML (and Jinja2) of admin page compatible with named servers.
2018-09-17 11:54:51 +02:00
Min RK
571ca2dec6 Merge pull request #2142 from minrk/async-current-user-2
make `.get_current_user` async
2018-09-17 10:49:25 +02:00
Min RK
35a95b5f0c stop using deprecated gen.maybe_future
we already covered supported cases since we are using tornado 5,
so handle the scalar case ourselves, as recommended in the deprecation
2018-09-14 14:13:31 +02:00
Min RK
ce9d9fd26d clarify docstrings, comments in refresh_user
- refresh_user may return True in the common case, identifying that everything is up-to-date
- return False for "needs login"
- return auth_data dict when an update can be performed without logging in again
2018-09-13 10:28:10 +02:00
Min RK
d79a99323e make .get_current_user async
- `.get_current_user` is called in the `prepare` stage for all handlers
- use `.current_user` to access current user in methods
- adds Authenticator.refresh_user for refreshing user auth (unused at this point)
2018-09-13 10:16:13 +02:00
Thomas Mendoza
a81972067a Stop servers that don't get cleaned up
Running all tests (including internal_ssl
monkey-patched ones) leaves behind some
spawned servers. Stop them.
2018-09-12 17:48:31 -07:00
Thomas Mendoza
67f19a65b7 Use Certipy's trust graph to set up internal_ssl
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.
2018-09-12 17:46:39 -07:00
Carol Willing
a21b496d48 Merge pull request #2144 from willingc/comm-guide
Add link to Jupyter Community Guide
2018-09-12 10:12:35 -07:00
Carol Willing
7ff49705bc fix typo 2018-09-12 08:41:05 -07:00
Carol Willing
6dc43dd70b add link to community guide reference 2018-09-12 08:39:07 -07:00
Min RK
42c78a8ba7 Merge pull request #2143 from minrk/fixup-progress
remove spurious print from keepalive code
2018-09-12 09:45:14 +02:00
Min RK
54449562bd remove spurious print from keepalive code
and send keepalive every 8 seconds

to protect against possibly aggressive proxies dropping connections after 10 seconds of inactivity
2018-09-11 16:50:48 +02:00
Min RK
e29fad06ed write needs no await 2018-09-11 16:41:27 +02:00
Matthias Bussonnier
f1a5c7da55 Merge pull request #2141 from minrk/093
changelog for 0.9.3
2018-09-11 13:41:50 +02:00
Min RK
0239ff8646 changelog for 0.9.3
Mainly small fixes, but the token page could be completely broken

This release will include the spawner.handler addition,
but not the oauthlib change currently in master
2018-09-11 11:06:31 +02:00
Min RK
e4a64bd129 Merge pull request #2127 from minrk/oauthlib
switch to oauthlib from python-oauth2
2018-09-11 11:01:51 +02:00
Min RK
a0354de3c1 Merge pull request #2139 from minrk/token-page
token expiry fixes
2018-09-11 11:01:37 +02:00
Min RK
2e4e1ce82f test token page with html parsing 2018-09-11 10:16:36 +02:00
Min RK
1f0ea679e5 clarify messages per review 2018-09-11 09:00:19 +02:00
Min RK
06f646099f token expiry fixes
typos in token expiry:

- omitted from token model (it's in the spec in docs, but wasn't in the model)
- wrong type when sorting oauth tokens on token page could cause token page to not render
2018-09-11 08:54:12 +02:00
Min RK
3360817cb6 Merge pull request #2138 from SivaMaplelabs/undefined-variable
Fix undefined variable 'datetime' error
2018-09-11 08:52:59 +02:00
Min RK
b84e929e8c skip oauthlib absolute-uri check
because we want to allow relative redirect uri for internal oauth
2018-09-10 17:12:08 +02:00
Min RK
df74ff68ab better error messages on oauth errors 2018-09-10 17:12:08 +02:00
SivaMaplelabs
e042ad0b4a Fix undefined variable 'datetime' error 2018-09-10 20:04:54 +05:30
Min RK
246f9f9044 Merge pull request #2135 from adelcast/dev/adelcast/fix_chp
add Windows case when stopping the CHP
2018-09-10 15:19:14 +02:00
Min RK
03aa48a88c update tests with oauth confirmation
cross-user / service oauth tests must submit oauth confirmation form
to complete authorization
2018-09-10 15:18:12 +02:00
Min RK
de54056005 add oauth confirmation page
users accessing their own servers still don't require confirmation,
but accessing other users' servers or services shows a confirmation page.
2018-09-10 14:31:19 +02:00
Min RK
5e2c133669 flesh out oauth provider
- avoid logging credentials
- implement some missing methods
2018-09-10 14:26:40 +02:00
Min RK
4fc4cfe2cc move oauth.store to oauth.provider
since it defines the provider!
2018-09-10 11:09:52 +02:00
Alejandro del Castillo
bc08f4de34 proxy: add Windows case when zombie proxy is still running
Windows doesn't support signal.SIGKILL, which is used by
_check_previous_process to kill the CHP if still running. Use existing
implementation to kill the CHP and children processes on Windows
instead.

Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
2018-09-06 18:06:16 -05:00
Alejandro del Castillo
12904ecc32 _check_previous_process: use signal list as input to os.kill
Previously, signal.SIGTERM was using 3 times, instead of using it 2
times, then signal.SIGKILL.

Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
2018-09-06 16:15:56 -05:00
Matthias Bussonnier
601d371796 Merge pull request #2132 from willingc/iss204
fix link
2018-09-06 10:16:17 +02:00
Carol Willing
30d9e09390 fix link 2018-09-05 11:27:19 -07:00
Thomas Mendoza
ca33ccd66d Add longer internal_ssl documentation to main docs 2018-09-04 15:51:26 -07:00
Thomas Mendoza
84deb1fa7a Update doc strings for create_certs and move_certs 2018-09-04 15:50:45 -07:00
Thomas Mendoza
2a0e5d90e6 Add the ability to generate JupyterHub's certificates
This is used to be able to access JupyterHub's CA
information and (manually) move it to components
that need them (like externally managed proxies).
2018-09-04 15:22:49 -07:00
Thomas Mendoza
3c05033481 Update cert generation to use Certipy's new API
To better accommodate external certificate management
as well as building of trust, Certipy was refactored.
This included general improvements to file and
record handling. In the process, some of Certipy's
APIs changed slightly, but should be more stable now
going forward.
2018-09-04 15:08:12 -07:00
Min RK
7850a5d478 Merge pull request #2036 from minrk/pass-handler
pass requesting handler to spawner
2018-09-04 18:27:02 +02:00
Min RK
f84c73eb15 [wip] switch to oauthlib from python-oauth2
lower-level implementation, but more robust and gives us more control
2018-09-04 15:10:58 +02:00
Min RK
f5a3b1bc5a Merge pull request #2122 from SivaMaplelabs/pylint-fix
Address the pylint warnings
2018-09-04 09:58:13 +02:00
SivaMaplelabs
b2fe8e5691 Address the pylint warnings 2018-09-03 21:35:46 +05:30
Min RK
9d4c410996 include params in redirect from /spawn -> /user/:name 2018-09-03 09:57:00 +02:00
Min RK
dcae92ce4a test passing url params to spawner 2018-09-03 09:56:42 +02:00
Carol Willing
29957b8cd8 Merge pull request #2112 from minrk/disable-quit
disable quit button
2018-08-30 22:47:13 -07:00
Carol Willing
6299e0368c Merge pull request #2119 from Carreau/typoes
Fix some typos using `codespell`.
2018-08-30 15:44:55 -07:00
Carol Willing
c862b6062d Merge pull request #2121 from minrk/progress-keepalive
add keepalive to progress eventstream
2018-08-30 15:43:18 -07:00
Min RK
146587ffff add keepalive to progress eventstream
avoids issues with proxies dropping connections when no data passes through

Progress behavior should already be resilient to dropped connections,
as the progress ought to just resume anew.
2018-08-30 19:03:14 +02:00
Matthias Bussonnier
077d8dec9a Fix some typos using codespell.
And checking each manually. It's funny because one of the words in the
sphinx custom dictionary was wrong :-)
2018-08-29 21:24:28 -07:00
Min RK
af8d6086fc disable quit button
quit button (new in recent notebook 5.x) shuts down the server, which we want to happen via the JupyterHub control panel
2018-08-27 16:18:53 +02:00
Min RK
18f8661d73 publish singleuser x.y.z.dev from master 2018-08-20 10:42:46 +02:00
Min RK
bd70f66c70 Merge pull request #2094 from minrk/image-dev-tag
add .dev suffix to development x.y image tags
2018-08-20 10:38:02 +02:00
Min RK
ac213fc4b5 add .dev suffix to development x.y image tags
instead of publishing "1.0" for a development version.
2018-08-20 10:37:43 +02:00
Min RK
db33549173 Merge pull request #2092 from minrk/stable-0.9
fix jupyterhub/singleuser tagging
2018-08-17 16:44:37 +02:00
Min RK
e985e2b84c singleuser stable version is 0.9 2018-08-17 16:33:42 +02:00
Min RK
1d9abf7528 back to dev 2018-08-17 16:30:24 +02:00
Min RK
935baa8bc6 Merge pull request #2080 from minrk/rel-0.9.2
prepare to release 0.9.2
2018-08-11 14:50:15 +02:00
Min RK
9b77732319 Merge pull request #2078 from minrk/fix-pin-attrs
move attrs pinning to dev-requirements
2018-08-10 13:59:09 +02:00
Min RK
85aac0fa2d prepare to release 0.9.2 2018-08-10 13:56:58 +02:00
Min RK
abd6f35638 Merge pull request #2067 from NERSC/announcement-service-example
Add an example simple announcement service
2018-08-10 12:25:24 +02:00
Min RK
ba4700b3f3 move attrs pinning to dev-requirements
it shouldn’t be in the package’s own requirements, which are propagated to users
2018-08-10 11:51:24 +02:00
Min RK
05b11bd47a Merge pull request #2072 from gesiscss/master
fix links in services doc
2018-08-10 11:40:58 +02:00
Kenan Erdogan
71cb628563 fix links in services doc 2018-08-06 11:11:14 +02:00
Rollin Thomas
0d664355f0 Some explanatory comments 2018-08-03 12:15:50 -07:00
R. C. Thomas
dd6261d031 Merge pull request #1 from NERSC/test-announcement-service-example
Use `hub_users=[]` and `allow_admin=True`
2018-08-02 09:55:23 -07:00
Rollin Thomas
f3f5b69e49 Try hub_users=[] and allow_admin=True 2018-08-02 09:00:46 -07:00
Tim Head
9ea4ca3646 Merge pull request #2065 from minrk/cull-named-servers
cull-idle: fix deletion of named servers
2018-08-02 07:55:27 +01:00
Rollin Thomas
8ee9869ca0 Add an example simple announcement service 2018-08-01 16:11:30 -07:00
Min RK
6cedd73d2a Merge pull request #2062 from chaoleili/master
Ensure request uri with trailing slash
2018-08-01 10:17:58 +02:00
Min RK
59145ca0f7 fix deletion of named servers
first submitted to zero-to-jupyterhub
2018-08-01 10:07:02 +02:00
Thomas Mendoza
9607edcc23 Return a dict instead of a tuple from move_certs 2018-07-27 17:03:12 -07:00
Thomas Mendoza
e082b923e0 Clarify output directory name for user certs 2018-07-27 16:44:24 -07:00
Thomas Mendoza
dd4df873b4 Move internal_ssl init into an init function 2018-07-27 16:41:33 -07:00
Chaolei Li
ab02f9c568 Ensure request uri with trailing slash
When request uri matching with base_url in PrefixRedirectHandler,
it's better to ensure uri with tariling slash. That's will avoid
redirecting /foobar to /foobar/hub/foobar.
2018-07-27 17:17:26 +08:00
Thomas Mendoza
3adbfe315e Pass certfile info via env instead of args 2018-07-26 17:05:50 -07:00
Thomas Mendoza
6000a84ffc Remove certs from the Server orm 2018-07-26 14:29:58 -07:00
Min RK
a2f003ed31 Merge pull request #2060 from betatim/docs-env-update
Update dependencies used by ReadTheDocs
2018-07-26 15:35:59 +02:00
Tim Head
7b6dd9f5cf Update dependencies used by ReadTheDocs 2018-07-26 12:53:19 +02:00
Min RK
0fa5c20f89 Merge pull request #2042 from minrk/abort-failures
add Spawner.consecutive_failure_limit
2018-07-26 10:33:36 +02:00
Min RK
204399ee2c Merge pull request #2040 from minrk/sigterm-fix
fix SIGTERM handling
2018-07-26 10:32:25 +02:00
Min RK
5e68dce02f Merge pull request #2057 from adelcast/dev/adelcast/fix_pid_removal
proxy: make process existance check Windows friendly
2018-07-26 10:32:00 +02:00
Alejandro del Castillo
952bbea039 proxy: make process existance check Windows friendly
Currently, to check if the proxy is running, os.kill(pid,0) is used,
which doesn't work on Windows. Wrapped call into a new function that
adds a Windows case.

Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
2018-07-24 15:47:40 -05:00
Tim Head
630e85bfec Merge pull request #2050 from Carreau/https
Switch protocols to https in docs links
2018-07-24 06:09:26 +01:00
Matthias Bussonnier
26f7bb51bd Pin attrs to version greater than 17.4 or jsonschema 3.0.0a fails.
This is strange as JsonSchema already pin to higher than that.
2018-07-23 14:57:45 -07:00
Thomas Mendoza
d429433bb2 Add Certipy to requirements now that its in PyPI 2018-07-23 13:41:34 -07:00
Thomas Mendoza
5de870be41 Fix docstring 2018-07-23 13:41:20 -07:00
Thomas Mendoza
1fc75086aa Remove vague try-catch 2018-07-23 13:41:20 -07:00
Thomas Mendoza
fa3437c09a Add db migration for ssl changes to servers 2018-07-23 13:41:20 -07:00
Thomas Mendoza
01b27645fb Set http[s] as appropriate for the singleuser url 2018-07-23 13:41:19 -07:00
Thomas Mendoza
373c3f82dd SSL setup for testing
Setup general ssl request, not just to api

Basic tests comprised of non-ssl test copies

Create the context only when request is http

Refactor ssl key, cert, ca names

Configure the AsyncHTTPClient at app start

Change tests to import existing ones with ssl on

Override __new__ in MockHub to turn on SSL
2018-07-23 13:41:09 -07:00
Matthias Bussonnier
a1c2a50810 Switch protocols to https in docs links
Chrome will start to show insecure website for http next week
2018-07-22 18:58:22 -07:00
Thomas Mendoza
5c39325104 Only import certipy if internal_ssl is turned on 2018-07-18 16:02:57 -07:00
Thomas Mendoza
0304dd0040 Allow option to specify ssl_context in wait_up 2018-07-18 16:02:57 -07:00
Thomas Mendoza
a549edfd75 Testing internal ssl modifications 2018-07-18 16:02:57 -07:00
Thomas Mendoza
25e6b31a5f Only internal_ssl kwargs if internal_ssl is enabled 2018-07-18 16:02:57 -07:00
Thomas Mendoza
3c21e7d45b Server cert info into objects and orm 2018-07-18 16:02:57 -07:00
Thomas Mendoza
7c6972df7e Remove unnecessary flag, forward-ssl
Import socket when needed

Move pwd import since more than one thing uses it.
2018-07-18 16:02:57 -07:00
Thomas Mendoza
753bd0701f Create and move certs for use with spawned notebooks
Add Localhost to trusted alt names

Update to match refactored certipy names

Add the FQDN to cert alt names for hub

Ensure notebooks do not trust each other

Drop certs in user's home directory

Refactor cert creation and movement

Make alt names configurable

Make attaching alt names more generic

Setup ssl_context for the singleuser hub check
2018-07-18 16:02:57 -07:00
Thomas Mendoza
c5faf2c5ea Use certipy to automate cert creation 2018-07-18 16:02:57 -07:00
Thomas Mendoza
c50cd1ba7f Propagate certs to everything that needs them 2018-07-18 16:02:57 -07:00
Thomas Mendoza
a69e906c6e Add config and wiring for enabling internal ssl in app 2018-07-18 16:02:57 -07:00
Thomas Mendoza
f7f4759bde Build ssl_context as util, wait_up with context 2018-07-18 16:02:57 -07:00
Min RK
906abcc2f3 add Spawner.consecutive_failure_limit
The Hub will exit if consecutive failure count reaches this threshold

Any successful spawn will reset the count to 0

useful for auto-restarting / self-healing deployments such as kubernetes/systemd/docker where restarting the Hub

default is disabled, since it would bring down the Hub if it’s not an auto-restarting deployment
2018-07-16 12:07:26 -07:00
Min RK
5269370e4a fix SIGTERM handling
raise SystemExit on sigterm instead of calling atexit directly

- ensure fresh asyncio eventloop is created (not just IOLoop)
- makes cleanup more likely to run (one source of orphaned proxies)
2018-07-16 11:49:40 -07:00
Min RK
897f5f62d5 pass requesting handler to spawner
allows Spawners to implement logic such as processing GET params to select inputs

USE WITH CARE because this gives authors of links the ability to pass parameters to spawn without user knowledge or input.

This should only be used for things like selecting from a list of all known-good choices, e.g. a profile list.
2018-07-13 17:23:19 -05:00
Min RK
727356870a Merge pull request #2027 from adelcast/dev/adelcast/fix_services_windows
_ServiceSpawner: add 'SYSTEMROOT' to environment if Windows
2018-07-13 13:24:49 -05:00
Alejandro del Castillo
39aed3a5a0 _ServiceSpawner: add 'SYSTEMROOT' to environment if Windows
Python 3 cannot be started without SYSTEMROOT environment variable.
Otherwise, CryptAcquireContext() is unable to find a dll.

https://bugs.python.org/issue20614

Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
2018-07-06 14:47:19 -05:00
Min RK
ed26578717 back to dev 2018-07-04 11:59:43 +02:00
Min RK
22863f765f 0.9.1 2018-07-04 11:55:42 +02:00
Min RK
b500bd002b Merge pull request #2014 from willingc/bump-testing
add python 3.7 to travis
2018-07-04 11:02:55 +02:00
Carol Willing
aca40b24c3 remove env 2018-07-03 16:32:05 -07:00
Carol Willing
b5fe5a80c6 remove 3.7 from python list but leave in matrix 2018-07-03 14:57:58 -07:00
Carol Willing
ad073dd5dd add 3.7 to travis matrix 2018-07-03 14:44:09 -07:00
Carol Willing
7b815558c6 Merge pull request #2021 from minrk/091-changes
Prepare changelog for 0.9.1
2018-07-03 14:27:01 -07:00
Min RK
55f58b3ba7 review, note proxy prefix fix 2018-07-03 15:12:30 +02:00
Min RK
e1f93a4721 Merge pull request #2009 from BerserkerTroll/patch-2
proxy.py: Respect base_url in add_hub_route
2018-07-03 13:36:48 +02:00
Min RK
2e95f3c039 Merge branch 'master' into patch-2 2018-07-03 13:29:54 +02:00
Min RK
b0ba51f209 host-based routing doesn't support wildcards 2018-07-03 12:27:24 +02:00
Min RK
89e6c2110e add hub.routespec
this is the routespec for sending requests to the hub

It is [host]/prefix/ (not /hub/) so it receives all
requests, not just those destined for the hub
2018-07-03 12:05:21 +02:00
Min RK
7dfdc23b4e Prepare changelog for 0.9.1 2018-07-03 11:44:37 +02:00
Min RK
4c7df53a8a Merge pull request #2020 from weatherforce/master
Fix a couple of typos in the technical reference documentation
2018-07-03 11:23:36 +02:00
Alex Marandon
678afd3783 Fix a couple of typos 2018-07-03 11:16:55 +02:00
Carol Willing
0185a08f32 Merge pull request #2015 from minrk/allow_remote
disable host checking in upcoming notebook app
2018-07-02 08:45:41 -07:00
Tim Head
f3787dd2c8 Merge pull request #2016 from minrk/spawner-docs
mention get_env and get_args in spawner reference
2018-06-30 09:59:38 +02:00
Min RK
30f19cfc8c mention get_env and get_args in spawner reference
these are important and usually required (especially get_env) for custom Spawner implementations
2018-06-29 14:46:08 +02:00
Min RK
a84fa38c6b ensure prefix is on next_url in test_pages 2018-06-29 14:21:32 +02:00
Min RK
867ce4c213 use app.base_url in Proxy.check_routes
rather than assuming '/'
2018-06-29 14:19:20 +02:00
Min RK
005118e09d disable upcoming host checking in single-user notebook application 2018-06-29 11:55:47 +02:00
Carol Willing
04ce67ee71 add python 3.7 to travis 2018-06-28 08:47:04 -07:00
Min RK
31807929cb update test expectations for proxy state
expect app.base_url instead of unconditional ‘/‘
2018-06-27 12:46:13 +02:00
Min RK
cb4105b53e Merge pull request #2012 from josemonsalve2/master
c.LocalProcessSpawner.shell_cmd configuration option does not work
2018-06-27 12:39:19 +02:00
Carol Willing
151887dd56 Merge pull request #2008 from minrk/services-localhost
managed services always talk to hub on localhost
2018-06-26 12:07:29 -07:00
Carol Willing
5f97487184 Merge pull request #2001 from minrk/auto-spawn-api
avoid triggering a spawn from API requests to a not-running server
2018-06-26 12:04:10 -07:00
Carol Willing
4d2d677777 Merge pull request #1996 from minrk/proxy-cleanup
use pid file to check for previous proxy instances
2018-06-26 12:02:54 -07:00
Jose M Monsalve Diaz
6a3b3807c9 fixing shell_cmd attribute of the LocalProcessSpawner that was not tag for configuration 2018-06-25 17:07:39 -04:00
Min RK
02a52a0289 Merge pull request #1997 from gesiscss/master
fix wrong/missing closing tags in templates
2018-06-25 12:54:36 +02:00
BerserkerTroll
7bd1e387df proxy.py: Respect base_url in add_hub_route 2018-06-24 17:22:43 +03:00
Min RK
edc0d7901f services always talk to hub on localhost
When the Hub listens on all ips by default, the connection ip is the hostname.

in some cases (e.g. certain kubernetes deployments) the hub’s container’s hostname is not connectable from itself, preventing managed services from connecting to the hub.

This ensures that managed service processes talk to the hub over localhost in this case, rather than via the hostname.
2018-06-22 13:48:34 +02:00
Min RK
8e561f1c12 avoid triggering a spawn from API requests to a not-running server
this avoids left-open notebook tabs from respawning a culled server indefinitely
2018-06-20 14:57:41 +02:00
Kenan Erdogan
24d87c882f fix wrong/missing closing tags in templates 2018-06-19 09:15:18 +02:00
Min RK
1e333e2f29 Merge pull request #1992 from willingc/doc-toc
add templates and user env docs to home page index
2018-06-18 15:45:52 +02:00
Carol Willing
a507fa1c8a add templates and user env docs to home page index 2018-06-16 10:21:33 -07:00
Min RK
90cc03b3ec back to dev 2018-06-15 15:39:02 +02:00
Min RK
6f15113e2a link and date for 0.9.0 2018-06-15 15:36:48 +02:00
Min RK
f3f08c9caa 0.9.0 2018-06-15 15:23:25 +02:00
Min RK
c495c4731a Merge pull request #1983 from willingc/test-tilde
add test case for user with tilde
2018-06-15 14:48:49 +02:00
Min RK
e08a50ef66 Merge pull request #1988 from gesiscss/redirects
fix AddSlashHandler for hub_prefix without trailing /
2018-06-15 14:48:14 +02:00
Min RK
fbcd792062 Merge pull request #1984 from chicocvenancio/tilde_safe_in_proxy
mark tilde as safe in proxy routespec quoting FIX:#1982
2018-06-15 14:38:38 +02:00
Min RK
bb81ce0160 also test @ handling in proxy.check_routes
@ and ~ should be the same
2018-06-15 14:33:31 +02:00
Kenan Erdogan
315087d67c fix AddSlashHandler for hub_prefix without trailing / 2018-06-15 13:36:05 +02:00
Chico Venancio
31e6a15a85 mark tilde as safe in proxy routespec quoting FIX:#1982 2018-06-14 18:18:52 -03:00
Carol Willing
aed99d8d19 add test case for user with tilde 2018-06-14 13:24:05 -07:00
Min RK
ec83708892 use pid file to check for previous proxy instances
avoids failure to start when the previous proxy wasn't cleaned up properly
2018-06-14 17:50:33 +02:00
Min RK
bedac5f148 Merge pull request #1980 from willingc/pypi-meta
Add info to display at pypi site
2018-06-14 11:51:29 +02:00
Carol Willing
376aa13981 correct link 2018-06-13 14:37:27 -07:00
Carol Willing
4bc8b48763 add info to display at pypi site 2018-06-13 14:35:23 -07:00
Carol Willing
21496890f6 Remove stray bullet that I missed in review 2018-06-13 11:10:41 -07:00
Carol Willing
70dcd50e44 Merge pull request #1976 from minrk/changelog-more
last few things in changelog
2018-06-13 11:09:30 -07:00
Min RK
24094567e5 Merge pull request #1977 from kpfleming/patch-1
Correct 'conda' installation instructions
2018-06-13 15:44:27 +02:00
Kevin P. Fleming
6bd0febbe1 Correct 'conda' installation instructions
JupyterHub packages are in the 'conda-forge' channel of Anaconda packages; if the Anaconda installation doesn't already have 'conda-forge' enabled, `conda install jupyterhub` fails.

Rather than adding instructions to enable 'conda-forge' in Anaconda, this patch modifies the installation command to specify that channel.
2018-06-13 09:42:05 -04:00
Min RK
57075aba52 Add last few entries in changelog for 0.9 2018-06-13 15:15:18 +02:00
Min RK
f0260aae52 add missing expiry fields in rest-api doc 2018-06-13 15:15:09 +02:00
Min RK
edd8e21f71 Merge pull request #1969 from willingc/edit-userenv
Edit and reflow user environment reference
2018-06-13 09:49:23 +02:00
Min RK
681d3ce2d8 Merge pull request #1971 from willingc/contributor-list
Update contributor list for 0.9 release
2018-06-13 09:45:37 +02:00
Carol Willing
97e792ccde Update issue templates 2018-06-12 15:47:05 -07:00
Carol Willing
a5a0543b2a Delete old issue template 2018-06-12 15:42:46 -07:00
Carol Willing
5a810ccba3 Update issue templates 2018-06-12 15:41:30 -07:00
Carol Willing
0a6b2cdadc Merge pull request #1973 from jupyterhub/willingc-patch-1
Create CODE_OF_CONDUCT.md
2018-06-12 15:33:37 -07:00
Carol Willing
08903e7af8 Create PULL_REQUEST_TEMPLATE.md 2018-06-12 15:29:54 -07:00
Carol Willing
78439329c0 Merge pull request #1972 from willingc/insights
Move issue template one level down in .github directory
2018-06-12 15:28:34 -07:00
Carol Willing
4dfd6bc4b9 Create CODE_OF_CONDUCT.md 2018-06-12 15:25:27 -07:00
Carol Willing
574cc39b5f set up pull request template directory 2018-06-12 15:16:02 -07:00
Carol Willing
6fb43a8241 update issue templaate location to current github recommendation 2018-06-12 15:13:39 -07:00
Carol Willing
84c82fe382 update the contributor list for 0.9 2018-06-12 14:51:51 -07:00
Carol Willing
5e45e76f5b update contributors for 0.9 2018-06-12 14:36:00 -07:00
Carol Willing
92fd819cd6 Merge pull request #1970 from JasonJWilliamsNY/hub-not-found-at-localhost
Hub not found at localhost
2018-06-12 14:04:09 -07:00
Jason Williams
cb5ef0c302 Update troubleshooting.md 2018-06-12 17:01:37 -04:00
Jason Williams
34fab033fe Jupyterhub on Docker add workaround for unable to connect to localhost
Added a command that worked for me to fix the situation that localhost:8000 is unable to reach the hub even though the published command for Docker exposes the correct port.
2018-06-12 16:59:17 -04:00
Carol Willing
37f4c4429e edit and reflow user environment reference 2018-06-12 08:47:22 -07:00
Carol Willing
293410ec94 Merge pull request #1967 from minrk/config-docs
docs: configuring user environments
2018-06-12 07:55:53 -07:00
Min RK
ed6ee27dcd docs: configuring user environments
covers system-wide installation, kernelspec registration, and the differences between containers and host systems
2018-06-12 14:34:26 +02:00
Min RK
ca16ddb7ad back to dev 2018-06-12 14:21:16 +02:00
Min RK
2102c1fd1c 0.9.0rc1 2018-06-12 14:19:59 +02:00
Min RK
aa9676ec5e Merge pull request #1913 from rkdarst/announcement_text
Add customizable announcement text on home,login,logout,spawn
2018-06-12 14:14:21 +02:00
Min RK
5e93c7de4c announcement doc language
per willingc review
2018-06-12 13:48:42 +02:00
Min RK
d22626906b multiline conditionals setting announcement variable in templates
for readability per review by willingc
2018-06-12 13:48:24 +02:00
Min RK
5f91ed044e parametrize test_announcements 2018-06-12 13:47:55 +02:00
Min RK
5c3c7493c1 Merge pull request #1963 from willingc/hooks-doc
add a small section for pre/post spawn hooks
2018-06-11 15:27:39 +02:00
Carol Willing
1b7965092e remove backticks and long for rst format 2018-06-08 14:21:31 -07:00
Carol Willing
ef60be5a99 put backticks outside of link 2018-06-08 14:19:43 -07:00
Carol Willing
f78d652cd6 fix missing brackets 2018-06-08 14:18:14 -07:00
Carol Willing
3650575797 add a small section for pre/post spawn hooks 2018-06-08 14:13:45 -07:00
Tim Head
0f000f6d41 Merge pull request #1961 from willingc/doc-shib
Add link to authenticators used with Shibboleth
2018-06-08 18:17:08 +02:00
Carol Willing
643729ac0c Merge pull request #1962 from chicocvenancio/docs_mysql_dynamic
database docs utfmb4 collation and some versions of mysql/mariadb
2018-06-08 09:14:04 -07:00
Chico Venancio
91a67bf580 database docs: fix formatting 2018-06-08 13:09:09 -03:00
Chico Venancio
c75eddb730 database docs utfmb4 collation and some versions of mysql/mariadb 2018-06-08 12:55:02 -03:00
Carol Willing
0f5888ad6c Add link to authenticators used with Shibboleth 2018-06-08 08:22:11 -07:00
Carol Willing
8c48f3b856 Merge pull request #1960 from willingc/db-doc
add database doc section and edits to upgrading db
2018-06-08 08:08:51 -07:00
Carol Willing
6e7e18bc3c add @minrk review comments 2018-06-08 07:34:09 -07:00
Tim Head
3dfd7e5a84 Merge pull request #1958 from willingc/proxy-error
Add error message text
2018-06-08 15:19:27 +02:00
Carol Willing
19ecbf3734 add note about why no sqlite and nfs 2018-06-08 06:06:15 -07:00
Carol Willing
eac3e8ba90 add database doc section and edits to upgrading db 2018-06-08 05:51:00 -07:00
Carol Willing
a7a6829b69 add additional reference per @betatim review 2018-06-08 05:01:32 -07:00
Carol Willing
61299113c8 add error message text 2018-06-07 21:44:18 -07:00
Tim Head
21a57dfa0b Merge pull request #1949 from willingc/npm-doc
clarify that conda installs npm and proxy
2018-06-07 19:52:00 +02:00
Carol Willing
a7226a8231 changes per @minrk review 2018-06-07 09:10:04 -07:00
Min RK
6e3dd21f60 Merge pull request #1952 from willingc/docker-conda
bump miniconda to 4.5.1 in Dockerfile
2018-06-07 10:24:33 +02:00
Min RK
cf049730d4 Merge pull request #1954 from willingc/black-test
Blacken python doc build files
2018-06-07 10:24:14 +02:00
Min RK
cb9ce4d3af Merge pull request #1955 from dtaniwaki/handle-fatal-error
only relay headers from HTTPErrors
2018-06-07 10:22:38 +02:00
Daisuke Taniwaki
925ee1dfb2 Do not refer spawner on fatal errors 2018-06-07 14:53:46 +09:00
Daisuke Taniwaki
5d9122b26c Avoid setting unexpected headers 2018-06-07 14:53:34 +09:00
Carol Willing
6821ad0c59 blacken autodoc sphinx extension 2018-06-06 12:57:14 -07:00
Carol Willing
ff7851ee2e blacken conf.py 2018-06-06 12:52:30 -07:00
Carol Willing
6940ed85b1 bump miniconda to 4.5.1 2018-06-06 08:25:28 -07:00
Carol Willing
3d497a7f43 clarify that conda installs npm and proxy 2018-06-06 06:56:22 -07:00
Carol Willing
cc6968e225 Merge pull request #1942 from minrk/nginx-file
note where nginx config files are typically created.
2018-06-06 06:02:30 -07:00
Carol Willing
a6c517c344 Merge pull request #1947 from minrk/progress-stopping
Avoid showing spawn-pending page when user is stopping
2018-06-06 06:00:58 -07:00
Carol Willing
a3e08b7f52 Merge pull request #1948 from minrk/aclosing
Python 3.5.1 cannot close async iterators
2018-06-06 05:56:00 -07:00
Min RK
14c8d7dc46 Merge pull request #1946 from dtaniwaki/configure-max-inactive-duration
Configure max inactive duration
2018-06-06 12:54:55 +02:00
Daisuke Taniwaki
ac2590c679 Add active_user_window configuration 2018-06-06 19:00:34 +09:00
Min RK
ead13c6a11 further clarify that we are creating a new file, not editing nginx.confg 2018-06-06 12:00:21 +02:00
Min RK
5002ab2990 Python 3.5.1 cannot close async iterators
so provide a null aclosing async context manager that does nothing
2018-06-06 11:43:33 +02:00
Min RK
ab3e7293a4 disable my server link while stop is pending
makes it a little harder to request a spawn while stop is pending
2018-06-06 10:53:50 +02:00
Min RK
062af5e5cb Avoid showing spawn_pending page when pending action is stop
Separate stop_pending page when this occurs,
similar to the old spawn pending spinner without progress events
2018-06-06 10:53:05 +02:00
Carol Willing
92088570ea Merge pull request #1943 from minrk/getuser-delayed
delay call to getuser in token app
2018-06-05 10:18:08 -07:00
Min RK
604ccf515d delay call to getuser in token app
avoids issues with getuser preventing launch, e.g. in weird containers where the current user doesn’t exist
2018-06-05 17:52:00 +02:00
Min RK
ec9b244990 note where nginx config files are typically created. 2018-06-04 11:10:21 +02:00
Min RK
09acdc23b5 Merge pull request #1940 from dtaniwaki/fix-created-columne-error
Handle NULL created column of tokens table
2018-06-04 10:55:20 +02:00
Richard Darst
e7808b50af Add tests of page announcements
- Adds test_pages.py:test_page_contents, which currently tests just
  the page annoucement variables.
2018-06-03 01:18:48 +03:00
Richard Darst
9c27095744 Add customizable announcement text on home,login,logout,spawn
- Using the new template_vars setting (#1872), allow the variable
  `announcement` to create a header message on all the pages in the
  title, or the variables `announcement_{home,login,logout,spawn}` to
  set variables on these single pages.
- This is not the most powerful method of putting an announcement into
  the templates, because it requires a server restart to change.  But
  the invasiveness is very low, and allows minimal message
  without having to touch the templates themselves.
- Closes: #1836
2018-06-03 01:18:48 +03:00
Daisuke Taniwaki
690b07982e Handle NULL created column of api_tokens table 2018-06-02 23:55:21 +09:00
Min RK
784e5aa4ee Merge pull request #1926 from minrk/tilde-safe
tilde is a safe character in user URLs
2018-05-30 14:48:35 +02:00
Min RK
29187cab3a Merge pull request #1929 from minrk/pgbin
install psycopg2 from binary
2018-05-29 11:03:41 +02:00
Min RK
43a72807c6 install psycopg2 from binary
it has a new package name for the binary wheel
2018-05-29 10:41:53 +02:00
Min RK
1d1f6f1870 Merge pull request #1923 from nxg/doc-changes-1747
Documentation clarifications (adding explicitness).
2018-05-29 10:21:42 +02:00
Min RK
505a6eb4e3 ensure user subdomains are valid
escape with `_` instead of `%`.

This is not technically rigorous, as collisions are possible (users foo_40 and foo@ have the same domain)
and other domain restrictions are not applied (length, starting characters, etc.).
Username normalization can be used to apply stricter, more rigorous structure.
2018-05-29 10:19:21 +02:00
Min RK
cc49df8147 Merge pull request #1852 from summerswallow-whi/service-info
Attach an info field to the service
2018-05-28 14:57:10 +02:00
Min RK
98d60402b5 add service.info to rest api docs 2018-05-28 14:09:53 +02:00
Min RK
319e8a1062 update service models in tests 2018-05-28 14:09:44 +02:00
Min RK
0c5d564830 tilde is a safe character in user URLs
Chrome unconditionally reverts any not-strictly-necessary escaping in URLs (this seems wrong?)
2018-05-28 13:46:52 +02:00
Norman Gray
c0404cf9d9 Documentation clarifications (adding explicitness).
Addresses issue #1747.

These additions aren't perfect -- it's unfortunate that I've added
mention of reverse proxies on two separate pages.  I don't _think_
these can reasonably be put on the same page -- perhaps a cross
reference?
2018-05-27 18:49:40 +01:00
Min RK
f364661363 Merge pull request #1899 from adelcast/dev/adelcast/kill_proxy_tree
ConfigurableHTTPProxy.stop: kill child processes on Windows case
2018-05-25 15:25:53 +02:00
Min RK
f92d77b06d Merge pull request #1915 from rkdarst/respawn_error_msg
Clarify error message on implicit respawns.
2018-05-25 10:09:35 +02:00
Haw-minn Lu
2cf00e6aae Add info field to service model 2018-05-24 11:19:18 -07:00
Richard Darst
dfdb0cff2b Clarify error message on implicit respawns.
- This message is presented when the last spawn failed, along with a
  HTTP 500.  The current text is quite confusing, especially when the
  problem may just be solvable by trying to respawn again.
2018-05-24 16:07:26 +03:00
Alejandro del Castillo
d0dad84ffa ConfigurableHTTPProxy.stop: kill child processes on Windows case
On the Windows case, the configurable-http-proxy is spwaned using a
shell. To stop the proxy, we need to terminate both the main process
(shell) and its child (proxy).

Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
2018-05-23 10:10:50 -05:00
Min RK
1745937f1a back to dev 2018-05-23 16:47:56 +02:00
Min RK
e7eb674a89 0.9.0b3 2018-05-23 16:30:07 +02:00
Min RK
b232633100 Merge pull request #1894 from minrk/db-rollback
Rollback database sessions on SQLAlchemy errors
2018-05-23 16:09:51 +02:00
Carol Willing
6abd19c149 Merge pull request #1911 from minrk/log-classes
log Authenticator and Spawner classes at startup
2018-05-22 11:50:59 -07:00
Min RK
0aa0ff8db7 Merge pull request #1912 from minrk/double-slash
Fix login redirect checking for `//` urls
2018-05-22 15:56:29 +02:00
Min RK
a907429fd4 more test cases for login redirects 2018-05-22 15:40:27 +02:00
Min RK
598b550a67 fix query/hash login redirect handling 2018-05-22 15:40:14 +02:00
Min RK
92bb442494 more robust checking for login redirects outside jupyterhub 2018-05-22 15:40:00 +02:00
Min RK
2d41f6223e log Authenticator and Spawner classes at startup
for better diagnostics
2018-05-22 13:52:41 +02:00
Min RK
791dd5fb9f Merge pull request #1895 from minrk/oauth-commits
avoid creating one huge transaction cleaning up oauth clients
2018-05-22 13:37:56 +02:00
Carol Willing
9a0ccf4c98 Merge pull request #1910 from minrk/ip-typo
default bind url should be on all ips
2018-05-22 01:26:35 -07:00
Min RK
ad2abc5771 default bind url should be on all ips
preserves jupyterhub default behavior

typo introduced in new bind_url config
2018-05-22 09:55:01 +02:00
Min RK
2d99b3943f enable pessimistic connection handling
from the sqlalchemy docs

checks if a connection is valid via `SELECT 1` prior to using it.

Since we have long-running connections, this helps us survive database restarts, disconnects, etc.
2018-05-21 22:14:11 +02:00
Min RK
a358132f95 remove --rm from docker-db.sh
for easier stop/start testing
2018-05-21 22:12:30 +02:00
Tim Head
09cd37feee Merge pull request #1896 from thoralf-gutierrez/fix-typos-in-config
Fix typos in auth config documentation
2018-05-16 22:37:51 +02:00
Thoralf Gutierrez
0f3610e81d Fix typos in auth config documentation 2018-05-16 10:58:02 -07:00
Min RK
3f97c438e2 avoid creating one huge transaction cleaning up oauth clients 2018-05-15 16:33:50 +02:00
Min RK
42351201d2 back to dev 2018-05-15 16:32:24 +02:00
Min RK
907bbb8e9d 0.9.0b2 2018-05-15 14:03:10 +02:00
Min RK
63f3d8b621 catch database errors in update_last_activity 2018-05-15 13:53:05 +02:00
Min RK
47d6e841fd cache get_current_user result
avoids raising an error rendering templates, etc.
2018-05-15 13:49:38 +02:00
Min RK
e3bb09fabe rollback database session on db errors
ensures reconnect will occur when database connection is lost
2018-05-15 13:49:14 +02:00
Carol Willing
d4e0c01189 Merge pull request #1893 from minrk/version
ensure jupyterhub version matches pep440
2018-05-15 07:40:24 -04:00
Min RK
50370d42b0 ensure jupyterhub version matches pep440
avoids mismatch jupyterhub version and tag in docker builds
2018-05-15 13:19:43 +02:00
Min RK
aa190a80b7 Merge pull request #1891 from minrk/base_url
fix and test bind_url / base_url interactions
2018-05-15 12:07:44 +01:00
Min RK
e48bae77aa Merge pull request #1890 from minrk/default-url
test default_url handling
2018-05-15 10:51:17 +01:00
Min RK
96cf0f99ed fix and test bind_url / base_url interactions 2018-05-15 10:51:11 +02:00
Min RK
f380968049 test default_url handling
- default_url is used even if not logged in
- flesh out docstrings
- pass via settings
2018-05-15 10:15:33 +02:00
Min RK
02468f4625 Merge pull request #1854 from summerswallow-whi/extra_handler
Add custom handlers and allow setting of defaults
2018-05-15 08:55:15 +01:00
Haw-minn Lu
24611f94cf Remove base_url from default_url
Add help to new traits
change extra_page_handler to extra_handler
2018-05-14 11:53:22 -07:00
Min RK
dc75a9a4b7 Merge pull request #1881 from paccorsi/check-post-stop-hook
Check the value of post stop hook
2018-05-14 13:31:33 +01:00
Min RK
33f459a23a Merge pull request #1878 from ausecocloud/master
fix listing of OAuth tokens on tokens page
2018-05-14 13:31:06 +01:00
Min RK
bdcc251002 Merge pull request #1882 from dhirschfeld/patch-1
Allow configuring the heading in spawn.html
2018-05-14 13:30:47 +01:00
Pierre Accorsi
86052ba7b4 Check the value of post stop hook 2018-05-11 10:12:45 -04:00
Dave Hirschfeld
62ebcf55c9 Allow configuring the heading in spawn.html 2018-05-11 13:34:17 +10:00
Haw-minn Lu
80ac2475a0 Restore whitespacing to original 2018-05-10 11:25:02 -07:00
Haw-minn Lu
5179d922f5 Clean up extra handler defaults 2018-05-10 11:22:50 -07:00
Gerhard Weis
26f085a8ed add test for oauth tokens on tokens page 2018-05-10 08:46:28 +10:00
Gerhard Weis
b7d302cc72 fix listing of OAuth tokens on tokens page 2018-05-10 08:46:28 +10:00
Carol Willing
f2941e3631 Merge pull request #1873 from minrk/apitoken-expiry
implement API token expiry
2018-05-09 11:45:41 -04:00
Carol Willing
26a6401af4 Merge pull request #1876 from willingc/sudo-section
refactor sudo example config
2018-05-08 09:23:28 -07:00
Carol Willing
5c8ce338a1 edit per @minrk review 2018-05-08 11:54:38 -04:00
Carol Willing
5addc7bbaf correct directive 2018-05-07 21:03:13 -07:00
Carol Willing
da095170bf remove toctree item 2018-05-07 20:38:15 -07:00
Carol Willing
1aab0a69bd fix typo 2018-05-07 20:31:20 -07:00
Carol Willing
fc8e04b62f reflow templates file 2018-05-07 20:29:13 -07:00
Carol Willing
c6c53b4e10 update index 2018-05-07 20:28:55 -07:00
Carol Willing
9b0219a2d8 break up configuration examples 2018-05-07 20:18:02 -07:00
Carol Willing
6e212fa476 reflow proxy doc 2018-05-07 20:17:14 -07:00
Carol Willing
58f9237b12 refactor sudo example config 2018-05-07 15:38:16 -07:00
Carol Willing
74fd925219 Merge pull request #1864 from datalayer-contrib/docs-sudo
Add Docs about sudo (and remove it from the wiki)
2018-05-07 23:29:08 +02:00
Carol Willing
2696bb97d2 Merge pull request #1875 from willingc/api-redux
add packages to environment.yml
2018-05-07 23:16:53 +02:00
Haw-minn Lu
9cefb27704 Move extra_handlers to fall below builtins in priority 2018-05-07 14:06:34 -07:00
Carol Willing
5e75357b06 add packages to environment.yml 2018-05-07 13:54:06 -07:00
Min RK
79bebb4bc9 Merge pull request #1872 from thedataincubator/template-vars
Allow extra variables to be passed into templates
2018-05-07 20:33:44 +02:00
Eric Charles
0ed88f212b add sudo.md 2018-05-07 19:49:26 +02:00
Eric Charles
a8c1cab5fe add sudo doc 2018-05-07 19:49:26 +02:00
Min RK
e1a6b1a70f Merge pull request #1856 from minrk/whoami-users
note about hub_users in whoami example
2018-05-07 19:47:45 +02:00
Robert Schroll
c95ed16786 Allow extra variables to be passed into templates 2018-05-07 10:47:27 -07:00
Min RK
ec784803b4 remove duplicate whoami-oauth.py from external-oauth example 2018-05-07 15:35:05 +02:00
Min RK
302d7a22d3 leave user-whitelist example in a comment
allow all users by default because default whitelist is confusing
2018-05-07 15:34:33 +02:00
Min RK
eccd5a460b 0.9.0b1 2018-05-07 14:43:59 +02:00
Min RK
80437229a1 include package-lock in sdists 2018-05-07 14:43:59 +02:00
Min RK
237ffba641 Merge pull request #1871 from minrk/fix-hub-bind-url
fix and test constructing objects from bind_url
2018-05-07 14:40:39 +02:00
Dave Hirschfeld
2695c5e49f Add missing import 2018-05-07 14:13:36 +02:00
Min RK
b7a608fdfd soften deprecation messages about ip/ports in favor of URLs
These are not deprecated, bind_url is only a potentially more convenient/powerful alternative.
2018-05-07 14:13:36 +02:00
Min RK
c3413bad78 ensure hub_prefix is part of hub bind/connect URLs 2018-05-07 14:13:36 +02:00
Min RK
dceb244e5b ensure connect_url includes base_url prefix 2018-05-07 14:13:36 +02:00
Min RK
cb31a0b162 fix and test constructing objects from bind_url 2018-05-07 14:13:36 +02:00
Min RK
7ced657d79 Merge pull request #1863 from jamescurtin/add-post-spawn-hook
Add post spawn hook
2018-05-07 13:15:21 +02:00
James Curtin
8dd9168077 Refactor method name to post_stop_hook 2018-05-07 07:07:29 -04:00
Min RK
7c6591aefe add token expiry to token model 2018-05-07 13:02:26 +02:00
Min RK
58c91e3fd4 implement API token expiry 2018-05-07 13:00:37 +02:00
Min RK
db4cf7ae62 note about hub_users in whoami example
explain what hub_users does and the value in the example
2018-05-07 10:55:39 +02:00
Min RK
a17f5e4f1b Merge pull request #1870 from dhirschfeld/patch-3
Allow `hub_connect_url` to be configured
2018-05-07 10:49:44 +02:00
Min RK
6cf7f2b0a7 Merge pull request #1866 from chicocvenancio/mysql_large_prefix
Mysql large prefix
2018-05-07 10:49:03 +02:00
Min RK
7e21ea9a48 Merge pull request #1867 from dhirschfeld/patch-1
Fix typo
2018-05-07 10:46:30 +02:00
Min RK
3f29198bae Merge pull request #1868 from dhirschfeld/patch-2
Fix ImportError on Windows
2018-05-07 10:45:57 +02:00
Dave Hirschfeld
d4293650ff Allow hub_connect_url to be configured 2018-05-07 18:43:58 +10:00
Dave Hirschfeld
d65dd16881 Fix ImportError on Windows
Delay importing unix-specific functionality until required
2018-05-07 13:27:44 +10:00
Dave Hirschfeld
f36e163581 Fix typo 2018-05-07 12:54:25 +10:00
Chico Venancio
f215adcfa2 move check after engine creation 2018-05-06 04:39:26 +00:00
Chico Venancio
1549af6f56 move large_prefix_check to previous mysql if 2018-05-06 04:29:37 +00:00
Chico Venancio
c553f82580 add comment 2018-05-06 04:27:16 +00:00
Chico Venancio
196b4ebc9f fix py syntax 2018-05-06 04:27:16 +00:00
Chico Venancio
8710ce1687 fixing py syntax 2018-05-06 04:27:16 +00:00
Chico Venancio
f65e8d7369 add ROW_FORMAT=DYNAMIC if server is configured to need it for large collums 2018-05-06 04:27:16 +00:00
Carol Willing
dc5d9f02c7 Merge pull request #1861 from minrk/0.9-changelog
Changelog for 0.9
2018-05-05 02:00:05 +02:00
James Curtin
2f3f8d7826 Add post-spawn hook 2018-05-04 19:56:34 -04:00
Carol Willing
297da070fc Merge pull request #1859 from minrk/auth-token
Allow Authenticators to authenticate requests for API tokens
2018-05-05 01:53:37 +02:00
Carol Willing
10ea92dcea Merge pull request #1850 from minrk/connect_url
Use URLs for config
2018-05-05 01:30:35 +02:00
Min RK
2e5f01f232 changelog for 0.9 2018-05-04 17:25:04 +02:00
Min RK
1a080c4261 test retrieving a token with auth in the body 2018-05-04 17:22:47 +02:00
Min RK
0e08963355 suppress auth errors on authenticated token request
since Authenticators may not be prepared for this
2018-05-04 17:18:32 +02:00
Min RK
cd9e39bf54 allow authenticators to authenticate API requests for tokens
gives Authenticators the ability to authenticate token requests,
e.g. with an existing OAuth token from the upstream provider
2018-05-04 17:18:32 +02:00
Min RK
580e840165 Merge pull request #1709 from yuvipanda/retry-suggest
Suggest retry timing when we throttle server starts
2018-05-04 16:33:35 +02:00
Min RK
09a8fd5254 address review in spawn-throttle-retry
- update config to single tuple instead of two integers
- call it spawn_throttle_retry_range
- fix setting Retry-After header without disabling error pages
2018-05-04 13:44:32 +02:00
yuvipanda
8898faa141 Suggest retry timing when we throttle server starts
Fixes #1706
2018-05-04 12:38:11 +02:00
Min RK
fdbb1dad79 use bind_url in tests 2018-05-04 12:36:59 +02:00
Min RK
c39244168b note deprecations for ip/port
in favor of bind_url
2018-05-04 11:03:47 +02:00
Min RK
9591fd88c5 add JupyterHub.bind_url for public bind URL 2018-05-04 11:02:16 +02:00
Min RK
3558ce958e Merge pull request #1848 from willingc/docs-theme
Switch docs theme to be consistent with z2jh and binderhub
2018-05-04 10:27:44 +02:00
Min RK
804a9b7be8 Spawner.start can return a URL
enables internal HTTPS, if setup by the Spawner
2018-05-03 16:41:02 +02:00
Min RK
3cae550b13 remove redundant "Adding default route" log
the same message is logged immediately after with the URL
2018-05-03 16:32:56 +02:00
Min RK
138bad5913 add connect_url, bind_url overrides
enables `c.JupyterHub.bind_url = 'unix+http://%2Fsrv%2Fjupyterhub%2Fjupyterhub.sock'`
for listening on a bsd socket.

Similarly, bind_url and connect_url work as overrides everywhere
2018-05-03 16:32:31 +02:00
Carol Willing
09011815af Good catch @betatim 2018-05-03 15:54:51 +02:00
Matthias Bussonnier
7b0c845c3a Allow Hub to listen on a unix-socket
Add the hub_socket option to the JupyterHub class, which takes
precedence over the hub_ip and hub_port setting. It does not forward
this setting to the Hub class though, and a few log messages still say
the hub is listening on `http://:8000` that works fine when testing with
netcat:

```
$ nc -U /tmp/jhub.sock
GET /login HTTP/1.1

HTTP/1.1 302 Found
Server: TornadoServer/4.5.1
Content-Type: text/html; charset=UTF-8
Date: Fri, 28 Jul 2017 02:05:36 GMT
X-Jupyterhub-Version: 0.8.0.dev
Content-Security-Policy: frame-ancestors 'self'; report-uri /hub/security/csp-report
Location: /hub/login
Content-Length: 0
```

Should still be better documented I guess.
2018-05-03 15:49:17 +02:00
Min RK
6a47123ec9 Merge pull request #1847 from willingc/update-contributing
Update the contributing instructions for running tests.
2018-05-03 14:56:01 +02:00
Carol Willing
19fab6bbf8 fix typo 2018-05-03 04:42:06 +02:00
Carol Willing
90e6b63e59 bump tornado and sphinx versions 2018-05-03 04:37:33 +02:00
Carol Willing
bd78217cf3 remove jupyter alabaster theme from requirements 2018-05-03 04:34:56 +02:00
Carol Willing
b0833985e6 fix wording from spawn to launch 2018-05-03 04:32:22 +02:00
Carol Willing
a6f73b035f updates to theme 2018-05-03 04:26:02 +02:00
Carol Willing
251440ec64 add templates for theme 2018-05-03 03:34:48 +02:00
Carol Willing
22a1df6fa0 update conf.py for theme 2018-05-03 03:34:16 +02:00
Carol Willing
6389751c22 move to alabaster theme 2018-05-03 03:22:26 +02:00
Carol Willing
8498691763 Update the contributing instructions for running tests. 2018-05-02 22:25:45 +02:00
Carol Willing
1750ff0324 Merge pull request #1846 from minrk/log-typo
ensure changed is defined
2018-05-02 20:53:08 +02:00
Carol Willing
2ce4c46afd Merge pull request #1845 from minrk/colorblind-friendly
pick colorblind-friendly alternatives for success/danger
2018-05-02 20:22:46 +02:00
Carol Willing
a20f5e44d1 Merge pull request #1819 from minrk/test-tornado-45
require tornado 5
2018-05-02 20:12:59 +02:00
Min RK
cd746d72d4 scrub redirect urls as well 2018-05-02 12:58:50 +02:00
Min RK
f7eaff0828 ensure changed is defined
avoids UnboundLocal error when no change has occurred
2018-05-02 12:52:58 +02:00
Min RK
849f119a47 Merge pull request #1835 from minrk/secret-logs
further scrub potentially sensitive url params
2018-05-02 11:58:40 +02:00
Min RK
52b68381f6 require tornado 5 2018-05-02 11:56:26 +02:00
Min RK
46d495e1e2 use btn-primary instead of btn-success
avoid references to formerly-green color
2018-05-02 11:19:46 +02:00
Min RK
acc6c22355 eliminate distinction between 'primary' and 'success'
since we don't use them both on the same screen
2018-05-02 11:16:56 +02:00
Min RK
8143182971 pick colorblind-friendly alternatives for success/danger
danger is still red, success is now blue

picked from color brewer 2 RdYlBu
2018-05-02 11:14:19 +02:00
Carol Willing
04a22cd482 Merge pull request #1841 from rkdarst/run_same_service_culling
cull_idle_servers: Add note about running with different timeouts
2018-05-02 05:41:13 +02:00
Richard Darst
4376224084 cull_idle_servers: Add note about running with different timeouts
- Instead of creating many options for different timeouts of users and
  servers, just add a note that the whole culler can be run multiple
  times with different options.  See discussion in #1834.
- Closes: #1834
2018-05-02 01:11:29 +03:00
Min RK
a9fe88c343 Merge pull request #1838 from tklever/moment-upgrade
chore: bump moment.js version
2018-04-30 14:59:43 +02:00
Carol Willing
6eb95e1c66 Merge pull request #1839 from jupyterhub/spawner-as-noun
Use verb spawn in README to refer to things related to spawner
2018-04-30 14:36:27 +02:00
J Forde
a46287c4a6 Update README.md
We should probably use the verb spawn to refer to the spawner since the spawner is the name of a specific part of JHub
2018-04-30 13:27:25 +02:00
Haw-minn Lu
bc86ee1c31 Add custom handlers and allow setting of defaults 2018-04-27 15:58:59 -07:00
Haw-minn Lu
a73e6f0bf8 Attach an info field to the service 2018-04-27 14:51:55 -07:00
Tim Klever
10a6c5144d chore: bump moment.js version
Moving to 2.19.3 or higher to clear some regex issues
2018-04-27 09:53:51 -07:00
Carol Willing
4e5f43aeae Merge pull request #1832 from minrk/dockerfiles
Docker updates
2018-04-27 06:10:59 -07:00
Min RK
ff56db0c8b Merge pull request #1828 from rkdarst/authenthicator_blacklist
Authenthicator blacklist
2018-04-26 17:59:44 +02:00
Richard Darst
95a9b97649 Add tests for authentication blacklist 2018-04-26 17:51:25 +03:00
Min RK
a5b5208823 add build context to alpine dir 2018-04-26 16:43:56 +02:00
Min RK
783295fabd fix tags in post_push 2018-04-26 16:43:56 +02:00
Min RK
1c942ec97c ubuntu base image has utf8 locale 2018-04-26 16:43:56 +02:00
Min RK
3b6d2655ab fix onbuild build arg 2018-04-26 16:43:56 +02:00
Min RK
8a18d0daab move onbuild hook to post_build 2018-04-26 16:43:56 +02:00
Min RK
e9f7ccbd25 make build hooks exit on failure 2018-04-26 16:43:56 +02:00
Min RK
68d9f35c0b build all our docker images on circleci 2018-04-26 16:43:56 +02:00
Min RK
28d78134c1 remove push from circle
building directly on docker cloud now, no credentials needed
2018-04-26 16:43:56 +02:00
Min RK
fd92ac852d add docker cloud hooks for onbuild 2018-04-26 16:43:56 +02:00
Min RK
8399f5288e add BASE_IMAGE build arg for onbuild
for easier automated building
2018-04-26 16:43:56 +02:00
Min RK
f99b7cb7eb update Python, conda, ubuntu in Dockerfile 2018-04-26 16:43:56 +02:00
Min RK
bb5166077f further scrub potentially sensitive url params
include oauth codes, state, and tokens
2018-04-26 16:42:24 +02:00
Carol Willing
b72e4b66ca Merge pull request #1831 from minrk/service-stop
service.stop is a coroutine
2018-04-26 07:28:55 -07:00
Carol Willing
ed85cd25d6 Merge pull request #1827 from minrk/circle
simplify circle2 config
2018-04-26 07:23:52 -07:00
Carol Willing
3f90697e18 Merge pull request #1820 from minrk/test-db-upgrade
test database upgrades
2018-04-26 07:22:58 -07:00
Tim Head
73271a3e55 Merge pull request #1833 from rkdarst/cull_idle_py36
Note cull-idle needs python3
2018-04-26 15:44:35 +02:00
Richard Darst
6f9ea712de Note cull-idle needs python3
- Closes: #1825
2018-04-26 16:30:51 +03:00
Min RK
6ee244e7cb Merge pull request #1829 from rkdarst/cull_idle_py36
cull_idle_servers.py: py<3.6 compatibility
2018-04-26 14:42:24 +02:00
Min RK
d66a4af79b service.stop is a coroutine
fixes waiting for services to stop on shutdown
2018-04-26 14:29:50 +02:00
Richard Darst
ea7b1caa4e Add blacklist to auth.py
- Introduce blacklist to supplement white list
- Original code by github:ndiy, updated by github:rkdarst
2018-04-26 15:22:41 +03:00
Richard Darst
9cd880fb35 cull_idle_servers.py: Remove f-string for py3.4 compatibility 2018-04-26 15:05:49 +03:00
Min RK
658c152707 simplify circleci 2 config 2018-04-26 10:49:22 +02:00
Min RK
6f1ba77608 Merge pull request #1813 from rkdarst/api_server_state
add server.state to server model if requester is an admin
2018-04-26 10:33:22 +02:00
Richard Darst
2344d696ca API: pass 'server_state' through to admin clients only
- This will allow, for example, cull_idle_servers to be more
  intelligent when culling servers.
- This is only given to admin API users, because we don't know if all
  spawners expect their state to be made available to users.
2018-04-24 16:52:18 +03:00
Min RK
bd816310cb Merge pull request #1817 from minrk/server-model
Always include server sub-models in user api requests
2018-04-24 14:12:58 +02:00
Min RK
2bcf759a9f Don't forget to install db libs in upgrade env 2018-04-24 11:44:08 +02:00
Min RK
82a04f7032 Merge pull request #1823 from willingc/test-time
Add a pytest ini file for running marked tests and edit testing mock files
2018-04-24 11:38:57 +02:00
Min RK
4281babee4 make server-model inclusion opt-in
so only certain API endpoints include server info:

- user list
- get named user

The rest exclude running servers
2018-04-24 11:35:51 +02:00
Min RK
d89f2965cf handle updated server models in culler
- servers sub-models model always defined in 0.9
- explicit 'ready' key added, use user.url fallback only when needed
2018-04-24 11:35:15 +02:00
Min RK
e2a2a9903a spawner.pending is None when nothing is pending
rather than False, which is a bit less convenient since we turn it to None in APIs anyway
2018-04-24 11:35:15 +02:00
Min RK
4401cdc16a Always have .servers model on users
rather than only when named_servers is enabled.

Put new-in-0.9 state there, rather than continuing to add server fields to top-level user model.
2018-04-24 11:35:15 +02:00
Carol Willing
e8d3fb2920 Document the mock service and mock single user servers 2018-04-23 17:38:02 -07:00
Carol Willing
f7ccc137ea add comments to header docstring 2018-04-23 17:06:44 -07:00
Carol Willing
07bbb4ea02 add comments to test file header docstring 2018-04-23 17:06:15 -07:00
Carol Willing
b189e70c9b add a minimal ini file for pytest 2018-04-23 15:31:34 -07:00
Carol Willing
de4c9c1463 mark some api tests as slow 2018-04-23 15:31:00 -07:00
Carol Willing
8bdb73ced4 Merge pull request #1809 from minrk/no-expire-again
don't expire objects on commit
2018-04-23 09:26:57 -07:00
Min RK
dee9050939 require virtualenv package for tests 2018-04-23 15:44:21 +02:00
Min RK
ae3c214708 remove unused old-jupyterhub.sqlite 2018-04-23 15:23:26 +02:00
Min RK
d6e81867bf remove upgrade-db step from travis.yml
it's now in the test itself
2018-04-23 15:22:45 +02:00
Min RK
d30a5ee0a5 add populate_db.py script to populate a database for upgrading 2018-04-23 15:22:45 +02:00
Min RK
88bb80be0f ALTER TABLE is required to add foreign key constraints
skip this for sqlite upgrade
2018-04-23 15:22:45 +02:00
Min RK
bba1ba1678 create additional test databases
for upgrading from multiple base hub versions
2018-04-23 15:22:45 +02:00
Min RK
b50daf20d0 IS NOT NULL typo in upgrade 2018-04-23 15:22:45 +02:00
Min RK
5c6c7cdff5 require tornado 4.5 2018-04-23 13:42:42 +02:00
Min RK
3f9b2a0c28 test with tornado 4.5 on travis 2018-04-23 13:42:34 +02:00
Min RK
453e119808 don't bypass spawner.server to delete server
this shouldn't happen, it's just breaking things
2018-04-23 12:54:22 +02:00
Min RK
a021f910c8 expose expire_on_commit option
conservative deployments may set

    c.JupyterHub.db_kwargs['expire_on_commit'] = True

as an escape if the optimization is causing problems.
2018-04-23 12:54:22 +02:00
Min RK
e6c2afc4db fix oauth lookup use of relationships
have to lookup orm client/user by id

client/user attributes don't exist on oauth objects, which aren't orm objects
2018-04-23 12:54:20 +02:00
Min RK
e6c7b28057 expire before re-running init_services
seems to be required, not sure why
2018-04-23 12:53:38 +02:00
Min RK
b1840e8be7 use relationships everywhere
in order to use sqlalchemy's expire_on_commit=False optimization,
we need to make sure that objects are kept up to date.

This means we cannot rely on ForeignKey ondelete/onupdate behavior,
we must use sqlalchemy's local relationship cascades

The main key here is that we must use relationships to set foreign-key relations,
e.g. APIToken.user = user instead of APIToken.user_id = user.id.

It also means that we cannot use passive_deletes,
which allows sqlalchemy to defer to the database's more efficient ON DELETE behavior.

This makes deletions more expensive in particular,
but should improve db performance overall.
2018-04-23 12:53:38 +02:00
yuvipanda
15e4b1ad8b Don't expire objects on commit 2018-04-23 12:53:38 +02:00
Min RK
2517afcee0 Merge pull request #1800 from minrk/token-api
API for managing tokens
2018-04-23 12:52:34 +02:00
Min RK
15c7ba3078 Merge pull request #1788 from NERSC/options-template-variables
Options form template variables
2018-04-23 12:49:41 +02:00
Rollin Thomas
f2cb24781a Pass for_user.spawner to templating namespace
Give access to spawner fields from the spawner form template.
2018-04-20 08:25:13 -07:00
Min RK
e1d346b8c3 add set -e to script
to prevent proceeding to docs after failure
2018-04-20 15:34:52 +02:00
Min RK
97bdf4811c update expected default token note 2018-04-20 15:34:52 +02:00
Min RK
45c871d779 add some description of API and OAuth tokens 2018-04-20 15:34:52 +02:00
Min RK
976fa9c907 update default note for API-requested tokens 2018-04-20 15:34:52 +02:00
Min RK
771c60ca37 update default token page note 2018-04-20 15:34:52 +02:00
Min RK
e15eeccd35 match oauth client description and sever token note
for spawner api tokens: "Server at /user/:name"
2018-04-20 15:34:52 +02:00
Min RK
ce535b55bc Revoking one oauth token revokes all oauth tokens for that client 2018-04-20 15:34:52 +02:00
Min RK
33cb62c2ee support revoking tokens from token page 2018-04-20 15:34:52 +02:00
Min RK
32fe3cf61d support adding note to new tokens on token page
turn token request into a form
2018-04-20 15:34:52 +02:00
Min RK
73a05498ce support new token API in jhapi.js 2018-04-20 15:34:52 +02:00
Min RK
034147f604 add token lists to token page 2018-04-20 15:34:52 +02:00
Min RK
b629e520a9 add token api to rest yaml 2018-04-20 15:34:52 +02:00
Min RK
30280cc6a4 add token.api_id
id key used in rest api
2018-04-20 15:34:52 +02:00
Min RK
f7f0b72776 retrieve tokens by id in REST API, not full token in URL 2018-04-20 15:34:52 +02:00
Min RK
251289fc05 add new token management to REST API
- list tokens
- create new tokens
- delete tokens
2018-04-20 15:34:52 +02:00
Min RK
6437093a67 add token_model method
for returning the model of an API or OAuth token
2018-04-20 15:34:52 +02:00
Min RK
be5a878da5 add description to oauth clients for services and user servers 2018-04-20 15:34:52 +02:00
Min RK
8dc73a852d add oauth client description 2018-04-20 15:34:42 +02:00
Min RK
e37d82951e Merge pull request #1814 from dhirschfeld/cookie-secret-permissions
Skip checking cookie secret permissions on Windows
2018-04-20 12:34:08 +02:00
dhirschf
acc311830e Skip checking cookie secret permissions on Windows
The existing checks are posix specific
2018-04-19 09:47:57 +10:00
Min RK
6b1046697a Merge pull request #1807 from rkdarst/cull_idle_unknown_times
cull_idle_servers.py: Fix problem when age/inactive undefined
2018-04-17 18:15:38 +02:00
Carol Willing
c5befc5b2a Merge pull request #1810 from minrk/service-stop
service.stop is not async
2018-04-17 05:18:37 -07:00
Min RK
e743a5733b add debug-logging for stopping proxy and services 2018-04-17 14:07:13 +02:00
Richard Darst
5f98801c99 cull_idle_servers.py: Don't try to delete non-running servers
- Only run the server handler if a server is actually running.  A bug
  could occur with non-named servers.
2018-04-17 13:52:13 +03:00
Richard Darst
9858a3db9d cull_idle_servers.py: Fix problem when age/inactive undefined
- Sometimes the inactive or age can be undefined instead of timedelta.
  Handle this case.
2018-04-17 13:51:40 +03:00
Min RK
65c1a525b9 service.stop is not async 2018-04-17 11:43:42 +02:00
Min RK
8bd055d4bd Merge pull request #1804 from consideRatio/query-string-memory-pr
/user/someone-else redirection retain query strings
2018-04-16 10:11:11 +02:00
Erik Sundell
5ee14db1f9 /user/someone-else redirection retain query strings 2018-04-15 05:03:56 +02:00
Carol Willing
58069d015b Merge pull request #1801 from minrk/cascades
fix and test deletion cascades
2018-04-13 13:47:27 -07:00
Carol Willing
f2684b59ec Merge pull request #1802 from minrk/dbutil-shell
add `python -m jupyterhub.dbutil shell`
2018-04-13 12:54:23 -07:00
Min RK
e0c0d03c5f define client_id in oauth token test 2018-04-13 21:52:17 +02:00
Min RK
1ac47d2bb0 consolidate stale client_id check to AccessToken.find 2018-04-13 21:49:57 +02:00
Min RK
bc75c71ca3 ensure oauth tokens with no client id aren’t accepted
these should have been deleted by deleting oauth clients
2018-04-13 21:42:38 +02:00
Min RK
c49fc14528 move oauth token relation to user
for symmetry with APIToken
2018-04-13 21:26:18 +02:00
Min RK
078bd8c627 fix and test deletion cascades
- ensure foreign keys are enabled on sqlite
- fix deletion cascades where relationships were causing dissociation instead of deletion
2018-04-13 21:23:58 +02:00
Min RK
33ba9fb5cf ensure foreign keys are enabled on sqlite 2018-04-13 21:23:58 +02:00
Min RK
4e7e586cb9 add python -m jupyterhub.dbutil shell
allows opening an IPython shell with a connection to your database

alembic moved from `python -m jupyterhub.dbutil` to `python -m jupyterhub.dbutil alembic` subcommand
2018-04-13 21:23:36 +02:00
Min RK
62fa795052 Merge pull request #1803 from minrk/status-code-typeyo
typo catching 404 in proxy.delete_route
2018-04-13 21:22:54 +02:00
Min RK
b6d9f89518 typo in test_multi_groups
add multiple groups, not users
2018-04-13 21:01:48 +02:00
Min RK
afbf867169 typo catching 404 in proxy.delete_route
status code is .code, not .status_code
2018-04-13 20:54:15 +02:00
Carol Willing
dace6ac156 Merge pull request #1793 from minrk/server.port
check if server is defined before accessing server.port
2018-04-13 10:31:05 -07:00
Carol Willing
cbf2b8cb78 Merge pull request #1790 from minrk/409-conflict
raise 409 conflict on duplicate actions
2018-04-13 10:29:52 -07:00
Carol Willing
96c5de63d8 Merge pull request #1775 from minrk/proxy-perf
proxy performance tweaks
2018-04-13 09:48:59 -07:00
Carol Willing
b8b57843a6 Merge pull request #1771 from minrk/progress
Progress on spawn-pending page
2018-04-12 16:16:37 -07:00
Min RK
e3fd4ad77d check if server is defined before accessing server.port
avoids error on premature access of Spawner.get_args if port is not set
2018-04-12 14:34:18 +02:00
Min RK
c08148266a raise 409 conflict on duplicate actions
Makes it easier for upstream clients to retry failed actions and ignore failure due to duplicate transactions
2018-04-11 10:52:05 +02:00
Min RK
a6a2d04c46 Merge pull request #1768 from sangramga/master
Added Post groups API in group list handlers
2018-04-10 13:11:05 +02:00
Min RK
8f7061fb9b Merge pull request #1779 from minrk/cull-semaphore
limit concurrent cull requests
2018-04-10 13:10:45 +02:00
Min RK
7b5235138f commit changes after stopping in cleanup 2018-04-09 16:00:04 +02:00
Min RK
7e3fa8c38d Don't double-check _stop_pending flag
could cause spurious raises of Timeout errors
2018-04-09 15:58:39 +02:00
Min RK
151acd5bec catch errors in cleanup 2018-04-09 15:16:05 +02:00
Min RK
23ca2039f6 run cleanup_after on ioloop
instead of directly on asyncio
2018-04-09 15:09:50 +02:00
Min RK
b291103592 fixup cleanup 2018-04-09 14:51:20 +02:00
Min RK
e962c9993b don't ask for exception is Future is not done 2018-04-09 14:47:50 +02:00
Min RK
955b769d3f add missing commits for deprecated ip/port
consider for removal
2018-04-09 14:47:34 +02:00
Min RK
9b914e8f01 fix waiting for spawner to fail in progress 2018-04-09 14:46:28 +02:00
Min RK
307ad636dc test spawner failure mid-progress 2018-04-09 14:46:08 +02:00
Min RK
2952f62726 add cleanup_after fixture
function-scoped fixture for shutting down servers

avoids servers leaking into neighbor tests without having to teardown the app itself after every test
2018-04-09 14:24:29 +02:00
Min RK
6d6e48f434 test native async generator on Python 3.6 2018-04-09 13:03:29 +02:00
Min RK
a189196855 ensure async generators are properly closed
only terminate with iterate_until in handler, not Spawner._generate_events
2018-04-09 13:03:18 +02:00
Min RK
d30e62a205 test spawn progress 2018-04-09 11:39:07 +02:00
Min RK
e56d416210 Don't delete failed spawners
They preserve error messages that are useful

only delete spawners that shutdown cleanly
2018-04-09 11:38:29 +02:00
Min RK
c0f37c48a1 fix wait for spawn future
asyncio.wait takes a list
2018-04-09 11:16:17 +02:00
Min RK
a3ed387455 move get_content_type up one level to BaseHandler
so all handlers get it
2018-04-09 10:38:02 +02:00
Min RK
beedc94179 delete the spinner
no need for a spinner when we have a progress bar
2018-04-09 10:32:28 +02:00
Tim Head
5229604782 Merge pull request #1781 from consideRatio/link-in-doc-fix-pr
links in docs corrected
2018-04-08 14:06:57 +02:00
Erik Sundell
cf665517dd links in docs corrected 2018-04-08 09:10:09 +02:00
sangramga
4663edd8a7 removed comments 2018-04-07 13:09:12 +05:30
Min RK
312e7974d9 limit concurrency of cull requests
avoids simultaneous request for deletion of lots of users, which can slow down the Hub
2018-04-06 16:03:48 +02:00
Min RK
ca8aa53b32 remove 'missing' from default route message
avoids indication that something went wrong
since this occurs during normal hub startup
2018-04-05 12:12:03 +02:00
Min RK
7122ca1c24 add lock to prevent concurrent calls to check_routes 2018-04-05 12:09:06 +02:00
Min RK
97cdb1a5d8 handle progress_url in user model tests 2018-04-05 11:46:47 +02:00
Min RK
31d3f7a20b allow isoformat(None)
simplifies "if timestamp is None" cases when we are just using it to serialize nullable timestamps to JSON
2018-04-05 11:32:34 +02:00
Min RK
6f8a34127b consolidate progress url
and include it in server models
2018-04-05 11:28:52 +02:00
Min RK
ee1a86d192 progress url is at server/progress
instead of server-progress
2018-04-05 11:22:00 +02:00
Min RK
707b300bd6 add iterate_until utility
allows iterating through an async generator, yielding items until another Future resolves

if/when that deadline Future resolves, ready items will continue to be yielded until there is one that actually needs to wait
at which point the iteration will halt
2018-04-05 11:22:00 +02:00
Min RK
c9e12182a2 halt progress iteration on completed spawn
requires calling `__aiter__` and `__anext__` instead of `async for`
2018-04-05 11:22:00 +02:00
Min RK
9b7186e9b8 close eventstream on success 2018-04-05 11:22:00 +02:00
Min RK
4eb07f9d48 stop spinner on failure 2018-04-05 11:22:00 +02:00
Min RK
4f78cbbd1b implement progress on spawn_pending page
- add Spawner.progress method. Must be an async generator of JSON-able progress events
- add /api/users/:user/server-progress eventstream endpoint
- use eventstream to fill progress bar on the spawn pending page
2018-04-05 11:22:00 +02:00
Min RK
d962e8bcbc Merge pull request #1748 from minrk/cookie-options
expose cookie options and pass them down to spawners
2018-04-05 10:28:46 +02:00
Min RK
ba695a0230 Merge pull request #1750 from minrk/warn-should-start
remove warning when generating proxy token if Proxy.should_start
2018-04-05 10:28:18 +02:00
Min RK
dfed2437a8 Merge pull request #1746 from minrk/activity-tracking
expand user activity timestamps
2018-04-05 10:27:55 +02:00
Min RK
ecfcb4ec64 Merge pull request #1745 from minrk/rm-redirects
clear ?redirects from URL once single-user pages load successfully
2018-04-05 10:25:24 +02:00
Min RK
b9335311de Merge pull request #1774 from dhirschfeld/patch-1
Fix Windows build
2018-04-05 10:24:41 +02:00
Dave Hirschfeld
354468db0a Fix Windows build
Closes #1773
2018-04-05 16:35:29 +10:00
Min RK
340a736722 use age instead of time cutoff
gets nicely formatted timedeltas in logging
instead of absolute times
2018-04-03 15:24:10 +02:00
Min RK
7bf93cb7e6 update cull_idle_servers for 0.9
- adds max-age
- handle named servers
- refactor culling a bit
2018-04-03 15:24:10 +02:00
Min RK
4fa9535fd4 get upstream changes from cull_idle_servers.py in zero-to-jupyterhub 2018-04-03 15:24:10 +02:00
Min RK
1abd3217aa always run test_auth_api with 'admin' user
avoids inconsistent subsequent state based on db behavior
2018-04-03 15:24:10 +02:00
Min RK
d0360d5c98 update tests with new user models
add normalize_user and fill_user utilities
2018-04-03 15:24:08 +02:00
Min RK
74365ad05e starting a server updates last_activity and started for user and spawner 2018-04-03 15:14:47 +02:00
Min RK
9dc24c0995 add user.created, spawner.started
- alembic revision
- in user/spawner models
2018-04-03 15:14:47 +02:00
Min RK
fd40e27be4 indicate that REST API timestamps are UTC
use iso8601 Z suffix for UTC timestamps

use dateutil to parse dates from proxy, as well

even though CHP uses iso8601 UTC timestamps, we no longer assume CHP, so use more general parsing

in our db we are stuck with naïve datetime objects, so use those internally.
But ensure we put 'Z' on timestamps we ship externally
2018-04-03 15:14:47 +02:00
Min RK
05b2bf4c96 ensure user.created is defined during app startup
avoids user.created being null after upgrade
2018-04-03 15:14:47 +02:00
Min RK
a0fcbcbc7d do not consider stopping a user's server activity 2018-04-03 15:14:47 +02:00
Min RK
3117ea9d34 handle user.last_activity being None 2018-04-03 15:14:47 +02:00
Min RK
8973dea33e add user.created and start last_activity as None
need to handle last_activity being None throughout
2018-04-03 15:14:47 +02:00
Min RK
3e7d0dbd23 update user.last_activity whenever we see activity on API tokens / cookies 2018-04-03 15:14:47 +02:00
Min RK
b26b1bc038 Merge pull request #1720 from glenak1911/gk/update-circleci-config-v2
Updated CircleCI config file to 2.0
2018-04-03 13:14:14 +02:00
Glen A Knight
74b1102dea Delete package-lock.json 2018-04-02 09:06:57 -04:00
Glen A Knight
a89226279f remove checkout step from deploy and release jobs 2018-04-02 09:03:50 -04:00
Glen A Knight
8b490c8ef0 add package-lock.json to gitignore 2018-04-02 09:03:09 -04:00
Min RK
77a98e7875 Merge pull request #1753 from minrk/check-pending
avoid deleting routes for spawners in a pending state
2018-04-02 09:31:29 +02:00
sangramga
c02592d5ba Merge remote-tracking branch 'origin/master' 2018-03-31 16:24:08 +05:30
sangramga
52d7dacbaa post groups api added
Added post groups list api

Added test for  Multi groups post API

Added Post  multiple groups API
2018-03-31 16:20:51 +05:30
sangramga
9a8457deff Added Post multiple groups API 2018-03-31 15:42:58 +05:30
sangramga
5039b3ac6f Added test for Multi groups post API 2018-03-31 14:46:49 +05:30
sangramga
00705223b6 Added post groups list api 2018-03-31 13:10:48 +05:30
Glen Knight
9f6ab4c419 make workflows in line with jobs 2018-03-30 11:39:25 -04:00
Glen Knight
9012c7310d update workflows 2018-03-29 01:53:37 -04:00
Glen Knight
a3edebcad9 update run commands 2018-03-29 01:49:50 -04:00
Glen Knight
f2abb6a73f update indentation 2018-03-29 01:40:35 -04:00
Glen Knight
e96e5b740a update indentation 2018-03-29 01:38:57 -04:00
Glen Knight
ee067ad97a update indentation 2018-03-29 01:36:44 -04:00
Glen Knight
d01b3a88b6 update workflow 2018-03-29 01:34:59 -04:00
Glen Knight
5a22c978cf update workflows 2018-03-29 01:26:14 -04:00
Glen Knight
f8a0e7d1be update workflows 2018-03-29 01:25:23 -04:00
Glen Knight
25a65564b1 update workflows 2018-03-29 01:24:00 -04:00
Glen Knight
c858023c88 update config and add workflows 2018-03-29 01:19:17 -04:00
sangramga
c3e470db26 post groups api added 2018-03-28 18:50:35 +05:30
Min RK
5908c4da7a clarify pending exception comment 2018-03-27 17:49:03 +02:00
Min RK
b08dbbd106 handle that auth_token is checked now at startup 2018-03-27 17:46:37 +02:00
Min RK
3b320c75e9 remove warning when generating proxy token if Proxy.should_start
Now that it's unambiguous whether the proxy should start or not,
we don't need a warning about generating tokens causing issues for hub restart.

We can raise a strict, early error if proxy s external and token is still unspecified,
rather than running into a 403 error due to a generated token
2018-03-27 17:46:25 +02:00
Min RK
1aa6dc6686 use semaphore to limit concurrent requests to the proxy
should limit timeout errors in case of flooding the proxy with requests

default concurrency is 10
2018-03-27 14:30:03 +02:00
Min RK
fdc4385e62 a bit more debug logging in proxy.check_routes
- log (info) that check_routes is starting
- log (debug) when fetching routes
2018-03-27 14:25:49 +02:00
Min RK
5094448762 Merge pull request #1743 from betatim/user-api
[MRG] Expose `auth_state` via /api/users/<name>
2018-03-27 10:56:39 +02:00
Min RK
98c7fa919f avoid deleting routes for spawners
we previously checked if spawn_pending, but *any* transitional state should exclude them from the check
2018-03-27 10:43:43 +02:00
Tim Head
5b9f51417f Fix permission check when handing out auth state 2018-03-27 10:02:59 +02:00
Tim Head
7a91f89474 Use user's token for auth when using API 2018-03-27 10:02:59 +02:00
Tim Head
bf7afa16e5 Remove auth state from user's self handler 2018-03-27 10:02:59 +02:00
Tim Head
0d57baae82 Modify user API wrt auth_state
A user can not get their own auth state via the REST API. Only admins
can fetch and update the auth state this way.
2018-03-27 10:02:59 +02:00
Tim Head
446d197cf7 Move auth state fixture to conftest 2018-03-27 10:02:59 +02:00
Tim Head
2582f0bbe6 Modify auth_state API test to use mocked crypto 2018-03-27 10:02:59 +02:00
Tim Head
1ee993c664 Add ability to modify auth_state via the REST API 2018-03-27 10:02:59 +02:00
Tim Head
542c20065f Reduce the number of endpoints that expose auth_state 2018-03-27 10:02:59 +02:00
Tim Head
39f663d03c Expose auth_state via user API 2018-03-27 10:02:59 +02:00
Min RK
6474a55302 Merge pull request #1749 from minrk/await-fixes
fix await of default authenticate
2018-03-26 13:34:01 +02:00
Min RK
8566d4c5ab fix await of default authenticate 2018-03-23 10:57:47 +01:00
Min RK
e374e93cfb expose cookie options and pass them down to spawners
enables forcing all-session cookies with:

```python
c.JupyterHub.tornado_settings['cookie_options'] = {
    'expires_days': None,
}
```
2018-03-23 10:38:50 +01:00
Min RK
7bd4f6490c Merge pull request #1731 from vilhelmen/pam_account_check
Allow checking PAM account stack during PAM auth
2018-03-23 09:19:20 +01:00
Unknown
25373f510d Allow and enable PAM account stack checking
JH can now differentiate between authenticated and authorized users via PAM
This allows JH to respect PAM-accessible user access controls.

This also fixes missing PAMAuthenticator.encoding usages.
2018-03-22 15:53:28 -05:00
Min RK
82cab39e1c Merge pull request #1722 from minrk/login-spawn
Simplify root/login redirect behavior
2018-03-21 13:20:49 +01:00
Min RK
22507cc1cd clear ?redirects from URL once single-user pages load successfully 2018-03-21 13:01:29 +01:00
Min RK
2bded65c7e update singleuser auth test url check
handle `?redirects`
2018-03-21 12:58:59 +01:00
Min RK
a3a0c60804 update redirect tests
now that redirects are not sensitive to state
2018-03-21 11:15:40 +01:00
Min RK
704b172887 update tests to reflect that login no longer implies spawn 2018-03-21 10:51:49 +01:00
Min RK
135717f8cb Merge pull request #1733 from willingc/spawner-comment
Add a spawner_class option to the reference example
2018-03-21 10:38:33 +01:00
Glen Knight
1d87ba8534 updated run? 2018-03-19 23:59:14 -04:00
Glen Knight
97cd27775b updated run command 2018-03-19 23:56:45 -04:00
Glen Knight
fe2e9c282e removed checkout 2018-03-19 23:44:53 -04:00
Glen Knight
fab125975b re-added build step 2018-03-19 23:39:50 -04:00
Glen Knight
cefd7e3b1b remove cicle.yml 2018-03-19 23:38:37 -04:00
Carol Willing
344a3e7b24 Add a spawner_class option to the reference example 2018-03-19 14:23:14 -07:00
Min RK
a0ee237ada Simplify root/login redirect behavior
- ignore spawner state when determining redirect destination
- remove implicit spawn from login handler (rely on redirect to user.url for spawn)
- settings.redirect_to_server determines if login sends users to /user/:name vs /hub/home
- visiting `/hub/` should result in the same destination regardless of login state or spawner state
2018-03-14 15:37:25 +01:00
Min RK
e81eb9a5f8 Merge pull request #1687 from minrk/external-oauth-basic
fix /api/user with oauth tokens
2018-03-13 16:11:28 +01:00
Min RK
98d3b538af Further clarifications in external-oauth example 2018-03-13 10:03:01 +01:00
Min RK
3614a0e368 move get_self test after get_users
to avoid changing expected state
2018-03-13 10:03:01 +01:00
Min RK
0421497b1e remove web.authenticated from /api/user handler
which prevents it from being used with oauth tokens
2018-03-13 10:03:01 +01:00
Min RK
8b3c2fa12f add whoami-oauth-basic example
implements oauth without inheriting from HubOAuthenticated

should be easier to parse for users with alternate oauth implementations
2018-03-13 10:03:01 +01:00
Min RK
a58bea6d93 Merge pull request #1696 from minrk/async-def
async/await syntax
2018-03-12 18:40:34 +01:00
Min RK
c7c41cd761 remove bad yield in test_api 2018-03-12 18:32:00 +01:00
Min RK
b282ec73c7 no_patience doesn't quite work with zero timeout anymore
thanks to asyncio always waiting a finite time on any await
2018-03-12 18:18:47 +01:00
Min RK
dad26be2c6 call it our own maybe_future
our version of gen.maybe_future that's fully tornado- and asyncio-compatible
2018-03-12 18:18:47 +01:00
Min RK
58d602e549 require Python 3.5 for async/await syntax 2018-03-12 18:18:46 +01:00
Min RK
5e14904205 fix a few unawaited calls to coroutines
asyncio is less forgiving about these than tornado
2018-03-12 18:18:46 +01:00
Min RK
97293ab7ce use asyncio.ensure_future to start coroutines immediately
asyncio has different coroutine start mechanics than tornado

tornado starts coroutines immediately,
whereas asyncio doesn't until they are scheduled with either ensure_future or waited upon.
2018-03-12 18:18:46 +01:00
Min RK
b6f634368c add utils.awaitable replacement for gen.maybe_future
gen.maybe_future doesn't accept asyncio coroutines
and asyncio.ensure_future doesn't accept *tornado* coroutines, so do our own thing
2018-03-12 18:18:46 +01:00
Min RK
7b4de150cc add awaitable wrapper
to replace gen.maybe_future
2018-03-12 18:18:46 +01:00
Min RK
7a268c94b0 bulk find/replace async def and await
- `@gen.coroutine def` -> `async def`
- `yield future` -> `await future`

needs some fine tuning, but this is the big one
2018-03-12 18:18:46 +01:00
Carol Willing
7a1fa78632 Merge pull request #1660 from minrk/spawn-form-access
expand admin[-access] support
2018-03-12 07:34:07 -07:00
Min RK
19f02da64d should_spawn=False when current_user is None (not logged in) 2018-03-12 14:23:57 +01:00
Min RK
5bf1aac9cb get the right render form when spawning for another user 2018-03-12 14:23:57 +01:00
Min RK
0ae034083c fix spawn admin tests 2018-03-12 14:23:57 +01:00
Min RK
5010af941b 'start server' on admin page opens spawn form
if spawn form is registered and admin access is enabled

cannot use spawn form on behalf of users without admin_access
2018-03-12 14:23:52 +01:00
Min RK
015df7e060 unify mocking of tornado_settings
ensures that everywhere we access settings, it's the same dict
and not a copy
2018-03-12 14:23:00 +01:00
Min RK
e025d58f6e fix mocks for spawner config 2018-03-12 14:23:00 +01:00
Min RK
b151d333d3 show who you're spawning for if it's not yourself
on the spawn page
2018-03-12 14:23:00 +01:00
Min RK
304c005a85 fix priority of template namespace
allow overrides
2018-03-12 14:23:00 +01:00
Min RK
e2591e8e36 fix user construction in add_user test function
ensures same construction is used as the real app
2018-03-12 14:23:00 +01:00
Min RK
f3c22cb6d0 test spawn-form for other users 2018-03-12 14:23:00 +01:00
Min RK
b2527984bc use find_user in POST /spawn/:user
so we get a 404 for missing users
2018-03-12 14:23:00 +01:00
Min RK
b8d2271191 add /spawn/:user for spawning servers for a specific user
part of admin-access
2018-03-12 14:23:00 +01:00
Min RK
b8978b0235 allow admin-access to launch servers via /user/:name
rather than checking if user.name == name,
check more directly if user should have access to :name's server
2018-03-12 14:23:00 +01:00
Min RK
63ef6419cd add admin_access fixture 2018-03-12 14:23:00 +01:00
Min RK
25dc429455 ensure app.tornado_settings is the real tornado settings in mocking
enables updates to settings during testing
2018-03-12 14:23:00 +01:00
Carol Willing
7550e63fd0 Merge pull request #1700 from minrk/cookie-name
cleanup some cookie names
2018-03-07 08:34:25 -08:00
Carol Willing
0561968fac Merge pull request #1694 from minrk/sigusr
add SIGINFO handler
2018-03-07 08:32:08 -08:00
Min RK
7811bf518b cleanup some cookie names
In part to cleanup a few remnants of early design where jupyterhub was ‘jupyter-hub’ instead of ‘jupyterhub’.
Should also clarify to some degree what the cookies are for.

- hub login cookie is now ‘jupyterhub-hub-login’ instead of ‘jupyter-hub-token’
- user server cookie is now ‘jupyterhub-user-<name>’ instead of ‘user-name’ to keep jupyterhub prefix on all cookies

All cookies at this point:

- jupyterhub-session-id on /
- jupyterhub-hub-login on /hub/ (the main login cookie)
- jupyterhub-services on /services/
- jupyterhub-user-<name> on /user/:name
- jupyterhub-user-<name>-oauth-state on /user/:name during oauth
2018-03-05 10:55:07 +01:00
Min RK
bc7116ad94 Merge pull request #1691 from minrk/async-pam-auth
talk to PAM in a thread
2018-03-02 11:40:18 +01:00
Carol Willing
70eec33d06 Merge pull request #1692 from minrk/gitignore
gitignore some more files
2018-03-01 09:05:53 -08:00
Min RK
773973825f also show asyncio task stacks
which are nicely formatted on their own

there won't be many yet, but if we transition to async def,
we will get lots more useful info
2018-03-01 14:39:11 +01:00
Min RK
a184d372f4 add SIGINFO handler
send SIGINFO (ctrl-T) to jupyterhub and it will dump
process info

- if psutil is available, show cpu, memory, FD counts
- always show stacks of non-idle threads
2018-03-01 14:37:46 +01:00
Min RK
ca1606a021 factor-out coroutine_frames filtering
so it can be used on stacks, not just tracebacks
2018-03-01 14:23:26 +01:00
Min RK
5c6d7eb309 gitignore some more files
static files have moved
2018-03-01 11:26:35 +01:00
Min RK
4de6b39788 talk to PAM in a thread
since PAM can be slow, we don't want to block the rest of the application
2018-03-01 11:22:01 +01:00
Carol Willing
f0494cc7d6 Merge pull request #1688 from minrk/no-trash
disable send2trash by default
2018-02-28 09:01:19 -08:00
Min RK
9d98d1ee63 disable send2trash by default
avoids filling up hidden .Trash directory when files are deleted

since there's no UI for trash in a jupyterhub deployment, this mainly results in files never being deleted and possibly filling up disks
2018-02-28 16:19:17 +01:00
Min RK
f1238e17b1 Merge pull request #1667 from minrk/templates
move static resources to share/jupyterhub
2018-02-28 15:57:10 +01:00
Min RK
4201c8a6f3 missing share_jupyterhub 2018-02-28 15:41:58 +01:00
Min RK
53396ed454 bower-lite, too 2018-02-28 15:41:58 +01:00
Min RK
8695823165 move static resources to share/jupyterhub
from share/jupyter/hub

to be consistent with use of etc/jupyterhub etc.
2018-02-28 15:41:58 +01:00
Min RK
ec8d008678 Merge pull request #1684 from emmanuel/support_async_options_form
Add `Spawner.get_options_form` for async support.
2018-02-28 11:08:51 +01:00
Emmanuel Gomez
a949ad14f8 Correct versionchanged annotation based on review. 2018-02-27 09:17:50 -08:00
Emmanuel Gomez
48e7bd4f10 Add Spawner.get_options_form for async support. 2018-02-26 16:50:40 -08:00
Min RK
4b11f8f26b Merge pull request #1670 from thedataincubator/nav-blocks
Add blocks for navbar components in the page template
2018-02-26 13:28:15 +01:00
Robert Schroll
b056444863 Add blocks for navbar components in the page template 2018-02-23 12:15:35 -08:00
Carol Willing
872f021ddc Merge pull request #1590 from minrk/external-oauth
enable external oauth clients
2018-02-23 06:35:59 -08:00
Min RK
079b0c1b91 feedback in README 2018-02-23 13:44:07 +01:00
Min RK
2664b50a18 Merge pull request #1678 from minrk/fix-stop
fix stop of singleuser with tornado 5
2018-02-23 09:29:02 +01:00
Min RK
6970df4dda add external oauth example 2018-02-22 17:01:00 +01:00
Min RK
22c3064ec4 pass note arg in User.new_api_token 2018-02-22 15:10:13 +01:00
Min RK
d6ab65a2e7 remove alembic autogenerate statements 2018-02-22 15:06:52 +01:00
Min RK
aa23b01a57 add notes on API tokens when they are allocated 2018-02-22 15:06:01 +01:00
Min RK
d82de98001 add alembic revision for token tracking
via alembic autogenerate
2018-02-22 15:06:01 +01:00
Min RK
7df8597484 cleanup oauth clients at startup
avoids leaving stale oauth clients in db

- cascade oauth access token, code deletion on delete of oauth client
2018-02-22 15:06:01 +01:00
Min RK
1b99b1275c allow service redirect uri to come from config
for external services

- ensure Spawner.oauth_client_id is always defined, not just for running Spawners
2018-02-22 15:05:53 +01:00
Min RK
d16461052b track activity of individual tokens 2018-02-22 15:05:18 +01:00
Min RK
9640364713 Merge pull request #1665 from thedataincubator/templates-doc
Add documentation for new templates system
2018-02-22 15:03:10 +01:00
Min RK
18e0600727 Merge pull request #1627 from minrk/logging-unicode
Fix unicode errors with extra_log_file
2018-02-22 15:01:34 +01:00
Min RK
17fffda74e fix stop of singleuser with tornado 5
Updates call to match notebook application itself

calling IOLoop.instance() is deprecated, and won't work from a background thread with tornado 5.
2018-02-22 14:48:36 +01:00
Robert Schroll
3ac4f48f82 Add version information to templates doc 2018-02-21 15:13:47 -08:00
Min RK
6f8ae98ed0 Merge pull request #1661 from GladysNalvarte/ports
Additional information about which ports can be used and which are reserved for internal use only.
2018-02-19 15:16:19 +01:00
Min RK
47b2ce6180 Merge pull request #1601 from thedataincubator/base-template
Base template mechanism
2018-02-19 14:42:40 +01:00
Gladys Nalvarte
d18d84e187 Includes suggestions to make more clear to the end user which port/ip is public. 2018-02-16 15:30:15 +01:00
Robert Schroll
c1dcdf49e5 Add doc page on templates 2018-02-15 16:18:15 -08:00
Min RK
079005eab1 Merge pull request #1643 from minrk/startup-lite
avoid instantiating idle Spawner objects during startup
2018-02-15 15:25:22 +01:00
Robert Schroll
dc8cea3a3e Change base template flag to "templates/" 2018-02-14 16:55:22 -08:00
Robert Schroll
efca88cf8b Always enable the base templates feature 2018-02-14 16:49:11 -08:00
Gladys Nalvarte
c05a6b96b7 Additional information about which ports can be used and which are reserved for internal use only. 2018-02-14 11:06:08 +01:00
Min RK
a831ff3b61 Merge pull request #1653 from dhirschfeld/patch-1
Add PyCharm folder to gitignore
2018-02-12 13:27:02 +01:00
Dave Hirschfeld
b814a09fe6 Add PyCharm folder to gitignore 2018-02-09 12:51:57 +10:00
Min RK
fb48c8626a fix reuse token test now that Spawners are cleaned up after stopping
put the Spawner instance back so it can reuse the token

'real' reuse cases don't need this because the info is stored in their own storage,
e.g. a stopped container.
2018-02-07 11:31:59 +01:00
Min RK
fbdeb4c386 move add_user call for new users to login_user
previous location was in a non-awaitable call
2018-02-07 11:22:47 +01:00
Min RK
4cf9ecc819 spawners are deleted during shutdown 2018-02-06 17:09:59 +01:00
Min RK
e9573b6e24 fixup test_orm with new User wrapper
user.db is evaluated immediately, rather than on first request,
which means we can't do User(orm.User) before adding the orm.User to the db
2018-02-06 17:02:23 +01:00
Min RK
d5f0137052 revert computing user_model from orm.User
always instantiate User wrapper
2018-02-06 15:38:32 +01:00
Min RK
d9f5adb1fb instantiate all User objects during application startup
still avoid instantiating Spawners
2018-02-06 15:38:30 +01:00
Min RK
0c6aa064ac Make User not a HasTraits
HasTraits are expensive to instantiate, so make Users as light as possible

Removes immediate instantiation of Spawners during User init. Spawners will only be instantiated while running
2018-02-06 15:38:08 +01:00
Min RK
646c853cf4 Merge pull request #1648 from thedataincubator/login-redirect
Add option to redirect to running Jupyter server
2018-02-06 15:16:45 +01:00
Min RK
fb3bc95623 Remove expunges from startup 2018-02-06 12:04:14 +01:00
Min RK
c8b4cab022 support getting user models from orm-only User objects
avoids instantiating User wrappers for inactive users in get_all_users
2018-02-06 12:04:14 +01:00
Min RK
06fb94b4ea Delay instantiation of User and Spawner objects
Avoids instantiating too many objects before they are used

- deletes Spawner instances after they stop to avoid lingering instances
- use user_dict cache more often instead of db queries
- check for empty spawners dict to avoid a few Spawner instantiations
2018-02-06 12:04:14 +01:00
Robert Schroll
9f6cef4fb4 Add option to redirect to running Jupyter server
This is how the system used to behave, but now it can be turned off, always
showing the control panel on login.  Adjustment is needed in two places.
2018-02-05 18:12:07 -08:00
Min RK
0315dd5612 avoid instantiating idle Spawner objects during startup
only instantiate Spawners when they are requested
2018-02-02 00:22:47 +01:00
Min RK
e4e5bebc1a Merge pull request #1638 from minrk/404-ok
avoid raising on 404 deleting proxy route
2018-02-01 21:32:52 +01:00
Min RK
c688e9ebad avoid raising on 404 deleting proxy route
deleting a route that doesn't exist should only warn, not error
2018-02-01 20:18:13 +01:00
Min RK
6d6041a3c1 parallelize startup poll
puts each check for a running spawner in a coroutine and runs them all concurrently.

Note: this will only improve performance when a large number of Spawners are running and `yield spawner.poll()` takes a nontrivial amount of time.
This is because these are coroutines, not threads. If instantiating Spawners themselves takes a long time, performance will not be affected.
2018-02-01 20:17:47 +01:00
Min RK
dde7b5ea68 Merge pull request #1642 from minrk/tornado-5-b
Fixes for tests with tornado 5
2018-02-01 19:57:59 +01:00
Min RK
9bf533b340 fixes when tests are run on asyncio
- need to explicitly instantiate asyncio eventloops in background threads
- remove some now-obsolete initialized checks in teardown
2018-02-01 14:56:40 +01:00
Min RK
f1a105abec register tornado's asyncio support at launch time, not import time
avoids other imports from overriding this
2018-02-01 14:49:55 +01:00
Carol Willing
e6587b5dc8 Merge pull request #1631 from minrk/bumps
bump jupyterhub version to 0.9.0.dev
2018-01-24 08:17:54 -08:00
Min RK
b2ad045a2d update docker build hooks
stable is 0.8 (and has been for some time now)
2018-01-24 16:50:49 +01:00
Min RK
89734d8c5f master is 0.9.0.dev
now that we've started making db changes
2018-01-24 16:46:46 +01:00
Min RK
53736099ba specify extra_log_file encoding as utf8
even if locale is ascii

extra_log_file can fail with encoding errors, where stdout logging will escape safely.
2018-01-22 07:39:09 +01:00
Carol Willing
2fcfa136c1 Merge pull request #1625 from jupyterhub/ellisonbg-patch-1
Remove unicode character in favor of plain ->
2018-01-18 15:40:05 -08:00
Brian E. Granger
9f85209a1b Remove unicode character in favor of plain ->
This is still causing problems in all fresh deployments we are doing. I am fine with another solution, but at least wanted to proposed this as a fix for now.
2018-01-18 12:31:17 -08:00
Carol Willing
cea1b2fd4d Merge pull request #1623 from BerserkerTroll/patch-1
Fix Authentication state documentation
2018-01-17 09:28:22 -08:00
BerserkerTroll
312252b670 Fix Authentication state documentation
This — is how it actually works!
2018-01-17 05:45:47 +03:00
Min RK
4d6b30c17b Merge pull request #1621 from consideRatio/master
Fix spawner/service typo in proxy.py
2018-01-13 13:20:44 -08:00
Erik Sundell
0beb9c2670 fix spawner/service typo in proxy.py 2018-01-13 21:43:09 +01:00
Min RK
a0289af59f Merge pull request #1615 from yuvipanda/hub_connect_ip
Add note about hub_connect_ip restrictions
2018-01-12 17:38:16 -08:00
Carol Willing
40363834c8 Merge pull request #1619 from timfreund/linkupdate
Update docker volumes link
2018-01-12 09:08:47 -08:00
Tim Freund
0c9e5fd10b Update docker volumes link
The old link now returns 404.
2018-01-11 21:28:24 -05:00
yuvipanda
3d90e5cdf6 Add note about hub_connect_ip restrictions
Kubernets Ingress Proxy requires IPs, and I suspect other
proxies in the future might have DNS restrictions too.
This causes confusion, in cases like
https://github.com/jupyterhub/kubespawner/issues/116.
2018-01-10 18:35:58 -08:00
Robert Schroll
8e3f1f0955 Add a block around the message in the spawn_pending page
This makes it easier for users to add or substitute custom messages on
this page.
2018-01-04 15:34:59 -08:00
Robert Schroll
7c64415096 Add base_template option
If true, the user can have custom templates (specified in
template_paths) that extend the default templates, by referencing them
as "BASE:filename.html".  This makes it easier to add information to
exising templates.
2018-01-04 15:34:59 -08:00
Min RK
e3fd1dba0e Merge pull request #1609 from minrk/tornado-5
tornado 5 fixes
2018-01-03 18:24:07 +01:00
Min RK
9866a0fadc avoid raising HTTPError in get_current_user
it can cause issues, e.g. with upcoming notebook releases .get_current_user may be called in set_default_headers,
which doesn't catch HTTPErrors.
2018-01-03 14:58:42 +01:00
Min RK
f87f24d9e5 unpin tornado 2018-01-03 14:12:29 +01:00
Min RK
4729ae4769 tornado 5 fixes
- ._running private attribute is removed. We don't need it anymore,
  since we were only using it while the application was run in a background thread.
- call blocking cleanup in a thread because asyncio doesn't allow multiple loops in one thread.
2018-01-03 14:12:23 +01:00
Min RK
691c4c158f Merge pull request #1606 from willingc/test-readme
Add CHP to dev install and move to CONTRIBUTING
2018-01-03 11:52:27 +01:00
Carol Willing
3c597339ba Add CHP to dev install and move to CONTRIBUTING 2018-01-03 11:52:01 +01:00
Min RK
e5fe174e03 Merge pull request #1607 from willingc/travis-tornado
pin tornado requirement to less than 5.0
2018-01-03 11:50:18 +01:00
Carol Willing
1c25a9d026 pin tornado requirement to less than 5.0 2018-01-02 15:19:35 -08:00
Min RK
2db378e9c1 Merge pull request #1577 from minrk/session-cookie
add session-id cookie
2017-12-19 15:18:02 +01:00
Min RK
a4067ee681 clarify alembic's autogenerated comments [ci skip]
with reformatting
2017-12-19 15:13:44 +01:00
Min RK
edb0831028 check for table before upgrading
avoids raising error, which aborts transactions on postgres
2017-12-19 14:19:49 +01:00
Min RK
dac3b0a6f5 clear cookies for the right domain 2017-12-19 11:05:02 +01:00
Min RK
9a180cc8ad relax failed-upgrade check
since each backend raises a different error, only check that the errors are the same.
2017-12-19 10:54:05 +01:00
Min RK
e81764610e Merge pull request #1588 from willingc/doc-spawner
Clarify resource limits/guarantees in docs and docstrings
2017-12-19 10:50:04 +01:00
Carol Willing
e4e2b627fe add formatting to clarify spawners' limits 2017-12-18 04:43:26 -08:00
Carol Willing
ec55f56725 clarify resource limits in docstrings 2017-12-18 04:33:41 -08:00
Carol Willing
1e4f871bcc update documentation on resource limits 2017-12-18 04:33:01 -08:00
Matthias Bussonnier
69f72919bd Merge pull request #1587 from darky2004/master
Request to add a new JupyterHub service provider
2017-12-15 21:20:32 +01:00
darky2004
dc0336fa45 Update gallery-jhub-deployments.md 2017-12-13 20:36:04 +00:00
darky2004
8c341d262e Update gallery-jhub-deployments.md 2017-12-13 20:35:34 +00:00
Min RK
2b15464e12 make add_columns conditional on table presence
in database upgrade.

For multi-version upgrades (e.g. 0.7 -> 0.9)
2017-12-12 14:38:06 +01:00
Min RK
a686235ffb alembic: add target_metadata
needed for `python -m jupyterhub.dbutil revision --autogenerate -m 'note'`
2017-12-12 10:54:08 +01:00
Min RK
29171a4d05 test logout
verify that:

1. auth is cached
2. oauth tokens are revoked on logout
3. clearing session id avoids cached auth data
2017-12-11 14:20:25 +01:00
Min RK
e9123f55e0 make HubAuth a singleton
allows cache re-use in default case

otherwise, default behavior is to instantiate anew on each request, eliminating cache
2017-12-11 14:20:25 +01:00
Min RK
ee004486bd include session id in cache key
if session id is defined, clearing the session id clears the cache,
allowing immediate revocation of tokens by the Hub.
2017-12-11 14:20:25 +01:00
Min RK
498e234c37 add cache repr for debugging 2017-12-11 14:20:25 +01:00
Min RK
b29f19e206 add session_id for OAuth tokens
allows tracking and revoking tokens for a login session
2017-12-11 12:15:36 +01:00
Min RK
1e00343262 Merge pull request #1581 from yuvipanda/prometheus
Add RED prometheus metrics for all requests
2017-12-11 12:00:25 +01:00
yuvipanda
3cd526c019 Make sure our metrics don't appear & disappear intermittently
Create all timeseries from the beginning, regardless of wether
they happen or not. Also rename metric objects for consistency.
2017-12-10 21:23:32 -08:00
yuvipanda
ea99c58da5 Clarify custom bucket sizes for spawn time histogram 2017-12-10 17:04:44 -08:00
yuvipanda
c64f23a64a Add note about metric naming conventions 2017-12-10 17:04:10 -08:00
yuvipanda
2099cd37fa s/starttime/start_time/ 2017-12-10 17:00:15 -08:00
yuvipanda
2559632079 Expand prometheus related docstrings a bit more 2017-12-10 16:59:35 -08:00
yuvipanda
352df39454 Add version requirement for prometheus_client 2017-12-10 16:52:19 -08:00
yuvipanda
ce3a940b11 Add histogram metric for proxy route addition 2017-12-10 15:01:47 -08:00
yuvipanda
6594e88390 Add metric recording spawn durations
Try to hit every possible exit point from the spawn_single_server
method, with an appropriate status code.

The default histogram buckets are also meant for request latencies,
but spawning usually takes longer so we use custom buckets
2017-12-10 14:54:34 -08:00
yuvipanda
339758ec42 Add RED prometheus metrics for all requests
This patch introduces Prometheus for exposing metrics
about JupyterHub's operation. We expose a standard /metrics
endpoint that can be queried without authentication. We
take on prometheus_client as an unconditional dependency
to both simplify code & because it is a pure python package
with no dependencies itself.

The first pass adds 'RED' style metrics for all HTTP requests.
http://rancher.com/red-method-for-prometheus-3-key-metrics-for-monitoring/
has some info on the RED method, but to summarize:

  For each request type, record at least the following metrics

   Rate – the number of requests, per second, your services are serving.
   Errors – the number of failed requests per second.
   Duration – The amount of time each request takes expressed as a time interval.

This instantly gives us a lot of useful metrics in a very
compact form.
2017-12-10 14:40:11 -08:00
Carol Willing
0b4c7defd4 Merge pull request #1578 from johnkpark/fix-static-file-caching
remove , which was turning timestamp into tuple
2017-12-07 19:55:24 -06:00
John Park
6d71e9065b remove , which was turning timestamp into tuple 2017-12-07 11:28:40 -08:00
Carol Willing
631ab4d4eb Merge pull request #1575 from minrk/rm-catchlog
remove pytest-catchlog in favor of recent pytest
2017-12-07 08:31:46 -06:00
Min RK
589ff47ae6 Merge pull request #1555 from ankitml/docker-compose-file
base dockerfile on alpine linux
2017-12-07 10:23:08 +01:00
Min RK
877034d012 remove pytest-catchlog in favor of recent pytest
pytest-catchlog has been merged into pytest as of pytest 3.3
2017-12-07 10:21:04 +01:00
Carol Willing
3d440bf8f5 Merge pull request #1570 from minrk/sigterm
stop polling proxy process during shutdown
2017-12-04 18:43:09 -06:00
Ankit
138b2be010 updated CMD and jupyterhub version is put into argument 2017-12-04 11:41:56 -05:00
Min RK
b729944480 Merge pull request #1564 from jkinkead/admin_from_authenticator
Allow Authenticators to return an `admin` flag for users.
2017-12-04 10:47:42 +01:00
Min RK
870afd9fac stop polling proxy process during shutdown
avoids proxy being restarted by `.check_running` during cleanup
2017-12-04 10:40:08 +01:00
Carol Willing
e808814725 Merge pull request #1567 from danielballan/build-docs
CI: Verify that the docs build without warnings.
2017-12-01 17:14:40 -06:00
danielballan
122cf2250d CI: Require the docs to build without warnings. 2017-12-01 11:18:47 -05:00
danielballan
fa1d962507 CI: Verify that the documentation builds. 2017-12-01 11:18:46 -05:00
Jesse Kinkead
6504692c5c Commit when setting admin, but only if the field changed. 2017-11-30 11:21:09 -08:00
Carol Willing
bd36962643 Merge pull request #1563 from jkinkead/patch-2
Include instructions for increasing test timeout.
2017-11-29 16:57:55 -06:00
Jesse Kinkead
f5ccfc3f8a Use travis timeout; expand documentation on timeout. 2017-11-29 14:46:18 -08:00
Jesse Kinkead
c1a7e0513b Allow Authenticators to return an admin flag for users. 2017-11-29 14:07:08 -08:00
Jesse Kinkead
af71e79371 Include instructions for increasing test timeout. 2017-11-29 13:05:01 -08:00
Min RK
bf911cf3a5 Merge pull request #1545 from ankitksharma/patch-1
Publish exposed port in docker run command
2017-11-29 18:15:46 +01:00
Carol Willing
6059a1c444 Merge pull request #1562 from minrk/external-proxy-test
wait for proxy to exit in test_external_proxy
2017-11-29 09:03:22 -06:00
Min RK
c4966a4bf2 Merge pull request #1561 from GladysNalvarte/master
test token and error pages
2017-11-29 15:24:44 +01:00
Min RK
cb9f356a69 wait for proxy to exit in test_external_proxy
.terminate() only sends the signal,
it doesn't wait for the process to exit.

If the process doesn't exit promptly,
the next instance may try to grab the port before the previous process has released it,
causing failure with EADDRINUSE.
2017-11-29 15:22:45 +01:00
Gladys Nalvarte
9d02f6a408 test_token and error pages 2017-11-28 10:09:39 +01:00
Min RK
ee76772e1b Merge pull request #1560 from GladysNalvarte/version-test
Version test
2017-11-27 12:56:42 +01:00
Min RK
f0a030a86d Merge pull request #1531 from thedataincubator/start_all_button
"Start All" button on admin page
2017-11-27 12:52:26 +01:00
Min RK
1a31e56f33 Merge pull request #1532 from minrk/npm-permissions
setup.py: run npm with --unsafe-perm
2017-11-27 12:52:06 +01:00
Gladys Nalvarte
04e9e0e687 test check_version
add coverage for different cases
2017-11-23 15:14:57 +01:00
Min RK
cec917c2a2 scaffolding for testing version checking 2017-11-23 10:55:35 +01:00
Carol Willing
08989a8797 Merge pull request #1557 from minrk/extra-log-file-warning
deprecate extra_log_file
2017-11-22 08:19:40 -08:00
Min RK
b734c331e4 deprecate extra_log_file
and add loud warning about discarding information

this has been the cause of many debugging difficulties,
when redirecting output seems to be a better option in ~all cases.
2017-11-22 17:02:43 +01:00
Matthias Bussonnier
fe477a6809 Merge pull request #1554 from smiller5678/remove-redirect-url-param-from-error-pages
Remove redirect url parameter from error pages
2017-11-21 23:05:47 +01:00
Carol Willing
6391a4a7f7 Merge pull request #1552 from cfournie/extendable_script_block
Add super() calls to child script blocks
2017-11-21 12:35:08 -08:00
Carol Willing
e68220d4b3 Merge pull request #1553 from syutbai/master
Add doc for building docs locally.
2017-11-21 12:21:28 -08:00
Ankit
b873149f9b updated alpine according to PR comments 2017-11-21 14:04:25 -05:00
Seak Pek Chhan
86aebbcaea Switch to python3 -m pip install instead of calling pip directly, move cd docs closer to make commands. 2017-11-21 14:02:07 -05:00
Ankit
fd260cf32f updated base name 2017-11-21 13:58:22 -05:00
Min RK
69101a5b14 Merge pull request #1533 from DerekHeldtWerle/master
If spawner is pending, always route to /hub/home/:user to resolve iss…
2017-11-21 19:54:51 +01:00
Ankit
151d6cbc48 updated readme 2017-11-21 13:53:39 -05:00
Ankit
04675e5fcb removed compose and env file 2017-11-21 13:50:43 -05:00
Ankit
b38c6fe06a added readme and started working on config image 2017-11-21 13:42:50 -05:00
Ankit
089a12bdc9 adding a readme 2017-11-21 13:32:59 -05:00
Ankit
d9a0a2003f moving base dockerfile into a directory 2017-11-21 13:23:21 -05:00
Derek Heldt-Werle
ad704d9925 No longer force a redirect when pending, simply set url to allow users access to home page during a pending spawn 2017-11-21 10:17:42 -08:00
Ankit
0cca79eeee auth token instructions updated 2017-11-21 13:03:25 -05:00
Ankit
457bea7c34 Base dockerfile 2017-11-21 13:01:21 -05:00
semiller
2479679eeb Remove redirect url parameter from error pages
Issue #1365
2017-11-21 12:59:02 -05:00
Chris Fournier
937405d2d8 Add super() calls to child script blocks 2017-11-21 12:24:58 -05:00
Seak Pek Chhan
d1bed1b9cc Add doc for building docs locally. 2017-11-21 12:15:30 -05:00
Ankit
acc60bce57 wip 2017-11-21 11:35:58 -05:00
Carol Willing
43807ff06b Merge pull request #1550 from syutbai/master
add jupyter-alabaster-theme to doc requirements.txt
2017-11-21 07:48:03 -08:00
Ankit
b8a63bcc0c auth env blank file 2017-11-21 10:26:28 -05:00
Ankit
66c1815a78 creating a simple docker compose environment to isolate jupyterhub notebook from other parts like configurable proxy 2017-11-21 10:25:06 -05:00
Matthias Bussonnier
4e5cfa2077 Merge pull request #1540 from minrk/cookie-secure
allow override of cookie options
2017-11-21 10:58:25 +01:00
Seak Pek Chhan
ebaf5d31b7 add jupyter-alabaster-theme to doc requirements.txt 2017-11-18 04:04:28 -05:00
Christian Moscardi
760a640c6a alternate, horizontal layout 2017-11-17 19:19:13 -05:00
Ankit Sharma
4fc06e9504 Publish exposed port in docker run command 2017-11-18 00:14:38 +05:30
Carol Willing
c283ccb122 Merge pull request #1539 from minrk/cors-fix
fix headers for CORS
2017-11-16 10:58:26 -08:00
Carol Willing
80df842b2b Merge pull request #1541 from jupyterhub/takluyver-patch-1
Clarify how to enable/disable statsd collection
2017-11-16 10:49:45 -08:00
Thomas Kluyver
f1a8a72a9f Clarify how to enable/disable statsd collection 2017-11-16 14:33:08 +00:00
Min RK
0296e16232 allow override of cookie options
via `tornado_settings['cookie_options']`

for cases where default options are incorrect or insufficient (e.g. expiry or https detection fails)
2017-11-16 13:53:27 +01:00
Min RK
f6f7081483 adjust headers for CORS
- add `authorization` to default Access-Control-Allow-Headers
- allow overriding `Access-Control-Allow-Headers` just like everything else in case default is inappropriate
- ensure case-insensitive comparison for proper header checks
2017-11-16 11:46:40 +01:00
Derek Heldt-Werle
7f7cd0a314 If spawner is pending, always route to /hub/home/:user to resolve issues with form options 2017-11-13 15:22:49 -08:00
Min RK
5ffb5763a5 setup.py: run npm with --unsafe-perm
this is the equivalent to bower's `--allow-root` that we had in bower-proper

fixes issues when installing jupyterhub from source with sudo
2017-11-13 11:09:25 +01:00
Christian Moscardi
4382037110 start all button 2017-11-10 16:57:48 -05:00
Carol Willing
963cd88440 Merge pull request #1526 from minrk/form-control
don't apply form-control unconditionally to spawn form
2017-11-08 05:40:55 -08:00
Min RK
885f99ac08 back to dev 2017-11-08 14:14:05 +01:00
Min RK
7c3919980a don't apply form-control unconditionally to spawn form
leave it to users to build their own form
2017-11-08 14:13:26 +01:00
Carol Willing
d8860d6f24 Merge pull request #1525 from minrk/thread-hangs
avoid waiting forever for threads to exit
2017-11-07 06:47:06 -08:00
Carol Willing
6b992e37e3 Merge pull request #1521 from jupyterhub/its-jupyter-now
strike mention of IPython notebook in README
2017-11-07 06:41:39 -08:00
Min RK
a3424355fa back to dev 2017-11-07 15:32:13 +01:00
Min RK
569a91296d avoid waiting forever for threads to exit
- call loop.stop via `.add_callback`
- add 30s timeout to `thread.join()` to avoid hanging forever if thread fails to exit
- assert that threads exit
2017-11-07 15:17:42 +01:00
Min RK
8b583cb445 release 0.8.1 2017-11-07 13:39:10 +01:00
Min RK
038a85af43 add removal of bower to changelog for 0.8.1 2017-11-07 13:39:10 +01:00
Min RK
9165beb41c Merge pull request #1306 from minrk/bower-lite
remove bower
2017-11-07 13:35:08 +01:00
Min RK
b285de4412 npm install with unsafe-perm on docker
npm doesn't like to run postinstall as root
2017-11-07 13:01:31 +01:00
Min RK
5826035fe9 node when css building starts 2017-11-07 12:59:57 +01:00
Min RK
b953ac295b check for built css as well in data-files lookup
avoids serving incomplete files
2017-11-07 11:40:24 +01:00
Min RK
8a95066b2e run lessc via npm 2017-11-07 11:39:53 +01:00
Min RK
00a4aef607 remove bower
use npm to fetch dependencies and a simple postinstall script to copy into components
2017-11-07 11:38:47 +01:00
Min RK
9e2663491e strike mention of IPython notebook in README
It's been long enough that we can call it Jupyter notebook, I think
2017-11-07 10:01:14 +01:00
Carol Willing
e01ce7b665 Merge pull request #1516 from minrk/0.8.1-changes
changelog for 0.8.1
2017-11-06 14:23:03 -08:00
Min RK
a57df48f28 changelog for 0.8.1 2017-11-03 11:07:08 +01:00
Min RK
5d7e008055 Merge pull request #1512 from DeepHorizons/update-service-doc
Update docs and examples for the slash at the end of the prefix
2017-11-03 10:31:46 +01:00
Min RK
ba31b3ecb7 Merge pull request #1497 from DeepHorizons/update-docs
[doc] Updated the rest docs to about change in 0.8
2017-11-01 11:49:41 +01:00
Joshua Milas
3c5eb934bf Update docs and examples for the slash at the end of the prefix 2017-10-31 14:04:37 -04:00
Joshua Milas
82e15df6e9 Added that you can also access the notebook if you are the owner 2017-10-31 10:15:02 -04:00
Yuvi Panda
e3c83c0c29 Merge pull request #1509 from minrk/stacky
copy exception before reraising
2017-10-30 17:50:37 -07:00
Min RK
94542334c4 Merge pull request #1507 from minrk/upgrade-db
add `jupyterhub --upgrade-db` to trigger upgrade on launch
2017-10-30 15:34:31 +01:00
Min RK
95494b3ace only sqlite 2017-10-30 09:58:55 +01:00
Min RK
a131cfb79e add jupyterhub --upgrade-db to trigger upgrade on launch
Upgrades the database (if needed) on start.

This is opt-in, for uses like the helm chart where explicit 'upgrade-db' steps are hard to insert.

This ought to be safe for sqlite users, where an automatic backup file is created *if an upgrade will occur*.
2017-10-27 15:35:17 +02:00
Min RK
f002c67343 add dbutil.upgrade_if_needed
so it's reusable now that we want to use it in more than one place
2017-10-27 15:35:17 +02:00
Min RK
b9caf95c72 copy exception before reraising
avoids growing traceback on each raise
2017-10-27 15:29:16 +02:00
Min RK
5356954240 Merge pull request #1493 from schon/rendering-logout
Rendering logout page when auto login is true
2017-10-27 14:42:22 +02:00
Joshua Milas
126c73002e Updated the rest docs to about change in 0.8
In 0.8, the jupyterhub api token can also be used to make requests to
hte jupyter notebook given some conditions. This commit updates that
documentation
2017-10-21 09:18:08 -04:00
Seongduk Cheon
65b4502a78 Rendering logout page when auto login is true 2017-10-19 12:14:20 +09:00
Min RK
3406161d75 Merge pull request #1460 from DeepHorizons/asyncio_event_loop
Enable the asyncio event loop to run with tornado
2017-10-13 11:18:02 +02:00
Yuvi Panda
e45f00f0f7 Merge pull request #1475 from minrk/disallow-slash
disallow '/' in usernames
2017-10-11 08:54:58 -07:00
Min RK
71f4a30562 Merge pull request #1473 from franga2000/patch-1
Change username input type to "text" to fix auto-filling
2017-10-11 16:01:45 +02:00
Min RK
20ba414b41 disallow / in usernames 2017-10-11 11:46:50 +02:00
Miha Frangez
f5250f04c5 Change username input type to "text"
<input type="username"> isn't allowed according to the spec and causes problems with autofill in Firefox.
2017-10-10 22:30:20 +02:00
Carol Willing
c2ea20a87a Merge pull request #1466 from minrk/auth_state_username
[doc] typo in auth_state structure
2017-10-04 16:57:27 -04:00
Carol Willing
b14989d4a5 Merge pull request #1465 from minrk/outerjoin
use outerjoin to join User with Spawner for admin page
2017-10-04 16:56:52 -04:00
Min RK
04578e329c typo in auth_state structure
it's 'name' not 'username'
2017-10-04 14:18:14 +02:00
Min RK
be05e438ca use outerjoin to join User with Spawner for admin page
avoids excluding users from admin page if they haven't instantiated their first Spawner yet
2017-10-04 13:58:08 +02:00
Min RK
24d9215029 back to dev 2017-10-03 21:49:23 +02:00
Min RK
8892270c24 0.8.0 2017-10-03 21:35:24 +02:00
Min RK
b928df6cba update changelog links for 0.8.0 release 2017-10-03 21:35:24 +02:00
Carol Willing
3fc74bd79e Merge pull request #1462 from minrk/proxy-docs
Document custom proxy implementations
2017-10-03 08:36:02 -07:00
Carol Willing
b34be77fec Merge pull request #1463 from minrk/auth-docs
Document auth_state
2017-10-03 08:29:45 -07:00
Joshua Milas
54dcca7ba9 Install the AsyncIOMainLoop instead of configuring it.
Installing the loop instructs the tornado loop to point to the ayncio loop and use
that. IOLoop.configure told the tornado loop to create a new ioloop when
a loop was needed, which is not what we want.
2017-10-03 08:30:49 -04:00
Min RK
d991c06098 document auth_state 2017-10-03 13:08:10 +02:00
Min RK
01a67ba156 document custom proxies 2017-10-03 12:42:52 +02:00
Min RK
8831573b6c typos in services.auth headings 2017-10-03 12:42:52 +02:00
Min RK
c5bc5411fb ignore docs/build 2017-10-03 12:42:52 +02:00
Carol Willing
a13ccd7530 Merge pull request #1461 from minrk/apache-docs
Update reverse proxy config examples
2017-10-03 02:46:27 -07:00
Min RK
e9a744e8b7 further clarify config-examples comments
per review
2017-10-03 10:19:43 +02:00
Min RK
582d43c153 add apache reverse proxy to config-examples 2017-10-02 18:18:03 +02:00
Min RK
7b5550928f mention how to generate dhparams
since we use them
2017-10-02 18:17:39 +02:00
Min RK
83920a3258 remove websocket-path-awareness from nginx config
using map, knowledge of the path is no longer necessary
2017-10-02 17:20:09 +02:00
Min RK
d1670aa443 fix mixed tabs and spaces 2017-10-02 16:19:21 +02:00
Min RK
c6f589124e Merge pull request #1458 from ryanlovett/master
Conditionally substitute $http_host for $host.
2017-09-29 16:06:56 +02:00
Carol Willing
35991e5194 Merge pull request #1455 from minrk/db-upgrade-test
Add db-upgrade test
2017-09-28 10:08:27 -07:00
Ryan Lovett
b956190393 Conditionally substitute $http_host for $host.
Necessary when using non-standard port. Closes #1457.
2017-09-28 09:40:51 -07:00
Min RK
122c989b7a specify mysql host and port explicitly
seems to be preferring MYSQL_UNIX_PORT
2017-09-28 18:20:57 +02:00
Min RK
5602575099 move db scripts to general ci directory
- remove shell test-db-upgrade test
- run mysql with docker on Travis because the version there is too old (< 5.7)
2017-09-28 16:20:15 +02:00
Min RK
4534499aad make db scripts accept one db at a time 2017-09-28 16:20:15 +02:00
Min RK
f733a91d7c avoid key length errors with old mysql + jupyterhub 0.7 2017-09-28 16:20:15 +02:00
Min RK
bf3fa30a01 load upgrade_db_url in test 2017-09-28 16:20:15 +02:00
Min RK
2625229847 note about venv 2017-09-28 16:20:15 +02:00
Min RK
2c3eb6d0d6 only count sqlite files when using sqlite 2017-09-28 15:09:17 +02:00
Min RK
5ff98fd1a5 run upgrade-tests on travis via pytest 2017-09-28 15:09:17 +02:00
Joshua Milas
056a7351a3 Enable the asyncio event loop to run with tornado
This allows packages written to use asyncio to work with tornado
2017-09-27 23:04:00 -04:00
Carol Willing
f79b71727b Merge pull request #1454 from minrk/auto-login-logout
typo rendering logout page when auto_login=True
2017-09-27 10:33:42 -07:00
Min RK
d3a3b8ca19 test db-upgrade on travis 2017-09-27 19:06:54 +02:00
Min RK
df9e002b9a separate docker-db from init-db
so we don't need docker on Travis
2017-09-27 19:05:55 +02:00
Min RK
a4a2c9d068 add tests for db upgrade with mysql, postgres 2017-09-27 18:41:08 +02:00
Min RK
c453e5ad20 mysql needs an extra step to drop _server_id 2017-09-27 18:34:54 +02:00
Min RK
617b879c2a stamp version before performing upgrade-db 2017-09-27 18:34:54 +02:00
Min RK
a0042e9302 typo rendering logout page when auto_login=True
and include it in test coverage
2017-09-27 14:29:56 +02:00
Min RK
6bbfcdfe4f 0.8.0rc2 2017-09-25 11:20:01 +02:00
Min RK
25662285af Merge pull request #1442 from DeepHorizons/add_more_spawner_statsd
[WIP] Added additional statsd collection for the spawner
2017-09-25 10:43:33 +02:00
Joshua Milas
84d12e8d72 Mock out the statsd object for testing 2017-09-22 12:57:41 -04:00
Joshua Milas
c317cbce36 Added additional statsd info for the spawner
spawner.failure coutner collects the number of failures for various reasons:
spawner.stop timer for seeing how long it takes a user server to stop
2017-09-22 12:13:15 -04:00
Min RK
d279604fac Merge pull request #1439 from minrk/oauth-state-cookie
avoid oauth state cookie collisions
2017-09-22 17:33:27 +02:00
Min RK
70fc4ef886 test concurrent oauth login state 2017-09-21 14:38:10 +02:00
Min RK
24ff91eef5 avoid oauth state cookie collisions
in case of multiple simultaneous

- state arg is strictly required now
- default cookie name in case of no collision is unchanged
- in case of collision, randomize cookie name with a suffix and store cookie_name in state
- expire state cookies after 10 minutes, not 1 day
2017-09-21 14:32:47 +02:00
Min RK
afc6789c74 Merge pull request #1441 from minrk/test-trailing-slash-wtf
debug intermittent failure on Travis
2017-09-21 14:18:08 +02:00
Min RK
819e5e222a stop server before testing trailing-slash handling
ensures `/user/name` is handled by the Hub without relying on CHP bug that was fixed in 3.0
2017-09-21 14:08:08 +02:00
Min RK
e1a4f37bbc cache pip packages on travis 2017-09-21 14:08:08 +02:00
Carol Willing
a73477feed Merge pull request #1435 from Analect/named-server-docs
Adding a short description ref starting/stopping named-servers via API
2017-09-20 21:29:11 -07:00
analect
89722ee2f3 Added in necessity to set c.JupyterHub.allow_named_servers = True 2017-09-20 10:27:28 +01:00
Min RK
30d4b2cef4 0.8.0rc1 2017-09-19 19:07:34 +02:00
analect
ca4fce7ffb Add Analect to contributor list 2017-09-19 16:18:09 +01:00
analect
018b2daace Fixing typo. 2017-09-19 16:17:54 +01:00
analect
fd01165cf6 Adding a short description ref starting/stopping named-servers via API 2017-09-19 14:33:20 +01:00
Carol Willing
34e4719893 Merge pull request #1434 from Analect/rest-api-named-server
Add handling for POST/DELETE of named-servers in hub API introduced in 0.8x
2017-09-19 06:17:05 -07:00
analect
c6ac9e1d15 Add handling for POST/DELETE of named-servers introduced in 0.8x 2017-09-19 13:20:15 +01:00
Min RK
70b8876239 Merge pull request #1413 from yuvipanda/memory-float
Allow non integral memory byte specifications
2017-09-18 10:50:56 +02:00
Min RK
5e34f4481a refer to self.UNIT_SUFFIXES 2017-09-18 10:10:20 +02:00
Min RK
eae5594698 byte specifications always return integers 2017-09-18 10:09:14 +02:00
Carol Willing
f02022a00c Merge pull request #1428 from minrk/default-server-name
allow default (empty) server name with named servers
2017-09-17 20:01:31 -07:00
Min RK
f964013516 exercise default server handler with named servers enabled 2017-09-17 11:55:50 +02:00
Min RK
5f7ffaf1f6 allow default (empty) server name with named servers
remove generated names behavior because it doesn't work
2017-09-17 11:47:17 +02:00
Carol Willing
0e7ccb7520 Merge pull request #1422 from minrk/lowercase-timeouts
lowercase LocalProcessSpawner timeouts
2017-09-15 08:11:15 -07:00
Min RK
c9db504a49 Merge pull request #1424 from phill84/bugfix/control-panel-button-height
wrap control panel button in a span
2017-09-15 06:56:41 -07:00
Jiening Wen
716677393e wrap control panel button in a span
make sure the same style is applied to all buttons in header-container
2017-09-15 15:29:38 +02:00
Min RK
ba8484f161 lowercase LocalProcessSpawner timeouts
traitlets doesn't like uppercase configurables
2017-09-15 12:07:03 +02:00
Yuvi Panda
ceec84dbb4 Merge pull request #1417 from minrk/test-delete
test restoring and deleting spawners while the Hub is down
2017-09-14 12:54:38 -07:00
Yuvi Panda
f2a83ec846 Merge pull request #1418 from minrk/oauth-state-boogaloo
Fixes (and tests!) for oauth state handling
2017-09-14 12:43:39 -07:00
Carol Willing
7deea6083a Merge pull request #1416 from minrk/traitlets-log
avoid error if another traitlets Application is initialized
2017-09-14 10:50:52 -07:00
Min RK
a169ff3548 test oauth redirects
include coverage of state handling
2017-09-14 16:06:57 +02:00
Min RK
f84a88da21 fix oauth state redirect
check for HubOAuth, not HubOAuthenticated
2017-09-14 16:06:36 +02:00
Min RK
eecec7183e fix clearing of oauth state cookie
missing path arg
2017-09-14 16:01:34 +02:00
Min RK
f11705ee26 delete service.server from db when they stop
same ondelete='SET NULL' as on spawner.server
2017-09-14 13:30:38 +02:00
Min RK
78ac5abf23 test restoring and deleting spawners while the Hub is down
- set ONDELETE='set null' on spawner->server relation (fixes error when deleting servers that stopped)
- set `spawner.server = None`, which is not triggered when deleting orm_spawner.server
2017-09-14 13:16:29 +02:00
Min RK
2beeaa0932 avoid error if another traitlets Application is initialized
encountered when doing db debugging in IPython
2017-09-14 11:37:34 +02:00
yuvipanda
90cb8423bc Allow non integral memory byte specifications 2017-09-12 16:19:10 -07:00
Min RK
3b07bd286b Merge pull request #1408 from DeepHorizons/update_service_doc
Updated the reference flask service example to include token auth
2017-09-12 23:49:55 +02:00
Joshua Milas
73564b97ea Updated the whoami-flask example 2017-09-11 12:16:17 -04:00
Joshua Milas
65cad5efad Updated the reference flask example to include token auth 2017-09-11 00:09:57 -04:00
Carol Willing
52eb627cd6 Merge pull request #1407 from willingc/spawn-hooks
Add pre/post spawn hooks to docs
2017-09-08 13:01:56 -07:00
Carol Willing
506e568a9a Add pre/post spawn hooks to docs 2017-09-08 13:00:14 -07:00
Min RK
6c89de082f 0.8.0b5 2017-09-08 11:19:25 +02:00
Carol Willing
6fb31cc613 Merge pull request #1393 from minrk/spawn-future
improve reporting of spawn failure
2017-09-07 10:20:38 -07:00
Carol Willing
cfb22baf05 Merge pull request #1399 from minrk/trailing-slash
add trailing slash on /user/name
2017-09-07 09:59:58 -07:00
Min RK
2d0c1ff0a8 Merge pull request #1404 from minrk/sqla-11
we require sqlalchemy 1.1
2017-09-07 16:48:13 +02:00
Min RK
7789e13879 we require sqlalchemy 1.1
for enum support

[ref](http://docs.sqlalchemy.org/en/latest/changelog/changelog_11.html#change-9d6d98d7acabc8564b8eebb11c28a624)
2017-09-07 15:10:48 +02:00
Yuvi Panda
f7b90e2c09 Merge pull request #1400 from minrk/auth-custom-html
allow Authenticator.custom_html to be HTML
2017-09-06 11:56:14 -07:00
Carol Willing
ccb29167dd Merge pull request #1392 from minrk/rm-extra-log
update docs to preferred method of writing to log file
2017-09-06 07:32:25 -07:00
Min RK
4ef1eca3c9 allow Authenticator.custom_html to be HTML 2017-09-06 15:14:26 +02:00
Min RK
c26ede30b9 Point users to /hub/home to retry spawn on spawn failure 2017-09-06 15:03:26 +02:00
Min RK
64c69a3164 update docs to preferred method of writing to log file
extra_log_files config is unreliable and doesn't capture all output.

Piping output is much more robust and reliable.
2017-09-06 14:38:33 +02:00
Min RK
ad7867ff11 add trailing slash on /user/name
proxies may not route `/user/name` correctly, only `/user/name/...`, so make sure that `/user/name` is redirected to `/user/name/`

this manifests as a redirect loop between /user/name and /hub/user/name when a route exists but /user/name is still
being routed to the Hub
2017-09-06 12:37:22 +02:00
Yuvi Panda
14fc1588f8 Merge pull request #1380 from minrk/cull-idle-users
add —cull-users to cull_idle_servers
2017-09-05 12:48:24 -07:00
Min RK
7e5a925f4f raise original spawn failure on implicit spawn
so the error message is the same, however it was arrived at.

potential downside: it could look like the current request is spawning and failing,
rather than the reality that a previous spawn failed and we are just re-presenting the earlier error.
It's possible for there to have been a long time in between spawn and error.
2017-09-04 14:27:01 +02:00
Min RK
3c61e422da prevent implicit spawn on /user/:name if previous spawn failed
require users to visit /hub/home and click 'Start My Server' to get a new server

Visits to /hub/user/:name will get an error if the previous spawn failed,
rather than triggering a new spawn.
This should guarantee that a user sees an error if their spawn failed,
regardless of when the failure occurred and how long it took.
Some cases of slow errors could result in triggering a new spawn indefinitely without
the user seeing an error message.

/hub/spawn was a simple redirect to /user/:name in the absence of a spawn form,
but now clears the `_spawn_future` prior to redirect
to signal that a new spawn has been explicitly requested in the case of a prior failure.
2017-09-04 14:17:24 +02:00
Min RK
0e2cf37981 point to single-user logs when spawner fails to start 2017-09-04 13:14:07 +02:00
Min RK
503d5e389f render pending page if triggered spawn doesn't finish
instead of redirecting, which starts redirect loop counter
2017-09-04 12:02:40 +02:00
Min RK
7b1e61ab2c allow waiting for pending spawn via spawner._spawn_future
avoids losing errors when visiting `/hub/user/:name` during a pending spawn
2017-09-04 11:53:42 +02:00
Min RK
4692d6638d 0.8.0b4 2017-08-31 16:47:12 +02:00
Carol Willing
7829070e1c Merge pull request #1383 from minrk/singleuser-token-cookie
set cookie on singleuser when authenticated with ?token=...
2017-08-31 09:31:35 -05:00
Min RK
5e4b935322 only HubOAuth can set token cookie 2017-08-31 16:04:54 +02:00
Carol Willing
4c445c7a88 Add jencabral to contributors 2017-08-31 07:52:08 -05:00
Carol Willing
8e2965df6a Merge pull request #1384 from minrk/spawner-db
restore db access on Spawner
2017-08-31 07:50:18 -05:00
Min RK
7a41d24606 set cookie on singleuser when authenticated with ?token=...
Allows `/user/name?token=...` URL to login users for more than one request.

matches token behavior of regular notebook server.
2017-08-31 13:53:48 +02:00
Min RK
5f84a006dc restore db access on Spawner
Shouldn’t be strictly necessary, but doesn’t hurt
2017-08-31 10:03:44 +02:00
Carol Willing
e19296a230 Merge pull request #1382 from minrk/request-token
let admins request tokens for other users
2017-08-31 00:04:59 -04:00
Min RK
89ba97f413 exercise more token API cases
separate parametrize cases for clarity
2017-08-30 14:38:00 +02:00
Min RK
fe2157130b Merge pull request #1381 from minrk/log-fix
fix logging error when login_user is called with no form data and login fails
2017-08-30 14:09:52 +02:00
Min RK
e3b17e8176 Merge pull request #1379 from ding-c3/master
Pass timeout value to exponential_backoff in wait functions
2017-08-30 14:05:42 +02:00
Min RK
027f2f95c6 let admins request tokens for other users 2017-08-30 12:31:41 +02:00
Min RK
210975324a fix logging error when login_user is called with no form data and login fails 2017-08-30 11:31:44 +02:00
Min RK
f9a90d2494 add —cull-users to cull_idle_servers
allows deleting idle users in addition to servers for temp-user cases such as binder/tmpnb
2017-08-30 10:31:44 +02:00
Alex Ding
932689f2f8 Pass timeout value to exponential_backoff in wait functions 2017-08-29 17:45:21 -07:00
Min RK
f91e911d1a Merge pull request #1375 from lsst-sqre/master
Prevent "extra" from being used before definition.
2017-08-29 08:36:25 -04:00
Adam Thornton
b75cce857e Merge pull request #1 from lsst-sqre/ticket/DM-11663
Fix "extra" so it isn't used before definition.
2017-08-28 19:00:17 -04:00
adam
62f00690f7 Fix "extra" so it isn't used before definition. 2017-08-28 15:58:31 -07:00
Yuvi Panda
f700ba4154 Merge pull request #1368 from minrk/check-version-error
Provide more detailed error message in case of version mismatch
2017-08-28 13:27:00 -04:00
Min RK
8b91842eae Merge pull request #1369 from minrk/template-typo
typo in navbar template
2017-08-27 16:41:44 -04:00
Min RK
80a9eb93f4 Merge pull request #1370 from yuvipanda/button-roles
Add role=button attribute to all <a> & <span> buttons
2017-08-27 15:39:04 -04:00
yuvipanda
e1deecbbfb Add role=button attribute to all <a> & <span> buttons
Simple accessibility win - screen readers will now be
able to properly present these as buttons than links.
2017-08-27 11:17:22 -04:00
Min RK
d3142704b7 typo in navbar template
mixed up elements causing funky alignment on some pages
2017-08-26 22:42:17 -04:00
Min RK
447edd081a Provide more detailed error message in case of version mismatch
this is the most likely cause of redirect loops when using docker,
so record the spawner version and check it when a redirect is detected.

In the event of a redirect and mismatch, fail with a message explaining the version mismatch and how to fix it.
2017-08-26 22:41:24 -04:00
Min RK
e1531ec277 Merge pull request #1366 from minrk/typo
typo in proxy recovery
2017-08-26 20:21:51 -04:00
Min RK
d12ac4b1f6 typo in proxy recovery
should have been the dict of instantiated services, not the list of service configurations
2017-08-26 15:25:17 -04:00
Min RK
17851b7586 0.8.0b3 2017-08-26 13:51:12 -04:00
Min RK
118e2fa610 Merge pull request #1364 from minrk/test-start-stop-race
exercise start/stop race conditions
2017-08-26 13:37:41 -04:00
Min RK
8e3553462c exercise start/stop race conditions
this doesn’t cover all the edge cases of each possible stage for the races, but it gets the basics covered.
2017-08-26 11:57:05 -04:00
Carol Willing
37da47d811 Merge pull request #1356 from minrk/proxy-race
rework spawn futures to fix races
2017-08-26 11:07:55 -04:00
Min RK
a640a468fb Merge pull request #1362 from stuartcampbell/master
Improve help comments for SSL key/certs configuration parameters
2017-08-26 09:41:47 -04:00
Min RK
92f034766e Merge pull request #1355 from minrk/update-oauth-secret
update oauth secret if API tokens change
2017-08-26 09:41:14 -04:00
Min RK
f7ea451df8 get the tests running 2017-08-25 18:12:15 -04:00
Stuart Campbell
1b7f54b462 Make SSL cert/key help clearer. 2017-08-25 14:52:23 -04:00
Stuart Campbell
b14b12231a Correct typo to have consistent comments 2017-08-24 16:53:25 -04:00
Min RK
2866be9462 don’t allow start while stop is pending
- start fails with 400 if stop is pending
- set spawn_pending across a whole spawn (including proxy)
- proxy_pending is only around the proxy
2017-08-23 23:35:19 -04:00
Min RK
f8648644bf ensure _stop_pending is always True on stop_single_user
previously there was a race during `delete_route`

apply the same logic as _start_pending
2017-08-23 18:30:49 -04:00
Min RK
69d4d48db0 rework spawn futures to fix races
1. set _proxy_pending before first wait to ensure that there is never a gap between setting spawn flags
2. always call `finish_user_spawn` to reduce the number of finalization cases
3. wait for proxy to finish on the slow_spawn timeout, not just start, because we are only interested in the total duration for page responsiveness
2017-08-21 11:27:30 +02:00
Min RK
df309749f2 update oauth secret if API tokens change
handle will_resume case correctly, where an API token *may* be re-used.

Previously, we only did it right if the token was *always* reused,
but clearing out a container would get it into a bad state.
2017-08-21 11:23:17 +02:00
Min RK
58751067db Merge pull request #1354 from minrk/log-typo
typo: use app_log, not self.log
2017-08-20 15:49:56 +02:00
Min RK
4fd70cf79b app_log typo 2017-08-20 15:48:55 +02:00
Carol Willing
ff15bad375 Merge pull request #1353 from minrk/log-connection-error
log error when failing to connect to Hub
2017-08-20 10:45:32 +02:00
Min RK
90ac4ab6fe 0.8.0b2 2017-08-20 10:11:45 +02:00
Min RK
cba5bb1676 log error when failing to connect to Hub
for better diagnosis
2017-08-20 10:03:52 +02:00
Min RK
4b5fa404fc Merge pull request #1352 from minrk/singleuser-image
build jupyterhub/singleuser on this repo
2017-08-20 09:45:54 +02:00
Min RK
c4ac1240ac Merge pull request #1347 from minrk/re-use-token
handle and test a few unlikely cases when Spawners reuse tokens
2017-08-20 09:45:35 +02:00
Min RK
d384ad2700 ensure notebook is installed 2017-08-18 17:57:53 +02:00
Min RK
c3da0b8073 include singleuser in sdists 2017-08-18 17:55:00 +02:00
Min RK
9919cba375 add BASE_IMAGE as a build arg 2017-08-18 17:45:35 +02:00
Min RK
1e6b94de92 add singleuser build dir from dockerspawner 2017-08-18 17:36:08 +02:00
Min RK
8451a4cd08 clarify and simplify api token tests 2017-08-18 13:09:41 +02:00
Carol Willing
48f1da1b8d Merge pull request #1348 from minrk/oauth-state
use state field for internal OAuth
2017-08-17 19:22:11 +02:00
Carol Willing
e20050b719 Merge pull request #1346 from minrk/test-admin-sort
Fix (and test!) sorting of admin page
2017-08-17 19:12:37 +02:00
Min RK
a9c0a46a06 add missing classes to services.auth 2017-08-17 17:29:45 +02:00
Min RK
03bb094b90 update service-whoami examples to include OAuth 2017-08-17 17:29:45 +02:00
Min RK
5d0d552c26 fix check for service startup 2017-08-17 17:29:45 +02:00
Min RK
2d50cef098 implement state handling in HubOAuth 2017-08-17 17:29:45 +02:00
Min RK
d6d0b83b4e remove redundant oauth callback implementation in singleuser 2017-08-17 17:29:45 +02:00
Min RK
f1dbeda451 regenerate cookie_secret on every single-user spawn
ensures that singleuser cookies do not persist across single-user instances

relaunching a singleuser instance invalidates all cookies used with that instance
2017-08-17 17:29:45 +02:00
Min RK
512bbae5cb handle and test a few unlikely cases when Spawners reuse tokens
- test that .will_resume preserves tokens (worked, but wasn't tested)

If a Spawner reuses a token, validate it in the db:

- verify that it's in the db
- if it doesn't map onto the right user, revoke the token
- if it's not in the db, insert it as a user-provided token

The most likely case is prior unclean shutdown of something like DockerSpawner,
where a spawn failed and thus the token was revoked,
but the container was in fact created.
2017-08-17 17:29:33 +02:00
Min RK
8c575d40af fix sort-by-running on admin page
server_id is on Spawner, not User anymore
2017-08-17 17:29:19 +02:00
Min RK
d6b9909bc6 test admin page sort order
just exercise the handler, sort results are not verified
2017-08-17 17:29:19 +02:00
Min RK
ef7d6dc091 Merge pull request #1350 from minrk/allow-fail-nightly
allow failures on python: nightly
2017-08-17 17:27:54 +02:00
Min RK
57f707bbfd allow failures on python: nightly
since they break stuff sometimes.
2017-08-17 17:27:07 +02:00
Min RK
0ae7213366 Merge pull request #1344 from minrk/0.8-changes
Start drafting 0.8 changelog
2017-08-17 17:24:05 +02:00
Min RK
22ff7aa672 begin 0.8 changelog
most of the changes I could find!
2017-08-17 17:21:48 +02:00
Carol Willing
ca579fbf4a Merge pull request #1342 from willingc/toc-tweak
Add detail to tutorials toc section
2017-08-16 15:52:22 +02:00
Carol Willing
f2eb30d090 Add detail to tutorials toc section 2017-08-16 15:41:22 +02:00
Min RK
63a4b4744b Merge pull request #1335 from willingc/upgrade-08
Add upgrade to 0.8 doc
2017-08-15 18:09:12 +02:00
Min RK
e03b5b3992 Merge pull request #1340 from zonca/patch-2
Fix broken jupyterhub getting started link
2017-08-15 18:08:56 +02:00
Min RK
fa4a27fb1a 0.8.0b1 2017-08-15 18:06:58 +02:00
Andrea Zonca
d3a6aa2471 Fix broken jupyterhub getting started link 2017-08-14 16:02:40 -05:00
Carol Willing
8bd64cff59 Merge pull request #1338 from willingc/update-conrtib
Update contributor list [ci skip]
2017-08-13 16:31:50 -07:00
Carol Willing
760db17640 Update contributor list 2017-08-13 16:26:33 -07:00
Carol Willing
a9cb25f3a2 Update gallery-jhub-deployments.md 2017-08-12 08:07:47 -07:00
Min RK
d9d5ddb77e Merge pull request #1337 from yuvipanda/urlencoding
Fix bug causing failures with special chars in user names
2017-08-12 15:28:40 +02:00
yuvipanda
9b8e5b03b4 Fix bug causing failures with special chars in user names
Fixes #1336
2017-08-11 16:46:19 -07:00
Yuvi Panda
02f0c4a5b8 Merge pull request #1333 from minrk/client-id
use fully-escaped name in oauth_client_id
2017-08-11 12:30:55 -07:00
Carol Willing
b254716cee Add upgrade to 0.8 doc 2017-08-11 09:05:54 -07:00
Min RK
4c52ad6f7c Merge pull request #1331 from willingc/travis-req
verify requirements installed in travis builds
2017-08-11 16:34:13 +02:00
Min RK
0c09bfcafa use fully-escaped name in oauth_client_id
because it will be a cookie key
and @ is not legal there
2017-08-11 16:32:54 +02:00
Carol Willing
0b67546481 Allow sqlalchemy to float upward 2017-08-11 06:08:52 -07:00
Min RK
2698b00fb9 Merge pull request #1330 from willingc/restructure-doc
Restructure doc source folders
2017-08-11 14:11:36 +02:00
Carol Willing
f7ce705999 Merge pull request #1332 from pjamason/patch-1
Update gallery-jhub-deployments.md
2017-08-10 16:23:11 -07:00
pjamason
ee14131827 Update gallery-jhub-deployments.md
added jupyterhub.ucsd.edu
2017-08-10 13:07:27 -07:00
Carol Willing
828c499ac7 Add missing images 2017-08-10 10:39:44 -07:00
Carol Willing
a43d594452 correct link 2017-08-10 09:53:29 -07:00
Carol Willing
406d572a7b keep sqlalchemy version from floating upward 2017-08-10 09:48:49 -07:00
Carol Willing
71c38fd515 modify link from md to rst 2017-08-10 09:07:38 -07:00
Carol Willing
68e02dd62a Correct links 2017-08-10 09:07:38 -07:00
Carol Willing
dd1902b1d9 update image links 2017-08-10 09:00:04 -07:00
Carol Willing
39041ee08c Update toc 2017-08-10 09:00:04 -07:00
Carol Willing
eb6a2f9e89 Restructure doc folder structure 2017-08-10 09:00:04 -07:00
Min RK
4f826d8245 Merge pull request #1325 from willingc/services-update
Update services getting started docs
2017-08-10 12:18:13 +02:00
Min RK
a434a6f144 Merge pull request #1328 from willingc/test-travis
Update pin on sqlalchemy for travis
2017-08-10 12:15:50 +02:00
Carol Willing
0fe1020022 Update pin on sqlalchemy for travis 2017-08-09 11:46:55 -07:00
Carol Willing
8aca08f508 Edit REST doc per minrk 2017-08-09 10:38:17 -07:00
Carol Willing
fb0331aa4c Edits per minrk 2017-08-09 10:28:38 -07:00
Carol Willing
184a9bceb9 Add link to HTCondor and JupyterHub 2017-08-09 10:17:31 -07:00
Min RK
dfef7c2b52 Merge pull request #1321 from willingc/doc-services
Add autodoc of services and update services.auth for OAuth
2017-08-09 11:37:16 +02:00
Min RK
6b16b51064 Merge pull request #1326 from willingc/aws-workshop
Add CTB's tutorial config on AWS to gallery of deployments
2017-08-09 08:33:06 +02:00
Carol Willing
85a75b637a Add automodule for app 2017-08-08 23:07:28 -07:00
Carol Willing
fae2d9414a Remove heading in docstring 2017-08-08 23:06:50 -07:00
Carol Willing
61e263b160 Correct docstring that was preventing build 2017-08-08 23:05:20 -07:00
Carol Willing
ac13140083 Edit some classes 2017-08-08 23:02:12 -07:00
Carol Willing
024fd07ec8 Update autodoc doc files 2017-08-08 23:01:08 -07:00
Carol Willing
95175155d4 Update autodoc of services.auth and add services 2017-08-08 22:51:35 -07:00
Carol Willing
e5c088f8d6 add alembic to conda env 2017-08-08 22:41:42 -07:00
Carol Willing
42a103c76f bump bootprint versions 2017-08-08 22:41:23 -07:00
Carol Willing
b70f2fa20a remove schema error 2017-08-08 22:41:08 -07:00
Carol Willing
8e69b158eb Update rest doc 2017-08-08 21:03:20 -07:00
Carol Willing
6e2c544a19 correct link formatting 2017-08-08 20:59:06 -07:00
Carol Willing
c62d080e9c Add CTB's tutorial config on AWS 2017-08-08 17:48:20 -07:00
Carol Willing
bd0e00ed86 Add tokens can be for activities not tied to a specific user 2017-08-08 16:01:41 -07:00
Carol Willing
264a78e2cc Add note about single-user servers auth and tokens 2017-08-08 15:46:47 -07:00
Carol Willing
4f95ef437f Add more complex requests example for API 2017-08-08 15:37:35 -07:00
Carol Willing
f0556954ed Deprecate and de-emphasize 'jupyterhub token' 2017-08-08 15:25:41 -07:00
Carol Willing
44bc569868 Update services getting started docs 2017-08-08 15:13:30 -07:00
Carol Willing
1e9bbb1d14 Merge pull request #1323 from minrk/prefix-slash
handle missing trailing slash on /hub
2017-08-08 09:07:56 -07:00
Min RK
f2953f6b09 handle missing trailing slash on /hub 2017-08-08 14:23:07 +02:00
Min RK
fa4c5ec9d4 Merge pull request #1320 from minrk/access-link
make sure we send users to `/user/name/`, not just `/user/name`
2017-08-08 13:35:45 +02:00
Min RK
546268809f add / to user-redirect
Some proxies may not correctly route /user/name, only /user/name/...
2017-08-08 12:02:36 +02:00
Min RK
6af4c0f9e0 Merge pull request #1322 from willingc/link-update
Correct broken links in docs
2017-08-08 09:50:33 +02:00
Min RK
7d0fd85d65 Merge pull request #1319 from minrk/test-mysql
Test against postgres, mysql (again)
2017-08-08 09:50:12 +02:00
Carol Willing
15b78307fb Correct broken links in docs 2017-08-07 14:35:17 -07:00
Min RK
6ba3090cd5 add trailing slash to user access link 2017-08-07 15:18:20 +02:00
Min RK
74c4c58e37 ensure mysql has proper unicode on travis 2017-08-07 13:18:28 +02:00
Min RK
31f63264b0 ensure oauth uses same db session as app
further remnant of test threads
2017-08-07 13:18:28 +02:00
Min RK
9e7dbbbbff avoid recreating existing users in test_proxy
db tests re-use users across sessions
2017-08-07 13:18:28 +02:00
Min RK
c1d120c9bb cleanup named servers 2017-08-07 13:18:27 +02:00
Min RK
3955a8c1d0 limit unique columns to 255 chars
for MySQL key size limits (767 = 256 * 3 - 1 for utf8)
2017-08-07 13:18:27 +02:00
Min RK
12f8073e5d only create first user if it doesn't exist 2017-08-07 13:18:27 +02:00
Min RK
ec2b1dd39b install mysql/postres drivers on Travis 2017-08-07 11:23:34 +02:00
Min RK
e9d603abf1 run tests with mysql, postgres
make sure everything works
2017-08-07 11:23:34 +02:00
Carol Willing
ac33ba6ff4 Merge pull request #1316 from minrk/rm-scoped-session
drop scoped_session
2017-08-06 09:01:50 -07:00
Carol Willing
3b4888b8ba Merge pull request #1314 from minrk/spawner.start-doc
update spawner.start docs
2017-08-06 08:58:49 -07:00
Carol Willing
5c64c88d5a Merge pull request #1312 from minrk/reverse-generated-token
reverse generated-tokens default logic
2017-08-06 08:57:27 -07:00
Carol Willing
924d095c68 Merge pull request #1311 from minrk/oauth-token-no-service
handle OAuthAccessTokens with no user
2017-08-06 08:49:37 -07:00
Min RK
700ccb17cb Merge pull request #1317 from minrk/proxy-check-routes
disable periodic check_routes during proxy tests
2017-08-06 15:06:36 +02:00
Min RK
1d156f8183 disable periodic check_routes during proxy tests
can race tests and create inconsistent state
2017-08-06 14:39:42 +02:00
Min RK
c0e2c5cb71 drop scoped_session
this was an artifact of the now-removed test thread
2017-08-06 14:29:10 +02:00
Min RK
25d19732e0 keep salting generated tokens
all the savings are in rounds, but keep salt because it still prevents the ability to hash a token once and check it against the whole db
2017-08-06 14:16:47 +02:00
Min RK
f0b8d56e9f fix oauth hashed column sizes 2017-08-06 13:28:06 +02:00
Min RK
718a3fe7ef update spawner.start docs
remove mention of self.user.server, which is deprecated in 0.7
2017-08-06 13:15:46 +02:00
Carol Willing
ca6e0ec9b9 Merge pull request #1307 from minrk/last_activity
remove last_activity from server
2017-08-05 15:34:45 -07:00
Min RK
a27765f7d5 reverse generated-tokens default logic
user-provided tokens are added in exactly one place,
so switch default handling of tokens to generated=True
and explicitly distrust user tokens.

Add JupyterHub.trust_user_provided_tokens flag so that users can avoid the extra hashing
if they know they are providing good keys.
2017-08-05 15:36:03 +02:00
Min RK
bf1dd03df3 handle OAuthAccessTokens with no user
This shouldn’t happen, raise if it does.

If a token API request is authenticated with no user or service, delete the token because it is invalid and return with 404 because it doesn’t correspond to an existing user.
2017-08-05 15:01:22 +02:00
Min RK
2726648982 typo in OAuthAccessToken.service
Token.session doesn’t exist

OAuthAccessTokens are never associated with services
2017-08-05 14:58:41 +02:00
Min RK
275a4ce18d remove last_activity from server
and put it on individual spawners
2017-08-05 14:55:09 +02:00
Carol Willing
0b34e13dd4 Merge pull request #1303 from minrk/message-202
consolidate server APIHandlers
2017-08-04 07:43:40 -07:00
Carol Willing
e666261434 Merge pull request #1308 from minrk/rest-api-finish
finish up oauth swagger doc
2017-08-04 07:40:06 -07:00
Min RK
57c8ad6b92 consolidate server APIHandlers
no need for separate handlers for named and default servers

avoid claiming that empty responses are JSON.
2017-08-04 16:17:20 +02:00
Min RK
3f032abc25 finish oauth swagger doc
- clarify that /authorize is not really an API endpoint, but the redirect target
- /oauth2/token accepts x-www-form-urlencoded not json
2017-08-04 15:23:50 +02:00
Carol Willing
f86202c07d Update link to Jupyter contributor guide 2017-08-04 04:02:18 -07:00
Min RK
1b0ff0a5f6 Merge pull request #1093 from willingc/oauth-doc
Add docs for OAuth
2017-08-04 12:14:01 +02:00
Carol Willing
cebb962645 Edit per mirnk review 2017-08-03 10:34:12 -07:00
Min RK
55000f98bc include non-empty body with 202 responses
reply claims to be application/json, so make sure it has some content
2017-08-03 12:01:19 +02:00
Min RK
449aff1b1d Merge pull request #1302 from minrk/properties
restore user.running property
2017-08-03 12:00:52 +02:00
Min RK
3c591f744b Merge pull request #1305 from minrk/alembic-log
hook up alembic logging to Hub app if it's running
2017-08-03 11:46:32 +02:00
Min RK
329781023f use futures to avoid races on slow spawners
trigger events by hand so that performance can't cause races
2017-08-03 11:45:29 +02:00
Min RK
8d9731e241 hook up alembic logging to Hub app if it's running
avoids calling `logging.fileConfig` which disables all exiting logging when called
2017-08-03 11:28:53 +02:00
Min RK
bde37ba9c2 Merge pull request #1299 from minrk/hash-auto
only apply reduced hash+salt to internally generated tokens
2017-08-03 11:13:25 +02:00
Min RK
088fdc8f42 Deprecate User.spawn|stop_pending flags
Rather than removing them immediately
2017-08-03 11:12:10 +02:00
Min RK
886005be2a handle named servers in user_stopped callback 2017-08-03 11:09:28 +02:00
Min RK
684afed3f1 restore user.running property
it was made a method for handing named_servers,
but that made things way more complicated and replaced a boolean flag with a callable,
which would behave unexpectedly but without error if a boolean flag was expected.

Spawners have properties for dealing with this now, so use spawners

Restore `user.running` as an alias for `user.spawner.ready`
2017-08-03 11:09:27 +02:00
Min RK
210d7e59fd Merge pull request #1301 from minrk/total-running-limit
add active_server_limit
2017-08-03 11:08:23 +02:00
Min RK
a19a94b2c2 test active_server_limit 2017-08-03 10:52:32 +02:00
Min RK
9bf70208c8 return 'spawn' pending for spawn or proxy_pending
In general, we treat both the same way
2017-08-03 10:52:01 +02:00
Min RK
fada0d99f0 call it active_server_limit 2017-08-03 10:50:50 +02:00
Min RK
e6ce468301 set Spawner.server directly
avoids Spawner.server property looking up on the ORM every time,
which is expensive and we want to check `Spawner.server is None` often.
2017-08-03 09:59:01 +02:00
Min RK
875e5d59fe Merge pull request #1300 from minrk/check-hub-ip
verify route targets in check_routes
2017-08-02 22:28:38 +02:00
Min RK
6556135a69 verify route targets in check_routes
updates routes that have the wrong target
2017-08-02 11:23:49 +02:00
Min RK
8636b4ebca Merge pull request #1294 from minrk/alembic-tag
always include and check alembic revision
2017-08-02 11:14:44 +02:00
Min RK
4a5f914a62 only apply reduced hash+salt to internally generated tokens
don't trust any user-provided tokens to have decent entropy, regardless of size
2017-08-02 11:14:18 +02:00
Yuvi Panda
47b6014d13 Merge pull request #1297 from minrk/check-enabled-auth-state
prevent saving auth_state if auth_state is not enabled.
2017-08-01 09:24:34 -07:00
Yuvi Panda
1995d825df Merge pull request #1293 from minrk/test-spawn-limit
test pending spawn count
2017-08-01 09:23:36 -07:00
Min RK
f49606dff6 add user.count_active_users
produces summary of active/pending/ready spawner counts

Avoids brittle bookkeeping of running counts,
computing the value upon request.

For 10k users this is still only a few milliseconds, which seems worth it
2017-08-01 17:00:45 +02:00
Min RK
7520d4b81e add concurrent_user_limit
limits total active users, not just spawns
2017-08-01 16:22:54 +02:00
Min RK
083408a685 add pending/ready/active properties to Spawner
- pending: stop or start is pending
- ready: spawner is running and ready (not pending)
- active: spawner is running or pending (consuming resources)
2017-08-01 16:17:37 +02:00
Min RK
9c4972239d prevent saving auth_state if auth_state is not enabled.
allows Authenticators to return auth_state without having to check enable_auth_state
2017-08-01 10:51:44 +02:00
Min RK
4458f2e6d4 error when db mismatches is SystemExit now
since we catch explicitly and call `self.exit` with a nice message
2017-07-31 17:04:27 +02:00
Min RK
a24027f188 hook up app logging in upgrade-db
matches default formatting
2017-07-31 16:19:47 +02:00
Min RK
c749fc05f4 update 0.8 alembic revision
add some missing transactions
2017-07-31 16:19:24 +02:00
Min RK
5ad77df04f check database revision on launch
fail with informative error if version mismatches

Since we weren't always tagging before,
we have to handle no tag being present:

- database empty (use latest because we are about to create everything anew)
- if 'spawners' is present, assume 0.8.dev
- if 'services' is present, assume 0.7.x
- else: assume base revision when we started tracking this stuff
2017-07-31 16:18:58 +02:00
Min RK
4b51d67d35 match alembic log formatting to default hub log format 2017-07-31 15:12:39 +02:00
Min RK
88268bd76f test spawn_pending_count
make sure to cover various cases of spawn failure
so that failed spawns don't leak pending-spawn counts
2017-07-31 12:39:06 +02:00
Min RK
744d96330e use properties for spawn_pending 2017-07-31 11:45:01 +02:00
Min RK
55c3164a7d Make default concurrent spawn limit 100
it's a conservative default, and deployments can turn it up if need be
2017-07-31 11:24:21 +02:00
Min RK
c78e31b136 Merge pull request #1290 from yuvipanda/concurrent_spawn_limit
Add support for limiting the number of concurrent spawns
2017-07-31 10:28:37 +02:00
Min RK
ecfd0a6796 Merge pull request #1285 from Carreau/spawner-import
Try enforcing methods overwrite at import time.
2017-07-31 10:27:28 +02:00
Yuvi Panda
162ce2a9c5 Merge pull request #1178 from yuvipanda/auth-state
Encrypt auth_state at rest
2017-07-30 10:31:32 -07:00
Min RK
1f2125a097 Add Authenticator.enable_auth_state
Allows authenticators to optionally enable this flag

and signal that auth_state will be used,
enabling early check and exit if encryption is not available.
2017-07-28 22:36:49 +02:00
Matthias Bussonnier
feae3eacb1 Try enforcing methods overwrite at import time.
Currently Spawners need to overwrite start, stop, poll. When this is not
done, it will fail at runtime.

This replicate this check at class definition time, meaning that
potential errors will be caught way earlier. It also have not runtime
cost as the check is a class definition time (ie often import time).

This takes only effect on Python 3.6+ which introduce __init_subclass__,
we could do it with metaclasses, but that's might be too complicated.

If one want to create a class the avoid these restriction they can
overwrite __init_subclass__ and not call the super() method.
2017-07-28 12:05:18 -07:00
yuvipanda
a1a706cb31 More cleanup 2017-07-28 11:58:58 -07:00
Min RK
8a1da297d9 CryptKeeper is configurable 2017-07-28 17:20:57 +02:00
Min RK
1987221026 Python 3.4 doesn't allow bytestring formatting
can't do  until Python 3.5. When do we get to drop py34 support :)
2017-07-28 17:08:18 +02:00
Min RK
4b7b34064b alembic revision for encrypted_auth_state 2017-07-28 16:52:18 +02:00
Min RK
5abb4618bd test auth_state on login handler 2017-07-28 16:51:46 +02:00
Min RK
75c1d36237 trade privy for raw Fernet
only benefit of privy was KDF, but if users provide good 32B keys, this doesn't help.

Fernet already adds randomness, etc. to tokens, so is good enough on its own if keys are good.
2017-07-28 16:08:12 +02:00
Min RK
90e8e1a8aa move auth_state encryption outside the ORM
privy is used for encryption

- db only has blob column, no knowledge of encryption
- add CryptKeeper for handling encryption
- use privy for encryption, so we have fewer choices to make
- storing/loading encrypted auth_state runs in a ThreadPool
2017-07-28 16:08:12 +02:00
Min RK
32a9b38d26 use HKDF on auth keys
if the given tokens aren't already the right shape, pass through a proper KDF
2017-07-28 16:08:12 +02:00
Min RK
5714f56083 encrypt auth_state with MultiFernet
- MultFernet allows key rotation via `AUTH_STATE_KEY=secret2;secret1;secret0`
- Failure to decrypt results in cleared state
- Attempting to set auth_state without encryption is a hard failure
- Absent encryption, auth_state will always be None
2017-07-28 16:08:12 +02:00
Min RK
3d635816c9 add cryptography to dev requirements 2017-07-28 16:08:12 +02:00
yuvipanda
1aa5ce2f35 Add sqlalchemy-utils to requirements.txt 2017-07-28 16:08:12 +02:00
yuvipanda
f765fde6c1 Add OptionalEncrypted type 2017-07-28 16:08:12 +02:00
Min RK
523cbf641c Merge pull request #1288 from Carreau/fix-port-number
Default port is 8081 not 8080
2017-07-28 15:36:01 +02:00
yuvipanda
112834bbaa Cleanup code a little 2017-07-28 01:10:19 -07:00
Matthias Bussonnier
f0ab1ae907 Merge pull request #1286 from willingc/authenticator-edits
Refresh docs on Authenticators
2017-07-27 22:16:32 -07:00
yuvipanda
d6827a2794 Error if we hit pending spawn limit
The backlog actually doesn't help - almost all of them fail,
and the exponential backoff just adds more work for our ticks
2017-07-27 20:36:59 -07:00
Carol Willing
a1591185c1 Flesh out auth in swagger spec 2017-07-27 19:44:59 -07:00
Carol Willing
b77c8a8717 Update the API index section 2017-07-27 19:44:59 -07:00
Carol Willing
831b7d2a86 WIP 2017-07-27 19:44:59 -07:00
Carol Willing
057a52dd32 Add oauth to swagger api doc 2017-07-27 19:44:59 -07:00
Matthias Bussonnier
8f88fae530 Default port is 8081 not 8080 2017-07-27 19:21:16 -07:00
Carol Willing
85cc8eb6f3 Fix typo 2017-07-27 17:42:49 -07:00
Carol Willing
349f1b115e Reorganize content 2017-07-27 17:33:37 -07:00
yuvipanda
27de44b0ec Add support for limiting the number of concurrent spawns 2017-07-27 16:32:45 -07:00
Carol Willing
9847408d77 Edit auth docs 2017-07-27 08:59:57 -07:00
Carol Willing
cc24f36e80 Merge pull request #1281 from minrk/no-test-threads
eliminate test application thread
2017-07-27 08:43:45 -07:00
Min RK
e7fe6d25b6 set ASYNC_TEST_TIMEOUT=15 on Travis
Travis is super slow and default timeout is 5 seconds, which is too low sometimes.
2017-07-27 12:48:46 +02:00
Min RK
afc968146d fix race in test_proxy
prevent `.check_routes` from firing while we wait for a new proxy to come up

We check explicitly that it comes up with no routes, so makes sure check_routes hasn't restored its state, which is causing intermittent failures
2017-07-27 12:48:25 +02:00
Min RK
471decdbb6 Merge pull request #1280 from yuvipanda/hub_connect_port
Add hub_connect_port
2017-07-27 12:07:12 +02:00
Min RK
638f980281 fix race waiting for slow spawners
wait for `.running` instead of `._spawn_pending`,
since we now have `._proxy_pending` as well to wait for.
2017-07-27 11:46:33 +02:00
Min RK
8f1115a257 remove handling of changing db sessions
this was purely for accessing the db from multiple threads in tests
2017-07-27 11:37:19 +02:00
Min RK
9e8b6503a0 use gen_test in place of IOLoop.run_sync
even where not strictly required

for consistency, now that we are using gen_test on the main app tests
2017-07-27 11:29:58 +02:00
Min RK
91d042f6f3 get the rest of tests running without threads
all tests pass!
2017-07-27 11:29:58 +02:00
Min RK
d559cad042 test_pages without threads 2017-07-27 11:29:56 +02:00
Min RK
f05aecf5f9 test_api passes without threads
just put requests in a thread via `utils.async_requests`

eliminates db threads issue
2017-07-27 11:29:16 +02:00
Min RK
58f072e5af start MockHub without threads
everything's going to run with gen_test

need our own io_loop fixture that's module_scoped to go with our app fixture
2017-07-27 11:28:32 +02:00
yuvipanda
afc3bcbc75 Fix more references to port that should be connect_port 2017-07-26 18:12:01 -07:00
yuvipanda
8ee2fd2cf8 Fix possible redirect loop 2017-07-26 18:05:50 -07:00
yuvipanda
be7faacd07 Add ability to set hub_connect_port 2017-07-26 17:53:40 -07:00
Yuvi Panda
dc97433d9b Merge pull request #1272 from yuvipanda/exponential-function
Move exponential backoff into a function
2017-07-26 15:38:01 -07:00
Carol Willing
da10a8e7dd Edit docstring and comments 2017-07-26 13:00:16 -07:00
Carol Willing
847ae21ccb Merge pull request #1267 from minrk/auto-login
add login_user and get_next_url methods
2017-07-26 10:16:47 -07:00
Carol Willing
128cf115a7 Merge pull request #1269 from willingc/network-docs
Streamline networking and using REST API Docs
2017-07-26 09:50:49 -07:00
Carol Willing
1b9cff6d5f Add minrk comments 2017-07-26 09:48:58 -07:00
Carol Willing
110a8e22ae Edit for clarity 2017-07-26 09:26:21 -07:00
Carol Willing
7f058c0c77 Minor edits 2017-07-26 09:26:21 -07:00
Carol Willing
1e3512ac84 Update TOC placement 2017-07-26 09:26:21 -07:00
Carol Willing
8662a4a807 Edit networking and REST API usage docs 2017-07-26 09:26:21 -07:00
Carol Willing
63d1c918e5 Merge pull request #1276 from minrk/stop-button
running is a method now
2017-07-26 06:45:35 -07:00
Min RK
0a89090dc2 add login_user and get_next_url methods
for easier re-use of login in custom handlers

Further, enable auto_login + no custom login handler to mean that auth info is already present in requests
(e.g. REMOTE_USER)
2017-07-26 15:40:13 +02:00
Min RK
645575239f running is a method now
a few that were missed on the home page
2017-07-26 15:38:34 +02:00
Min RK
8de38b1708 add some jitter to the deadline itself
so that we don't re-align a bunch of timing out calls once the deadline is reached.

(±10% of timeout by default)
2017-07-26 14:12:28 +02:00
Min RK
6db987972a exponential backoff
- apply jitter to first iteration
- due to jitter, double start_wait to 0.2 so that <first wait> is still 0.1
- keep scaling by start_wait, rather than previous dt
- limit last wait to deadline so timeout is not overshot
2017-07-26 14:06:07 +02:00
Min RK
0ddf6bf579 restore wait_for_death
- don't raise TimeoutError
- keep Spawner.death_interval for subclasses
2017-07-26 14:06:07 +02:00
yuvipanda
9f8033a147 Move exponential backoff into a function
Also use the 'Full Jitter' jitter algorithm from
https://www.awsarchitectureblog.com/2015/03/backoff.html
2017-07-26 14:06:07 +02:00
Carol Willing
d007b40e15 Merge pull request #1275 from minrk/log-spawn-start
add log statement when spawn starts
2017-07-26 04:30:02 -07:00
Carol Willing
bbfd36fc92 Merge pull request #1274 from minrk/hub-token
simplify Hub object a bit
2017-07-26 04:24:24 -07:00
Min RK
3faa02b00d add log statement when spawn starts
for easier monitoring of spawn time
and improve consistency of named spawner logging
2017-07-26 12:57:15 +02:00
Min RK
eb1895e980 simplify Hub object a bit
- remove use of deprecated Hub.server
- add deprecation warning to Hub.server property
- move cookie_name declaration to Hub

It should now be possible to use Hub.from_url('http://1.2.3.4:1234/hub/') without missing information
2017-07-26 11:48:30 +02:00
Min RK
7ee8e96ece Merge pull request #1243 from minrk/named_servers
Flesh out named-servers
2017-07-26 11:15:16 +02:00
Min RK
3e796b579d Address review in named_servers
from willingc

- consistency of repr/str when logging usernames
- cleanup some attribute declarations
- add comments about db session weirdness
2017-07-26 10:47:35 +02:00
Carol Willing
74d9e2f421 Merge pull request #1268 from Carreau/flake8
Ignore a couple other of regularly non followed lint rules.
2017-07-25 13:58:47 -07:00
Matthias Bussonnier
2603cbb102 Ignore a couple other of regularly non followed lint rules.
These rules are not followed in a lot of place leading to too many
warnnigs which (at least in my editor) make code unreadable.
2017-07-25 13:50:13 -07:00
Min RK
194d6c9d4c Merge branch 'master' into named_servers 2017-07-25 18:29:01 +02:00
Yuvi Panda
f364f8e832 Merge pull request #1250 from yuvipanda/exponential-backoff-redirect
Apply exponential backoff when we're redirecting to ourselves
2017-07-25 08:19:10 -07:00
Carol Willing
ba6af85e9d Merge pull request #1264 from willingc/tech-overview
Streamline technical overview docs
2017-07-25 08:02:19 -07:00
Carol Willing
d2e411dba0 Edits per @minrk review 2017-07-25 08:01:14 -07:00
Min RK
e15a6bb758 Merge branch 'master' into named_servers 2017-07-25 16:56:16 +02:00
Carol Willing
96c04f3c60 Edit section intro 2017-07-25 07:49:06 -07:00
Carol Willing
9c9bc68092 Expand section overview and prune auth/spawners 2017-07-25 07:49:06 -07:00
Carol Willing
46f003fe14 Minor edits 2017-07-25 07:49:06 -07:00
Carol Willing
1404965b07 Edit and deduplicate the document text 2017-07-25 07:49:06 -07:00
Carol Willing
9fbb1417f2 Update table of contents 2017-07-25 07:49:06 -07:00
Carol Willing
158a7090a3 Combine tech overview docs into one 2017-07-25 07:49:06 -07:00
Carol Willing
9fa9859495 Move tech overview to config reference 2017-07-25 07:49:06 -07:00
Carol Willing
de85fefa7d Merge pull request #1262 from willingc/config-doc
Streamline configuration docs
2017-07-25 07:44:50 -07:00
Carol Willing
dee55df94a Edits per @minrk review 2017-07-25 07:43:48 -07:00
Carol Willing
62b9450ce1 Merge pull request #1266 from willingc/fix-link
Fix link to direct to docs not source
2017-07-25 07:07:32 -07:00
Carol Willing
bcdcf4351d Fix link to direct to docs not source 2017-07-25 07:04:47 -07:00
Min RK
0d941e9c96 move redirect loop fallback to /user/name handler
- add user_redirect_limit to settings, default 5 (that's still a whole minute before failing)
- limit sleep to ten seconds
2017-07-24 17:32:57 -07:00
yuvipanda
9d837b2e4b Add more docs & tweak max redirect wait time 2017-07-24 17:32:57 -07:00
yuvipanda
8544010eb6 Apply exponential backoff when we're redirecting to ourselves
Lots of custom proxy implementations that are distributed are
eventually consistent, and it might take upto a few seconds for
all the components to start redirecting properly. If we do
exponential backoff when doing these redirects, it gives the
proxies a lot of time to catch up. We also explicitly raise an
error if it's going on too long, instead of giving the user
juts a 'redirected too many times' error.
2017-07-24 17:32:57 -07:00
Carol Willing
f37243169a Update links 2017-07-24 14:30:05 -07:00
Yuvi Panda
7caa1e1f0e Merge pull request #1258 from minrk/salt-hash-uuid
don't salt & re-hash generated UUID tokens
2017-07-24 14:07:52 -07:00
Yuvi Panda
e019a394b0 Merge pull request #1259 from willingc/fix-docstring
Reformat docstring causing Sphinx error
2017-07-24 14:06:25 -07:00
Carol Willing
c0b482e68c Fix typos 2017-07-24 08:57:25 -07:00
Carol Willing
2da115f5c4 Reformat docstring causing Sphinx error 2017-07-24 08:32:12 -07:00
Min RK
639ccf5582 index prefix column 2017-07-24 17:27:19 +02:00
Min RK
2654794968 don't salt & extra hash uuids
They have enough entropy on their own,
so use just the hash and no salt.

ref: https://security.stackexchange.com/a/151262/155114
2017-07-24 17:03:04 +02:00
Min RK
2cec124b4f support named servers in REST API
and exercise them in tests
2017-07-24 16:55:17 +02:00
Carol Willing
e21737399b Edit config basics doc and examples 2017-07-24 07:53:20 -07:00
Min RK
9a555d8a6e move user.proxy_pending to Spawner._proxy_pending 2017-07-24 15:22:36 +02:00
Min RK
f7bf2b0ba6 Merge branch 'master' into named_servers 2017-07-24 15:21:42 +02:00
Min RK
710ed0a5c8 Merge pull request #1245 from willingc/deduplicate
Review and edit security documentation
2017-07-24 14:35:33 +02:00
Min RK
7539523ef2 Merge pull request #1251 from yuvipanda/another-race-maybe
Don't add route if there's already a route addition pending
2017-07-24 14:34:34 +02:00
Yuvi Panda
c97444e438 Merge pull request #1257 from minrk/dirty
Dirty database fixes
2017-07-24 05:19:19 -07:00
Min RK
4c86d10037 comment about sqlachemy dirty flag 2017-07-24 14:12:50 +02:00
Min RK
69a6c79558 use admin user in test_admin
rather than relying on multi db sessions talking to each other
2017-07-24 13:37:11 +02:00
yuvipanda
a0466dc322 Count ourselves as a good route if we've a proxy pending 2017-07-24 04:35:13 -07:00
Min RK
546e35e9a3 Merge pull request #1249 from Carreau/fix-pam-500
Do not 500 if cannot authenticate.
2017-07-24 12:54:56 +02:00
Min RK
ce53b11cf7 Make rollback conditional on db.dirty
avoids calling rollback when there are no changes

includes warning about what objects are actually dirty
2017-07-24 12:53:58 +02:00
Min RK
1229fd100f only set attributes on orm_server if they changed
Setting things on orm_server set the dirty flag,
even if they haven't changed.
2017-07-24 12:52:46 +02:00
Matthias Bussonnier
e4541591ea Do not 500 if cannot authenticate.
self.authenticate can return None, in which case you can't subscript.
So move extracting data into the branch checking whether authenticate is
not `None`.

Now that extracting the username is inside the if branch, it can't be
used in the else one, so extract username from the request itself.

This can be easily reproduce with the default PAM login with a wrong
non existing/ wrong username.
2017-07-21 15:40:28 -07:00
Carol Willing
be62b1b9df Reword based on @minrk's review 2017-07-21 11:47:24 -07:00
Carol Willing
9c21cf4c62 Add @minrk review comments 2017-07-21 11:32:48 -07:00
Carol Willing
51af6a98cc Be clearer about the config file name 2017-07-21 11:23:43 -07:00
Carol Willing
520d6160f0 Make use of config file and environment variable consistent 2017-07-21 11:23:43 -07:00
Carol Willing
e8ebedb2da Move security audits to overview doc 2017-07-21 11:23:43 -07:00
Carol Willing
fd7700d577 Update title 2017-07-21 11:23:43 -07:00
Carol Willing
6ee88a5424 Edit content for clarity 2017-07-21 11:23:43 -07:00
Carol Willing
c89711d0d5 Edit and deduplicate security docs 2017-07-21 11:23:43 -07:00
Carol Willing
daee0f8df8 Merge pull request #1248 from Carreau/cleanup
Remove unused import and add version to deprecations.
2017-07-21 11:21:20 -07:00
Matthias Bussonnier
e1444f4aca remove trailing comma 2017-07-21 11:13:18 -07:00
Matthias Bussonnier
97b9c4899a typo 2017-07-21 11:12:24 -07:00
Matthias Bussonnier
b8aa6ecd70 Remove unused import and add version to deprecations. 2017-07-21 10:23:54 -07:00
Min RK
e28f3947bd Merge branch 'master' into named_servers 2017-07-21 15:43:09 +02:00
Min RK
bc9cc98789 Merge pull request #1246 from yuvipanda/no-unconditional-add
Don't unconditionally add hub route to proxy
2017-07-21 10:23:25 +02:00
yuvipanda
72132e7946 Don't unconditionally add hub route to proxy
This is done contidtionally in check_routes instead
2017-07-21 01:01:21 -07:00
Carol Willing
b0307dd98e Merge pull request #1242 from minrk/headers-fixes
various singleuser header fixes
2017-07-20 11:49:13 -07:00
Carol Willing
fd1ac55a70 Merge pull request #1240 from minrk/drop-33
Require Python 3.4
2017-07-20 11:25:30 -07:00
Yuvi Panda
39d8800389 Merge pull request #1241 from minrk/progress-spin
add spinner to slow-spawn page
2017-07-20 09:59:32 -07:00
Min RK
382a7121e1 further clear up named servers
- use spawner.server instead of user.server
- user.running, proxy_spec are methods that take spawner names
2017-07-20 16:54:17 +02:00
Min RK
4c0ac6d502 Merge pull request #1234 from CRegenschein/master
Add pre_spawn_hook
2017-07-20 15:45:06 +02:00
Min RK
40dcbedc2a various singleuser header fixes
- always set content security policy header, to workaround bug in notebook 5.0
- set x-jupyterhub-version on all requests, not just our own
- fix version comparison in _check_version (leftover `__version__`)
- even log version matches at debug-level (verifies that check happened)
2017-07-20 15:37:54 +02:00
Min RK
9eda66b3ae bump bower dependencies
need fa 4.3 for fa-pulse, but rev everything while we're at it
2017-07-20 14:31:13 +02:00
Min RK
d4c48db248 add spinner on slow-spawn page 2017-07-20 14:30:45 +02:00
Min RK
7bd4861689 minor cleanup in pre_spawn_hook
- remove reduntant None, allow_none in Any
- remove callable check (if it's not callable, let the error raise)
- let outer error handling deal with failed pre-spawn hook
- add missing `return` in pre_spawn_hook
2017-07-20 14:08:06 +02:00
CRegenschein
72550725da jupyterhub-1219 Enhancement: automatically create a directory for the user after successful login 2017-07-20 14:02:13 +02:00
Min RK
5a8011ea66 Require Python 3.4
Specify Requires-Python (PEP345) metadata
2017-07-20 13:49:34 +02:00
Min RK
0fd1a95405 Merge pull request #1239 from willingc/remove-33
Bump Python support to 3.4 and up
2017-07-20 13:48:56 +02:00
Min RK
8d0cfa8e7c always set content-type json on API handlers 2017-07-20 11:58:50 +02:00
Min RK
3d1187283c apply stricter CSP on api endpoints
double-ensure that no scripts run on api pages (referrer check already doesn't allow malicious links)
2017-07-20 11:58:50 +02:00
Carol Willing
7416a55083 Add test for invalid version 2017-07-19 19:23:37 -07:00
Carol Willing
e8a3c4dac6 Fix link 2017-07-19 17:33:14 -07:00
Carol Willing
33f2026dac Add badge for 0.7.2 docs to README 2017-07-19 17:30:57 -07:00
Carol Willing
d34f6e779d Bump Python support to 3.4 and up 2017-07-19 14:57:52 -07:00
Min RK
738976a956 Merge pull request #1236 from willingc/doc-intro
Break up long Getting Started doc page
2017-07-19 11:40:39 +02:00
Carol Willing
fd8cc1df15 Break up large getting started doc 2017-07-18 17:57:56 -07:00
Carol Willing
61053b063e Reorganize content 2017-07-18 16:47:11 -07:00
Carol Willing
a27e1e9d40 Break up installation document 2017-07-18 11:45:03 -07:00
Carol Willing
a7889eb536 Rename guide to reference 2017-07-18 11:03:49 -07:00
Carol Willing
0f17709d4e Edit content in intro 2017-07-18 11:03:13 -07:00
Min RK
3eca010f66 limit curl logging to INFO-level
curl debug logs every byte of every request
2017-07-18 14:49:13 +02:00
Min RK
041ffd6db2 support named servers in proxy 2017-07-18 14:48:51 +02:00
Min RK
4b5aad41b1 make user.running a method
accept server names
2017-07-18 14:48:29 +02:00
Min RK
d6565076f5 add admin user by default 2017-07-18 14:29:59 +02:00
Min RK
c943162649 merge named server handlers
only need one handler class per path
2017-07-18 14:28:45 +02:00
Min RK
a2e94b8493 create Spawners table
for named servers

removes User.servers
2017-07-18 14:28:31 +02:00
Min RK
94b2bc1261 Merge pull request #1231 from willingc/doc-refresh
Update docs main TOC and edit quickstart
2017-07-18 13:19:45 +02:00
Min RK
7d34f83b18 Merge pull request #1232 from dhirschfeld/win-fix3
Pass `shell=True` to `check_call` on Windows
2017-07-18 13:18:54 +02:00
Hirschfeld
4f27a18616 Pass shell=True to check_call on Windows 2017-07-18 12:15:33 +10:00
Carol Willing
5a5aa1c2aa Update main TOC and edit quickstart 2017-07-17 12:24:43 -07:00
Carol Willing
1bafdf9130 Merge pull request #1223 from minrk/wait-up-fall-off
apply exponential backoff to all waits
2017-07-17 09:15:48 -07:00
Min RK
9eef5d7b1e refresh session of spawner server 2017-07-17 11:05:25 +02:00
Min RK
aee3c74681 Merge origin/master into named_servers 2017-07-17 10:53:17 +02:00
Min RK
653a39c05e checkpoint: named server state 2017-07-17 10:41:36 +02:00
Min RK
efa6a33b0a variables for exponential falloff 2017-07-17 10:27:42 +02:00
Min RK
0c5a9e8347 Merge pull request #1225 from willingc/unofficial-win
Document more fully platform support
2017-07-17 10:24:54 +02:00
Min RK
657f77b7c6 Merge pull request #1224 from dhirschfeld/more-windows-fixes
More Windows Fixes
2017-07-17 10:23:50 +02:00
Carol Willing
b528572960 Document in more detail platform support 2017-07-16 19:13:54 -07:00
Hirschfeld
e75d24aca2 Create getgrnam wrapper function to allow mocking in tests 2017-07-17 11:38:04 +10:00
Hirschfeld
7607f8d639 More Windows fixes 2017-07-17 11:13:00 +10:00
Carol Willing
9a59c02077 Merge pull request #1220 from minrk/service-msg
fix filtering of services with no endpoint
2017-07-16 08:46:54 -07:00
Min RK
8e3c4b1925 apply exponential backoff to all waits
Waiting for servers to come up and shut down was polled at an even interval of 100ms. If things are slow and busy, this is a lot if waiting events. exponential backoff reduces the number of callbacks triggered by slow spawners.

This may improve the load a bit when there’s a bunch of outstanding spawns.
2017-07-15 12:56:47 +02:00
Yuvi Panda
057bf03d3a Merge pull request #1221 from minrk/proxy-race
add User.proxy_pending
2017-07-14 19:20:16 -07:00
Min RK
224faff879 Merge pull request #1208 from dhirschfeld/windows-fixes
Minor fixes to get setup.py to work on Windows
2017-07-14 17:28:28 +02:00
Min RK
a6c2939bb4 delay stop_pending until the end of stop
avoids stop_pending being False while there's still one yield to go
2017-07-14 15:53:38 +02:00
Min RK
c78d88707c fallback during initial hub connection 2017-07-14 15:34:34 +02:00
Min RK
a79071bb33 add User.proxy_pending
flag for waiting for the proxy to be updated

avoids User.running being True when the user's server has not yet been added to the proxy,
causing potential redirect loops.
2017-07-14 15:17:56 +02:00
Min RK
dca530d2c0 Merge pull request #1218 from minrk/raise-not-exit
fix leftover `self.exit` in proxy
2017-07-14 14:13:17 +02:00
Min RK
c5b1542af2 fix service filtering
use `!=` to check for None, not `is not`
2017-07-14 14:11:25 +02:00
Min RK
a13e7766fc fix leftover self.exit in proxy
self.exit is a method on Application, missed copying the proxy code out of the JupyterHub app.
2017-07-14 10:51:14 +02:00
Min RK
765e391810 Merge pull request #1214 from yuvipanda/hub_ip_connect_config
Tag hub_ip_connect as configurable
2017-07-14 10:44:09 +02:00
Yuvi Panda
6a12e78cee Merge pull request #1212 from yuvipanda/typo-fix
Fix typo in proxy implementation
2017-07-13 21:15:17 -07:00
yuvipanda
e0effa567a Tag hub_ip_connect as configurable
This value is expected to be provided by the user.
2017-07-13 20:14:11 -07:00
yuvipanda
0322ca6d05 Fix typo
It is now self.command, not cmd
2017-07-13 19:52:13 -07:00
Hirschfeld
13eda34676 Used os.pathsep to join paths 2017-07-13 22:19:37 +10:00
Hirschfeld
874ed0c450 Passed shell argument to check_call instead of calling cmd.exe directly 2017-07-13 22:15:19 +10:00
Hirschfeld
f25ec3c3f0 Minor fixes to get setup.py to work on Windows 2017-07-13 16:47:26 +10:00
Carol Willing
8373c4619e Merge pull request #1207 from minrk/check-routes-on-startup
check routes on startup
2017-07-12 08:56:14 -05:00
Min RK
549dfd99e5 check routes on startup
and be more thorough about clearing out stale routes that shouldn't be there
2017-07-12 14:06:04 +02:00
Carol Willing
eed88f6366 Merge pull request #1204 from minrk/httponly
set httponly on cookies
2017-07-11 09:33:00 -05:00
Carol Willing
fcf745b2f4 Merge pull request #1206 from minrk/pycurl-by-default
use pycurl by default, if available
2017-07-11 09:31:58 -05:00
Min RK
69a27b7843 use pycurl by default, if available
simplehttpclient can have issues with high load
2017-07-11 16:16:02 +02:00
Min RK
a51141810d set httponly on cookies 2017-07-11 11:06:00 +02:00
Yuvi Panda
396f454998 Merge pull request #1199 from jupyterhub/data-dict-default
Make data a non-optional arg to add_route
2017-06-29 14:06:00 -07:00
yuvipanda
5f21909138 Fix proxy test failure 2017-06-29 12:32:31 -07:00
yuvipanda
ebb7b4b4ae Make data a non-optional arg to add_route
We expect at least an empty dict when we fetch it,
so let's make it non-optional and always pass in something.
This is clearer.
2017-06-29 12:26:27 -07:00
Min RK
e691231f64 Merge pull request #1169 from minrk/version-check
Compare JupyterHub and single-user server versions
2017-06-29 17:49:22 +01:00
Min RK
471110c0f2 Merge pull request #1194 from yuvipanda/route_fix
Mark `data` param to proxy.add_route optional
2017-06-29 06:52:14 +01:00
yuvipanda
73948c016b Mark data param to proxy.add_route optional
It is used as optional throughout the code, and the CHP implementation
makes it optional too. So let's explicitly mark it as such.
2017-06-28 22:40:52 -07:00
Carol Willing
864e7ac4ee Merge pull request #1193 from willingc/rtd-update
Remove mkdocs as workaround fixed in RTD upstream
2017-06-28 15:53:07 -07:00
Carol Willing
2207220592 Remove mkdocs as workaround fixed upstream 2017-06-28 15:50:35 -07:00
Min RK
a4a5781f7f invoke app when testing single-user 2017-06-28 21:55:15 +01:00
Min RK
194d2b9639 handle oauth id checks in tests 2017-06-28 21:55:15 +01:00
Min RK
530f499ce1 _version.py is private 2017-06-28 21:55:15 +01:00
Min RK
d167e275d1 compare hub and single-user server versions
in both directions - Hub checks singleuser server on spawn and singleuser server checks Hub on startup

if minor versions mismatch, log at warning level, otherwise debug
2017-06-28 21:55:15 +01:00
Min RK
cdcc7fc3c1 return http response from wait_for_http_server 2017-06-28 21:55:15 +01:00
Min RK
0a30e0ade5 put jupyterhub version in logs and headers 2017-06-28 21:55:15 +01:00
Min RK
47dc66db5a better handle a few values being undefined when launching single-user 2017-06-28 21:55:15 +01:00
Yuvi Panda
c192391551 Merge pull request #1189 from minrk/default-route
add default hub route via Proxy.add_route
2017-06-28 12:58:30 -07:00
Carol Willing
b0c44aa67a Merge pull request #1192 from willingc/fix-conda
Add mkdocs as RTD workaround
2017-06-28 08:21:48 -07:00
Carol Willing
29890dcfa9 Add mkdocs as RTD workaround 2017-06-28 04:46:06 -07:00
Min RK
1742065f77 Merge pull request #1191 from kroq-gar78/fix-anchors
Fix in-document anchors
2017-06-28 10:36:14 +01:00
Aditya Vaidya
28480d0359 Fix in-document anchors
Removes the explicit extension of the target if it's in the same
document. This allows these links to work in GitHub or in Read the Docs.
2017-06-28 01:57:45 -07:00
Min RK
2f57cfc812 respect port in testing subdomain host 2017-06-28 09:53:57 +01:00
Min RK
b12a52e266 run tests -v 2017-06-28 09:50:07 +01:00
Min RK
5d45a44247 use db_factory in Proxy
should avoid session crossover problems in tests

…still really need to move tests over to gen_test
2017-06-27 22:39:39 +01:00
Min RK
8ee520d99b filter out non-jupyterhub routes in CHP 2017-06-27 15:22:26 +01:00
Min RK
4c0d4ffc47 add default hub route via Proxy.add_route
instead of relying on default target
2017-06-27 15:22:26 +01:00
Min RK
44c00a2581 run test hub on a random port 2017-06-27 15:22:26 +01:00
Min RK
1015f3bf53 Merge pull request #1187 from minrk/fix-db
fix db reconnect when user.db changes
2017-06-27 15:21:20 +01:00
Yuvi Panda
71378d23d5 Merge pull request #1180 from minrk/auth-return-dict
allow .authenticate to return a dict containing name and state
2017-06-26 10:23:39 -07:00
Yuvi Panda
f5d0855c2b Merge pull request #1177 from minrk/proxy-routespec
define routespec
2017-06-26 10:05:07 -07:00
Min RK
88040362b0 fix db reconnect when user.db changes
store id on outer User, rather than accessing orm_user.id, which seems to fail sometimes

this may fix the recent increase in intermittent test failures
2017-06-26 12:46:55 +02:00
Min RK
8f49412438 docstrings for proxy 2017-06-26 11:32:15 +02:00
Min RK
bb417b98b8 Merge pull request #1184 from evanlinde/evanlinde-patch-1
Add '/tree' to spawner default_url
2017-06-25 08:36:18 +02:00
evanlinde
afed81d173 Fix default_url documentation 2017-06-24 23:07:31 -05:00
evanlinde
def99c1795 Add '/tree' to default_url
Add '/tree' to default_url so it doesn't have to be included in config file.
2017-06-23 16:22:41 -05:00
evanlinde
fcdea007ac Merge pull request #1 from jupyterhub/master
Trying to update local copy
2017-06-23 13:51:10 -05:00
Min RK
383b56276e fix versionchanged format 2017-06-23 18:51:51 +02:00
Min RK
11e6c38702 routespecs are strings (again)
- no slash means host-routing
- slash means no-host
2017-06-23 14:49:42 +02:00
Min RK
a2686ac27b always return dict from get_authenticated_user
outer APIs don't need to handle the different cases
2017-06-23 14:41:06 +02:00
Min RK
49bf4747fd avoid error in service.stop if service failed to start 2017-06-23 14:12:31 +02:00
Min RK
cf257c48b4 handle host-routing in add/get/delete 2017-06-23 14:12:31 +02:00
Min RK
05d939beac JSON shenanigans now that proxy route keys aren't strings 2017-06-23 14:12:31 +02:00
Min RK
fa7fed8ea3 routespec docstrings 2017-06-23 14:12:31 +02:00
Min RK
fbf5816952 handle leading/trailing slashes in RouteSpec 2017-06-23 14:12:31 +02:00
Min RK
31fc89c944 add RouteSpec namedtuple for route specification
namedtuple(path, host)

everywhere that accepts a RouteSpec must also accept a string
and treat it as RouteSpec(string).
RouteSpec.as_routespec(spec_or_string) handles this.
2017-06-23 14:12:30 +02:00
Min RK
f7a05713a1 allow .authenticate to return a dict containing name and state
Allows authenticators to set .auth_state from info in the initial authentication.
2017-06-22 15:19:45 +02:00
Yuvi Panda
9f532d6b2d Merge pull request #1176 from minrk/protect-pamela
delay errors on pamela import
2017-06-21 08:58:12 -07:00
Min RK
5263e4ceae user.state is keyed by server name 2017-06-21 16:52:54 +02:00
Min RK
3145011004 add multi-spawner info to user model 2017-06-21 16:33:39 +02:00
Min RK
5da4348c2d move some state to Spawner
now that there are more than one per user
2017-06-21 16:33:16 +02:00
Min RK
e33e34748f Re-sync with master 2017-06-21 15:33:01 +02:00
Min RK
d2e62a90d7 Merge pull request #1167 from minrk/more-env-less-argv
pass more arguments as environment variables instead of CLI args
2017-06-21 14:13:25 +02:00
Min RK
593a3c8ebb fix base_url handling in services
JUPYTERHUB_BASE_URL is the whole application base_url (default: /)
JUPYTERHUB_SERVICE_PREFIX is the service prefix (/user/name/)
2017-06-21 14:02:55 +02:00
Min RK
6713277f33 delay errors on pamela import
only raise ImportError on pamela if PAMAuthenticator is actually used

avoids failure to start in rare cases where pamela is not importable (e.g. broken libpam)
2017-06-21 11:17:13 +02:00
Min RK
178f1ed5e0 fix defaults in singleuser ip/port
when service url is undefined

never return None
2017-06-15 11:08:35 +02:00
Min RK
f5c703a04f update tests for env change 2017-06-15 11:08:35 +02:00
Min RK
27e83a3260 pass more arguments as environment variables instead of CLI args
env is often easier to deal with for Spawners

Now, only optional args are passed on the command-line and all required args come from environment variables.
2017-06-15 11:08:33 +02:00
Carol Willing
e7cd5ec019 Merge pull request #1170 from minrk/403-bad-user
raise 403 on disallowed user, rather than redirect to login
2017-06-14 15:12:35 -07:00
Min RK
8704deeb31 ensure db.commit happens before yield 2017-06-14 21:19:38 +02:00
Min RK
9c6056518f use user.base_url in args 2017-06-14 21:18:38 +02:00
Min RK
5f813a4206 Merge pull request #1172 from Carreau/intersphinx-python-3
Inter-sphinx with Python 3, not 2.
2017-06-13 10:27:42 +02:00
Matthias Bussonnier
5cb40531d0 Inter-sphinx with Python 3, not 2.
Python 2 is the default, you need to be explicit for Python 3.
2017-06-12 12:04:41 -07:00
Min RK
fe85a79ae3 403 in services_auth tests 2017-06-08 19:00:35 +02:00
Min RK
97ec0b803d Merge pull request #1171 from minrk/close-socket
close socket when testing connections
2017-06-08 18:57:30 +02:00
Min RK
a5fbc0351f close socket when testing connections
rather than relying on garbage collection
2017-06-08 15:28:02 +02:00
Yuvi Panda
38e772dfec Merge pull request #1165 from minrk/hub_connect_ip
add hub_connect_ip
2017-06-07 14:32:40 -07:00
Min RK
dda3762b48 raise 403 on disallowed user, rather than redirect to login url
raise UserNotAllowed exception in generic `check_hub_user`
when a user or service is identified and not allowed.

turn it into `HTTPError(403)` in tornado `get_current_user` wrapper,
caching `None` so that subsequent calls don't re-trigger the same error.
2017-06-07 15:30:12 +02:00
Min RK
1ddbf97c11 comments to clarify that connect_ip is only for connecting 2017-06-07 13:21:52 +02:00
Min RK
ca4952a85d Merge pull request #1166 from minrk/log-cleanup
disconnect logging during MockHub cleanup
2017-06-06 18:39:56 +02:00
Min RK
d76632de91 update tests for connect_ip changes 2017-06-06 16:33:30 +02:00
Min RK
b96f3485fd make connect_ip a property
so that the default doesn't override explicit settings
2017-06-06 16:33:30 +02:00
Min RK
a6f1f6ea09 disconnect logging during MockHub cleanup
pytest appears to close captured FDs prematurely,
causing huge "I/O operation on closed file" tracebacks
whenever tests stop early due to a failure.

This should quiet the extra traceback, though it could potentially silence useful log messages during cleanup in rare cases
2017-06-06 15:28:19 +02:00
Min RK
d2533688b6 add hub_connect_ip
allows specifying the connect ip/hostname for the Hub
when it differs from hub_ip (the bind address).

Used when the Hub is not on the same host as the spawners and/or proxy (e.g. docker, kubernetes, etc.)
2017-06-06 12:47:43 +02:00
Min RK
6810aba5e9 Merge pull request #1164 from joychak/master
Added Kerberos authenticator link for Jupyterhub in ReadMe file
2017-06-06 10:09:12 +02:00
jchakrabort5
aca5b1ccd4 Added Kerberos authenticator for Jupyterhub in ReadMe 2017-06-05 10:00:16 -04:00
Carol Willing
888aa99ea6 Merge pull request #1069 from minrk/first-poll-fails-no-crash
Prevent crashes due to deleted system users
2017-06-02 05:25:34 -07:00
Min RK
b112b88587 Merge pull request #1148 from yuvipanda/pwdfree
Don't use getuser to find out current user name for spawning
2017-05-22 16:40:14 -07:00
Carol Willing
86276541be Merge pull request #1146 from minrk/log-redirect-targets
log redirect targets
2017-05-22 15:18:31 -07:00
Carol Willing
bdfd81fe83 Merge pull request #1144 from minrk/raise-on-config-error
raise on config file errors
2017-05-22 15:16:05 -07:00
Min RK
c24a0a4995 typo missing hub.api_url in service 2017-05-22 15:09:31 -07:00
Min RK
524b9104d0 also skip user_env for no username 2017-05-22 15:09:01 -07:00
Min RK
19e896c38d Merge pull request #1143 from minrk/spawn-next-url
Don’t redirect back to home from spawn
2017-05-22 14:39:58 -07:00
Min RK
62517d0c89 Merge pull request #1098 from minrk/proxy
implement proxy API
2017-05-22 14:17:41 -07:00
yuvipanda
49a0f154d0 Don't use getuser to find out current user name for spawning
It can easily be spoofed, since it only looks at env vars
2017-05-22 14:17:19 -07:00
Min RK
39248a532d log redirect targets
on both Hub and singleuser

should help debugging redirect loops, etc.
2017-05-21 11:04:15 -07:00
Min RK
465c81f281 clarify delete-invalid-user messages and docstrings 2017-05-20 11:31:59 -07:00
Min RK
2d8facd022 Add Authenticator.delete_invalid_users
opt-in option for deleting users that have been invalidated,
e.g. for LocalAuthenticators when system users have been removed and `create_system_users` is False.

Since it’s opt-in, log config to do so when the error is seen and option is not enabled.
2017-05-20 11:21:21 -07:00
Min RK
d548aa1e72 deprecate old proxy config
but keep it working with warnings
2017-05-19 12:08:49 -07:00
Min RK
7968912a7c raise on config file errors
don’t start jupyterhub if we can’t load config files
2017-05-19 11:43:59 -07:00
Min RK
79bd1a50ad Don’t redirect back to home from spawn
options_form spawn sent people back to home instead of to their newly spawned server
2017-05-19 11:42:58 -07:00
Carol Willing
7b96950a9c Merge pull request #1139 from tschaume/patch-1
semi-colons missing
2017-05-16 18:49:48 -07:00
Patrick Huck
89331d15cc semi-colons missing 2017-05-16 15:44:47 -07:00
Carol Willing
25910b732a Merge pull request #1132 from minrk/stop-docstring
Correct stop docstring
2017-05-16 13:21:56 -07:00
Min RK
bdcb9e7540 Correct stop docstring
stop should always wait to finish,
`now` indicates how forcefully it should be done.
2017-05-15 09:33:23 +02:00
Min RK
130bec4a2f Merge pull request #1133 from willingc/travis-requests
Update pip before install of dependencies on travis
2017-05-10 22:05:27 +02:00
Carol Willing
db2d685c40 Update pip before install dependencies on travis 2017-05-09 10:32:47 -07:00
Carol Willing
f9e0f90e08 Merge pull request #1119 from minrk/next-url
include next_url in authenticator login url
2017-05-08 03:05:56 -07:00
Carol Willing
4f85644c34 Merge pull request #1131 from minrk/clear-poll-notify
clear poll callbacks list before using it
2017-05-08 03:04:00 -07:00
Min RK
73d77ee56b clear poll callbacks list before using it
avoids accumulating callbacks for repeated spawns
2017-05-08 11:34:24 +02:00
Min RK
33a37ffa25 User has no single .server anymore 2017-05-08 11:07:35 +02:00
Carol Willing
2716ba4dc6 Merge pull request #1129 from charnpreetsingh/docs-warning
add jupyterhub-deployment-aws in docs
2017-05-06 17:35:00 -07:00
Carol Willing
65afc65f51 Merge pull request #1130 from willingc/new-docs
Update docs for jupyter alabaster theme
2017-05-06 17:20:34 -07:00
Carol Willing
034432bfba Remove self from contents 2017-05-06 16:51:29 -07:00
Carol Willing
f815fe8b59 Update for jupyter-alabaster local build 2017-05-06 16:46:48 -07:00
Carol Willing
cc7605d6a9 Add subsection docs 2017-05-06 16:46:48 -07:00
Carol Willing
d809b8717c Add numbered, self, and order in index 2017-05-06 16:46:48 -07:00
Carol Willing
f878ad54a8 Change single toc tree to visible and numbered 2017-05-06 16:46:48 -07:00
Carol Willing
22bc9b0dbf Make a single toctree 2017-05-06 16:46:48 -07:00
Carol Willing
86428aa0f6 Change to jupyter alabaster doc theme 2017-05-06 16:46:48 -07:00
charnpreetsingh
8c8b532ffd add jupyterhub-deployment-aws 2017-05-05 12:55:59 -07:00
Min RK
475c0a3144 Merge pull request #1127 from minrk/sudo-false
set sudo: false on Travis
2017-05-04 16:27:52 +02:00
Min RK
3c6e20585c set sudo: false on Travis 2017-05-04 14:03:19 +02:00
Min RK
98c2bd9a6a return ip, port from stub spawner
avoids deprecation warning in tests
2017-05-04 13:49:31 +02:00
Min RK
226b6c40a5 improve waiting for service to start in mockservice fixture
- wait for proxy update before starting service
- wait for service server to respond to start before proceeding
2017-05-04 13:33:16 +02:00
Min RK
4cb18c931d JUPYTERHUB_HOST is hub.public_host 2017-05-04 13:24:04 +02:00
Min RK
96b75c18b7 fix check-routes data access 2017-05-04 13:23:53 +02:00
Min RK
87d9d14e5d update proxy test 2017-05-04 12:28:37 +02:00
Min RK
1069799ea7 get rid of single-user cookie_name
it's unused now that single-user uses OAuth
2017-05-04 12:20:02 +02:00
Min RK
5e55753baa various cleanup to get most tests passing (yay!) 2017-05-04 12:16:47 +02:00
Min RK
be8f847309 move proxy management to Proxy object
out of the Application
2017-05-04 11:13:19 +02:00
Min RK
acc31b8441 remove Hub, Proxy from database
These are in-memory-only objects, no need for a table with one row
2017-05-04 11:05:58 +02:00
YuviPanda
a98bab8b5e Mock of how the proxy base class will be used 2017-05-04 11:02:33 +02:00
YuviPanda
7b944a3a3f Add proxy base class 2017-05-04 11:02:33 +02:00
Carol Willing
a0d32c5b33 Merge pull request #1126 from charnpreetsingh/dependencies
Sphinx min version is 1.4
2017-05-03 17:06:17 -07:00
charnpreetsingh
89f1254396 resolve merge conflicts 2017-05-03 16:06:57 -07:00
charnpreetsingh
41c136392f Sphinx min version is 1.4 2017-05-03 16:00:31 -07:00
Min RK
b4d1ee353d include next_url in authenticator login url
avoids losing redirect target when clicking through "Login with ..."
2017-05-02 14:37:52 +02:00
Carol Willing
a24d7406fc Merge pull request #1097 from minrk/whoami-only
Don't give OAuth access tokens access to the REST API
2017-05-02 03:03:58 -07:00
Min RK
574d3ba1f4 unused imports 2017-05-02 11:10:06 +02:00
Carol Willing
6eb61e2923 Merge pull request #1111 from minrk/whitespace-password
avoid stripping login form fields
2017-04-28 09:57:05 -07:00
Min RK
9e679e8024 avoid stripping login form fields
which prevented users from being able to login with passwords that start or end with whitespace
2017-04-28 16:40:11 +02:00
Carol Willing
006488fc74 Merge pull request #1101 from prasadkatti/patch-1
[docs] Minor fix to index.rst
2017-04-23 22:06:22 -04:00
Prasad Katti
8e66c383e8 [docs] Minor fix to index.rst 2017-04-23 11:12:34 -07:00
Carol Willing
e7a0556118 Merge pull request #1066 from minrk/auto_login
make Authenticator.auto_login explicit
2017-04-22 07:02:04 -04:00
Min RK
6117c0b573 accept OAuthAccessTokens in /authorization/token 2017-04-21 14:52:47 +02:00
Min RK
c3a90e0804 raise 500 on failure to identify a user in oauth callback 2017-04-21 14:52:23 +02:00
Min RK
66cb630b86 separate OAuth access tokens from API tokens
OAuth access tokens can only be used to identify users, not perform actions on their behalf, which API tokens do.

Implementing OAuth scopes would allow us to achieve this limitation without separating the two items, but that would be a much bigger change, including having an OAuth "Would you like to grant permissions..." confirmation page.
2017-04-21 14:52:07 +02:00
Christian Barra
2b2eefdd1f catch KeyError for get_spawner 2017-04-19 14:58:43 +02:00
Christian Barra
db77932a95 moving track of spawner's instances inside user 2017-04-19 14:46:54 +02:00
Christian Barra
2aaf82412d add a dict to save spawner's instances, fix user.server with server 2017-04-19 03:25:26 +02:00
Min RK
4df93cab04 add oauth2 to doc requirements 2017-04-18 16:16:16 +02:00
Carol Willing
b778232cac Merge pull request #1090 from minrk/rm-other-user-cookies
remove references to unused other_user_cookies
2017-04-18 07:05:41 -07:00
Min RK
f58015dc57 remove references to unused other_user_cookies
OAuth gets rid of the concept of the Hub managing cookies on behalf of sub-servers
2017-04-18 11:22:00 +02:00
Min RK
57d3cbccc4 Merge pull request #1084 from prasadkatti/patch-2
Fix Travis CI url
2017-04-18 11:18:59 +02:00
Prasad Katti
52fdd0bd8c Fix Travis CI url 2017-04-15 17:50:23 -07:00
Christian Barra
ced8e9f874 add named_servers proxy 2017-04-15 05:22:01 +03:00
Christian Barra
76b589bc90 fix named_servers, change server.base_url 2017-04-15 03:47:09 +03:00
Carol Willing
4c79a8cb2d Merge pull request #1077 from willingc/ipython-profile
Remove reference to profile for Jupyter
2017-04-13 07:28:53 -07:00
Carol Willing
64f7244808 Remove reference to profile for Jupyter 2017-04-13 07:27:07 -07:00
Carol Willing
ebaf36d503 Merge pull request #1072 from willingc/docker-docs
Add information about DockerHub to FAQ
2017-04-13 07:18:27 -07:00
Carol Willing
e58c1a5f5a Merge pull request #1076 from philejmath/readme_updates
Updates Jupyter server config file names and locations
2017-04-13 07:17:07 -07:00
Philip Matheson
c1eb7618d6 Updates jupyter server config names and locations to use "jupyter" instead of "ipython" 2017-04-12 12:18:36 -04:00
Carol Willing
0ce0dfbc35 Add information about DockerHub to FAQ 2017-04-10 09:49:17 -07:00
Carol Willing
a555af428d Merge pull request #1068 from zonca/patch-1
[DOC] gallery deployments, improve UCSD
2017-04-08 09:39:11 -07:00
Min RK
b5666a45f6 prevent crash on first poll failure of Spawners
1. only poll if server might be running
2. catch and log failure to poll, treat it as not running to avoid Spawner bugs aborting Hub startup
2017-04-08 10:57:22 +02:00
Andrea Zonca
170f0f918f [DOC] gallery deployments, improve UCSD
added post titles and added one more post.
2017-04-07 21:49:01 -07:00
Min RK
a59b0af2b4 test auto_login redirects 2017-04-07 17:01:51 +02:00
Min RK
3cac9a2203 add path arg to public_url helper 2017-04-07 17:01:51 +02:00
Min RK
6b22f80ead Add Authenticator.auto_login
Simplifies login URL, handler login

- all login redirects go to `settings['login_url']`
- `login_url` is unconditionally `/hub/login`
- `/hub/login` renders form page or 'login with...' button
- enabling auto_login redirects from /hub/login to Authenticator.login_url()
2017-04-07 14:49:18 +02:00
Min RK
5f498ffaf3 Merge pull request #1062 from betatim/doc-fix
Fix missing space in header
2017-04-07 11:48:34 +02:00
Tim Head
258fe7b277 Fix missing space in header 2017-04-07 10:08:07 +02:00
Carol Willing
703ed7d21e Merge pull request #938 from minrk/oauth-provider
Make JupyterHub an OAuth provider
2017-04-06 06:57:55 -07:00
Min RK
9a1f84329f clarify oauth store docstrings
per review
2017-04-06 12:15:34 +02:00
Min RK
a20c7eb4de remove unused/unimplemented AccessTokenStore methods 2017-04-06 12:13:08 +02:00
Min RK
e866651f96 update admin access deprecation message 2017-04-06 11:59:31 +02:00
Min RK
2b5f42a546 docstring clarifying what we override in OAuthHandler 2017-04-06 11:50:23 +02:00
Min RK
b811c63ac5 blacklist sphinx 1.5.4
it has a bug preventing docs from building
2017-04-06 10:09:14 +02:00
Min RK
c7ea106675 use User wrappers in test_spawner 2017-04-05 16:12:29 +02:00
Min RK
1f2218c875 update travis.yml
- remove Python 3.3
- install node.js 6 with nvm
- remove use of outdated travis-wheels
2017-04-05 16:04:34 +02:00
Min RK
99369aa5a1 fix trailing - in oauth-client-id for single-user servers with empty server_name 2017-04-05 15:53:49 +02:00
Min RK
ffd3c171fe fix oauth url for SU servers with subdomains
and services without
2017-04-05 15:53:49 +02:00
Min RK
ce4b9e8e9f only store token in single-user cookie
not the user model

preserves cached-response behavior from the Hub
so that the Hub can still revoke tokens.
2017-04-05 15:53:49 +02:00
Min RK
ef51eb21e0 get OAuth working with subdomains
needs a lot of host passing around
2017-04-05 15:53:49 +02:00
Min RK
b1efe3a5c1 load initial API token before setting up oauth client 2017-04-05 15:53:48 +02:00
Min RK
6d647b5387 use API token for oauth client secret
rather than a separate single-purpose secret

since we need the token anyway, use it for the secret handshake as well
2017-04-05 15:53:48 +02:00
Min RK
d11c7ba4db cleanup more after mockservices 2017-04-05 15:53:48 +02:00
Carol Willing
6b33358c56 Merge pull request #1054 from parente/clarify-token-api-auth
Minor update to clarify hub token auth
2017-04-04 20:20:48 -07:00
Peter Parente
9030302ff7 Fix typo request -> requests 2017-04-04 22:36:05 -04:00
Peter Parente
1631a6eab0 Minor update to clarify hub token auth 2017-04-04 22:33:57 -04:00
Min RK
c6fe145030 s/JupyterHubOAuthCallback/HubOAuthCallback/ 2017-04-04 17:02:34 +02:00
Min RK
5b1435081a remove redundant/unused code in mockservice fixture 2017-04-04 17:02:34 +02:00
Min RK
39fce0304d support oauth in services
fix bugs caught by tests
2017-04-04 17:02:34 +02:00
Min RK
5a5fdc2565 validate oauth client_id/secret 2017-04-04 17:02:33 +02:00
Min RK
bef121dbe3 get default hub_prefix from env 2017-04-04 17:02:33 +02:00
Min RK
0b7a43f6fa remove placeholder oauth example 2017-04-04 14:26:44 +02:00
Peter Parente
2d1a45f019 Merge pull request #1050 from willingc/admin-doc
Clarify admin users and access in docs
2017-03-31 20:58:54 -04:00
Carol Willing
5494172706 Clarify admin users and access in docs 2017-03-31 10:28:37 -07:00
Min RK
198bb875df delay evaluation of oauth environment variables
only affects mocking in tests
2017-03-31 17:07:21 +02:00
Min RK
d1822ee939 handle hub prefix in HubAuth 2017-03-31 17:06:51 +02:00
Min RK
5e1516189b allow oauth provider to be missing
mostly for testing
2017-03-31 16:15:00 +02:00
Min RK
5819b442aa stop using deprecated server cookie in tests
use Hub cookie instead, which still exists
2017-03-31 15:58:39 +02:00
Min RK
4bb8e47f3b implement admin-access with OAuth 2017-03-30 19:15:43 +02:00
Min RK
ff6a68112e put whole user model in cookie
ensures cached value has all the info needed (group, etc.)
2017-03-30 16:52:20 +02:00
Min RK
52b9060415 remove debug-print in self handler 2017-03-30 16:35:50 +02:00
Min RK
74728e5f42 make HubOAuth a subclass
instead of implementing both shared-cookie and OAuth on HubAuth
2017-03-30 15:57:58 +02:00
Min RK
3e482d08d7 Don't overwrite class name when patching-in hub auth 2017-03-30 15:24:48 +02:00
Min RK
7e55220c3f use OAuth in single-user server 2017-03-30 15:24:35 +02:00
Min RK
453d1daf8b move oauth tables to top-level orm 2017-03-29 13:35:13 +02:00
Min RK
d0eb4e0946 add /api/user handler for identifying the requester 2017-03-28 16:19:56 +02:00
Min RK
9a40196678 Avoid storing secrets and tokens at rest
- OAuth access tokens *are* APITokens.
  oauth_access_tokens table only stores extra oauth metadata.
- only store hashed client_secret in database,
  using HashedCompare to allow comparison.
2017-03-28 16:19:56 +02:00
Min RK
4f7552ea1d OAuth works! 2017-03-28 16:19:56 +02:00
Min RK
7412e357cf allow 'bearer' in Authorization header
since that's what OAuth likes
2017-03-28 16:19:56 +02:00
Min RK
bac96c679f fix login URL for oauth provider 2017-03-28 16:19:56 +02:00
Min RK
4f1d201286 OAuth handlers inherit from BaseHandler 2017-03-28 16:19:56 +02:00
Min RK
bcf6559514 WIP: Make JupyterHub an OAuth provider 2017-03-28 16:19:55 +02:00
Min RK
0af9f2b875 Merge pull request #1046 from willingc/iss753
Add default behavior of whitelist to FAQ in docs
2017-03-28 09:31:06 +02:00
Min RK
d9393c6663 Merge pull request #1047 from willingc/iss1024
Add note to FAQ about updating node on Debian
2017-03-28 09:30:30 +02:00
Carol Willing
00274c991f Add note to FAQ about updating node on Debian 2017-03-27 08:51:20 -07:00
Carol Willing
e6848b68aa Add default behaviorof whitelist to doc FAQ 2017-03-27 07:27:46 -07:00
Carol Willing
853a460bd7 Merge pull request #1043 from minrk/local.jovyan
run subdomain test with localhost.jovyan.org
2017-03-27 06:48:46 -07:00
Carol Willing
ff5b708707 Merge pull request #1044 from minrk/hex-regex
match the whole content when checking if cookie secret is hex
2017-03-27 06:46:15 -07:00
Min RK
0d62ba2f80 use hex secretfile in tests 2017-03-27 14:02:30 +02:00
Min RK
f257716d1b match the whole content when checking if cookie secret is hex
fixes spurious message with base64 cookie secrets that start with hex subset
2017-03-27 14:02:30 +02:00
Min RK
43a6cd0bf9 Merge pull request #1039 from minrk/validate_security
prevent warnings about security in single-user servers
2017-03-27 13:58:14 +02:00
Min RK
af8965664e Merge pull request #1030 from yuvipanda/port-configurable
Tag c.Spawner.port as configurable
2017-03-27 13:39:07 +02:00
Min RK
168ad315c7 run subdomain test with localhost.jovyan
instead of relying on xip.io, which seems to be flaky sometimes
2017-03-27 12:48:10 +02:00
Min RK
66510de4e9 Merge pull request #1040 from willingc/doc-logging
Add rotating log info by @minrk to docs
2017-03-27 12:37:32 +02:00
Carol Willing
942e05888b Add rotating log info by @minrk to docs 2017-03-24 10:56:35 -07:00
Min RK
1970273c58 Merge pull request #1027 from mgeplf/form_redirect
Teach FormSpawner to handle query next=/path/to/landing
2017-03-24 15:56:58 +01:00
Min RK
06d081a73b prevent warnings about security in single-user servers
single-user warns if no token or password is set unless validate_security is overridden

these checks are not relevant when using JupyterHub
2017-03-24 13:14:18 +01:00
Min RK
352efa6d47 Merge pull request #1036 from yuvipanda/none-cmd
Allow setting spawner.cmd to None
2017-03-24 11:32:19 +01:00
Min RK
586dc3868d describe when setting port config makes sense
only in containers / remote servers
2017-03-24 11:14:18 +01:00
yuvipanda
0fe149dd57 Allow setting spawner.cmd to None
In some spawners you want to unset .cmd - for example, in
KubeSpawner setting it to None will use the CMD metadata that
is set in the Docker Image. Currently there's no way to set a
None value - you can't set it to [] either. Treating None and
empty values as separate is a useful thing to have.
2017-03-23 16:49:50 -07:00
yuvipanda
688845b907 Tag c.Spawner.port as configurable
Fixes #1029
2017-03-18 17:25:57 -07:00
Mike Gevaert
21af37a7a3 Teach FormSpawner to handle query next=/path/to/landing
* before, if /user-redirect/ was used, or if ?next=/path/
  and there was a FormSpawner, the query param would be lost
2017-03-17 14:00:15 +01:00
Carol Willing
6078b8d9e5 Merge pull request #1025 from barrachri/correct_named_servers
correct self.allow_multiple_servers to self.allow_named_servers
2017-03-16 18:30:17 -07:00
Christian Barra
bfe1457897 fix after test fail 2017-03-17 01:53:04 +01:00
Christian Barra
f873b77a5f correct self.allow_multiple_servers to self.allow_named_servers 2017-03-17 01:15:47 +01:00
Min RK
be1af58147 Merge pull request #1016 from yuvipanda/accessibility
Hide the logout icon from screen readers
2017-03-09 13:45:38 -08:00
Min RK
2b8268f1d4 Merge pull request #1015 from willingc/aws-config
[DOC] Integrate AWS example into doc
2017-03-09 13:44:44 -08:00
Min RK
6cc3cd325c Merge pull request #1014 from willingc/galler
[DOC] Add gallery of jupyterhub deployments
2017-03-09 13:44:19 -08:00
YuviPanda
efab0dbc47 Hide the logout icon from screen readers
This makes the logout link more discoverable by screen readers,
which sort links based on what they say. Since our icon was
in front of and not behind 'Logout', someone looking for Logout
will not find this
2017-03-09 10:35:28 -08:00
Carol Willing
a5b4ed83f7 Integrate AWS example into doc 2017-03-07 16:11:29 -08:00
Carol Willing
8eed5c7709 Merge pull request #1002 from ThomasMChen/aws-setup-doc
Add AWS setup documentation.
2017-03-07 16:00:24 -08:00
Carol Willing
883d3ad29b Fix typo 2017-03-07 15:55:03 -08:00
Carol Willing
044d5d2a84 Add gallery of deployments to docs 2017-03-07 15:51:52 -08:00
Min RK
68f23b2cdf Merge pull request #1009 from jupyterhub/willingc-patch-1
Add word to docstring to improve comprehension
2017-03-05 16:03:39 -08:00
Carol Willing
91553ebe34 Add word to docstring to improve comprehension 2017-03-05 13:15:58 -08:00
Carol Willing
a45bc9b31e Merge pull request #1008 from willingc/rtd-build
Pin Python to 3.5 for RTD build
2017-03-05 12:37:20 -08:00
Carol Willing
849f52de67 Pin Python to 3.5 2017-03-05 12:28:03 -08:00
Min RK
46f9841dce Merge pull request #1007 from barrachri/contributor_list
correct barrachri
2017-03-05 09:53:08 -08:00
Christian Barra
d8213b5fa5 correct barrachri 2017-03-05 12:35:26 +01:00
Carol Willing
ee276adcf8 Merge pull request #1006 from jupyterhub/willingc-patch-1
Add Christian Barra to contributor list
2017-03-04 15:28:46 -06:00
Carol Willing
07ae847d08 Add Christian Barra to contributor list 2017-03-04 15:28:05 -06:00
Min RK
95dc4713f4 Merge pull request #942 from barrachri/multi_servers
Multiple singleuser servers
2017-03-04 14:00:53 -05:00
Christian Barra
2294dc0ad9 from multiservers to namedservers 2017-03-03 03:42:24 +01:00
Min RK
87c0d7e54f Merge pull request #1005 from prasadkatti/patch-1
minor fix in upgrade process doc
2017-03-01 15:38:59 -05:00
Prasad Katti
18238241ef minor fix 2017-03-01 12:24:55 -08:00
Min RK
192cb193a1 Merge pull request #1003 from whitead/issue_997_fix
Ensure that SERVICE_FIX has trailing slash
2017-02-27 23:20:49 +01:00
Andrew White
2fb503df17 Ensure that SERVICE_FIX has trailing slash.
Fixes Issue #997. Also updated Traitlets to 4.3.2 since the change in singleuser.py relies on trait default values being checked through validator, which was added in traitlets 4.3.2.
2017-02-27 16:34:54 -05:00
Thomas Chen
810566729d Add AWS setup documentation. 2017-02-25 21:16:06 -06:00
Christian Barra
746912cece fix *args and **kwargs 2017-02-24 00:37:41 +01:00
Christian Barra
7a38a57397 remove unused imports and correct base_url 2017-02-24 00:37:41 +01:00
Christian Barra
4fdf405d77 add JupyterHub.allow_multiple_servers 2017-02-24 00:37:41 +01:00
Christian Barra
488706293f pass server_name to the spawner 2017-02-24 00:37:41 +01:00
Christian Barra
9373325f1b fix options error and base_url 2017-02-24 00:37:40 +01:00
Christian Barra
e151248ac2 fix server_name 2017-02-24 00:37:40 +01:00
Christian Barra
b09ccc4373 fix base_url 2017-02-24 00:37:40 +01:00
Christian Barra
f4a7e28aa5 add default_server_name, change spawn start 2017-02-24 00:37:40 +01:00
Christian Barra
5b85d1e248 correct server name and base_url unique=True 2017-02-24 00:09:48 +01:00
Christian Barra
a85bc5cad4 change classes for creating/deleting a server, add server_name param for delete method 2017-02-24 00:09:48 +01:00
Christian Barra
d682edd44f use only the first 10 chars of server_url 2017-02-24 00:09:48 +01:00
Christian Barra
3524399984 fix some errors 2017-02-24 00:09:48 +01:00
Christian Barra
b127788100 add a new base for multi servers 2017-02-24 00:09:48 +01:00
Christian Barra
a823a6b371 add a name field for the server 2017-02-24 00:09:48 +01:00
Carol Willing
b47f76c037 Merge pull request #983 from minrk/config-docs
add configurable traits to api docs
2017-02-22 08:36:33 -06:00
Min RK
1d19684b2c Handle traitlets 4.x 2017-02-21 18:06:48 +01:00
Min RK
08e8c93b16 add app.rst 2017-02-20 21:44:02 +01:00
Carol Willing
a0103ebd6c Merge pull request #988 from minrk/cookie-secret-256b
use 32B hex cookie secret
2017-02-17 11:38:09 -08:00
Carol Willing
b5a600d488 Merge pull request #984 from minrk/spawner-shell
allow customization of spawn command
2017-02-17 10:43:31 -08:00
Min RK
27410a6c51 remove spurious print 2017-02-15 11:31:25 +01:00
Min RK
67d6de9f68 don't forget to yield 2017-02-15 11:30:34 +01:00
Min RK
3996fa00ef turn off database echo in tests
it's a bunch of noise
2017-02-15 11:29:48 +01:00
Min RK
42f8509287 use observer instead of validator for checking cookie length
since we aren't mutating the value
2017-02-15 10:58:16 +01:00
Min RK
11b738b837 Merge pull request #989 from willingc/update-confpyapp
Rename to mocked_app to avoid shadowing app
2017-02-15 10:56:00 +01:00
Carol Willing
576858b6ca Rename to mocked_app to avoid shadowing app 2017-02-14 18:55:02 -08:00
Carol Willing
645c2bdd4a Merge pull request #974 from willingc/travis-config
Refactor travis config for more efficient builds
2017-02-14 18:18:51 -08:00
Min RK
9ae708b367 use 32B hex cookie secret
instead of large b64 secret, which doesn't make sense for sha256

Warn about deprecated base64 secrets and too-large secrets.
2017-02-14 14:36:50 +01:00
Min RK
abf554f9cf Merge pull request #987 from yuvipanda/cookie-id-nullcheck
Make cookie_id be unique and not-null too
2017-02-14 13:02:45 +01:00
YuviPanda
9df6e76cc3 Make cookie_id be unique and not-null too
Fixes #985
2017-02-13 09:15:39 -08:00
Min RK
7afbe952e6 test
take pytest-tornado for a spin

it's nice!
2017-02-13 17:55:50 +01:00
Min RK
00aa92f7b6 add env handler to mocksu 2017-02-13 17:53:30 +01:00
Min RK
4ae264de5e allow customization of spawn command
- add shell_cmd for launching with a shell (e.g. `bash -l -c`
- add popen_kwargs for overriding keyword args passed to Popen
2017-02-13 17:51:53 +01:00
Min RK
4b987dd334 add configurable traits to api docs 2017-02-13 14:18:20 +01:00
Carol Willing
f75c4c0ba3 Edit per @minrk review 2017-02-10 10:40:57 -08:00
Carol Willing
8b4d089376 Remove extra dash in maxfail 2017-02-10 10:40:57 -08:00
Carol Willing
bd2e758b04 Add maxfail to tests to prevent travis stalls 2017-02-10 10:40:57 -08:00
Carol Willing
54e5910e45 Remove verbose tests 2017-02-10 10:40:57 -08:00
Carol Willing
5460d5748f Remove travis retry 2017-02-10 10:40:57 -08:00
Carol Willing
25d5d95a5b Remove pypy test 2017-02-10 10:40:57 -08:00
Carol Willing
8db26af57a Update conditionals 2017-02-10 10:40:57 -08:00
Carol Willing
4f29cbe81f Update travis settings 2017-02-10 10:40:57 -08:00
Min RK
0dced91495 Merge pull request #975 from willingc/cleanup-fixtures
Remove deprecated yield_fixture
2017-02-10 10:04:30 +01:00
Min RK
c02a463348 Merge pull request #978 from willingc/style-util
Add flake8 support
2017-02-10 10:03:47 +01:00
Carol Willing
a2f717fba2 Remove pylintrc for a different PR 2017-02-09 08:03:58 -08:00
Carol Willing
8973571dc0 Add pylint config file 2017-02-09 07:38:36 -08:00
Carol Willing
0fe3aacb4d Update punctuation per @minrk 2017-02-09 06:48:15 -08:00
Carol Willing
7313b4fd26 Update ignored errors in flake8 config 2017-02-09 06:15:06 -08:00
Carol Willing
5c0b3f8b34 Add spacing for user.py 2017-02-08 22:36:56 -08:00
Carol Willing
a4eb795d32 Add exclude files to flake8 config 2017-02-08 22:33:58 -08:00
Carol Willing
8e1efc2851 Remove extra space in __init__.py 2017-02-08 22:33:13 -08:00
Carol Willing
8c999907c2 Add spacing to _data.py 2017-02-08 22:26:39 -08:00
Carol Willing
cd7a31dd3c Add spacing to app.py 2017-02-08 22:23:28 -08:00
Carol Willing
b21b0427d1 Add error to flake8 config 2017-02-08 22:22:59 -08:00
Carol Willing
3a2299f7f2 Add space to auth.py 2017-02-08 22:04:53 -08:00
Carol Willing
7d5287000f Fix spacing in dbutil.py 2017-02-08 22:03:56 -08:00
Carol Willing
bc37c56742 Add error to flake8 config 2017-02-08 22:03:33 -08:00
Carol Willing
97b04d8b43 Add spacing to emptyclass.py 2017-02-08 21:58:59 -08:00
Carol Willing
5de1c078d2 Edit spacing in log.py 2017-02-08 21:49:19 -08:00
Carol Willing
021ef6e6c4 Add error to flake8 config 2017-02-08 21:47:06 -08:00
Carol Willing
69d20eb297 Edit spacing in orm.py 2017-02-08 21:46:33 -08:00
Carol Willing
4688348020 Edit spacing in singleuser.py 2017-02-08 21:38:23 -08:00
Carol Willing
cf02f3133a Correct spacing in spawner.py 2017-02-08 21:29:56 -08:00
Carol Willing
e0748540d7 Ignore errors in flake8 config 2017-02-08 21:29:35 -08:00
Carol Willing
ab3c28e46a Correct spacing in traitlets.py 2017-02-08 21:19:55 -08:00
Carol Willing
13ae12b57d Correct style spacing 2017-02-08 21:18:12 -08:00
Carol Willing
222cdc7f79 Add config file for flake8 2017-02-08 21:17:46 -08:00
Carol Willing
e8a1d2f1bd Clean up docstring errors 2017-02-08 20:53:53 -08:00
Carol Willing
5245670af1 Remove deprecated yield_fixture; add docstrings 2017-02-08 14:16:36 -08:00
Carol Willing
6b83d516a7 Merge pull request #976 from minrk/no-token-pop
Don't pop token env in single-user servers
2017-02-08 14:03:02 -08:00
Carol Willing
b72562e805 Merge pull request #971 from minrk/token-page
Add page for requesting tokens
2017-02-08 13:57:45 -08:00
Min RK
0b964c8358 Don't pop token env in single-user servers
Users should be allowed to access their own tokens to talk to the Hub API.
2017-02-08 22:31:18 +01:00
Min RK
d61f9547fe Merge pull request #973 from apetresc/patch-1
Update traitlets dependency to 4.3
2017-02-08 22:24:25 +01:00
Adrian Petrescu
78360608b1 Update traitlets dependency
Fixes #972. Currently, Jupyterhub actually has a hard requirement on the 4.3 traitlets API, otherwise you'll run into the crash described in that issue for any traitlets version older than that.
2017-02-08 11:21:23 -05:00
Min RK
2a25e3cb89 replace existing get_token tests 2017-02-08 16:46:50 +01:00
Min RK
f3b7fda4a8 it's JupyterHub
not Jupyter Hub
2017-02-08 14:43:11 +01:00
Min RK
6c6d070b16 minor html cleanup 2017-02-08 14:42:41 +01:00
Min RK
eec0a11ef0 add POST /authorizations/token to rest API docs 2017-02-08 14:39:13 +01:00
Min RK
2b262f453d test requesting token via API 2017-02-08 14:32:19 +01:00
Min RK
c2b494f702 put nav in the header
reduce custom css, use more bootstrap variables.

Admin link is now in the heading rather than the list of big buttons
2017-02-08 14:19:35 +01:00
Min RK
958ee00efd Add /token page with a button for requesting new tokens 2017-02-08 14:16:11 +01:00
Min RK
363354d941 allow POST /authorizations/token to request new tokens 2017-02-08 13:39:46 +01:00
Carol Willing
074ea61514 Merge pull request #969 from minrk/logout-redirect
redirect to `/hub/login` to avoid automatically starting login process
2017-02-03 08:17:19 -08:00
Min RK
abc59d3d30 redirect logout page to login page directly
instead of relying on root redirect
2017-02-03 12:55:45 +01:00
Min RK
fea683f992 redirect root to /hub/login instead of authenticator.login_url
/hub/login always renders a page,
whereas `authenticator.login_url` may automatically log the user in via redirects,
causing logout to appear not to work, as redirects immediately cause login again.
2017-02-03 12:51:03 +01:00
Min RK
3402f4f514 Merge pull request #966 from minrk/service-token-auth
support service tokens in HubAuth
2017-02-01 13:11:32 +01:00
Carol Willing
3bb82ea330 Merge pull request #949 from willingc/test-mock
Refactor test classes used to mock services
2017-01-27 05:43:29 -08:00
Carol Willing
bced09e5b3 Add file docstring from @minrk 2017-01-27 05:19:05 -08:00
Carol Willing
9e84402f42 Edit docstrings to clarify handlers are not mocked 2017-01-27 04:58:29 -08:00
Min RK
18c65453fd Merge pull request #965 from willingc/test-proxy
Refactor proxy tests
2017-01-27 13:40:28 +01:00
Carol Willing
57ed99020f Edit comment 2017-01-27 04:19:43 -08:00
Carol Willing
caa3b0c438 Parameterize test values 2017-01-27 04:14:51 -08:00
Carol Willing
5133cf0275 Add some comments 2017-01-27 04:14:51 -08:00
Carol Willing
7f6c080b46 Fix pep8 errors 2017-01-27 04:14:51 -08:00
Carol Willing
142907395f Use pytest parameterize for proxy tests; fix spacing 2017-01-27 04:14:51 -08:00
Min RK
43d069438e Merge pull request #956 from willingc/test-api
Refactor API tests
2017-01-27 10:36:14 +01:00
Carol Willing
e7b73c4f53 Add docstrings and remove request_received 2017-01-26 13:58:38 -08:00
Carol Willing
f2ca0a2372 Implement all methods for classes that inherit from abstract class 2017-01-26 12:54:11 -08:00
Carol Willing
021cfe446f Fix formatting on a few requests 2017-01-26 12:41:39 -08:00
Carol Willing
1a71c906d5 Revert "Relax line length for requests" 2017-01-26 12:26:02 -08:00
Carol Willing
10d2eb6449 Return to original style for line length for requests 2017-01-26 12:20:19 -08:00
Carol Willing
0f283e088e Fix minor formatting 2017-01-26 12:17:11 -08:00
Carol Willing
025977f19a Clean up vertical spacing 2017-01-26 12:17:11 -08:00
Min RK
2a9ba788d0 shorten date_fmt in tests
reduces log prefix length a bit in test output
2017-01-26 11:52:59 +01:00
Min RK
aa65266726 support services in HubAuth 2017-01-26 11:52:40 +01:00
Min RK
4b6c58292b add 'kind' field to user and group models 2017-01-26 11:48:20 +01:00
Min RK
d0813cc736 support service tokens in /api/authorizations 2017-01-26 10:44:25 +01:00
Min RK
f1d7e5e779 Merge pull request #961 from minrk/get-user-simplified
Enable token authentication in HubAuth
2017-01-26 09:55:35 +01:00
Min RK
66f01fc880 set login url on hub_auth 2017-01-25 22:58:10 +01:00
Min RK
d93384536f clarify some things
- cleanup docstrings
- more comments
- rename cookie_cache to cache, since it's not a cache of cookies
2017-01-25 17:10:14 +01:00
Min RK
69250db70e support token authentication in HubAuth.get_user
in Authorization header or `?token` parameter

enables token authentication in single-user server based on notebook >= 4.3 as well
2017-01-25 13:53:36 +01:00
Min RK
ad52398087 add get_login_url to HubAuthenticated
needed for tornado's default redirect
2017-01-25 13:52:14 +01:00
Min RK
4f1eec31a1 more code consolidation in HubAuth
consolidates duplicate code in user_for_cookie and user_for_token
into _check_hub_authorization
2017-01-25 13:50:20 +01:00
Min RK
43c02740ab Merge pull request #960 from DeepHorizons/get_user_by_token
Added user_for_token method, moved r check into its own function
2017-01-25 10:39:01 +01:00
Joshua Milas
4605f74cf9 Fixed missing variable 2017-01-24 11:49:18 -05:00
Joshua Milas
9ab4b35f22 Changed error message to be more generic 2017-01-24 11:47:52 -05:00
Min RK
e9784f0e69 Merge pull request #959 from willingc/test-typo
Add missing assert to test
2017-01-24 13:27:51 +01:00
Min RK
3e37d0a39b Merge pull request #958 from willingc/add-badges
Edit README content and update formatting
2017-01-24 13:14:57 +01:00
Min RK
44ae162f09 Merge pull request #955 from willingc/test-services
Refactor services tests
2017-01-24 13:13:15 +01:00
Joshua Milas
2821b9a832 Added user_for_token method, moved r check into its own function 2017-01-23 21:12:40 -05:00
Carol Willing
cf97247f75 Add missing assert to test 2017-01-23 08:33:48 -08:00
Carol Willing
1bb40e2be1 Add built-in spawner to table 2017-01-23 08:09:00 -08:00
Carol Willing
869db9e31c Edit content and update formatting 2017-01-22 21:00:58 -08:00
Carol Willing
39ee52ad3c Refactor services tests 2017-01-20 23:13:09 -08:00
Carol Willing
7e699af2b5 Merge pull request #953 from willingc/covfix
Rename test class to stub class to allow pytest collection

Closes #952
2017-01-20 14:52:39 -08:00
Min RK
2b344cc717 Merge pull request #950 from willingc/travis36
Add Python versions to Travis
2017-01-20 11:25:17 -10:00
Carol Willing
246f0bc442 Omit alembic directory from report 2017-01-20 12:30:46 -08:00
Carol Willing
4afb659f44 Omit travis site-packages directory from report 2017-01-20 12:25:33 -08:00
Carol Willing
a43069fc35 Correct syntax in coverage command 2017-01-20 11:35:39 -08:00
Carol Willing
5b43266278 Update coverage setting to ignore test directory 2017-01-20 11:26:19 -08:00
Carol Willing
5df16371e1 Rename class used in test cases to StubSingleUserSpawner 2017-01-20 10:49:59 -08:00
Carol Willing
c086f05c7c Rename test class to allow pytest to collect tests 2017-01-20 10:49:59 -08:00
Carol Willing
7a38857bcd Add Python versions to Travis 2017-01-20 08:32:52 -08:00
Min RK
e860925f57 Merge pull request #944 from barrachri/fix_patch_post_#941
check name collisions on rename
2017-01-19 10:38:38 -10:00
Christian Barra
3808067dd7 better docs 2017-01-19 10:57:18 +01:00
Min RK
c7d7dec40d Merge pull request #939 from minrk/service-logs
more debugging and health checks for services
2017-01-18 16:19:01 -10:00
Christian Barra
e96e0acc9f more pythonic 2017-01-19 03:05:28 +01:00
Min RK
3efd2398ca review comments 2017-01-18 16:03:05 -10:00
Christian Barra
7284ef6e06 change from username to name 2017-01-19 02:35:42 +01:00
Christian Barra
f5dc3ad753 fix to have unique username value 2017-01-19 02:30:04 +01:00
Christian Barra
fc0d0031bf typo correct 2017-01-16 17:03:47 +01:00
Min RK
d44ee4b8fa Merge pull request #937 from minrk/service-chdir
Don't set cwd to user's home for services
2017-01-16 15:39:20 +01:00
Min RK
eb5e755aa6 more debugging and health checks for services
- log that external services are added (helps catch accidental external services due to missing fields)
- check connectivity of services with web endpoints periodically
2017-01-16 15:36:11 +01:00
Min RK
6fc9e90f28 Don't set cwd to user's home for services
allow `cwd` setting to take effect
2017-01-15 20:10:06 +01:00
Min RK
2effd3da16 Merge pull request #933 from DeepHorizons/fix_service_help
Fixed help and documentation related to service tokens
2017-01-15 20:08:41 +01:00
Min RK
69230b1147 Merge pull request #936 from barrachri/add_grant_cookie_admin_services
Allow services to request admin-access
2017-01-15 20:08:06 +01:00
Christian Barra
5435bf3ec4 add api_token to services' properties 2017-01-15 13:36:36 +01:00
Christian Barra
b0b13bfcb9 fix AttributeError when a service ask for a cookie 2017-01-14 05:48:07 +01:00
Joshua Milas
c3b0b2ecf0 Fixed help and documentation related to service tokens
The documentation stated that the key `token` should be used to specify
the pregenerated token in `JupyterHub.services`. This is wrong as the key
should be `api_token`.

This changes the help on the trait, along with changing the module
docstring in `service.py`.
2017-01-13 17:45:42 -05:00
Min RK
a276421d25 Merge pull request #907 from barrachri/adding_multi_server_features_orm
Allow users to have multiple servers (in db)
2017-01-11 15:19:47 +01:00
Christian Barra
dbb6303bdc update and test with version 0.7.2 2017-01-11 14:02:11 +01:00
Christian Barra
d28036e173 fix docstrings 2017-01-11 12:27:30 +01:00
Carol Willing
bc3f1cae16 Merge pull request #931 from jupyterhub/willingc-patch-1
Correct links for changelog
2017-01-10 07:38:09 -08:00
Carol Willing
5e84d0c2b3 Correct links for changelog
Update links for 0.7.2 and Unreleased titles
2017-01-10 07:23:39 -08:00
Min RK
086f88852d back to dev 2017-01-10 16:15:01 +01:00
Min RK
aa132cade7 release 0.7.2 2017-01-10 16:12:45 +01:00
Carol Willing
dd35ffbe86 Merge pull request #928 from minrk/0.7.2
Changelog for 0.7.2
2017-01-09 16:18:12 -08:00
Min RK
8edcf8be81 Changelog for 0.7.2 2017-01-09 12:45:16 +01:00
Christian Barra
11196443ac remove relationship, fix some typo 2017-01-06 22:15:51 +01:00
Min RK
29b02b7bcb Merge pull request #927 from willingc/clarify-whitelist
Add better prose for removing users
2017-01-06 20:25:01 +01:00
Carol Willing
0383bc27b2 Add better prose for removing users 2017-01-06 08:52:48 -08:00
Carol Willing
65d5102b49 Merge pull request #926 from minrk/singleuser-service-defaults
support service env vars in singleuser entrypoint
2017-01-06 08:28:48 -08:00
Min RK
8a226e6f46 simplify singleuser-service examples
now that service env vars are respected
2017-01-06 17:21:28 +01:00
Min RK
0bd34e0a10 support service env variables in singleuser
and set a few sensible defaults where they are known/likely
2017-01-06 17:21:10 +01:00
Min RK
186107d959 cache HubAuth user per request 2017-01-06 17:19:10 +01:00
Carol Willing
91b07b7ea4 Merge pull request #924 from minrk/singleuser-service-example
singleuser-server service example
2017-01-06 08:10:34 -08:00
Min RK
f5b30fd2b4 move version requirement further up 2017-01-06 16:57:13 +01:00
Min RK
0234396c2c Merge pull request #922 from yuvipanda/fix-user-redirect
Pass query params through with user-redirect
2017-01-06 13:31:23 +01:00
Min RK
a43d677ae4 add external-service shared notebook example 2017-01-06 13:30:53 +01:00
Min RK
dcfe71e7f0 add managed notebook service example 2017-01-06 13:30:53 +01:00
Min RK
5d41376c2e use JUPYTERHUB_API_TOKEN env in Spawner
to be more consistent with services

deprecate JPY_API_TOKEN, but keep it around for compatibility
2017-01-06 13:30:53 +01:00
Min RK
dd083359ec Merge pull request #925 from minrk/fix-hub-group-auth
[HubAuth] Fix group authentication for services
2017-01-06 13:30:30 +01:00
Min RK
e6d54960ba test group whitelist checking 2017-01-06 13:24:40 +01:00
Min RK
a9295bc5c2 more debug logging for Hub auth 2017-01-06 13:24:40 +01:00
Min RK
2015c701fa HubAuth services: fix group authentication checking
If group authentication checking was enabled, any user would be allowed
2017-01-06 13:24:40 +01:00
YuviPanda
3e9c18f50a Pass query params through with user-redirect 2017-01-05 17:18:36 -08:00
Min RK
7cac874afc Merge pull request #919 from ellisonbg/nbserver-group
Adding group to single user server for group based auth
2017-01-05 14:37:20 +01:00
Brian E. Granger
a7b6bd8d32 Adding group to single user server for group based auth 2017-01-04 20:12:34 -07:00
Min RK
1649a98656 2017 typo 2017-01-03 15:55:39 +01:00
Christian Barra
6694cb42c8 remove pep8 corrections 2017-01-03 14:30:36 +01:00
Christian Barra
b6e293c38e update to the last jupyterhub version 2017-01-03 14:22:12 +01:00
Christian Barra
02090c953b fix errors, remove pep8 corrections 2017-01-03 14:10:46 +01:00
Min RK
ecbe51f60f signaling typo 2017-01-02 14:50:10 +01:00
Min RK
fed14abed3 back to dev 2017-01-02 14:44:07 +01:00
Min RK
94978ea9e0 release 0.7.1 2017-01-02 13:53:43 +01:00
Min RK
bf6999e439 changelog for 0.7.1 2017-01-02 13:53:43 +01:00
Carol Willing
020ee7378f Merge pull request #916 from rachmaninovquartet/master
Added Toree troubleshooting to docs
2016-12-22 13:56:51 -08:00
Min RK
e4a0569961 Merge pull request #915 from jupyterhub/willingc-patch-1
Update README to clarify docker image contents
2016-12-22 16:43:02 +01:00
Ian Maloney
4ff525d5bd updated docs/source/troubleshooting.md per conversation with @willingc in issue 889 2016-12-21 15:21:50 -05:00
Carol Willing
37a31b01b2 Update README to clarify docker image contents
Addresses #879 and #772 re: confusion about the docker image contents
2016-12-21 10:46:30 -08:00
Carol Willing
1604cb1b0b Merge pull request #914 from minrk/update-bootprint
fix rest-api doc building
2016-12-21 10:29:08 -08:00
Min RK
45702ac18c update bootprint to 0.10
0.8 has stopped working for some reason
2016-12-21 14:51:12 +01:00
Min RK
c81e9d60e4 fix rest-api link
link to REST API, not Python API
2016-12-21 14:51:12 +01:00
Carol Willing
224865b894 Merge pull request #910 from minrk/cleanup-server-token
Avoid cleaning up API tokens for Spawners that will resume
2016-12-20 08:29:06 -08:00
Min RK
3b3bc8224b comment review 2016-12-20 16:41:26 +01:00
Carol Willing
c56dc2ea6f Merge pull request #911 from jjaraalm/master
Update Service Docs

Closes #908
2016-12-19 10:28:30 -08:00
jjaraalm
62202bbb74 Revert "Revert "Update service docs""
This reverts commit 7ba28c0207.
2016-12-19 13:00:48 -05:00
jjaraalm
7ba28c0207 Revert "Update service docs"
This reverts commit 9392a29dad.
2016-12-19 12:59:42 -05:00
jjaraalm
9392a29dad Update service docs
Fixes #908
2016-12-19 12:56:26 -05:00
Min RK
72ab8f99ec Avoid cleaning up API tokens for Spawners that will resume
in which case the previous API token should be left alone.
2016-12-19 10:50:25 +01:00
Min RK
fcf32c7e50 Merge pull request #909 from willingc/update-travis
Add 3.6 to travis
2016-12-19 09:59:47 +01:00
Carol Willing
da451d6552 Add 3.6 to travis 2016-12-18 21:26:52 -08:00
Christian Barra
dbe8bf5428 add users_servers class in orm.py, correct test_orm.py, fix some pep8, issue #766 2016-12-17 04:55:00 +01:00
Carol Willing
662b1a4d4a Merge pull request #902 from minrk/redirect-empty-msg
Don't warn about empty next_url
2016-12-09 08:04:56 -08:00
Min RK
732adea997 Don't warn about empty next_url
empty next_url is fine
2016-12-09 15:34:32 +01:00
Carol Willing
7e1dbf3515 Merge pull request #896 from minrk/whitelist-warning
Warn about single-character names in whitelist
2016-12-05 11:16:30 -06:00
Min RK
65b92ec246 Warn about single-character names in whitelist
likely cause is `set('string')` typo instead of `set(['string'])`,
so include that in the error message:

    whitelist contains single-character names: ['i', 'k', 'm', 'n', 'r']; did you mean set(['ikmnr']) instead of set('ikmnr')?
2016-12-05 09:46:52 +01:00
Min RK
dc42ee4779 typo in changelog link 2016-12-02 18:12:28 +01:00
Min RK
c04441c1b2 back to dev 2016-12-02 18:08:03 +01:00
Min RK
c3faef8e2a release 0.7.0 2016-12-02 18:02:20 +01:00
Carol Willing
d2175635af Merge pull request #895 from minrk/release-0.7
Update changelog for 0.7 final
2016-12-02 10:47:21 -06:00
Min RK
1f7401cd14 Update changelog for 0.7 final 2016-12-02 17:35:19 +01:00
Min RK
c94b3e34d2 Merge pull request #894 from minrk/disable-token
disable unused token on singleuser-server
2016-12-02 17:01:50 +01:00
Carol Willing
566e1d05ea Merge pull request #893 from minrk/expanduser
call expanduser on singleuser notebook_dir
2016-12-01 21:53:24 -06:00
Min RK
0488d0bd73 call expanduser on singleuser notebook_dir
This copies validate_notebook_dir from notebook with one addition:
calling expanduser.
2016-12-01 22:04:18 +01:00
Min RK
ca31d9b426 disable token on singleuser-server
fixes confusing output about token access in notebook server startup
2016-12-01 21:59:44 +01:00
Min RK
8721f9010f Merge pull request #892 from yuvipanda/maybe-async
Document that authenticator's add_user maybe a coroutine
2016-12-01 17:58:02 +01:00
YuviPanda
88de48ebac Document that authenticator's add_user maybe a coroutine 2016-12-01 19:31:23 +05:30
Min RK
d5a6e2b2ac Merge pull request #886 from yuvipanda/spawner-docs 2016-11-30 13:48:05 +01:00
Min RK
2152a94156 review pass on spawner docstring changes
- small wording, spelling tweaks
- rst formatting fixes
- remove some spurious, cluttering newlines
- clearer traitlets default values on first line
2016-11-30 13:43:59 +01:00
Min RK
bc3824e9bf review pass on auth docstrings 2016-11-30 13:22:07 +01:00
YuviPanda
60bc92cf78 Spawner doc fixes per @willingc 2016-11-30 14:02:02 +05:30
YuviPanda
3b15467738 Clearer module docstring for spawner.py 2016-11-29 16:26:34 +08:00
YuviPanda
4970fe0a1c Add more docs for spawner base class 2016-11-29 16:25:15 +08:00
YuviPanda
7dbe2425b8 Fix typo 2016-11-29 16:00:25 +08:00
YuviPanda
433d44a642 Add docs for PAMAuthenticator 2016-11-29 15:58:35 +08:00
YuviPanda
7733d320d0 Add more docs to LocalAuthenticator 2016-11-29 15:56:16 +08:00
YuviPanda
20d367c2a8 Add more docs for authenticator base class 2016-11-29 15:55:32 +08:00
YuviPanda
4687fbe075 Add extended docs for LocalProcessSpawner too 2016-11-28 23:07:54 -08:00
YuviPanda
b0dc52781e Add info about shell expansion to cmd / args traitlets
We should probably standardize this too
2016-11-28 22:45:06 -08:00
YuviPanda
4f1f7d6b8f Add example use for default_url traitlet 2016-11-28 22:42:10 -08:00
YuviPanda
41f8608f4e Fix port config documentation to match reality 2016-11-28 22:41:47 -08:00
Min RK
ba3a8f2e76 Merge pull request #887 from yuvipanda/rename-spec
Rename MemorySpecification to ByteSpecification
2016-11-28 10:27:41 +01:00
YuviPanda
12e3a5496d Rename MemorySpecification to ByteSpecification 2016-11-27 17:57:34 -08:00
YuviPanda
280644bab5 Expand traitlet documentation for spawner base class 2016-11-27 17:53:41 -08:00
Carol Willing
bf28371356 Merge pull request #882 from minrk/alembic.ini
add alembic.ini to package_data
2016-11-22 08:10:43 -08:00
Carol Willing
ce237181f2 Merge pull request #881 from minrk/more-allow-async-whitelist
handle async check_whitelist in app
2016-11-22 07:46:27 -08:00
Min RK
85ca5a052e add alembic.ini to package_data 2016-11-22 16:21:03 +01:00
Min RK
db8b3dbce9 handle async check_whitelist in app
follow-up to previous PR
2016-11-22 16:06:08 +01:00
Min RK
9c2d56f015 Merge pull request #876 from jbweston/bugfix/whitelist-coroutine
allow `check_whitelist` to be a coroutine
2016-11-22 09:56:28 +01:00
Joseph Weston
d244a1e02f allow check_whitelist to be a coroutine
Some authenticators may have whitelist checking that requires
async operations.
2016-11-21 16:14:02 +01:00
Min RK
9f134277a9 Merge pull request #872 from jupyterhub/willingc-patch-1
Change py.test to newer convention of pytest
2016-11-16 10:18:15 +01:00
Carol Willing
ef9aca7bcb Change py.test to newer convention of pytest 2016-11-15 14:13:03 -08:00
Min RK
32f39f23eb Merge pull request #871 from jupyterhub/willingc-patch-1
Add info on tests to README
2016-11-15 20:39:59 +01:00
Carol Willing
c9b2beb821 Add info on tests to README 2016-11-15 06:35:39 -08:00
Min RK
e9ad82e350 release 0.7b1 2016-11-12 18:36:36 -08:00
Min RK
347dd3cc0f prune docs/node_modules 2016-11-12 18:36:30 -08:00
Min RK
798346dbe8 Merge pull request #869 from willingc/doc-service
Edit Services doc content
2016-11-12 18:28:24 -08:00
Carol Willing
fd94c6de17 Fix missing link target 2016-11-12 18:16:59 -08:00
Carol Willing
3fc6fc32c5 Add review comment by @parente 2016-11-12 18:07:17 -08:00
Carol Willing
a1b6aa5537 Add troubleshooting commands 2016-11-12 18:01:53 -08:00
Carol Willing
f9965bb3c3 Add example of Service per @parente 2016-11-12 17:37:30 -08:00
Carol Willing
541997371c Fix broken or changed links 2016-11-12 17:17:00 -08:00
Carol Willing
522c3e5bee Edit Services doc content 2016-11-12 16:54:57 -08:00
Carol Willing
1baf434695 Merge pull request #868 from minrk/more-changes
Add a few more things in the changelog
2016-11-12 13:40:16 -08:00
Carol Willing
92db71f293 Merge pull request #867 from minrk/upgrade-db-backup
backup db file during upgrade-db
2016-11-12 13:39:39 -08:00
Min RK
b985f8384d Add a few more things in the changelog 2016-11-12 12:54:44 -08:00
Min RK
4c2d049e70 backup db file during upgrade-db 2016-11-12 12:44:59 -08:00
Carol Willing
605c4f121c Merge pull request #866 from parente/note-about-db-secrets
Add two short notes about db security
2016-11-12 12:03:21 -08:00
Peter Parente
4baf5035cb Reflow markdown for easier editing 2016-11-12 11:57:45 -08:00
Peter Parente
f8a57eb7d9 Add two short notes about db security 2016-11-12 11:49:17 -08:00
Min RK
93ac343493 Merge pull request #865 from willingc/doc-tidbits
Add documentation prior to 0.7 beta
2016-11-12 11:40:53 -08:00
Carol Willing
dc092186f0 Edit example for clarity 2016-11-12 11:27:36 -08:00
Carol Willing
6b7c319351 Add intro and standardize code format 2016-11-12 11:15:44 -08:00
Carol Willing
ef5885f769 Make minor edits 2016-11-12 11:15:02 -08:00
Peter Parente
0ffd53424d Merge pull request #861 from willingc/issuetempl
Add initial issue template
2016-11-11 13:36:11 -08:00
Carol Willing
5f464d01b4 Soften tone 2016-11-11 10:44:20 -08:00
Yuvi Panda
0a054cc651 Merge pull request #858 from willingc/post855-edits
Reflow text and minor edits following PR #855
2016-11-11 09:54:14 -08:00
Carol Willing
348af48d45 Merge pull request #863 from minrk/checklist-checklist
Make the release checklist a GFM checklist
2016-11-11 09:31:47 -08:00
Min RK
4d03c00dab Make the release checklist a GFM checklist
so we can paste into a new issue when preparing for a release
2016-11-11 09:14:07 -08:00
Min RK
7a71074a55 Merge pull request #860 from willingc/release-checklist
Add a high-level release checklist
2016-11-11 08:23:12 -08:00
Carol Willing
5527a3e7dd Fix spacing 2016-11-11 07:39:23 -08:00
Carol Willing
f961800fa4 Add troubleshoot command per @parente review 2016-11-11 07:37:43 -08:00
Peter Parente
adbf961433 Merge pull request #859 from willingc/contrib-thanks
Update contributor thank you list
2016-11-11 07:30:02 -08:00
Carol Willing
73e130cb2c Add initial issue template 2016-11-11 07:03:05 -08:00
Carol Willing
a44f178b64 Fix typo 2016-11-11 03:56:42 -08:00
Carol Willing
057fe32e3b Add release checklist 2016-11-11 03:54:33 -08:00
Carol Willing
cad9ffa453 Update contributor thank you list 2016-11-11 03:29:42 -08:00
Carol Willing
a11193a240 Reflow text and minor edits 2016-11-11 03:13:51 -08:00
Carol Willing
ea61a580b3 Merge pull request #855 from yuvipanda/limits-env
Add docs for the LIMIT_ and GUARANTEE_ conventions
2016-11-11 02:43:05 -08:00
Min RK
0bf6db92dd typo in example 2016-11-10 17:07:48 -08:00
YuviPanda
b0f38e7626 Fix docs to match reality 2016-11-10 14:38:09 -08:00
YuviPanda
0f237f28e7 Rename the env variables
Match the traitlet names
2016-11-10 14:37:50 -08:00
YuviPanda
d63bd944ac Add clarifying comment about limit / guarantee env variables 2016-11-10 10:39:44 -08:00
YuviPanda
54e28d759d Some inline doc fixups 2016-11-10 10:31:04 -08:00
YuviPanda
a00c13ba67 Set allow_none=True for limit/guarantee floats 2016-11-09 09:41:54 -08:00
YuviPanda
b4bc5437dd Set allow_none = True as default for MemorySpecification 2016-11-08 22:43:47 -08:00
Min RK
13bc0397f6 Merge pull request #767 from willingc/upgrade723
Add document on upgrading JupyterHub and its db
2016-11-08 18:13:27 -08:00
YuviPanda
9eb30f6ff6 Add resource limits / guarantees consistently to jupyterhub
- Allows us to standardize this on the spawner base class,
  so there's a consistent interface for different spawners
  to implement this.
- Specify the supported suffixes and various units we accept
  for memory and cpu units.
- Standardize the way we expose resource limit / guarantees
  to single-user servers
2016-11-08 17:17:10 -08:00
YuviPanda
17f20d8593 Add docs for the LIMIT_ and GUARANTEE_ conventions
https://github.com/jupyterhub/jupyterhub/issues/854 has
rationale for why, and links to PRs.
2016-11-08 16:19:25 -08:00
Carol Willing
cd23e086a8 Add an upgrade checklist 2016-11-08 12:04:57 -08:00
Carol Willing
03087f20fe Add additional database content from @minrk review 2016-11-08 11:51:42 -08:00
Carol Willing
f536eb4629 Change title 2016-11-08 10:50:49 -08:00
Carol Willing
f3e814aa8a Minor edits 2016-11-08 10:50:49 -08:00
Carol Willing
5fb0a6dffe Add note on databases 2016-11-08 10:50:49 -08:00
Carol Willing
c7ba86d1d8 Add upgrade instructions 2016-11-08 10:50:49 -08:00
Carol Willing
38dcc694b7 Add shutdown and upgrade steps 2016-11-08 10:50:49 -08:00
Carol Willing
fdfffefefa Update process steps 2016-11-08 10:50:49 -08:00
Carol Willing
4e7704afd9 Edit heading levels 2016-11-08 10:50:49 -08:00
Carol Willing
b52fcf4936 Add structure to upgrading doc 2016-11-08 10:50:49 -08:00
Carol Willing
539be2f08e Add basics for alembic 2016-11-08 10:50:49 -08:00
Carol Willing
29b2836c50 Add wip upgrade doc 2016-11-08 10:50:49 -08:00
Min RK
3a757d003a Merge pull request #852 from parente/use-conda-forge
[WIP] Update Dockerfile
2016-11-08 09:58:36 -08:00
Peter Parente
236802be1f Update Dockerfile
* Use nodejs, CHP from condaforge
* Bump the version of conda used
2016-11-07 18:46:04 -08:00
Carol Willing
4a2c9e97c6 Merge pull request #844 from willingc/secure-doc
Reflow text in websecurity doc
2016-11-01 15:15:16 -07:00
Carol Willing
0444d8465c Reflow text in doc 2016-11-01 14:27:49 -07:00
Carol Willing
faef34e4ff Merge pull request #838 from minrk/ensure-strings
quotes around single-user CLI args
2016-11-01 14:05:56 -07:00
Carol Willing
c174ec42f0 Merge pull request #842 from minrk/generate-path-error
finish error message when generate-config path does not exist
2016-11-01 09:26:52 -07:00
Min RK
d484728de9 check directory existence when writing config file
rather than file

and put output on stderr with exit message
2016-11-01 14:47:44 +01:00
Min RK
7da7f7e074 quotes around single-user CLI args
avoids mishandling things such as integer-literals
2016-11-01 12:07:25 +01:00
Min RK
53bdcd7d74 Merge pull request #840 from parente/clear-services-cookie
Fix jupyter-services cookie reset on logout
2016-10-31 13:25:43 +01:00
Peter Parente
1849964699 Fix jupyter-services cookie reset on logout
It currently remains set after logout from the hub allowing the user to
continue to access any services.
2016-10-30 22:36:31 -04:00
Carol Willing
5163c7a97f Merge pull request #824 from minrk/allow-empty-state
Don't assume empty state means not running
2016-10-27 08:33:54 -07:00
Min RK
b9daef9947 docstring review 2016-10-27 11:41:23 +02:00
Carol Willing
f16e0488ab Merge pull request #837 from Scrypy/issue-821
Updated authenticators and spawner docs
2016-10-26 15:44:09 -07:00
Daniel Martinez
adc16be4dc Updated spawners docs 2016-10-26 16:50:25 -05:00
Daniel Martinez
3e4b4149de Updated authenticators docs 2016-10-26 16:48:15 -05:00
Min RK
c392bae7e4 Merge pull request #835 from willingc/check-return
Edit model check to be consistent for user and group
2016-10-26 23:25:24 +02:00
Carol Willing
2e5373aa37 Edit model check to be consistent for user and group 2016-10-26 12:03:53 -07:00
Min RK
5412cd414f Merge pull request #832 from willingc/replace-warn
Use warning instead of warn for logs
2016-10-26 13:26:41 +02:00
Carol Willing
d957c5158f Use warning instead of warn for logs 2016-10-26 04:06:29 -07:00
Carol Willing
4a622cb964 Merge pull request #831 from jupyterhub/willingc-patch-1
Remove duplicate word in docstring
2016-10-26 02:24:39 -07:00
Carol Willing
69e721de46 Remove duplicate word in docstring 2016-10-26 02:19:49 -07:00
Carol Willing
f3f130f452 Merge pull request #830 from minrk/services-todo
Flesh out custom services examples
2016-10-26 02:16:39 -07:00
Min RK
fd4a04e3f3 docs review 2016-10-26 10:22:54 +02:00
Min RK
85c040ab8e flesh out custom services doc 2016-10-25 13:28:13 +02:00
Min RK
2bb4cd4739 allow HubAuthenticated to check groups 2016-10-25 13:27:57 +02:00
Min RK
4c3b134f10 add flask whoami service
for a non-tornado example
2016-10-25 13:24:46 +02:00
Carol Willing
bb8536b553 Merge pull request #826 from Scrypy/issue-822
Updated spawner docs
2016-10-24 23:21:00 -07:00
Carol Willing
8998fd480c Merge pull request #829 from Todd-Z-Li/issue-823
Added funky ascii art to previous TODO messages.
2016-10-24 18:40:25 -07:00
Carol Willing
d948fed0b5 Merge pull request #828 from temogen/deldoc
Deleted IPython from howitworks doc.
2016-10-24 18:38:17 -07:00
Daniel Anthony Noventa
fcfe6314ac Delted IPython from howitworks docs. 2016-10-24 19:13:57 -05:00
Todd
dcfe2aa792 Added funky ascii art to previous TODO messages. 2016-10-24 19:03:21 -05:00
Danowsky
85790ab9d8 Updated spawner docs 2016-10-24 18:57:17 -05:00
Min RK
adda2fcd90 Don't assume empty state means not running
Some Spawners may not need state,
and they should be allowed to resume on Hub restart as well.

Adds some detail about when .poll may be called and how it should behave in less obvious circumstances
2016-10-21 16:28:40 +02:00
Min RK
5604e983db Merge pull request #818 from minrk/unmanaged-no-start
don’t try to start unmanaged services
2016-10-19 10:44:14 +02:00
Min RK
386563a10a don’t try to start unmanaged services 2016-10-18 16:18:03 +02:00
Min RK
0e3c5cf625 statsd typo 2016-10-18 16:17:49 +02:00
Min RK
a3eb2d2b9a Merge pull request #815 from kinuax/fix-setting-in-configuration-example
Fix setting in configuration example
2016-10-14 13:03:45 +02:00
Asier
b6a8860a44 Fix setting in configuration example 2016-10-13 13:45:23 -05:00
Carol Willing
b8a649ae86 Add error message when generate config path does not exist 2016-10-13 07:20:38 -07:00
Min RK
7774bfc612 Merge pull request #811 from willingc/quick-install
Sync quick install steps with PyData tutorial
2016-10-13 10:56:55 +02:00
Carol Willing
9f76613aed Sync quick install steps with PyData tutorial 2016-10-12 18:06:11 -07:00
Min RK
f1ccbe4bed Merge pull request #807 from willingc/normalize-whitelist
Add tests for username normalization
2016-10-12 16:21:19 +02:00
Carol Willing
668d78f729 Add tests for username normalization 2016-10-11 16:44:24 -07:00
Min RK
0009b9a3d6 Merge pull request #805 from danielballan/template-vars
MNT: Add hub host and prefix to template vars in prep for JLab extension
2016-10-11 18:18:21 +02:00
danielballan
b2be07ea6a MNT: Add hub host and prefix to template vars in prep for JLab extension. 2016-10-11 11:27:50 -04:00
Min RK
74649eaad0 Merge pull request #804 from willingc/ssl-termination
Clarify deprecation of --no-ssl
2016-10-11 12:08:55 +02:00
Carol Willing
f33086aa13 Clarify deprecation of --no-ssl 2016-10-10 12:05:39 -07:00
Min RK
9c1cd960fc Merge pull request #801 from minrk/warn-about-direct-connect
try to detect and warn about connecting directly to the Hub
2016-10-10 10:36:50 +02:00
Min RK
3a5226ffa0 Merge pull request #802 from minrk/spawn-pending-finish
add User.waiting_for_response
2016-10-07 11:53:04 +02:00
Min RK
96a53f9921 Merge pull request #797 from ianabc/redirection_loop
spawn_pending set too soon causing redirect loop
2016-10-07 11:13:09 +02:00
Min RK
ff92ac9dad more mocking in tests
avoids no_patience state leaking into other tests
2016-10-07 10:59:32 +02:00
Min RK
933478bfff add waiting_for_response indicator on User
.spawn_pending used for the *whole* window, from request to responsive (added to proxy)
.waiting_for_response is just used for the window between Spawner.start returning (process started, http endpoint known) and http endpoint becoming responsive

.waiting_for_response will never be True while .spawn_pending is False
2016-10-07 10:59:05 +02:00
Min RK
7d996f91b0 try to detect and warn about connecting directly to the Hub
This is guaranteed to result in a redirect loop.
2016-10-07 10:16:21 +02:00
Min RK
c818cbb644 Merge pull request #799 from willingc/doc-install
Move README installation instructions to docs
2016-10-06 19:46:51 +02:00
Carol Willing
e638e5b684 Move README installation instructions to docs 2016-10-06 04:37:57 -07:00
Ian Allison
625e76ea40 spawn_pending set too soon causing redirect loop
Signed-off-by: Ian Allison <iana@pims.math.ca>
2016-10-05 13:28:52 -07:00
Min RK
f8229c9fb6 Merge pull request #793 from willingc/slimconfpy
Slim conf.py comments and options cruft
2016-10-04 15:04:32 +02:00
Min RK
47da422a93 Merge pull request #758 from willingc/update-changes
Add changes for 0.7 release
2016-10-04 14:47:00 +02:00
Carol Willing
3dd98bc0fc Slim conf.py comments and options cruft 2016-10-04 05:28:03 -07:00
Carol Willing
fa6e4aa449 Add pr 789 deprecate --no-ssl 2016-09-30 09:02:58 -07:00
Carol Willing
182472f921 Changes per @minrk review 2016-09-30 08:57:35 -07:00
Carol Willing
d99afe531d Add changes for 0.7 release 2016-09-30 08:57:35 -07:00
Carol Willing
b6b238073f Merge pull request #789 from minrk/deprecate-no-ssl
Deprecate `--no-ssl`
2016-09-30 08:42:07 -07:00
Min RK
a4c696d3bd Merge pull request #788 from willingc/warehouse
Update link to docs
2016-09-30 17:03:34 +02:00
Min RK
bce767120c Merge pull request #785 from willingc/devclarity
Clarify docstring
2016-09-30 16:58:23 +02:00
Min RK
6a9f346b21 Deprecate --no-ssl
it's unnecessarily pedantic. Just warn instead.
2016-09-30 16:16:33 +02:00
Carol Willing
d4646e1caa Update link 2016-09-28 20:54:57 -07:00
Carol Willing
77f0e00695 Clarify docstring 2016-09-28 07:36:29 -07:00
Carol Willing
26a6c89b3a Merge pull request #778 from minrk/shutdown-services
cleanup managed services in shutdown
2016-09-27 09:53:50 -07:00
Carol Willing
34297b82b3 Merge pull request #777 from minrk/service-cookie
Work on service authentication
2016-09-27 09:53:12 -07:00
Carol Willing
70727c4940 Merge pull request #776 from minrk/cleanup-on-start
remove stopped users from proxy on startup
2016-09-27 09:51:01 -07:00
Min RK
56080e5436 Merge pull request #782 from spoorthyv/master
Updated Logos To Match New Brand Guidelines
2016-09-27 15:41:44 +02:00
spoorthyv
309b1bda75 Updated Logos 2016-09-26 15:56:11 -07:00
Min RK
f3ebb694b4 Merge pull request #780 from minrk/travis-no-verbose-pip
remove -v from pip install on travis
2016-09-26 17:06:44 +02:00
Min RK
f35c14318a Merge pull request #779 from minrk/docker-cdn
Dockerfile: set debian CDN
2016-09-26 17:06:01 +02:00
Min RK
b60f2e8233 remove -v from pip install on travis
it makes way too much noise
2016-09-26 17:03:51 +02:00
Min RK
f1a55e31ce Dockerfile: set debian CDN
because the default httpredir fails with some regularity

based on info from http://deb.debian.org
2016-09-26 16:58:31 +02:00
Min RK
2432611264 cleanup managed services in shutdown
don’t leave them running
2016-09-26 15:20:34 +02:00
Min RK
729b608eff Fix setting cookie for services
and exercise it in tests
2016-09-26 14:30:00 +02:00
Min RK
eb3252da28 simplify whoami service example
rely on defaults in HubAuthenticated to show how simple it can be
2016-09-26 14:18:54 +02:00
Min RK
a9e9338ee4 get HubAuth defaults from service env variables
allows use of HubAuthenticated without any arguments
2016-09-26 14:13:04 +02:00
Min RK
aad063e3cd remove stopped users from proxy on startup
We already added running users, but we didn't handle removing users from the proxy
if the user's server was stopped (e.g. while the Hub was restarting).
2016-09-26 13:20:42 +02:00
Min RK
be00265d1a Merge pull request #762 from willingc/swagger
Edit descriptions in API spec for user clarity
2016-09-25 14:39:42 +02:00
Min RK
335ba4f453 Merge pull request #771 from willingc/faq-adds
Added navigation links and workshop best practices
2016-09-25 14:38:45 +02:00
Carol Willing
5a4f3a4910 Added navigation links and workshop best practices 2016-09-22 10:02:29 -07:00
Carol Willing
7ee4be0f13 Remove api review notes doc 2016-09-22 09:13:39 -07:00
Carol Willing
10c3fbe5cf Add changes per @minrk 2016-09-22 09:12:26 -07:00
Carol Willing
13826a41a1 Merge pull request #769 from minrk/service-start-yield
service.start is not a coroutine
2016-09-22 03:21:47 -07:00
Min RK
cb35026637 service.start is not a coroutine
don’t yield it
2016-09-22 12:04:31 +02:00
Min RK
24c080cf4a Merge pull request #768 from minrk/service-url
only set service URL env if there's a URL to set
2016-09-22 11:57:44 +02:00
Min RK
e9fc629285 only set service URL env if there's a URL to set
These fields are only relevant for services with a web endpoint
2016-09-21 12:39:07 +02:00
Min RK
150b67c1c9 Merge pull request #761 from willingc/apidocs
Update API docs
2016-09-21 10:34:57 +02:00
Carol Willing
acdee0ac29 Change notes from txt to md 2016-09-19 12:05:26 -07:00
Carol Willing
193b236ef1 Add additional review questions re: API 2016-09-19 11:52:43 -07:00
Carol Willing
1851e6a29d Edit descriptions in API spec for user clarity 2016-09-19 10:49:56 -07:00
Carol Willing
74f086629c Update API docs 2016-09-19 08:42:28 -07:00
Min RK
33a59c8352 Merge pull request #757 from willingc/doc-contrib
Add contributor list to the docs and update the contents
2016-09-19 09:01:54 +02:00
Carol Willing
08644fea74 Add services to index/table of contents 2016-09-18 15:33:01 -07:00
Carol Willing
f878bf6ad3 Add contribution list to documentation 2016-09-18 15:29:54 -07:00
Carol Willing
651c457266 Add contributor list 2016-09-18 15:28:51 -07:00
Carol Willing
2dd3463ea8 Merge pull request #748 from minrk/string-formatting
Deprecate `%U` username substitution
2016-09-18 06:34:01 -04:00
Carol Willing
ad93af8cc8 Merge pull request #749 from minrk/single-user-help-all
exercise single-user help output
2016-09-18 06:33:38 -04:00
Min RK
080cf7a29b exercise single-user help output
and tweak some of its output
2016-09-15 13:04:09 +02:00
Min RK
b8f4803ef4 Deprecate %U username substitution
use Python format-strings instead.
2016-09-15 12:05:46 +02:00
Min RK
4a8f51ed6d Merge pull request #741 from willingc/add-lab
Add info on trying out JupyterLab
2016-09-13 10:31:49 +02:00
Carol Willing
7923074ed5 Add info on trying out JupyterLab 2016-09-12 22:22:22 -07:00
Min RK
834b2ba77d Merge pull request #739 from jupyterhub/fix-readme-1
Add --no-ssl to docker run command in README
2016-09-10 10:55:41 +02:00
Yuvi Panda
7897a13ca5 Add --no-ssl to docker run command
Otherwise this doesn't run by default, and someone in gitter ran into this earlier.
2016-09-09 10:57:19 -07:00
Min RK
7987011372 Merge pull request #738 from willingc/inspired-zulip
Add navigation to README
2016-09-09 13:38:22 +02:00
Min RK
d7a76077bd Merge pull request #734 from minrk/deprecated-local-spawner-subclasses
backward-combat for ip, port in LocalProcessSpawner subclasses
2016-09-09 13:37:58 +02:00
Min RK
62731cf489 Merge pull request #727 from willingc/servicespec
Edit Services document
2016-09-09 10:29:10 +02:00
Carol Willing
5d501bc465 Add navigation to README 2016-09-08 22:41:44 -07:00
Kyle Kelley
63a6841848 Merge pull request #737 from willingc/issue438
Add info on configuring pySpark executors on YARN
2016-09-08 17:59:24 -05:00
Carol Willing
403241bd98 Add reference to official pySpark docs 2016-09-08 15:28:54 -07:00
Carol Willing
de3fe88df6 Fix code indentation for markdown 2016-09-08 15:11:25 -07:00
Carol Willing
6a370286e1 Add info on setting pySpark executors on YARN 2016-09-08 15:09:20 -07:00
Carol Willing
491b7e7d11 Use Hub-Managed and Externally-Managed 2016-09-08 08:23:47 -07:00
Min RK
0b0db97117 Merge pull request #728 from willingc/cull-idle
Add readme to cull-idle example to demonstrate managed services
2016-09-08 16:57:16 +02:00
Min RK
42a993fd08 backward-combat for ip, port in LocalProcessSpawner subclasses
Subclasses prior to 0.6 may assume return value
of LocalProcessSpawner.start can be ignored
instead of passing it through.

For these cases, keep setting ip/port in the deprecated way
so that it still works with a warning,
rather than failing with the wrong port.
2016-09-08 16:54:52 +02:00
Carol Willing
fd1544bf41 Edits per @minrk's review 2016-09-08 07:16:25 -07:00
Carol Willing
ed36207328 Merge pull request #731 from willingc/issue654
Add config for default URL to FAQ
2016-09-08 07:05:56 -07:00
Carol Willing
a0b8ccf805 Add config for whole filesystem access and user home directory as default 2016-09-08 06:54:23 -07:00
Min RK
9d2278d29b Merge pull request #733 from willingc/issue594
Add troubleshooting info about sudospawner
2016-09-08 14:51:57 +02:00
Min RK
df42385d7e Merge pull request #732 from willingc/issue632
Add info on updates and Qualsys SSL analyzer to docs
2016-09-08 14:51:42 +02:00
Min RK
02796d4daa Merge pull request #730 from willingc/issue661
Add install instructions with no network to FAQ
2016-09-08 14:50:44 +02:00
Carol Willing
80c5f67335 Add troubleshooting info about sudospawner 2016-09-08 00:57:17 -07:00
Carol Willing
0b14e89404 Add info on updates and Qualsys SSL analyzer to docs 2016-09-07 22:00:33 -07:00
Carol Willing
f595b1ad59 Add clarification re: run on hub not each single user server 2016-09-07 21:21:10 -07:00
Carol Willing
80ca1eacc5 Add install instructions with no network to FAQ 2016-09-07 21:06:56 -07:00
Carol Willing
5b3ac6c840 Add readme to cull-idle example 2016-09-07 14:01:46 -07:00
Carol Willing
0000b7447a Make command consistent with examples/cull-idle 2016-09-07 13:52:33 -07:00
Carol Willing
a22060ca7f Edit Services document 2016-09-07 11:39:15 -07:00
Min RK
8ca321ecc3 Merge pull request #705 from minrk/actual-services
WIP: implement services API
2016-09-07 13:43:54 +02:00
Min RK
862cb3640b Merge pull request #722 from minrk/setuptools-no-egg
always install with setuptools
2016-09-07 13:38:06 +02:00
Min RK
51908c9673 clarifications from review 2016-09-07 13:19:09 +02:00
Min RK
9aa4046093 always install with setuptools
but not eggs (effectively require pip install .)
2016-09-05 15:46:20 +02:00
Min RK
acb49adfea Merge pull request #719 from Mistobaan/patch-1
fix docker repository
2016-09-05 10:38:12 +02:00
Fabrizio Milo
f345ad5422 fix docker repository 2016-09-02 14:45:16 -07:00
Min RK
5ad618bfc1 add API endpoint for services 2016-09-02 15:19:45 +02:00
Min RK
26b00578a1 remove redundant user_url utility
public_url works for users now
2016-09-02 13:22:49 +02:00
Min RK
c3111b04bb support services subdomain
- all services are on the 'services' domain, share the same cookie
2016-09-02 13:21:46 +02:00
Min RK
a61ba74360 Merge pull request #717 from minrk/hubauth-defaults
HubAuth login_url changes:
2016-09-02 12:05:17 +02:00
Min RK
4de93fd1d5 Merge pull request #718 from willingc/sdist-one
Remove zip from sdist build per PEP 527
2016-09-02 11:45:44 +02:00
Min RK
46bb7b05f4 strict host matching by including / 2016-09-02 11:44:51 +02:00
Carol Willing
1aa2cb1921 Remove zip from sdist build per PEP 527 2016-09-01 07:33:10 -07:00
Min RK
c4bfa63fd6 allow full URLs for login redirects iff they are for our host 2016-09-01 15:10:02 +02:00
Min RK
4c5d6167bd use just path for default hub auth login_url 2016-09-01 15:07:00 +02:00
Min RK
9a002c2445 update services doc with some feedback 2016-09-01 15:01:02 +02:00
Min RK
f97d32c5bd add services to the proxy
and start test coverage
2016-09-01 14:46:34 +02:00
Min RK
bac311677f Merge pull request #711 from willingc/update-change
Update changelog format
2016-08-29 12:01:08 +02:00
Carol Willing
94cb5b3a05 Update changelog format 2016-08-29 02:39:39 -07:00
Carol Willing
ed4f0ba014 Merge pull request #707 from willingc/mytheme
Update conda env and conf.py for clean build
2016-08-28 10:42:49 -07:00
Carol Willing
fd219b5fff Update conda env and conf.py for clean build 2016-08-28 10:08:00 -07:00
Min RK
140c4f2909 use services API in cull-idle example 2016-08-27 13:23:45 +02:00
Min RK
a1c787ba5f basic implementation of managed services
- managed services are automatically restarted
- proxied services not there yet
2016-08-27 12:59:26 +02:00
Min RK
54c808fe98 Service specification document 2016-08-26 17:25:53 +02:00
Min RK
eaeec9f19b Merge pull request #693 from willingc/doc-revise
Documentation refresh
2016-08-24 23:05:54 +02:00
Min RK
21d25ac130 Merge pull request #689 from minrk/log-add-user-error
log errors adding users already in db
2016-08-21 22:19:39 +02:00
Min RK
eda21642bd log errors adding users already in db
avoids removal of system users preventing Hub startup
2016-08-21 22:07:46 +02:00
Carol Willing
aace54d5b2 Merge pull request #699 from jhamrick/swarm-docs
Remove link to SwarmSpawner
2016-08-19 20:41:18 -07:00
Jessica B. Hamrick
e460c00759 Remove link to SwarmSpawner 2016-08-20 02:02:08 +01:00
Carol Willing
678fd1cd08 Shorten name 2016-08-18 10:36:40 -07:00
Carol Willing
42c78f3c43 Drop back to old environment 2016-08-18 10:20:57 -07:00
Carol Willing
548e0f6153 Edits to technical overview 2016-08-18 09:58:37 -07:00
Carol Willing
31f63c737f Add image of JupyterHub parts to index 2016-08-18 09:15:48 -07:00
Carol Willing
71b35602d7 Edit grammar in index 2016-08-18 08:36:46 -07:00
Carol Willing
7c41a024ba Fix typo 2016-08-18 05:05:46 -07:00
Carol Willing
51097de43d Update contents format 2016-08-18 04:52:51 -07:00
Carol Willing
44e16d538d Edit and corrections 2016-08-18 04:52:22 -07:00
Carol Willing
f6517d01db Move 'Using API' to user guide 2016-08-18 04:51:48 -07:00
Carol Willing
039b925cf6 Edit config-examples 2016-08-18 04:50:11 -07:00
Carol Willing
bba5460236 Simplify formating of troubleshooting doc 2016-08-18 04:49:30 -07:00
Carol Willing
e5d3705a1a Edit headings for authenticators and spawners docs 2016-08-18 04:48:43 -07:00
Carol Willing
7b80b95a49 Add checks for spelling 2016-08-18 04:47:21 -07:00
Carol Willing
75cb487ab3 Update conf 2016-08-17 15:11:57 -07:00
Carol Willing
eba4b3e8c7 More doc edits 2016-08-17 15:11:17 -07:00
Carol Willing
712b895d8e WIP refresh 2016-08-15 19:18:38 -07:00
Carol Willing
635fd9b2c3 Fix typo 2016-08-15 18:50:26 -07:00
Min RK
afcbdd9bc4 Merge pull request #678 from vilhelmen/swagger_fix
Swagger spec conformance
2016-08-04 13:06:00 +02:00
Will Starms
80fa5418b7 Fix missing description for responce 2016-08-03 16:59:14 -05:00
Will Starms
b0a09c027d Fix invalid type bool->boolean 2016-08-03 16:57:17 -05:00
Kyle Kelley
4edf59efeb Merge pull request #675 from minrk/api-info
Add /api/ and /api/info endpoints
2016-08-02 22:26:10 -05:00
Min RK
9f0dec1247 ignore generated rest-api html 2016-08-01 15:16:26 +02:00
Min RK
2c47fd4a02 Add /api/ and /api/info endpoints
/api/ is not authenticated, and just reports JupyterHub's version for now.
/api/info is admin-only, and reports more detailed info about Python, authenticators/spawners in use, etc.
2016-08-01 15:15:59 +02:00
Min RK
9878f1e32d Document parameters to shutdown API 2016-08-01 15:12:05 +02:00
Min RK
5c396668ff Merge pull request #671 from vilhelmen/swagger_fix
Fix timestamp type in API spec
2016-08-01 13:39:10 +02:00
Min RK
5f12f9f2c3 Merge pull request #667 from vilhelmen/master
Proxy will no longer recieve Hub's SIGINT
2016-08-01 11:04:39 +02:00
Will Starms
4974775cd9 Fix timestamp type 2016-07-31 19:23:59 -05:00
Will Starms
0cb777cd0f Switch to start_new_sesstion 2016-07-29 13:43:09 -05:00
Min RK
a4bb25a75f Merge pull request #604 from minrk/service-token
add Services to db
2016-07-29 10:32:15 +02:00
Min RK
b3f117bc59 Merge pull request #669 from vilhelmen/swagger_fix
Fix invalid license object and bad JSON pointers in API spec
2016-07-29 10:25:39 +02:00
Will Starms
499ba89f07 Correct invalid JSON pointers 2016-07-28 22:25:38 -05:00
Will Starms
05d743f725 Correct invalid license object in API spec 2016-07-28 22:19:05 -05:00
Carol Willing
a347d56623 Merge pull request #668 from willingc/toc-tweak
Minor additions to work done by @iamed18 in PR#602
2016-07-28 14:33:36 -07:00
Carol Willing
172976208e Minor additions to work done by @iamed18 in PR#602 2016-07-28 14:27:19 -07:00
Carol Willing
b6db3f59a2 Merge pull request #602 from iamed18/master
Added nginx reverse proxy example to GettingStarted.md
2016-07-28 14:09:31 -07:00
Carol Willing
4b31279fc8 Merge branch 'iamed18-master'
Closes #509
2016-07-28 14:01:29 -07:00
Edward Leonard
bfef83cefc separated configuration examples into their own document
Merge conflict resolved by @willingc
2016-07-28 13:58:20 -07:00
Edward Leonard
07d599fed2 added code-block ends
forgot them in last commit
2016-07-28 13:56:15 -07:00
Edward Leonard
0412407558 added example config with nginx reverse proxy 2016-07-28 13:56:15 -07:00
Edward Leonard
4c568b46d6 separated configuration examples into their own document 2016-07-28 14:17:51 -05:00
Michael Milligan
d92fcf5827 batchspawner URL change 2016-07-28 13:54:34 -05:00
Will Starms
36f3abbfc7 Proxy will no longer recieve Hub's SIGINT #665 2016-07-28 13:04:55 -05:00
Min RK
49a45b13e6 debug installation on travis 2016-07-28 17:23:44 +02:00
Min RK
dfa13cb2c5 avoid creating duplicate users in test_api
now that we check!
2016-07-28 17:23:44 +02:00
Min RK
fd3b959771 add api_tokens.service_id column with alembic 2016-07-28 17:23:44 +02:00
Min RK
39a80edb74 async fixes in test_init_tokens 2016-07-28 17:23:44 +02:00
Min RK
2a35d1c8a6 add service API tokens
service_tokens supersedes api_tokens,
since they now map to a new services collection,
rather than regular Hub usernames.

Services in the ORM have:

- API tokens
- servers (multiple, can be 0)
- pid (0 if not managed)
2016-07-28 17:23:44 +02:00
Min RK
81350322d7 Merge pull request #660 from willingc/remove-badge
Remove requires.io badge
2016-07-26 12:02:33 +02:00
Min RK
50c2528359 Merge pull request #659 from willingc/fix-restlink
Remove link and reflow text
2016-07-26 12:02:24 +02:00
Min RK
77bac30654 Merge pull request #650 from minrk/return-ip-port
return (ip, port) from Spawner.start
2016-07-26 12:02:13 +02:00
Carol Willing
41fafc74cf Merge pull request #662 from mwmarkland/master
Fix typo regarding user's interactions with PATH
2016-07-25 17:58:48 -07:00
Matthew Markland
c6281160fa Fix typo regarding user 2016-07-25 14:55:17 -05:00
Min RK
3159b61ae7 return (ip, port) from Spawner.start
removes the need for Spawners to set db state themselves in most cases

Should be backward-compatible with warnings.
2016-07-25 16:54:15 +02:00
Carol Willing
11278ddb26 Remove requires.io badge 2016-07-25 07:45:34 -07:00
Carol Willing
e299a6c279 Remove link and reflow text 2016-07-25 07:41:28 -07:00
Min RK
22ff5f3d91 Merge pull request #635 from minrk/traitlets-4.2-singleuser
use traitlets 4.2 API in singleuser script
2016-07-25 16:29:07 +02:00
Carol Willing
a3e8bd346f Merge pull request #656 from minrk/rest-api-docs
Add REST API to docs
2016-07-25 07:09:16 -07:00
Min RK
592a084a28 set API token in single-user-spawner test 2016-07-25 15:57:43 +02:00
Min RK
c27e59b0f9 better exit message if JPY_API_TOKEN is undefined. 2016-07-25 15:27:32 +02:00
Min RK
1c9bc1b133 traitlets 4.2 API in singleuser script 2016-07-25 15:27:32 +02:00
Min RK
be4f4853cf Merge pull request #655 from willingc/doc-rest
Add links to REST API docs
2016-07-25 10:51:08 +02:00
Carol Willing
7d8895c2fb Add links to swagger docs for REST API 2016-07-23 18:47:23 -07:00
Min RK
5b8913be5b install nodejs with conda on RTD 2016-07-23 12:23:30 +02:00
Min RK
d03a1ee490 build rest-api on RTD 2016-07-23 12:05:50 +02:00
Min RK
19ae38c108 add REST API to docs
include local build, even though it's not as nice as petstore.
Due the that, link to petstore as well.
2016-07-23 12:05:25 +02:00
Carol Willing
9b71f11213 Merge pull request #651 from minrk/check-hub-ip
more informative error if single-user server can't connect to Hub for auth
2016-07-22 07:30:27 -07:00
Min RK
8fbaedf4d7 more informative error if single-user server can't connect to Hub for auth
error message points to hub_ip setting if Hub doesn't appear to be accessible at 127.0.0.1
2016-07-22 15:35:24 +02:00
Min RK
87ab07b322 Merge pull request #646 from datapolitan/fix_juptyter
fixing start_proxy() that misspelled name of the project
2016-07-18 22:05:22 -07:00
Richard Dunks
f36a1e10e6 fixing start_proxy() that misspelled name of the project 2016-07-17 23:23:32 -04:00
Carol Willing
5944671663 Merge pull request #644 from JamiesHQ/doctypo
Fix link
2016-07-16 11:21:55 -05:00
Jamie W
27dfd0edca fix link 2016-07-16 11:18:14 -05:00
Min RK
9dfc043352 Merge pull request #639 from ryanlovett/patch-1
Correct Spawner.start typo
2016-07-13 17:10:17 -05:00
Min RK
e8bd1520b2 Merge pull request #640 from minrk/travis-pre-for-nathaniel
install dependencies with pre
2016-07-13 17:10:03 -05:00
Min RK
a30b9976f5 install dependencies with pre
to catch bugs introduced by dependencies during prerelease
2016-07-13 16:19:15 -05:00
Ryan Lovett
954e5b3d5e Correct Spawner.start typo
As documented at https://github.com/jupyterhub/jupyterhub/blob/master/jupyterhub/spawner.py#L103
2016-07-13 10:23:16 -07:00
Min RK
7cd8aa266b Merge pull request #634 from minrk/cleanup-after-yourself
cleanup servers, api tokens after spawner shutdown
2016-07-11 14:29:20 -05:00
Min RK
d0449d136c cascade on API token delete 2016-07-11 10:44:55 -05:00
Min RK
ff9aeb70b4 try ondelete=SET NULL in foreign keys 2016-07-09 12:13:04 +02:00
Min RK
2eaecd22ba cleanup servers, api tokens after spawner shutdown
prevents growing table of unused servers and tokens
2016-07-08 16:50:43 +02:00
Carol Willing
4801d647c1 Merge pull request #627 from minrk/alembic-util
allow running alembic with `python -m jupyterhub.dbutil`
2016-07-01 17:17:54 -07:00
Carol Willing
b7e6fa3abe Merge pull request #626 from minrk/check-permissions
Add a permissions-check hint when spawn fails with PermissionError
2016-07-01 17:02:37 -07:00
Min RK
d590024c47 allow running alembic with python -m jupyterhub.dbutil
since we only have generated alembic.ini, present a command that generates one and uses it.

enables generating new revisions with:

    python -m jupyterhub.dbutil revision -m msg
2016-07-01 14:38:31 +02:00
Min RK
f3f71c38c3 Merge pull request #620 from Fokko/fd-add-badge
Added requirements badge
2016-07-01 14:37:26 +02:00
Min RK
27125a169c Merge pull request #621 from minrk/user-redirect-handler
Add /user-redirect/ endpoint
2016-07-01 14:37:00 +02:00
Min RK
3f9205d405 Add a permissions-check hint when spawn fails with PermissionError 2016-07-01 14:36:34 +02:00
Carol Willing
96861dc2b0 Merge pull request #622 from minrk/getting-started-log
update log instructions in getting started
2016-06-24 08:52:31 -07:00
Min RK
cedaa184f1 update log instructions in getting started
use recommended output-piping instead of nonexistent log_file config
2016-06-24 17:15:50 +02:00
Fokko Driesprong
f491791081 Added requirements badge 2016-06-24 16:17:51 +02:00
Min RK
6bba1c474f Add /user-redirect/ endpoint
should avoid needing to cram user-detection / intent into other endpoints.
That functionality isn't removed,
but warnings are added indicating that /user-redirect/ should be used instead.
2016-06-24 16:08:30 +02:00
Carol Willing
357f6799b0 Merge pull request #613 from minrk/user-redirect-560
Finish up cross-user redirects
2016-06-16 08:32:03 -07:00
Carol Willing
ce3ea270f5 Merge pull request #612 from minrk/doc-links
fix links to authenticator/spawner pages from howitworks
2016-06-16 08:28:56 -07:00
Min RK
992717adc0 support cross-user redirects when JupyterHub is on a prefix 2016-06-16 15:42:00 +02:00
Min RK
993101710f fix links to authenticator/spawner pages from howitworks 2016-06-16 15:00:19 +02:00
Matthias Bussonnier
ac6fe61804 Merge pull request #609 from minrk/only-relevant-warning
hide http warning until it's relevant
2016-06-14 09:42:24 -07:00
Min RK
37aa1a291a Merge pull request #606 from minrk/rm-hub-prefix-option
disable hub_prefix config
2016-06-13 12:08:58 +02:00
Min RK
c6294f2763 Merge pull request #607 from Carreau/fix-bad-security-anchor-link
Fix bad anchor
2016-06-13 12:08:34 +02:00
Min RK
6e9a77f55f hide http warning until it's relevant
avoids flash of invalid warning when everything is correct
2016-06-13 12:07:52 +02:00
Min RK
799b407d89 Merge pull request #608 from Carreau/add-ssl-frontend-warning
Add a warning on login if page not over ssl.
2016-06-13 12:00:02 +02:00
Matthias Bussonnier
3ddfa5f939 Add a warning on login if page not over ssl.
The --no-ssl option in the backend make sens, but still too many
deployment are not over SSL because they underestimate / do not
understand the risks.
2016-06-12 13:24:46 -07:00
Matthias Bussonnier
5968661742 Fix bad anchor 2016-06-11 12:09:00 -07:00
Dara Adib
34592e3da5 Process single-user server redirects
Follow-up to #448.

If single-user notebook is running, it will redirect other
users to hub root with next argument, which was previously
ignored.
2016-06-10 17:15:48 +02:00
Min RK
5aea7eda96 disable hub_prefix config
it shouldn't be configurable
2016-06-10 17:14:47 +02:00
Edward Leonard
08024be1c0 added code-block ends
forgot them in last commit
2016-06-06 22:07:10 -05:00
Edward Leonard
39daff3099 added example config with nginx reverse proxy 2016-06-06 22:05:27 -05:00
Min RK
d4c0fe8679 Merge pull request #597 from minrk/single-user-service-auth
use HubAuth in single-user server
2016-06-06 13:31:40 +02:00
Min RK
c9ae45bef3 Merge pull request #599 from minrk/groups
Add groups
2016-06-04 21:22:29 +02:00
Min RK
503f21fd37 allow initializing groups from config
c.JupyterHub.load_groups creates groups and adds users to them.

It *does not* remove users from groups added previously.
2016-06-01 14:35:34 +02:00
Min RK
6d106b24f4 add groups API 2016-06-01 14:04:32 +02:00
Min RK
71f47b7a70 add user groups 2016-06-01 13:47:53 +02:00
Min RK
844381e7c9 use HubAuthenticated in jupyterhub-singleuser 2016-05-31 13:20:21 +02:00
Min RK
267994b191 move singleuser script into the package 2016-05-31 12:59:38 +02:00
Min RK
cc2202c188 Merge pull request #554 from minrk/service-auth
Add HubAuth for authenticating services with JupyterHub
2016-05-31 12:58:51 +02:00
Min RK
4996a84ca0 Merge pull request #596 from minrk/hub-prefix-traitlet
fix _hub_prefix_changed signature
2016-05-31 12:58:37 +02:00
Min RK
3cefc2951c fix _hub_prefix_changed signature
wasn't update for new traitlets API

c/o @Milly
2016-05-31 11:33:12 +02:00
Min RK
835b4afc06 Merge pull request #593 from minrk/redirect-typo
only strip base_url if it's actually there
2016-05-31 11:32:42 +02:00
Min RK
146bef1d88 test hub-authenticated tornado handler 2016-05-30 13:32:10 +02:00
Min RK
ef9656eb8b add example service 2016-05-30 13:32:10 +02:00
Min RK
84868a6475 add login_url to HubAuth
needed for tornado redirects. Still not sure the best way to pass it to tornado app settings.
2016-05-30 13:32:10 +02:00
Min RK
9e9c6f2761 document services.auth 2016-05-30 13:32:10 +02:00
Min RK
19e8bdacfe Add HubAuth for authenticating tornado-based services with JupyterHub
- HubAuth implements request to identify users with the Hub
- HubAuthenticated is a mixin for tornado handlers
2016-05-30 13:32:10 +02:00
Min RK
c6640aa51d only strip base_url if it's actually there 2016-05-30 10:34:33 +02:00
Min RK
1514a2f2e2 ignore .cache 2016-05-27 16:12:54 +02:00
Min RK
9edb282067 Merge pull request #591 from minrk/clean-css-fix
require clean-css 3.4.13
2016-05-27 13:12:09 +02:00
Min RK
9ffe5e6187 require clean-css 3.4.13
fixes node 6 compatibility
2016-05-26 18:31:10 +02:00
Min RK
14662111a8 Merge pull request #508 from minrk/alembic
Use alembic for database migrations
2016-05-26 15:40:44 +02:00
Min RK
a7ea5774d9 test database upgrades with alembic 2016-05-26 15:32:57 +02:00
Min RK
c998458362 include old-jupyterhub.sqlite generated by
I don't like including this, but I don't know a better way to get a starting db
other than doing a complete installation of old JupyterHub in an env.

At least it's small.
2016-05-26 15:32:50 +02:00
Min RK
07ddede40c typo: write db url in alembic 2016-05-26 15:31:49 +02:00
Min RK
b8a6ac62e8 include alembic in package_data 2016-05-26 14:23:10 +02:00
Min RK
86e9a3217c add jupyterhub upgrade-db entry point
don't do automatic upgrades (yet)

I'm not sure if auto upgrades are a good idea or not.
2016-05-26 14:17:41 +02:00
Min RK
f591e6e3fb require alembic 2016-05-26 14:17:41 +02:00
Min RK
64dd1db327 add User.auth_state column
a place for storing authenticator state,
and a simple test case for alembic.
2016-05-26 14:17:41 +02:00
Min RK
b68569f61c init alembic
prepare for database migration
2016-05-26 14:17:40 +02:00
Min RK
3a52e3f4df Merge pull request #589 from minrk/test-with-base-url
Run tests with an encoded base_url
2016-05-26 14:14:18 +02:00
Min RK
05c268e190 Run tests with an encoded base_url
to ensure we get our escaping right

Mostly revealed fixes needed in tests so far, not code,
but should catch regressions.
2016-05-26 13:56:20 +02:00
Carol Willing
98937de278 Merge pull request #586 from jupyterhub/willingc-patch-1
Fix typo in README link
2016-05-25 09:36:41 -07:00
Carol Willing
ff35e3b93e Fix typo in README link
Extra 's' on jupyter-notebook removed.
2016-05-25 09:12:10 -07:00
Carol Willing
4eebc95109 Merge pull request #585 from willingc/link-me
Fix RTD links to PDF
2016-05-25 09:02:39 -07:00
Carol Willing
c708c2a3a0 Fix RTD links to PDF back to org 2016-05-25 08:46:54 -07:00
Kyle Kelley
35f8190128 Merge pull request #584 from willingc/wtd-readme
Edit README based on Write The Docs tips
2016-05-24 13:31:46 -07:00
Carol Willing
78b268ddef Edit README based on Write The Docs tips 2016-05-24 12:40:52 -07:00
Min RK
eb99060a25 Merge pull request #578 from willingc/doc-570
Add docs on chain certificates and configuration re: 570
2016-05-19 08:24:54 +02:00
Carol Willing
8e99f659f5 Fix link 2016-05-18 10:59:04 -07:00
Carol Willing
5c9e9d65b5 Add links to SSL section in docs 2016-05-18 10:52:49 -07:00
Carol Willing
3e768b7297 Add chained cert doc info from @ryanlovett and @LMtx 2016-05-18 10:34:38 -07:00
Kyle Kelley
aa2999210d Merge pull request #572 from PeterDaveHelloKitchen/image-optimize
Losslessly optimize images using Google zopflipng
2016-05-16 09:33:59 -05:00
Peter Dave Hello
be95a27597 optimize images 2016-05-16 21:46:53 +08:00
Kyle Kelley
5edcdd4fb2 Merge pull request #567 from minrk/less-271
require less-2.7.1
2016-05-12 07:12:32 -05:00
Min RK
b81586de0a require less-2.7.1
2.7.0 has compatibility problems with source maps
2016-05-12 10:32:52 +02:00
Carol Willing
e0f3e3b954 Merge pull request #559 from ozancaglayan/doc-fix-apitoken
doc: Add section about API tokens
2016-05-09 05:57:56 -07:00
Ozan Çağlayan
3037d264c3 docs: Fix last two typos 2016-05-05 15:41:38 +03:00
Ozan Çağlayan
17f1346c08 doc: address reviewers comments 2016-05-04 18:15:15 +03:00
Ozan Çağlayan
276aba9f85 doc: Add section about API tokens 2016-05-04 17:35:54 +03:00
Min RK
0ba63c42fd back to dev 2016-05-04 14:09:47 +02:00
Min RK
2985562c2f release 0.6.1 2016-05-04 14:08:39 +02:00
Min RK
754f850e95 changelog for 0.6.1 2016-05-04 14:08:39 +02:00
Min RK
dccb85d225 plural add-users ids 2016-05-04 13:57:16 +02:00
Min RK
a0e401bc87 Merge pull request #551 from minrk/proxy-error
Serve proxy error pages from the Hub
2016-05-04 12:34:10 +02:00
Min RK
c6885a2124 Merge pull request #552 from minrk/poll-and-notify
notice dead servers more often
2016-05-04 12:33:09 +02:00
Min RK
7528fb7d9b notice dead servers more often
call poll_and_notify to ensure triggering of dead-server events in a few places:

- `/hub/home` page view
- user start and stop API endpoints

This should avoid the failure to stop a server that's died uncleanly because the server hasn't noticed yet
2016-05-04 11:07:28 +02:00
Carol Willing
e7df5a299c Merge pull request #556 from minrk/shutdown-all
Add Stop All button to admin page
2016-05-03 05:58:41 -07:00
Min RK
ff997bbce5 Add Stop All button to admin page
for stopping all single-user servers at once
2016-05-03 13:25:12 +02:00
Min RK
1e21e00e1a return status from poll_and_notify
allows calling it directly
2016-04-27 14:28:23 +02:00
Min RK
77d3ee98f9 allow logo_url in template namespace to set the logo link 2016-04-27 14:06:51 +02:00
Min RK
1f861b2c90 server proxy error pages from the Hub 2016-04-27 14:06:29 +02:00
Carol Willing
14a00e67b4 Merge pull request #550 from daradib/typo
Fix docs typo for Spawner.disable_user_config
2016-04-26 15:28:02 -07:00
Dara Adib
14f63c168d Fix docs typo for Spawner.disable_user_config 2016-04-26 11:36:48 -07:00
Kyle Kelley
e70dbb3d32 Merge pull request #549 from minrk/optional-statsd
Make statsd an optional dependency
2016-04-26 07:46:28 -05:00
Min RK
b679275a68 remove unneeded codecov.yml
codecov team config suffices
2016-04-26 13:44:29 +02:00
Min RK
0c1478a67e Make statsd an optional dependency
only import it if it's used
2016-04-26 13:37:39 +02:00
Min RK
d26e2346a2 Merge pull request #548 from minrk/jupyterhub-urls
fix a few more jupyter->jupyterhub URLs
2016-04-26 12:41:19 +02:00
Min RK
9a09c841b9 Merge pull request #547 from minrk/disable-codecov-comments
disable codecov PR comments
2016-04-26 12:41:02 +02:00
Min RK
f1d4f5a733 fix a few more jupyter->jupyterhub URLs
in README
2016-04-26 11:58:27 +02:00
Min RK
d970dd4c89 disable CodeCov PR comments
The've removed web app config, in favor of codecov.yml,
discarding our existing config,
which means coverage reports are showing up in most Jupyter PRs now.
2016-04-26 11:55:52 +02:00
Min RK
f3279bf849 Merge pull request #544 from rafael-ladislau/master
Fix multiple windows logout error
2016-04-26 11:41:53 +02:00
Rafael Ladislau
db0878a495 Fix multiple windows logout error
When you have two JupyterHub windows and log out successfully in one of them. If you try to click the logout button in the other window, you will receive a 500 error.

It happened because there were operations being done in a None user object.
2016-04-25 13:31:39 -04:00
Min RK
c9b1042791 back to dev 2016-04-25 14:34:15 +02:00
Min RK
cd81320d8f push tags on circleci 2016-04-25 14:25:34 +02:00
Min RK
3046971064 release 0.6 2016-04-25 14:10:29 +02:00
Min RK
30498f97c4 Merge pull request #543 from robnagler:master
Allow jupyterhub-singleuser to run on python 2 install

closes #543
2016-04-25 11:35:40 +02:00
robnagler
d9d68efa55 run with default python, which might be python 2 2016-04-25 11:31:17 +02:00
Min RK
4125dc7ad0 Merge pull request #542 from willingc/doc-addition
Add troubleshooting documentation for 500 issue
2016-04-22 15:23:28 +02:00
Carol Willing
13600894fb Changed link re: Min's tip 2016-04-22 06:11:53 -07:00
Carol Willing
1b796cd871 Add links 2016-04-22 05:37:30 -07:00
Carol Willing
e7889dc12e Add 500 error to troubleshooting docs 2016-04-22 05:36:15 -07:00
Carol Willing
244a3b1000 Merge pull request #541 from minrk/cookie-referer
check referer only if there is a valid user cookie
2016-04-22 05:03:05 -07:00
Carol Willing
05dfda469f Merge pull request #540 from minrk/0.6
Changelog for 0.6
2016-04-22 04:21:44 -07:00
Min RK
6b19ee792d check referer only if there is a valid user cookie
avoids misleading "Blocking Cross Origin..." message
when there's no logged-in user for API requests.
2016-04-22 13:16:13 +02:00
Min RK
ace38d744a Changelog for 0.6 2016-04-22 12:50:49 +02:00
Min RK
56a5ed8c87 Merge pull request #539 from minrk/unused-email
add ignored -e arg to docker login
2016-04-22 10:50:15 +02:00
Min RK
60e8a76476 add ignored -e arg to docker login
doesn't appear to be needed on more recent docker
2016-04-22 10:24:40 +02:00
Min RK
552800ceb7 add sec doc
reviewed on security list
2016-04-22 10:20:18 +02:00
Carol Willing
7dd1900f5f Merge pull request #521 from minrk/docker-onbuild
Move docker onbuild step to jupyterhub-onbuild
2016-04-21 18:26:43 -07:00
Min RK
35c261d0ed better Dockerfile comments from Carol 2016-04-21 21:32:36 +02:00
Min RK
fa34ce64b7 include dockerfiles in manifest 2016-04-21 13:50:35 +02:00
Min RK
f0504420a9 move docker onbuild to directory 2016-04-21 13:50:27 +02:00
Min RK
8666f3a46c push onbuild image to docker hub with circle-ci 2016-04-21 13:38:15 +02:00
Carol Willing
60d6019cf7 Merge pull request #534 from jupyterhub/willingc-patch-1
Fix post move links to jupyterhub org in README
2016-04-20 20:05:39 -07:00
Carol Willing
173daeeb09 Fix post move links to jupyterhub org in README 2016-04-20 20:00:18 -07:00
Carol Willing
cf988dca4d Merge pull request #531 from minrk/extra-log-file-doc
[DOC] Note that extra_log_file only affects Hub's logs
2016-04-20 06:00:01 -07:00
Min RK
ffc2faabf7 [DOC] Note that extra_log_file only affects Hub's logs
not single-user server logs, or anything else.
2016-04-20 14:45:22 +02:00
Min RK
9fed0334c8 jupyterhub path in dockerfiles 2016-04-20 14:43:25 +02:00
Min RK
8b61eb7347 install from miniconda 4.0.5
- checksum miniconda installer
- move jupyterhub src to /src/jupyterhub
2016-04-19 13:21:25 +02:00
Min RK
9cdda101c7 Move onbuild step to jupyterhub-onbuild
Removes onbuild from from jupyter/jupyterhub image,
though it remains incomplete and will not run without a config file.
2016-04-19 13:21:24 +02:00
Carol Willing
f3bbca80ea Merge pull request #528 from minrk/test-cookie-secret
exercise cookie secret loading in tests
2016-04-19 04:01:36 -07:00
Carol Willing
ce30f28449 Merge pull request #527 from minrk/polish-520
polish cookie-secret PR
2016-04-19 03:56:41 -07:00
Min RK
6cb58c17e7 exercise cookie secret loading in tests 2016-04-19 11:15:48 +02:00
Min RK
183e244490 polish cookie-secret PR
- fix a couple of typos
- use ValueError instead of assert to ensure error is raised even when Python optimizes-out asserts
2016-04-19 10:15:10 +02:00
Min RK
d5cd5115a5 Merge pull request #520 from robnagler/master
cookie_secret file must be base64
2016-04-19 10:10:58 +02:00
robnagler
bbd3b22490 incorrect log call in previous checkin 2016-04-18 16:25:03 +00:00
robnagler
e02daf01ad Fix jupyter/jupyterhub#520: exit if any errors parsing file; Also, fix abstraction use of getenv/os.environ (use one or the other, not both) 2016-04-18 15:35:31 +00:00
robnagler
af1e253f8a Fix jupyter/jupyterhub#522 2016-04-18 15:16:01 +00:00
Min RK
491da69994 typo 2016-04-18 12:51:35 +02:00
Min RK
0737600d3c Merge pull request #515 from proversity-org/master
Post handler for  requesting authorization tokens; authenticated via form.
2016-04-18 11:23:24 +02:00
dominic
c7f542e79e Add tests for form based token generation 2016-04-18 10:27:38 +02:00
robnagler
21213c97c6 cookie_secret file is decoded by binascii.a2b_base64 so need to document it must be Base64. Added better doc for other values, and included description of "cookie_secret" parameter as well 2016-04-17 23:35:06 +00:00
Carol Willing
b36cd92ae6 Merge pull request #517 from minrk/load-tokens
allow pre-loading API tokens from config
2016-04-15 06:49:40 -07:00
Min RK
094ac451c7 Don't allow bad tokens to create tokens in the db 2016-04-15 12:42:52 +02:00
Min RK
fa4b666693 allow pre-loading API tokens from config
This is the first small part of easing the pain of services,
which is generating the API tokens,
and used to require initializing the JupyterHub database.
2016-04-14 16:45:40 +02:00
Carol Willing
ce9dc2093c Merge pull request #514 from minrk/docker-readme
revisions to docker notes
2016-04-14 07:05:02 -07:00
dominic
9fd97a8d63 Keep line spacing consistent. Don't do anything if authenticator not defined. 2016-04-14 15:39:26 +02:00
Min RK
2261a0e21d revisions to docker notes
- link to Docker docs on volumes
- name container `jupyterhub`
- wording
2016-04-14 15:35:58 +02:00
dominic
a7a1c32a03 Add post handler for form based auth 2016-04-14 09:32:42 +02:00
Matthias Bussonnier
dfd01bbf5f Merge pull request #503 from minrk/disable-npm-progress
disable npm progress when installing
2016-04-08 17:36:02 -07:00
Min RK
b11a5be781 disable npm progress when installing
apparently faster, but should also fix unicode errors
2016-04-08 16:35:23 -07:00
Kyle Kelley
8b6950055b Merge pull request #501 from minrk/set-login-at-root-redirect
set login cookie when redirecting
2016-04-06 12:35:50 -05:00
Min RK
e8a298be00 set login cookie when redirecting
should avoid one possible redirect-loop case when the single-user cookie is invalid, but the Hub cookie is valid.
2016-04-06 10:18:23 -07:00
Min RK
69f24acac2 Merge pull request #499 from yuvipanda/statsd
Emit metrics via statsd
2016-04-05 09:23:20 -07:00
YuviPanda
9ffebd0c5e Send metrics about various redirects from User spawning 2016-04-01 14:05:02 -07:00
YuviPanda
2dd3d3c448 Send timing info about spawner success / failure 2016-04-01 10:20:37 -07:00
YuviPanda
4644e7019e Send metrics about running and active users
Uses the standard user last-updated activity callback
2016-04-01 10:20:37 -07:00
YuviPanda
5a15d7a219 Actually start the timer 2016-04-01 10:20:37 -07:00
YuviPanda
788129da12 Send metrics for login and logout actions 2016-04-01 10:20:37 -07:00
YuviPanda
cac5175c9b Send CSP metrics to statsd 2016-04-01 10:20:37 -07:00
YuviPanda
80556360ac Add statsd to the base request handler 2016-04-01 10:20:37 -07:00
YuviPanda
3dca0df55f Add statsd to the base JupyterHub app
Not actually emitting any metrics yet
2016-04-01 10:20:37 -07:00
Min RK
62a5e9dbce Merge pull request #497 from yuvipanda/env-callable
Allow environment config values to be callable
2016-04-01 09:57:52 -07:00
YuviPanda
45fcdc75c0 Add docs about callables in environment configurable 2016-03-31 23:44:08 -07:00
Min RK
f1bdf6247a Merge pull request #500 from yuvipanda/fix-url-encoding-4
Use User.url instead of constructing it manually
2016-03-31 22:15:58 -07:00
YuviPanda
80932a51f4 Use User.url instead of constructing it manually
This fixes issues with URL encoding when redirecting users to
their own notebook instances
2016-03-31 17:28:33 -07:00
Min RK
c8774c44d4 Merge pull request #498 from yuvipanda/statsd-configurable
Mark statsd_prefix as configurable as well
2016-03-31 15:08:10 -07:00
YuviPanda
bf2629450c Mark statsd_prefix as configurable as well 2016-03-31 13:46:37 -07:00
YuviPanda
705ff78715 Allow environment config values to be callable
This allows deployments to configure environment variables
that need to be different for each user / container (such as
credentials for various services, etc).
2016-03-31 11:52:53 -07:00
Min RK
a13119a79f Merge pull request #496 from yuvipanda/statsd
Allow specifying statsd host/port/prefix info
2016-03-31 11:18:09 -07:00
YuviPanda
6932719e4e Convert port into string (so that .join works) 2016-03-31 10:32:49 -07:00
YuviPanda
68a750fc7a Use 'Integer' rather than 'Int' for config traitlet 2016-03-30 19:04:57 -07:00
YuviPanda
c6d05d0840 Allow specifying statsd host/port/prefix info
Currently only passes it through to CHP. This is needed
for the cases when JupyterHub spawns and maintains CHP.
2016-03-30 18:59:32 -07:00
Carol Willing
2bbfd75f4d Merge pull request #495 from Carreau/add-import
Import warnings, used on line 215, not imported.
2016-03-29 15:52:39 -07:00
Matthias Bussonnier
26f0e8ea5c Import warnings, used on line 215, not imported. 2016-03-29 15:36:22 -07:00
Carol Willing
552e5caa11 Merge pull request #494 from jupyter/Codecov-badge
Add codecov Badge.
2016-03-29 15:23:54 -07:00
Matthias Bussonnier
7753187e51 Add codecov Badge. 2016-03-29 15:04:17 -07:00
Carol Willing
bddadc7522 Merge pull request #493 from minrk/traitlets-4-1-again
use traitlets 4.1 APIs
2016-03-29 14:51:51 -07:00
Min RK
195eea55f3 log.warning 2016-03-29 09:22:32 -07:00
Min RK
7a2794af7c use traitlets-4.1 observe/default decorators 2016-03-27 10:41:36 -07:00
Min RK
fa48620076 use traitlets-4.1 .tag(config=True) API 2016-03-27 10:29:36 -07:00
Min RK
e4cfe01c4a require traitlets 4.1 2016-03-27 10:21:41 -07:00
Carol Willing
b35e506220 Merge pull request #479 from minrk/config-env
Make Spawner.env configurable
2016-03-24 07:59:44 -07:00
Carol Willing
dd3ed1bf75 Merge pull request #490 from minrk/disable-pam-session
Allow disabling PAM sessions
2016-03-24 07:57:00 -07:00
Min RK
40368b8f55 Allow disabling PAM sessions
it's often buggy and rarely necessary,
so allow it to be disabled when it's causing problems.

It's still on by default for backward-compatibility,
though maybe it shouldn't be.
2016-03-23 23:24:54 +01:00
Min RK
d0f1520642 Add Spawner.environment configurable
instead of making existing Spawner.env configurable

Spawner.env is deprecated
2016-03-22 13:48:26 +01:00
Carol Willing
28c8265c3d Merge pull request #487 from minrk/fix-failed-login-for-none
Fix 'failed login for None' message
2016-03-21 04:51:20 -07:00
Min RK
1d1a8ba78b Fix 'failed login for None' message
on failed login, get username from form data, not the guaranteed-None return value of authenticate
2016-03-21 12:01:31 +01:00
Min RK
a1c764593c travis_retry tests
to hide intermittent failures and enable laziness
2016-03-15 10:37:03 +01:00
Min RK
06902afa2d Merge pull request #481 from willingc/issue-417
Add additional documentation on --no-SSL option
2016-03-15 10:12:18 +01:00
Min RK
6d46f10cfa Merge pull request #480 from willingc/issue-458
Update the configuration section of docs
2016-03-15 10:11:54 +01:00
Carol Willing
b71f34eb3c Fix transposed version number 2016-03-14 16:57:12 -07:00
Carol Willing
11df935f34 Fix awkward wording 2016-03-14 16:54:04 -07:00
Carol Willing
19b6468889 Add no-SSL option to docs 2016-03-14 16:48:49 -07:00
Carol Willing
d2dddd6c82 Update the configuration section of docs, add example 2016-03-14 16:21:24 -07:00
Min RK
5d140fb889 Merge pull request #478 from willingc/readme-docker
Update README re: docker image contents
2016-03-11 22:24:27 +01:00
Matthias Bussonnier
2bf8683905 Merge pull request #477 from willingc/doc-sphinx
Use latest version of Sphinx to fix RTD "Edit on GitHub"
2016-03-11 10:46:52 -08:00
Carol Willing
2dba7f4f61 Update README re: docker image contents 2016-03-11 10:05:13 -08:00
Carol Willing
2820ba319f Update sphinx version for md on rtd 2016-03-11 07:55:49 -08:00
Min RK
be7a627c11 Make Spawner.env configurable
moves `_env_default` logic to `get_env`,
so that `Spawner.env` can be safely configurable
2016-03-11 12:34:49 +01:00
Matthias Bussonnier
2cb1618937 Merge pull request #467 from minrk/add-user-more-often
Call `add_user` more often
2016-03-10 14:45:56 -08:00
Min RK
c9e0c5fe04 Merge pull request #474 from minrk/user.url
allow user.url to be accessed without the server running
2016-03-10 10:28:11 +01:00
Min RK
922956def2 allow user.url to be accessed without the server running
Reduces the number of different ways we need to build the same URLs.
2016-03-09 09:30:50 +01:00
Min RK
c6c699ea89 Merge pull request #472 from yuvipanda/fix-user-encoding
Use encoded URL when redirecting user notebooks
2016-03-09 09:20:43 +01:00
YuviPanda
e0219d0363 Use encoded URL when redirecting user notebooks
Otherwise it breaks for usernames that have url unsafe
characters.
2016-03-08 18:41:35 -08:00
Matthias Bussonnier
f7dab558e4 Merge pull request #468 from minrk/clean-the-pool
set default pool_recycle if using mysql
2016-03-08 11:28:59 -08:00
Min RK
74e558dad2 set default pool_recycle if using mysql 2016-03-08 10:58:18 +01:00
Min RK
96269fac0f Call add_user more often
- Ensures add_user is called as part of startup *for all users*.
  This was previously only true for users not already in the db.
- Normalize usernames in whitelist and admin sets
- Call add_user on new users logged in when there is no whitelist.
2016-03-08 10:49:02 +01:00
Min RK
a0501c6ee4 set patch version to 0 on release 2016-03-08 09:55:44 +01:00
Min RK
ea2ed75ab2 back to dev 2016-03-08 09:00:41 +01:00
Min RK
fc6435825c release 0.5.0 2016-03-08 08:57:33 +01:00
Min RK
b3ab48eb68 Merge pull request #463 from minrk/moar-coverage
Increase some test coverage
2016-03-07 17:13:20 +01:00
Carol Willing
a212151c09 Merge pull request #461 from minrk/0.5
0.5 changelog
2016-03-07 08:07:19 -08:00
Min RK
67ccfc7eb7 increase some test coverage 2016-03-07 16:13:57 +01:00
Min RK
9af103c673 fixes for handling failed chdir in spawners 2016-03-07 15:12:30 +01:00
Min RK
82643adfb6 stop_pending also counts as not running 2016-03-07 14:27:40 +01:00
Min RK
74df94d15a 0.5 changelog 2016-03-07 13:54:40 +01:00
Min RK
da1b9bdd80 Merge pull request #460 from yuvipanda/mysql-fix
Add lengths to all Unicode() columns
2016-03-07 10:36:17 +01:00
Min RK
18675ef6df Merge pull request #453 from minrk/timeout-in-is-up
use the same connection check everywhere
2016-03-07 10:35:12 +01:00
YuviPanda
bf9dea5522 Add lengths to all Unicode() ones
- Otherwise does not work with MySQL
- Change JSONDict to be TEXT (Unbounded) rather than VARCHAR.
  This makes most sense, since you can't index these anyway.
- The 'ip' field in Server is set to 255, since that is the
  max allowed length of DNS entries.
- Most of the rest of the Unicodes have approximately high
  values that most people should not mostly run into
  (famous last words).
2016-03-06 18:26:25 -08:00
Min RK
62e30c1d79 Merge pull request #457 from shreddd/default_url
Enable default_url to pass in to notebook server
2016-03-06 10:33:52 +01:00
shreddd
1316196542 Update spawner.py
type
2016-03-05 12:24:39 -08:00
Shreyas Cholia
1a377bd03a comment on default_url being used with notebook_dir 2016-03-05 12:16:10 -08:00
Shreyas Cholia
66a99ce881 Add support for default_url 2016-03-05 12:05:58 -08:00
shreddd
481debcb80 Merge pull request #1 from jupyter/master
sync master
2016-03-05 12:04:09 -08:00
Carol Willing
03c25b5cac Merge pull request #452 from minrk/redundant-use-subdomain
remove redundant use_subdomains
2016-03-05 11:52:43 -08:00
Carol Willing
26c060d2c5 Merge pull request #456 from willingc/readme-clarify
Add minor clarification to README
2016-03-05 10:57:13 -08:00
Carol Willing
7ff42f9b55 Add @betatim's suggested wording 2016-03-05 10:43:45 -08:00
Carol Willing
a35d8a6262 Add minor clarification 2016-03-05 10:14:44 -08:00
Carol Willing
8f39e1f8f9 Merge pull request #455 from betatim/readme-fix
README uses two different names for docker container
2016-03-05 10:08:34 -08:00
Tim Head
ff19b799c4 container -> cont for consistency 2016-03-05 09:19:15 +01:00
Kyle Kelley
e547949aee Merge pull request #433 from minrk/disable-user-config
allow disabling user configuration of single-user servers
2016-03-04 09:57:45 -06:00
Min RK
31be00b49f failure to connect may be a timeout 2016-03-04 16:28:57 +01:00
Min RK
4533d96002 use the same connection check everywhere
avoids inconsistencies in error handling
2016-03-04 16:28:57 +01:00
Min RK
7f89f1a2a0 expose disable_user_config as Spawner.disable_user_config 2016-03-04 14:41:40 +01:00
Min RK
aed29e1db8 Simplify filter to exclude config in the home directory 2016-03-04 11:43:45 +01:00
Min RK
49bee25820 allow disabling user configuration of single-user servers 2016-03-04 11:43:45 +01:00
Min RK
838c8eb057 Merge pull request #448 from daradib/redirect
Redirect requests to logged in user
2016-03-04 11:15:56 +01:00
Min RK
be5860822d remove redundant use_subdomains
non-empty subdomain_host is enough
2016-03-04 11:11:41 +01:00
Dara Adib
5a10d304c9 Redirect user to login page when not logged in 2016-03-02 16:55:33 -08:00
Dara Adib
fdd3746f54 Add test for user redirect 2016-03-02 16:18:02 -08:00
Dara Adib
4d55a48a79 Redirect requests to logged in user
If a user, alice, requests /user/bob/notebooks/mynotebook.ipynb,
redirect her to /user/alice/notebooks/mynotebook.ipynb.
Currently, such requests get stuck in a redirect loop because
the request will be redirected to login page with a next parameter
that when followed is again redirected.

When notebook_dir is consistent across users, this will allow
users to share notebook URLs. Fixes #424.
2016-03-02 16:15:50 -08:00
Min RK
b2ece48239 reverse arguments in check_routes 2016-03-01 19:42:55 +01:00
Kyle Kelley
6375ba30b7 Merge pull request #445 from minrk/check-routes-pending
Don't add users with spawn_pending to the proxy
2016-03-01 09:19:42 -06:00
Min RK
f565f8ac53 Don't add users with spawn_pending to the proxy
check_routes checks for missing routes for running users.
This is meant for when the proxy has been relaunched outside the Hub.

If spawners are slow to start, it's possible for check_routes to fire in the middle of spawning,
triggering addition of the user's server (which has no defined location yet) to the proxy before it's up.
If the spawning fails, the route will remain indefinitely (because it never should have been added in the first place), and the user will see 503 until their server is launched manually again.

Checking `spawn_pending` in user.running prevents this.
2016-03-01 15:18:51 +01:00
Kyle Kelley
5ec05822f1 Merge pull request #436 from minrk/subdomains
allow running single-user servers on subdomains
2016-02-28 09:49:45 -06:00
Min RK
335b47d7c1 include protocol in subdomain_host
makes everything easier, and tests are passing with and without subdomains (yay!)
2016-02-28 11:12:41 +01:00
Min RK
f922561003 Tests are passing with subdomains 2016-02-26 17:32:55 +01:00
Min RK
79df83f0d3 Allow getting users by name 2016-02-26 17:32:55 +01:00
Min RK
29416463ff proxy needs user dict, which has proxy path
this won't be needed if/when I make a schema change, where domain is included in the Server table.
2016-02-26 17:32:55 +01:00
Min RK
dd2e1ef758 turn off subdomains by default 2016-02-26 17:32:55 +01:00
Min RK
a9b8542ec7 pass hub's host to single-user servers via hub_host 2016-02-26 17:32:54 +01:00
Min RK
a4ae2ec2d8 consolidate cookie setting in _set_user_cookie 2016-02-26 17:32:54 +01:00
Min RK
b54bfad8c2 [WIP]: allow running single-user servers on subdomains
relies on CHP's host-based routing (a feature I didn't add!)

requires wildcard DNS and wildcard SSL for a proper setup

still lots to workout and cleanup in terms of cookies and where to use host, domain, path, but it works locally.
2016-02-26 17:32:54 +01:00
Min RK
724bf7c4ce Merge pull request #441 from jupyter/revert-440-master
Revert "Do not consider `@` character url-safe"
2016-02-26 09:06:46 +01:00
Kyle Kelley
fccc954fb4 Merge pull request #442 from minrk/never-poll-before-start-is-done
avoid calling Spawner.poll during Spawner.start
2016-02-25 08:20:35 -06:00
Kyle Kelley
74385a6906 Merge pull request #443 from minrk/catch-options-from-form
catch exceptions in options_from_form
2016-02-25 08:19:16 -06:00
Min RK
dd66fe63c0 catch exceptions in options_from_form
Allows form validation to be implemented in options_from_form, as well as start.
2016-02-25 12:02:23 +01:00
Min RK
e74934cb17 avoid calling Spawner.poll during Spawner.start
moves `spawn_pending` flag to only around start, not the HTTP wait.

Some Spawners may not know how to poll until start has finished (DockerSpawner).
Let's not require that they do.
2016-02-25 10:13:51 +01:00
Min RK
450281a90a Revert "Do not consider @ character url-safe" 2016-02-25 09:04:25 +01:00
Kyle Kelley
6e7fc0574e Merge pull request #440 from ResearchComputing/master
Do not consider `@` character url-safe
2016-02-24 23:58:45 -06:00
Jonathon Anderson
fc49aac02b Do not consider `@' character url-safe
Usernames that have an `@'-separated domain component
break JupyterHub when the server expects to see query
strings that contain an `@', when browsers and other
clients send `%40'.
2016-02-24 16:48:23 -07:00
Kyle Kelley
097d883905 Merge pull request #435 from minrk/debug-no-server
add debug logging for adding users with no running server
2016-02-20 06:04:12 -08:00
Min RK
cb55118f70 add debug logging for adding users with no running server
in check_routes, it has been reported that users without a running server are attempted to be added.

So something is wrong, either in sqlalchemy or my understanding of what it does (likely the latter),
because a filter for users with a non-None server is returning at least one result whose server is None.
2016-02-20 14:22:50 +01:00
Carol Willing
2a3c87945e Merge pull request #434 from rgbkrk/ssl
Don't let the default include `--no-ssl`.
2016-02-18 16:48:06 -08:00
Kyle Kelley
2b2aacedc6 Don't let the default include --no-ssl. 2016-02-18 16:27:53 -08:00
Kyle Kelley
8ebec52827 Merge pull request #431 from ObiWahn/master
Update README.md
2016-02-18 16:25:56 -08:00
Jan Christoph Uhde
1642cc30c8 fix: run vs exec and split sentence 2016-02-19 00:13:02 +01:00
Kyle Kelley
1645d8f0c0 Merge pull request #432 from minrk/no-port-retries
disable port_retries in single-user server
2016-02-18 06:40:51 -08:00
Min RK
8d390819a1 disable port_retries in single-user server
since Spawners won't notice that the server has started somewhere other than where it was asked to
2016-02-18 09:03:45 +01:00
Jan Christoph Uhde
c7dd18bb03 Update README.md 2016-02-16 22:58:27 +01:00
Min RK
84b7de4d21 set x bit on jupyterhub-singleuser 2016-02-15 21:50:55 +01:00
Carol Willing
161df53143 Merge pull request #426 from takluyver/docs-intro
Add overview to landing page
2016-02-13 11:12:35 -08:00
Thomas Kluyver
1cfd6cf12e Fix grammaros 2016-02-13 18:18:23 +00:00
Thomas Kluyver
d40dcc35fb Reword intro 2016-02-13 16:44:41 +00:00
Thomas Kluyver
a570e95602 Add my overview to intro
Closes gh-425
2016-02-13 15:29:08 +00:00
Thomas Kluyver
e4e43521ee Close code block 2016-02-13 15:28:37 +00:00
Min RK
1b2c21a99c Merge pull request #423 from minrk/custom-logo
allow overriding logo
2016-02-11 15:03:02 +01:00
Min RK
e28eda6386 exercise some static file handlers in tests 2016-02-09 15:38:44 +01:00
Min RK
39c171cce7 allow overriding logo
by specifying JupyterHub.logo_file

also ensures single-user server always has the same logo image as the Hub
2016-02-09 15:38:34 +01:00
Min RK
c81cefd768 Merge pull request #372 from minrk/require-notebook-4
drop support for single-user server from IPython 3.x
2016-02-09 14:42:12 +01:00
Min RK
325f137265 Merge pull request #421 from Fokko/add-docker-label
Added label to dockerfile for referencing
2016-02-09 14:41:48 +01:00
Fokko Driesprong
1ae795df18 Changed domain of the label to .org 2016-02-09 14:16:50 +01:00
Fokko Driesprong
2aacd5e28b Added label to dockerfile for referencing 2016-02-08 17:16:20 +01:00
Kyle Kelley
6e1425e2c0 Merge pull request #417 from minrk/require-confirm-insecure
require confirmation for JupyterHub to run without SSL
2016-02-05 19:27:37 -06:00
Carol Willing
010db6ce72 Merge pull request #416 from willingc/doc-warn
Add more prominent message for https
2016-02-04 14:21:52 -08:00
Min RK
ce8d782220 no-ssl in changelog 2016-02-04 23:00:54 +01:00
Min RK
90c2b23fc0 require confirmation for JupyterHub to run without SSL
ensures folks deploying JupyterHub on HTTP have been told what's up.
2016-02-04 23:00:54 +01:00
Carol Willing
32685aeac1 Add more prominent message for https 2016-02-04 13:42:13 -08:00
Min RK
01c5608104 update version requirements in README 2016-02-04 22:41:18 +01:00
Min RK
a35f6298f0 drop support for single-user server from IPython 3.x 2016-02-04 22:40:44 +01:00
Min RK
8955d6aed4 Merge pull request #411 from minrk/one-two-seven
use 127.0.0.1 instead of localhost
2016-02-04 20:37:09 +01:00
Min RK
cafbf8b990 back to dev 2016-02-03 21:05:48 +01:00
Min RK
7837a9cf68 release 0.4.1 2016-02-03 21:04:32 +01:00
Min RK
65a019e05b Merge pull request #413 from minrk/login_url
Restore /login handler
2016-02-03 21:00:03 +01:00
Min RK
f2014c5687 note that login/logout should always be registered 2016-02-03 20:54:01 +01:00
Min RK
109c315336 changelog for 0.4.1 2016-02-03 16:55:25 +01:00
Min RK
941fc7e627 restore /login page
erroneously removed in 0.4
2016-02-03 16:52:43 +01:00
Min RK
f626d2f6e5 use 127.0.0.1 instead of localhost
localhost can cause some issues on badly behaved or misconfigured systems,
and 127 seems simpler.
2016-02-03 10:30:09 +01:00
Min RK
80215f6b3c Merge pull request #407 from willingc/doc-proxy
Add doc details for #406
2016-02-02 09:06:35 +01:00
Carol Willing
84916062f0 Edit per @minrk and added troubleshooting 2016-02-01 14:17:14 -08:00
Carol Willing
641154bf06 Add doc details for #406 2016-02-01 11:47:08 -08:00
Min RK
14b0dbde0e Merge pull request #405 from willingc/doc-link
Update documentation link to source code
2016-02-01 19:58:08 +01:00
Carol Willing
cd85766441 Update link to source code 2016-02-01 08:42:49 -08:00
Min RK
6c072bdb3d nonempty long_description
avoids dumping README.md garbage onto PyPI
2016-02-01 11:05:58 +01:00
Min RK
35f080458e Upload with twine 2016-02-01 10:41:51 +01:00
Min RK
feac4f6bc4 Changelog for 0.4 2016-02-01 10:41:51 +01:00
Min RK
1bbabbb989 back to dev 2016-02-01 10:37:46 +01:00
Min RK
ad5624c7ce release 0.4.0 2016-02-01 10:37:16 +01:00
Min RK
a7d6c37d26 Merge pull request #400 from willingc/juphub-spawner
Edit tone and grammar in Spawners document
2016-01-29 21:57:51 +01:00
Min RK
b8d9954c28 Merge pull request #402 from mistercrunch/fix_custom_html
Fixing the custom_html feature in the login form
2016-01-29 21:02:45 +01:00
Maxime Beauchemin
927a341764 Fixing the custom_html feature in the login form 2016-01-28 11:25:19 -08:00
Carol Willing
83d092b0ad Minor edit 2016-01-27 22:57:42 -08:00
Carol Willing
95f7889803 Edit the custom spawners doc 2016-01-27 16:48:59 -08:00
Matthias Bussonnier
ceacd72d63 Merge pull request #399 from willingc/newci-badge
Add circleci badge with status only API token
2016-01-25 17:02:29 -08:00
Carol Willing
49c0fa4f08 Add circleci badge with status only API token 2016-01-25 10:56:55 -08:00
Min RK
223318bfff Merge pull request #396 from minrk/test-fixes
If spawner fails to start, show error page
2016-01-25 14:55:07 +01:00
Min RK
9c3f953682 mock pam close session
bug revealed by change in slow_spawn test
2016-01-25 14:29:20 +01:00
Min RK
cc4c65bd0b fix possible loss of port info due to mixed db sessions 2016-01-25 14:28:54 +01:00
Min RK
c4fad21850 If spawner fails to start, show error page
instead of slow-spawner page
2016-01-25 13:32:54 +01:00
Min RK
665907afd3 remove login from default handlers
rely on getting it from LoginHandler
2016-01-25 13:21:21 +01:00
Min RK
8a4305a15c s/chose/choose/ typo 2016-01-25 12:57:19 +01:00
Min RK
7e59148168 ignore node_modules 2016-01-25 12:56:51 +01:00
Min RK
98b44d59c4 Merge pull request #395 from minrk/docker-test
Test docker builds on CircleCI
2016-01-25 12:55:01 +01:00
Min RK
aac357b715 Merge pull request #392 from evanlinde/master
username parameter for notebook_dir
2016-01-25 12:50:47 +01:00
Min RK
2632d03dc2 Merge pull request #391 from minrk/form-error
show error messages on spawn form
2016-01-25 12:46:04 +01:00
Min RK
babb2cf908 test docker builds on circle-ci 2016-01-25 12:32:32 +01:00
Min RK
6a3d790f49 install locale in Dockerfile
and do a little cleanup of temporary installation files
2016-01-25 12:32:32 +01:00
Min RK
9cae91aeb0 Merge pull request #393 from willingc/fix-mdlink
Use relative html link instead of local md
2016-01-22 22:52:01 +01:00
Carol Willing
84f8f8f322 Use relative html link instead of local md 2016-01-22 08:06:30 -08:00
evanlinde
bc4973fb43 username parameter for notebook_dir
Allow specifying user-specific notebook directories outside of user's home folder
2016-01-22 09:47:48 -06:00
Min RK
1a21e822b6 Merge pull request #389 from willingc/fix-docstring
Fix docstrings *ix -> Linux/UNIX to prevent Sphinx build warnings

closes #389
2016-01-22 16:05:31 +01:00
Carol Willing
d437a8f06a Fix docstrings *ix -> Linux/UNIX 2016-01-22 16:05:15 +01:00
Min RK
0555ee44e7 turn on jinja autoescape
now that we are putting user content on the page
2016-01-22 16:02:51 +01:00
Min RK
ef40bd230e Show error messages on spawn form
when spawning fails

instead of 500
2016-01-22 16:02:11 +01:00
Min RK
818510c2ca Merge pull request #381 from minrk/rtd-yml
add preliminary API docs
2016-01-22 12:03:57 +01:00
Min RK
caaab40944 Merge pull request #386 from minrk/dockerfile-jessie
Base Dockerfile on debian:jessie
2016-01-21 13:05:35 +01:00
Min RK
0fb80d43b6 Merge pull request #387 from minrk/single-user-script
make jupyterhub-singleuser a script
2016-01-21 12:55:21 +01:00
Min RK
8146af7240 make jupyterhub-singleuser a script
instead of a module in the package

makes it easier to do `/path/to/python $(which jupyterhub-singleuser)`
2016-01-20 15:41:54 +01:00
Min RK
b9df681115 Merge pull request #353 from minrk/try-localhost
Ensure that we can bind and connect to localhost
2016-01-20 15:37:42 +01:00
Min RK
40a3ebde84 Merge pull request #354 from zoltan-fedor/master
IPv6 ready /etc/hosts file without IPv6 enabled causing localhost issue
2016-01-20 15:37:32 +01:00
Min RK
fbf3b45d52 needs sphinx 1.3 2016-01-20 15:36:26 +01:00
Min RK
eb0a38c136 add preliminary API docs 2016-01-20 15:36:24 +01:00
Min RK
37d42a336f put repo on path
allows autodoc to import jupyterhub without installing it
2016-01-20 15:35:49 +01:00
Min RK
51a04258d1 build on readthedocs 2016-01-20 15:35:49 +01:00
Min RK
1a4226419f Base Dockerfile on debian:jessie
rather than jupyter/notebook

and use conda to get Python 3.5

No longer includes single-user server dependencies
2016-01-20 14:33:39 +01:00
Min RK
ce4cc62c05 Merge pull request #383 from minrk/start-new-session
use start_new_session to detach single-user servers
2016-01-15 17:55:37 +01:00
Min RK
614a0806f5 use start_new_session to detach single-user servers
instead of setpgrp, which causes various problems
2016-01-15 14:21:45 +01:00
Min RK
ff2fef1617 Merge pull request #373 from minrk/normalize-username
Username normalization and validation
2016-01-14 10:16:45 +01:00
Carol Willing
2e6f08268b Merge pull request #380 from minrk/installation
move install commands around a bit
2016-01-13 06:42:36 -08:00
Min RK
ff4019128a move install commands around a bit
npm/less notes are only relevant for dev installs
2016-01-13 15:10:22 +01:00
Min RK
6fd18840a7 Merge pull request #378 from willingc/readme-rtd
Update project README to reflect docs on RTD
2016-01-13 15:07:21 +01:00
Min RK
108d710dcb doc: username normalization and validation 2016-01-13 14:02:51 +01:00
Min RK
aa93384f47 Include system-user creation error message in API reply
when system-user creation fails
2016-01-13 14:02:50 +01:00
Min RK
9441fa37c5 validate usernames
via Authenticator.validate_username

base class configurable with Authenticator.username_pattern
2016-01-13 14:02:50 +01:00
Min RK
beb2dae6ce add username_map 2016-01-13 14:02:50 +01:00
Min RK
887fdaf9d3 add username normalization
Handlers call `get_authenticated_user`, which in turn calls

- authenticate
- normalize_username
- check_whitelist

get_authenticated_user shouldn't need to be overridden.

Normalization can be handled via overriding normalize_username.
2016-01-13 14:02:50 +01:00
Min RK
8a5a85a489 Merge pull request #377 from minrk/swagger-spec
add swagger spec for REST API
2016-01-13 13:08:01 +01:00
Carol Willing
2cc49d317b Add more wording tweaks 2016-01-12 13:55:10 -08:00
Carol Willing
4afa358201 Add some minor formatting 2016-01-12 13:49:04 -08:00
Carol Willing
50a58e5e81 Update README after docs move to RTD 2016-01-12 13:44:08 -08:00
Min RK
479b40d840 add swagger spec for REST API 2016-01-12 16:32:50 +01:00
Min RK
931c2d6f8a Merge pull request #368 from willingc/doc-wip
Sphinx documentation that converts markdown using recommonmark
2016-01-12 16:31:55 +01:00
Min RK
f5746d0765 Merge pull request #375 from betatim/form-file-upload
Handle file upload in spawner form
2016-01-09 23:25:52 +01:00
Tim Head
a59f57e095 Handle file upload in spawner form
Allow files to be uploaded in the spawner form.
2016-01-09 13:53:45 +01:00
Min RK
47549e752d Merge pull request #371 from minrk/delete-user
delete users via UserDict API
2016-01-08 10:32:10 +01:00
Min RK
4534bea86e delete users via UserDict API
avoids reusing user IDs when user creation fails
2016-01-06 15:14:28 +01:00
Carol Willing
2815f72250 Change mocking of slowspawner to match nospawner 2016-01-05 19:45:49 -08:00
Carol Willing
131b695fbb Correct some links 2016-01-05 19:45:49 -08:00
Carol Willing
1bc0d208d3 Move image files 2016-01-05 19:45:49 -08:00
Carol Willing
46a9e8b1c3 Update doc requirements 2016-01-05 19:45:49 -08:00
Carol Willing
04cb5fe503 Add recommonmark parser for markdown 2016-01-05 19:45:49 -08:00
Carol Willing
0ad110f7de Add parsers 2016-01-05 19:45:49 -08:00
Carol Willing
0c5c3eb8b1 Add recommonmark 2016-01-05 19:45:49 -08:00
Carol Willing
bd8b8c55b2 Add initial index file 2016-01-05 19:45:49 -08:00
Carol Willing
e52d2eb27d Add Jupyter customizations 2016-01-05 19:45:49 -08:00
Carol Willing
0b4fbee418 Add sphinx skeleton 2016-01-05 19:45:49 -08:00
Carol Willing
9ee92a3984 Add a requirements for building docs 2016-01-05 19:45:49 -08:00
Carol Willing
f4de573198 Set up docs directory for Sphinx 2016-01-05 19:45:49 -08:00
Min RK
26e00718f9 Merge pull request #366 from minrk/double-redirect
return after redirect to spawner form
2016-01-05 17:19:04 +01:00
Min RK
c878e137aa try codecov for coverage 2016-01-05 14:05:59 +01:00
Min RK
53785a985d return after redirect to spawner form
avoids double-call to redirect, which fails
2016-01-05 14:02:20 +01:00
Min RK
b0cc47984b Merge pull request #364 from minrk/spawn-typo
s/users/user typo in spawn redirect
2015-12-31 17:30:56 +01:00
Min RK
91168fc22b s/users/user typo in spawn redirect 2015-12-31 12:06:04 +01:00
Min RK
66cbb8a614 more testing of spawn page redirects 2015-12-31 12:05:55 +01:00
Min RK
0fbd69be9b Merge pull request #355 from minrk/spawner-options
Add Spawner form page
2015-12-30 16:40:16 +01:00
Min RK
872005f852 document spawner options form 2015-12-30 14:17:58 +01:00
Min RK
647dd09f40 add spawn-form example 2015-12-30 13:55:39 +01:00
Min RK
041c1a4a1e remove always-False else branch 2015-12-30 13:55:38 +01:00
Min RK
d2e3a73f53 set login cookie after starting server
avoids redirect loop
2015-12-30 13:55:38 +01:00
Min RK
2bd7192e89 add extensible get_env hook on Spawner
to make it easier for subclasses to modify the env
2015-12-30 13:55:38 +01:00
Min RK
28f5f33a76 add bootstrap form-control to spawner form inputs 2015-12-30 13:55:38 +01:00
Min RK
f9c9c2b471 options_form is a regular configurable
now that we can assume User.spawner exists at all times
2015-12-30 13:55:38 +01:00
Min RK
41ea696546 Instantiate Spawner on User init
shrinks `User.spawn` to take single argument, grants User more direct access to state.
2015-12-30 13:55:36 +01:00
Min RK
54f9a296de test Spawner.user_options and spawn form 2015-12-30 13:55:01 +01:00
Min RK
ba634354dd Add Spawner form
If Spawner.options_form is specified, a form providing input controls is shown to the user prior to launch.

Spawners access the result via the `self.user_options` dict.

The default spawners offer no form.
2015-12-30 13:55:01 +01:00
Min RK
675f19b5cb Merge pull request #358 from minrk/ipython-traitlets
import base traitlets
2015-12-27 22:26:31 +01:00
Min RK
1eed96193d import base traitlets
missed IPython.utils.traitlets import from old User PR
2015-12-24 12:25:43 +01:00
Zoltan Fedor
faa259e97b IPv6 ready hosts file localhost issue
This is to resolve the 'Network is Unreachable' error experienced by a few when JupyterHUB is connecting to localhost.

On most recent linux OS versions like CentOS 6, 7, Red Hat 6, 7, Oracle Linux 6, 7, etc, the hosts file (/etc/hosts) usually has a line to make the server IPv6-ready:
    ::1 localhost
even if the given server actually has no IPv6 permissioned. In such case the Python socket library when connecting to 'localhost' will try to connect via the IPv6 protocol - which will fail with the 'Network is Unreachable' error.

To solve this we capture this error and try to reconnect on 127.0.0.1 instead of localhost, alias forcing the user of the IPv4 protocol.
2015-12-15 10:53:06 -05:00
Min RK
4785a1ef87 Ensure that we can bind and connect to localhost
otherwise fallback to 127.0.0.1 for defaults
2015-12-15 13:37:30 +01:00
Min RK
aa529f3aba Merge pull request #352 from minrk/sqlalchemy-1.0
require sqlalchemy 1.0
2015-12-14 14:11:52 +01:00
Min RK
98955a5702 require sqlalchemy 1.0
we know 0.7.9 is too old. We might work on 0.8,
but 1.0 is current.
2015-12-14 10:37:48 +01:00
Min RK
2f1a203699 Merge pull request #349 from minrk/adduser
create users with adduser
2015-12-13 13:43:02 +01:00
Brian E. Granger
77b31d8542 Minor fixes to the PR on docs and the default command. 2015-12-13 12:15:31 +01:00
Min RK
8fca4e859d create users with adduser
instead of useradd (on Linux).

- still user `pw useradd` on BSD
- allow complete custom add_user_cmd for specifying directories, etc.
2015-12-13 12:15:31 +01:00
Brian E. Granger
8d90a92ef3 Merge pull request #351 from ellisonbg/token-docs
Edits to the security part of the docs
2015-12-12 15:29:09 -08:00
Brian E. Granger
37424acabf Adding actual secret key... 2015-12-12 15:28:12 -08:00
Brian E. Granger
86a450da77 Edits to the security part of the docs 2015-12-12 14:30:19 -08:00
Min RK
151dcbafb4 Merge pull request #347 from dblockow/feature/log-failed-auth-ip
Log Remote IP Address for Failed Authentication Attempts
2015-12-10 22:51:48 +01:00
David Blockow
d512ee9f65 Fixed to cope with a None handler passed in tests 2015-12-08 15:50:54 +10:30
David Blockow
e59b3f3ab1 Remote IP logged for failed authentication attempts 2015-12-08 15:00:29 +10:30
Min RK
2e7af82865 Merge pull request #185 from minrk/outer-user
move non-persisted User objects (spawner-related) off of orm.User
2015-12-02 12:44:47 +01:00
Min RK
49d4be002b Merge pull request #344 from minrk/system-user-home
add LocalAuthenticator.system_user_home
2015-12-02 10:29:14 +01:00
Min RK
fa8756767d add LocalAuthenticator.system_user_home 2015-12-01 10:36:06 +01:00
Min RK
6f128758db move non-persisted User objects (spawner-related) off of orm.User
adds higher level User object, which handles spawning.
This object has running, spawner, etc. attributes.
2015-11-30 14:05:00 +01:00
Min RK
235746a484 Merge pull request #338 from minrk/dockerfile
install nodejs with one command in Dockerfile
2015-11-25 15:01:57 +01:00
Min RK
37f736cf45 install nodejs with one command in Dockerfile 2015-11-17 14:54:06 +01:00
Min RK
5376291eaa Merge pull request #336 from Fokko/master
Added npm/node which fixes the Dockerfile
2015-11-17 14:52:54 +01:00
Fokko Driesprong
9e738a62d1 Added npm/node which fixes the Dockerfile 2015-11-16 15:55:41 +01:00
Min RK
8bfe52df4f Merge pull request #334 from cwaldbieser/custom_login
Load Authenticator handlers before default handlers
2015-11-10 12:40:57 +01:00
Carl Waldbieser
91ff31f688 Change the order for handlers so that the authenticator handler is added before the default handlers. 2015-11-09 14:17:26 -05:00
Min RK
b7fe3463cf back to dev 2015-11-04 17:13:41 +01:00
Min RK
4931684a2c release 0.3 2015-11-04 17:10:36 +01:00
Min RK
62d3cc53ef changelog for 0.3 2015-11-04 17:09:34 +01:00
Min RK
bd002e5340 Merge pull request #325 from minrk/authenticator-hooks
add pre/post-spawn hooks for Authenticators
2015-11-04 16:07:01 +00:00
Min RK
6f2aefb990 add pre/post-spawn hooks for Authenticators
allows setup/cleanup to be performed by the authenticator

use this to open PAM sessions at spawn
and close them at stop,
rather than open at login and never close.
2015-10-16 12:02:44 +02:00
Min RK
bd3c878c67 Merge pull request #320 from minrk/authenticator-username
get username from authenticator
2015-10-06 15:43:22 +02:00
Min RK
c1de376b6a Merge pull request #310 from minrk/singleuser-notebook
single-user imports notebook package directly
2015-10-06 14:08:35 +02:00
Min RK
4cc74d287e get username from authenticator 2015-10-06 13:36:34 +02:00
Min RK
411a7a0bd8 single-user imports notebook package directly
instead of relying on IPython.html shims

when should we drop support for IPython 3?
2015-09-24 16:13:28 +02:00
Min RK
498c062ee0 Merge pull request #309 from minrk/gen.sleep
use gen.sleep
2015-09-24 16:09:55 +02:00
Min RK
d1edbddb77 use gen.sleep
instead of elaborate `gen.Task(add_timeout...)`

requires tornado 4.1
2015-09-23 17:04:01 +02:00
Min RK
0c9214ffb7 Merge pull request #307 from minrk/test-3.5
test on 3.5
2015-09-22 14:17:30 +02:00
Min RK
db0aaf1027 test on 3.5
requires pytest >= 2.8
2015-09-22 14:09:23 +02:00
Min RK
42681f8512 Merge pull request #306 from minrk/test-token-username
update token app test
2015-09-22 14:08:41 +02:00
Min RK
e5c1414b6a update token app test
now that admin user isn't added by default
2015-09-22 10:14:11 +02:00
Min RK
d857c20de0 Merge pull request #304 from minrk/rm-default-admin
Remove implicit admin of launching user
2015-09-22 08:59:28 +02:00
Min RK
a267174a03 Remove implicit admin of launching user
instead, warn about missing admins and point to config.
2015-09-21 10:52:19 +02:00
Min RK
768eeee470 Merge pull request #298 from minrk/spawner-authenticator
give Spawners a handle on the Authenticator
2015-09-11 14:24:38 +02:00
Min RK
a451f11cd3 give Spawners a handle on the Authenticator
band-aid for spawner-authenticator pairs
2015-09-11 11:57:41 +02:00
Min RK
63a476f9a6 remove some unused cruft from spawner 2015-09-11 11:23:00 +02:00
Min RK
100b17819d Merge pull request #296 from minrk/pamela
use pamela instead of simplepam
2015-09-11 11:02:14 +02:00
Min RK
024d8d7378 update mocking for pamela 2015-09-09 14:24:53 +02:00
Min RK
15e50529ff use pamela instead of simplepam
and open PAM sessions after successful auth
2015-09-09 13:55:02 +02:00
Min RK
a1a10be747 Merge pull request #290 from jhamrick/clear-login-cookies
Unset all login cookies
2015-08-22 18:55:30 -07:00
Jessica B. Hamrick
a91ee67e74 Reset other_user_cookies after clearing them 2015-08-22 13:14:05 -07:00
Jessica B. Hamrick
ea5bfa9999 Unset all login cookies 2015-08-21 19:24:44 -07:00
Min RK
bea58ee622 Merge pull request #288 from minrk/dont-auto-redirect-root
redirect unauthenticated root to *regular* login page
2015-08-19 21:44:00 -07:00
Min RK
b698d4d226 redirect root to *regular* login page
shows "Login with..." button for external services
instead of auto-redirecting to login service
(no good for oauth)
2015-08-19 12:43:32 -07:00
Min RK
139c7ecacb always render login page at /login 2015-08-19 12:30:10 -07:00
Min RK
eefa8fcad7 Merge pull request #284 from minrk/double-base-url
remove double base_url in login redirect
2015-08-06 21:48:49 -07:00
Min RK
acaedcd898 remove double base_url in login redirect
user.server.base_url is already correct,
and shouldn't be joined with the hub url
2015-08-06 21:37:06 -07:00
Min RK
a075661bfb Merge pull request #276 from Crunch-io/redirect-to-login
Redirect unauthenticated root to login
2015-07-23 13:00:16 -07:00
Joseph Tate
f2246df5bb Fix logging and comments 2015-07-23 15:08:53 -04:00
Joseph Tate
1a3c062512 Fix broken test 2015-07-23 15:06:20 -04:00
Joseph Tate
05e4ab41fe Redirect to the loginurl when not logged in, fix the user.running redirect to fix a redirect loop 2015-07-23 15:06:03 -04:00
Min RK
6f3ccb2d3d Merge pull request #275 from jhamrick/installation-instructions
Update installation instructions
2015-07-14 22:06:52 -07:00
Jessica B. Hamrick
6e5ce236c1 Update installation instructions 2015-07-14 15:36:35 -07:00
Min RK
58437057a1 back to dev 2015-07-12 15:30:47 -05:00
Min RK
7d39e6a1a3 release 0.2.0 2015-07-12 15:30:02 -05:00
Min RK
0b1aebbbf4 Merge pull request #274 from minrk/check-referer
port security fixes from IPython
2015-07-12 15:27:26 -05:00
Min RK
3003c87f02 check Referer on API requests
For CSRF
2015-07-12 14:23:02 -05:00
Min RK
2c8c88ac3f add CSP report handler 2015-07-12 11:22:21 -05:00
Min RK
db994e09d3 add OPTIONS on API handlers 2015-07-12 11:22:21 -05:00
Min RK
357ba23ff3 set csp_report_uri in single-user server
so Hub gets CSP reports instead of single-user servers.
2015-07-12 11:22:21 -05:00
Min RK
54c0c276ed use hmac.compare_digest for constant time comparisons on tokens 2015-07-12 11:22:21 -05:00
Min RK
baf8bd9e03 Merge pull request #269 from minrk/travis-segfaulty
Use thread local storage to avoid sharing db sessions in tests
2015-07-09 15:08:55 -05:00
Min RK
e866abe1a0 use thread-local properties for hub, proxy 2015-07-09 11:34:35 -05:00
Min RK
48fe642c44 use thread local db sessions
to avoid segfaults on Travis
2015-07-09 11:34:35 -05:00
Min RK
c8487c2117 Merge pull request #268 from dietmarw/patch-1
ipython/ipython is deprecated.
2015-07-09 09:19:47 -05:00
Dietmar Winkler
0d6ee3c63c ipython/ipython is deprecated.
The correct one is now jupyter/notebook
2015-07-09 09:53:18 +02:00
Min RK
a00abc7a76 Merge pull request #267 from minrk/strict-next
require next_url to be an absolute path
2015-07-07 12:33:19 -05:00
Min RK
02c8855d10 Merge pull request #264
add supplemental groups to single-user servers

closes #264
2015-07-07 12:31:33 -05:00
Min RK
b5877ac546 Catch failure to set gids 2015-07-07 12:28:17 -05:00
Min RK
ea91bed620 require next_url to be an absolute path
- disallow relative path
- disallow full URL (cross-site)
2015-07-07 11:28:44 -05:00
Min RK
3e81e2ebf9 Merge pull request #265 from jhamrick/docs
Add some docs clarifications
2015-06-26 08:13:49 +01:00
Jessica B. Hamrick
e9e2b17a92 Move npm install to a different part of the docs 2015-06-26 01:41:14 -04:00
Jessica B. Hamrick
498181d217 Remove sudo from npm install 2015-06-26 01:37:26 -04:00
Jessica B. Hamrick
9f807a5959 Add some docs clarifications 2015-06-25 14:48:18 -04:00
shreddd
d328015fe8 add supplemental groups to the local user notebook
Set the list of supplemental group ids for the user associated with the spawned notebook process. This allows users to access utilize their full complement of UNIX system groups. Currently the user is restricted to their default group - accessing a file owned by any other group does not work, even if a user is a member of that group. This patch fixes that.
2015-06-24 14:56:44 -07:00
Min RK
cbbc0290b9 Merge pull request #263 from minrk/test-singleuser
single-user should still be using IPython.utils.traitlets
2015-06-24 12:53:25 -07:00
Min RK
7477f2f6d1 make sure to launch single-user server at least once in tests 2015-06-24 08:47:51 -07:00
Min RK
c03e50b3a2 single-user should still be using IPython.utils.traitlets
We haven't moved to using notebook 4.0 in the single-user, yet
2015-06-24 08:46:56 -07:00
Min RK
cfd19c3e61 Merge pull request #261 from minrk/traitlets
remove dependency on IPython
2015-06-22 22:56:08 -07:00
Min RK
c289cdfaec remove dependency on IPython
- Standalone traitlets has been released, use it directly.
- Copy url_path_join from notebook
2015-06-22 16:02:45 -07:00
Min RK
7acaf8ce52 Merge pull request #260 from minrk/notebook-aliases
don't try to get notebook aliases from NotebookApp
2015-06-22 15:59:50 -07:00
Min RK
e5821e573a don't try to get notebook aliases from NotebookApp
Sentinel changes make it ~impossible to fetch values without instantiation,
which probably wasn't the best idea in the first place.
2015-06-22 14:50:37 -07:00
Min RK
0c16fb98f3 Merge pull request #257 from minrk/command-traitlet
add command traitlet
2015-06-19 10:46:38 -07:00
Min RK
b27ef8e4cb we're not in the future, yet. 2015-06-12 14:09:05 -07:00
Min RK
6cfd186f06 proxy_cmd is a list 2015-06-12 14:01:57 -07:00
Min RK
552859084c simplify some installation notes
- use pip3 / python3
2015-06-12 11:22:13 -07:00
Min RK
6e8a58091e prioritize Google Group over Gitter for help 2015-06-12 11:18:44 -07:00
Min RK
6b0aee2443 Merge pull request #259 from nthiery/master
Removed sudo from pip install instructions

closes #258
2015-06-10 16:32:35 -07:00
Nicolas M. Thiéry
8d00ccc506 Removed sudo from pip install instructions, ...
Attempt at implementing @minrk's suggestion

https://github.com/jupyter/jupyterhub/pull/258#issuecomment-110932499
2015-06-11 00:54:32 +02:00
Min RK
86e31dffa5 add command traitlet
allows specifying commands as either strings or list.

This enables adding arguments to JupyterHub.proxy_cmd without breaking backward-compatibility.
2015-06-03 20:05:20 -08:00
Min RK
f421d1a6da Merge pull request #256 from KrishnaPG/master
Added note about pip3 and zmq
2015-05-30 14:35:47 -07:00
Gopalakrishna Palem
9112ad0f4a Added note about pip3 and zmq
Updated Readme.md with optional dependencies
2015-05-30 08:34:16 +05:30
Min RK
354aeb96af Merge pull request #255 from quantopian/query_args
Include query arguments in GET requests to the notebook server (once it spawns)
2015-05-28 13:03:49 -07:00
Tim Shawver
ff1bf7c4c0 Don't strip query string parameters out of GET requests to the notebook server.
Using self.request.uri instead of self.request.path in a few places accomplishes this.
2015-05-28 15:05:39 -04:00
Kyle Kelley
1ff659a847 Merge pull request #251 from minrk/version
fix `jupyterhub --version` output
2015-05-11 15:16:45 -05:00
Min RK
de40310f54 fix jupyterhub --version output 2015-05-11 10:32:46 -07:00
Min RK
72d9592241 avoid import * in __init__ 2015-05-11 10:32:21 -07:00
Fernando Perez
087a93f9ef Merge pull request #250 from minrk/multi-user-add
create multiple users in admin panel
2015-05-06 20:54:23 -07:00
Min RK
4d73f4eedb note that admin is a single value 2015-05-06 15:35:23 -07:00
Min RK
612cc73c3c skip existing users on bulk user creation
rather than aborting if any already exist

if no users are to be created, throw 400
2015-05-06 15:24:34 -07:00
Min RK
c9d02382e3 fixup 2015-05-06 15:14:08 -07:00
Min RK
da647397ac create multiple users in admin panel
usernames separated by lines
2015-05-06 14:03:19 -07:00
Min RK
546d86e888 allow creating multiple users with one API request 2015-05-06 14:01:31 -07:00
Min RK
36bc07b02e add gitter badge 2015-05-05 14:32:24 -07:00
Min RK
81b13c6660 Merge pull request #245 from minrk/user-name
fix auth key in single-user check
2015-05-02 19:01:09 -05:00
Min RK
b0ef2c4c84 fix auth key in single-user check 2015-05-02 15:22:03 -05:00
Min RK
38024c65d8 Merge pull request #209 from minrk/user-model
reply with full user model in auth handlers
2015-05-01 18:32:21 -07:00
Min RK
80997c8297 reply with full user model in auth handlers 2015-05-01 13:43:43 -07:00
Min RK
c467c64e01 move user_model handling to base APIHandler 2015-05-01 13:41:08 -07:00
Min RK
3fd80f9f3a Merge pull request #243 from minrk/url-name
quote usernames in URLs, cookies
2015-04-30 12:07:33 -07:00
Min RK
d4a4d04183 quote usernames
allow @ to be left unescaped in URLs, quote everything in cookie names
2015-04-30 12:04:32 -07:00
Min RK
f6a3f371b4 Merge pull request #241 from toobaz/url_path_join_from_jupyter_notebook
Get url_path_join from jupyter_notebook
2015-04-24 15:51:11 -07:00
Min RK
8fb74c8627 Merge pull request #240 from quantopian/configurable-headers
DEV: Allow configuration of default headers.
2015-04-24 10:14:43 -07:00
Pietro Battiston
fd6e6f1ded Get url_path_join from jupyter_notebook 2015-04-24 12:34:33 +02:00
Scott Sanderson
74d3740921 DEV: Allow configuration of default headers.
Applies Content-Security-Policy: frame-ancestors 'self' by default.
2015-04-24 01:19:25 -04:00
Min RK
1674d2f698 Merge pull request #238 from quantopian/configurable-templates
DEV: Make template search path configurable.
2015-04-23 14:26:40 -07:00
Tim Shawver
e5d9d136da One more place where template_path needed to be changed to template_paths 2015-04-23 12:32:59 -04:00
Scott Sanderson
1d6b16060b DEV: Make template search path configurable. 2015-04-23 11:08:32 -04:00
Min RK
cd268af799 Merge pull request #236 from quantopian/py2-compat
DEV: Python2 compat in singleuser.py
2015-04-20 15:45:40 -07:00
Scott Sanderson
bc37c729ff DEV: Failover for urrlib.parse.quote in PY2. 2015-04-20 16:51:46 -04:00
Min RK
d277951fa7 Merge pull request #232 from minrk/init-order
reorder server init
2015-04-17 12:51:32 -07:00
Min RK
e4b214536d Merge pull request #233 from minrk/single-user-xheaders
trust proxy headers in single-user server
2015-04-17 12:50:56 -07:00
Min RK
713f222e19 trust proxy headers in single-user server
required for request protocol, ip checks to work properly
2015-04-17 10:37:25 -07:00
Min RK
6b32a5c2d8 Merge pull request #231 from Carreau/secure-cookie
Make cookie secure if used over https
2015-04-17 10:33:48 -07:00
Min RK
5dc38b85eb reorder server init
So the Hub private interface isn't the last thing logged,
which caused lots of confusion.
2015-04-17 10:33:03 -07:00
Matthias Bussonnier
494e4fe68b Make cookie secure if used over https 2015-04-17 10:13:28 -07:00
Min RK
778202ada8 Merge pull request #222 from minrk/log-login
log login / logout at info-level
2015-04-12 14:29:58 -07:00
Min RK
6029204383 Merge pull request #191 from minrk/getting-started
add getting started doc
2015-04-12 14:29:44 -07:00
Min RK
30eef4d353 finish up first round of getting-started 2015-04-12 14:12:04 -07:00
Min RK
b30be43d22 move admin_users from JupyterHub to Authenticator 2015-04-12 14:12:02 -07:00
Brian E. Granger
ca1380eb06 Addressing review comments. 2015-04-12 14:10:55 -07:00
Brian E. Granger
491ee38a37 More edits... 2015-04-12 14:10:55 -07:00
Brian E. Granger
5a9687b02a Editing getting started doc. 2015-04-12 14:10:55 -07:00
Min RK
6b09ff6ef2 add getting started doc 2015-04-12 14:10:55 -07:00
Brian E. Granger
bdbb6164d5 Merge pull request #228 from minrk/no-empty-shell
don't set empty values for HOME, SHELL
2015-04-12 11:09:22 -07:00
Min RK
2890e27052 don't set empty values for HOME, SHELL
in weird cases (probably misconfigured systems),
these can be empty strings.
Leave them unset in such cases.
2015-04-12 11:04:17 -07:00
Min RK
43f13086cf Merge pull request #226 from minrk/last-activity-stop
don't update last_activity on shutdown
2015-04-09 09:58:08 -07:00
Min RK
e883fccf2b don't update last_activity on shutdown 2015-04-08 12:48:04 -07:00
Min RK
364c648d6f Merge pull request #223 from minrk/token-init-hub
assign hub in token app
2015-04-08 11:58:10 -07:00
Min RK
637cc1a7bb split user init into two stages
- init_users populates users table
- init_spawners initializes spawner objects

only the first is needed by the token app
2015-04-08 11:47:49 -07:00
Min RK
6aae4be54d assign hub in token app
avoids AttributeError on hub if there are
users with running servers.

Don't call init_hub,
which can modify the Hub's entries in the database,
which shouldn't happen in the token command.
2015-04-08 11:06:09 -07:00
Min RK
dbc410d6a1 log login / logout at info-level 2015-04-08 10:49:13 -07:00
Brian E. Granger
7ed9c9b6c0 Merge pull request #221 from minrk/debug-clear-cookie
Demote cookie clear message to debug-level
2015-04-07 21:58:39 -07:00
Min RK
ffece0ae79 Demote cookie clear message to debug-level 2015-04-07 21:56:25 -07:00
Min RK
59fda9632a Merge pull request #220 from minrk/coverage
add some test coverage
2015-04-07 16:21:45 -07:00
Min RK
998fc28c32 various testing cleanup
- Disable signal register during testing.
  It doesn't work in background threads.
- Fix IOLoop instance management.
  Some instances were being reused across tests.
2015-04-07 16:09:27 -07:00
Min RK
34386ba3b7 more authenticator coverage 2015-04-07 15:49:25 -07:00
Min RK
64c4d00756 test add_system_user 2015-04-07 15:49:25 -07:00
Min RK
04b7056591 fix group-whitelist checks
and test it
2015-04-07 15:49:25 -07:00
Min RK
d9fc40652d test shutdown API handler 2015-04-07 15:49:25 -07:00
Min RK
d0b4e5bc2a add some basic exercise for HTML pages 2015-04-07 15:49:24 -07:00
Min RK
9372d5f872 add coverage 2015-04-07 15:49:24 -07:00
Min RK
ce59815e16 Merge pull request #205 from minrk/page-flow
Update page flow based on dev meeting
2015-04-07 11:12:07 -07:00
Min RK
7c5e89faa6 use jupyter logo 2015-04-06 10:56:36 -07:00
Min RK
0fe3dab408 use jinja FunctionLoader instead of monkey patch to add Control Panel button 2015-03-31 15:04:17 -07:00
Min RK
789ee44d85 Merge pull request #217 from kyper-data/master
switched app and singleuser to run under python3 by default
2015-03-31 14:27:08 -07:00
Min RK
163a4db3ad single-user login url is now the root hub page 2015-03-31 13:58:09 -07:00
Min RK
50d1f78b61 add control panel link to single-user header
This is done by defining the `headingcontainer` block as a function, and inserting it into the template rendering.

Without monkeypatching, we could use a custom template file,
but that would make the single-user server require its own template path,
while it currently functions as a fully encapsulated single script.
2015-03-31 13:58:07 -07:00
Min RK
ab0010fa32 finish removing logout page 2015-03-31 13:56:49 -07:00
Min RK
1bc8d50261 add "Login with..." button
for custom authenticators that use external services (e.g. OAuth)
2015-03-31 13:56:49 -07:00
Min RK
24fd843c3c render login form at root
- redirect to server, if running (hub home, otherwise)
2015-03-31 13:56:49 -07:00
Min RK
cffdf89327 remove logout page
redirect to landing page, instead
2015-03-31 13:56:49 -07:00
Min RK
2e53de0459 Merge pull request #216 from minrk/allow_none
add missing allow_none=True in Spawner
2015-03-31 13:56:19 -07:00
Kyle Solan
80531341c0 switched app and singleuser to run under python3 by default 2015-03-31 19:54:13 +00:00
Min RK
94a3584620 Merge pull request #215 from minrk/cunicode-user
cast user to unicode
2015-03-30 13:19:51 -07:00
Min RK
12a1ec7f57 add missing allow_none=True in Spawner 2015-03-30 13:18:09 -07:00
Min RK
d13286606a cast user to unicode
allows numerical usernames without fighting with the config system.
2015-03-30 11:23:52 -07:00
Min RK
e39e6d2073 Merge pull request #211 from peterruppel/patch-1
Make the hub bind to address specified in hub_ip
2015-03-24 16:31:54 -07:00
Peter Ruppel
904c848bcc Make the hub bind to address specified in hub_ip
Bug: the hub binds to all interfaces and ignores the address given in 'hub_ip'. The 'address' parameter was missing in the call http_server.listen().
2015-03-24 20:15:29 +01:00
Min RK
038aae7e0a Merge pull request #208 from minrk/log-requests
customize request logging
2015-03-24 11:54:04 -07:00
Min RK
ba81bd4a01 Merge pull request #190 from minrk/bind_url
url logging
2015-03-24 11:52:33 -07:00
Min RK
36d62672df Merge pull request #207 from minrk/get-cookie-body
use `cookie_name/cookie_value` URL for cookie checking API
2015-03-24 09:48:17 -07:00
Min RK
ffd334b5ff Merge pull request #189 from jdavidheiser/master
set user shel from pw_shell

closes #189
closes #204
2015-03-23 17:55:44 -07:00
James Davidheiser
7701b82f58 replace using server shell with user shell
Per discussion on PR, replaced the heavy-handed setting of the shell environment variable through the server environment variables.
2015-03-23 17:55:16 -07:00
James Davidheiser
7ca96e5c6c spawner.py update for default shell
Update spawner.py to do a better job keeping the shell variable intact for terminals launched from within the notebook.
2015-03-23 17:55:16 -07:00
Min RK
3be33f2884 escape cookie value in auth uri
requests didn't seem to need it,
but I feel safer doing it explicitly.
2015-03-23 16:17:28 -07:00
Min RK
3d6a0c126f custom request logging
adapted from IPython

- demotes static page success, cache hits to debug-level
- removes auth info from log messages
- logs usernames for authenticated requests
2015-03-23 15:45:57 -07:00
Min RK
39a7feea72 use cookie_name/cookie_value URL for cookie checking API
instead of putting the value in the request body,
which is verboten for GET requests
2015-03-23 15:14:36 -07:00
Min RK
5529774c1d url logging
log the actual bind url (Server.bind_url),
rather than the connect url (Server.url),
which converts all-interfaces IPs to 'localhost'
2015-03-23 12:12:10 -07:00
Min RK
ffb2ba055a remove inappropriate argv in Hub.instance() 2015-03-23 12:06:07 -07:00
Min RK
2a2f9c0b67 Merge pull request #189 from minrk/timeout-spawn-error
better error messages for spawn failure
2015-03-23 11:55:15 -07:00
Min RK
3e89f45954 Merge pull request #197 from minrk/expire-token
expire login cookies
2015-03-23 11:51:08 -07:00
Min RK
fad5f5a61d Merge pull request #200 from quantopian/group_auth
DEV: Allow setting a whitelist_group on LocalAuthenticator.
2015-03-22 21:22:49 -07:00
Scott Sanderson
ed94c2d774 BUG: group_whitelist is a set, not a scalar. 2015-03-22 14:51:10 -04:00
Scott Sanderson
77c66d8b27 DEV: Make group/user whitelist mutually exclusive.
If group whitelist is provided, it takes precedence.
2015-03-19 10:42:55 -04:00
Scott Sanderson
33a4f31520 DEV: Allow setting a whitelist_group on LocalAuthenticator.
Any user in the group is considered in the whitelist.
2015-03-18 19:20:10 -04:00
Min RK
3fb2afc2bd expire login cookies
via tornado's max_age_days mechanism

default expiry is two weeks
2015-03-17 12:56:06 -06:00
Min RK
8787335b01 Merge pull request #196 from quantopian/invalidate-su-cookies
DEV: Periodically clear single-user server cookie cache.
2015-03-17 12:46:54 -06:00
Min RK
376ee29b12 Merge pull request #195 from minrk/chp-missing
better error when proxy command isn't found
2015-03-17 12:44:30 -06:00
Scott Sanderson
5e16e6f52f DEV: Periodically clear single-user server cookie cache.
Default is every 5 minutes.
2015-03-17 13:48:44 -04:00
Min RK
ce45fde74a better error when proxy command isn't found 2015-03-17 11:46:12 -06:00
Min RK
665edb6651 Merge pull request #194 from quantopian/handle-404-auth
BUG: Correctly handle 404 from hub.
2015-03-17 10:54:38 -06:00
Scott Sanderson
f98c8feaae BUG: Correctly handle 404 from hub.
Previously, the `if r.status_code == 404` branch was being trampled by a
later `if r.status_code > 400` branch.
2015-03-17 12:00:26 -04:00
Min RK
5100dd29c2 note when installing with npm 2015-03-14 14:32:31 -06:00
Min RK
40ae3a5821 Merge pull request #188 from blippy/master
Make jupyterhub and jupyterhub-singleuser executable and call python3
2015-03-13 12:57:58 -07:00
Min RK
da1fe54aee better error messages for spawn failure
Server started, but never became accessible:

> Failed to reach your server.
> Please try again later.
> Contact admin if the issue persists.

Server failed to start (errors in Spawner):

> Failed to start your server.
> Please contact admin.
2015-03-13 12:12:36 -07:00
Min RK
545739472e make default http timeout 30 seconds
some computers can be very slow to start
2015-03-13 12:04:07 -07:00
mark carter
36bb03dc3f Make jupyterhub and jupyterhub-singleuser executable and call python3 2015-03-13 09:01:00 +00:00
Min RK
61fa2d9ef2 Merge pull request #182 from Carreau/theme
Better Theme II
2015-03-08 18:26:42 -07:00
Matthias Bussonnier
301560b6f8 use bootstrap variables 2015-03-08 18:06:43 -07:00
Matthias Bussonnier
5bd649829a remove dropdown 2015-03-08 17:44:46 -07:00
Matthias Bussonnier
eccf2fe5be Make theme closer to notebook.
improvement of admin page split
edit/delete in their own column
2015-03-08 17:39:46 -07:00
Min RK
e82683d14f remove 'workaround' that didn't workaround anything 2015-03-08 17:25:53 -07:00
Min RK
2455680ab8 cleanup bizarre login html 2015-03-08 17:21:04 -07:00
Min RK
827f694589 simplify login css
use mixins, remove lots of unnecessary CSS
2015-03-08 17:21:04 -07:00
Min RK
fa7e230b6e Merge pull request #56 from Carreau/master
Implementation of login page design
2015-03-08 17:20:23 -07:00
Min RK
42a8094b20 add links to wiki auth/spawner lists
from the docs
2015-03-07 17:08:13 -08:00
Min RK
a898063b83 back to dev 2015-03-07 16:48:20 -08:00
Matthias Bussonnier
c0b67770e4 make color and gradient more logo-like 2015-03-06 12:25:07 -08:00
Matthias Bussonnier
791e527695 do not change brand primary, plus rework login form 2015-03-06 12:06:45 -08:00
Matthias Bussonnier
a6b79780b3 compute gradient 2015-03-03 17:14:58 -08:00
Matthias Bussonnier
25bcb6ede4 fix bootstrap bug 2015-03-03 17:09:30 -08:00
Bussonnier Matthias
839bd79bbd Implementation of login page design 2015-03-03 16:53:35 -08:00
405 changed files with 70585 additions and 4483 deletions

View File

@@ -1,3 +0,0 @@
{
"directory": "share/jupyter/hub/static/components"
}

18
.coveragerc Normal file
View File

@@ -0,0 +1,18 @@
[run]
parallel = True
branch = False
omit =
jupyterhub/tests/*
jupyterhub/alembic/*
[report]
exclude_lines =
if self.debug:
pragma: no cover
raise NotImplementedError
if __name__ == .__main__.:
ignore_errors = True
omit =
jupyterhub/tests/*
jupyterhub/alembic/*
*/site-packages/*

View File

@@ -3,3 +3,8 @@ bench
jupyterhub_cookie_secret
jupyterhub.sqlite
jupyterhub_config.py
node_modules
docs
.git
dist
build

19
.flake8 Normal file
View File

@@ -0,0 +1,19 @@
[flake8]
# Ignore style and complexity
# E: style errors
# W: style warnings
# C: complexity
# D: docstring warnings (unused pydocstyle extension)
# F841: local variable assigned but never used
ignore = E, C, W, D, F841
builtins = c, get_config
exclude =
.cache,
.github,
docs,
jupyterhub/alembic*,
onbuild,
scripts,
share,
tools,
setup.py

16
.github/dependabot.yaml vendored Normal file
View File

@@ -0,0 +1,16 @@
# dependabot.yaml reference: https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
#
# Notes:
# - Status and logs from dependabot are provided at
# https://github.com/jupyterhub/jupyterhub/network/updates.
#
version: 2
updates:
# Maintain dependencies in our GitHub Workflows
- package-ecosystem: github-actions
directory: /
labels: [ci]
schedule:
interval: monthly
time: "05:00"
timezone: Etc/UTC

230
.github/workflows/release.yml vendored Normal file
View File

@@ -0,0 +1,230 @@
# This is a GitHub workflow defining a set of jobs with a set of steps.
# ref: https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions
#
# Test build release artifacts (PyPI package, Docker images) and publish them on
# pushed git tags.
#
name: Release
on:
pull_request:
paths-ignore:
- "docs/**"
- "**.md"
- "**.rst"
- ".github/workflows/*"
- "!.github/workflows/release.yml"
push:
paths-ignore:
- "docs/**"
- "**.md"
- "**.rst"
- ".github/workflows/*"
- "!.github/workflows/release.yml"
branches-ignore:
- "dependabot/**"
- "pre-commit-ci-update-config"
tags:
- "**"
workflow_dispatch:
jobs:
build-release:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.11"
- uses: actions/setup-node@v4
with:
node-version: "20"
- name: install build requirements
run: |
npm install -g yarn
pip install --upgrade pip
pip install build
pip freeze
- name: build release
run: |
python -m build --sdist --wheel .
ls -l dist
- name: verify sdist
run: |
./ci/check_sdist.py dist/jupyterhub-*.tar.gz
- name: verify data-files are installed where they are found
run: |
pip install dist/*.whl
./ci/check_installed_data.py
- name: verify sdist can be installed without npm/yarn
run: |
docker run --rm -v $PWD/dist:/dist:ro docker.io/library/python:3.9-slim-bullseye bash -c 'pip install /dist/jupyterhub-*.tar.gz'
# ref: https://github.com/actions/upload-artifact#readme
- uses: actions/upload-artifact@v4
with:
name: jupyterhub-${{ github.sha }}
path: "dist/*"
if-no-files-found: error
- name: Publish to PyPI
if: startsWith(github.ref, 'refs/tags/')
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: |
pip install twine
twine upload --skip-existing dist/*
publish-docker:
runs-on: ubuntu-22.04
timeout-minutes: 20
services:
# So that we can test this in PRs/branches
local-registry:
image: registry:2
ports:
- 5000:5000
steps:
- name: Should we push this image to a public registry?
run: |
if [ "${{ startsWith(github.ref, 'refs/tags/') || (github.ref == 'refs/heads/main') }}" = "true" ]; then
echo "REGISTRY=quay.io/" >> $GITHUB_ENV
else
echo "REGISTRY=localhost:5000/" >> $GITHUB_ENV
fi
- uses: actions/checkout@v4
# Setup docker to build for multiple platforms, see:
# https://github.com/docker/build-push-action/tree/v2.4.0#usage
# https://github.com/docker/build-push-action/blob/v2.4.0/docs/advanced/multi-platform.md
- name: Set up QEMU (for docker buildx)
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx (for multi-arch builds)
uses: docker/setup-buildx-action@v3
with:
# Allows pushing to registry on localhost:5000
driver-opts: network=host
- name: Setup push rights to Docker Hub
# This was setup by...
# 1. Creating a [Robot Account](https://quay.io/organization/jupyterhub?tab=robots) in the JupyterHub
# . Quay.io org
# 2. Giving it enough permissions to push to the jupyterhub and singleuser images
# 3. Putting the robot account's username and password in GitHub actions environment
if: env.REGISTRY != 'localhost:5000/'
run: |
docker login -u "${{ secrets.QUAY_USERNAME }}" -p "${{ secrets.QUAY_PASSWORD }}" "${{ env.REGISTRY }}"
docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" -p "${{ secrets.DOCKERHUB_TOKEN }}" docker.io
# image: jupyterhub/jupyterhub
#
# https://github.com/jupyterhub/action-major-minor-tag-calculator
# If this is a tagged build this will return additional parent tags.
# E.g. 1.2.3 is expanded to Docker tags
# [{prefix}:1.2.3, {prefix}:1.2, {prefix}:1, {prefix}:latest] unless
# this is a backported tag in which case the newer tags aren't updated.
# For branches this will return the branch name.
# If GITHUB_TOKEN isn't available (e.g. in PRs) returns no tags [].
- name: Get list of jupyterhub tags
id: jupyterhubtags
uses: jupyterhub/action-major-minor-tag-calculator@v3
with:
githubToken: ${{ secrets.GITHUB_TOKEN }}
prefix: >-
${{ env.REGISTRY }}jupyterhub/jupyterhub:
jupyterhub/jupyterhub:
defaultTag: "${{ env.REGISTRY }}jupyterhub/jupyterhub:noref"
branchRegex: ^\w[\w-.]*$
- name: Build and push jupyterhub
uses: docker/build-push-action@v5
with:
context: .
platforms: linux/amd64,linux/arm64
push: true
# tags parameter must be a string input so convert `gettags` JSON
# array into a comma separated list of tags
tags: ${{ join(fromJson(steps.jupyterhubtags.outputs.tags)) }}
# image: jupyterhub/jupyterhub-onbuild
#
- name: Get list of jupyterhub-onbuild tags
id: onbuildtags
uses: jupyterhub/action-major-minor-tag-calculator@v3
with:
githubToken: ${{ secrets.GITHUB_TOKEN }}
prefix: >-
${{ env.REGISTRY }}jupyterhub/jupyterhub-onbuild:
jupyterhub/jupyterhub-onbuild:
defaultTag: "${{ env.REGISTRY }}jupyterhub/jupyterhub-onbuild:noref"
branchRegex: ^\w[\w-.]*$
- name: Build and push jupyterhub-onbuild
uses: docker/build-push-action@v5
with:
build-args: |
BASE_IMAGE=${{ fromJson(steps.jupyterhubtags.outputs.tags)[0] }}
context: onbuild
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ join(fromJson(steps.onbuildtags.outputs.tags)) }}
# image: jupyterhub/jupyterhub-demo
#
- name: Get list of jupyterhub-demo tags
id: demotags
uses: jupyterhub/action-major-minor-tag-calculator@v3
with:
githubToken: ${{ secrets.GITHUB_TOKEN }}
prefix: >-
${{ env.REGISTRY }}jupyterhub/jupyterhub-demo:
jupyterhub/jupyterhub-demo:
defaultTag: "${{ env.REGISTRY }}jupyterhub/jupyterhub-demo:noref"
branchRegex: ^\w[\w-.]*$
- name: Build and push jupyterhub-demo
uses: docker/build-push-action@v5
with:
build-args: |
BASE_IMAGE=${{ fromJson(steps.onbuildtags.outputs.tags)[0] }}
context: demo-image
# linux/arm64 currently fails:
# ERROR: Could not build wheels for argon2-cffi which use PEP 517 and cannot be installed directly
# ERROR: executor failed running [/bin/sh -c python3 -m pip install notebook]: exit code: 1
platforms: linux/amd64
push: true
tags: ${{ join(fromJson(steps.demotags.outputs.tags)) }}
# image: jupyterhub/singleuser
#
- name: Get list of jupyterhub/singleuser tags
id: singleusertags
uses: jupyterhub/action-major-minor-tag-calculator@v3
with:
githubToken: ${{ secrets.GITHUB_TOKEN }}
prefix: >-
${{ env.REGISTRY }}jupyterhub/singleuser:
jupyterhub/singleuser:
defaultTag: "${{ env.REGISTRY }}jupyterhub/singleuser:noref"
branchRegex: ^\w[\w-.]*$
- name: Build and push jupyterhub/singleuser
uses: docker/build-push-action@v5
with:
build-args: |
JUPYTERHUB_VERSION=${{ github.ref_type == 'tag' && github.ref_name || format('git:{0}', github.sha) }}
context: singleuser
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ join(fromJson(steps.singleusertags.outputs.tags)) }}

31
.github/workflows/support-bot.yml vendored Normal file
View File

@@ -0,0 +1,31 @@
# https://github.com/dessant/support-requests
name: "Support Requests"
on:
issues:
types: [labeled, unlabeled, reopened]
permissions:
issues: write
jobs:
action:
runs-on: ubuntu-latest
steps:
- uses: dessant/support-requests@v3
with:
github-token: ${{ github.token }}
support-label: "support"
issue-comment: |
Hi there @{issue-author} :wave:!
I closed this issue because it was labelled as a support question.
Please help us organize discussion by posting this on the http://discourse.jupyter.org/ forum.
Our goal is to sustain a positive experience for both users and developers. We use GitHub issues for specific discussions related to changing a repository's content, and let the forum be where we can more generally help and inspire each other.
Thank you for being an active member of our community! :heart:
close-issue: true
lock-issue: false
issue-lock-reason: "off-topic"

107
.github/workflows/test-docs.yml vendored Normal file
View File

@@ -0,0 +1,107 @@
# This is a GitHub workflow defining a set of jobs with a set of steps.
# ref: https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions
#
# This workflow validates the REST API definition and runs the pytest tests in
# the docs/ folder. This workflow does not build the documentation. That is
# instead tested via ReadTheDocs (https://readthedocs.org/projects/jupyterhub/).
#
name: Test docs
# The tests defined in docs/ are currently influenced by changes to _version.py
# and scopes.py.
on:
pull_request:
paths:
- "docs/**"
- "jupyterhub/_version.py"
- "jupyterhub/scopes.py"
- ".github/workflows/test-docs.yml"
push:
paths:
- "docs/**"
- "jupyterhub/_version.py"
- "jupyterhub/scopes.py"
- ".github/workflows/test-docs.yml"
branches-ignore:
- "dependabot/**"
- "pre-commit-ci-update-config"
tags:
- "**"
workflow_dispatch:
env:
# UTF-8 content may be interpreted as ascii and causes errors without this.
LANG: C.UTF-8
PYTEST_ADDOPTS: "--verbose --color=yes"
jobs:
validate-rest-api-definition:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- name: Validate REST API definition
uses: char0n/swagger-editor-validate@v1.3.2
with:
definition-file: docs/source/_static/rest-api.yml
test-docs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
with:
# make rediraffecheckdiff requires git history to compare current
# commit with the main branch and previous releases.
fetch-depth: 0
- uses: actions/setup-python@v4
with:
python-version: "3.9"
- name: Install requirements
run: |
pip install -r docs/requirements.txt pytest
- name: pytest docs/
run: |
pytest docs/
# readthedocs doesn't halt on warnings,
# so raise any warnings here
- name: build docs
run: |
cd docs
make html
- name: check links
run: |
cd docs
make linkcheck
# make rediraffecheckdiff compares files for different changesets
# these diff targets aren't always available
# - compare with base ref (usually 'main', always on 'origin') for pull requests
# - only compare with tags when running against jupyterhub/jupyterhub
# to avoid errors on forks, which often lack tags
- name: check redirects for this PR
if: github.event_name == 'pull_request'
run: |
cd docs
export REDIRAFFE_BRANCH=origin/${{ github.base_ref }}
make rediraffecheckdiff
# this should check currently published 'stable' links for redirects
- name: check redirects since last release
if: github.repository == 'jupyterhub/jupyterhub'
run: |
cd docs
export REDIRAFFE_BRANCH=$(git describe --tags --abbrev=0)
make rediraffecheckdiff
# longer-term redirect check (fixed version) for older links
- name: check redirects since 3.0.0
if: github.repository == 'jupyterhub/jupyterhub'
run: |
cd docs
export REDIRAFFE_BRANCH=3.0.0
make rediraffecheckdiff

52
.github/workflows/test-jsx.yml vendored Normal file
View File

@@ -0,0 +1,52 @@
# This is a GitHub workflow defining a set of jobs with a set of steps.
# ref: https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions
#
name: Test jsx (admin-react.js)
on:
pull_request:
paths:
- "jsx/**"
- ".github/workflows/test-jsx.yml"
push:
paths:
- "jsx/**"
- ".github/workflows/test-jsx.yml"
branches-ignore:
- "dependabot/**"
- "pre-commit-ci-update-config"
tags:
- "**"
workflow_dispatch:
permissions:
contents: read
jobs:
# The ./jsx folder contains React based source code files that are to compile
# to share/jupyterhub/static/js/admin-react.js. The ./jsx folder includes
# tests also has tests that this job is meant to run with `yarn test`
# according to the documentation in jsx/README.md.
test-jsx-admin-react:
runs-on: ubuntu-20.04
timeout-minutes: 5
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: "14"
- name: Install yarn
run: |
npm install -g yarn
- name: yarn
run: |
cd jsx
yarn
- name: yarn test
run: |
cd jsx
yarn test

268
.github/workflows/test.yml vendored Normal file
View File

@@ -0,0 +1,268 @@
# This is a GitHub workflow defining a set of jobs with a set of steps.
# ref: https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions
#
name: Test
on:
pull_request:
paths-ignore:
- "docs/**"
- "**.md"
- "**.rst"
- ".github/workflows/*"
- "!.github/workflows/test.yml"
push:
paths-ignore:
- "docs/**"
- "**.md"
- "**.rst"
- ".github/workflows/*"
- "!.github/workflows/test.yml"
branches-ignore:
- "dependabot/**"
- "pre-commit-ci-update-config"
tags:
- "**"
workflow_dispatch:
env:
# UTF-8 content may be interpreted as ascii and causes errors without this.
LANG: C.UTF-8
SQLALCHEMY_WARN_20: "1"
permissions:
contents: read
jobs:
# Run "pytest jupyterhub/tests" in various configurations
pytest:
runs-on: ubuntu-20.04
timeout-minutes: 15
strategy:
# Keep running even if one variation of the job fail
fail-fast: false
matrix:
# We run this job multiple times with different parameterization
# specified below, these parameters have no meaning on their own and
# gain meaning on how job steps use them.
#
# subdomain:
# Tests everything when JupyterHub is configured to add routes for
# users with dedicated subdomains like user1.jupyter.example.com
# rather than jupyter.example.com/user/user1.
#
# db: [mysql/postgres]
# Tests everything when JupyterHub works against a dedicated mysql or
# postgresql server.
#
# legacy_notebook:
# Tests everything when the user instances are started with
# the legacy notebook server instead of jupyter_server.
#
# ssl:
# Tests everything using internal SSL connections instead of
# unencrypted HTTP
#
# main_dependencies:
# Tests everything when the we use the latest available dependencies
# from: traitlets.
#
# NOTE: Since only the value of these parameters are presented in the
# GitHub UI when the workflow run, we avoid using true/false as
# values by instead duplicating the name to signal true.
# Python versions available at:
# https://github.com/actions/python-versions/blob/HEAD/versions-manifest.json
include:
- python: "3.7"
oldest_dependencies: oldest_dependencies
legacy_notebook: legacy_notebook
- python: "3.8"
jupyter_server: "1.*"
subset: singleuser
- python: "3.9"
db: mysql
- python: "3.10"
db: postgres
- python: "3.11"
subdomain: subdomain
serverextension: serverextension
- python: "3.11"
ssl: ssl
serverextension: serverextension
- python: "3.11"
subdomain: subdomain
noextension: noextension
subset: singleuser
- python: "3.11"
ssl: ssl
noextension: noextension
subset: singleuser
- python: "3.11"
browser: browser
- python: "3.11"
subdomain: subdomain
browser: browser
- python: "3.11"
main_dependencies: main_dependencies
steps:
# NOTE: In GitHub workflows, environment variables are set by writing
# assignment statements to a file. They will be set in the following
# steps as if would used `export MY_ENV=my-value`.
- name: Configure environment variables
run: |
if [ "${{ matrix.subdomain }}" != "" ]; then
echo "JUPYTERHUB_TEST_SUBDOMAIN_HOST=http://localhost.jovyan.org:8000" >> $GITHUB_ENV
fi
if [ "${{ matrix.db }}" == "mysql" ]; then
echo "MYSQL_HOST=127.0.0.1" >> $GITHUB_ENV
echo "JUPYTERHUB_TEST_DB_URL=mysql+mysqldb://root@127.0.0.1:3306/jupyterhub" >> $GITHUB_ENV
fi
if [ "${{ matrix.ssl }}" == "ssl" ]; then
echo "SSL_ENABLED=1" >> $GITHUB_ENV
fi
if [ "${{ matrix.db }}" == "postgres" ]; then
echo "PGHOST=127.0.0.1" >> $GITHUB_ENV
echo "PGUSER=test_user" >> $GITHUB_ENV
echo "PGPASSWORD=hub[test/:?" >> $GITHUB_ENV
echo "JUPYTERHUB_TEST_DB_URL=postgresql://test_user:hub%5Btest%2F%3A%3F@127.0.0.1:5432/jupyterhub" >> $GITHUB_ENV
fi
if [ "${{ matrix.serverextension }}" != "" ]; then
echo "JUPYTERHUB_SINGLEUSER_EXTENSION=1" >> $GITHUB_ENV
elif [ "${{ matrix.noextension }}" != "" ]; then
echo "JUPYTERHUB_SINGLEUSER_EXTENSION=0" >> $GITHUB_ENV
fi
- uses: actions/checkout@v3
# NOTE: actions/setup-node@v3 make use of a cache within the GitHub base
# environment and setup in a fraction of a second.
- name: Install Node v14
uses: actions/setup-node@v3
with:
node-version: "14"
- name: Install Javascript dependencies
run: |
npm install
npm install -g configurable-http-proxy yarn
npm list
# NOTE: actions/setup-python@v4 make use of a cache within the GitHub base
# environment and setup in a fraction of a second.
- name: Install Python ${{ matrix.python }}
uses: actions/setup-python@v4
with:
python-version: "${{ matrix.python }}"
- name: Install Python dependencies
run: |
pip install --upgrade pip
pip install -e ".[test]"
if [ "${{ matrix.oldest_dependencies }}" != "" ]; then
# take any dependencies in requirements.txt such as tornado>=5.0
# and transform them to tornado==5.0 so we can run tests with
# the earliest-supported versions
cat requirements.txt | grep '>=' | sed -e 's@>=@==@g' > oldest-requirements.txt
pip install -r oldest-requirements.txt
fi
if [ "${{ matrix.main_dependencies }}" != "" ]; then
# Tests are broken:
# https://github.com/jupyterhub/jupyterhub/issues/4418
# pip install git+https://github.com/ipython/traitlets#egg=traitlets --force
pip install --upgrade --pre sqlalchemy
fi
if [ "${{ matrix.legacy_notebook }}" != "" ]; then
pip uninstall jupyter_server --yes
pip install 'notebook<7'
fi
if [ "${{ matrix.jupyter_server }}" != "" ]; then
pip install "jupyter_server==${{ matrix.jupyter_server }}"
fi
if [ "${{ matrix.db }}" == "mysql" ]; then
pip install mysqlclient
fi
if [ "${{ matrix.db }}" == "postgres" ]; then
pip install psycopg2-binary
fi
if [ "${{ matrix.serverextension }}" != "" ]; then
pip install 'jupyter-server>=2'
fi
pip freeze
# NOTE: If you need to debug this DB setup step, consider the following.
#
# 1. mysql/postgressql are database servers we start as docker containers,
# and we use clients named mysql/psql.
#
# 2. When we start a database server we need to pass environment variables
# explicitly as part of the `docker run` command. These environment
# variables are named differently from the similarly named environment
# variables used by the clients.
#
# - mysql server ref: https://hub.docker.com/_/mysql/
# - mysql client ref: https://dev.mysql.com/doc/refman/5.7/en/environment-variables.html
# - postgres server ref: https://hub.docker.com/_/postgres/
# - psql client ref: https://www.postgresql.org/docs/9.5/libpq-envars.html
#
# 3. When we connect, they should use 127.0.0.1 rather than the
# default way of connecting which leads to errors like below both for
# mysql and postgresql unless we set MYSQL_HOST/PGHOST to 127.0.0.1.
#
# - ERROR 2002 (HY000): Can't connect to local MySQL server through socket '/var/run/mysqld/mysqld.sock' (2)
#
- name: Start a database server (${{ matrix.db }})
if: ${{ matrix.db }}
run: |
if [ "${{ matrix.db }}" == "mysql" ]; then
if [[ -z "$(which mysql)" ]]; then
sudo apt-get update
sudo apt-get install -y mysql-client
fi
DB=mysql bash ci/docker-db.sh
DB=mysql bash ci/init-db.sh
fi
if [ "${{ matrix.db }}" == "postgres" ]; then
if [[ -z "$(which psql)" ]]; then
sudo apt-get update
sudo apt-get install -y postgresql-client
fi
DB=postgres bash ci/docker-db.sh
DB=postgres bash ci/init-db.sh
fi
- name: Configure browser tests
if: matrix.browser
run: echo "PYTEST_ADDOPTS=$PYTEST_ADDOPTS -m browser" >> "${GITHUB_ENV}"
- name: Ensure browsers are installed for playwright
if: matrix.browser
run: python -m playwright install --with-deps
- name: Run pytest
run: |
pytest -k "${{ matrix.subset }}" --maxfail=2 --cov=jupyterhub jupyterhub/tests
- uses: codecov/codecov-action@v3
docker-build:
runs-on: ubuntu-20.04
timeout-minutes: 20
steps:
- uses: actions/checkout@v3
- name: build images
run: |
DOCKER_BUILDKIT=1 docker build -t jupyterhub/jupyterhub .
docker build -t jupyterhub/jupyterhub-onbuild onbuild
docker build -t jupyterhub/singleuser singleuser
- name: smoke test jupyterhub
run: |
docker run --rm -t jupyterhub/jupyterhub jupyterhub --help
- name: verify static files
run: |
docker run --rm -t -v $PWD/dockerfiles:/io jupyterhub/jupyterhub python3 /io/test.py

31
.gitignore vendored
View File

@@ -1,16 +1,39 @@
node_modules
*.py[co]
*~
.cache
.DS_Store
build
/build
dist
docs/_build
docs/build
docs/source/_static/rest-api
docs/source/rbac/scope-table.md
docs/source/reference/metrics.md
.ipynb_checkpoints
jsx/build/
# ignore config file at the top-level of the repo
# but not sub-dirs
/jupyterhub_config.py
jupyterhub_cookie_secret
jupyterhub.sqlite
share/jupyter/hub/static/components
share/jupyter/hub/static/css/style.min.css
share/jupyter/hub/static/css/style.min.css.map
jupyterhub.sqlite*
package-lock.json
share/jupyterhub/static/components
share/jupyterhub/static/css/style.min.css
share/jupyterhub/static/css/style.min.css.map
share/jupyterhub/static/js/admin-react.js*
*.egg-info
MANIFEST
.coverage
.coverage.*
htmlcov
.idea/
.vscode/
.pytest_cache
pip-wheel-metadata
docs/source/reference/metrics.rst
oldest-requirements.txt
jupyterhub-proxy.pid
examples/server-api/service-token

66
.pre-commit-config.yaml Normal file
View File

@@ -0,0 +1,66 @@
# pre-commit is a tool to perform a predefined set of tasks manually and/or
# automatically before git commits are made.
#
# Config reference: https://pre-commit.com/#pre-commit-configyaml---top-level
#
# Common tasks
#
# - Run on all files: pre-commit run --all-files
# - Register git hooks: pre-commit install --install-hooks
#
ci:
# pre-commit.ci will open PRs updating our hooks once a month
autoupdate_schedule: monthly
repos:
# Autoformat: Python code, syntax patterns are modernized
- repo: https://github.com/asottile/pyupgrade
rev: v3.15.0
hooks:
- id: pyupgrade
args:
- --py37-plus
# Autoformat: Python code
- repo: https://github.com/PyCQA/autoflake
rev: v2.2.1
hooks:
- id: autoflake
# args ref: https://github.com/PyCQA/autoflake#advanced-usage
args:
- --in-place
# Autoformat: Python code
- repo: https://github.com/pycqa/isort
rev: 5.13.2
hooks:
- id: isort
# Autoformat: Python code
- repo: https://github.com/psf/black
rev: 24.1.1
hooks:
- id: black
# Autoformat: markdown, yaml, javascript (see the file .prettierignore)
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v4.0.0-alpha.8
hooks:
- id: prettier
# Autoformat and linting, misc. details
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
hooks:
- id: end-of-file-fixer
exclude: share/jupyterhub/static/js/admin-react.js
- id: requirements-txt-fixer
- id: check-case-conflict
- id: check-executables-have-shebangs
# Linting: Python code (see the file .flake8)
- repo: https://github.com/PyCQA/flake8
rev: "7.0.0"
hooks:
- id: flake8

3
.prettierignore Normal file
View File

@@ -0,0 +1,3 @@
share/jupyterhub/templates/
share/jupyterhub/static/js/admin-react.js
jupyterhub/singleuser/templates/

25
.readthedocs.yaml Normal file
View File

@@ -0,0 +1,25 @@
# Configuration on how ReadTheDocs (RTD) builds our documentation
# ref: https://readthedocs.org/projects/jupyterhub/
# ref: https://docs.readthedocs.io/en/stable/config-file/v2.html
#
version: 2
sphinx:
configuration: docs/source/conf.py
build:
os: ubuntu-20.04
tools:
nodejs: "16"
python: "3.9"
python:
install:
- requirements: docs/requirements.txt
formats:
# Adding htmlzip enables a Downloads section in the rendered website's RTD
# menu where the html build can be downloaded. This doesn't require any
# additional configuration in docs/source/conf.py.
#
- htmlzip

View File

@@ -1,15 +0,0 @@
# http://travis-ci.org/#!/jupyter/jupyterhub
language: python
sudo: false
python:
- 3.4
- 3.3
before_install:
- npm install
- npm install -g configurable-http-proxy
- git clone --quiet --depth 1 https://github.com/minrk/travis-wheels travis-wheels
install:
- pip install -f travis-wheels/wheelhouse -r dev-requirements.txt .
- pip install -f travis-wheels/wheelhouse ipython[notebook]
script:
- py.test jupyterhub

1
CODE_OF_CONDUCT.md Normal file
View File

@@ -0,0 +1 @@
Please refer to [Project Jupyter's Code of Conduct](https://github.com/jupyter/governance/blob/HEAD/conduct/code_of_conduct.md).

View File

@@ -1,3 +1,14 @@
# Contributing
# Contributing to JupyterHub
We mainly follow the [IPython Contributing Guide](https://github.com/ipython/ipython/blob/master/CONTRIBUTING.md).
Welcome! As a [Jupyter](https://jupyter.org) project,
you can follow the [Jupyter contributor guide](https://jupyter.readthedocs.io/en/latest/contributing/content-contributor.html).
Make sure to also follow [Project Jupyter's Code of Conduct](https://github.com/jupyter/governance/blob/HEAD/conduct/code_of_conduct.md)
for a friendly and welcoming collaborative environment.
Please see our documentation on
- [Setting up a development install](https://jupyterhub.readthedocs.io/en/latest/contributing/setup.html)
- [Testing JupyterHub and linting code](https://jupyterhub.readthedocs.io/en/latest/contributing/tests.html)
If you need some help, feel free to ask on [Gitter](https://gitter.im/jupyterhub/jupyterhub) or [Discourse](https://discourse.jupyter.org/).

View File

@@ -24,7 +24,7 @@ software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
@@ -46,8 +46,8 @@ Jupyter uses a shared copyright model. Each contributor maintains copyright
over their contributions to Jupyter. But, it is important to note that these
contributions are typically only changes to the repositories. Thus, the Jupyter
source code, in its entirety is not the copyright of any single person or
institution. Instead, it is the collective copyright of the entire Jupyter
Development Team. If individual contributors want to maintain a record of what
institution. Instead, it is the collective copyright of the entire Jupyter
Development Team. If individual contributors want to maintain a record of what
changes/contributions they have specific copyright on, they should indicate
their copyright in the commit message of the change, when they commit the
change to one of the Jupyter repositories.

View File

@@ -1,35 +1,136 @@
# A base docker image that includes juptyerhub and IPython master
# An incomplete base Docker image for running JupyterHub
#
# Build your own derivative images starting with
# Add your configuration to create a complete derivative Docker image.
#
# FROM jupyter/jupyterhub:latest
# Include your configuration settings by starting with one of two options:
#
# Option 1:
#
# FROM quay.io/jupyterhub/jupyterhub:latest
#
# And put your configuration file jupyterhub_config.py in /srv/jupyterhub/jupyterhub_config.py.
#
# Option 2:
#
# Or you can create your jupyterhub config and database on the host machine, and mount it with:
#
# docker run -v $PWD:/srv/jupyterhub -t quay.io/jupyterhub/jupyterhub
#
# NOTE
# If you base on quay.io/jupyterhub/jupyterhub-onbuild
# your jupyterhub_config.py will be added automatically
# from your docker directory.
FROM ipython/ipython
######################################################################
# This Dockerfile uses multi-stage builds with optimisations to build
# the JupyterHub wheel on the native architecture only
# https://www.docker.com/blog/faster-multi-platform-builds-dockerfile-cross-compilation-guide/
MAINTAINER Jupyter Project <jupyter@googlegroups.com>
ARG BASE_IMAGE=ubuntu:22.04
# install js dependencies
RUN npm install -g configurable-http-proxy
RUN mkdir -p /srv/
######################################################################
# The JupyterHub wheel is pure Python so can be built for any platform
# on the native architecture (avoiding QEMU emulation)
FROM --platform=${BUILDPLATFORM:-linux/amd64} $BASE_IMAGE AS jupyterhub-builder
# install jupyterhub
ADD requirements.txt /tmp/requirements.txt
RUN pip3 install -r /tmp/requirements.txt
ENV DEBIAN_FRONTEND=noninteractive
WORKDIR /srv/
ADD . /srv/jupyterhub
WORKDIR /srv/jupyterhub/
# Don't clear apt cache, and don't combine RUN commands, so that cached layers can
# be reused in other stages
RUN pip3 install .
RUN apt-get update -qq \
&& apt-get install -yqq --no-install-recommends \
build-essential \
ca-certificates \
curl \
locales \
python3-dev \
python3-pip \
python3-pycurl \
python3-venv \
&& python3 -m pip install --no-cache-dir --upgrade setuptools pip build wheel
# Ubuntu 22.04 comes with Nodejs 12 which is too old for building JupyterHub JS
# It's fine at runtime though (used only by configurable-http-proxy)
RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - \
&& apt-get install -yqq --no-install-recommends \
nodejs \
&& npm install --global yarn
WORKDIR /srv/jupyterhub/
WORKDIR /src/jupyterhub
# copy everything except whats in .dockerignore, its a
# compromise between needing to rebuild and maintaining
# what needs to be part of the build
COPY . .
# Derivative containers should add jupyterhub config,
# which will be used when starting the application.
ARG PIP_CACHE_DIR=/tmp/pip-cache
RUN --mount=type=cache,target=${PIP_CACHE_DIR} \
python3 -m build --wheel
######################################################################
# All other wheels required by JupyterHub, some are platform specific
FROM $BASE_IMAGE AS wheel-builder
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update -qq \
&& apt-get install -yqq --no-install-recommends \
build-essential \
ca-certificates \
curl \
locales \
python3-dev \
python3-pip \
python3-pycurl \
python3-venv \
&& python3 -m pip install --no-cache-dir --upgrade setuptools pip build wheel
WORKDIR /src/jupyterhub
COPY --from=jupyterhub-builder /src/jupyterhub/dist/*.whl /src/jupyterhub/dist/
ARG PIP_CACHE_DIR=/tmp/pip-cache
RUN --mount=type=cache,target=${PIP_CACHE_DIR} \
python3 -m pip wheel --wheel-dir wheelhouse dist/*.whl
######################################################################
# The final JupyterHub image, platform specific
FROM $BASE_IMAGE AS jupyterhub
ENV DEBIAN_FRONTEND=noninteractive \
SHELL=/bin/bash \
LC_ALL=en_US.UTF-8 \
LANG=en_US.UTF-8 \
LANGUAGE=en_US.UTF-8 \
PYTHONDONTWRITEBYTECODE=1
EXPOSE 8000
ONBUILD ADD jupyterhub_config.py /srv/jupyterhub/jupyterhub_config.py
CMD ["jupyterhub", "-f", "/srv/jupyterhub/jupyterhub_config.py"]
LABEL maintainer="Jupyter Project <jupyter@googlegroups.com>"
LABEL org.jupyter.service="jupyterhub"
WORKDIR /srv/jupyterhub
RUN apt-get update -qq \
&& apt-get install -yqq --no-install-recommends \
ca-certificates \
curl \
gnupg \
locales \
python-is-python3 \
python3-pip \
python3-pycurl \
nodejs \
npm \
&& locale-gen $LC_ALL \
&& npm install -g configurable-http-proxy@^4.2.0 \
# clean cache and logs
&& rm -rf /var/lib/apt/lists/* /var/log/* /var/tmp/* ~/.npm
# install the wheels we built in the previous stage
RUN --mount=type=cache,from=wheel-builder,source=/src/jupyterhub/wheelhouse,target=/tmp/wheelhouse \
# always make sure pip is up to date!
python3 -m pip install --no-compile --no-cache-dir --upgrade setuptools pip \
&& python3 -m pip install --no-compile --no-cache-dir /tmp/wheelhouse/*
CMD ["jupyterhub"]

View File

@@ -1,26 +1,38 @@
include README.md
include COPYING.md
include setupegg.py
include bower.json
include bower-lite
include package.json
include package-lock.json
include *requirements.txt
include Dockerfile
graft onbuild
graft jsx
graft jupyterhub
graft scripts
graft share
graft singleuser
graft ci
# Documentation
graft docs
prune docs/node_modules
# Intermediate javascript files
prune jsx/node_modules
prune jsx/build
# prune some large unused files from components
prune share/jupyter/hub/static/components/bootstrap/css
exclude share/jupyter/hub/static/components/components/fonts/*.svg
exclude share/jupyter/hub/static/components/bootstrap/less/*.js
exclude share/jupyter/hub/static/components/font-awesome/css
exclude share/jupyter/hub/static/components/font-awesome/fonts/*.svg
exclude share/jupyter/hub/static/components/jquery/*migrate*.js
prune share/jupyter/hub/static/components/moment/lang
prune share/jupyter/hub/static/components/moment/min
prune share/jupyterhub/static/components/bootstrap/dist/css
exclude share/jupyterhub/static/components/bootstrap/dist/fonts/*.svg
prune share/jupyterhub/static/components/font-awesome/css
prune share/jupyterhub/static/components/font-awesome/scss
exclude share/jupyterhub/static/components/font-awesome/fonts/*.svg
prune share/jupyterhub/static/components/jquery/external
prune share/jupyterhub/static/components/jquery/src
prune share/jupyterhub/static/components/moment/lang
prune share/jupyterhub/static/components/moment/min
# Patterns to exclude from any directory
global-exclude *~

257
README.md
View File

@@ -1,93 +1,248 @@
# JupyterHub: A multi-user server for Jupyter notebooks
**[Technical Overview](#technical-overview)** |
**[Installation](#installation)** |
**[Configuration](#configuration)** |
**[Docker](#docker)** |
**[Contributing](#contributing)** |
**[License](#license)** |
**[Help and Resources](#help-and-resources)**
JupyterHub is a multi-user server that manages and proxies multiple instances of the single-user <del>IPython</del> Jupyter notebook server.
---
Three actors:
# [JupyterHub](https://github.com/jupyterhub/jupyterhub)
- multi-user Hub (tornado process)
- configurable http proxy (node-http-proxy)
- multiple single-user IPython notebook servers (Python/IPython/tornado)
[![Latest PyPI version](https://img.shields.io/pypi/v/jupyterhub?logo=pypi)](https://pypi.python.org/pypi/jupyterhub)
[![Latest conda-forge version](https://img.shields.io/conda/vn/conda-forge/jupyterhub?logo=conda-forge)](https://anaconda.org/conda-forge/jupyterhub)
[![Documentation build status](https://img.shields.io/readthedocs/jupyterhub?logo=read-the-docs)](https://jupyterhub.readthedocs.org/en/latest/)
[![GitHub Workflow Status - Test](https://img.shields.io/github/workflow/status/jupyterhub/jupyterhub/Test?logo=github&label=tests)](https://github.com/jupyterhub/jupyterhub/actions)
[![Test coverage of code](https://codecov.io/gh/jupyterhub/jupyterhub/branch/main/graph/badge.svg)](https://codecov.io/gh/jupyterhub/jupyterhub)
[![GitHub](https://img.shields.io/badge/issue_tracking-github-blue?logo=github)](https://github.com/jupyterhub/jupyterhub/issues)
[![Discourse](https://img.shields.io/badge/help_forum-discourse-blue?logo=discourse)](https://discourse.jupyter.org/c/jupyterhub)
[![Gitter](https://img.shields.io/badge/social_chat-gitter-blue?logo=gitter)](https://gitter.im/jupyterhub/jupyterhub)
Basic principles:
With [JupyterHub](https://jupyterhub.readthedocs.io) you can create a
**multi-user Hub** that spawns, manages, and proxies multiple instances of the
single-user [Jupyter notebook](https://jupyter-notebook.readthedocs.io)
server.
- Hub spawns proxy
- Proxy forwards ~all requests to hub by default
- Hub handles login, and spawns single-user servers on demand
- Hub configures proxy to forward url prefixes to single-user servers
[Project Jupyter](https://jupyter.org) created JupyterHub to support many
users. The Hub can offer notebook servers to a class of students, a corporate
data science workgroup, a scientific research project, or a high-performance
computing group.
## Technical overview
## Dependencies
Three main actors make up JupyterHub:
JupyterHub requires IPython >= 3.0 (current master) and Python >= 3.3.
- multi-user **Hub** (tornado process)
- configurable http **proxy** (node-http-proxy)
- multiple **single-user Jupyter notebook servers** (Python/Jupyter/tornado)
You will need nodejs/npm, which you can get from your package manager:
Basic principles for operation are:
sudo apt-get install npm nodejs-legacy
- Hub launches a proxy.
- The Proxy forwards all requests to Hub by default.
- Hub handles login and spawns single-user servers on demand.
- Hub configures proxy to forward URL prefixes to the single-user notebook
servers.
(The `nodejs-legacy` package installs the `node` executable,
which is required for npm to work on Debian/Ubuntu at this point)
Then install javascript dependencies:
sudo npm install -g configurable-http-proxy
JupyterHub also provides a
[REST API][]
for administration of the Hub and its users.
[rest api]: https://jupyterhub.readthedocs.io/en/latest/reference/rest-api.html
## Installation
Then you can install the Python package by doing:
### Check prerequisites
pip install -r requirements.txt
pip install .
- A Linux/Unix based system
- [Python](https://www.python.org/downloads/) 3.6 or greater
- [nodejs/npm](https://www.npmjs.com/)
If you plan to run notebook servers locally, you may also need to install the IPython notebook:
- If you are using **`conda`**, the nodejs and npm dependencies will be installed for
you by conda.
pip install "ipython[notebook]"
- If you are using **`pip`**, install a recent version (at least 12.0) of
[nodejs/npm](https://docs.npmjs.com/getting-started/installing-node).
- If using the default PAM Authenticator, a [pluggable authentication module (PAM)](https://en.wikipedia.org/wiki/Pluggable_authentication_module).
- TLS certificate and key for HTTPS communication
- Domain name
This will fetch client-side javascript dependencies and compile CSS,
and install these files to `sys.prefix`/share/jupyter, as well as
install any Python dependencies.
### Install packages
#### Using `conda`
### Development install
To install JupyterHub along with its dependencies including nodejs/npm:
For a development install:
```bash
conda install -c conda-forge jupyterhub
```
pip install -r dev-requirements.txt
pip install -e .
If you plan to run notebook servers locally, install JupyterLab or Jupyter notebook:
In which case you may need to manually update javascript and css after some updates, with:
```bash
conda install jupyterlab
conda install notebook
```
python setup.py js # fetch updated client-side js (changes rarely)
python setup.py css # recompile CSS from LESS sources
#### Using `pip`
JupyterHub can be installed with `pip`, and the proxy with `npm`:
## Running the server
```bash
npm install -g configurable-http-proxy
python3 -m pip install jupyterhub
```
To start the server, run the command:
If you plan to run notebook servers locally, you will need to install
[JupyterLab or Jupyter notebook](https://jupyter.readthedocs.io/en/latest/install.html):
python3 -m pip install --upgrade jupyterlab
python3 -m pip install --upgrade notebook
### Run the Hub server
To start the Hub server, run the command:
jupyterhub
and then visit `http://localhost:8000`, and sign in with your unix credentials.
Visit `http://localhost:8000` in your browser, and sign in with your system username and password.
If you want multiple users to be able to sign into the server, you will need to run the
`jupyterhub` command as a privileged user, such as root.
The [wiki](https://github.com/jupyter/jupyterhub/wiki/Using-sudo-to-run-JupyterHub-without-root-privileges) describes how to run the server
as a less privileged user, which requires more configuration of the system.
_Note_: To allow multiple users to sign in to the server, you will need to
run the `jupyterhub` command as a _privileged user_, such as root.
The [wiki](https://github.com/jupyterhub/jupyterhub/wiki/Using-sudo-to-run-JupyterHub-without-root-privileges)
describes how to run the server as a _less privileged user_, which requires
more configuration of the system.
### Some examples
## Configuration
generate a default config file:
The [Getting Started](https://jupyterhub.readthedocs.io/en/latest/tutorial/index.html#getting-started) section of the
documentation explains the common steps in setting up JupyterHub.
The [**JupyterHub tutorial**](https://github.com/jupyterhub/jupyterhub-tutorial)
provides an in-depth video and sample configurations of JupyterHub.
### Create a configuration file
To generate a default config file with settings and descriptions:
jupyterhub --generate-config
spawn the server on 10.0.1.2:443 with https:
### Start the Hub
To start the Hub on a specific url and port `10.0.1.2:443` with **https**:
jupyterhub --ip 10.0.1.2 --port 443 --ssl-key my_ssl.key --ssl-cert my_ssl.cert
The authentication and process spawning mechanisms can be replaced,
which should allow plugging into a variety of authentication or process control environments.
Some examples, meant as illustration and testing of this concept:
### Authenticators
- Using GitHub OAuth instead of PAM with [OAuthenticator](https://github.com/jupyter/oauthenticator)
- Spawning single-user servers with docker, using the [DockerSpawner](https://github.com/jupyter/dockerspawner)
| Authenticator | Description |
| ---------------------------------------------------------------------------- | ------------------------------------------------- |
| PAMAuthenticator | Default, built-in authenticator |
| [OAuthenticator](https://github.com/jupyterhub/oauthenticator) | OAuth + JupyterHub Authenticator = OAuthenticator |
| [ldapauthenticator](https://github.com/jupyterhub/ldapauthenticator) | Simple LDAP Authenticator Plugin for JupyterHub |
| [kerberosauthenticator](https://github.com/jupyterhub/kerberosauthenticator) | Kerberos Authenticator Plugin for JupyterHub |
### Spawners
| Spawner | Description |
| -------------------------------------------------------------- | -------------------------------------------------------------------------- |
| LocalProcessSpawner | Default, built-in spawner starts single-user servers as local processes |
| [dockerspawner](https://github.com/jupyterhub/dockerspawner) | Spawn single-user servers in Docker containers |
| [kubespawner](https://github.com/jupyterhub/kubespawner) | Kubernetes spawner for JupyterHub |
| [sudospawner](https://github.com/jupyterhub/sudospawner) | Spawn single-user servers without being root |
| [systemdspawner](https://github.com/jupyterhub/systemdspawner) | Spawn single-user notebook servers using systemd |
| [batchspawner](https://github.com/jupyterhub/batchspawner) | Designed for clusters using batch scheduling software |
| [yarnspawner](https://github.com/jupyterhub/yarnspawner) | Spawn single-user notebook servers distributed on a Hadoop cluster |
| [wrapspawner](https://github.com/jupyterhub/wrapspawner) | WrapSpawner and ProfilesSpawner enabling runtime configuration of spawners |
## Docker
A starter [**docker image for JupyterHub**](https://quay.io/repository/jupyterhub/jupyterhub)
gives a baseline deployment of JupyterHub using Docker.
**Important:** This `quay.io/jupyterhub/jupyterhub` image contains only the Hub itself,
with no configuration. In general, one needs to make a derivative image, with
at least a `jupyterhub_config.py` setting up an Authenticator and/or a Spawner.
To run the single-user servers, which may be on the same system as the Hub or
not, Jupyter Notebook version 4 or greater must be installed.
The JupyterHub docker image can be started with the following command:
docker run -p 8000:8000 -d --name jupyterhub quay.io/jupyterhub/jupyterhub jupyterhub
This command will create a container named `jupyterhub` that you can
**stop and resume** with `docker stop/start`.
The Hub service will be listening on all interfaces at port 8000, which makes
this a good choice for **testing JupyterHub on your desktop or laptop**.
If you want to run docker on a computer that has a public IP then you should
(as in MUST) **secure it with ssl** by adding ssl options to your docker
configuration or by using an ssl enabled proxy.
[Mounting volumes](https://docs.docker.com/engine/admin/volumes/volumes/) will
allow you to **store data outside the docker image (host system) so it will be persistent**, even when you start
a new image.
The command `docker exec -it jupyterhub bash` will spawn a root shell in your docker
container. You can **use the root shell to create system users in the container**.
These accounts will be used for authentication in JupyterHub's default configuration.
## Contributing
If you would like to contribute to the project, please read our
[contributor documentation](https://jupyter.readthedocs.io/en/latest/contributing/content-contributor.html)
and the [`CONTRIBUTING.md`](CONTRIBUTING.md). The `CONTRIBUTING.md` file
explains how to set up a development installation, how to run the test suite,
and how to contribute to documentation.
For a high-level view of the vision and next directions of the project, see the
[JupyterHub community roadmap](docs/source/contributing/roadmap.md).
### A note about platform support
JupyterHub is supported on Linux/Unix based systems.
JupyterHub officially **does not** support Windows. You may be able to use
JupyterHub on Windows if you use a Spawner and Authenticator that work on
Windows, but the JupyterHub defaults will not. Bugs reported on Windows will not
be accepted, and the test suite will not run on Windows. Small patches that fix
minor Windows compatibility issues (such as basic installation) **may** be accepted,
however. For Windows-based systems, we would recommend running JupyterHub in a
docker container or Linux VM.
[Additional Reference:](http://www.tornadoweb.org/en/stable/#installation) Tornado's documentation on Windows platform support
## License
We use a shared copyright model that enables all contributors to maintain the
copyright on their contributions.
All code is licensed under the terms of the [revised BSD license](./COPYING.md).
## Help and resources
We encourage you to ask questions and share ideas on the [Jupyter community forum](https://discourse.jupyter.org/).
You can also talk with us on our JupyterHub [Gitter](https://gitter.im/jupyterhub/jupyterhub) channel.
- [Reporting Issues](https://github.com/jupyterhub/jupyterhub/issues)
- [JupyterHub tutorial](https://github.com/jupyterhub/jupyterhub-tutorial)
- [Documentation for JupyterHub](https://jupyterhub.readthedocs.io/en/latest/)
- [Documentation for JupyterHub's REST API][rest api]
- [Documentation for Project Jupyter](http://jupyter.readthedocs.io/en/latest/index.html)
- [Project Jupyter website](https://jupyter.org)
- [Project Jupyter community](https://jupyter.org/community)
JupyterHub follows the Jupyter [Community Guides](https://jupyter.readthedocs.io/en/latest/community/content-community.html).
---
**[Technical Overview](#technical-overview)** |
**[Installation](#installation)** |
**[Configuration](#configuration)** |
**[Docker](#docker)** |
**[Contributing](#contributing)** |
**[License](#license)** |
**[Help and Resources](#help-and-resources)**

55
RELEASE.md Normal file
View File

@@ -0,0 +1,55 @@
# How to make a release
`jupyterhub` is a package available on [PyPI][] and [conda-forge][].
These are instructions on how to make a release.
## Pre-requisites
- Push rights to [jupyterhub/jupyterhub][]
- Push rights to [conda-forge/jupyterhub-feedstock][]
## Steps to make a release
1. Create a PR updating `docs/source/changelog.md` with [github-activity][] and
continue only when its merged.
```shell
pip install github-activity
github-activity --heading-level=3 jupyterhub/jupyterhub
```
1. Checkout main and make sure it is up to date.
```shell
git checkout main
git fetch origin main
git reset --hard origin/main
```
1. Update the version, make commits, and push a git tag with `tbump`.
```shell
pip install tbump
tbump --dry-run ${VERSION}
tbump ${VERSION}
```
Following this, the [CI system][] will build and publish a release.
1. Reset the version back to dev, e.g. `2.1.0.dev` after releasing `2.0.0`
```shell
tbump --no-tag ${NEXT_VERSION}.dev
```
1. Following the release to PyPI, an automated PR should arrive to
[conda-forge/jupyterhub-feedstock][] with instructions.
[pypi]: https://pypi.org/project/jupyterhub/
[conda-forge]: https://anaconda.org/conda-forge/jupyterhub
[jupyterhub/jupyterhub]: https://github.com/jupyterhub/jupyterhub
[conda-forge/jupyterhub-feedstock]: https://github.com/conda-forge/jupyterhub-feedstock
[github-activity]: https://github.com/executablebooks/github-activity
[ci system]: https://github.com/jupyterhub/jupyterhub/actions/workflows/release.yml

5
SECURITY.md Normal file
View File

@@ -0,0 +1,5 @@
# Reporting a Vulnerability
If you believe youve found a security vulnerability in a Jupyter
project, please report it to security@ipython.org. If you prefer to
encrypt your security reports, you can use [this PGP public key](https://jupyter-notebook.readthedocs.io/en/stable/_downloads/1d303a645f2505a8fd283826fafc9908/ipython_security.asc).

33
bower-lite Executable file
View File

@@ -0,0 +1,33 @@
#!/usr/bin/env python
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
"""
bower-lite
Since Bower's on its way out,
stage frontend dependencies from node_modules into components
"""
import json
import os
import shutil
from os.path import join
HERE = os.path.abspath(os.path.dirname(__file__))
components = join(HERE, "share", "jupyterhub", "static", "components")
node_modules = join(HERE, "node_modules")
if os.path.exists(components):
shutil.rmtree(components)
os.mkdir(components)
with open(join(HERE, 'package.json')) as f:
package_json = json.load(f)
dependencies = package_json['dependencies']
for dep in dependencies:
src = join(node_modules, dep)
dest = join(components, dep)
print(f"{src} -> {dest}")
shutil.copytree(src, dest)

View File

@@ -1,11 +0,0 @@
{
"name": "jupyterhub-deps",
"version": "0.0.0",
"dependencies": {
"bootstrap": "components/bootstrap#~3.1",
"font-awesome": "components/font-awesome#~4.1",
"jquery": "components/jquery#~2.0",
"moment": "~2.7",
"requirejs": "~2.1"
}
}

36
ci/check_installed_data.py Executable file
View File

@@ -0,0 +1,36 @@
#!/usr/bin/env python
# Check that installed package contains everything we expect
from pathlib import Path
import jupyterhub
from jupyterhub._data import DATA_FILES_PATH
print("Checking jupyterhub._data", end=" ")
print(f"DATA_FILES_PATH={DATA_FILES_PATH}", end=" ")
DATA_FILES_PATH = Path(DATA_FILES_PATH)
assert DATA_FILES_PATH.is_dir(), DATA_FILES_PATH
for subpath in (
"templates/spawn.html",
"static/css/style.min.css",
"static/components/jquery/dist/jquery.js",
"static/js/admin-react.js",
):
path = DATA_FILES_PATH / subpath
assert path.is_file(), path
print("OK")
print("Checking package_data", end=" ")
jupyterhub_path = Path(jupyterhub.__file__).parent.resolve()
for subpath in (
"alembic.ini",
"alembic/versions/833da8570507_rbac.py",
"event-schemas/server-actions/v1.yaml",
"singleuser/templates/page.html",
):
path = jupyterhub_path / subpath
assert path.is_file(), path
print("OK")

27
ci/check_sdist.py Executable file
View File

@@ -0,0 +1,27 @@
#!/usr/bin/env python
# Check that sdist contains everything we expect
import sys
import tarfile
expected_files = [
"docs/requirements.txt",
"jsx/package.json",
"package.json",
"README.md",
]
assert len(sys.argv) == 2, "Expected one file"
print(f"Checking {sys.argv[1]}")
tar = tarfile.open(name=sys.argv[1], mode="r:gz")
try:
# Remove leading jupyterhub-VERSION/
filelist = {f.partition('/')[2] for f in tar.getnames()}
finally:
tar.close()
for e in expected_files:
assert e in filelist, f"{e} not found"
print("OK")

60
ci/docker-db.sh Executable file
View File

@@ -0,0 +1,60 @@
#!/usr/bin/env bash
# The goal of this script is to start a database server as a docker container.
#
# Required environment variables:
# - DB: The database server to start, either "postgres" or "mysql".
#
# - PGUSER/PGPASSWORD: For the creation of a postgresql user with associated
# password.
set -eu
# Stop and remove any existing database container
DOCKER_CONTAINER="hub-test-$DB"
docker rm -f "$DOCKER_CONTAINER" 2>/dev/null || true
# Prepare environment variables to startup and await readiness of either a mysql
# or postgresql server.
if [[ "$DB" == "mysql" ]]; then
# Environment variables can influence both the mysql server in the docker
# container and the mysql client.
#
# ref server: https://hub.docker.com/_/mysql/
# ref client: https://dev.mysql.com/doc/refman/5.7/en/setting-environment-variables.html
#
DOCKER_RUN_ARGS="-p 3306:3306 --env MYSQL_ALLOW_EMPTY_PASSWORD=1 mysql:8.0"
READINESS_CHECK="mysql --user root --execute \q"
elif [[ "$DB" == "postgres" ]]; then
# Environment variables can influence both the postgresql server in the
# docker container and the postgresql client (psql).
#
# ref server: https://hub.docker.com/_/postgres/
# ref client: https://www.postgresql.org/docs/9.5/libpq-envars.html
#
# POSTGRES_USER / POSTGRES_PASSWORD will create a user on startup of the
# postgres server, but PGUSER and PGPASSWORD are the environment variables
# used by the postgresql client psql, so we configure the user based on how
# we want to connect.
#
DOCKER_RUN_ARGS="-p 5432:5432 --env "POSTGRES_USER=${PGUSER}" --env "POSTGRES_PASSWORD=${PGPASSWORD}" postgres:15.1"
READINESS_CHECK="psql --command \q"
else
echo '$DB must be mysql or postgres'
exit 1
fi
# Start the database server
docker run --detach --name "$DOCKER_CONTAINER" $DOCKER_RUN_ARGS
# Wait for the database server to start
echo -n "waiting for $DB "
for i in {1..60}; do
if $READINESS_CHECK; then
echo 'done'
break
else
echo -n '.'
sleep 1
fi
done
$READINESS_CHECK

27
ci/init-db.sh Executable file
View File

@@ -0,0 +1,27 @@
#!/usr/bin/env bash
# The goal of this script is to initialize a running database server with clean
# databases for use during tests.
#
# Required environment variables:
# - DB: The database server to start, either "postgres" or "mysql".
set -eu
# Prepare env vars SQL_CLIENT and EXTRA_CREATE_DATABASE_ARGS
if [[ "$DB" == "mysql" ]]; then
SQL_CLIENT="mysql --user root --execute "
EXTRA_CREATE_DATABASE_ARGS='CHARACTER SET utf8 COLLATE utf8_general_ci'
elif [[ "$DB" == "postgres" ]]; then
SQL_CLIENT="psql --command "
else
echo '$DB must be mysql or postgres'
exit 1
fi
# Configure a set of databases in the database server for upgrade tests
# this list must be in sync with versions in test_db.py:test_upgrade
set -x
for SUFFIX in '' _upgrade_110 _upgrade_122 _upgrade_130 _upgrade_150 _upgrade_211; do
$SQL_CLIENT "DROP DATABASE jupyterhub${SUFFIX};" 2>/dev/null || true
$SQL_CLIENT "CREATE DATABASE jupyterhub${SUFFIX} ${EXTRA_CREATE_DATABASE_ARGS:-};"
done

16
demo-image/Dockerfile Normal file
View File

@@ -0,0 +1,16 @@
# Demo JupyterHub Docker image
#
# This should only be used for demo or testing and not as a base image to build on.
#
# It includes the notebook package and it uses the DummyAuthenticator and the SimpleLocalProcessSpawner.
ARG BASE_IMAGE=quay.io/jupyterhub/jupyterhub-onbuild
FROM ${BASE_IMAGE}
# Install the notebook package
RUN python3 -m pip install notebook
# Create a demo user
RUN useradd --create-home demo
RUN chown demo .
USER demo

26
demo-image/README.md Normal file
View File

@@ -0,0 +1,26 @@
## Demo Dockerfile
This is a demo JupyterHub Docker image to help you get a quick overview of what
JupyterHub is and how it works.
It uses the SimpleLocalProcessSpawner to spawn new user servers and
DummyAuthenticator for authentication.
The DummyAuthenticator allows you to log in with any username & password and the
SimpleLocalProcessSpawner allows starting servers without having to create a
local user for each JupyterHub user.
### Important!
This should only be used for demo or testing purposes!
It shouldn't be used as a base image to build on.
### Try it
1. `cd` to the root of your jupyterhub repo.
2. Build the demo image with `docker build -t jupyterhub-demo demo-image`.
3. Run the demo image with `docker run -d -p 8000:8000 jupyterhub-demo`.
4. Visit http://localhost:8000 and login with any username and password
5. Happy demo-ing :tada:!

View File

@@ -0,0 +1,7 @@
# Configuration file for jupyterhub-demo
c = get_config()
# Use DummyAuthenticator and SimpleSpawner
c.JupyterHub.spawner_class = "simple"
c.JupyterHub.authenticator_class = "dummy"

View File

@@ -1,2 +0,0 @@
-r requirements.txt
pytest

14
dockerfiles/test.py Normal file
View File

@@ -0,0 +1,14 @@
import os
from jupyterhub._data import DATA_FILES_PATH
print(f"DATA_FILES_PATH={DATA_FILES_PATH}")
for sub_path in (
"templates",
"static/components",
"static/css/style.min.css",
"static/js/admin-react.js",
):
path = os.path.join(DATA_FILES_PATH, sub_path)
assert os.path.exists(path), path

62
docs/Makefile Normal file
View File

@@ -0,0 +1,62 @@
# Makefile for Sphinx documentation generated by sphinx-quickstart
# ----------------------------------------------------------------------------
# You can set these variables from the command line, and also
# from the environment for the first two.
SPHINXOPTS ?= --color -W --keep-going
SPHINXBUILD ?= sphinx-build
SOURCEDIR = source
BUILDDIR = _build
# Put it first so that "make" without argument is like "make help".
help:
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS)
.PHONY: help Makefile metrics scopes
# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option.
#
# Several sphinx-build commands can be used through this, for example:
#
# - make clean
# - make linkcheck
# - make spelling
#
%: Makefile
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS)
# Manually added targets - related to code generation
# ----------------------------------------------------------------------------
# For local development:
# - builds the html
# - NOTE: If the pre-requisites for the html target is updated, also update the
# Read The Docs section in docs/source/conf.py.
#
html: metrics scopes
$(SPHINXBUILD) -b html "$(SOURCEDIR)" "$(BUILDDIR)/html" $(SPHINXOPTS)
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
metrics: source/reference/metrics.md
source/reference/metrics.md:
python3 generate-metrics.py
scopes: source/rbac/scope-table.md
source/rbac/scope-table.md:
python3 source/rbac/generate-scope-table.py
# Manually added targets - related to development
# ----------------------------------------------------------------------------
# For local development:
# - requires sphinx-autobuild, see
# https://sphinxcontrib-spelling.readthedocs.io/en/latest/
# - builds and rebuilds html on changes to source, but does not re-generate
# metrics/scopes files
# - starts a livereload enabled webserver and opens up a browser
devenv: html
sphinx-autobuild -b html --open-browser "$(SOURCEDIR)" "$(BUILDDIR)/html"

View File

@@ -1,78 +0,0 @@
# Writing a custom Authenticator
The [Authenticator][] is the mechanism for authorizing users.
Basic authenticators use simple username and password authentication.
JupyterHub ships only with a [PAM][]-based Authenticator,
for logging in with local user accounts.
You can use custom Authenticator subclasses to enable authentication via other systems.
One such example is using [GitHub OAuth][].
Because the username is passed from the Authenticator to the Spawner,
a custom Authenticator and Spawner are often used together.
## Basics of Authenticators
A basic Authenticator has one central method:
### Authenticator.authenticate
Authenticator.authenticate(handler, data)
This method is passed the tornado RequestHandler and the POST data from the login form.
Unless the login form has been customized, `data` will have two keys:
- `username` (self-explanatory)
- `password` (also self-explanatory)
`authenticate`'s job is simple:
- return a username (non-empty str)
of the authenticated user if authentication is successful
- return `None` otherwise
Writing an Authenticator that looks up passwords in a dictionary
requires only overriding this one method:
```python
from tornado import gen
from IPython.utils.traitlets import Dict
from jupyterhub.auth import Authenticator
class DictionaryAuthenticator(Authenticator):
passwords = Dict(config=True,
help="""dict of username:password for authentication"""
)
@gen.coroutine
def authenticate(self, handler, data):
if self.passwords.get(data['username']) == data['password']:
return data['username']
```
### Authenticator.whitelist
Authenticators can specify a whitelist of usernames to allow authentication.
For local user authentication (e.g. PAM), this lets you limit which users
can login.
## OAuth and other non-password logins
Some login mechanisms, such as [OAuth][], don't map onto username+password.
For these, you can override the login handlers.
You can see an example implementation of an Authenticator that uses [GitHub OAuth][]
at [OAuthenticator][].
[Authenticator]: ../jupyterhub/auth.py
[PAM]: http://en.wikipedia.org/wiki/Pluggable_authentication_module
[OAuth]: http://en.wikipedia.org/wiki/OAuth
[GitHub OAuth]: https://developer.github.com/v3/oauth/
[OAuthenticator]: https://github.com/jupyter/oauthenticator

53
docs/generate-metrics.py Normal file
View File

@@ -0,0 +1,53 @@
import os
from pytablewriter import MarkdownTableWriter
import jupyterhub.metrics
HERE = os.path.abspath(os.path.dirname(__file__))
class Generator:
@classmethod
def create_writer(cls, table_name, headers, values):
writer = MarkdownTableWriter()
writer.table_name = table_name
writer.headers = headers
writer.value_matrix = values
writer.margin = 1
return writer
def _parse_metrics(self):
table_rows = []
for name in dir(jupyterhub.metrics):
obj = getattr(jupyterhub.metrics, name)
if obj.__class__.__module__.startswith('prometheus_client.'):
for metric in obj.describe():
table_rows.append([metric.type, metric.name, metric.documentation])
return table_rows
def prometheus_metrics(self):
generated_directory = f"{HERE}/source/reference"
if not os.path.exists(generated_directory):
os.makedirs(generated_directory)
filename = f"{generated_directory}/metrics.md"
table_name = ""
headers = ["Type", "Name", "Description"]
values = self._parse_metrics()
writer = self.create_writer(table_name, headers, values)
with open(filename, 'w') as f:
f.write("# List of Prometheus Metrics\n\n")
f.write(writer.dumps())
f.write("\n")
print(f"Generated {filename}")
def main():
doc_generator = Generator()
doc_generator.prometheus_metrics()
if __name__ == "__main__":
main()

View File

@@ -1,75 +0,0 @@
# How JupyterHub works
JupyterHub is a multi-user server that manages and proxies multiple instances of the single-user <del>IPython</del> Jupyter notebook server.
There are three basic processes involved:
- multi-user Hub (Python/Tornado)
- configurable http proxy (nodejs)
- multiple single-user IPython notebook servers (Python/IPython/Tornado)
The proxy is the only process that listens on a public interface.
The Hub sits behind the proxy at `/hub`.
Single-user servers sit behind the proxy at `/user/[username]`.
## Logging in
When a new browser logs in to JupyterHub, the following events take place:
- Login data is handed to the [Authenticator](#authentication) instance for validation
- The Authenticator returns the username, if login information is valid
- A single-user server instance is [Spawned](#spawning) for the logged-in user
- When the server starts, the proxy is notified to forward `/user/[username]/*` to the single-user server
- Two cookies are set, one for `/hub/` and another for `/user/[username]`,
containing an encrypted token.
- The browser is redirected to `/user/[username]`, which is handled by the single-user server
Logging into a single-user server is authenticated via the Hub:
- On request, the single-user server forwards the encrypted cookie to the Hub for verification
- The Hub replies with the username if it is a valid cookie
- If the user is the owner of the server, access is allowed
- If it is the wrong user or an invalid cookie, the browser is redirected to `/hub/login`
## Customizing JupyterHub
There are two basic extension points for JupyterHub: How users are authenticated,
and how their server processes are started.
Each is governed by a customizable class,
and JupyterHub ships with just the most basic version of each.
To enable custom authentication and/or spawning,
subclass Authenticator or Spawner,
and override the relevant methods.
### Authentication
Authentication is customizable via the Authenticator class.
Authentication can be replaced by any mechanism,
such as OAuth, Kerberos, etc.
JupyterHub only ships with [PAM](http://en.wikipedia.org/wiki/Pluggable_authentication_module) authentication,
which requires the server to be run as root,
or at least with access to the PAM service,
which regular users typically do not have
(on Ubuntu, this requires being added to the `shadow` group).
[More info on custom Authenticators](authenticators.md).
### Spawning
Each single-user server is started by a Spawner.
The Spawner represents an abstract interface to a process,
and needs to be able to take three actions:
1. start the process
2. poll whether the process is still running
3. stop the process
[More info on custom Spawners](spawners.md).
[An example using Docker](https://github.com/jupyter/dockerspawner).

49
docs/make.bat Normal file
View File

@@ -0,0 +1,49 @@
@ECHO OFF
pushd %~dp0
REM Command file for Sphinx documentation
if "%SPHINXBUILD%" == "" (
set SPHINXBUILD=--color -W --keep-going
)
if "%SPHINXBUILD%" == "" (
set SPHINXBUILD=sphinx-build
)
set SOURCEDIR=source
set BUILDDIR=_build
if "%1" == "" goto help
if "%1" == "devenv" goto devenv
goto default
:default
%SPHINXBUILD% >NUL 2>NUL
if errorlevel 9009 (
echo.
echo.The 'sphinx-build' command was not found. Open and read README.md!
exit /b 1
)
%SPHINXBUILD% -M %1 "%SOURCEDIR%" "%BUILDDIR%" %SPHINXOPTS%
goto end
:help
%SPHINXBUILD% -M help "%SOURCEDIR%" "%BUILDDIR%" %SPHINXOPTS%
goto end
:devenv
sphinx-autobuild >NUL 2>NUL
if errorlevel 9009 (
echo.
echo.The 'sphinx-autobuild' command was not found. Open and read README.md!
exit /b 1
)
sphinx-autobuild -b html --open-browser "%SOURCEDIR%" "%BUILDDIR%/html"
goto end
:end
popd

21
docs/requirements.txt Normal file
View File

@@ -0,0 +1,21 @@
# We install the jupyterhub package to help autodoc-traits inspect it and
# generate documentation.
#
# FIXME: If there is a way for this requirements.txt file to pass a flag that
# the build system can intercept to not build the javascript artifacts,
# then do so so. That would mean that installing the documentation can
# avoid needing node/npm installed.
#
--editable .
autodoc-traits
jupyterhub-sphinx-theme
myst-parser>=0.19
pre-commit
pytablewriter>=0.56
ruamel.yaml
sphinx>=4
sphinx-copybutton
sphinx-jsonschema
sphinxext-opengraph
sphinxext-rediraffe

View File

@@ -0,0 +1,10 @@
/* Added to avoid logo being too squeezed */
.navbar-brand {
height: 4rem !important;
}
/* hide redundant funky-formatted swagger-ui version */
.swagger-ui .info .title small {
display: none !important;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

File diff suppressed because it is too large Load Diff

249
docs/source/conf.py Normal file
View File

@@ -0,0 +1,249 @@
# Configuration file for Sphinx to build our documentation to HTML.
#
# Configuration reference: https://www.sphinx-doc.org/en/master/usage/configuration.html
#
import contextlib
import datetime
import io
import os
import subprocess
from docutils import nodes
from sphinx.directives.other import SphinxDirective
import jupyterhub
from jupyterhub.app import JupyterHub
# -- Project information -----------------------------------------------------
# ref: https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
#
project = "JupyterHub"
author = "Project Jupyter Contributors"
copyright = f"{datetime.date.today().year}, {author}"
# -- General Sphinx configuration --------------------------------------------
# ref: https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
#
extensions = [
"sphinx.ext.autodoc",
"sphinx.ext.intersphinx",
"sphinx.ext.napoleon",
"autodoc_traits",
"sphinx_copybutton",
"sphinx-jsonschema",
"sphinxext.opengraph",
"sphinxext.rediraffe",
"jupyterhub_sphinx_theme",
"myst_parser",
]
root_doc = "index"
source_suffix = [".md"]
# default_role let's use use `foo` instead of ``foo`` in rST
default_role = "literal"
# -- MyST configuration ------------------------------------------------------
# ref: https://myst-parser.readthedocs.io/en/latest/configuration.html
#
myst_heading_anchors = 2
myst_enable_extensions = [
# available extensions: https://myst-parser.readthedocs.io/en/latest/syntax/optional.html
"attrs_inline",
"colon_fence",
"deflist",
"fieldlist",
"substitution",
]
myst_substitutions = {
# date example: Dev 07, 2022
"date": datetime.date.today().strftime("%b %d, %Y").title(),
"version": jupyterhub.__version__,
}
# -- Custom directives to generate documentation -----------------------------
# ref: https://myst-parser.readthedocs.io/en/latest/syntax/roles-and-directives.html
#
# We define custom directives to help us generate documentation using Python on
# demand when referenced from our documentation files.
#
# Create a temp instance of JupyterHub for use by two separate directive classes
# to get the output from using the "--generate-config" and "--help-all" CLI
# flags respectively.
#
jupyterhub_app = JupyterHub()
class ConfigDirective(SphinxDirective):
"""Generate the configuration file output for use in the documentation."""
has_content = False
required_arguments = 0
optional_arguments = 0
final_argument_whitespace = False
option_spec = {}
def run(self):
# The generated configuration file for this version
generated_config = jupyterhub_app.generate_config_file()
# post-process output
home_dir = os.environ["HOME"]
generated_config = generated_config.replace(home_dir, "$HOME", 1)
par = nodes.literal_block(text=generated_config)
return [par]
class HelpAllDirective(SphinxDirective):
"""Print the output of jupyterhub help --all for use in the documentation."""
has_content = False
required_arguments = 0
optional_arguments = 0
final_argument_whitespace = False
option_spec = {}
def run(self):
# The output of the help command for this version
buffer = io.StringIO()
with contextlib.redirect_stdout(buffer):
jupyterhub_app.print_help("--help-all")
all_help = buffer.getvalue()
# post-process output
home_dir = os.environ["HOME"]
all_help = all_help.replace(home_dir, "$HOME", 1)
par = nodes.literal_block(text=all_help)
return [par]
def setup(app):
app.add_css_file("custom.css")
app.add_directive("jupyterhub-generate-config", ConfigDirective)
app.add_directive("jupyterhub-help-all", HelpAllDirective)
# -- Read The Docs -----------------------------------------------------------
#
# Since RTD runs sphinx-build directly without running "make html", we run the
# pre-requisite steps for "make html" from here if needed.
#
if os.environ.get("READTHEDOCS"):
docs = os.path.dirname(os.path.dirname(__file__))
subprocess.check_call(["make", "metrics", "scopes"], cwd=docs)
# -- Spell checking ----------------------------------------------------------
# ref: https://sphinxcontrib-spelling.readthedocs.io/en/latest/customize.html#configuration-options
#
# The "sphinxcontrib.spelling" extension is optionally enabled if its available.
#
try:
import sphinxcontrib.spelling # noqa
except ImportError:
pass
else:
extensions.append("sphinxcontrib.spelling")
spelling_word_list_filename = "spelling_wordlist.txt"
# -- Options for HTML output -------------------------------------------------
# ref: https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
#
html_logo = "_static/images/logo/logo.png"
html_favicon = "_static/images/logo/favicon.ico"
html_static_path = ["_static"]
html_theme = "jupyterhub_sphinx_theme"
html_theme_options = {
"icon_links": [
{
"name": "GitHub",
"url": "https://github.com/jupyterhub/jupyterhub",
"icon": "fa-brands fa-github",
},
],
"use_edit_page_button": True,
"navbar_align": "left",
}
html_context = {
"github_user": "jupyterhub",
"github_repo": "jupyterhub",
"github_version": "main",
"doc_path": "docs/source",
}
# -- Options for linkcheck builder -------------------------------------------
# ref: https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-the-linkcheck-builder
#
linkcheck_ignore = [
r"(.*)github\.com(.*)#", # javascript based anchors
r"(.*)/#%21(.*)/(.*)", # /#!forum/jupyter - encoded anchor edge case
r"https://github.com/[^/]*$", # too many github usernames / searches in changelog
"https://github.com/jupyterhub/jupyterhub/pull/", # too many PRs in changelog
"https://github.com/jupyterhub/jupyterhub/compare/", # too many comparisons in changelog
r"https?://(localhost|127.0.0.1).*", # ignore localhost references in auto-links
r".*/rest-api.html#.*", # ignore javascript-resolved internal rest-api links
r"https://linux.die.net/.*", # linux.die.net seems to block requests from CI with 403 sometimes
# don't check links to unpublished advisories
r"https://github.com/jupyterhub/jupyterhub/security/advisories/.*",
]
linkcheck_anchors_ignore = [
"/#!",
"/#%21",
]
# -- Intersphinx -------------------------------------------------------------
# ref: https://www.sphinx-doc.org/en/master/usage/extensions/intersphinx.html#configuration
#
intersphinx_mapping = {
"python": ("https://docs.python.org/3/", None),
"tornado": ("https://www.tornadoweb.org/en/stable/", None),
"jupyter-server": ("https://jupyter-server.readthedocs.io/en/stable/", None),
"nbgitpuller": ("https://nbgitpuller.readthedocs.io/en/latest", None),
}
# -- Options for the opengraph extension -------------------------------------
# ref: https://github.com/wpilibsuite/sphinxext-opengraph#options
#
# ogp_site_url is set automatically by RTD
ogp_image = "_static/logo.png"
ogp_use_first_image = True
# -- Options for the rediraffe extension -------------------------------------
# ref: https://github.com/wpilibsuite/sphinxext-rediraffe#readme
#
# This extension helps us relocate content without breaking links. If a
# document is moved internally, a redirect link should be configured as below to
# help us not break links.
#
# The workflow for adding redirects can be as follows:
# 1. Change "rediraffe_branch" below to point to the commit/ branch you
# want to base off the changes.
# 2. Option 1: run "make rediraffecheckdiff"
# a. Analyze the output of this command.
# b. Manually add the redirect entries to the "redirects.txt" file.
# Option 2: run "make rediraffewritediff"
# a. rediraffe will then automatically add the obvious redirects to redirects.txt.
# b. Analyze the output of the command for broken links.
# c. Check the "redirects.txt" file for any files that were moved/ renamed but are not listed.
# d. Manually add the redirects that have been mised by the automatic builder to "redirects.txt".
# Option 3: Do not use the commands above and, instead, do everything manually - by taking
# note of the files you have moved or renamed and adding them to the "redirects.txt" file.
#
# If you are basing changes off another branch/ commit, always change back
# rediraffe_branch to main before pushing your changes upstream.
#
rediraffe_branch = os.environ.get("REDIRAFFE_BRANCH", "main")
rediraffe_redirects = "redirects.txt"
# allow 80% match for autogenerated redirects
rediraffe_auto_redirect_perc = 80
# rediraffe_redirects = {
# "old-file": "new-folder/new-file-name",
# }

View File

@@ -0,0 +1,27 @@
# Community communication channels
We use different channels of communication for different purposes. Whichever one you use will depend on what kind of communication you want to engage in.
## Discourse (recommended)
We use [Discourse](https://discourse.jupyter.org) for online discussions and support questions.
You can ask questions here if you are a first-time contributor to the JupyterHub project.
Everyone in the Jupyter community is welcome to bring ideas and questions there.
We recommend that you first use our Discourse as all past and current discussions on it are archived and searchable. Thus, all discussions remain useful and accessible to the whole community.
## Gitter
We use [our Gitter channel](https://gitter.im/jupyterhub/jupyterhub) for online, real-time text chat; a place for more ephemeral discussions. When you're not on Discourse, you can stop here to have other discussions on the fly.
## Github Issues
[Github issues](https://docs.github.com/en/issues/tracking-your-work-with-issues/about-issues) are used for most long-form project discussions, bug reports and feature requests.
- Issues related to a specific authenticator or spawner should be opened in the appropriate repository for the authenticator or spawner.
- If you are using a specific JupyterHub distribution (such as [Zero to JupyterHub on Kubernetes](https://github.com/jupyterhub/zero-to-jupyterhub-k8s) or [The Littlest JupyterHub](https://github.com/jupyterhub/the-littlest-jupyterhub/)), you should open issues directly in their repository.
- If you cannot find a repository to open your issue in, do not worry! Open the issue in the [main JupyterHub repository](https://github.com/jupyterhub/jupyterhub/) and our community will help you figure it out.
```{note}
Our community is distributed across the world in various timezones, so please be patient if you do not get a response immediately!
```

View File

@@ -0,0 +1,123 @@
# Contributors
Project Jupyter thanks the following people for their help and
contribution on JupyterHub:
- adelcast
- Analect
- anderbubble
- anikitml
- ankitksharma
- apetresc
- athornton
- barrachri
- BerserkerTroll
- betatim
- Carreau
- cfournie
- charnpreetsingh
- chicovenancio
- cikao
- ckald
- cmoscardi
- consideRatio
- cqzlxl
- CRegenschein
- cwaldbieser
- danielballen
- danoventa
- daradib
- darky2004
- datapolitan
- dblockow-d2dcrc
- DeepHorizons
- DerekHeldtWerle
- dhirschfeld
- dietmarw
- dingc3
- dmartzol
- DominicFollettSmith
- dsblank
- dtaniwaki
- echarles
- ellisonbg
- emmanuel
- evanlinde
- Fokko
- fperez
- franga2000
- GladysNalvarte
- glenak1911
- gweis
- iamed18
- jamescurtin
- JamiesHQ
- JasonJWilliamsNY
- jbweston
- jdavidheiser
- jencabral
- jhamrick
- jkinkead
- johnkpark
- josephtate
- jzf2101
- karfai
- kinuax
- KrishnaPG
- kroq-gar78
- ksolan
- mbmilligan
- mgeplf
- minrk
- mistercrunch
- Mistobaan
- mpacer
- mwmarkland
- ndly
- nthiery
- nxg
- ObiWahn
- ozancaglayan
- paccorsi
- parente
- PeterDaveHello
- peterruppel
- phill84
- pjamason
- prasadkatti
- rafael-ladislau
- rcthomas
- rgbkrk
- rkdarst
- robnagler
- rschroll
- ryanlovett
- sangramga
- Scrypy
- schon
- shreddd
- Siecje
- smiller5678
- spoorthyv
- ssanderson
- summerswallow
- syutbai
- takluyver
- temogen
- ThomasMChen
- Thoralf Gutierrez
- timfreund
- TimShawver
- tklever
- Todd-Z-Li
- toobaz
- tsaeger
- tschaume
- vilhelmen
- whitead
- willingc
- YannBrrd
- yuvipanda
- zoltan-fedor
- zonca
- Neeraj Natu

View File

@@ -0,0 +1,76 @@
(contributing-docs)=
# Contributing Documentation
Documentation is often more important than code. This page helps
you get set up on how to contribute to JupyterHub's documentation.
## Building documentation locally
We use [sphinx](https://www.sphinx-doc.org) to build our documentation. It takes
our documentation source files (written in [markdown](https://daringfireball.net/projects/markdown/) or [reStructuredText](https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html) &
stored under the `docs/source` directory) and converts it into various
formats for people to read. To make sure the documentation you write or
change renders correctly, it is good practice to test it locally.
1. Make sure you have successfully completed {ref}`contributing/setup`.
2. Install the packages required to build the docs.
```bash
python3 -m pip install -r docs/requirements.txt
```
3. Build the html version of the docs. This is the most commonly used
output format, so verifying it renders correctly is usually good
enough.
```bash
cd docs
make html
```
This step will display any syntax or formatting errors in the documentation,
along with the filename / line number in which they occurred. Fix them,
and re-run the `make html` command to re-render the documentation.
4. View the rendered documentation by opening `_build/html/index.html` in
a web browser.
:::{tip}
**On Windows**, you can open a file from the terminal with `start <path-to-file>`.
**On macOS**, you can do the same with `open <path-to-file>`.
**On Linux**, you can do the same with `xdg-open <path-to-file>`.
After opening index.html in your browser you can just refresh the page whenever
you rebuild the docs via `make html`
:::
(contributing-docs-conventions)=
## Documentation conventions
This section lists various conventions we use in our documentation. This is a
living document that grows over time, so feel free to add to it / change it!
Our entire documentation does not yet fully conform to these conventions yet,
so help in making it so would be appreciated!
### `pip` invocation
There are many ways to invoke a `pip` command, we recommend the following
approach:
```bash
python3 -m pip
```
This invokes pip explicitly using the python3 binary that you are
currently using. This is the **recommended way** to invoke pip
in our documentation, since it is least likely to cause problems
with python3 and pip being from different environments.
For more information on how to invoke `pip` commands, see
[the pip documentation](https://pip.pypa.io/en/stable/).

View File

@@ -0,0 +1,22 @@
# Contributing
We want you to contribute to JupyterHub in ways that are most exciting
and useful to you. We value documentation, testing, bug reporting & code equally,
and are glad to have your contributions in whatever form you wish.
Be sure to first check our [Code of Conduct](https://github.com/jupyter/governance/blob/HEAD/conduct/code_of_conduct.md)
([reporting guidelines](https://github.com/jupyter/governance/blob/HEAD/conduct/reporting_online.md)), which help keep our community welcoming to as many people as possible.
This section covers information about our community, as well as ways that you can connect and get involved.
```{toctree}
:maxdepth: 2
contributor-list
community
setup
docs
tests
roadmap
security
```

View File

@@ -0,0 +1,95 @@
# The JupyterHub roadmap
This roadmap collects "next steps" for JupyterHub. It is about creating a
shared understanding of the project's vision and direction amongst
the community of users, contributors, and maintainers.
The goal is to communicate priorities and upcoming release plans.
It is not aimed at limiting contributions to what is listed here.
## Using the roadmap
### Sharing Feedback on the Roadmap
All of the community is encouraged to provide feedback as well as share new
ideas with the community. Please do so by submitting an issue. If you want to
have an informal conversation first use one of the other communication channels.
After submitting the issue, others from the community will probably
respond with questions or comments they have to clarify the issue. The
maintainers will help identify what a good next step is for the issue.
### What do we mean by "next step"?
When submitting an issue, think about what "next step" category best describes
your issue:
- **now**, concrete/actionable step that is ready for someone to start work on.
These might be items that have a link to an issue or more abstract like
"decrease typos and dead links in the documentation"
- **soon**, less concrete/actionable step that is going to happen soon,
discussions around the topic are coming close to an end at which point it can
move into the "now" category
- **later**, abstract ideas or tasks, need a lot of discussion or
experimentation to shape the idea so that it can be executed. Can also
contain concrete/actionable steps that have been postponed on purpose
(these are steps that could be in "now" but the decision was taken to work on
them later)
### Reviewing and Updating the Roadmap
The roadmap will get updated as time passes (next review by 1st December) based
on discussions and ideas captured as issues.
This means this list should not be exhaustive, it should only represent
the "top of the stack" of ideas. It should
not function as a wish list, collection of feature requests or todo list.
For those please create a
[new issue](https://github.com/jupyterhub/jupyterhub/issues/new).
The roadmap should give the reader an idea of what is happening next, what needs
input and discussion before it can happen and what has been postponed.
## The roadmap proper
### Project vision
JupyterHub is a dependable tool used by humans that reduces the complexity of
creating the environment in which a piece of software can be executed.
### Now
These "Now" items are considered active areas of focus for the project:
- HubShare - a sharing service for use with JupyterHub.
- Users should be able to:
- Push a project to other users.
- Get a checkout of a project from other users.
- Push updates to a published project.
- Pull updates from a published project.
- Manage conflicts/merges by simply picking a version (our/theirs)
- Get a checkout of a project from the internet. These steps are completely different from saving notebooks/files.
- Have directories that are managed by git completely separately from our stuff.
- Look at pushed content that they have access to without an explicit pull.
- Define and manage teams of users.
- Adding/removing a user to/from a team gives/removes them access to all projects that team has access to.
- Build other services, such as static HTML publishing and dashboarding on top of these things.
### Soon
These "Soon" items are under discussion. Once an item reaches the point of an
actionable plan, the item will be moved to the "Now" section. Typically,
these will be moved at a future review of the roadmap.
- resource monitoring and management:
- (prometheus?) API for resource monitoring
- tracking activity on single-user servers instead of the proxy
- notes and activity tracking per API token
### Later
The "Later" items are things that are at the back of the project's mind. At this
time there is no active plan for an item. The project would like to find the
resources and time to discuss these ideas.
- real-time collaboration
- Enter into real-time collaboration mode for a project that starts a shared execution context.
- Once the single-user notebook package supports realtime collaboration,
implement sharing mechanism integrated into the Hub.

View File

@@ -0,0 +1,9 @@
# Reporting security issues in Jupyter or JupyterHub
If you find a security vulnerability in Jupyter or JupyterHub,
whether it is a failure of the security model described in [Security Overview](web-security)
or a failure in implementation,
please report it to <mailto:security@ipython.org>.
If you prefer to encrypt your security reports,
you can use {download}`this PGP public key </ipython_security.asc>`.

View File

@@ -0,0 +1,175 @@
(contributing/setup)=
# Setting up a development install
## System requirements
JupyterHub can only run on macOS or Linux operating systems. If you are
using Windows, we recommend using [VirtualBox](https://virtualbox.org)
or a similar system to run [Ubuntu Linux](https://ubuntu.com) for
development.
### Install Python
JupyterHub is written in the [Python](https://python.org) programming language and
requires you have at least version 3.6 installed locally. If you havent
installed Python before, the recommended way to install it is to use
[Miniforge](https://github.com/conda-forge/miniforge#download).
### Install nodejs
[NodeJS 12+](https://nodejs.org/en/) is required for building some JavaScript components.
`configurable-http-proxy`, the default proxy implementation for JupyterHub, is written in Javascript.
If you have not installed NodeJS before, we recommend installing it in the `miniconda` environment you set up for Python.
You can do so with `conda install nodejs`.
Many in the Jupyter community use \[`nvm`\](<https://github.com/nvm-sh/nvm>) to
managing node dependencies.
### Install git
JupyterHub uses [Git](https://git-scm.com) & [GitHub](https://github.com)
for development & collaboration. You need to [install git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) to work on
JupyterHub. We also recommend getting a free account on GitHub.com.
## Setting up a development install
When developing JupyterHub, you would need to make changes and be able to instantly view the results of the changes. To achieve that, a developer install is required.
:::{note}
This guide does not attempt to dictate _how_ development
environments should be isolated since that is a personal preference and can
be achieved in many ways, for example, `tox`, `conda`, `docker`, etc. See this
[forum thread](https://discourse.jupyter.org/t/thoughts-on-using-tox/3497) for
a more detailed discussion.
:::
1. Clone the [JupyterHub git repository](https://github.com/jupyterhub/jupyterhub)
to your computer.
```bash
git clone https://github.com/jupyterhub/jupyterhub
cd jupyterhub
```
2. Make sure the `python` you installed and the `npm` you installed
are available to you on the command line.
```bash
python -V
```
This should return a version number greater than or equal to 3.6.
```bash
npm -v
```
This should return a version number greater than or equal to 5.0.
3. Install `configurable-http-proxy` (required to run and test the default JupyterHub configuration) and `yarn` (required to build some components):
```bash
npm install -g configurable-http-proxy yarn
```
If you get an error that says `Error: EACCES: permission denied`, you might need to prefix the command with `sudo`.
`sudo` may be required to perform a system-wide install.
If you do not have access to sudo, you may instead run the following commands:
```bash
npm install configurable-http-proxy yarn
export PATH=$PATH:$(pwd)/node_modules/.bin
```
The second line needs to be run every time you open a new terminal.
If you are using conda you can instead run:
```bash
conda install configurable-http-proxy yarn
```
4. Install an editable version of JupyterHub and its requirements for
development and testing. This lets you edit JupyterHub code in a text editor
& restart the JupyterHub process to see your code changes immediately.
```bash
python3 -m pip install --editable ".[test]"
```
5. Set up a database.
The default database engine is `sqlite` so if you are just trying
to get up and running quickly for local development that should be
available via [Python](https://docs.python.org/3.5/library/sqlite3.html).
See [The Hub's Database](hub-database) for details on other supported databases.
6. You are now ready to start JupyterHub!
```bash
jupyterhub
```
7. You can access JupyterHub from your browser at
`http://localhost:8000` now.
Happy developing!
## Using DummyAuthenticator & SimpleLocalProcessSpawner
To simplify testing of JupyterHub, it is helpful to use
{class}`~jupyterhub.auth.DummyAuthenticator` instead of the default JupyterHub
authenticator and SimpleLocalProcessSpawner instead of the default spawner.
There is a sample configuration file that does this in
`testing/jupyterhub_config.py`. To launch JupyterHub with this
configuration:
```bash
jupyterhub -f testing/jupyterhub_config.py
```
The default JupyterHub [authenticator](PAMAuthenticator)
& [spawner](LocalProcessSpawner)
require your system to have user accounts for each user you want to log in to
JupyterHub as.
DummyAuthenticator allows you to log in with any username & password,
while SimpleLocalProcessSpawner allows you to start servers without having to
create a Unix user for each JupyterHub user. Together, these make it
much easier to test JupyterHub.
Tip: If you are working on parts of JupyterHub that are common to all
authenticators & spawners, we recommend using both DummyAuthenticator &
SimpleLocalProcessSpawner. If you are working on just authenticator-related
parts, use only SimpleLocalProcessSpawner. Similarly, if you are working on
just spawner-related parts, use only DummyAuthenticator.
## Troubleshooting
This section lists common ways setting up your development environment may
fail, and how to fix them. Please add to the list if you encounter yet
another way it can fail!
### `lessc` not found
If the `python3 -m pip install --editable .` command fails and complains about
`lessc` being unavailable, you may need to explicitly install some
additional JavaScript dependencies:
```bash
npm install
```
This will fetch client-side JavaScript dependencies necessary to compile
CSS.
You may also need to manually update JavaScript and CSS after some
development updates, with:
```bash
python3 setup.py js # fetch updated client-side js
python3 setup.py css # recompile CSS from LESS sources
python3 setup.py jsx # build React admin app
```

View File

@@ -0,0 +1,157 @@
(contributing-tests)=
# Testing JupyterHub and linting code
Unit testing helps to validate that JupyterHub works the way we think it does,
and continues to do so when changes occur. They also help communicate
precisely what we expect our code to do.
JupyterHub uses [pytest](https://pytest.org) for all the tests. You
can find them under the [jupyterhub/tests](https://github.com/jupyterhub/jupyterhub/tree/main/jupyterhub/tests) directory in the git repository.
## Running the tests
1. Make sure you have completed {ref}`contributing/setup`.
Once you are done, you would be able to run `jupyterhub` from the command line and access it from your web browser.
This ensures that the dev environment is properly set up for tests to run.
2. You can run all tests in JupyterHub
```bash
pytest -v jupyterhub/tests
```
This should display progress as it runs all the tests, printing
information about any test failures as they occur.
If you wish to confirm test coverage the run tests with the `--cov` flag:
```bash
pytest -v --cov=jupyterhub jupyterhub/tests
```
3. You can also run tests in just a specific file:
```bash
pytest -v jupyterhub/tests/<test-file-name>
```
4. To run a specific test only, you can do:
```bash
pytest -v jupyterhub/tests/<test-file-name>::<test-name>
```
This runs the test with function name `<test-name>` defined in
`<test-file-name>`. This is very useful when you are iteratively
developing a single test.
For example, to run the test `test_shutdown` in the file `test_api.py`,
you would run:
```bash
pytest -v jupyterhub/tests/test_api.py::test_shutdown
```
For more details, refer to the [pytest usage documentation](https://pytest.readthedocs.io/en/latest/usage.html).
## Test organisation
The tests live in `jupyterhub/tests` and are organized roughly into:
1. `test_api.py` tests the REST API
2. `test_pages.py` tests loading the HTML pages
and other collections of tests for different components.
When writing a new test, there should usually be a test of
similar functionality already written and related tests should
be added nearby.
The fixtures live in `jupyterhub/tests/conftest.py`. There are
fixtures that can be used for JupyterHub components, such as:
- `app`: an instance of JupyterHub with mocked parts
- `auth_state_enabled`: enables persisting auth_state (like authentication tokens)
- `db`: a sqlite in-memory DB session
- `` io_loop` ``: a Tornado event loop
- `event_loop`: a new asyncio event loop
- `user`: creates a new temporary user
- `admin_user`: creates a new temporary admin user
- single user servers
\- `cleanup_after`: allows cleanup of single user servers between tests
- mocked service
\- `MockServiceSpawner`: a spawner that mocks services for testing with a short poll interval
\- `` mockservice` ``: mocked service with no external service url
\- `mockservice_url`: mocked service with a url to test external services
And fixtures to add functionality or spawning behavior:
- `admin_access`: grants admin access
- `` no_patience` ``: sets slow-spawning timeouts to zero
- `slow_spawn`: enables the SlowSpawner (a spawner that takes a few seconds to start)
- `never_spawn`: enables the NeverSpawner (a spawner that will never start)
- `bad_spawn`: enables the BadSpawner (a spawner that fails immediately)
- `slow_bad_spawn`: enables the SlowBadSpawner (a spawner that fails after a short delay)
Refer to the [pytest fixtures documentation](https://pytest.readthedocs.io/en/latest/fixture.html) to learn how to use fixtures that exists already and to create new ones.
### The Pytest-Asyncio Plugin
When testing the various JupyterHub components and their various implementations, it sometimes becomes necessary to have a running instance of JupyterHub to test against.
The [`app`](https://github.com/jupyterhub/jupyterhub/blob/270b61992143b29af8c2fab90c4ed32f2f6fe209/jupyterhub/tests/conftest.py#L60) fixture mocks a JupyterHub application for use in testing by:
- enabling ssl if internal certificates are available
- creating an instance of [MockHub](https://github.com/jupyterhub/jupyterhub/blob/270b61992143b29af8c2fab90c4ed32f2f6fe209/jupyterhub/tests/mocking.py#L221) using any provided configurations as arguments
- initializing the mocked instance
- starting the mocked instance
- finally, a registered finalizer function performs a cleanup and stops the mocked instance
The JupyterHub test suite uses the [pytest-asyncio plugin](https://pytest-asyncio.readthedocs.io/en/latest/) that handles [event-loop](https://docs.python.org/3/library/asyncio-eventloop.html) integration in [Tornado](https://www.tornadoweb.org/en/stable/) applications. This allows for the use of top-level awaits when calling async functions or [fixtures](https://docs.pytest.org/en/6.2.x/fixture.html#what-fixtures-are) during testing. All test functions and fixtures labelled as `async` will run on the same event loop.
```{note}
With the introduction of [top-level awaits](https://piccolo-orm.com/blog/top-level-await-in-python/), the use of the `io_loop` fixture of the [pytest-tornado plugin](https://www.tornadoweb.org/en/stable/ioloop.html) is no longer necessary. It was initially used to call coroutines. With the upgrades made to `pytest-asyncio`, this usage is now deprecated. It is now, only utilized within the JupyterHub test suite to ensure complete cleanup of resources used during testing such as open file descriptors. This is demonstrated in this [pull request](https://github.com/jupyterhub/jupyterhub/pull/4332).
More information is provided below.
```
One of the general goals of the [JupyterHub Pytest Plugin project](https://github.com/jupyterhub/pytest-jupyterhub) is to ensure the MockHub cleanup fully closes and stops all utilized resources during testing so the use of the `io_loop` fixture for teardown is not necessary. This was highlighted in this [issue](https://github.com/jupyterhub/pytest-jupyterhub/issues/30)
For more information on asyncio and event-loops, here are some resources:
- **Read**: [Introduction to the Python event loop](https://www.pythontutorial.net/python-concurrency/python-event-loop)
- **Read**: [Overview of Async IO in Python 3.7](https://stackabuse.com/overview-of-async-io-in-python-3-7)
- **Watch**: [Asyncio: Understanding Async / Await in Python](https://www.youtube.com/watch?v=bs9tlDFWWdQ)
- **Watch**: [Learn Python's AsyncIO #2 - The Event Loop](https://www.youtube.com/watch?v=E7Yn5biBZ58)
## Troubleshooting Test Failures
### All the tests are failing
Make sure you have completed all the steps in {ref}`contributing/setup` successfully, and are able to access JupyterHub from your browser at http://localhost:8000 after starting `jupyterhub` in your command line.
## Code formatting and linting
JupyterHub automatically enforces code formatting. This means that pull requests
with changes breaking this formatting will receive a commit from pre-commit.ci
automatically.
To automatically format code locally, you can install pre-commit and register a
_git hook_ to automatically check with pre-commit before you make a commit if
the formatting is okay.
```bash
pip install pre-commit
pre-commit install --install-hooks
```
To run pre-commit manually you would do:
```bash
# check for changes to code not yet committed
pre-commit run
# check for changes also in already committed code
pre-commit run --all-files
```
You may also install [black integration](https://github.com/psf/black#editor-integration)
into your text editor to format code automatically.

View File

@@ -0,0 +1,308 @@
# Capacity planning
General capacity planning advice for JupyterHub is hard to give,
because it depends almost entirely on what your users are doing,
and what JupyterHub users do varies _wildly_ in terms of resource consumption.
**There is no single answer to "I have X users, what resources do I need?" or "How many users can I support with this machine?"**
Here are three _typical_ Jupyter use patterns that require vastly different resources:
- **Learning**: negligible resources because computation is mostly idle,
e.g. students learning programming for the first time
- **Production code**: very intense, sustained load, e.g. training machine learning models
- **Bursting**: _mostly_ idle, but needs a lot of resources for short periods of time
(interactive research often looks like this)
But just because there's no single answer doesn't mean we can't help.
So we have gathered here some useful information to help you make your decisions
about what resources you need based on how your users work,
including the relative invariants in terms of resources that JupyterHub itself needs.
## JupyterHub infrastructure
JupyterHub consists of a few components that are always running.
These take up very little resources,
especially relative to the resources consumed by users when you have more than a few.
As an example, an instance of mybinder.org (running JupyterHub 1.5.0),
running with typically ~100-150 users has:
| Component | CPU (mean/peak) | Memory (mean/peak) |
| --------- | --------------- | ------------------ |
| Hub | 4% / 13% | (230 MB / 260 MB) |
| Proxy | 6% / 13% | (47 MB / 65 MB) |
So it would be pretty generous to allocate ~25% of one CPU core
and ~500MB of RAM to overall JupyterHub infrastructure.
The rest is going to be up to your users.
Per-user overhead from JupyterHub is typically negligible
up to at least a few hundred concurrent active users.
```{figure} /images/mybinder-hub-components-cpu-memory.png
JupyterHub component resource usage for mybinder.org.
```
## Factors to consider
### Static vs elastic resources
A big factor in planning resources is:
**how much does it cost to change your mind?**
If you are using a single shared machine with local storage,
migrating to a new one because it turns out your users don't fit might be very costly.
You will have to get a new machine, set it up, and maybe even migrate user data.
On the other hand, if you are using ephemeral resources,
such as node pools in Kubernetes,
changing resource types costs close to nothing
because nodes can automatically be added or removed as needed.
Take that cost into account when you are picking how much memory or cpu to allocate to users.
Static resources (like [the-littlest-jupyterhub][]) provide for more **stable, predictable costs**,
but elastic resources (like [zero-to-jupyterhub][]) tend to provide **lower overall costs**
(especially when deployed with monitoring allowing cost optimizations over time),
but which are **less predictable**.
[the-littlest-jupyterhub]: https://the-littlest-jupyterhub.readthedocs.io
[zero-to-jupyterhub]: https://z2jh.jupyter.org
(limits-requests)=
### Limit vs Request for resources
Many scheduling tools like Kubernetes have two separate ways of allocating resources to users.
A **Request** or **Reservation** describes how much resources are _set aside_ for each user.
Often, this doesn't have any practical effect other than deciding when a given machine is considered 'full'.
If you are using expandable resources like an autoscaling Kubernetes cluster,
a new node must be launched and added to the pool if you 'request' more resources than fit on currently running nodes (a cluster **scale-up event**).
If you are running on a single VM, this describes how many users you can run at the same time, full stop.
A **Limit**, on the other hand, enforces a limit to how much resources any given user can consume.
For more information on what happens when users try to exceed their limits, see [](oversubscription).
In the strictest, safest case, you can have these two numbers be the same.
That means that each user is _limited_ to fit within the resources allocated to it.
This avoids **[oversubscription](oversubscription)** of resources (allowing use of more than you have available),
at the expense (in a literal, this-costs-money sense) of reserving lots of usually-idle capacity.
However, you often find that a small fraction of users use more resources than others.
In this case you may give users limits that _go beyond the amount of resources requested_.
This is called **oversubscribing** the resources available to users.
Having a gap between the request and the limit means you can fit a number of _typical_ users on a node (based on the request),
but still limit how much a runaway user can gobble up for themselves.
(oversubscription)=
### Oversubscribed CPU is okay, running out of memory is bad
An important consideration when assigning resources to users is: **What happens when users need more than I've given them?**
A good summary to keep in mind:
> When tasks don't get enough CPU, things are slow.
> When they don't get enough memory, things are broken.
This means it's **very important that users have enough memory**,
but much less important that they always have exclusive access to all the CPU they can use.
This relates to [Limits and Requests](limits-requests),
because these are the consequences of your limits and/or requests not matching what users actually try to use.
A table of mismatched resource allocation situations and their consequences:
| issue | consequence |
| -------------------------------------------------------- | ------------------------------------------------------------------------------------- |
| Requests too high | Unnecessarily high cost and/or low capacity. |
| CPU limit too low | Poor performance experienced by users |
| CPU oversubscribed (too-low request + too-high limit) | Poor performance across the system; may crash, if severe |
| Memory limit too low | Servers killed by Out-of-Memory Killer (OOM); lost work for users |
| Memory oversubscribed (too-low request + too-high limit) | System memory exhaustion - all kinds of hangs and crashes and weird errors. Very bad. |
Note that the 'oversubscribed' problem case is where the request is lower than _typical_ usage,
meaning that the total reserved resources isn't enough for the total _actual_ consumption.
This doesn't mean that _all_ your users exceed the request,
just that the _limit_ gives enough room for the _average_ user to exceed the request.
All of these considerations are important _per node_.
Larger nodes means more users per node, and therefore more users to average over.
It also means more chances for multiple outliers on the same node.
### Example case for oversubscribing memory
Take for example, this system and sampling of user behavior:
- System memory = 8G
- memory request = 1G, limit = 3G
- typical 'heavy' user: 2G
- typical 'light' user: 0.5G
This will assign 8 users to those 8G of RAM (remember: only requests are used for deciding when a machine is 'full').
As long as the total of 8 users _actual_ usage is under 8G, everything is fine.
But the _limit_ allows a total of 24G to be used,
which would be a mess if everyone used their full limit.
But _not_ everyone uses the full limit, which is the point!
This pattern is fine if 1/8 of your users are 'heavy' because _typical_ usage will be ~0.7G,
and your total usage will be ~5G (`1 × 2 + 7 × 0.5 = 5.5`).
But if _50%_ of your users are 'heavy' you have a problem because that means your users will be trying to use 10G (`4 × 2 + 4 × 0.5 = 10`),
which you don't have.
You can make guesses at these numbers, but the only _real_ way to get them is to measure (see [](measuring)).
### CPU:memory ratio
Most of the time, you'll find that only one resource is the limiting factor for your users.
Most often it's memory, but for certain tasks, it could be CPU (or even GPUs).
Many cloud deployments have just one or a few fixed ratios of cpu to memory
(e.g. 'general purpose', 'high memory', and 'high cpu').
Setting your secondary resource allocation according to this ratio
after selecting the more important limit results in a balanced resource allocation.
For instance, some of Google Cloud's ratios are:
| node type | GB RAM / CPU core |
| ----------- | ----------------- |
| n2-highmem | 8 |
| n2-standard | 4 |
| n2-highcpu | 1 |
(idleness)=
### Idleness
Jupyter being an interactive tool means people tend to spend a lot more time reading and thinking than actually running resource-intensive code.
This significantly affects how much _cpu_ resources a typical active user needs,
but often does not significantly affect the _memory_.
Ways to think about this:
- More idle users means unused CPU.
This generally means setting your CPU _limit_ higher than your CPU _request_.
- What do your users do when they _are_ running code?
Is it typically single-threaded local computation in a notebook?
If so, there's little reason to set a limit higher than 1 CPU core.
- Do typical computations take a long time, or just a few seconds?
Longer typical computations means it's more likely for users to be trying to use the CPU at the same moment,
suggesting a higher _request_.
- Even with idle users, parallel computation adds up quickly - one user fully loading 4 cores and 3 using almost nothing still averages to more than a full CPU core per user.
- Long-running intense computations suggest higher requests.
Again, using mybinder.org as an example—we run around 100 users on 8-core nodes,
and still see fairly _low_ overall CPU usage on each user node.
The limit here is actually Kubernetes' pods per node, not memory _or_ CPU.
This is likely a extreme case, as many Binder users come from clicking links on webpages
without any actual intention of running code.
```{figure} /images/mybinder-load5.png
mybinder.org node CPU usage is low with 50-150 users sharing just 8 cores
```
### Concurrent users and culling idle servers
Related to [][idleness], all of these resource consumptions and limits are calculated based on **concurrently active users**,
not total users.
You might have 10,000 users of your JupyterHub deployment, but only 100 of them running at any given time.
That 100 is the main number you need to use for your capacity planning.
JupyterHub costs scale very little based on the number of _total_ users,
up to a point.
There are two important definitions for **active user**:
- Are they _actually_ there (i.e. a human interacting with Jupyter, or running code that might be )
- Is their server running (this is where resource reservations and limits are actually applied)
Connecting those two definitions (how long are servers running if their humans aren't using them) is an important area of deployment configuration, usually implemented via the [JupyterHub idle culler service][idle-culler].
[idle-culler]: https://github.com/jupyterhub/jupyterhub-idle-culler
There are a lot of considerations when it comes to culling idle users that will depend:
- How much does it save me to shut down user servers? (e.g. keeping an elastic cluster small, or keeping a fixed-size deployment available to active users)
- How much does it cost my users to have their servers shut down? (e.g. lost work if shutdown prematurely)
- How easy do I want it to be for users to keep their servers running? (e.g. Do they want to run unattended simulations overnight? Do you want them to?)
Like many other things in this guide, there are many correct answers leading to different configuration choices.
For more detail on culling configuration and considerations, consult the [JupyterHub idle culler documentation][idle-culler].
## More tips
### Start strict and generous, then measure
A good tip, in general, is to give your users as much resources as you can afford that you think they _might_ use.
Then, use resource usage metrics like prometheus to analyze what your users _actually_ need,
and tune accordingly.
Remember: **Limits affect your user experience and stability. Requests mostly affect your costs**.
For example, a sensible starting point (lacking any other information) might be:
```yaml
request:
cpu: 0.5
mem: 2G
limit:
cpu: 1
mem: 2G
```
(more memory if significant computations are likely - machine learning models, data analysis, etc.)
Some actions
- If you see out-of-memory killer events, increase the limit (or talk to your users!)
- If you see typical memory well below your limit, reduce the request (but not the limit)
- If _nobody_ uses that much memory, reduce your limit
- If CPU is your limiting scheduling factor and your CPUs are mostly idle,
reduce the cpu request (maybe even to 0!).
- If CPU usage continues to be low, increase the limit to 2 or 4 to allow bursts of parallel execution.
(measuring)=
### Measuring user resource consumption
It is _highly_ recommended to deploy monitoring services such as [Prometheus][]
and [Grafana][] to get a view of your users' resource usage.
This is the only way to truly know what your users need.
JupyterHub has some experimental [grafana dashboards][] you can use as a starting point,
to keep an eye on your resource usage.
Here are some sample charts from (again from mybinder.org),
showing >90% of users using less than 10% CPU and 200MB,
but a few outliers near the limit of 1 CPU and 2GB of RAM.
This is the kind of information you can use to tune your requests and limits.
![Snapshot from JupyterHub's Grafana dashboards on mybinder.org](/images/mybinder-user-resources.png)
[prometheus]: https://prometheus.io
[grafana]: https://grafana.com
[grafana dashboards]: https://github.com/jupyterhub/grafana-dashboards
### Measuring costs
Measuring costs may be as important as measuring your users activity.
If you are using a cloud provider, you can often use cost thresholds and quotas to instruct them to notify you if your costs are too high,
e.g. "Have AWS send me an email if I hit X spending trajectory on week 3 of the month."
You can then use this information to tune your resources based on what you can afford.
You can mix this information with user resource consumption to figure out if you have a problem,
e.g. "my users really do need X resources, but I can only afford to give them 80% of X."
This information may prove useful when asking your budget-approving folks for more funds.
### Additional resources
There are lots of other resources for cost and capacity planning that may be specific to JupyterHub and/or your cloud provider.
Here are some useful links to other resources
- [Zero to JupyterHub](https://z2jh.jupyter.org) documentation on
- [projecting costs](https://z2jh.jupyter.org/en/latest/administrator/cost.html)
- [configuring user resources](https://z2jh.jupyter.org/en/latest/jupyterhub/customizing/user-resources.html)
- Cloud platform cost calculators:
- [Google Cloud](https://cloud.google.com/products/calculator/)
- [Amazon AWS](https://calculator.aws)
- [Microsoft Azure](https://azure.microsoft.com/en-us/pricing/calculator/)

View File

@@ -0,0 +1,183 @@
(hub-database)=
# The Hub's Database
JupyterHub uses a database to store information about users, services, and other data needed for operating the Hub.
This is the **state** of the Hub.
## Why does JupyterHub have a database?
JupyterHub is a **stateful** application (more on that 'state' later).
Updating JupyterHub's configuration or upgrading the version of JupyterHub requires restarting the JupyterHub process to apply the changes.
We want to minimize the disruption caused by restarting the Hub process, so it can be a mundane, frequent, routine activity.
Storing state information outside the process for later retrieval is necessary for this, and one of the main thing databases are for.
A lot of the operations in JupyterHub are also **relationships**, which is exactly what SQL databases are great at.
For example:
- Given an API token, what user is making the request?
- Which users don't have running servers?
- Which servers belong to user X?
- Which users have not been active in the last 24 hours?
Finally, a database allows us to have more information stored without needing it all loaded in memory,
e.g. supporting a large number (several thousands) of inactive users.
## What's in the database?
The short answer of what's in the JupyterHub database is "everything."
JupyterHub's **state** lives in the database.
That is, everything JupyterHub needs to be aware of to function that _doesn't_ come from the configuration files, such as
- users, roles, role assignments
- state, urls of running servers
- Hashed API tokens
- Short-lived state related to OAuth flow
- Timestamps for when users, tokens, and servers were last used
### What's _not_ in the database
Not _quite_ all of JupyterHub's state is in the database.
This mostly involves transient state, such as the 'pending' transitions of Spawners (starting, stopping, etc.).
Anything not in the database must be reconstructed on Hub restart, and the only sources of information to do that are the database and JupyterHub configuration file(s).
## How does JupyterHub use the database?
JupyterHub makes some _unusual_ choices in how it connects to the database.
These choices represent trade-offs favoring single-process simplicity and performance at the expense of horizontal scalability (multiple Hub instances).
We often say that the Hub 'owns' the database.
This ownership means that we assume the Hub is the only process that will talk to the database.
This assumption enables us to make several caching optimizations that dramatically improve JupyterHub's performance (i.e. data written recently to the database can be read from memory instead of fetched again from the database) that would not work if multiple processes could be interacting with the database at the same time.
Database operations are also synchronous, so while JupyterHub is waiting on a database operation, it cannot respond to other requests.
This allows us to avoid complex locking mechanisms, because transaction races can only occur during an `await`, so we only need to make sure we've completed any given transaction before the next `await` in a given request.
:::{note}
We are slowly working to remove these assumptions, and moving to a more traditional db session per-request pattern.
This will enable multiple Hub instances and enable scaling JupyterHub, but will significantly reduce the number of active users a single Hub instance can serve.
:::
### Database performance in a typical request
Most authenticated requests to JupyterHub involve a few database transactions:
1. look up the authenticated user (e.g. look up token by hash, then resolve owner and permissions)
2. record activity
3. perform any relevant changes involved in processing the request (e.g. create the records for a running server when starting one)
This means that the database is involved in almost every request, but only in quite small, simple queries, e.g.:
- lookup one token by hash
- lookup one user by name
- list tokens or servers for one user (typically 1-10)
- etc.
### The database as a limiting factor
As a result of the above transactions in most requests, database performance is the _leading_ factor in JupyterHub's baseline requests-per-second performance, but that cost does not scale significantly with the number of users, active or otherwise.
However, the database is _rarely_ a limiting factor in JupyterHub performance in a practical sense, because the main thing JupyterHub does is start, stop, and monitor whole servers, which take far more time than any small database transaction, no matter how many records you have or how slow your database is (within reason).
Additionally, there is usually _very_ little load on the database itself.
By far the most taxing activity on the database is the 'list all users' endpoint, primarily used by the [idle-culling service](https://github.com/jupyterhub/jupyterhub-idle-culler).
Database-based optimizations have been added to make even these operations feasible for large numbers of users:
1. State filtering on [GET /hub/api/users?state=active](../reference/rest-api.html#/default/get_users){.external},
which limits the number of results in the query to only the relevant subset (added in JupyterHub 1.3), rather than all users.
2. [Pagination](api-pagination) of all list endpoints, allowing the request of a large number of resources to be more fairly balanced with other Hub activities across multiple requests (added in 2.0).
:::{note}
It's important to note when discussing performance and limiting factors and that all of this only applies to requests to `/hub/...`.
The Hub and its database are not involved in most requests to single-user servers (`/user/...`), which is by design, and largely motivated by the fact that the Hub itself doesn't _need_ to be fast because its operations are infrequent and large.
:::
## Database backends
JupyterHub supports a variety of database backends via [SQLAlchemy][].
The default is sqlite, which works great for many cases, but you should be able to use many backends supported by SQLAlchemy.
Usually, this will mean PostgreSQL or MySQL, both of which are officially supported and well tested with JupyterHub, but others may work as well.
See [SQLAlchemy's docs][sqlalchemy-dialect] for how to connect to different database backends.
Doing so generally involves:
1. installing a Python package that provides a client implementation, and
2. setting [](JupyterHub.db_url) to connect to your database with the specified implementation
[sqlalchemy-dialect]: https://docs.sqlalchemy.org/en/20/dialects/
[sqlalchemy]: https://www.sqlalchemy.org
### Default backend: SQLite
The default database backend for JupyterHub is [SQLite](https://sqlite.org).
We have chosen SQLite as JupyterHub's default because it's simple (the 'database' is a single file) and ubiquitous (it is in the Python standard library).
It works very well for testing, small deployments, and workshops.
For production systems, SQLite has some disadvantages when used with JupyterHub:
- `upgrade-db` may not always work, and you may need to start with a fresh database
- `downgrade-db` **will not** work if you want to rollback to an earlier
version, so backup the `jupyterhub.sqlite` file before upgrading (JupyterHub automatically creates a date-stamped backup file when upgrading sqlite)
The sqlite documentation provides a helpful page about [when to use SQLite and
where traditional RDBMS may be a better choice](https://sqlite.org/whentouse.html).
### Picking your database backend (PostgreSQL, MySQL)
When running a long term deployment or a production system, we recommend using a full-fledged relational database, such as [PostgreSQL](https://www.postgresql.org) or [MySQL](https://www.mysql.com), that supports the SQL `ALTER TABLE` statement, which is used in some database upgrade steps.
In general, you select your database backend with [](JupyterHub.db_url), and can further configure it (usually not necessary) with [](JupyterHub.db_kwargs).
## Notes and Tips
### SQLite
The SQLite database should not be used on NFS. SQLite uses reader/writer locks
to control access to the database. This locking mechanism might not work
correctly if the database file is kept on an NFS filesystem. This is because
`fcntl()` file locking is broken on many NFS implementations. Therefore, you
should avoid putting SQLite database files on NFS since it will not handle well
multiple processes which might try to access the file at the same time.
### PostgreSQL
We recommend using PostgreSQL for production if you are unsure whether to use
MySQL or PostgreSQL or if you do not have a strong preference.
There is additional configuration required for MySQL that is not needed for PostgreSQL.
For example, to connect to a postgres database with psycopg2:
1. install psycopg2: `pip instal psycopg2` (or `psycopg2-binary` to avoid compilation, which is [not recommended for production][psycopg2-binary])
2. set authentication via environment variables `PGUSER` and `PGPASSWORD`
3. configure [](JupyterHub.db_url):
```python
c.JupyterHub.db_url = "postgres+psycopg2://my-postgres-server:5432/my-db-name"
```
[psycopg2-binary]: https://www.psycopg.org/docs/install.html#psycopg-vs-psycopg-binary
### MySQL / MariaDB
- You should probably use the `pymysql` or `mysqlclient` sqlalchemy provider, or another backend [recommended by sqlalchemy](https://docs.sqlalchemy.org/en/20/dialects/mysql.html#dialect-mysql)
- You also need to set `pool_recycle` to some value (typically 60 - 300, JupyterHub will default to 60)
which depends on your MySQL setup. This is necessary since MySQL kills
connections serverside if they've been idle for a while, and the connection
from the hub will be idle for longer than most connections. This behavior
will lead to frustrating 'the connection has gone away' errors from
sqlalchemy if `pool_recycle` is not set.
- If you use `utf8mb4` collation with MySQL earlier than 5.7.7 or MariaDB
earlier than 10.2.1 you may get an `1709, Index column size too large` error.
To fix this you need to set `innodb_large_prefix` to enabled and
`innodb_file_format` to `Barracuda` to allow for the index sizes jupyterhub
uses. `row_format` will be set to `DYNAMIC` as long as those options are set
correctly. Later versions of MariaDB and MySQL should set these values by
default, as well as have a default `DYNAMIC` `row_format` and pose no trouble
to users.
For example, to connect to a mysql database with mysqlclient:
1. install mysqlclient: `pip install mysqlclient`
2. configure [](JupyterHub.db_url):
```python
c.JupyterHub.db_url = "mysql+mysqldb://myuser:mypassword@my-sql-server:3306/my-db-name"
```

View File

@@ -0,0 +1,14 @@
# Explanation
_Explanation_ documentation provide big-picture descriptions of how JupyterHub works. This section is meant to build your understanding of particular topics.
```{toctree}
:maxdepth: 1
capacity-planning
database
websecurity
oauth
singleuser
../rbac/index
```

View File

@@ -0,0 +1,373 @@
# JupyterHub and OAuth
JupyterHub uses [OAuth 2](https://oauth.net/2/) as an internal mechanism for authenticating users.
As such, JupyterHub itself always functions as an OAuth **provider**.
You can find out more about what that means [below](oauth-terms).
Additionally, JupyterHub is _often_ deployed with [OAuthenticator](https://oauthenticator.readthedocs.io),
where an external identity provider, such as GitHub or KeyCloak, is used to authenticate users.
When this is the case, there are _two_ nested OAuth flows:
an _internal_ OAuth flow where JupyterHub is the **provider**,
and an _external_ OAuth flow, where JupyterHub is the **client**.
This means that when you are using JupyterHub, there is always _at least one_ and often two layers of OAuth involved in a user logging in and accessing their server.
The following points are noteworthy:
- Single-user servers _never_ need to communicate with or be aware of the upstream provider configured in your Authenticator.
As far as the servers are concerned, only JupyterHub is an OAuth provider,
and how users authenticate with the Hub itself is irrelevant.
- When interacting with a single-user server,
there are ~always two tokens:
first, a token issued to the server itself to communicate with the Hub API,
and second, a per-user token in the browser to represent the completed login process and authorized permissions.
More on this [later](two-tokens).
(oauth-terms)=
## Key OAuth terms
Here are some key definitions to keep in mind when we are talking about OAuth.
You can also read more in detail [here](https://www.oauth.com/oauth2-servers/definitions/).
- **provider**: The entity responsible for managing identity and authorization;
always a web server.
JupyterHub is _always_ an OAuth provider for JupyterHub's components.
When OAuthenticator is used, an external service, such as GitHub or KeyCloak, is also an OAuth provider.
- **client**: An entity that requests OAuth **tokens** on a user's behalf;
generally a web server of some kind.
OAuth **clients** are services that _delegate_ authentication and/or authorization
to an OAuth **provider**.
JupyterHub _services_ or single-user _servers_ are OAuth **clients** of the JupyterHub **provider**.
When OAuthenticator is used, JupyterHub is itself _also_ an OAuth **client** for the external OAuth **provider**, e.g. GitHub.
- **browser**: A user's web browser, which makes requests and stores things like cookies.
- **token**: The secret value used to represent a user's authorization. This is the final product of the OAuth process.
- **code**: A short-lived temporary secret that the **client** exchanges
for a **token** at the conclusion of OAuth,
in what's generally called the "OAuth callback handler."
## One oauth flow
OAuth **flow** is what we call the sequence of HTTP requests involved in authenticating a user and issuing a token, ultimately used for authorizing access to a service or single-user server.
A single OAuth flow typically goes like this:
### OAuth request and redirect
1. A **browser** makes an HTTP request to an OAuth **client**.
2. There are no credentials, so the client _redirects_ the browser to an "authorize" page on the OAuth **provider** with some extra information:
- the OAuth **client ID** of the client itself.
- the **redirect URI** to be redirected back to after completion.
- the **scopes** requested, which the user should be presented with to confirm.
This is the "X would like to be able to Y on your behalf. Allow this?" page you see on all the "Login with ..." pages around the Internet.
3. During this authorize step,
the browser must be _authenticated_ with the provider.
This is often already stored in a cookie,
but if not the provider webapp must begin its _own_ authentication process before serving the authorization page.
This _may_ even begin another OAuth flow!
4. After the user tells the provider that they want to proceed with the authorization,
the provider records this authorization in a short-lived record called an **OAuth code**.
5. Finally, the oauth provider redirects the browser _back_ to the oauth client's "redirect URI"
(or "OAuth callback URI"),
with the OAuth code in a URL parameter.
That marks the end of the requests made between the **browser** and the **provider**.
### State after redirect
At this point:
- The browser is authenticated with the _provider_.
- The user's authorized permissions are recorded in an _OAuth code_.
- The _provider_ knows that the permissions requested by the OAuth client have been granted, but the client doesn't know this yet.
- All the requests so far have been made directly by the browser.
No requests have originated from the client or provider.
### OAuth Client Handles Callback Request
At this stage, we get to finish the OAuth process.
Let's dig into what the OAuth client does when it handles
the OAuth callback request.
- The OAuth client receives the _code_ and makes an API request to the _provider_ to exchange the code for a real _token_.
This is the first direct request between the OAuth _client_ and the _provider_.
- Once the token is retrieved, the client _usually_
makes a second API request to the _provider_
to retrieve information about the owner of the token (the user).
This is the step where behavior diverges for different OAuth providers.
Up to this point, all OAuth providers are the same, following the OAuth specification.
However, OAuth does not define a standard for issuing tokens in exchange for information about their owner or permissions ([OpenID Connect](https://openid.net/connect/) does that),
so this step may be different for each OAuth provider.
- Finally, the OAuth client stores its own record that the user is authorized in a cookie.
This could be the token itself, or any other appropriate representation of successful authentication.
- Now that credentials have been established,
the browser can be redirected to the _original_ URL where it started,
to try the request again.
If the client wasn't able to keep track of the original URL all this time
(not always easy!),
you might end up back at a default landing page instead of where you started the login process. This is frustrating!
😮‍💨 _phew_.
So that's _one_ OAuth process.
## Full sequence of OAuth in JupyterHub
Let's go through the above OAuth process in JupyterHub,
with specific examples of each HTTP request and what information it contains.
For bonus points, we are using the double-OAuth example of JupyterHub configured with GitHubOAuthenticator.
To disambiguate, we will call the OAuth process where JupyterHub is the **provider** "internal OAuth,"
and the one with JupyterHub as a **client** "external OAuth."
Our starting point:
- a user's single-user server is running. Let's call them `danez`
- Jupyterhub is running with GitHub as an OAuth provider (this means two full instances of OAuth),
- Danez has a fresh browser session with no cookies yet.
First request:
- browser->single-user server running JupyterLab or Jupyter Classic
- `GET /user/danez/notebooks/mynotebook.ipynb`
- no credentials, so single-user server (as an OAuth **client**) starts internal OAuth process with JupyterHub (the **provider**)
- response: 302 redirect -> `/hub/api/oauth2/authorize`
with:
- client-id=`jupyterhub-user-danez`
- redirect-uri=`/user/danez/oauth_callback` (we'll come back later!)
Second request, following redirect:
- browser->JupyterHub
- `GET /hub/api/oauth2/authorize`
- no credentials, so JupyterHub starts external OAuth process _with GitHub_
- response: 302 redirect -> `https://github.com/login/oauth/authorize`
with:
- client-id=`jupyterhub-client-uuid`
- redirect-uri=`/hub/oauth_callback` (we'll come back later!)
_pause_ This is where JupyterHub configuration comes into play.
Recall, in this case JupyterHub is using:
```python
c.JupyterHub.authenticator_class = 'github'
```
That means authenticating a request to the Hub itself starts
a _second_, external OAuth process with GitHub as a provider.
This external OAuth process is optional, though.
If you were using the default username+password PAMAuthenticator,
this redirect would have been to `/hub/login` instead, to present the user
with a login form.
Third request, following redirect:
- browser->GitHub
- `GET https://github.com/login/oauth/authorize`
Here, GitHub prompts for login and asks for confirmation of authorization
(more redirects if you aren't logged in to GitHub yet, but ultimately back to this `/authorize` URL).
After successful authorization
(either by looking up a pre-existing authorization,
or recording it via form submission)
GitHub issues an **OAuth code** and redirects to `/hub/oauth_callback?code=github-code`
Next request:
- browser->JupyterHub
- `GET /hub/oauth_callback?code=github-code`
Inside the callback handler, JupyterHub makes two API requests:
The first:
- JupyterHub->GitHub
- `POST https://github.com/login/oauth/access_token`
- request made with OAuth **code** from URL parameter
- response includes an access **token**
The second:
- JupyterHub->GitHub
- `GET https://api.github.com/user`
- request made with access **token** in the `Authorization` header
- response is the user model, including username, email, etc.
Now the external OAuth callback request completes with:
- set cookie on `/hub/` path, recording jupyterhub authentication so we don't need to do external OAuth with GitHub again for a while
- redirect -> `/hub/api/oauth2/authorize`
🎉 At this point, we have completed our first OAuth flow! 🎉
Now, we get our first repeated request:
- browser->jupyterhub
- `GET /hub/api/oauth2/authorize`
- this time with credentials,
so jupyterhub either
1. serves the internal authorization confirmation page, or
2. automatically accepts authorization (shortcut taken when a user is visiting their own server)
- redirect -> `/user/danez/oauth_callback?code=jupyterhub-code`
Here, we start the same OAuth callback process as before, but at Danez's single-user server for the _internal_ OAuth.
- browser->single-user server
- `GET /user/danez/oauth_callback`
(in handler)
Inside the internal OAuth callback handler,
Danez's server makes two API requests to JupyterHub:
The first:
- single-user server->JupyterHub
- `POST /hub/api/oauth2/token`
- request made with oauth code from url parameter
- response includes an API token
The second:
- single-user server->JupyterHub
- `GET /hub/api/user`
- request made with token in the `Authorization` header
- response is the user model, including username, groups, etc.
Finally completing `GET /user/danez/oauth_callback`:
- response sets cookie, storing encrypted access token
- _finally_ redirects back to the original `/user/danez/notebooks/mynotebook.ipynb`
Final request:
- browser -> single-user server
- `GET /user/danez/notebooks/mynotebook.ipynb`
- encrypted jupyterhub token in cookie
To authenticate this request, the single token stored in the encrypted cookie is passed to the Hub for verification:
- single-user server -> Hub
- `GET /hub/api/user`
- browser's token in Authorization header
- response: user model with name, groups, etc.
If the user model matches who should be allowed (e.g. Danez),
then the request is allowed.
See [Scopes in JupyterHub](jupyterhub-scopes) for how JupyterHub uses scopes to determine authorized access to servers and services.
_the end_
## Token caches and expiry
Because tokens represent information from an external source,
they can become 'stale,'
or the information they represent may no longer be accurate.
For example: a user's GitHub account may no longer be authorized to use JupyterHub,
that should ultimately propagate to revoking access and force logging in again.
To handle this, OAuth tokens and the various places they are stored can _expire_,
which should have the same effect as no credentials,
and trigger the authorization process again.
In JupyterHub's internal OAuth, we have these layers of information that can go stale:
- The OAuth client has a **cache** of Hub responses for tokens,
so it doesn't need to make API requests to the Hub for every request it receives.
This cache has an expiry of five minutes by default,
and is governed by the configuration `HubAuth.cache_max_age` in the single-user server.
- The internal OAuth token is stored in a cookie, which has its own expiry (default: 14 days),
governed by `JupyterHub.cookie_max_age_days`.
- The internal OAuth token itself can also expire,
which is by default the same as the cookie expiry,
since it makes sense for the token itself and the place it is stored to expire at the same time.
This is governed by `JupyterHub.cookie_max_age_days` first,
or can overridden by `JupyterHub.oauth_token_expires_in`.
That's all for _internal_ auth storage,
but the information from the _external_ authentication provider
(could be PAM or GitHub OAuth, etc.) can also expire.
Authenticator configuration governs when JupyterHub needs to ask again,
triggering the external login process anew before letting a user proceed.
- `jupyterhub-hub-login` cookie stores that a browser is authenticated with the Hub.
This expires according to `JupyterHub.cookie_max_age_days` configuration,
with a default of 14 days.
The `jupyterhub-hub-login` cookie is encrypted with `JupyterHub.cookie_secret`
configuration.
- {meth}`.Authenticator.refresh_user` is a method to refresh a user's auth info.
By default, it does nothing, but it can return an updated user model if a user's information has changed,
or force a full login process again if needed.
- {attr}`.Authenticator.auth_refresh_age` configuration governs how often
`refresh_user()` will be called to check if a user must login again (default: 300 seconds).
- {attr}`.Authenticator.refresh_pre_spawn` configuration governs whether
`refresh_user()` should be called prior to spawning a server,
to force fresh auth info when a server is launched (default: False).
This can be useful when Authenticators pass access tokens to spawner environments, to ensure they aren't getting a stale token that's about to expire.
**So what happens when these things expire or get stale?**
- If the HubAuth **token response cache** expires,
when a request is made with a token,
the Hub is asked for the latest information about the token.
This usually has no visible effect, since it is just refreshing a cache.
If it turns out that the token itself has expired or been revoked,
the request will be denied.
- If the token has expired, but is still in the cookie:
when the token response cache expires,
the next time the server asks the hub about the token,
no user will be identified and the internal OAuth process begins again.
- If the token _cookie_ expires, the next browser request will be made with no credentials,
and the internal OAuth process will begin again.
This will usually have the form of a transparent redirect browsers won't notice.
However, if this occurs on an API request in a long-lived page visit
such as a JupyterLab session, the API request may fail and require
a page refresh to get renewed credentials.
- If the _JupyterHub_ cookie expires, the next time the browser makes a request to the Hub,
the Hub's authorization process must begin again (e.g. login with GitHub).
Hub cookie expiry on its own **does not** mean that a user can no longer access their single-user server!
- If credentials from the upstream provider (e.g. GitHub) become stale or outdated,
these will not be refreshed until/unless `refresh_user` is called
_and_ `refresh_user()` on the given Authenticator is implemented to perform such a check.
At this point, few Authenticators implement `refresh_user` to support this feature.
If your Authenticator does not or cannot implement `refresh_user`,
the only way to force a check is to reset the `JupyterHub.cookie_secret` encryption key,
which invalidates the `jupyterhub-hub-login` cookie for all users.
### Logging out
Logging out of JupyterHub means clearing and revoking many of these credentials:
- The `jupyterhub-hub-login` cookie is revoked, meaning the next request to the Hub itself will require a new login.
- The token stored in the `jupyterhub-user-username` cookie for the single-user server
will be revoked, based on its associaton with `jupyterhub-session-id`, but the _cookie itself cannot be cleared at this point_
- The shared `jupyterhub-session-id` is cleared, which ensures that the HubAuth **token response cache** will not be used,
and the next request with the expired token will ask the Hub, which will inform the single-user server that the token has expired
## Extra bits
(two-tokens)=
### A tale of two tokens
**TODO**: discuss API token issued to server at startup ($JUPYTERHUB_API_TOKEN)
and OAuth-issued token in the cookie,
and some details of how JupyterLab currently deals with that.
They are different, and JupyterLab should be making requests using the token from the cookie,
not the token from the server,
but that is not currently the case.
### Redirect loops
In general, an authenticated web endpoint has this behavior,
based on the authentication/authorization state of the browser:
- If authorized, allow the request to happen
- If authenticated (I know who you are) but not authorized (you are not allowed), fail with a 403 permission denied error
- If not authenticated, start a redirect process to establish authorization,
which should end in a redirect back to the original URL to try again.
**This is why problems in authentication result in redirect loops!**
If the second request fails to detect the authentication that should have been established during the redirect,
it will start the authentication redirect process over again,
and keep redirecting in a loop until the browser balks.

View File

@@ -0,0 +1,109 @@
(singleuser)=
# The JupyterHub single-user server
When a user logs into JupyterHub, they get a 'server', which we usually call the **single-user server**, because it's a server that's meant for a single JupyterHub user.
Each JupyterHub user gets a different one (or more than one!).
A single-user server is a process running somewhere that is:
1. accessible over http[s],
2. authenticated via JupyterHub using OAuth 2.0,
3. started by a [Spawner](spawners), and
4. 'owned' by a single JupyterHub user
## The single-user server command
The Spawner's default single-user server startup command, `jupyterhub-singleuser`, launches `jupyter-server`, the same program used when you run `jupyter lab` on your laptop.
(_It can also launch the legacy `jupyter-notebook` server_).
That's why JupyterHub looks familiar to folks who are already using Jupyter at home or elsewhere.
It's the same!
`jupyterhub-singleuser` _customizes_ that program to change (approximately) one thing: **authenticate requests with JupyterHub**.
(singleuser-auth)=
## Single-user server authentication
Implementation-wise, JupyterHub single-user servers are a special-case of {ref}`services`
and as such use the same (OAuth) authentication mechanism (more on OAuth in JupyterHub at [](oauth)).
This is primarily implemented in the {class}`~.HubOAuth` class.
This code resides in `jupyterhub.singleuser` subpackage of JupyterHub.
The main task of this code is to:
1. resolve a JupyterHub token to a JupyterHub user (authenticate)
2. check permissions (`access:servers`) for the token to make sure the request should be allowed (authorize)
3. if not authorized, begin the OAuth process with a redirect to the Hub
4. after login, store OAuth tokens in a cookie only used by this single-user server
5. implement logout to clear the cookie
Most of this is implemented in the {class}`~.HubOAuth` class. `jupyterhub.singleuser` is responsible for _adapting_ the base Jupyter Server to use HubOAuth for these tasks.
### JupyterHub authentication extension
By default, `jupyter-server` uses its own cookie to authenticate.
If that cookie is not present, the server redirects you a login page and asks you to enter a password or token.
Jupyter Server 2.0 introduces two new _APIs_ for customizing authentication: the [IdentityProvider](inv:jupyter-server#jupyter_server.auth.IdentityProvider) and the [Authorizer](inv:jupyter-server#jupyter_server.auth.Authorizer).
More information can be found in the [Jupyter Server documentation](https://jupyter-server.readthedocs.io).
JupyterHub implements these APIs in `jupyterhub.singleuser.extension`.
The IdentityProvider is responsible for _authenticating_ requests.
In JupyterHub, that means extracting OAuth tokens from the request and resolving them to a JupyterHub user.
The Authorizer is a _separate_ API for _authorizing_ actions on particular resources.
Because the JupyterHub IdentityProvider only allows _authenticating_ users who already have the necessary `access:servers` permission to access the server, the default Authorizer only contains a redundant check for this same permission, and ignores the resource inputs.
However, specifying a _custom_ Authorizer allows for granular permissions, such as read-only access to subsets of a shared server.
### JupyterHub authentication via subclass
Prior to Jupyter Server 2 (i.e. Jupyter Server 1.x or the legacy `jupyter-notebook` server), JupyterHub authentication is applied via _subclass_.
Originally a subclass of `NotebookApp`,
this approach works with both `jupyter-server` and `jupyter-notebook`.
Instead of using the extension mechanisms above,
the server application is _subclassed_. This worked well in the `jupyter-notebook` days,
but doesn't fit well with Jupyter Server's extension-based architecture.
### Selecting jupyterhub-singleuser implementation
Using the JupyterHub singleuser-server extension is the default behavior of JupyterHub 4 and Jupyter Server 2, otherwise the subclass approach is taken.
You can opt-out of the extension by setting the environment variable `JUPYTERHUB_SINGLEUSER_EXTENSION=0`:
```python
c.Spawner.environment.update(
{
"JUPYTERHUB_SINGLEUSER_EXTENSION": "0",
}
)
```
The subclass approach will also be taken if you've opted to use the classic notebook server with:
```
JUPYTERHUB_SINGLEUSER_APP=notebook
```
which was introduced in JupyterHub 2.
## Other customizations
`jupyterhub-singleuser` makes other small customizations to how the single-user server behaves:
1. logs activity on the single-user server, used in [idle-culling](https://github.com/jupyterhub/jupyterhub-idle-culler).
2. disables some features that don't make sense in JupyterHub (trash, retrying ports)
3. loading options such as URLs and SSL configuration from the environment
4. customize logging for consistency with JupyterHub logs
## Running a single-user server that's not `jupyterhub-singleuser`
By default, `jupyterhub-singleuser` is the same `jupyter-server` used by JupyterLab, Jupyter notebook (>= 7), etc.
But technically, all JupyterHub cares about is that it is:
1. an http server at the prescribed URL, accessible from the Hub and proxy, and
2. authenticated via [OAuth](oauth) with the Hub (it doesn't even have to do this, if you want to do your own authentication, as is done in BinderHub)
which means that you can customize JupyterHub to launch _any_ web application that meets these criteria, by following the specifications in {ref}`services`.
Most of the time, though, it's easier to use [jupyter-server-proxy](https://jupyter-server-proxy.readthedocs.io) if you want to launch additional web applications in JupyterHub.

View File

@@ -0,0 +1,272 @@
(web-security)=
# Security Overview
The **Security Overview** section helps you learn about:
- the design of JupyterHub with respect to web security
- the semi-trusted user
- the available mitigations to protect untrusted users from each other
- the value of periodic security audits
This overview also helps you obtain a deeper understanding of how JupyterHub
works.
## Semi-trusted and untrusted users
JupyterHub is designed to be a _simple multi-user server for modestly sized
groups_ of **semi-trusted** users. While the design reflects serving
semi-trusted users, JupyterHub can also be suitable for serving **untrusted** users,
but **is not suitable for untrusted users** in its default configuration.
As a result, using JupyterHub with **untrusted** users means more work by the
administrator, since much care is required to secure a Hub, with extra caution on
protecting users from each other.
One aspect of JupyterHub's _design simplicity_ for **semi-trusted** users is that
the Hub and single-user servers are placed in a _single domain_, behind a
[_proxy_][configurable-http-proxy]. If the Hub is serving untrusted
users, many of the web's cross-site protections are not applied between
single-user servers and the Hub, or between single-user servers and each
other, since browsers see the whole thing (proxy, Hub, and single user
servers) as a single website (i.e. single domain).
## Protect users from each other
To protect users from each other, a user must **never** be able to write arbitrary
HTML and serve it to another user on the Hub's domain. This is prevented by JupyterHub's
authentication setup because only the owner of a given single-user notebook server is
allowed to view user-authored pages served by the given single-user notebook
server.
To protect all users from each other, JupyterHub administrators must
ensure that:
- A user **does not have permission** to modify their single-user notebook server,
including:
- the installation of new packages in the Python environment that runs
their single-user server;
- the creation of new files in any `PATH` directory that precedes the
directory containing `jupyterhub-singleuser` (if the `PATH` is used
to resolve the single-user executable instead of using an absolute path);
- the modification of environment variables (e.g. PATH, PYTHONPATH) for
their single-user server;
- the modification of the configuration of the notebook server
(the `~/.jupyter` or `JUPYTER_CONFIG_DIR` directory).
- unrestricted selection of the base environment (e.g. the image used in container-based Spawners)
If any additional services are run on the same domain as the Hub, the services
**must never** display user-authored HTML that is neither _sanitized_ nor _sandboxed_
to any user that lacks authentication as the author of a file.
### Sharing access to servers
Because sharing access to servers (via `access:servers` scopes or the sharing feature in JupyterHub 5) by definition means users can serve each other files, enabling sharing is not suitable for untrusted users without also enabling per-user domains.
JupyterHub does not enable any sharing by default.
## Mitigate security issues
The several approaches to mitigating security issues with configuration
options provided by JupyterHub include:
### Enable user subdomains
JupyterHub provides the ability to run single-user servers on their own
domains. This means the cross-origin protections between servers has the
desired effect, and user servers and the Hub are protected from each other.
**Subdomains are the only way to reliably isolate user servers from each other.**
To enable subdomains, set:
```python
c.JupyterHub.subdomain_host = "https://jupyter.example.org"
```
When subdomains are enabled, each user's single-user server will be at e.g. `https://username.jupyter.example.org`.
This also requires all user subdomains to point to the same address,
which is most easily accomplished with wildcard DNS, where a single A record points to your server and a wildcard CNAME record points to your A record:
```
A jupyter.example.org 192.168.1.123
CNAME *.jupyter.example.org jupyter.example.org
```
Since this spreads the service across multiple domains, you will likely need wildcard SSL as well,
matching `*.jupyter.example.org`.
Unfortunately, for many institutional domains, wildcard DNS and SSL may not be available.
We also **strongly encourage** serving JupyterHub and user content on a domain that is _not_ a subdomain of any sensitive content.
For reasoning, see [GitHub's discussion of moving user content to github.io from \*.github.com](https://github.blog/2013-04-09-yummy-cookies-across-domains/).
**If you do plan to serve untrusted users, enabling subdomains is highly encouraged**,
as it resolves many security issues, which are difficult to unavoidable when JupyterHub is on a single-domain.
:::{important}
JupyterHub makes no guarantees about protecting users from each other unless subdomains are enabled.
If you want to protect users from each other, you **_must_** enable per-user domains.
:::
### Disable user config
If subdomains are unavailable or undesirable, JupyterHub provides a
configuration option `Spawner.disable_user_config = True`, which can be set to prevent
the user-owned configuration files from being loaded. After implementing this
option, `PATH`s and package installation are the other things that the
admin must enforce.
### Prevent spawners from evaluating shell configuration files
For most Spawners, `PATH` is not something users can influence, but it's important that
the Spawner should _not_ evaluate shell configuration files prior to launching the server.
### Isolate packages in a read-only environment
The user must not have permission to install packages into the environment where the singleuser-server runs.
On a shared system, package isolation is most easily handled by running the single-user server in
a root-owned virtualenv with disabled system-site-packages.
The user must not have permission to install packages into this environment.
The same principle extends to the images used by container-based deployments.
If users can select the images in which their servers run, they can disable all security for their own servers.
It is important to note that the control over the environment is only required for the
single-user server, and not the environment(s) in which the users' kernel(s)
may run. Installing additional packages in the kernel environment does not
pose additional risk to the web application's security.
### Encrypt internal connections with SSL/TLS
By default, all communications within JupyterHub—between the proxy, hub, and single
-user notebooks—are performed unencrypted. Setting the `internal_ssl` flag in
`jupyterhub_config.py` secures the aforementioned routes. Turning this
feature on does require that the enabled `Spawner` can use the certificates
generated by the `Hub` (the default `LocalProcessSpawner` can, for instance).
It is also important to note that this encryption **does not** cover the
`zmq tcp` sockets between the Notebook client and kernel yet. While users cannot
submit arbitrary commands to another user's kernel, they can bind to these
sockets and listen. When serving untrusted users, this eavesdropping can be
mitigated by setting `KernelManager.transport` to `ipc`. This applies standard
Unix permissions to the communication sockets thereby restricting
communication to the socket owner. The `internal_ssl` option will eventually
extend to securing the `tcp` sockets as well.
### Mitigating same-origin deployments
While per-user domains are **required** for robust protection of users from each other,
you can mitigate many (but not all) cross-user issues.
First, it is critical that users cannot modify their server environments, as described above.
Second, it is important that users do not have `access:servers` permission to any server other than their own.
If users can access each others' servers, additional security measures must be enabled, some of which come with distinct user-experience costs.
Without the [Same-Origin Policy] (SOP) protecting user servers from each other,
each user server is considered a trusted origin for requests to each other user server (and the Hub itself).
Servers _cannot_ meaningfully distinguish requests originating from other user servers,
because SOP implies a great deal of trust, losing many restrictions applied to cross-origin requests.
That means pages served from each user server can:
1. arbitrarily modify the path in the Referer
2. make fully authorized requests with cookies
3. access full page contents served from the hub or other servers via popups
JupyterHub uses distinct xsrf tokens stored in cookies on each server path to attempt to limit requests across.
This has limitations because not all requests are protected by these XSRF tokens,
and unless additional measures are taken, the XSRF tokens from other user prefixes may be retrieved.
[Same-Origin Policy]: https://developer.mozilla.org/en-US/docs/Web/Security/Same-origin_policy
For example:
- `Content-Security-Policy` header must prohibit popups and iframes from the same origin.
The following Content-Security-Policy rules are _insecure_ and readily enable users to access each others' servers:
- `frame-ancestors: 'self'`
- `frame-ancestors: '*'`
- `sandbox allow-popups`
- Ideally, pages should use the strictest `Content-Security-Policy: sandbox` available,
but this is not feasible in general for JupyterLab pages, which need at least `sandbox allow-same-origin allow-scripts` to work.
The default Content-Security-Policy for single-user servers is
```
frame-ancestors: 'none'
```
which prohibits iframe embedding, but not pop-ups.
A more secure Content-Security-Policy that has some costs to user experience is:
```
frame-ancestors: 'none'; sandbox allow-same-origin allow-scripts
```
`allow-popups` is not disabled by default because disabling it breaks legitimate functionality, like "Open this in a new tab", and the "JupyterHub Control Panel" menu item.
To reiterate, the right way to avoid these issues is to enable per-user domains, where none of these concerns come up.
Note: even this level of protection requires administrators maintaining full control over the user server environment.
If users can modify their server environment, these methods are ineffective, as users can readily disable them.
### Cookie tossing
Cookie tossing is a technique where another server on a subdomain or peer subdomain can set a cookie
which will be read on another domain.
This is not relevant unless there are other user-controlled servers on a peer domain.
"Domain-locked" cookies avoid this issue, but have their own restrictions:
- JupyterHub must be served over HTTPS
- All secure cookies must be set on `/`, not on sub-paths, which means they are shared by all JupyterHub components in a single-domain deployment.
As a result, this option is only recommended when per-user subdomains are enabled,
to prevent sending all jupyterhub cookies to all user servers.
To enable domain-locked cookies, set:
```python
c.JupyterHub.cookie_host_prefix_enabled = True
```
```{versionadded} 4.1
```
### Forced-login
Jupyter servers can share links with `?token=...`.
JupyterHub prior to 5.0 will accept this request and persist the token for future requests.
This is useful for enabling admins to create 'fully authenticated' links bypassing login.
However, it also means users can share their own links that will log other users into their own servers,
enabling them to serve each other notebooks and other arbitrary HTML, depending on server configuration.
```{versionadded} 4.1
Setting environment variable `JUPYTERHUB_ALLOW_TOKEN_IN_URL=0` in the single-user environment can opt out of accepting token auth in URL parameters.
```
```{versionadded} 5.0
Accepting tokens in URLs is disabled by default, and `JUPYTERHUB_ALLOW_TOKEN_IN_URL=1` environment variable must be set to _allow_ token auth in URL parameters.
```
## Security audits
We recommend that you do periodic reviews of your deployment's security. It's
good practice to keep [JupyterHub](https://readthedocs.org/projects/jupyterhub/), [configurable-http-proxy][], and [nodejs
versions](https://github.com/nodejs/Release) up to date.
A handy website for testing your deployment is
[Qualsys' SSL analyzer tool](https://www.ssllabs.com/ssltest/analyze.html).
[configurable-http-proxy]: https://github.com/jupyterhub/configurable-http-proxy
## Vulnerability reporting
If you believe you have found a security vulnerability in JupyterHub, or any
Jupyter project, please report it to
[security@ipython.org](mailto:security@ipython.org). If you prefer to encrypt
your security reports, you can use [this PGP public
key](https://jupyter.org/assets/ipython_security.asc).

76
docs/source/faq/faq.md Normal file
View File

@@ -0,0 +1,76 @@
# Frequently asked questions
## How do I share links to notebooks?
Sharing links to notebooks is a common activity,
and can look different depending on what you mean by 'share.'
Your first instinct might be to copy the URL you see in the browser,
e.g. `jupyterhub.example/user/yourname/notebooks/coolthing.ipynb`,
but this usually won't work, depending on the permissions of the person you share the link with.
Unfortunately, 'share' means at least a few things to people in a JupyterHub context.
We'll cover 3 common cases here, when they are applicable, and what assumptions they make:
1. sharing links that will open the same file on the visitor's own server
2. sharing links that will bring the visitor to _your_ server (e.g. for real-time collaboration, or RTC)
3. publishing notebooks and sharing links that will download the notebook into the user's server
### link to the same file on the visitor's server
This is for the case where you have JupyterHub on a shared (or sufficiently similar) filesystem, where you want to share a link that will cause users to login and start their _own_ server, to view or edit the file.
**Assumption:** the same path on someone else's server is valid and points to the same file
This is useful in e.g. classes where you know students have certain files in certain locations, or collaborations where you know you have a shared filesystem where everyone has access to the same files.
A link should look like `https://jupyterhub.example/hub/user-redirect/lab/tree/foo.ipynb`.
You can hand-craft these URLs from the URL you are looking at, where you see `/user/name/lab/tree/foo.ipynb` use `/hub/user-redirect/lab/tree/foo.ipynb` (replace `/user/name/` with `/hub/user-redirect/`).
Or you can use JupyterLab's "copy shareable link" in the context menu in the file browser:
![copy shareable link in JupyterLab](../images/shareable_link.webp)
which will produce a correct URL with `/hub/user-redirect/` in it.
### link to the file on your server
This is for the case where you want to both be using _your_ server, e.g. for real-time collaboration (RTC).
**Assumption:** the user has (or should have) access to your server.
**Assumption:** your server is running _or_ the user has permission to start it.
By default, JupyterHub users don't have access to each other's servers, but JupyterHub 2.0 administrators can grant users limited access permissions to each other's servers.
If the visitor doesn't have access to the server, these links will result in a 403 Permission Denied error.
In many cases, for this situation you can copy the link in your URL bar (`/user/yourname/lab`), or you can add `/tree/path/to/specific/notebook.ipynb` to open a specific file.
The [jupyterlab-link-share] JupyterLab extension generates these links, and even can _grant_ other users access to your server.
[jupyterlab-link-share]: https://github.com/jupyterlab-contrib/jupyterlab-link-share
:::{warning}
Note that the way the extension _grants_ access is handing over credentials to allow the other user to **_BECOME YOU_**.
This is usually not appropriate in JupyterHub.
:::
### link to a published copy
Another way to 'share' notebooks is to publish copies, e.g. pushing the notebook to a git repository and sharing a download link.
This way is especially useful for course materials,
where no assumptions are necessary about the user's environment,
except for having one package installed.
**Assumption:** The [nbgitpuller](inv:nbgitpuller#index) server extension is installed
Unlike the other two methods, nbgitpuller doesn't provide an extension to copy a shareable link for the document you're currently looking at,
but it does provide a [link generator](inv:nbgitpuller#link),
which uses the `user-redirect` approach above.
When visiting an nbgitpuller link:
- The visitor will be directed to their own server
- Your repo will be cloned (or updated if it's already been cloned)
- and then the file opened when it's ready
[nbgitpuller]: https://nbgitpuller.readthedocs.io
[nbgitpuller-link]: https://nbgitpuller.readthedocs.io/en/latest/link.html

11
docs/source/faq/index.md Normal file
View File

@@ -0,0 +1,11 @@
# FAQs
Find answers to some of the most frequently-asked questions around JupyterHub and how it works.
```{toctree}
:maxdepth: 2
faq
institutional-faq
troubleshooting
```

View File

@@ -0,0 +1,267 @@
# Institutional FAQ
This page contains common questions from users of JupyterHub,
broken down by their roles within organizations.
## For all
### Is it appropriate for adoption within a larger institutional context?
Yes! JupyterHub has been used at-scale for large pools of users, as well
as complex and high-performance computing.
For example,
- UC Berkeley uses
JupyterHub for its Data Science Education Program courses (serving over
3,000 students).
- The Pangeo project uses JupyterHub to provide access
to scalable cloud computing with Dask.
JupyterHub is stable and customizable
to the use-cases of large organizations.
### I keep hearing about Jupyter Notebook, JupyterLab, and now JupyterHub. Whats the difference?
Here is a quick breakdown of these three tools:
- **The Jupyter Notebook** is a document specification (the `.ipynb`) file that interweaves
narrative text with code cells and their outputs. It is also a graphical interface
that allows users to edit these documents. There are also several other graphical interfaces
that allow users to edit the `.ipynb` format (nteract, Jupyter Lab, Google Colab, Kaggle, etc).
- **JupyterLab** is a flexible and extendible user interface for interactive computing. It
has several extensions that are tailored for using Jupyter Notebooks, as well as extensions
for other parts of the data science stack.
- **JupyterHub** is an application that manages interactive computing sessions for **multiple users**.
It also connects users with infrastructure they wish to access. It can provide
remote access to Jupyter Notebooks and JupyterLab for many people.
## For management
### Briefly, what problem does JupyterHub solve for us?
JupyterHub provides a shared platform for data science and collaboration.
It allows users to utilize familiar data science workflows (such as the scientific Python stack,
the R tidyverse, and Jupyter Notebooks) on institutional infrastructure. It also gives administrators
some control over access to resources, security, environments, and authentication.
### Is JupyterHub mature? Why should we trust it?
Yes - the core JupyterHub application recently
reached 1.0 status, and is considered stable and performant for most institutions.
JupyterHub has also been deployed (along with other tools) to work on
scalable infrastructure, large datasets, and high-performance computing.
### Who else uses JupyterHub?
JupyterHub is used at a variety of institutions in academia,
industry, and government research labs. It is most-commonly used by two kinds of groups:
- Small teams (e.g., data science teams, research labs, or collaborative projects) to provide a
shared resource for interactive computing, collaboration, and analytics.
- Large teams (e.g., a department, a large class, or a large group of remote users) to provide
access to organizational hardware, data, and analytics environments at scale.
Here is a sample of organizations that use JupyterHub:
- **Universities and colleges**: UC Berkeley, UC San Diego, Cal Poly SLO, Harvard University, University of Chicago,
University of Oslo, University of Sheffield, Université Paris Sud, University of Versailles
- **Research laboratories**: NASA, NCAR, NOAA, the Large Synoptic Survey Telescope, Brookhaven National Lab,
Minnesota Supercomputing Institute, ALCF, CERN, Lawrence Livermore National Laboratory, HUNT
- **Online communities**: Pangeo, Quantopian, mybinder.org, MathHub, Open Humans
- **Computing infrastructure providers**: NERSC, San Diego Supercomputing Center, Compute Canada
- **Companies**: Capital One, SANDVIK code, Globus
See the [Gallery of JupyterHub deployments](gallery-of-deployments) for
a more complete list of JupyterHub deployments at institutions.
### How does JupyterHub compare with hosted products, like Google Colaboratory, RStudio.cloud, or Anaconda Enterprise?
JupyterHub puts you in control of your data, infrastructure, and coding environment.
In addition, it is vendor neutral, which reduces lock-in to a particular vendor or service.
JupyterHub provides access to interactive computing environments in the cloud (similar to each of these services).
Compared with the tools above, it is more flexible, more customizable, free, and
gives administrators more control over their setup and hardware.
Because JupyterHub is an open-source, community-driven tool, it can be extended and
modified to fit an institution's needs. It plays nicely with the open source data science
stack, and can serve a variety of computing environments, user interfaces, and
computational hardware. It can also be deployed anywhere - on enterprise cloud infrastructure, on
High-Performance-Computing machines, on local hardware, or even on a single laptop, which
is not possible with most other tools for shared interactive computing.
## For IT
### How would I set up JupyterHub on institutional hardware?
That depends on what kind of hardware you've got. JupyterHub is flexible enough to be deployed
on a variety of hardware, including in-room hardware, on-prem clusters, cloud infrastructure,
etc.
The most common way to set up a JupyterHub is to use a JupyterHub distribution, these are pre-configured
and opinionated ways to set up a JupyterHub on particular kinds of infrastructure. The two distributions
that we currently suggest are:
- [Zero to JupyterHub for Kubernetes](https://z2jh.jupyter.org) is a scalable JupyterHub deployment and
guide that runs on Kubernetes. Better for larger or dynamic user groups (50-10,000) or more complex
compute/data needs.
- [The Littlest JupyterHub](https://tljh.jupyter.org) is a lightweight JupyterHub that runs on a single
machine (in the cloud or under your desk). Better for smaller user groups (4-80) or more
lightweight computational resources.
### Does JupyterHub run well in the cloud?
**Yes** - most deployments of JupyterHub are run via cloud infrastructure and on a variety of cloud providers.
Depending on the distribution of JupyterHub that you'd like to use, you can also connect your JupyterHub
deployment with a number of other cloud-native services so that users have access to other resources from
their interactive computing sessions.
For example, if you use the [Zero to JupyterHub for Kubernetes](https://z2jh.jupyter.org) distribution,
you'll be able to utilize container-based workflows of other technologies such as the [dask-kubernetes](https://kubernetes.dask.org/en/latest/)
project for distributed computing.
The Z2JH Helm Chart also has some functionality built in for auto-scaling your cluster up and down
as more resources are needed - allowing you to utilize the benefits of a flexible cloud-based deployment.
### Is JupyterHub secure?
The short answer: yes.
JupyterHub as a standalone application has been battle-tested at an institutional
level for several years, and makes a number of "default" security decisions that are reasonable for most
users.
- For security considerations in the base JupyterHub application,
[see the JupyterHub security page](web-security).
- For security considerations when deploying JupyterHub on Kubernetes, see the
[JupyterHub on Kubernetes security page](https://z2jh.jupyter.org/en/latest/security.html).
The longer answer: it depends on your deployment. Because JupyterHub is very flexible, it can be used
in a variety of deployment setups. This often entails connecting your JupyterHub to **other** infrastructure
(such as a [Dask Gateway service](https://gateway.dask.org/)). There are many security decisions to be made
in these cases, and the security of your JupyterHub deployment will often depend on these decisions.
If you are worried about security, don't hesitate to reach out to the JupyterHub community in the
[Jupyter Community Forum](https://discourse.jupyter.org/c/jupyterhub). This community of practice has many
individuals with experience running secure JupyterHub deployments and will be very glad to help you out.
### Does JupyterHub provide computing or data infrastructure?
**No** - JupyterHub manages user sessions and can _control_ computing infrastructure, but it does not provide these
things itself. You are expected to run JupyterHub on your own infrastructure (local or in the cloud). Moreover,
JupyterHub has no internal concept of "data", but is designed to be able to communicate with data repositories
(again, either locally or remotely) for use within interactive computing sessions.
### How do I manage users?
JupyterHub offers a few options for managing your users. Upon setting up a JupyterHub, you can choose what
kind of **authentication** you'd like to use. For example, you can have users sign up with an institutional
email address, or choose a username / password when they first log-in, or offload authentication onto
another service such as an organization's OAuth.
The users of a JupyterHub are stored locally, and can be modified manually by an administrator of the JupyterHub.
Moreover, the _active_ users on a JupyterHub can be found on the administrator's page. This page
gives you the abiltiy to stop or restart kernels, inspect user filesystems, and even take over user
sessions to assist them with debugging.
### How do I manage software environments?
A key benefit of JupyterHub is the ability for an administrator to define the environment(s) that users
have access to. There are many ways to do this, depending on what kind of infrastructure you're using for
your JupyterHub.
For example, **The Littlest JupyterHub** runs on a single VM. In this case, the administrator defines
an environment by installing packages to a shared folder that exists on the path of all users. The
**JupyterHub for Kubernetes** deployment uses Docker images to define environments. You can create your
own list of Docker images that users can select from, and can also control things like the amount of
RAM available to users, or the types of machines that their sessions will use in the cloud.
### How does JupyterHub manage computational resources?
For interactive computing sessions, JupyterHub controls computational resources via a **spawner**.
Spawners define how a new user session is created, and are customized for particular kinds of
infrastructure. For example, the KubeSpawner knows how to control a Kubernetes deployment
to create new pods when users log in.
For more sophisticated computational resources (like distributed computing), JupyterHub can
connect with other infrastructure tools (like Dask or Spark). This allows users to control
scalable or high-performance resources from within their JupyterHub sessions. The logic of
how those resources are controlled is taken care of by the non-JupyterHub application.
### Can JupyterHub be used with my high-performance computing resources?
Yes - JupyterHub can provide access to many kinds of computing infrastructure.
Especially when combined with other open-source schedulers such as Dask, you can manage fairly
complex computing infrastructures from the interactive sessions of a JupyterHub. For example
[see the Dask HPC page](https://docs.dask.org/en/latest/setup/hpc.html).
### How much resources do user sessions take?
This is highly configurable by the administrator. If you wish for your users to have simple
data analytics environments for prototyping and light data exploring, you can restrict their
memory and CPU based on the resources that you have available. If you'd like your JupyterHub
to serve as a gateway to high-performance computing or data resources, you may increase the
resources available on user machines, or connect them with computing infrastructures elsewhere.
### Can I customize the look and feel of a JupyterHub?
JupyterHub provides some customization of the graphics displayed to users. The most common
modification is to add custom branding to the JupyterHub login page, loading pages, and
various elements that persist across all pages (such as headers).
## For Technical Leads
### Will JupyterHub “just work” with our team's interactive computing setup?
Depending on the complexity of your setup, you'll have different experiences with "out of the box"
distributions of JupyterHub. If all of the resources you need will fit on a single VM, then
[The Littlest JupyterHub](https://tljh.jupyter.org) should get you up-and-running within
a half day or so. For more complex setups, such as scalable Kubernetes clusters or access
to high-performance computing and data, it will require more time and expertise with
the technologies your JupyterHub will use (e.g., dev-ops knowledge with cloud computing).
In general, the base JupyterHub deployment is not the bottleneck for setup, it is connecting
your JupyterHub with the various services and tools that you wish to provide to your users.
### How well does JupyterHub scale? What are JupyterHub's limitations?
JupyterHub works well at both a small scale (e.g., a single VM or machine) as well as a
high scale (e.g., a scalable Kubernetes cluster). It can be used for teams as small as 2, and
for user bases as large as 10,000. The scalability of JupyterHub largely depends on the
infrastructure on which it is deployed. JupyterHub has been designed to be lightweight and
flexible, so you can tailor your JupyterHub deployment to your needs.
### Is JupyterHub resilient? What happens when a machine goes down?
For JupyterHubs that are deployed in a containerized environment (e.g., Kubernetes), it is
possible to configure the JupyterHub to be fairly resistant to failures in the system.
For example, if JupyterHub fails, then user sessions will not be affected (though new
users will not be able to log in). When a JupyterHub process is restarted, it should
seamlessly connect with the user database and the system will return to normal.
Again, the details of your JupyterHub deployment (e.g., whether it's deployed on a scalable cluster)
will affect the resiliency of the deployment.
### What interfaces does JupyterHub support?
Out of the box, JupyterHub supports a variety of popular data science interfaces for user sessions,
such as JupyterLab, Jupyter Notebooks, and RStudio. Any interface that can be served
via a web address can be served with a JupyterHub (with the right setup).
### Does JupyterHub make it easier for our team to collaborate?
JupyterHub provides a standardized environment and access to shared resources for your teams.
This greatly reduces the cost associated with sharing analyses and content with other team
members, and makes it easier to collaborate and build off of one another's ideas. Combined with
access to high-performance computing and data, JupyterHub provides a common resource to
amplify your team's ability to prototype their analyses, scale them to larger data, and then
share their results with one another.
JupyterHub also provides a computational framework to share computational narratives between
different levels of an organization. For example, data scientists can share Jupyter Notebooks
rendered as [Voilà dashboards](https://voila.readthedocs.io/en/stable/) with those who are not
familiar with programming, or create publicly-available interactive analyses to allow others to
interact with your work.
### Can I use JupyterHub with R/RStudio or other languages and environments?
Yes, Jupyter is a polyglot project, and there are over 40 community-provided kernels for a variety
of languages (the most common being Python, Julia, and R). You can also use a JupyterHub to provide
access to other interfaces, such as RStudio, that provide their own access to a language kernel.

View File

@@ -0,0 +1,395 @@
(troubleshooting)=
# Troubleshooting
When troubleshooting, you may see unexpected behaviors or receive an error
message. This section provides links for identifying the cause of the
problem and how to resolve it.
## Behavior
### JupyterHub proxy fails to start
If you have tried to start the JupyterHub proxy and it fails to start:
- check if the JupyterHub IP configuration setting is
`c.JupyterHub.ip = '*'`; if it is, try `c.JupyterHub.ip = ''`
- Try starting with `jupyterhub --ip=0.0.0.0`
**Note**: If this occurs on Ubuntu/Debian, check that you are using a
recent version of [Node](https://nodejs.org). Some versions of Ubuntu/Debian come with a very old version
of Node and it is necessary to update Node.
### sudospawner fails to run
If the sudospawner script is not found in the path, sudospawner will not run.
To avoid this, specify sudospawner's absolute path. For example, start
jupyterhub with:
jupyterhub --SudoSpawner.sudospawner_path='/absolute/path/to/sudospawner'
or add:
c.SudoSpawner.sudospawner_path = '/absolute/path/to/sudospawner'
to the config file, `jupyterhub_config.py`.
### What is the default behavior when none of the lists (admin, allowed, allowed groups) are set?
When nothing is given for these lists, there will be no admins, and all users
who can authenticate on the system (i.e. all the Unix users on the server with
a password) will be allowed to start a server. The allowed username set lets you limit
this to a particular set of users, and admin_users lets you specify who
among them may use the admin interface (not necessary, unless you need to do
things like inspect other users' servers or modify the user list at runtime).
### JupyterHub Docker container is not accessible at localhost
Even though the command to start your Docker container exposes port 8000
(`docker run -p 8000:8000 -d --name jupyterhub quay.io/jupyterhub/jupyterhub jupyterhub`),
it is possible that the IP address itself is not accessible/visible. As a result,
when you try http://localhost:8000 in your browser, you are unable to connect
even though the container is running properly. One workaround is to explicitly
tell Jupyterhub to start at `0.0.0.0` which is visible to everyone. Try this
command:
`docker run -p 8000:8000 -d --name jupyterhub quay.io/jupyterhub/jupyterhub jupyterhub --ip 0.0.0.0 --port 8000`
### How can I kill ports from JupyterHub-managed services that have been orphaned?
I started JupyterHub + nbgrader on the same host without containers. When I try to restart JupyterHub + nbgrader with this configuration, errors appear that the service accounts cannot start because the ports are being used.
How can I kill the processes that are using these ports?
Run the following command:
sudo kill -9 $(sudo lsof -t -i:<service_port>)
Where `<service_port>` is the port used by the nbgrader course service. This configuration is specified in `jupyterhub_config.py`.
### Why am I getting a Spawn failed error message?
After successfully logging in to JupyterHub with a compatible authenticator, I get a 'Spawn failed' error message in the browser. The JupyterHub logs have `jupyterhub KeyError: "getpwnam(): name not found: <my_user_name>`.
This issue occurs when the authenticator requires a local system user to exist. In these cases, you need to use a spawner
that does not require an existing system user account, such as `DockerSpawner` or `KubeSpawner`.
### How can I run JupyterHub with sudo but use my current environment variables and virtualenv location?
When launching JupyterHub with `sudo jupyterhub` I get import errors and my environment variables don't work.
When launching services with `sudo ...` the shell won't have the same environment variables or `PATH`s in place. The most direct way to solve this issue is to use the full path to your python environment and add environment variables. For example:
```bash
sudo MY_ENV=abc123 \
/home/foo/venv/bin/python3 \
/srv/jupyterhub/jupyterhub
```
## Errors
### Error 500 after spawning my single-user server
You receive a 500 error while accessing the URL `/user/<your_name>/...`.
This is often seen when your single-user server cannot verify your user cookie
with the Hub.
There are two likely reasons for this:
1. The single-user server cannot connect to the Hub's API (networking
configuration problems)
2. The single-user server cannot _authenticate_ its requests (invalid token)
#### Symptoms
The main symptom is a failure to load _any_ page served by the single-user
server, met with a 500 error. This is typically the first page at `/user/<your_name>`
after logging in or clicking "Start my server". When a single-user notebook server
receives a request, the notebook server makes an API request to the Hub to
check if the cookie corresponds to the right user. This request is logged.
If everything is working, the response logged will be similar to this:
```
200 GET /hub/api/authorizations/cookie/jupyterhub-token-name/[secret] (@10.0.1.4) 6.10ms
```
You should see a similar 200 message, as above, in the Hub log when you first
visit your single-user notebook server. If you don't see this message in the log, it
may mean that your single-user notebook server is not connecting to your Hub.
If you see 403 (forbidden) like this, it is likely a token problem:
```
403 GET /hub/api/authorizations/cookie/jupyterhub-token-name/[secret] (@10.0.1.4) 4.14ms
```
Check the logs of the single-user notebook server, which may have more detailed
information on the cause.
#### Causes and resolutions
##### No authorization request
If you make an API request and it is not received by the server, you likely
have a network configuration issue. Often, this happens when the Hub is only
listening on 127.0.0.1 (default) and the single-user servers are not on the
same 'machine' (can be physically remote, or in a docker container or VM). The
fix for this case is to make sure that `c.JupyterHub.hub_ip` is an address
that all single-user servers can connect to, e.g.:
```python
c.JupyterHub.hub_ip = '10.0.0.1'
```
##### 403 GET /hub/api/authorizations/cookie
If you receive a 403 error, the API token for the single-user server is likely
invalid. Commonly, the 403 error is caused by resetting the JupyterHub
database (either removing jupyterhub.sqlite or some other action) while
leaving single-user servers running. This happens most frequently when using
DockerSpawner because Docker's default behavior is to stop/start containers
that reset the JupyterHub database, rather than destroying and recreating
the container every time. This means that the same API token is used by the
server for its whole life until the container is rebuilt.
The fix for this Docker case is to remove any Docker containers seeing this
issue (typically all containers created before a certain point in time):
docker rm -f jupyter-name
After this, when you start your server via JupyterHub, it will build a
new container. If this was the underlying cause of the issue, you should see
your server again.
##### Proxy settings (403 GET)
When your whole JupyterHub sits behind an organization proxy (_not_ a reverse proxy like NGINX as part of your setup and _not_ the configurable-http-proxy) the environment variables `HTTP_PROXY`, `HTTPS_PROXY`, `http_proxy`, and `https_proxy` might be set. This confuses the JupyterHub single-user servers: When connecting to the Hub for authorization they connect via the proxy instead of directly connecting to the Hub on localhost. The proxy might deny the request (403 GET). This results in the single-user server thinking it has the wrong auth token. To circumvent this you should add `<hub_url>,<hub_ip>,localhost,127.0.0.1` to the environment variables `NO_PROXY` and `no_proxy`.
### Launching Jupyter Notebooks to run as an externally managed JupyterHub service with the `jupyterhub-singleuser` command returns a `JUPYTERHUB_API_TOKEN` error
{ref}`services` allow processes to interact with JupyterHub's REST API. Example use-cases include:
- **Secure Testing**: provide a canonical Jupyter Notebook for testing production data to reduce the number of entry points into production systems.
- **Grading Assignments**: provide access to shared Jupyter Notebooks that may be used for management tasks such as grading assignments.
- **Private Dashboards**: share dashboards with certain group members.
If possible, try to run the Jupyter Notebook as an externally managed service with one of the provided [jupyter/docker-stacks](https://github.com/jupyter/docker-stacks).
Standard JupyterHub installations include a [jupyterhub-singleuser](https://github.com/jupyterhub/jupyterhub/blob/9fdab027daa32c9017845572ad9d5ba1722dbc53/setup.py#L116) command which is built from the `jupyterhub.singleuser:main` method. The `jupyterhub-singleuser` command is the default command when JupyterHub launches single-user Jupyter Notebooks. One of the goals of this command is to make sure the version of JupyterHub installed within the Jupyter Notebook coincides with the version of the JupyterHub server itself.
If you launch a Jupyter Notebook with the `jupyterhub-singleuser` command directly from the command line, the Jupyter Notebook won't have access to the `JUPYTERHUB_API_TOKEN` and will return:
```
JUPYTERHUB_API_TOKEN env is required to run jupyterhub-singleuser.
Did you launch it manually?
```
If you plan on testing `jupyterhub-singleuser` independently from JupyterHub, then you can set the API token environment variable. For example, if you were to run the single-user Jupyter Notebook on the host, then:
export JUPYTERHUB_API_TOKEN=my_secret_token
jupyterhub-singleuser
With a docker container, pass in the environment variable with the run command:
docker run -d \
-p 8888:8888 \
-e JUPYTERHUB_API_TOKEN=my_secret_token \
jupyter/datascience-notebook:latest
[This example](https://github.com/jupyterhub/jupyterhub/tree/HEAD/examples/service-notebook/external) demonstrates how to combine the use of the `jupyterhub-singleuser` environment variables when launching a Notebook as an externally managed service.
## How do I...?
### Use a chained SSL certificate
Some certificate providers, i.e. Entrust, may provide you with a chained
certificate that contains multiple files. If you are using a chained
certificate you will need to concatenate the individual files by appending the
chained cert and root cert to your host cert:
cat your_host.crt chain.crt root.crt > your_host-chained.crt
You would then set in your `jupyterhub_config.py` file the `ssl_key` and
`ssl_cert` as follows:
c.JupyterHub.ssl_cert = your_host-chained.crt
c.JupyterHub.ssl_key = your_host.key
#### Example
Your certificate provider gives you the following files: `example_host.crt`,
`Entrust_L1Kroot.txt`, and `Entrust_Root.txt`.
Concatenate the files appending the chain cert and root cert to your host cert:
cat example_host.crt Entrust_L1Kroot.txt Entrust_Root.txt > example_host-chained.crt
You would then use the `example_host-chained.crt` as the value for
JupyterHub's `ssl_cert`. You may pass this value as a command line option
when starting JupyterHub or more conveniently set the `ssl_cert` variable in
JupyterHub's configuration file, `jupyterhub_config.py`. In `jupyterhub_config.py`,
set:
c.JupyterHub.ssl_cert = /path/to/example_host-chained.crt
c.JupyterHub.ssl_key = /path/to/example_host.key
where `ssl_cert` is example-chained.crt and ssl_key to your private key.
Then restart JupyterHub.
See also {ref}`ssl-encryption`.
### Install JupyterHub without a network connection
Both conda and pip can be used without a network connection. You can make your
own repository (directory) of conda packages and/or wheels, and then install
from there instead of the internet.
For instance, you can install JupyterHub with pip and configurable-http-proxy
with npmbox:
python3 -m pip wheel jupyterhub
npmbox configurable-http-proxy
### I want access to the whole filesystem and still default users to their home directory
Setting the following in `jupyterhub_config.py` will configure access to
the entire filesystem and set the default to the user's home directory.
c.Spawner.notebook_dir = '/'
c.Spawner.default_url = '/home/%U' # %U will be replaced with the username
### How do I increase the number of pySpark executors on YARN?
From the command line, pySpark executors can be configured using a command
similar to this one:
pyspark --total-executor-cores 2 --executor-memory 1G
[Cloudera documentation for configuring spark on YARN applications](https://www.cloudera.com/documentation/enterprise/latest/topics/cdh_ig_running_spark_on_yarn.html#spark_on_yarn_config_apps)
provides additional information. The [pySpark configuration documentation](https://spark.apache.org/docs/0.9.0/configuration.html)
is also helpful for programmatic configuration examples.
### How do I use JupyterLab's pre-release version with JupyterHub?
While JupyterLab is still under active development, we have had users
ask about how to try out JupyterLab with JupyterHub.
You need to install and enable the JupyterLab extension system-wide,
then you can change the default URL to `/lab`.
For instance:
python3 -m pip install jupyterlab
jupyter serverextension enable --py jupyterlab --sys-prefix
The important thing is that JupyterLab is installed and enabled in the
single-user notebook server environment. For system users, this means
system-wide, as indicated above. For Docker containers, it means inside
the single-user docker image, etc.
In `jupyterhub_config.py`, configure the Spawner to tell the single-user
notebook servers to default to JupyterLab:
c.Spawner.default_url = '/lab'
### How do I set up JupyterHub for a workshop (when users are not known ahead of time)?
1. Set up JupyterHub using OAuthenticator for GitHub authentication
2. Configure the admin list to have workshop leaders listed with administrator privileges.
Users will need a GitHub account to log in and be authenticated by the Hub.
### How do I set up rotating daily logs?
You can do this with [logrotate](https://linux.die.net/man/8/logrotate),
or pipe to `logger` to use Syslog instead of directly to a file.
For example, with this logrotate config file:
```
/var/log/jupyterhub.log {
copytruncate
daily
}
```
and run this daily by putting a script in `/etc/cron.daily/`:
```bash
logrotate /path/to/above-config
```
Or use syslog:
jupyterhub | logger -t jupyterhub
### Toree integration with HDFS rack awareness script
The Apache Toree kernel will have an issue when running with JupyterHub if the standard HDFS rack awareness script is used. This will materialize in the logs as a repeated WARN:
```bash
16/11/29 16:24:20 WARN ScriptBasedMapping: Exception running /etc/hadoop/conf/topology_script.py some.ip.address
ExitCodeException exitCode=1: File "/etc/hadoop/conf/topology_script.py", line 63
print rack
^
SyntaxError: Missing parentheses in call to 'print'
at `org.apache.hadoop.util.Shell.runCommand(Shell.java:576)`
```
In order to resolve this issue, there are two potential options.
1. Update HDFS core-site.xml, so the parameter "net.topology.script.file.name" points to a custom
script (e.g. /etc/hadoop/conf/custom_topology_script.py). Copy the original script and change the first line point
to a python two installation (e.g. /usr/bin/python).
2. In spark-env.sh add a Python 2 installation to your path (e.g. export PATH=/opt/anaconda2/bin:$PATH).
### Where do I find Docker images and Dockerfiles related to JupyterHub?
Docker images can be found at the [JupyterHub organization on Quay.io](https://quay.io/organization/jupyterhub).
The Docker image [jupyterhub/singleuser](https://quay.io/repository/jupyterhub/singleuser)
provides an example single-user notebook server for use with DockerSpawner.
Additional single-user notebook server images can be found at the [Jupyter
organization on Quay.io](https://quay.io/organization/jupyter) and information
about each image at the [jupyter/docker-stacks repo](https://github.com/jupyter/docker-stacks).
### How can I view the logs for JupyterHub or the user's Notebook servers when using the DockerSpawner?
Use `docker logs <container>` where `<container>` is the container name defined within `docker-compose.yml`. For example, to view the logs of the JupyterHub container use:
docker logs hub
By default, the user's notebook server is named `jupyter-<username>` where `username` is the user's username within JupyterHub's database.
So if you wanted to see the logs for user `foo` you would use:
docker logs jupyter-foo
You can also tail logs to view them in real-time using the `-f` option:
docker logs -f hub
## Troubleshooting commands
The following commands provide additional detail about installed packages,
versions, and system information that may be helpful when troubleshooting
a JupyterHub deployment. The commands are:
- System and deployment information
```bash
jupyter troubleshoot
```
- Kernel information
```bash
jupyter kernelspec list
```
- Debug logs when running JupyterHub
```bash
jupyterhub --debug
```

View File

@@ -0,0 +1,128 @@
(api-only)=
# Deploying JupyterHub in "API only mode"
As a service for deploying and managing Jupyter servers for users, JupyterHub
exposes this functionality _primarily_ via a [REST API](rest).
For convenience, JupyterHub also ships with a _basic_ web UI built using that REST API.
The basic web UI enables users to click a button to quickly start and stop their servers,
and it lets admins perform some basic user and server management tasks.
The REST API has always provided additional functionality beyond what is available in the basic web UI.
Similarly, we avoid implementing UI functionality that is also not available via the API.
With JupyterHub 2.0, the basic web UI will **always** be composed using the REST API.
In other words, no UI pages should rely on information not available via the REST API.
Previously, some admin UI functionality could only be achieved via admin pages,
such as paginated requests.
## Limited UI customization via templates
The JupyterHub UI is customizable via extensible HTML [templates](templates),
but this has some limited scope to what can be customized.
Adding some content and messages to existing pages is well supported,
but changing the page flow and what pages are available are beyond the scope of what is customizable.
## Rich UI customization with REST API based apps
Increasingly, JupyterHub is used purely as an API for managing Jupyter servers
for other Jupyter-based applications that might want to present a different user experience.
If you want a fully customized user experience,
you can now disable the Hub UI and use your own pages together with the JupyterHub REST API
to build your own web application to serve your users,
relying on the Hub only as an API for managing users and servers.
One example of such an application is [BinderHub][], which powers https://mybinder.org,
and motivates many of these changes.
BinderHub is distinct from a traditional JupyterHub deployment
because it uses temporary users created for each launch.
Instead of presenting a login page,
users are presented with a form to specify what environment they would like to launch:
![Binder launch form](../images/binderhub-form.png)
When a launch is requested:
1. an image is built, if necessary
2. a temporary user is created,
3. a server is launched for that user, and
4. when running, users are redirected to an already running server with an auth token in the URL
5. after the session is over, the user is deleted
This means that a lot of JupyterHub's UI flow doesn't make sense:
- there is no way for users to login
- the human user doesn't map onto a JupyterHub `User` in a meaningful way
- when a server isn't running, there isn't a 'restart your server' action available because the user has been deleted
- users do not have any access to any Hub functionality, so presenting pages for those features would be confusing
BinderHub is one of the motivating use cases for JupyterHub supporting being used _only_ via its API.
We'll use BinderHub here as an example of various configuration options.
[binderhub]: https://binderhub.readthedocs.io
## Disabling Hub UI
`c.JupyterHub.hub_routespec` is a configuration option to specify which URL prefix should be routed to the Hub.
The default is `/` which means that the Hub will receive all requests not already specified to be routed somewhere else.
There are three values that are most logical for `hub_routespec`:
- `/` - this is the default, and used in most deployments.
It is also the only option prior to JupyterHub 1.4.
- `/hub/` - this serves only Hub pages, both UI and API
- `/hub/api` - this serves _only the Hub API_, so all Hub UI is disabled,
aside from the OAuth confirmation page, if used.
If you choose a hub routespec other than `/`,
the main JupyterHub feature you will lose is the automatic handling of requests for `/user/:username`
when the requested server is not running.
JupyterHub's handling of this request shows this page,
telling you that the server is not running,
with a button to launch it again:
![screenshot of hub page for server not running](../images/server-not-running.png)
If you set `hub_routespec` to something other than `/`,
it is likely that you also want to register another destination for `/` to handle requests to not-running servers.
If you don't, you will see a default 404 page from the proxy:
![screenshot of CHP default 404](../images/chp-404.png)
For mybinder.org, the default "start my server" page doesn't make sense,
because when a server is gone, there is no restart action.
Instead, we provide hints about how to get back to a link to start a _new_ server:
![screenshot of mybinder.org 404](../images/binder-404.png)
To achieve this, mybinder.org registers a route for `/` that goes to a custom endpoint
that runs nginx and only serves this static HTML error page.
This is set with
```python
c.Proxy.extra_routes = {
"/": "http://custom-404-entpoint/",
}
```
You may want to use an alternate behavior, such as redirecting to a landing page,
or taking some other action based on the requested page.
If you use `c.JupyterHub.hub_routespec = "/hub/"`,
then all the Hub pages will be available,
and only this default-page-404 issue will come up.
If you use `c.JupyterHub.hub_routespec = "/hub/api/"`,
then only the Hub _API_ will be available,
and all UI will be up to you.
mybinder.org takes this last option,
because none of the Hub UI pages really make sense.
Binder users don't have any reason to know or care that JupyterHub happens
to be an implementation detail of how their environment is managed.
Seeing Hub error pages and messages in that situation is more likely to be confusing than helpful.
:::{versionadded} 1.4
`c.JupyterHub.hub_routespec` and `c.Proxy.extra_routes` are new in JupyterHub 1.4.
:::

View File

@@ -0,0 +1,83 @@
# Configure GitHub OAuth
In this example, we show a configuration file for a fairly standard JupyterHub
deployment with the following assumptions:
- Running JupyterHub on a single cloud server
- Using SSL on the standard HTTPS port 443
- Using GitHub OAuth (using [OAuthenticator](https://oauthenticator.readthedocs.io/en/latest)) for login
- Using the default spawner (to configure other spawners, uncomment and edit
`spawner_class` as well as follow the instructions for your desired spawner)
- Users exist locally on the server
- Users' notebooks to be served from `~/assignments` to allow users to browse
for notebooks within other users' home directories
- You want the landing page for each user to be a `Welcome.ipynb` notebook in
their assignments directory
- All runtime files are put into `/srv/jupyterhub` and log files in `/var/log`
The `jupyterhub_config.py` file would have these settings:
```python
# jupyterhub_config.py file
c = get_config()
import os
pjoin = os.path.join
runtime_dir = os.path.join('/srv/jupyterhub')
ssl_dir = pjoin(runtime_dir, 'ssl')
if not os.path.exists(ssl_dir):
os.makedirs(ssl_dir)
# Allows multiple single-server per user
c.JupyterHub.allow_named_servers = True
# https on :443
c.JupyterHub.port = 443
c.JupyterHub.ssl_key = pjoin(ssl_dir, 'ssl.key')
c.JupyterHub.ssl_cert = pjoin(ssl_dir, 'ssl.cert')
# put the JupyterHub cookie secret and state db
# in /var/run/jupyterhub
c.JupyterHub.cookie_secret_file = pjoin(runtime_dir, 'cookie_secret')
c.JupyterHub.db_url = pjoin(runtime_dir, 'jupyterhub.sqlite')
# or `--db=/path/to/jupyterhub.sqlite` on the command-line
# use GitHub OAuthenticator for local users
c.JupyterHub.authenticator_class = 'oauthenticator.LocalGitHubOAuthenticator'
c.GitHubOAuthenticator.oauth_callback_url = os.environ['OAUTH_CALLBACK_URL']
# create system users that don't exist yet
c.LocalAuthenticator.create_system_users = True
# specify users and admin
c.Authenticator.allowed_users = {'rgbkrk', 'minrk', 'jhamrick'}
c.Authenticator.admin_users = {'jhamrick', 'rgbkrk'}
# uses the default spawner
# To use a different spawner, uncomment `spawner_class` and set to desired
# spawner (e.g. SudoSpawner). Follow instructions for desired spawner
# configuration.
# c.JupyterHub.spawner_class = 'sudospawner.SudoSpawner'
# start single-user notebook servers in ~/assignments,
# with ~/assignments/Welcome.ipynb as the default landing page
# this config could also be put in
# /etc/jupyter/jupyter_notebook_config.py
c.Spawner.notebook_dir = '~/assignments'
c.Spawner.args = ['--NotebookApp.default_url=/notebooks/Welcome.ipynb']
```
Using the GitHub Authenticator requires a few additional
environment variables to be set prior to launching JupyterHub:
```bash
export GITHUB_CLIENT_ID=github_id
export GITHUB_CLIENT_SECRET=github_secret
export OAUTH_CALLBACK_URL=https://example.com/hub/oauth_callback
export CONFIGPROXY_AUTH_TOKEN=super-secret
# append log output to log file /var/log/jupyterhub.log
jupyterhub -f /etc/jupyterhub/jupyterhub_config.py &>> /var/log/jupyterhub.log
```
Visit the [Github OAuthenticator reference](https://oauthenticator.readthedocs.io/en/latest/api/gen/oauthenticator.github.html) to see the full list of options for configuring Github OAuth with JupyterHub.

View File

@@ -0,0 +1,247 @@
# Using a reverse proxy
In the following example, we show configuration files for a JupyterHub server
running locally on port `8000` but accessible from the outside on the standard
SSL port `443`. This could be useful if the JupyterHub server machine is also
hosting other domains or content on `443`. The goal in this example is to
satisfy the following:
- JupyterHub is running on a server, accessed _only_ via `HUB.DOMAIN.TLD:443`
- On the same machine, `NO_HUB.DOMAIN.TLD` strictly serves different content,
also on port `443`
- `nginx` or `apache` is used as the public access point (which means that
only nginx/apache will bind to `443`)
- After testing, the server in question should be able to score at least an A on the
Qualys SSL Labs [SSL Server Test](https://www.ssllabs.com/ssltest/)
Let's start out with the needed JupyterHub configuration in `jupyterhub_config.py`:
```python
# Force the proxy to only listen to connections to 127.0.0.1 (on port 8000)
c.JupyterHub.bind_url = 'http://127.0.0.1:8000'
```
(For Jupyterhub < 0.9 use `c.JupyterHub.ip = '127.0.0.1'`.)
For high-quality SSL configuration, we also generate Diffie-Helman parameters.
This can take a few minutes:
```bash
openssl dhparam -out /etc/ssl/certs/dhparam.pem 4096
```
## Nginx
This **`nginx` config file** is fairly standard fare except for the two
`location` blocks within the main section for HUB.DOMAIN.tld.
To create a new site for jupyterhub in your Nginx config, make a new file
in `sites.enabled`, e.g. `/etc/nginx/sites.enabled/jupyterhub.conf`:
```bash
# Top-level HTTP config for WebSocket headers
# If Upgrade is defined, Connection = upgrade
# If Upgrade is empty, Connection = close
map $http_upgrade $connection_upgrade {
default upgrade;
'' close;
}
# HTTP server to redirect all 80 traffic to SSL/HTTPS
server {
listen 80;
server_name HUB.DOMAIN.TLD;
# Redirect the request to HTTPS
return 302 https://$host$request_uri;
}
# HTTPS server to handle JupyterHub
server {
listen 443;
ssl on;
server_name HUB.DOMAIN.TLD;
ssl_certificate /etc/letsencrypt/live/HUB.DOMAIN.TLD/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/HUB.DOMAIN.TLD/privkey.pem;
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
ssl_prefer_server_ciphers on;
ssl_dhparam /etc/ssl/certs/dhparam.pem;
ssl_ciphers 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA';
ssl_session_timeout 1d;
ssl_session_cache shared:SSL:50m;
ssl_stapling on;
ssl_stapling_verify on;
add_header Strict-Transport-Security max-age=15768000;
# Managing literal requests to the JupyterHub frontend
location / {
proxy_pass http://127.0.0.1:8000;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# websocket headers
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
proxy_set_header X-Scheme $scheme;
proxy_buffering off;
}
# Managing requests to verify letsencrypt host
location ~ /.well-known {
allow all;
}
}
```
If `nginx` is not running on port 443, substitute `$http_host` for `$host` on
the lines setting the `Host` header.
`nginx` will now be the front-facing element of JupyterHub on `443` which means
it is also free to bind other servers, like `NO_HUB.DOMAIN.TLD` to the same port
on the same machine and network interface. In fact, one can simply use the same
server blocks as above for `NO_HUB` and simply add a line for the root directory
of the site as well as the applicable location call:
```bash
server {
listen 80;
server_name NO_HUB.DOMAIN.TLD;
# Redirect the request to HTTPS
return 302 https://$host$request_uri;
}
server {
listen 443;
ssl on;
# INSERT OTHER SSL PARAMETERS HERE AS ABOVE
# SSL cert may differ
# Set the appropriate root directory
root /var/www/html
# Set URI handling
location / {
try_files $uri $uri/ =404;
}
# Managing requests to verify letsencrypt host
location ~ /.well-known {
allow all;
}
}
```
Now restart `nginx`, restart the JupyterHub, and enjoy accessing
`https://HUB.DOMAIN.TLD` while serving other content securely on
`https://NO_HUB.DOMAIN.TLD`.
### SELinux permissions for Nginx
On distributions with SELinux enabled (e.g. Fedora), one may encounter permission errors
when the Nginx service is started.
We need to allow Nginx to perform network relay and connect to the JupyterHub port. The
following commands do that:
```bash
semanage port -a -t http_port_t -p tcp 8000
setsebool -P httpd_can_network_relay 1
setsebool -P httpd_can_network_connect 1
```
Replace 8000 with the port the JupyterHub server is running from.
## Apache
As with Nginx above, you can use [Apache](https://httpd.apache.org) as the reverse proxy.
First, we will need to enable the Apache modules that we are going to need:
```bash
a2enmod ssl rewrite proxy headers proxy_http proxy_wstunnel
```
Our Apache configuration is equivalent to the Nginx configuration above:
- Redirect HTTP to HTTPS
- Good SSL Configuration
- Support for WebSocket on any proxied URL
- JupyterHub is running locally at http://127.0.0.1:8000
```bash
# Redirect HTTP to HTTPS
Listen 80
<VirtualHost HUB.DOMAIN.TLD:80>
ServerName HUB.DOMAIN.TLD
Redirect / https://HUB.DOMAIN.TLD/
</VirtualHost>
Listen 443
<VirtualHost HUB.DOMAIN.TLD:443>
ServerName HUB.DOMAIN.TLD
# Enable HTTP/2, if available
Protocols h2 http/1.1
# HTTP Strict Transport Security (mod_headers is required) (63072000 seconds)
Header always set Strict-Transport-Security "max-age=63072000"
# Configure SSL
SSLEngine on
SSLCertificateFile /etc/letsencrypt/live/HUB.DOMAIN.TLD/fullchain.pem
SSLCertificateKeyFile /etc/letsencrypt/live/HUB.DOMAIN.TLD/privkey.pem
SSLOpenSSLConfCmd DHParameters /etc/ssl/certs/dhparam.pem
# Intermediate configuration from SSL-config.mozilla.org (2022-03-03)
# Please note, that this configuration might be outdated - please update it accordingly using https://ssl-config.mozilla.org/
SSLProtocol all -SSLv3 -TLSv1 -TLSv1.1
SSLCipherSuite ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384
SSLHonorCipherOrder off
SSLSessionTickets off
# Use RewriteEngine to handle WebSocket connection upgrades
RewriteEngine On
RewriteCond %{HTTP:Connection} Upgrade [NC]
RewriteCond %{HTTP:Upgrade} websocket [NC]
RewriteRule /(.*) ws://127.0.0.1:8000/$1 [P,L]
<Location "/">
# preserve Host header to avoid cross-origin problems
ProxyPreserveHost on
# proxy to JupyterHub
ProxyPass http://127.0.0.1:8000/
ProxyPassReverse http://127.0.0.1:8000/
RequestHeader set "X-Forwarded-Proto" expr=%{REQUEST_SCHEME}
</Location>
</VirtualHost>
```
In case of the need to run JupyterHub under /jhub/ or another location please use the below configurations:
- JupyterHub running locally at http://127.0.0.1:8000/jhub/ or other location
httpd.conf amendments:
```bash
RewriteRule /jhub/(.*) ws://127.0.0.1:8000/jhub/$1 [P,L]
RewriteRule /jhub/(.*) http://127.0.0.1:8000/jhub/$1 [P,L]
ProxyPass /jhub/ http://127.0.0.1:8000/jhub/
ProxyPassReverse /jhub/ http://127.0.0.1:8000/jhub/
```
jupyterhub_config.py amendments:
```python
# The public facing URL of the whole JupyterHub application.
# This is the address on which the proxy will bind. Sets protocol, IP, base_url
c.JupyterHub.bind_url = 'http://127.0.0.1:8000/jhub/'
```

View File

@@ -0,0 +1,261 @@
# Run JupyterHub without root privileges using `sudo`
**Note:** Setting up `sudo` permissions involves many pieces of system
configuration. It is quite easy to get wrong and very difficult to debug.
Only do this if you are very sure you must.
## Overview
There are many [Authenticators](authenticators) and [Spawners](spawners) available for JupyterHub. Some, such
as [DockerSpawner](https://github.com/jupyterhub/dockerspawner) or [OAuthenticator](https://github.com/jupyterhub/oauthenticator), do not need any elevated permissions. This
document describes how to get the full default behavior of JupyterHub while
running notebook servers as real system users on a shared system, without
running the Hub itself as root.
Since JupyterHub needs to spawn processes as other users, the simplest way
is to run it as root, spawning user servers with [setuid](https://linux.die.net/man/2/setuid).
But this isn't especially safe, because you have a process running on the
public web as root.
A **more prudent way** to run the server while preserving functionality is to
create a dedicated user with `sudo` access restricted to launching and
monitoring single-user servers.
## Create a user
To do this, first create a user that will run the Hub:
```bash
sudo useradd rhea
```
This user shouldn't have a login shell or password (possible with -r).
## Set up sudospawner
Next, you will need [sudospawner](https://github.com/jupyter/sudospawner)
to enable monitoring the single-user servers with sudo:
```bash
sudo python3 -m pip install sudospawner
```
Now we have to configure sudo to allow the Hub user (`rhea`) to launch
the sudospawner script on behalf of our hub users (here `zoe` and `wash`).
We want to confine these permissions to only what we really need.
## Edit `/etc/sudoers`
To do this we add to `/etc/sudoers` (use `visudo` for safe editing of sudoers):
- specify the list of users `JUPYTER_USERS` for whom `rhea` can spawn servers
- set the command `JUPYTER_CMD` that `rhea` can execute on behalf of users
- give `rhea` permission to run `JUPYTER_CMD` on behalf of `JUPYTER_USERS`
without entering a password
For example:
```bash
# comma-separated list of users that can spawn single-user servers
# this should include all of your Hub users
Runas_Alias JUPYTER_USERS = rhea, zoe, wash
# the command(s) the Hub can run on behalf of the above users without needing a password
# the exact path may differ, depending on how sudospawner was installed
Cmnd_Alias JUPYTER_CMD = /usr/local/bin/sudospawner
# actually give the Hub user permission to run the above command on behalf
# of the above users without prompting for a password
rhea ALL=(JUPYTER_USERS) NOPASSWD:JUPYTER_CMD
```
It might be useful to modify `secure_path` to add commands in path. (Search for
`secure_path` in the [sudo docs](https://www.sudo.ws/man/1.8.14/sudoers.man.html)
As an alternative to adding every user to the `/etc/sudoers` file, you can
use a group in the last line above, instead of `JUPYTER_USERS`:
```bash
rhea ALL=(%jupyterhub) NOPASSWD:JUPYTER_CMD
```
If the `jupyterhub` group exists, there will be no need to edit `/etc/sudoers`
again. A new user will gain access to the application when added to the group:
```bash
$ adduser -G jupyterhub newuser
```
## Test `sudo` setup
Test that the new user doesn't need to enter a password to run the sudospawner
command.
This should prompt for your password to switch to `rhea`, but _not_ prompt for
any password for the second switch. It should show some help output about
logging options:
```bash
$ sudo -u rhea sudo -n -u $USER /usr/local/bin/sudospawner --help
Usage: /usr/local/bin/sudospawner [OPTIONS]
Options:
--help show this help information
...
```
And this should fail:
```bash
$ sudo -u rhea sudo -n -u $USER echo 'fail'
sudo: a password is required
```
## Enable PAM for non-root
By default, [PAM authentication](https://en.wikipedia.org/wiki/Pluggable_authentication_module)
is used by JupyterHub. To use PAM, the process may need to be able to read
the shadow password database.
### Shadow group (Linux)
**Note:** On [Fedora based distributions](https://fedoraproject.org/wiki/List_of_Fedora_remixes) there is no clear way to configure
the PAM database to allow sufficient access for authenticating with the target user's password
from JupyterHub. As a workaround we recommend use an
[alternative authentication method](https://github.com/jupyterhub/jupyterhub/wiki/Authenticators).
```bash
$ ls -l /etc/shadow
-rw-r----- 1 root shadow 2197 Jul 21 13:41 shadow
```
If there's already a shadow group, you are set. If its permissions are more like:
```bash
$ ls -l /etc/shadow
-rw------- 1 root wheel 2197 Jul 21 13:41 shadow
```
Then you may want to add a shadow group, and make the shadow file group-readable:
```bash
$ sudo groupadd shadow
$ sudo chgrp shadow /etc/shadow
$ sudo chmod g+r /etc/shadow
```
We want our new user to be able to read the shadow passwords, so add it to the shadow group:
```bash
$ sudo usermod -a -G shadow rhea
```
If you want jupyterhub to serve pages on a restricted port (such as port 80 for HTTP),
then you will need to give `node` permission to do so:
```bash
sudo setcap 'cap_net_bind_service=+ep' /usr/bin/node
```
However, you may want to further understand the consequences of this.
([Further reading](https://man7.org/linux/man-pages/man7/capabilities.7.html))
You may also be interested in limiting the amount of CPU any process can use
on your server. `cpulimit` is a useful tool that is available for many Linux
distributions' packaging system. This can be used to keep any user's process
from using too much CPU cycles. You can configure it accoring to [these
instructions](https://ubuntuforums.org/showthread.php?t=992706).
### Shadow group (FreeBSD)
**NOTE:** This has not been tested on FreeBSD and may not work as expected on
the FreeBSD platform. _Do not use in production without verifying that it works properly!_
```bash
$ ls -l /etc/spwd.db /etc/master.passwd
-rw------- 1 root wheel 2516 Aug 22 13:35 /etc/master.passwd
-rw------- 1 root wheel 40960 Aug 22 13:35 /etc/spwd.db
```
Add a shadow group if there isn't one, and make the shadow file group-readable:
```bash
$ sudo pw group add shadow
$ sudo chgrp shadow /etc/spwd.db
$ sudo chmod g+r /etc/spwd.db
$ sudo chgrp shadow /etc/master.passwd
$ sudo chmod g+r /etc/master.passwd
```
We want our new user to be able to read the shadow passwords, so add it to the
shadow group:
```bash
$ sudo pw user mod rhea -G shadow
```
## Test that PAM works
We can verify that PAM is working, with:
```bash
$ sudo -u rhea python3 -c "import pamela, getpass; print(pamela.authenticate('$USER', getpass.getpass()))"
Password: [enter your unix password]
```
## Make a directory for JupyterHub
JupyterHub stores its state in a database, so it needs write access to a directory.
The simplest way to deal with this is to make a directory owned by your Hub user,
and use that as the CWD when launching the server.
```bash
$ sudo mkdir /etc/jupyterhub
$ sudo chown rhea /etc/jupyterhub
```
## Start jupyterhub
Finally, start the server as our newly configured user, `rhea`:
```bash
$ cd /etc/jupyterhub
$ sudo -u rhea jupyterhub --JupyterHub.spawner_class=sudospawner.SudoSpawner
```
And try logging in.
## Troubleshooting: SELinux
If you still get a generic `Permission denied` `PermissionError`, it's possible SELinux is blocking you.
Here's how you can make a module to resolve this.
First, put this in a file named `sudo_exec_selinux.te`:
```bash
module sudo_exec_selinux 1.1;
require {
type unconfined_t;
type sudo_exec_t;
class file { read entrypoint };
}
#============= unconfined_t ==============
allow unconfined_t sudo_exec_t:file entrypoint;
```
Then run all of these commands as root:
```bash
$ checkmodule -M -m -o sudo_exec_selinux.mod sudo_exec_selinux.te
$ semodule_package -o sudo_exec_selinux.pp -m sudo_exec_selinux.mod
$ semodule -i sudo_exec_selinux.pp
```
## Troubleshooting: PAM session errors
If the PAM authentication doesn't work and you see errors for
`login:session-auth`, or similar, consider updating to a more recent version
of jupyterhub and disabling the opening of PAM sessions with
`c.PAMAuthenticator.open_sessions=False`.

View File

@@ -0,0 +1,263 @@
# Configuring user environments
To deploy JupyterHub means you are providing Jupyter notebook environments for
multiple users. Often, this includes a desire to configure the user
environment in a custom way.
Since the `jupyterhub-singleuser` server extends the standard Jupyter notebook
server, most configuration and documentation that applies to Jupyter Notebook
applies to the single-user environments. Configuration of user environments
typically does not occur through JupyterHub itself, but rather through system-wide
configuration of Jupyter, which is inherited by `jupyterhub-singleuser`.
**Tip:** When searching for configuration tips for JupyterHub user environments, you might want to remove JupyterHub from your search because there are a lot more people out there configuring Jupyter than JupyterHub and the configuration is the same.
This section will focus on user environments, which includes the following:
- [Installing packages](#installing-packages)
- [Configuring Jupyter and IPython](#configuring-jupyter-and-ipython)
- [Installing kernelspecs](#installing-kernelspecs)
- [Using containers vs. multi-user hosts](#multi-user-hosts-vs-containers)
## Installing packages
To make packages available to users, you will typically install packages system-wide or in a shared environment.
This installation location should always be in the same environment where
`jupyterhub-singleuser` itself is installed in, and must be _readable and
executable_ by your users. If you want your users to be able to install additional
packages, the installation location must also be _writable_ by your users.
If you are using a standard Python installation on your system, use the following command:
```bash
sudo python3 -m pip install numpy
```
to install the numpy package in the default Python 3 environment on your system
(typically `/usr/local`).
You may also use conda to install packages. If you do, you should make sure
that the conda environment has appropriate permissions for users to be able to
run Python code in the env. The env must be _readable and executable_ by all
users. Additionally it must be _writeable_ if you want users to install
additional packages.
## Configuring Jupyter and IPython
[Jupyter](https://jupyter-notebook.readthedocs.io/en/stable/configuring/config_overview.html)
and [IPython](https://ipython.readthedocs.io/en/stable/development/config.html)
have their own configuration systems.
As a JupyterHub administrator, you will typically want to install and configure environments for all JupyterHub users. For example, let's say you wish for each student in a class to have the same user environment configuration.
Jupyter and IPython support **"system-wide"** locations for configuration, which is the logical place to put global configuration that you want to affect all users. It's generally more efficient to configure user environments "system-wide", and it's a good practice to avoid creating files in the users' home directories.
The typical locations for these config files are:
- **system-wide** in `/etc/{jupyter|ipython}`
- **env-wide** (environment wide) in `{sys.prefix}/etc/{jupyter|ipython}`.
### Jupyter environment configuration priority
When Jupyter runs in an environment (conda or virtualenv), it prefers to load configuration from the environment over each user's own configuration (e.g. in `~/.jupyter`).
This may cause issues if you use a _shared_ conda environment or virtualenv for users, because e.g. jupyterlab may try to write information like workspaces or settings to the environment instead of the user's own directory.
This could fail with something like `Permission denied: $PREFIX/etc/jupyter/lab`.
To avoid this issue, set `JUPYTER_PREFER_ENV_PATH=0` in the user environment:
```python
c.Spawner.environment.update(
{
"JUPYTER_PREFER_ENV_PATH": "0",
}
)
```
which tells Jupyter to prefer _user_ configuration paths (e.g. in `~/.jupyter`) to configuration set in the environment.
### Example: Enable an extension system-wide
For example, to enable the `cython` IPython extension for all of your users, create the file `/etc/ipython/ipython_config.py`:
```python
c.InteractiveShellApp.extensions.append("cython")
```
### Example: Enable a Jupyter notebook configuration setting for all users
:::{note}
These examples configure the Jupyter ServerApp, which is used by JupyterLab, the default in JupyterHub 2.0.
If you are using the classing Jupyter Notebook server,
the same things should work,
with the following substitutions:
- Search for `jupyter_server_config`, and replace with `jupyter_notebook_config`
- Search for `NotebookApp`, and replace with `ServerApp`
:::
To enable Jupyter notebook's internal idle-shutdown behavior (requires notebook ≥ 5.4), set the following in the `/etc/jupyter/jupyter_server_config.py` file:
```python
# shutdown the server after no activity for an hour
c.ServerApp.shutdown_no_activity_timeout = 60 * 60
# shutdown kernels after no activity for 20 minutes
c.MappingKernelManager.cull_idle_timeout = 20 * 60
# check for idle kernels every two minutes
c.MappingKernelManager.cull_interval = 2 * 60
```
## Installing kernelspecs
You may have multiple Jupyter kernels installed and want to make sure that they are available to all of your users. This means installing kernelspecs either system-wide (e.g. in /usr/local/) or in the `sys.prefix` of JupyterHub
itself.
Jupyter kernelspec installation is system-wide by default, but some kernels
may default to installing kernelspecs in your home directory. These will need
to be moved system-wide to ensure that they are accessible.
To see where your kernelspecs are, you can use the following command:
```bash
jupyter kernelspec list
```
### Example: Installing kernels system-wide
Let's assume that I have a Python 2 and Python 3 environment that I want to make sure are available, I can install their specs **system-wide** (in /usr/local) using the following command:
```bash
/path/to/python3 -m ipykernel install --prefix=/usr/local
/path/to/python2 -m ipykernel install --prefix=/usr/local
```
## Multi-user hosts vs. Containers
There are two broad categories of user environments that depend on what
Spawner you choose:
- Multi-user hosts (shared system)
- Container-based
How you configure user environments for each category can differ a bit
depending on what Spawner you are using.
The first category is a **shared system (multi-user host)** where
each user has a JupyterHub account, a home directory as well as being
a real system user. In this example, shared configuration and installation
must be in a 'system-wide' location, such as `/etc/`, or `/usr/local`
or a custom prefix such as `/opt/conda`.
When JupyterHub uses **container-based** Spawners (e.g. KubeSpawner or
DockerSpawner), the 'system-wide' environment is really the container image used for users.
In both cases, you want to _avoid putting configuration in user home
directories_ because users can change those configuration settings. Also, home directories typically persist once they are created, thereby making it difficult for admins to update later.
## Named servers
By default, in a JupyterHub deployment, each user has one server only.
JupyterHub can, however, have multiple servers per user.
This is mostly useful in deployments where users can configure the environment in which their server will start (e.g. resource requests on an HPC cluster), so that a given user can have multiple configurations running at the same time, without having to stop and restart their own server.
To allow named servers, include this code snippet in your config file:
```python
c.JupyterHub.allow_named_servers = True
```
Named servers were implemented in the REST API in JupyterHub 0.8,
and JupyterHub 1.0 introduces UI for managing named servers via the user home page:
![named servers on the home page](/images/named-servers-home.png)
as well as the admin page:
![named servers on the admin page](/images/named-servers-admin.png)
Named servers can be accessed, created, started, stopped, and deleted
from these pages. Activity tracking is now per server as well.
To limit the number of **named server** per user by setting a constant value, include this code snippet in your config file:
```python
c.JupyterHub.named_server_limit_per_user = 5
```
Alternatively, to use a callable/awaitable based on the handler object, include this code snippet in your config file:
```python
def named_server_limit_per_user_fn(handler):
user = handler.current_user
if user and user.admin:
return 0
return 5
c.JupyterHub.named_server_limit_per_user = named_server_limit_per_user_fn
```
This can be useful for quota service implementations. The example above limits the number of named servers for non-admin users only.
If `named_server_limit_per_user` is set to `0`, no limit is enforced.
When using named servers, Spawners may need additional configuration to take the `servername` into account. Whilst `KubeSpawner` takes the `servername` into account by default in [`pod_name_template`](https://jupyterhub-kubespawner.readthedocs.io/en/latest/spawner.html#kubespawner.KubeSpawner.pod_name_template), other Spawners may not. Check the documentation for the specific Spawner to see how singleuser servers are named, for example in `DockerSpawner` this involves modifying the [`name_template`](https://jupyterhub-dockerspawner.readthedocs.io/en/latest/api/index.html) setting to include `servername`, eg. `"{prefix}-{username}-{servername}"`.
(classic-notebook-ui)=
## Switching back to the classic notebook
By default, the single-user server launches JupyterLab,
which is based on [Jupyter Server][].
This is the default server when running JupyterHub ≥ 2.0.
To switch to using the legacy Jupyter Notebook server (notebook < 7.0), you can set the `JUPYTERHUB_SINGLEUSER_APP` environment variable
(in the single-user environment) to:
```bash
export JUPYTERHUB_SINGLEUSER_APP='notebook.notebookapp.NotebookApp'
```
:::{note}
```
JUPYTERHUB_SINGLEUSER_APP='notebook.notebookapp.NotebookApp'
```
is only valid for notebook < 7. notebook v7 is based on jupyter-server,
and the default jupyter-server application must be used.
Selecting the new notebook UI is no longer a matter of selecting the server app to launch,
but only the default URL for users to visit.
To use notebook v7 with JupyterHub, leave the default singleuser app config alone (or specify `JUPYTERHUB_SINGLEUSER_APP=jupyter-server`) and set the default _URL_ for user servers:
```python
c.Spawner.default_url = '/tree/'
```
:::
[jupyter server]: https://jupyter-server.readthedocs.io
[jupyter notebook]: https://jupyter-notebook.readthedocs.io
:::{versionchanged} 2.0
JupyterLab is now the default single-user UI, if available,
which is based on the [Jupyter Server][],
no longer the legacy [Jupyter Notebook][] server.
JupyterHub prior to 2.0 launched the legacy notebook server (`jupyter notebook`),
and the Jupyter server could be selected by specifying the following:
```python
# jupyterhub_config.py
c.Spawner.cmd = ["jupyter-labhub"]
```
Alternatively, for an otherwise customized Jupyter Server app,
set the environment variable using the following command:
```bash
export JUPYTERHUB_SINGLEUSER_APP='jupyter_server.serverapp.ServerApp'
```
:::

View File

@@ -0,0 +1,34 @@
# How-to
The _How-to_ guides provide practical step-by-step details to help you achieve a particular goal. They are useful when you are trying to get something done but require you to understand and adapt the steps to your specific usecase.
Use the following guides when:
```{toctree}
:maxdepth: 1
api-only
proxy
rest
separate-proxy
templates
upgrading
log-messages
```
(config-examples)=
## Configuration
The following guides provide examples, including configuration files and tips, for the
following:
```{toctree}
:maxdepth: 1
configuration/config-user-env
configuration/config-ghoauth
configuration/config-proxy
configuration/config-sudo
```

View File

@@ -0,0 +1,72 @@
# Interpreting common log messages
When debugging errors and outages, looking at the logs emitted by
JupyterHub is very helpful. This document intends to describe some common
log messages, what they mean and what are the most common causes that generated them, as well as some possible ways to fix them.
## Failing suspected API request to not-running server
### Example
Your logs might be littered with lines that look scary
```
[W 2022-03-10 17:25:19.774 JupyterHub base:1349] Failing suspected API request to not-running server: /hub/user/<user-name>/api/metrics/v1
```
### Cause
This likely means that the user's server has stopped running but they
still have a browser tab open. For example, you might have 3 tabs open and you shut
the server down via one.
Another possible reason could be that you closed your laptop and the server was culled for inactivity, then reopened the laptop!
However, the client-side code (JupyterLab, Classic Notebook, etc) doesn't interpret the shut-down server and continues to make some API requests.
JupyterHub's architecture means that the proxy routes all requests that
don't go to a running user server to the hub process itself. The hub
process then explicitly returns a failure response, so the client knows
that the server is not running anymore. This is used by JupyterLab to
inform the user that the server is not running anymore, and provide an option
to restart it.
Most commonly, you'll see this in reference to the `/api/metrics/v1`
URL, used by [jupyter-resource-usage](https://github.com/jupyter-server/jupyter-resource-usage).
### Actions you can take
This log message is benign, and there is usually no action for you to take.
## JupyterHub Singleuser Version mismatch
### Example
```
jupyterhub version 1.5.0 != jupyterhub-singleuser version 1.3.0. This could cause failure to authenticate and result in redirect loops!
```
### Cause
JupyterHub requires the `jupyterhub` python package installed inside the image or
environment, the user server starts in. This message indicates that the version of
the `jupyterhub` package installed inside the user image or environment is not
the same as the JupyterHub server's version itself. This is not necessarily always a
problem - some version drift is mostly acceptable, and the only two known cases of
breakage are across the 0.7 and 2.0 version releases. In those cases, issues pop
up immediately after upgrading your version of JupyterHub, so **always check the JupyterHub
changelog before upgrading!**. The primary problems this _could_ cause are:
1. Infinite redirect loops after the user server starts
2. Missing expected environment variables in the user server once it starts
3. Failure for the started user server to authenticate with the JupyterHub server -
note that this is _not_ the same as _user authentication_ failing!
However, for the most part, unless you are seeing these specific issues, the log
message should be counted as a warning to get the `jupyterhub` package versions
aligned, rather than as an indicator of an existing problem.
### Actions you can take
Upgrade the version of the `jupyterhub` package in your user environment or image
so that it matches the version of JupyterHub running your JupyterHub server! If you
are using the [zero-to-jupyterhub](https://z2jh.jupyter.org) helm chart, you can find the appropriate
version of the `jupyterhub` package to install in your user image [here](https://jupyterhub.github.io/helm-chart/)

233
docs/source/howto/proxy.md Normal file
View File

@@ -0,0 +1,233 @@
# Writing a custom Proxy implementation
JupyterHub 0.8 introduced the ability to write a custom implementation of the
proxy. This enables deployments with different needs than the default proxy,
configurable-http-proxy (CHP). CHP is a single-process nodejs proxy that the
Hub manages by default as a subprocess (it can be run externally, as well, and
typically is in production deployments).
The upside to CHP, and why we use it by default, is that it's easy to install
and run (if you have nodejs, you are set!). The downsides are that
- it's a single process and
- does not support any persistence of the routing table.
So if the proxy process dies, your whole JupyterHub instance is inaccessible
until the Hub notices, restarts the proxy, and restores the routing table. For
deployments that want to avoid such a single point of failure, or leverage
existing proxy infrastructure in their chosen deployment (such as Kubernetes
ingress objects), the Proxy API provides a way to do that.
In general, for a proxy to be usable by JupyterHub, it must:
1. support websockets without prior knowledge of the URL where websockets may
occur
2. support trie-based routing (i.e. allow different routes on `/foo` and
`/foo/bar` and route based on specificity)
3. adding or removing a route should not cause existing connections to drop
Optionally, if the JupyterHub deployment is to use host-based routing,
the Proxy must additionally support routing based on the Host of the request.
## Subclassing Proxy
To start, any Proxy implementation should subclass the base Proxy class,
as is done with custom Spawners and Authenticators.
```python
from jupyterhub.proxy import Proxy
class MyProxy(Proxy):
"""My Proxy implementation"""
...
```
## Starting and stopping the proxy
If your proxy should be launched when the Hub starts, you must define how
to start and stop your proxy:
```python
class MyProxy(Proxy):
...
async def start(self):
"""Start the proxy"""
async def stop(self):
"""Stop the proxy"""
```
These methods **may** be coroutines.
`c.Proxy.should_start` is a configurable flag that determines whether the
Hub should call these methods when the Hub itself starts and stops.
## Encryption
When using `internal_ssl` to encrypt traffic behind the proxy, at minimum,
your `Proxy` will need client ssl certificates which the `Hub` must be made
aware of. These can be generated with the command `jupyterhub --generate-certs`
which will write them to the `internal_certs_location` in folders named
`proxy_api` and `proxy_client`. Alternatively, these can be provided to the
hub via the `jupyterhub_config.py` file by providing a `dict` of named paths
to the `external_authorities` option. The hub will include all certificates
provided in that `dict` in the trust bundle utilized by all internal
components.
### Purely external proxies
Probably most custom proxies will be externally managed,
such as Kubernetes ingress-based implementations.
In this case, you do not need to define `start` and `stop`.
To disable the methods, you can define `should_start = False` at the class level:
```python
class MyProxy(Proxy):
should_start = False
```
## Routes
At its most basic, a Proxy implementation defines a mechanism to add, remove,
and retrieve routes. A proxy that implements these three methods is complete.
Each of these methods **may** be a coroutine.
**Definition:** routespec
A routespec, which will appear in these methods, is a string describing a
route to be proxied, such as `/user/name/`. A routespec will:
1. always end with `/`
2. always start with `/` if it is a path-based route `/proxy/path/`
3. precede the leading `/` with a host for host-based routing, e.g.
`host.tld/proxy/path/`
### Adding a route
When adding a route, JupyterHub may pass a JSON-serializable dict as a `data`
argument that should be attached to the proxy route. When that route is
retrieved, the `data` argument should be returned as well. If your proxy
implementation doesn't support storing data attached to routes, then your
Python wrapper may have to handle storing the `data` piece itself, e.g in a
simple file or database.
```python
async def add_route(self, routespec, target, data):
"""Proxy `routespec` to `target`.
Store `data` associated with the routespec
for retrieval later.
"""
```
Adding a route for a user looks like this:
```python
await proxy.add_route('/user/pgeorgiou/', 'http://127.0.0.1:1227',
{'user': 'pgeorgiou'})
```
### Removing routes
`delete_route()` is given a routespec to delete. If there is no such route,
`delete_route` should still succeed, but a warning may be issued.
```python
async def delete_route(self, routespec):
"""Delete the route"""
```
### Retrieving routes
For retrieval, you only _need_ to implement a single method that retrieves all
routes. The return value for this function should be a dictionary, keyed by
`routespec`, of dicts whose keys are the same three arguments passed to
`add_route` (`routespec`, `target`, `data`)
```python
async def get_all_routes(self):
"""Return all routes, keyed by routespec"""
```
```python
{
'/proxy/path/': {
'routespec': '/proxy/path/',
'target': 'http://...',
'data': {},
},
}
```
## Note on activity tracking
JupyterHub can track activity of users, for use in services such as culling
idle servers. As of JupyterHub 0.8, this activity tracking is the
responsibility of the proxy. If your proxy implementation can track activity
to endpoints, it may add a `last_activity` key to the `data` of routes
retrieved in `.get_all_routes()`. If present, the value of `last_activity`
should be an [ISO8601](https://en.wikipedia.org/wiki/ISO_8601) UTC date
string:
```python
{
'/user/pgeorgiou/': {
'routespec': '/user/pgeorgiou/',
'target': 'http://127.0.0.1:1227',
'data': {
'user': 'pgeourgiou',
'last_activity': '2017-10-03T10:33:49.570Z',
},
},
}
```
If the proxy does not track activity, then only activity to the Hub itself is
tracked, and services such as cull-idle will not work.
Now that `notebook-5.0` tracks activity internally, we can retrieve activity
information from the single-user servers instead, removing the need to track
activity in the proxy. But this is not yet implemented in JupyterHub 0.8.0.
### Registering custom Proxies via entry points
As of JupyterHub 1.0, custom proxy implementations can register themselves via
the `jupyterhub.proxies` entry point metadata.
To do this, in your `setup.py` add:
```python
setup(
...
entry_points={
'jupyterhub.proxies': [
'mything = mypackage:MyProxy',
],
},
)
```
If you have added this metadata to your package,
admins can select your authenticator with the configuration:
```python
c.JupyterHub.proxy_class = 'mything'
```
instead of the full
```python
c.JupyterHub.proxy_class = 'mypackage:MyProxy'
```
as previously required.
Additionally, configurable attributes for your proxy will
appear in jupyterhub help output and auto-generated configuration files
via `jupyterhub --generate-config`.
### Index of proxies
A list of the proxies that are currently available for JupyterHub (that we know about).
1. [`jupyterhub/configurable-http-proxy`](https://github.com/jupyterhub/configurable-http-proxy) The default proxy which uses node-http-proxy
2. [`jupyterhub/traefik-proxy`](https://github.com/jupyterhub/traefik-proxy) The proxy which configures traefik proxy server for jupyterhub
3. [`AbdealiJK/configurable-http-proxy`](https://github.com/AbdealiJK/configurable-http-proxy) A pure python implementation of the configurable-http-proxy

339
docs/source/howto/rest.md Normal file
View File

@@ -0,0 +1,339 @@
(using-jupyterhub-rest-api)=
# Using JupyterHub's REST API
This section will give you information on:
- What you can do with the API
- How to create an API token
- Assigning permissions to a token
- Updating to admin services
- Making an API request programmatically using the requests library
- Paginating API requests
- Enabling users to spawn multiple named-servers via the API
- Learn more about JupyterHub's API
Before we discuss about JupyterHub's REST API, you can learn about [REST APIs here](https://en.wikipedia.org/wiki/Representational_state_transfer). A REST
API provides a standard way for users to get and send information to the
Hub.
## What you can do with the API
Using the [JupyterHub REST API](jupyterhub-rest-API), you can perform actions on the Hub,
such as:
- Checking which users are active
- Adding or removing users
- Stopping or starting single user notebook servers
- Authenticating services
- Communicating with an individual Jupyter server's REST API
## Create an API token
To send requests using the JupyterHub API, you must pass an API token with
the request.
While JupyterHub is running, any JupyterHub user can request a token via the `token` page.
This is accessible via a `token` link in the top nav bar from the JupyterHub home page,
or at the URL `/hub/token`.
:::{figure-md}
![token request page](../images/token-page.png)
JupyterHub's API token page
:::
:::{figure-md}
![token-request-success](../images/token-request-success.png)
JupyterHub's token page after successfully requesting a token.
:::
### Register API tokens via configuration
Sometimes, you'll want to pre-generate a token for access to JupyterHub,
typically for use by external services,
so that both JupyterHub and the service have access to the same value.
First, you need to generate a good random secret.
A good way of generating an API token is by running:
```bash
openssl rand -hex 32
```
This `openssl` command generates a random token that can be added to the JupyterHub configuration in `jupyterhub_config.py`.
For external services, this would be registered with JupyterHub via configuration:
```python
c.JupyterHub.services = [
{
"name": "my-service",
"api_token": the_secret_value,
},
]
```
At this point, requests authenticated with the token will be associated with The service `my-service`.
```{note}
You can also load additional tokens for users via the `JupyterHub.api_tokens` configuration.
However, this option has been deprecated since the introduction of services.
```
## Assigning permissions to a token
Prior to JupyterHub 2.0, there were two levels of permissions:
1. user, and
2. admin
where a token would always have full permissions to do whatever its owner could do.
In JupyterHub 2.0,
specific permissions are now defined as '**scopes**',
and can be assigned both at the user/service level,
and at the individual token level.
This allows e.g. a user with full admin permissions to request a token with limited permissions.
## Updating to admin services
```{note}
The `api_tokens` configuration has been softly deprecated since the introduction of services.
We have no plans to remove it,
but deployments are encouraged to use service configuration instead.
```
If you have been using `api_tokens` to create an admin user
and the token for that user to perform some automations, then
the services' mechanism may be a better fit if you have the following configuration:
```python
c.JupyterHub.admin_users = {"service-admin"}
c.JupyterHub.api_tokens = {
"secret-token": "service-admin",
}
```
This can be updated to create a service, with the following configuration:
```python
c.JupyterHub.services = [
{
# give the token a name
"name": "service-admin",
"api_token": "secret-token",
# "admin": True, # if using JupyterHub 1.x
},
]
# roles were introduced in JupyterHub 2.0
# prior to 2.0, only "admin": True or False was available
c.JupyterHub.load_roles = [
{
"name": "service-role",
"scopes": [
# specify the permissions the token should have
"admin:users",
],
"services": [
# assign the service the above permissions
"service-admin",
],
}
]
```
The token will have the permissions listed in the role
(see [scopes][] for a list of available permissions),
but there will no longer be a user account created to house it.
The main noticeable difference between a user and a service is that there will be no notebook server associated with the account
and the service will not show up in the various user list pages and APIs.
## Make an API request
To authenticate your requests, pass the API token in the request's
Authorization header.
### Use requests
Using the popular Python [requests](https://docs.python-requests.org)
library, an API GET request is made, and the request sends an API token for
authorization. The response contains information about the users, here's example code to make an API request for the users of a JupyterHub deployment
```python
import requests
api_url = 'http://127.0.0.1:8081/hub/api'
r = requests.get(api_url + '/users',
headers={
'Authorization': f'token {token}',
}
)
r.raise_for_status()
users = r.json()
```
This example provides a slightly more complicated request, yet the
process is very similar:
```python
import requests
api_url = 'http://127.0.0.1:8081/hub/api'
data = {'name': 'mygroup', 'users': ['user1', 'user2']}
r = requests.post(api_url + '/groups/formgrade-data301/users',
headers={
'Authorization': f'token {token}',
},
json=data,
)
r.raise_for_status()
r.json()
```
The same API token can also authorize access to the [Jupyter Notebook REST API][]
provided by notebook servers managed by JupyterHub if it has the necessary `access:servers` scope.
(api-pagination)=
## Paginating API requests
```{versionadded} 2.0
```
Pagination is available through the `offset` and `limit` query parameters on
list endpoints, which can be used to return ideally sized windows of results.
Here's example code demonstrating pagination on the `GET /users`
endpoint to fetch the first 20 records.
```python
import os
import requests
api_url = 'http://127.0.0.1:8081/hub/api'
r = requests.get(
api_url + '/users?offset=0&limit=20',
headers={
"Accept": "application/jupyterhub-pagination+json",
"Authorization": f"token {token}",
},
)
r.raise_for_status()
r.json()
```
For backward-compatibility, the default structure of list responses is unchanged.
However, this lacks pagination information (e.g. is there a next page),
so if you have enough users that they won't fit in the first response,
it is a good idea to opt-in to the new paginated list format.
There is a new schema for list responses which include pagination information.
You can request this by including the header:
```
Accept: application/jupyterhub-pagination+json
```
with your request, in which case a response will look like:
```python
{
"items": [
{
"name": "username",
"kind": "user",
...
},
],
"_pagination": {
"offset": 0,
"limit": 20,
"total": 50,
"next": {
"offset": 20,
"limit": 20,
"url": "http://127.0.0.1:8081/hub/api/users?limit=20&offset=20"
}
}
}
```
where the list results (same as pre-2.0) will be in `items`,
and pagination info will be in `_pagination`.
The `next` field will include the `offset`, `limit`, and `url` for requesting the next page.
`next` will be `null` if there is no next page.
Pagination is governed by two configuration options:
- `JupyterHub.api_page_default_limit` - the page size, if `limit` is unspecified in the request
and the new pagination API is requested
(default: 50)
- `JupyterHub.api_page_max_limit` - the maximum page size a request can ask for (default: 200)
Pagination is enabled on the `GET /users`, `GET /groups`, and `GET /proxy` REST endpoints.
## Enabling users to spawn multiple named-servers via the API
Support for multiple servers per user was introduced in JupyterHub [version 0.8.](changelog)
Prior to that, each user could only launch a single default server via the API
like this:
```bash
curl -X POST -H "Authorization: token <token>" "http://127.0.0.1:8081/hub/api/users/<user>/server"
```
With the named-server functionality, it's now possible to launch more than one
specifically named servers against a given user. This could be used, for instance,
to launch each server based on a different image.
First you must enable named-servers by including the following setting in the `jupyterhub_config.py` file.
`c.JupyterHub.allow_named_servers = True`
If you are using the [zero-to-jupyterhub-k8s](https://github.com/jupyterhub/zero-to-jupyterhub-k8s) set-up to run JupyterHub,
then instead of editing the `jupyterhub_config.py` file directly, you could pass
the following as part of the `config.yaml` file, as per the [tutorial](https://z2jh.jupyter.org/en/latest/):
```bash
hub:
extraConfig: |
c.JupyterHub.allow_named_servers = True
```
With that setting in place, a new named-server is activated like this:
```bash
curl -X POST -H "Authorization: token <token>" "http://127.0.0.1:8081/hub/api/users/<user>/servers/<serverA>"
curl -X POST -H "Authorization: token <token>" "http://127.0.0.1:8081/hub/api/users/<user>/servers/<serverB>"
```
The same servers can be stopped by substituting `DELETE` for `POST` above.
### Some caveats for using named-servers
For named-servers via the API to work, the spawner used to spawn these servers
will need to be able to handle the case of multiple servers per user and ensure
uniqueness of names, particularly if servers are spawned via docker containers
or kubernetes pods.
## Learn more about the API
You can see the full [JupyterHub REST API](jupyterhub-rest-api) for more details.
[openapi initiative]: https://www.openapis.org/
[jupyterhub rest api]: ./rest-api
[scopes]: ../rbac/scopes.md
[jupyter notebook rest api]: https://petstore3.swagger.io/?url=https://raw.githubusercontent.com/jupyter/notebook/HEAD/notebook/services/api/api.yaml

View File

@@ -0,0 +1,78 @@
(separate-proxy)=
# Running proxy separately from the hub
## Background
The thing which users directly connect to is the proxy, which by default is
`configurable-http-proxy`. The proxy either redirects users to the
hub (for login and managing servers), or to their own single-user
servers. Thus, as long as the proxy stays running, access to existing
servers continues, even if the hub itself restarts or goes down.
When you first configure the hub, you may not even realize this
because the proxy is automatically managed by the hub. This is great
for getting started and even most use-cases, although, everytime you restart the
hub, all user connections are also restarted. However, it is also simple to
run the proxy as a service separate from the hub, so that you are free
to reconfigure the hub while only interrupting users who are waiting for their notebook server to start.
starting their notebook server.
The default JupyterHub proxy is
[configurable-http-proxy](https://github.com/jupyterhub/configurable-http-proxy). If you are using a different proxy, such
as [Traefik](https://github.com/traefik/traefik), these instructions are probably not relevant to you.
## Configuration options
`c.JupyterHub.cleanup_servers = False` should be set, which tells the
hub to not stop servers when the hub restarts (this is useful even if
you don't run the proxy separately).
`c.ConfigurableHTTPProxy.should_start = False` should be set, which
tells the hub that the proxy should not be started (because you start
it yourself).
`c.ConfigurableHTTPProxy.auth_token = "CONFIGPROXY_AUTH_TOKEN"` should be set to a
token for authenticating communication with the proxy.
`c.ConfigurableHTTPProxy.api_url = 'http://localhost:8001'` should be
set to the URL which the hub uses to connect _to the proxy's API_.
## Proxy configuration
You need to configure a service to start the proxy. An example
command line argument for this is:
```bash
$ configurable-http-proxy --ip=127.0.0.1 --port=8000 --api-ip=127.0.0.1 --api-port=8001 --default-target=http://localhost:8081 --error-target=http://localhost:8081/hub/error
```
(Details on how to do this is out of the scope of this tutorial. For example, it might be a
systemd service configured within another docker container). The proxy has no
configuration files, all configuration is via the command line and
environment variables.
`--api-ip` and `--api-port` (which tells the proxy where to listen) should match the hub's `ConfigurableHTTPProxy.api_url`.
`--ip`, `-port`, and other options configure the _user_ connections to the proxy.
`--default-target` and `--error-target` should point to the hub, and used when users navigate to the proxy originally.
You must define the environment variable `CONFIGPROXY_AUTH_TOKEN` to
match the token given to `c.ConfigurableHTTPProxy.auth_token`.
You should check the [configurable-http-proxy
options](https://github.com/jupyterhub/configurable-http-proxy) to see
what other options are needed, for example, SSL options. Note that
these options are configured in the hub if the hub is starting the proxy, so you
need to configure the options there.
## Docker image
You can use [jupyterhub configurable-http-proxy docker
image](https://quay.io/repository/jupyterhub/configurable-http-proxy)
to run the proxy.
## See also
- [jupyterhub configurable-http-proxy](https://github.com/jupyterhub/configurable-http-proxy)

View File

@@ -0,0 +1,89 @@
# Working with templates and UI
The pages of the JupyterHub application are generated from
[Jinja](https://jinja.palletsprojects.com) templates. These allow the header, for
example, to be defined once and incorporated into all pages. By providing
your own template(s), you can have complete control over JupyterHub's
appearance.
## Custom Templates
JupyterHub will look for custom templates in all paths included in the
`JupyterHub.template_paths` configuration option, falling back on these
[default templates](https://github.com/jupyterhub/jupyterhub/tree/HEAD/share/jupyterhub/templates)
if no custom template(s) with specified name(s) are found. This fallback
behavior is new in version 0.9; previous versions searched only the paths
explicitly included in `template_paths`. You may override as many
or as few templates as you desire.
## Extending Templates
Jinja provides a mechanism to [extend templates](https://jinja.palletsprojects.com/en/3.0.x/templates/#template-inheritance).
A base template can define `block`(s) within itself that child templates can fill up or
supply content to. The
[JupyterHub default templates](https://github.com/jupyterhub/jupyterhub/tree/HEAD/share/jupyterhub/templates)
make extensive use of blocks, thus allowing you to customize parts of the
interface easily.
In general, a child template can extend a base template, `page.html`, by beginning with:
```html
{% extends "page.html" %}
```
This works, unless you are trying to extend the default template for the same
file name. Starting in version 0.9, you may refer to the base file with a
`templates/` prefix. Thus, if you are writing a custom `page.html`, start the
file with this block:
```html
{% extends "templates/page.html" %}
```
By defining `block`s with the same name as in the base template, child templates
can replace those sections with custom content. The content from the base
template can be included in the child template with the `{{ super() }}` directive.
### Example
To add an additional message to the spawn-pending page, below the existing
text about the server starting up, place the content below in a file named
`spawn_pending.html`. This directory must also be included in the
`JupyterHub.template_paths` configuration option.
```html
{% extends "templates/spawn_pending.html" %} {% block message %} {{ super() }}
<p>Patience is a virtue.</p>
{% endblock %}
```
## Page Announcements
To add announcements to be displayed on a page, you have two options:
- [Extend the page templates as described above](#extending-templates)
- Use configuration variables
### Announcement Configuration Variables
If you set the configuration variable `JupyterHub.template_vars = {'announcement': 'some_text'}`, the given `some_text` will be placed on
the top of all pages. The more specific variables
`announcement_login`, `announcement_spawn`, `announcement_home`, and
`announcement_logout` are more specific and only show on their
respective pages (overriding the global `announcement` variable).
Note that changing these variables requires a restart, unlike direct
template extension.
Alternatively, you can get the same effect by extending templates, which allows you
to update the messages without restarting. Set
`c.JupyterHub.template_paths` as mentioned above, and then create a
template (for example, `login.html`) with:
```html
{% extends "templates/login.html" %} {% set announcement = 'some message' %}
```
Extending `page.html` puts the message on all pages, but note that
extending `page.html` takes precedence over an extension of a specific
page (unlike the variable-based approach above).

View File

@@ -0,0 +1,141 @@
(upgrading-jupyterhub)=
# Upgrading JupyterHub
JupyterHub offers easy upgrade pathways between minor versions. This
document describes how to do these upgrades.
If you are using {ref}`a JupyterHub distribution <index/distributions>`, you
should consult the distribution's documentation on how to upgrade. This documentation is
for those who have set up their JupyterHub without using a distribution.
This documentation is lengthy because it is quite detailed. Most likely, upgrading
JupyterHub is painless, quick and with minimal user interruption.
The steps are discussed in detail, so if you get stuck at any step you can always refer to this guide.
## Read the Changelog
The [changelog](changelog) contains information on what has
changed with the new JupyterHub release and any deprecation warnings.
Read these notes to familiarize yourself with the coming changes. There
might be new releases of the authenticators & spawners you use, so
read the changelogs for those too!
## Notify your users
If you use the default configuration where `configurable-http-proxy`
is managed by JupyterHub, your users will see service disruption during
the upgrade process. You should notify them, and pick a time to do the
upgrade where they will be least disrupted.
If you use a different proxy or run `configurable-http-proxy`
independent of JupyterHub, your users will be able to continue using notebook
servers they had already launched, but will not be able to launch new servers or sign in.
## Backup database & config
Before doing an upgrade, it is critical to back up:
1. Your JupyterHub database (SQLite by default, or MySQL / Postgres if you used those).
If you use SQLite (the default), you should backup the `jupyterhub.sqlite` file.
2. Your `jupyterhub_config.py` file.
3. Your users' home directories. This is unlikely to be affected directly by
a JupyterHub upgrade, but we recommend a backup since user data is critical.
## Shut down JupyterHub
Shut down the JupyterHub process. This would vary depending on how you
have set up JupyterHub to run. It is most likely using a process
supervisor of some sort (`systemd` or `supervisord` or even `docker`).
Use the supervisor-specific command to stop the JupyterHub process.
## Upgrade JupyterHub packages
There are two environments where the `jupyterhub` package is installed:
1. The _hub environment_: where the JupyterHub server process
runs. This is started with the `jupyterhub` command, and is what
people generally think of as JupyterHub.
2. The _notebook user environments_: where the user notebook
servers are launched from, and is probably custom to your own
installation. This could be just one environment (different from the
hub environment) that is shared by all users, one environment
per user, or the same environment as the hub environment. The hub
launched the `jupyterhub-singleuser` command in this environment,
which in turn starts the notebook server.
You need to make sure the version of the `jupyterhub` package matches
in both these environments. If you installed `jupyterhub` with pip,
you can upgrade it with:
```bash
python3 -m pip install --upgrade jupyterhub==<version>
```
Where `<version>` is the version of JupyterHub you are upgrading to.
If you used `conda` to install `jupyterhub`, you should upgrade it
with:
```bash
conda install -c conda-forge jupyterhub==<version>
```
You should also check for new releases of the authenticator & spawner you
are using. You might wish to upgrade those packages, too, along with JupyterHub
or upgrade them separately.
## Upgrade JupyterHub database
Once new packages are installed, you need to upgrade the JupyterHub
database. From the hub environment, in the same directory as your
`jupyterhub_config.py` file, you should run:
```bash
jupyterhub upgrade-db
```
This should find the location of your database, and run the necessary upgrades
for it.
### SQLite database disadvantages
SQLite has some disadvantages when it comes to upgrading JupyterHub. These
are:
- `upgrade-db` may not work, and you may need to delete your database
and start with a fresh one.
- `downgrade-db` **will not** work if you want to rollback to an
earlier version, so backup the `jupyterhub.sqlite` file before
upgrading.
### What happens if I delete my database?
Losing the Hub database is often not a big deal. Information that
resides only in the Hub database includes:
- active login tokens (user cookies, service tokens)
- users added via JupyterHub UI, instead of config files
- info about running servers
If the following conditions are true, you should be fine clearing the
Hub database and starting over:
- users specified in the config file, or login using an external
authentication provider (Google, GitHub, LDAP, etc)
- user servers are stopped during the upgrade
- don't mind causing users to log in again after the upgrade
## Start JupyterHub
Once the database upgrade is completed, start the `jupyterhub`
process again.
1. Log in and start the server to make sure things work as
expected.
2. Check the logs for any errors or deprecation warnings. You
might have to update your `jupyterhub_config.py` file to
deal with any deprecated options.
Congratulations, your JupyterHub has been upgraded!

Binary file not shown.

After

Width:  |  Height:  |  Size: 160 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 138 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 141 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 158 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1017 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 607 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 104 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 103 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 446 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 483 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 66 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Some files were not shown because too many files have changed in this diff Show More