Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jdomeracki-coder wants to merge 1 commit into
base: release/2.32
Choose a base branch
from
+69 −0
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions coderd/users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1316,6 +1316,24 @@ func (api *API) putUserPassword(rw http.ResponseWriter, r *http.Request) {
return
}

// Only owners can change the password of another owner.
if apiKey.UserID != user.ID && slices.Contains(user.RBACRoles, rbac.RoleOwner().String()) {
actingUser, err := api.Database.GetUserByID(ctx, apiKey.UserID)
if err != nil {
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
Message: "Internal error fetching acting user.",
Detail: err.Error(),
})
return
}
if !slices.Contains(actingUser.RBACRoles, rbac.RoleOwner().String()) {
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
Message: "Only owners can change the password of an owner.",
})
return
}
}

if !httpapi.Read(ctx, rw, r, &params) {
return
}
Expand Down
51 changes: 51 additions & 0 deletions coderd/users_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1517,6 +1517,57 @@ func TestUpdateUserPassword(t *testing.T) {
require.Equal(t, http.StatusNotFound, cerr.StatusCode())
})

t.Run("UserAdminCannotResetOwnerPassword", func(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, nil)
owner := coderdtest.CreateFirstUser(t, client)
userAdmin, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID, rbac.RoleUserAdmin())

ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()

err := userAdmin.UpdateUserPassword(ctx, owner.UserID.String(), codersdk.UpdateUserPasswordRequest{
Password: "SomeNewStrongPassword!",
})
require.Error(t, err, "user-admin should not be able to reset owner password")
var apiErr *codersdk.Error
require.ErrorAs(t, err, &apiErr)
require.Equal(t, http.StatusBadRequest, apiErr.StatusCode())
require.Contains(t, apiErr.Message, "Only owners can change the password of an owner")
})

t.Run("OwnerCanResetOwnerPassword", func(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, nil)
owner := coderdtest.CreateFirstUser(t, client)

ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()

anotherOwner, err := client.CreateUserWithOrgs(ctx, codersdk.CreateUserRequestWithOrgs{
Email: "another-owner@coder.com",
Username: "another-owner",
Password: "SomeStrongPassword!",
OrganizationIDs: []uuid.UUID{owner.OrganizationID},
})
require.NoError(t, err)
_, err = client.UpdateUserRoles(ctx, anotherOwner.ID.String(), codersdk.UpdateRoles{
Roles: []string{rbac.RoleOwner().String()},
})
require.NoError(t, err)

err = client.UpdateUserPassword(ctx, anotherOwner.ID.String(), codersdk.UpdateUserPasswordRequest{
Password: "SomeNewStrongPassword!",
})
require.NoError(t, err, "owner should be able to reset another owner's password")

_, err = client.LoginWithPassword(ctx, codersdk.LoginWithPasswordRequest{
Email: "another-owner@coder.com",
Password: "SomeNewStrongPassword!",
})
require.NoError(t, err, "other owner should login with the new password")
})

t.Run("PasswordsMustDiffer", func(t *testing.T) {
t.Parallel()

Expand Down
Loading