Skip to content

[Browser MFA] Rename browser mfa config name#64980

Merged
danielashare merged 1 commit into
masterfrom
danielashare/browser-mfa-config-rename
Mar 26, 2026
Merged

[Browser MFA] Rename browser mfa config name#64980
danielashare merged 1 commit into
masterfrom
danielashare/browser-mfa-config-rename

Conversation

@danielashare
Copy link
Copy Markdown
Contributor

@danielashare danielashare commented Mar 24, 2026

Deprecate AllowBrowserAuthentication and add AllowCLIAuthViaBrowser to replace it, to make it clearer to the user what is being enabled.

Manual Test Plan

Test Environment

Running local Teleport

Test Cases

  • WebAuthn enabled, Browser MFA unspecified enables Browser MFA
  • WebAuthn disabled, Browser MFA enabled causes an error

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Mar 24, 2026

Amplify deployment status

Branch Commit Job ID Status Preview Updated (UTC)
danielashare/browser-mfa-config-rename b0d6bf6 13 ✅SUCCEED danielashare-browser-mfa-config-rename 2026-03-25 22:03:08

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: f2d190e283

ℹ️ 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/config/fileconf.go Outdated
Comment thread api/proto/teleport/legacy/types/types.proto Outdated
@danielashare danielashare force-pushed the danielashare/browser-mfa-config-rename branch from f2d190e to 3b00c76 Compare March 24, 2026 14:48
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: 3b00c76f40

ℹ️ 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 integrations/terraform/tfschema/types_terraform.go Outdated
@danielashare danielashare force-pushed the danielashare/browser-mfa-config-rename branch from 3b00c76 to b5005f9 Compare March 24, 2026 16:57
@danielashare danielashare force-pushed the danielashare/browser-mfa-config-rename branch from b5005f9 to aebf3d0 Compare March 24, 2026 17:20
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: aebf3d0c76

ℹ️ 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 integrations/terraform/tfschema/types_terraform.go
@danielashare danielashare force-pushed the danielashare/browser-mfa-config-rename branch from aebf3d0 to c8099c5 Compare March 24, 2026 17:53
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: c8099c5a40

ℹ️ 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 api/proto/teleport/legacy/types/types.proto
@danielashare danielashare force-pushed the danielashare/browser-mfa-config-rename branch from c8099c5 to 6edf70c Compare March 24, 2026 18:04
// When set to false, authentication flows that require a browser will be disabled.
// Defaults to true.
BoolValue AllowBrowserAuthentication = 23 [
deprecated = true,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Just a heads up that deprecations can break e/ if the field is used there, due to failing linters. (Not a problem if it's only used in OSS.)

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.

Thankfully it isn't used by e

// authenticating CLI sessions.
// When set to false, authentication flows that require a browser will be disabled.
// Defaults to true.
BoolValue AllowBrowserAuthentication = 23 [
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Could we delete/reserve this instead?

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.

+1, I would just remove this completely, and then add

reserve 23;
reserve AllowBrowserAuthentication;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Like Alan said, we can go a step further and just reuse message 23 for AllowCLIAuthViaBrowser since there is no releases depending on it.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I would just do the new tag. Reusing means a whole lot of fighting with the breaking changes linter, which is likely not worth it to save a single tag number. When Dan I discussed this out-of-band I suggested him to follow the "normal" deprecation process.

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.

Thanks guys, I've gone the reserve route to get rid of this field

Comment on lines +479 to +480
if c.Spec.AllowCLIAuthViaBrowser != nil {
return c.Spec.AllowCLIAuthViaBrowser.Value
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

If this wasn't part of an active release we can delete the old field and "replace" it with the new one.

If it were part of an active release then it's a different conversation.

@danielashare danielashare force-pushed the danielashare/browser-mfa-config-rename branch from 2baa264 to b9519c9 Compare March 25, 2026 21:46
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: b9519c906c

ℹ️ 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".

BoolValue AllowBrowserAuthentication = 23 [
// Defaults to true if the Webauthn is configured, defaults to false
// otherwise.
BoolValue AllowCLIAuthViaBrowser = 24 [
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Keep AuthPreference protobuf tag stable for browser auth

Changing AllowCLIAuthViaBrowser to protobuf field 24 (while reserving 23) breaks binary compatibility for mixed-version clients and servers that still send AllowBrowserAuthentication on tag 23 through clusterconfigv1 gRPC (Get/Update/UpsertAuthPreference use types.AuthPreferenceV2). Fresh evidence: this commit now reserves tag 23, so legacy values can no longer populate a known field and GetAllowCLIAuthViaBrowser() falls back to the WebAuthn-derived default, which can silently re-enable browser-based CLI auth after upgrade.

Useful? React with 👍 / 👎.

@danielashare danielashare force-pushed the danielashare/browser-mfa-config-rename branch from b9519c9 to b0d6bf6 Compare March 25, 2026 21:57
@danielashare danielashare added this pull request to the merge queue Mar 26, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Mar 26, 2026
@danielashare danielashare added this pull request to the merge queue Mar 26, 2026
Merged via the queue into master with commit 50e1ca5 Mar 26, 2026
46 checks passed
@danielashare danielashare deleted the danielashare/browser-mfa-config-rename branch March 26, 2026 09:20
@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 documentation 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.

5 participants