Skip to content

[Browser MFA] Add Browser MFA to presence checks#65052

Merged
danielashare merged 1 commit into
masterfrom
danielashare/browser-mfa-enable-presence-checks
Mar 28, 2026
Merged

[Browser MFA] Add Browser MFA to presence checks#65052
danielashare merged 1 commit into
masterfrom
danielashare/browser-mfa-enable-presence-checks

Conversation

@danielashare
Copy link
Copy Markdown
Contributor

This PR adds Browser MFA fields to presence check flow. The RFD for this addition can be found here. Tracking issue here.

Manual Test Plan

Test Environment

Testing with local Teleport

Test Cases

  • Presence check with Browser MFA
  • Presence check still works with WebAuthn
  • Presence check still work with SSO MFA

Comment thread lib/auth/grpcserver.go
Comment on lines +2589 to +2590
// Both SSO and Browser MFA redirect URLs point to the same callback server on tsh.
// So we can take either one and generate an auth challenge with it.
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

How do we know they both point to the same tsh server? What if they differ? Should we at least log that scenario?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

On tsh we spin up one callback server which can handle either SSO or Browser MFA. tsh sends along both SSOClientRedirectURL and BrowserMFATSHRedirectURL to let the server know which methods are supported by the client. If they differed, a sizeable change would have been made to tsh to spin up two callback servers and would break this flow. I'll add a log to this in case that happens one day

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 7a932649a0

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread lib/client/presence.go
Comment thread lib/auth/grpcserver.go
@danielashare danielashare force-pushed the danielashare/browser-mfa-challenge-request branch 2 times, most recently from 6143668 to c039f40 Compare March 26, 2026 11:21
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 2aeaefaf16

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread lib/auth/auth.go
Base automatically changed from danielashare/browser-mfa-challenge-request to master March 26, 2026 12:45
@danielashare danielashare force-pushed the danielashare/browser-mfa-enable-presence-checks branch from 2aeaefa to 5da6f31 Compare March 27, 2026 07:30
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 5da6f31fbb

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread lib/auth/auth.go
Comment thread api/proto/teleport/legacy/client/proto/authservice.proto Outdated
Comment thread lib/auth/auth.go
@danielashare danielashare added no-changelog Indicates that a PR does not require a changelog entry backport/branch/v18 labels Mar 27, 2026
Copy link
Copy Markdown
Contributor

@okraport okraport left a comment

Choose a reason for hiding this comment

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

LGTM

Comment thread lib/auth/grpcserver.go Outdated
@public-teleport-github-review-bot public-teleport-github-review-bot Bot removed the request for review from eriktate March 27, 2026 21:35
@danielashare danielashare force-pushed the danielashare/browser-mfa-enable-presence-checks branch from cbce736 to 5a352e5 Compare March 27, 2026 22:10
@danielashare danielashare force-pushed the danielashare/browser-mfa-enable-presence-checks branch from 5a352e5 to 5d432ab Compare March 28, 2026 07:38
@danielashare danielashare enabled auto-merge March 28, 2026 07:39
@danielashare danielashare added this pull request to the merge queue Mar 28, 2026
Merged via the queue into master with commit e49744d Mar 28, 2026
45 checks passed
@danielashare danielashare deleted the danielashare/browser-mfa-enable-presence-checks branch March 28, 2026 08:22
@backport-bot-workflows
Copy link
Copy Markdown
Contributor

@danielashare See the table below for backport results.

Branch Result
branch/v18 Failed

danielashare added a commit that referenced this pull request May 6, 2026
[Browser MFA] Add protobuf and config (#63831)

[Browser MFA] Add proto for Browser MFA feature (#64048)

[Browser MFA] Add CompleteBrowserMFAChallenge gRPC (#63873)

[Browser MFA] Rename browser mfa config name (#64980)

[Browser MFA] Add BrowserMFARequestID to CreateAuthenticateChallenge (#63945)

[Browser MFA] Add Browser MFA to challenge request flow (#63936)

[Browser MFA] Add initial requests for browser MFA process to client tools (#64301)

[Browser MFA] Add tsh callback handling for webauthn response (#64461)

[Browser MFA] Add Browser MFA to presence checks (#65052)

[Browser MFA] Add browser MFA path to MFA finish flow (#64523)

[Browser MFA] Add Browser MFA to Connect (#64887)

[Browser MFA] Add Browser MFA UI (#64692)

[Browser MFA] Fix formatting in moderated sessions (#65236)

[Browser MFA] Add Browser MFA ceremony tests
ivan-bax pushed a commit to ivan-bax/teleport that referenced this pull request May 22, 2026
[Browser MFA] Add protobuf and config (gravitational#63831)

[Browser MFA] Add proto for Browser MFA feature (gravitational#64048)

[Browser MFA] Add CompleteBrowserMFAChallenge gRPC (gravitational#63873)

[Browser MFA] Rename browser mfa config name (gravitational#64980)

[Browser MFA] Add BrowserMFARequestID to CreateAuthenticateChallenge (gravitational#63945)

[Browser MFA] Add Browser MFA to challenge request flow (gravitational#63936)

[Browser MFA] Add initial requests for browser MFA process to client tools (gravitational#64301)

[Browser MFA] Add tsh callback handling for webauthn response (gravitational#64461)

[Browser MFA] Add Browser MFA to presence checks (gravitational#65052)

[Browser MFA] Add browser MFA path to MFA finish flow (gravitational#64523)

[Browser MFA] Add Browser MFA to Connect (gravitational#64887)

[Browser MFA] Add Browser MFA UI (gravitational#64692)

[Browser MFA] Fix formatting in moderated sessions (gravitational#65236)

[Browser MFA] Add Browser MFA ceremony tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport/branch/v18 no-changelog Indicates that a PR does not require a changelog entry size/sm

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants