Thanks to visit codestin.com
Credit goes to github.com

Skip to content

feat: add INSECURE oidc email fallback flag for IdP brokers (#26751) - #26819

Merged
f0ssel merged 2 commits into
release/2.33from
backport/26751-to-2.33
Jun 29, 2026
Merged

feat: add INSECURE oidc email fallback flag for IdP brokers (#26751)#26819
f0ssel merged 2 commits into
release/2.33from
backport/26751-to-2.33

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

Backport of #26751

Original PR: #26751 — feat: add INSECURE oidc email fallback flag for IdP brokers
Merge commit: ad355ae
Requested by: @uzair-coder07

Warning

The automatic cherry-pick had conflicts.
Please resolve manually by cherry-picking the original merge commit:

git fetch origin backport/26751-to-2.33
git checkout backport/26751-to-2.33
git reset --hard origin/release/2.33
git cherry-pick -x -m1 ad355aeaa9a10d44c8b910236d6e293e321e9d2f
# resolve conflicts, then push

The automatic cherry-pick of ad355ae to release/2.33 had conflicts.
Please cherry-pick manually:

    git cherry-pick -x -m1 ad355ae
<!-- Authored by Coder Agents on behalf of @Emyrk. -->

Adds an opt-in `CODER_DANGEROUS_OIDC_EMAIL_FALLBACK` flag (alias
`--dangerous-oidc-email-fallback`) for IdP brokers that do not issue a
stable `sub` for the same user across connections.

(cherry picked from commit ad355ae)
@f0ssel f0ssel changed the title feat: add INSECURE oidc email fallback flag for IdP brokers (#26751) (conflicts) feat: add INSECURE oidc email fallback flag for IdP brokers (#26751) Jun 29, 2026

f0ssel commented Jun 29, 2026

Copy link
Copy Markdown
Member

Resolved the merge conflict from the automated backport of #26751.

What was done

  • Ran the manual cherry-pick the bot requested: git cherry-pick -x -m1 ad355aeaa9a10d44c8b910236d6e293e321e9d2f.
  • Every file auto-merged except coderd/userauth_test.go. That conflict bundled the three new tests from feat: add INSECURE oidc email fallback flag for IdP brokers #26751 together with an unrelated OIDCSuspended test that exists on main but not on release/2.33. I kept only the three intended tests (OIDCInsecureEmailFallbackAllowed, OIDCInsecureEmailFallbackPreservesOriginalLogin, OIDCInsecureEmailFallbackDoesNotCreateUsers) and dropped the unrelated OIDCSuspended test, placing them before OIDCConvert to match the release branch layout.

Verification

  • go test -c ./coderd/ compiles.
  • go test ./coderd/ -run 'TestUserOIDC' passes (full suite plus the three new tests).
  • go test ./cli/ -run TestServerYAMLConfig (golden config) passes.

The PR now shows exactly the intended diff (10 files, +254/-6). mergeStateStatus is BLOCKED only because of branch protection (required review/checks), not conflicts.

Resolved by Coder Agents on behalf of @f0ssel.

@github-actions

Copy link
Copy Markdown
Contributor Author

👋 Hey @github-actions[bot]!

This PR is targeting the release/2.33 release branch, but its title does not start with fix: or fix(scope):.

Only bug fixes should be cherry-picked to release branches. If this is a bug fix, please update the PR title to match the conventional commit format:

fix: description of the bug fix
fix(scope): description of the bug fix

If this is not a bug fix, it likely should not target a release branch.

@f0ssel
f0ssel enabled auto-merge (squash) June 29, 2026 17:28
@f0ssel
f0ssel merged commit 0cfa936 into release/2.33 Jun 29, 2026
53 of 56 checks passed
@f0ssel
f0ssel deleted the backport/26751-to-2.33 branch June 29, 2026 17:31
@github-actions github-actions Bot locked and limited conversation to collaborators Jun 29, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants