Jul 10, 2024 · Jul 9, 2024 · Jul 10, 2024 · Jul 10, 2024 · Jul 10, 2024 · Jul 10, 2024
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/audit/diff.go b/coderd/audit/diff.go
 database.WorkspaceProxy |
 database.AuditOAuthConvertState |
 database.HealthSettings |
 database.NotificationsSettings |
 database.OAuth2ProviderApp |
 database.OAuth2ProviderAppSecret |
 database.CustomRole |
diff --git a/coderd/audit/request.go b/coderd/audit/request.go
 return string(typed.ToLoginType)
 case database.HealthSettings:
 return "" // no target?
 case database.NotificationsSettings:
 return "" // no target?
 case database.OAuth2ProviderApp:
 return typed.Name
 case database.OAuth2ProviderAppSecret:
 case database.HealthSettings:
 // Artificial ID for auditing purposes
 return typed.ID
 case database.NotificationsSettings:
 // Artificial ID for auditing purposes
 return typed.ID
 case database.OAuth2ProviderApp:
 return typed.ID
 case database.OAuth2ProviderAppSecret:
 return database.ResourceTypeConvertLogin
 case database.HealthSettings:
 return database.ResourceTypeHealthSettings
 case database.NotificationsSettings:
 return database.ResourceTypeNotificationsSettings
 case database.OAuth2ProviderApp:
 return database.ResourceTypeOauth2ProviderApp
 case database.OAuth2ProviderAppSecret:
 case database.HealthSettings:
 // Artificial ID for auditing purposes
 return false
 case database.NotificationsSettings:
 // Artificial ID for auditing purposes
 return false
 case database.OAuth2ProviderApp:
 return false
 case database.OAuth2ProviderAppSecret:
