Skip to content

Unify and simplify MFA Ceremony helpers#46986

Merged
Joerger merged 12 commits intomasterfrom
joerger/mfa-ceremony-refactor
Oct 2, 2024
Merged

Unify and simplify MFA Ceremony helpers#46986
Joerger merged 12 commits intomasterfrom
joerger/mfa-ceremony-refactor

Conversation

@Joerger
Copy link
Copy Markdown
Contributor

@Joerger Joerger commented Sep 30, 2024

This is a follow up to the previous MFA Ceremony PR to unify MFA ceremonies with the same ceremony helpers. I also took steps to simplify the ceremony helpers. This change will make it easier to apply MFA ceremony changes, such as SSO MFA to one spot rather than several slightly modified spots.

This PR should have no functional impact.

@Joerger Joerger added no-changelog Indicates that a PR does not require a changelog entry backport/branch/v15 labels Sep 30, 2024
@Joerger Joerger requested a review from codingllama September 30, 2024 18:01
@github-actions github-actions Bot added desktop-access size/sm tsh tsh - Teleport's command line tool for logging into nodes running Teleport. labels Sep 30, 2024
Copy link
Copy Markdown
Contributor

@codingllama codingllama left a comment

Choose a reason for hiding this comment

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

Looks good, no major comments on my part.

Please take a look at the test failures.

Comment thread api/mfa/ceremony.go Outdated
Comment thread api/mfa/ceremony.go
Comment thread api/mfa/ceremony.go Outdated
Comment thread lib/auth/helpers_mfa.go
Comment thread lib/client/mfa.go Outdated
Comment thread lib/client/presence.go Outdated
Comment thread lib/client/presence.go
Comment thread lib/web/terminal.go Outdated
@Joerger Joerger force-pushed the joerger/mfa-ceremony-refactor branch from 28edc50 to 09dbce8 Compare October 1, 2024 23:50
@Joerger Joerger mentioned this pull request Oct 2, 2024
Copy link
Copy Markdown
Contributor

@codingllama codingllama left a comment

Choose a reason for hiding this comment

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

LGTM.

@public-teleport-github-review-bot public-teleport-github-review-bot Bot removed the request for review from bl-nero October 2, 2024 18:27
@Joerger Joerger added this pull request to the merge queue Oct 2, 2024
github-merge-queue Bot pushed a commit that referenced this pull request Oct 2, 2024
* Refactor MFA ceremony helpers.

* Refactor session MFA ceremony to use new MFA ceremony helpers.

* Simplify calls to NewMFACeremony.

* Remove remaining usage of tc.PromptMFA in favor of Ceremony.

* Rename prompt constructor.

* Add godoc to ceremony; update tests.

* Cleanup.

* Resolve comments; fix tests.

* Update comments.

* Fix test.

* Fix lint.
@Joerger Joerger removed this pull request from the merge queue due to a manual request Oct 2, 2024
@Joerger Joerger added this pull request to the merge queue Oct 2, 2024
Merged via the queue into master with commit 6a1d666 Oct 2, 2024
@Joerger Joerger deleted the joerger/mfa-ceremony-refactor branch October 2, 2024 19:26
@public-teleport-github-review-bot
Copy link
Copy Markdown

@Joerger See the table below for backport results.

Branch Result
branch/v15 Failed
branch/v16 Failed

Joerger added a commit that referenced this pull request Oct 3, 2024
* Refactor MFA ceremony helpers.

* Refactor session MFA ceremony to use new MFA ceremony helpers.

* Simplify calls to NewMFACeremony.

* Remove remaining usage of tc.PromptMFA in favor of Ceremony.

* Rename prompt constructor.

* Add godoc to ceremony; update tests.

* Cleanup.

* Resolve comments; fix tests.

* Update comments.

* Fix test.

* Fix lint.
@Joerger
Copy link
Copy Markdown
Contributor Author

Joerger commented Oct 3, 2024

There are many more hard to fix conflicts with the v15 backport than I would have hoped., so I'm going to hold off on it unless absolutely necessary.

github-merge-queue Bot pushed a commit that referenced this pull request Oct 16, 2024
* Refactor MFA ceremony helpers.

* Refactor session MFA ceremony to use new MFA ceremony helpers.

* Simplify calls to NewMFACeremony.

* Remove remaining usage of tc.PromptMFA in favor of Ceremony.

* Rename prompt constructor.

* Add godoc to ceremony; update tests.

* Cleanup.

* Resolve comments; fix tests.

* Update comments.

* Fix test.

* Fix lint.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

desktop-access no-changelog Indicates that a PR does not require a changelog entry size/sm tsh tsh - Teleport's command line tool for logging into nodes running Teleport.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants