Commit Graph

218 Commits

Author SHA1 Message Date
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
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
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
Simon Li
2088a57ffe Extra test_cors_check tests 2022-01-03 13:55:04 +00: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
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
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
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
b0c7df04ac raise 404 on admin attempt to spawn nonexistent user 2021-10-15 14:40:47 +02:00
josefgasewicz
1366911be6 Fixed tests & set status after writing json 2021-10-07 22:21:16 +01: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
Erik Sundell
c8c7418ed2 pyupgrade: run pyupgrade --py36-plus and black on jupyterhub/tests 2021-08-26 16:05:18 +02:00
Min RK
ebc3b6f4e5 set minimum pagination limit to 1 2021-08-26 14:42:09 +02:00
Min RK
d0c2bc051a test pagination limits on users endpoint 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
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
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
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
18623dc9de Unified service model 2021-06-08 15:18:57 +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
d2dc38d773 Sync with main 2021-05-21 12:53:37 +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
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
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
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
Nathan Barber
ab130309ec Add get_api_pagination method to base handler, revert group.users pagination 2021-04-21 09:57:30 -04:00
0mar
103c6a406a Changed error code of UserTokenListAPIHandler back to 403 2021-04-21 09:43:24 +02:00
0mar
399203e5d3 Fixed scope checking in UserTokenListAPIHandler 2021-04-20 14:55:36 +02:00
Nathan Barber
ec4afa3e5e Add pagination tests for users/groups/group users 2021-04-15 16:42:33 -04:00
0mar
cb104ffe42 Fixed tests 2021-04-15 17:30:13 +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
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
0mar
70dbe2f049 Merge branch 'additional_scopes' of github.com:0mar/jupyterhub into additional_scopes 2021-04-08 17:39:11 +02:00
0mar
b0b1350ec0 Merge branch 'rbac' into additional_scopes 2021-04-08 16:55:25 +02:00
0mar
2f34557689 Resolve comments 2021-04-07 10:37:49 +02:00
0mar
71a5842ad2 Removed user model flags, scope-guarded server model with new scopes 2021-04-01 17:26:34 +02:00
IvanaH8
bdc4bd4763 Resolve merge conflicts with Vertical Filtering and improve tests 2021-03-24 13:39:59 +01:00
0mar
7496fda089 Implemented default token roles, self scope for users and tokens for mockservices 2021-03-11 19:33:05 +01:00
0mar
9832a87ac4 Fixed some tests and unified scope read:user:name 2021-03-09 10:29:52 +01:00
0mar
9d19ffe457 Reimplemented scope logic to account for tokens 2021-03-07 15:29:50 +01:00
IvanaH8
10c82d6272 resolved conflicts with rbac branch 2021-02-17 16:31:46 +01:00
Min RK
4dac580d3d Merge master into rbac 2021-01-27 12:39:02 +01:00
0mar
b160a0e344 Consistent messages regardless of whether resources exist or not 2021-01-26 16:08:23 +01:00
Omar Richardson
82c837eb89 Refactored orm.get_class, improved resource filtereing 2021-01-05 19:58:39 +01:00