diff --git a/coderd/coderd.go b/coderd/coderd.go
 })
 })
 })
 r.Route("/notifications", func(r chi.Router) {
 r.Use(apiKeyMiddleware)
 r.Get("/settings", api.notificationsSettings)
 r.Put("/settings", api.putNotificationsSettings)
 })
 })

 if options.SwaggerEndpoint {
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
 return q.db.GetNotificationMessagesByStatus(ctx, arg)
 }

 func (q *querier) GetNotificationsSettings(ctx context.Context) (string, error) {
 // No authz checks
 return q.db.GetNotificationsSettings(ctx)
 }

 func (q *querier) GetOAuth2ProviderAppByID(ctx context.Context, id uuid.UUID) (database.OAuth2ProviderApp, error) {
 if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceOauth2App); err != nil {
 return database.OAuth2ProviderApp{}, err
 return q.db.UpsertLogoURL(ctx, value)
 }

 func (q *querier) UpsertNotificationsSettings(ctx context.Context, value string) error {
 if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceDeploymentConfig); err != nil {
 return err
 }
 return q.db.UpsertNotificationsSettings(ctx, value)
 }

 func (q *querier) UpsertOAuthSigningKey(ctx context.Context, value string) error {
 if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceSystem); err != nil {
 return err
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
 s.Run("UpsertHealthSettings", s.Subtest(func(db database.Store, check *expects) {
 check.Args("foo").Asserts(rbac.ResourceDeploymentConfig, policy.ActionUpdate)
 }))
 s.Run("GetNotificationsSettings", s.Subtest(func(db database.Store, check *expects) {
 check.Args().Asserts()
 }))
 s.Run("UpsertNotificationsSettings", s.Subtest(func(db database.Store, check *expects) {
 check.Args("foo").Asserts(rbac.ResourceDeploymentConfig, policy.ActionUpdate)
 }))
 s.Run("GetDeploymentWorkspaceAgentStats", s.Subtest(func(db database.Store, check *expects) {
 check.Args(time.Time{}).Asserts()
 }))
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
 lastUpdateCheck         []byte
 announcementBanners     []byte
 healthSettings          []byte
 notificationsSettings   []byte
 applicationName         string
 logoURL                 string
 appSecurityKey          string
 return out, nil
 }

 func (q *FakeQuerier) GetNotificationsSettings(_ context.Context) (string, error) {
 q.mutex.RLock()
 defer q.mutex.RUnlock()

 if q.notificationsSettings == nil {
 return "{}", nil
 }

 return string(q.notificationsSettings), nil
 }

 func (q *FakeQuerier) GetOAuth2ProviderAppByID(_ context.Context, id uuid.UUID) (database.OAuth2ProviderApp, error) {
 q.mutex.Lock()
 defer q.mutex.Unlock()
 }

 func (q *FakeQuerier) UpsertHealthSettings(_ context.Context, data string) error {
 q.mutex.RLock()
 defer q.mutex.RUnlock()
 q.mutex.Lock()
 defer q.mutex.Unlock()

 q.healthSettings = []byte(data)
 return nil
 }

 func (q *FakeQuerier) UpsertLogoURL(_ context.Context, data string) error {
 q.mutex.RLock()
 defer q.mutex.RUnlock()
 q.mutex.Lock()
 defer q.mutex.Unlock()

 q.logoURL = data
 return nil
 }

 func (q *FakeQuerier) UpsertNotificationsSettings(_ context.Context, data string) error {
 q.mutex.Lock()
 defer q.mutex.Unlock()

 q.notificationsSettings = []byte(data)
 return nil
 }

 func (q *FakeQuerier) UpsertOAuthSigningKey(_ context.Context, value string) error {
 q.mutex.Lock()
 defer q.mutex.Unlock()
diff --git a/coderd/database/dbmetrics/dbmetrics.go b/coderd/database/dbmetrics/dbmetrics.go
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,6 +20,7 @@ type Auditable interface {
		database.WorkspaceProxy \|
		database.AuditOAuthConvertState \|
		database.HealthSettings \|
		database.NotificationsSettings \|
		database.OAuth2ProviderApp \|
		database.OAuth2ProviderAppSecret \|
		database.CustomRole \|
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -99,6 +99,8 @@ func ResourceTarget[T Auditable](tgt T) string {
		return string(typed.ToLoginType)
		case database.HealthSettings:
		return "" // no target?
		case database.NotificationsSettings:
		return "" // no target?
		case database.OAuth2ProviderApp:
		return typed.Name
		case database.OAuth2ProviderAppSecret:
Expand DownExpand Up		@@ -142,6 +144,9 @@ func ResourceID[T Auditable](tgt T) uuid.UUID {
		case database.HealthSettings:
		// Artificial ID for auditing purposes
		return typed.ID
		case database.NotificationsSettings:
		// Artificial ID for auditing purposes
		return typed.ID
		case database.OAuth2ProviderApp:
		return typed.ID
		case database.OAuth2ProviderAppSecret:
Expand DownExpand Up		@@ -183,6 +188,8 @@ func ResourceType[T Auditable](tgt T) database.ResourceType {
		return database.ResourceTypeConvertLogin
		case database.HealthSettings:
		return database.ResourceTypeHealthSettings
		case database.NotificationsSettings:
		return database.ResourceTypeNotificationsSettings
		case database.OAuth2ProviderApp:
		return database.ResourceTypeOauth2ProviderApp
		case database.OAuth2ProviderAppSecret:
Expand DownExpand Up		@@ -225,6 +232,9 @@ func ResourceRequiresOrgID[T Auditable]() bool {
		case database.HealthSettings:
		// Artificial ID for auditing purposes
		return false
		case database.NotificationsSettings:
		// Artificial ID for auditing purposes
		return false
		case database.OAuth2ProviderApp:
		return false
		case database.OAuth2ProviderAppSecret:
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1243,6 +1243,11 @@ func New(options Options) API {
		})
		})
		})
		r.Route("/notifications", func(r chi.Router) {
		r.Use(apiKeyMiddleware)
		r.Get("/settings", api.notificationsSettings)
		r.Put("/settings", api.putNotificationsSettings)
		})
		})

		if options.SwaggerEndpoint {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1479,6 +1479,11 @@ func (q *querier) GetNotificationMessagesByStatus(ctx context.Context, arg datab
		return q.db.GetNotificationMessagesByStatus(ctx, arg)
		}

		func (q *querier) GetNotificationsSettings(ctx context.Context) (string, error) {
		// No authz checks
dannykopping marked this conversation as resolved. Show resolvedHide resolved
		return q.db.GetNotificationsSettings(ctx)
		}

		func (q *querier) GetOAuth2ProviderAppByID(ctx context.Context, id uuid.UUID) (database.OAuth2ProviderApp, error) {
		if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceOauth2App); err != nil {
		return database.OAuth2ProviderApp{}, err
Expand DownExpand Up		@@ -3687,6 +3692,13 @@ func (q *querier) UpsertLogoURL(ctx context.Context, value string) error {
		return q.db.UpsertLogoURL(ctx, value)
		}

		func (q *querier) UpsertNotificationsSettings(ctx context.Context, value string) error {
		if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceDeploymentConfig); err != nil {
		return err
		}
		return q.db.UpsertNotificationsSettings(ctx, value)
		}

		func (q *querier) UpsertOAuthSigningKey(ctx context.Context, value string) error {
		if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceSystem); err != nil {
		return err
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2350,6 +2350,12 @@ func (s *MethodTestSuite) TestSystemFunctions() {
		s.Run("UpsertHealthSettings", s.Subtest(func(db database.Store, check *expects) {
		check.Args("foo").Asserts(rbac.ResourceDeploymentConfig, policy.ActionUpdate)
		}))
		s.Run("GetNotificationsSettings", s.Subtest(func(db database.Store, check *expects) {
		check.Args().Asserts()
dannykopping marked this conversation as resolved. Show resolvedHide resolved
		}))
		s.Run("UpsertNotificationsSettings", s.Subtest(func(db database.Store, check *expects) {
		check.Args("foo").Asserts(rbac.ResourceDeploymentConfig, policy.ActionUpdate)
		}))
		s.Run("GetDeploymentWorkspaceAgentStats", s.Subtest(func(db database.Store, check *expects) {
		check.Args(time.Time{}).Asserts()
		}))
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -199,6 +199,7 @@ type data struct {
		lastUpdateCheck []byte
		announcementBanners []byte
		healthSettings []byte
		notificationsSettings []byte
		applicationName string
		logoURL string
		appSecurityKey string
Expand DownExpand Up		@@ -2771,6 +2772,17 @@ func (q *FakeQuerier) GetNotificationMessagesByStatus(_ context.Context, arg dat
		return out, nil
		}

		func (q *FakeQuerier) GetNotificationsSettings(_ context.Context) (string, error) {
		q.mutex.RLock()
		defer q.mutex.RUnlock()

		if q.notificationsSettings == nil {
		return "{}", nil
		}

		return string(q.notificationsSettings), nil
		}

		func (q *FakeQuerier) GetOAuth2ProviderAppByID(_ context.Context, id uuid.UUID) (database.OAuth2ProviderApp, error) {
		q.mutex.Lock()
		defer q.mutex.Unlock()
Expand DownExpand Up		@@ -8668,8 +8680,8 @@ func (q *FakeQuerier) UpsertDefaultProxy(_ context.Context, arg database.UpsertD
		}

		func (q *FakeQuerier) UpsertHealthSettings(_ context.Context, data string) error {
		q.mutex.RLock()
		defer q.mutex.RUnlock()
		q.mutex.Lock()
		defer q.mutex.Unlock()

		q.healthSettings = []byte(data)
		return nil
Expand DownExpand Up		@@ -8717,13 +8729,21 @@ func (q *FakeQuerier) UpsertLastUpdateCheck(_ context.Context, data string) erro
		}

		func (q *FakeQuerier) UpsertLogoURL(_ context.Context, data string) error {
		q.mutex.RLock()
		defer q.mutex.RUnlock()
		q.mutex.Lock()
		defer q.mutex.Unlock()

		q.logoURL = data
		return nil
		}

		func (q *FakeQuerier) UpsertNotificationsSettings(_ context.Context, data string) error {
		q.mutex.Lock()
		defer q.mutex.Unlock()

		q.notificationsSettings = []byte(data)
		return nil
		}

		func (q *FakeQuerier) UpsertOAuthSigningKey(_ context.Context, value string) error {
		q.mutex.Lock()
		defer q.mutex.Unlock()
Expand Down