fix: add dbauthz.AsSystemRestricted in updatecheck, when creating first user, and when registering InMemoryProvisionerd

johnstcn · johnstcn · commit 6f40cf68a799 · 2023-03-09T09:45:23.000Z
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -795,7 +795,7 @@ func (api *API) CreateInMemoryProvisionerDaemon(ctx context.Context, debounce ti
 	}()
 
 	name := namesgenerator.GetRandomName(1)
-	daemon, err := api.Database.InsertProvisionerDaemon(ctx, database.InsertProvisionerDaemonParams{
+	daemon, err := api.Database.InsertProvisionerDaemon(dbauthz.AsSystemRestricted(ctx), database.InsertProvisionerDaemonParams{
 		ID:           uuid.New(),
 		CreatedAt:    database.Now(),
 		Name:         name,
diff --git a/coderd/updatecheck/updatecheck.go b/coderd/updatecheck/updatecheck.go
@@ -20,6 +20,7 @@ import (
 	"cdr.dev/slog"
 
 	"github.com/coder/coder/coderd/database"
+	"github.com/coder/coder/coderd/database/dbauthz"
 )
 
 const (
@@ -224,7 +225,7 @@ func (c *Checker) notifyIfNewer(prev, next Result) {
 }
 
 func (c *Checker) lastUpdateCheck(ctx context.Context) (r Result, err error) {
-	s, err := c.db.GetLastUpdateCheck(ctx)
+	s, err := c.db.GetLastUpdateCheck(dbauthz.AsSystemRestricted(ctx))
 	if err != nil {
 		return r, err
 	}
diff --git a/coderd/users.go b/coderd/users.go
@@ -37,7 +37,7 @@ import (
 // @Router /users/first [get]
 func (api *API) firstUser(rw http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
-	userCount, err := api.Database.GetUserCount(ctx)
+	userCount, err := api.Database.GetUserCount(dbauthz.AsSystemRestricted(ctx))
 	if err != nil {
 		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
 			Message: "Internal error fetching user count.",
@@ -78,7 +78,7 @@ func (api *API) postFirstUser(rw http.ResponseWriter, r *http.Request) {
 	}
 
 	// This should only function for the first user.
-	userCount, err := api.Database.GetUserCount(ctx)
+	userCount, err := api.Database.GetUserCount(dbauthz.AsSystemRestricted(ctx))
 	if err != nil {
 		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
 			Message: "Internal error fetching user count.",

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ import (`
`20`	`20`	`"cdr.dev/slog"`
`21`	`21`
`22`	`22`	`"github.com/coder/coder/coderd/database"`
	`23`	`+ "github.com/coder/coder/coderd/database/dbauthz"`
`23`	`24`	`)`
`24`	`25`
`25`	`26`	`const (`
`@@ -224,7 +225,7 @@ func (c *Checker) notifyIfNewer(prev, next Result) {`
`224`	`225`	`}`
`225`	`226`
`226`	`227`	`func (c *Checker) lastUpdateCheck(ctx context.Context) (r Result, err error) {`
`227`		`- s, err := c.db.GetLastUpdateCheck(ctx)`
	`228`	`+ s, err := c.db.GetLastUpdateCheck(dbauthz.AsSystemRestricted(ctx))`
`228`	`229`	`if err != nil {`
`229`	`230`	`return r, err`
`230`	`231`	`}`