Sep 5, 2024 · Sep 5, 2024 · Sep 5, 2024 · Sep 5, 2024 · Sep 5, 2024 · Sep 5, 2024
diff --git a/cli/server.go b/cli/server.go
 return err
 }

 // TODO: Throw a caching layer infront of the RuntimeConfig to prevent
 // excessive database queries.
 // Note: This happens before dbauthz, which is really unfortunate.
 // dbauthz is configured in `Coderd.New()`, but we need the manager
 // at this level for notifications. We might have to move some init
 // code around.
 options.RuntimeConfig = runtimeconfig.NewStoreManager(options.Database)
 options.RuntimeConfig = runtimeconfig.NewStoreManager()

 // This should be output before the logs start streaming.
 cliui.Infof(inv.Stdout, "\n==> Logs will stream in below (press ctrl+c to gracefully exit):")
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
 var acs dbauthz.AccessControlStore = dbauthz.AGPLTemplateAccessControlStore{}
 accessControlStore.Store(&acs)

 // runtimeManager does not use dbauthz.
 // TODO: It probably should, but the init code for prod happens before dbauthz
 // is ready.
 runtimeManager := runtimeconfig.NewStoreManager(options.Database)
 runtimeManager := runtimeconfig.NewStoreManager()
 options.Database = dbauthz.New(options.Database, options.Authorizer, *options.Logger, accessControlStore)

 // Some routes expect a deployment ID, so just make sure one exists.
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
 }

 func (q *querier) DeleteRuntimeConfig(ctx context.Context, key string) error {
 // TODO: auth
 if err := q.authorizeContext(ctx, policy.ActionDelete, rbac.ResourceSystem); err != nil {
 return err
 }
 return q.db.DeleteRuntimeConfig(ctx, key)
 }

 }

 func (q *querier) GetRuntimeConfig(ctx context.Context, key string) (string, error) {
 // TODO: auth
 if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil {
 return "", err
 }
 return q.db.GetRuntimeConfig(ctx, key)
 }

 }

 func (q *querier) UpsertRuntimeConfig(ctx context.Context, arg database.UpsertRuntimeConfigParams) error {
 // TODO: auth
 if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceSystem); err != nil {
 return err
 }
 return q.db.UpsertRuntimeConfig(ctx, arg)
 }

diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
 AgentID:     uuid.New(),
 }).Asserts(tpl, policy.ActionCreate)
 }))
 s.Run("DeleteRuntimeConfig", s.Subtest(func(db database.Store, check *expects) {
 check.Args("test").Asserts(rbac.ResourceSystem, policy.ActionDelete)
 }))
 s.Run("GetRuntimeConfig", s.Subtest(func(db database.Store, check *expects) {
 _ = db.UpsertRuntimeConfig(context.Background(), database.UpsertRuntimeConfigParams{
 Key:   "test",
 Value: "value",
 })
 check.Args("test").Asserts(rbac.ResourceSystem, policy.ActionRead)
 }))
 s.Run("UpsertRuntimeConfig", s.Subtest(func(db database.Store, check *expects) {
 check.Args(database.UpsertRuntimeConfigParams{
 Key:   "test",
 Value: "value",
 }).Asserts(rbac.ResourceSystem, policy.ActionCreate)
 }))
 }

 func (s *MethodTestSuite) TestNotifications() {
diff --git a/coderd/runtimeconfig/config.go b/coderd/runtimeconfig/config.go
Original file line number	Diff line number	Diff line change
Expand Up		@@ -821,13 +821,7 @@ func (r RootCmd) Server(newAPI func(context.Context, coderd.Options) (*coderd.
		return err
		}

		// TODO: Throw a caching layer infront of the RuntimeConfig to prevent
		// excessive database queries.
		// Note: This happens before dbauthz, which is really unfortunate.
		// dbauthz is configured in `Coderd.New()`, but we need the manager
		// at this level for notifications. We might have to move some init
		// code around.
		options.RuntimeConfig = runtimeconfig.NewStoreManager(options.Database)
		options.RuntimeConfig = runtimeconfig.NewStoreManager()

		// This should be output before the logs start streaming.
		cliui.Infof(inv.Stdout, "\n==> Logs will stream in below (press ctrl+c to gracefully exit):")
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -255,10 +255,7 @@ func NewOptions(t testing.TB, options *Options) (func(http.Handler), context.Can
		var acs dbauthz.AccessControlStore = dbauthz.AGPLTemplateAccessControlStore{}
		accessControlStore.Store(&acs)

		// runtimeManager does not use dbauthz.
		// TODO: It probably should, but the init code for prod happens before dbauthz
		// is ready.
		runtimeManager := runtimeconfig.NewStoreManager(options.Database)
		runtimeManager := runtimeconfig.NewStoreManager()
		options.Database = dbauthz.New(options.Database, options.Authorizer, *options.Logger, accessControlStore)

		// Some routes expect a deployment ID, so just make sure one exists.
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1184,7 +1184,9 @@ func (q *querier) DeleteReplicasUpdatedBefore(ctx context.Context, updatedAt tim
		}

		func (q *querier) DeleteRuntimeConfig(ctx context.Context, key string) error {
		// TODO: auth
		if err := q.authorizeContext(ctx, policy.ActionDelete, rbac.ResourceSystem); err != nil {
		return err
		}
		return q.db.DeleteRuntimeConfig(ctx, key)
		}

Expand DownExpand Up		@@ -1862,7 +1864,9 @@ func (q *querier) GetReplicasUpdatedAfter(ctx context.Context, updatedAt time.Ti
		}

		func (q *querier) GetRuntimeConfig(ctx context.Context, key string) (string, error) {
		// TODO: auth
		if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil {
		return "", err
		}
		return q.db.GetRuntimeConfig(ctx, key)
		}

Expand DownExpand Up		@@ -3917,7 +3921,9 @@ func (q *querier) UpsertProvisionerDaemon(ctx context.Context, arg database.Upse
		}

		func (q *querier) UpsertRuntimeConfig(ctx context.Context, arg database.UpsertRuntimeConfigParams) error {
		// TODO: auth
		if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceSystem); err != nil {
		return err
		}
		return q.db.UpsertRuntimeConfig(ctx, arg)
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2696,6 +2696,22 @@ func (s *MethodTestSuite) TestSystemFunctions() {
		AgentID: uuid.New(),
		}).Asserts(tpl, policy.ActionCreate)
		}))
		s.Run("DeleteRuntimeConfig", s.Subtest(func(db database.Store, check *expects) {
		check.Args("test").Asserts(rbac.ResourceSystem, policy.ActionDelete)
		}))
		s.Run("GetRuntimeConfig", s.Subtest(func(db database.Store, check *expects) {
		_ = db.UpsertRuntimeConfig(context.Background(), database.UpsertRuntimeConfigParams{
		Key: "test",
		Value: "value",
		})
		check.Args("test").Asserts(rbac.ResourceSystem, policy.ActionRead)
		}))
		s.Run("UpsertRuntimeConfig", s.Subtest(func(db database.Store, check *expects) {
		check.Args(database.UpsertRuntimeConfigParams{
		Key: "test",
		Value: "value",
		}).Asserts(rbac.ResourceSystem, policy.ActionCreate)
		}))
		}

		func (s *MethodTestSuite) TestNotifications() {
Expand Down