Commit Graph

4582 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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