Fix more unit tests

Emyrk · Emyrk · commit 32a9e123242b · 2023-02-02T08:16:06.000-06:00
diff --git a/coderd/authzquery/user.go b/coderd/authzquery/user.go
@@ -137,10 +137,17 @@ func (q *AuthzQuerier) UpdateUserDeletedByID(ctx context.Context, arg database.U
 }
 
 func (q *AuthzQuerier) UpdateUserHashedPassword(ctx context.Context, arg database.UpdateUserHashedPasswordParams) error {
-	fetch := func(ctx context.Context, arg database.UpdateUserHashedPasswordParams) (database.User, error) {
-		return q.database.GetUserByID(ctx, arg.ID)
+	user, err := q.database.GetUserByID(ctx, arg.ID)
+	if err != nil {
+		return err
+	}
+
+	err = q.authorizeContext(ctx, rbac.ActionUpdate, user.UserDataRBACObject())
+	if err != nil {
+		return err
 	}
-	return authorizedUpdate(q.authorizer, fetch, q.database.UpdateUserHashedPassword)(ctx, arg)
+
+	return q.database.UpdateUserHashedPassword(ctx, arg)
 }
 
 func (q *AuthzQuerier) UpdateUserLastSeenAt(ctx context.Context, arg database.UpdateUserLastSeenAtParams) (database.User, error) {
diff --git a/coderd/workspaceapps.go b/coderd/workspaceapps.go
@@ -23,6 +23,7 @@ import (
 	jose "gopkg.in/square/go-jose.v2"
 
 	"cdr.dev/slog"
+	"github.com/coder/coder/coderd/authzquery"
 	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/coderd/httpapi"
 	"github.com/coder/coder/coderd/httpmw"
@@ -316,7 +317,8 @@ func (api *API) parseWorkspaceApplicationHostname(rw http.ResponseWriter, r *htt
 }
 
 func (api *API) handleWorkspaceAppLogout(rw http.ResponseWriter, r *http.Request) {
-	ctx := r.Context()
+	// TODO: Limit permissions of this system user. Using scope or new role.
+	ctx := authzquery.WithAuthorizeSystemContext(r.Context(), rbac.RolesAdminSystem())
 
 	// Delete the API key and cookie first before attempting to parse/validate
 	// the redirect URI.

Original file line number	Diff line number	Diff line change
`@@ -137,10 +137,17 @@ func (q *AuthzQuerier) UpdateUserDeletedByID(ctx context.Context, arg database.U`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`func (q *AuthzQuerier) UpdateUserHashedPassword(ctx context.Context, arg database.UpdateUserHashedPasswordParams) error {`
`140`		`- fetch := func(ctx context.Context, arg database.UpdateUserHashedPasswordParams) (database.User, error) {`
`141`		`- return q.database.GetUserByID(ctx, arg.ID)`
	`140`	`+ user, err := q.database.GetUserByID(ctx, arg.ID)`
	`141`	`+ if err != nil {`
	`142`	`+ return err`
	`143`	`+ }`
	`144`	`+`
	`145`	`+ err = q.authorizeContext(ctx, rbac.ActionUpdate, user.UserDataRBACObject())`
	`146`	`+ if err != nil {`
	`147`	`+ return err`
`142`	`148`	`}`
`143`		`- return authorizedUpdate(q.authorizer, fetch, q.database.UpdateUserHashedPassword)(ctx, arg)`
	`149`	`+`
	`150`	`+ return q.database.UpdateUserHashedPassword(ctx, arg)`
`144`	`151`	`}`
`145`	`152`
`146`	`153`	`func (q *AuthzQuerier) UpdateUserLastSeenAt(ctx context.Context, arg database.UpdateUserLastSeenAtParams) (database.User, error) {`