Skip to content

[OIDC] Pending provider views, routes, forms #12646

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 51 commits into from
Jan 26, 2023
Merged

[OIDC] Pending provider views, routes, forms #12646

merged 51 commits into from
Jan 26, 2023

Conversation

woodruffw
Copy link
Member

@woodruffw woodruffw commented Dec 6, 2022 •
edited
Loading

See #11296.

WIP. Pushing up for visibility.

TODO:

  • Pending OIDC providers page needs a documentation/help page link
  • Unit tests

@woodruffw
Copy link
Member Author

woodruffw commented Dec 6, 2022 •
edited
Loading

N.B.: I'm currently planning on having the "pending" OIDC machinery share the same ratelimits as the normal OIDC machinery, since they have similar external resource requirements (accessing GitHub's API, JWKS endpoints, etc.).

Edit: Done.

@woodruffw
warehouse: more pending OIDC provider scaffolding, deletions, ratelim…
b7b1846 
…iting

Signed-off-by: William Woodruff <[email protected]>
@woodruffw
Merge remote-tracking branch 'upstream/main' into tob-pending-oidc-pr…
a65a796 
…ovider-views
@woodruffw
migrations: rebase
964acd5 
Signed-off-by: William Woodruff <[email protected]>
@woodruffw
oidc/forms: handle connection errors against GitHub's API
c64ba29 
Signed-off-by: William Woodruff <[email protected]>
@woodruffw
warehouse: pending provider events
bf4fd00 
Signed-off-by: William Woodruff <[email protected]>
@woodruffw
warehouse: make translations
226460d 
Signed-off-by: William Woodruff <[email protected]>
@woodruffw
tests: make the tests pass
cbc0fc2 
...coverage needs to be brought back up.

Signed-off-by: William Woodruff <[email protected]>
@woodruffw
Merge remote-tracking branch 'upstream/main' into tob-pending-oidc-pr…
0acd8e9 
…ovider-views
@woodruffw
tests: add another OIDC form test
35c9630 
Signed-off-by: William Woodruff <[email protected]>
@woodruffw
warehouse: reintroduce UniqueConstraint
37871ab 
Signed-off-by: William Woodruff <[email protected]>
@woodruffw
templates: initial help text for OIDC, restrict add form
f4b6991 
Signed-off-by: William Woodruff <[email protected]>
@woodruffw
accounts/views: more constraints on pending registration
a49b062 
Signed-off-by: William Woodruff <[email protected]>
@woodruffw
accounts/views: warn the user if the OIDC provider has already been r…
ab09480 
…egistered

...potentially by someone else.

Signed-off-by: William Woodruff <[email protected]>
woodruffw
woodruffw commented Dec 8, 2022
View reviewed changes
woodruffw
woodruffw commented Dec 8, 2022
View reviewed changes
@woodruffw woodruffw mentioned this pull request Dec 8, 2022
Closed
@woodruffw
warehouse/local: make translations
bd0ba4c 
Signed-off-by: William Woodruff <[email protected]>
@woodruffw woodruffw marked this pull request as ready for review December 8, 2022 18:31
@woodruffw woodruffw requested a review from a team as a code owner December 8, 2022 18:31
@woodruffw
Copy link
Member Author

This is functionally complete (modulo the final API token exchange, which I'll do in a follow-up). Still needs unit test coverage, but I'll work on that now.

@woodruffw
warehouse: make translations
91cce8f 
Signed-off-by: William Woodruff <[email protected]>
@woodruffw
Merge remote-tracking branch 'upstream/main' into tob-pending-oidc-pr…
6b5c1f0 
…ovider-views

Signed-off-by: William Woodruff <[email protected]>
@woodruffw
accounts/views: reformat
be942bc 
Signed-off-by: William Woodruff <[email protected]>
@woodruffw
tests, warehouse: fixups, fix tests
9e5679d 
Signed-off-by: William Woodruff <[email protected]>
@woodruffw
Merge remote-tracking branch 'upstream/main' into tob-pending-oidc-pr…
2b49e31 
…ovider-views
@woodruffw
tests, warehouse: remove some OIDC restrictions
c11015a 
Signed-off-by: William Woodruff <[email protected]>
@woodruffw
Merge remote-tracking branch 'upstream/main' into tob-pending-oidc-pr…
c1b06e9 
…ovider-views
@woodruffw
pages/help: remove talk of OIDC "flavors"
044738e 
Too confusing.

Signed-off-by: William Woodruff <[email protected]>
@woodruffw
warehouse, tests: better error flashes
bd973ba 
Signed-off-by: William Woodruff <[email protected]>
@woodruffw
warehouse: dedupe project name regexps
b52f3e7 
Signed-off-by: William Woodruff <[email protected]>
@woodruffw
Copy link
Member Author

This should be good for another review pass! It doesn't include the tie-in functionality for converting a pending provider into a "normal" provider (and creating the corresponding project), but I can do that in a follow-on immediately afterwards.

@woodruffw woodruffw requested a review from di January 17, 2023 21:11
@woodruffw
warehouse: make translations
1371f10 
Signed-off-by: William Woodruff <[email protected]>
di
di reviewed Jan 19, 2023
View reviewed changes
Copy link
Member

@di di left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with small nits!

@woodruffw woodruffw requested a review from di January 19, 2023 22:38
@di di requested a review from ewdurbin January 25, 2023 14:54
ewdurbin
ewdurbin approved these changes Jan 25, 2023
View reviewed changes
Copy link
Member

@ewdurbin ewdurbin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Really the only thing missing in any of this work is a way to interact/view it in pypi admin application. No blocker, but question: is this planned?

@di
Copy link
Member

di commented Jan 25, 2023

Really the only thing missing in any of this work is a way to interact/view it in pypi admin application. No blocker, but question: is this planned?

Yeah, we should add that to the follow-on tasks (at the very least, listing pending providers in admin).

@woodruffw woodruffw requested review from di and ewdurbin January 25, 2023 20:06
@di di enabled auto-merge (squash) January 26, 2023 17:50
@di di merged commit 6922cc8 into pypi:main Jan 26, 2023
@woodruffw woodruffw deleted the tob-pending-oidc-provider-views branch January 26, 2023 18:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@di di Awaiting requested review from di

@ewdurbin ewdurbin Awaiting requested review from ewdurbin

Assignees

@woodruffw woodruffw

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@woodruffw @di @ewdurbin