Skip to content

fix(coderd): prevent user-admin from resetting owner password (#25709)#26191

Open
jdomeracki-coder wants to merge 1 commit into
release/2.29from
cherry-pick/25709/release/2.29
Open

fix(coderd): prevent user-admin from resetting owner password (#25709)#26191
jdomeracki-coder wants to merge 1 commit into
release/2.29from
cherry-pick/25709/release/2.29

Conversation

@jdomeracki-coder

@jdomeracki-coder jdomeracki-coder commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

Backport of #25709 to release/2.29.

Cherry-picked with git cherry-pick -x (76bf462bbf); the commit body references the original PR.

Generated by Coder Agents on behalf of @jdomeracki-coder.

`PUT /api/v2/users/{user}/password` was protected only by
`ActionUpdatePersonal`, which the built-in `user-admin` role holds
site-wide. No guard prevented targeting an owner. The old-password check
is skipped for non-self resets, so a user-admin could reset any owner's
password and authenticate as them, gaining full deployment control.

Add an owner-role guard to `putUserPassword` that refuses password-reset
requests when the target holds the owner role unless the caller is also
an owner. This is modeled on the guard in `putUserStatus`, but differs
in that it conditionally allows owner-to-owner resets (whereas
`putUserStatus` blocks all suspension of owners regardless of caller).

Fixes https://linear.app/codercom/issue/PLAT-227

<details><summary>Implementation details</summary>

- Guard inserted after the `Authorize` check, before `httpapi.Read`
- `apiKey.UserID != user.ID` gates the check so self-password-change is
unaffected
- Acting user's roles fetched from DB to verify owner status (same
pattern as `putUserStatus`)
- Returns HTTP 400 consistent with sibling handler error style
- Two new test cases: `UserAdminCannotResetOwnerPassword`,
`OwnerCanResetOwnerPassword`

</details>

> Generated with [Coder Agents](https://coder.com) by @f0ssel

(cherry picked from commit 76bf462)
@jdomeracki-coder jdomeracki-coder added the cherry-pick/v2.29 Needs to be cherry-picked to the 2.29 release branch label Jun 9, 2026
@jdomeracki-coder jdomeracki-coder requested a review from f0ssel June 9, 2026 19:01

@f0ssel f0ssel left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Backport of #25709 to release/2.29.

Verified as a clean version backport: identical changed files and diff stats to the sibling backports of this fix on the other release branches, with no unrelated files touched. Approving as requested.

This review was generated by Coder Agents.

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

Labels

cherry-pick/v2.29 Needs to be cherry-picked to the 2.29 release branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants