Commit Graph

4871 Commits

Author SHA1 Message Date
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
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
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
Matt Kafonek
1220673e61 Add files via upload 2021-04-07 14:34:10 -04:00