Commit Graph

7545 Commits

Author SHA1 Message Date
pre-commit-ci[bot]
1171bdcef6 [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/psf/black: 23.12.1 → 24.1.1](https://github.com/psf/black/compare/23.12.1...24.1.1)
- [github.com/PyCQA/flake8: 6.1.0 → 7.0.0](https://github.com/PyCQA/flake8/compare/6.1.0...7.0.0)
2024-02-05 20:26:34 +00:00
Erik Sundell
77e90051fd Merge pull request #4686 from jupyterhub/dependabot/github_actions/codecov/codecov-action-4
Bump codecov/codecov-action from 3 to 4
2024-02-01 10:20:36 +01:00
dependabot[bot]
8703df341f Bump codecov/codecov-action from 3 to 4
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3 to 4.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v3...v4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-01 05:56:48 +00:00
Erik Sundell
5c91f3cad7 Merge pull request #4684 from minrk/pytest8
enable log capture in pytest, compatibility with pytest 8
2024-01-30 14:32:08 +01:00
Min RK
4712802b45 enable log capture in pytest
- better periodic callback cleanup to reduce warnings
- fix log-assertion tests to use caplog instead of pytest.warns, which wasn't correct
2024-01-30 14:10:37 +01:00
Erik Sundell
9fa196092f Merge pull request #4683 from minrk/check-allow-later
don't run check_allowed until after check_blocked_users resolves
2024-01-26 12:38:34 +01:00
Min RK
000b42bdcf don't run check_allowed until after block resolves
avoids computing an unused value if blocked_pass is going to halt authorization anyway

no change in behavior
2024-01-26 11:24:42 +01:00
YuviPanda
7f8eef5e19 Note that you can throw a 403 from check_allowed
From https://github.com/jupyterhub/oauthenticator/pull/719#pullrequestreview-1838530737
2024-01-25 14:05:21 -08:00
Erik Sundell
041acbc0bf Merge pull request #4608 from minrk/oauth-state-cookie
move service oauth state from cookies to memory
2024-01-25 10:28:01 +01:00
Min RK
2c7fe93212 clarify private oauth state persistence docstring 2024-01-25 09:54:45 +01:00
Min RK
41a2e29f27 Merge pull request #4676 from thedataincubator/whoami-scope
Add appropriate scope in examples/service-whoami-flask
2024-01-25 09:39:17 +01:00
Min RK
c9b7b9b224 sync with main
# Conflicts:
#	jupyterhub/services/auth.py
2024-01-25 09:35:31 +01:00
Erik Sundell
46fbd0465e Merge pull request #4677 from minrk/expires_in_validate
Improve validation, docs for token.expires_in
2024-01-25 00:19:33 +01:00
Erik Sundell
92da2c12fd Merge pull request #4479 from minrk/jupyterhub-public-url
add JupyterHub.public_url config
2024-01-24 23:56:58 +01:00
Min RK
47e8bbaf5e regen rest-api 2024-01-23 10:48:49 +01:00
Min RK
d3d6d0a997 document 0 for no expiration
Co-authored-by: Simon Li <orpheus+devel@gmail.com>
2024-01-23 10:47:26 +01:00
Simon Li
5663964bf4 Unescape jinja escaped username in html page 2024-01-20 21:00:59 +00:00
Simon Li
35fe5f3bd2 browser tests: use username with special chars to check escapes/unescapes 2024-01-20 21:00:57 +00:00
Simon Li
c69dcdd0ed Fix some typos in tests/browser/test_browser.py 2024-01-20 15:02:56 +00:00
Yuvi Panda
ab588c28ce Merge pull request #4678 from manics/pre_spawn_hook-doc
pre_spawn_hook doc: make example generic to all spawners
2024-01-19 18:42:32 -08:00
Robert Schroll
551c65243c Black and Prettier formatting 2024-01-19 18:11:34 -08:00
Robert Schroll
1d9182dd82 Black formatting 2024-01-19 17:26:36 -08:00
Simon Li
547543b888 pre_spawn_hook doc: make example generic to all spawners 2024-01-19 12:01:36 +00:00
Min RK
8c3596d923 Improve validation, docs for token.expires_in
- accept 0 meaning no expiration, since folks have tried to use it that way
- clear error message for invalid (e.g. negative) values
- specify example in rest api doc so it doesn't default to invalid `0`
- better error if orm token fails to be retrieved
2024-01-19 10:23:49 +01:00
Robert Schroll
e879ab18e2 examples/service-whoami-flask: Fix return types in oauth_callback
In my testing, Flask 3.0.0 doesn't accept returning only an integer
(as an error code) in a handler.  A (content, status) tuple does
work.  I don't know if this is a recent change, or if this has always
been broken, but the tuple return should be good for older Flask
versions as well.
2024-01-18 15:18:26 -08:00
Robert Schroll
8a5fc8044a examples/service-whoami-flask: Add scope to user role
For ordinary users to access the service, they need an appropriate
scope added to the user role.  This adds that role in the
jupyterhub_config.py, as well as a note about this in the README.
It also updates the ouptut that comes form the whoami service.
2024-01-18 15:15:44 -08:00
Min RK
68c12d4d32 typo
Co-authored-by: Simon Li <orpheus+devel@gmail.com>
2024-01-15 12:54:52 +01:00
Min RK
965e4a91d6 update linkcheck to ignore example.org/com 2024-01-15 12:28:30 +01:00
Min RK
1a5220d5d8 Consistent example public_url
with jupyterhub.example.org

Co-authored-by: Simon Li <orpheus+devel@gmail.com>
2024-01-15 10:04:45 +01:00
dependabot[bot]
cc9d9e435a Merge pull request #4670 from jupyterhub/dependabot/npm_and_yarn/jsx/follow-redirects-1.15.4 2024-01-11 23:29:57 +00:00
Simon Li
efb5789dea Merge pull request #4671 from minrk/nginx-http-host
use $http_host in nginx proxy header
2024-01-11 23:23:43 +00:00
Min RK
4dd430e080 Merge branch 'main' into jupyterhub-public-url 2024-01-11 10:24:44 +01:00
Min RK
2f091e5300 Merge pull request #4665 from minrk/deprecated-utc
avoid deprecated datetime.utcnow
2024-01-11 10:21:18 +01:00
Min RK
603c59a307 use $http_host in nginx proxy header
$host is the hostname, $http_host is `hostname[:port]`, which is what's needed here

$host works fine in the example because it uses the default port 80, but if it's on a different port
it will differ from the http Host header, resulting in cross-origin check errors.
2024-01-11 09:17:08 +01:00
dependabot[bot]
0758b661df Bump follow-redirects from 1.15.2 to 1.15.4 in /jsx
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.2 to 1.15.4.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.2...v1.15.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-11 00:51:10 +00:00
Erik Sundell
a11816bff8 Merge pull request #4666 from jupyterhub/dependabot/github_actions/actions/upload-artifact-4
Bump actions/upload-artifact from 3 to 4
2024-01-03 07:53:20 +01:00
Erik Sundell
a5b1b02220 Merge pull request #4667 from jupyterhub/dependabot/github_actions/actions/setup-python-5
Bump actions/setup-python from 4 to 5
2024-01-03 07:52:30 +01:00
Erik Sundell
935a366fd3 Merge pull request #4652 from jupyterhub/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2024-01-03 07:49:43 +01:00
pre-commit-ci[bot]
00bab929fc [pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/pycqa/isort: 5.12.0 → 5.13.2](https://github.com/pycqa/isort/compare/5.12.0...5.13.2)
- [github.com/psf/black: 23.10.1 → 23.12.1](https://github.com/psf/black/compare/23.10.1...23.12.1)
- [github.com/pre-commit/mirrors-prettier: v3.0.3 → v4.0.0-alpha.8](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.3...v4.0.0-alpha.8)
2024-01-01 20:22:32 +00:00
dependabot[bot]
3f44c75fbc Bump actions/setup-python from 4 to 5
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v4...v5)

---
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>
2024-01-01 05:39:51 +00:00
dependabot[bot]
1f596793c6 Bump actions/upload-artifact from 3 to 4
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
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>
2024-01-01 05:39:48 +00:00
Min RK
be14baf096 avoid deprecated datetime.utcnow
deprecated in Python 3.12

replace with equivalent utils.utcnow(with_tz=False)
2023-12-20 14:23:49 +01:00
Min RK
ab82b8e492 Merge pull request #4658 from manics/hub-singleuser-versions-major-only
Compare major hub and singleuser versions only
2023-12-18 15:38:38 +01:00
Min RK
7532ba1310 Merge pull request #4663 from minrk/temp-pin-pytest-asyncio
temporarily pin pytest-asyncio
2023-12-18 15:16:41 +01:00
Min RK
8f2ad59254 temporarily pin pytest-asyncio
0.23 introduces breaking changes
2023-12-18 14:59:29 +01:00
Min RK
ebca6af1fd Merge pull request #4662 from yuvipanda/minor-change-to-contributing-docs
docs: Remove non-actionable step from developer setup
2023-12-18 08:37:28 +01:00
YuviPanda
a142876a4e docs: Remove non-actionable step from developer setup
I just went through these with @jmunroe, and found the
db step a little confusing - there is no action to really be
taken here, as pretty much everyone just uses sqlite for
development (and even production). So I've just removed that
step, as python almost always ships with sqlite built into it.
2023-12-17 13:05:19 -08:00
Simon Li
7bf4efd3f8 Merge pull request #4651 from minrk/ipython-handler-removed
avoid attempting to patch removed IPythonHandler with notebook v7
2023-12-09 14:52:06 +00:00
Simon Li
b0517a96d5 Compare major hub and singleuser versions only
JupyterHub uses semantic versioning and has been >1.0.0 for a long time. It should be fine for the hub and singleuser versions to differ in their minor component.
2023-12-09 14:24:29 +00:00
Min RK
fca5e9365c Merge pull request #4645 from minrk/manage-groups-required
explicitly require groups in auth model when Authenticator.manage_groups is enabled
2023-12-04 09:46:34 +01:00