fix compile errors

johnstcn · johnstcn · commit f99c77814172 · 2023-02-10T17:29:47.000Z
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -327,12 +327,13 @@ func New(options *Options) *API {
 				Optional:                    true,
 			}),
 			// TODO: We should remove this auth context after middleware.
-			httpmw.SystemAuthCtx,
-			// Redirect to the login page if the user tries to open an app with
-			// "me" as the username and they are not logged in.
-			httpmw.ExtractUserParam(api.Database, true),
-			// Extracts the <workspace.agent> from the url
-			httpmw.ExtractWorkspaceAndAgentParam(api.Database),
+			httpmw.AsAuthzSystem(
+				// Redirect to the login page if the user tries to open an app with
+				// "me" as the username and they are not logged in.
+				httpmw.ExtractUserParam(api.Database, true),
+				// Extracts the <workspace.agent> from the url
+				httpmw.ExtractWorkspaceAndAgentParam(api.Database),
+			),
 		)
 		r.HandleFunc("/*", api.workspaceAppsProxyPath)
 	}
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
@@ -42,7 +42,7 @@ func TestInTX(t *testing.T) {
 	}
 
 	w := dbgen.Workspace(t, db, database.Workspace{})
-	ctx := dbauthz.WithAuthorizeContext(context.Background(), actor)
+	ctx := dbauthz.As(context.Background(), actor)
 	err := q.InTx(func(tx database.Store) error {
 		// The inner tx should use the parent's authz
 		_, err := tx.GetWorkspaceByID(ctx, w.ID)
@@ -63,7 +63,7 @@ func TestNew(t *testing.T) {
 			Wrapped: &coderdtest.FakeAuthorizer{AlwaysReturn: nil},
 		}
 		subj = rbac.Subject{}
-		ctx  = dbauthz.WithAuthorizeContext(context.Background(), rbac.Subject{})
+		ctx  = dbauthz.As(context.Background(), rbac.Subject{})
 	)
 
 	// Double wrap should not cause an actual double wrap. So only 1 rbac call
@@ -95,7 +95,7 @@ func TestDBAuthzRecursive(t *testing.T) {
 	}
 	for i := 0; i < reflect.TypeOf(q).NumMethod(); i++ {
 		var ins []reflect.Value
-		ctx := dbauthz.WithAuthorizeContext(context.Background(), actor)
+		ctx := dbauthz.As(context.Background(), actor)
 
 		ins = append(ins, reflect.ValueOf(ctx))
 		method := reflect.TypeOf(q).Method(i)
diff --git a/coderd/database/dbauthz/setup_test.go b/coderd/database/dbauthz/setup_test.go
@@ -113,7 +113,7 @@ func (s *MethodTestSuite) Subtest(testCaseF func(db database.Store, check *expec
 			Groups: []string{},
 			Scope:  rbac.ScopeAll,
 		}
-		ctx := dbauthz.WithAuthorizeContext(context.Background(), actor)
+		ctx := dbauthz.As(context.Background(), actor)
 
 		var testCase expects
 		testCaseF(db, &testCase)

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ func TestInTX(t *testing.T) {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`w := dbgen.Workspace(t, db, database.Workspace{})`
`45`		`- ctx := dbauthz.WithAuthorizeContext(context.Background(), actor)`
	`45`	`+ ctx := dbauthz.As(context.Background(), actor)`
`46`	`46`	`err := q.InTx(func(tx database.Store) error {`
`47`	`47`	`// The inner tx should use the parent's authz`
`48`	`48`	`_, err := tx.GetWorkspaceByID(ctx, w.ID)`
`@@ -63,7 +63,7 @@ func TestNew(t *testing.T) {`
`63`	`63`	`Wrapped: &coderdtest.FakeAuthorizer{AlwaysReturn: nil},`
`64`	`64`	`}`
`65`	`65`	`subj = rbac.Subject{}`
`66`		`- ctx = dbauthz.WithAuthorizeContext(context.Background(), rbac.Subject{})`
	`66`	`+ ctx = dbauthz.As(context.Background(), rbac.Subject{})`
`67`	`67`	`)`
`68`	`68`
`69`	`69`	`// Double wrap should not cause an actual double wrap. So only 1 rbac call`
`@@ -95,7 +95,7 @@ func TestDBAuthzRecursive(t *testing.T) {`
`95`	`95`	`}`
`96`	`96`	`for i := 0; i < reflect.TypeOf(q).NumMethod(); i++ {`
`97`	`97`	`var ins []reflect.Value`
`98`		`- ctx := dbauthz.WithAuthorizeContext(context.Background(), actor)`
	`98`	`+ ctx := dbauthz.As(context.Background(), actor)`
`99`	`99`
`100`	`100`	`ins = append(ins, reflect.ValueOf(ctx))`
`101`	`101`	`method := reflect.TypeOf(q).Method(i)`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ func (s MethodTestSuite) Subtest(testCaseF func(db database.Store, check expec`
`113`	`113`	`Groups: []string{},`
`114`	`114`	`Scope: rbac.ScopeAll,`
`115`	`115`	`}`
`116`		`- ctx := dbauthz.WithAuthorizeContext(context.Background(), actor)`
	`116`	`+ ctx := dbauthz.As(context.Background(), actor)`
`117`	`117`
`118`	`118`	`var testCase expects`
`119`	`119`	`testCaseF(db, &testCase)`