Skip to content
Merged
2 changes: 2 additions & 0 deletions coderd/apidoc/docs.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions coderd/apidoc/swagger.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions coderd/audit/diff.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ type Auditable interface {
database.UserSecret |
database.Skill |
database.AuditableOrganizationSkill |
database.AuditableChatProjectSkill |
database.ChatInstructionSettings |
database.ChatOperationalSettings |
database.ChatOrganizationSystemPrompt |
Expand Down
8 changes: 8 additions & 0 deletions coderd/audit/request.go
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,8 @@ func ResourceTarget[T Auditable](tgt T) string {
return typed.Name
case database.AuditableOrganizationSkill:
return typed.Name
case database.AuditableChatProjectSkill:
return typed.Name
case database.ChatInstructionSettings:
return typed.Name
case database.ChatOperationalSettings:
Expand Down Expand Up @@ -291,6 +293,8 @@ func ResourceID[T Auditable](tgt T) uuid.UUID {
return typed.ID
case database.AuditableOrganizationSkill:
return typed.ID
case database.AuditableChatProjectSkill:
return typed.ID
case database.ChatInstructionSettings:
// Fixed ID per setting; see ChatInstructionSettings IDs.
return typed.ID
Expand Down Expand Up @@ -386,6 +390,8 @@ func ResourceType[T Auditable](tgt T) database.ResourceType {
return database.ResourceTypeUserSkill
case database.AuditableOrganizationSkill:
return database.ResourceTypeOrganizationSkill
case database.AuditableChatProjectSkill:
return database.ResourceTypeChatProjectSkill
case database.ChatInstructionSettings:
return database.ResourceTypeChatInstructionSettings
case database.ChatOperationalSettings:
Expand Down Expand Up @@ -495,6 +501,8 @@ func ResourceRequiresOrgID[T Auditable]() bool {
return false
case database.AuditableOrganizationSkill:
return true
case database.AuditableChatProjectSkill:
return true
case database.ChatInstructionSettings:
// Deployment settings, not scoped to any organization.
return false
Expand Down
60 changes: 52 additions & 8 deletions coderd/database/dbauthz/dbauthz.go
Original file line number Diff line number Diff line change
Expand Up @@ -1813,11 +1813,9 @@ func (q *querier) authorizeChatProjectMemories(ctx context.Context, action polic
return project, nil
}

// authorizeChatProjectInstructions authorizes an action on a project's
// instructions. Instructions are part of the project's configuration, so
// reading them requires reading the project and changing them requires
// updating the project.
func (q *querier) authorizeChatProjectInstructions(ctx context.Context, action policy.Action, projectID uuid.UUID) error {
// authorizeChatProjectConfig authorizes an action on a project's
// configuration, such as its instructions and skills.
func (q *querier) authorizeChatProjectConfig(ctx context.Context, action policy.Action, projectID uuid.UUID) error {
project, err := q.db.GetChatProjectByID(ctx, projectID)
if err != nil {
return err
Expand Down Expand Up @@ -2366,7 +2364,7 @@ func (q *querier) DeleteChatProjectByID(ctx context.Context, id uuid.UUID) error
}

func (q *querier) DeleteChatProjectInstructionsByProjectID(ctx context.Context, projectID uuid.UUID) error {
if err := q.authorizeChatProjectInstructions(ctx, policy.ActionUpdate, projectID); err != nil {
if err := q.authorizeChatProjectConfig(ctx, policy.ActionUpdate, projectID); err != nil {
return err
}
return q.db.DeleteChatProjectInstructionsByProjectID(ctx, projectID)
Expand Down Expand Up @@ -2677,6 +2675,13 @@ func (q *querier) DeleteOrganizationSkillByOrganizationIDAndName(ctx context.Con
return fetchAndQuery(q.log, q.auth, policy.ActionDelete, fetch, q.db.DeleteOrganizationSkillByOrganizationIDAndName)(ctx, arg)
}

func (q *querier) DeleteProjectSkillByProjectIDAndName(ctx context.Context, arg database.DeleteProjectSkillByProjectIDAndNameParams) (database.Skill, error) {
if err := q.authorizeChatProjectConfig(ctx, policy.ActionUpdate, arg.ProjectID); err != nil {
return database.Skill{}, err
}
return q.db.DeleteProjectSkillByProjectIDAndName(ctx, arg)
}

func (q *querier) DeleteProvisionerKey(ctx context.Context, id uuid.UUID) error {
return deleteQ(q.log, q.auth, q.db.GetProvisionerKeyByID, q.db.DeleteProvisionerKey)(ctx, id)
}
Expand Down Expand Up @@ -3790,7 +3795,7 @@ func (q *querier) GetChatProjectByIDForUpdate(ctx context.Context, id uuid.UUID)
}

func (q *querier) GetChatProjectInstructionsByProjectID(ctx context.Context, projectID uuid.UUID) (database.GetChatProjectInstructionsByProjectIDRow, error) {
if err := q.authorizeChatProjectInstructions(ctx, policy.ActionRead, projectID); err != nil {
if err := q.authorizeChatProjectConfig(ctx, policy.ActionRead, projectID); err != nil {
return database.GetChatProjectInstructionsByProjectIDRow{}, err
}
return q.db.GetChatProjectInstructionsByProjectID(ctx, projectID)
Expand Down Expand Up @@ -4857,6 +4862,24 @@ func (q *querier) GetPreviousTemplateVersion(ctx context.Context, arg database.G
return q.db.GetPreviousTemplateVersion(ctx, arg)
}

func (q *querier) GetProjectSkillByIDForUpdate(ctx context.Context, id uuid.UUID) (database.Skill, error) {
skill, err := q.db.GetProjectSkillByIDForUpdate(ctx, id)
if err != nil {
return database.Skill{}, err
}
if err := q.authorizeChatProjectConfig(ctx, policy.ActionRead, skill.ProjectID.UUID); err != nil {
return database.Skill{}, err
}
return skill, nil
}

func (q *querier) GetProjectSkillByProjectIDAndName(ctx context.Context, arg database.GetProjectSkillByProjectIDAndNameParams) (database.Skill, error) {
if err := q.authorizeChatProjectConfig(ctx, policy.ActionRead, arg.ProjectID); err != nil {
return database.Skill{}, err
}
return q.db.GetProjectSkillByProjectIDAndName(ctx, arg)
}

func (q *querier) GetProvisionerDaemons(ctx context.Context) ([]database.ProvisionerDaemon, error) {
fetch := func(ctx context.Context, _ interface{}) ([]database.ProvisionerDaemon, error) {
return q.db.GetProvisionerDaemons(ctx)
Expand Down Expand Up @@ -6745,6 +6768,13 @@ func (q *querier) InsertPresetPrebuildSchedule(ctx context.Context, arg database
return q.db.InsertPresetPrebuildSchedule(ctx, arg)
}

func (q *querier) InsertProjectSkill(ctx context.Context, arg database.InsertProjectSkillParams) (database.Skill, error) {
if err := q.authorizeChatProjectConfig(ctx, policy.ActionUpdate, arg.ProjectID); err != nil {
return database.Skill{}, err
}
return q.db.InsertProjectSkill(ctx, arg)
}

func (q *querier) InsertProvisionerJob(ctx context.Context, arg database.InsertProvisionerJobParams) (database.ProvisionerJob, error) {
// TODO: Remove this once we have a proper rbac check for provisioner jobs.
// Details in https://github.com/coder/coder/issues/16160
Expand Down Expand Up @@ -7326,6 +7356,13 @@ func (q *querier) ListOrganizationSkillMetadataByOrganizationID(ctx context.Cont
return q.db.GetAuthorizedOrganizationSkillMetadata(ctx, organizationID, prepared)
}

func (q *querier) ListProjectSkillMetadataByProjectID(ctx context.Context, projectID uuid.UUID) ([]database.ListProjectSkillMetadataByProjectIDRow, error) {
if err := q.authorizeChatProjectConfig(ctx, policy.ActionRead, projectID); err != nil {
return nil, err
}
return q.db.ListProjectSkillMetadataByProjectID(ctx, projectID)
}

func (q *querier) ListProvisionerKeysByOrganization(ctx context.Context, organizationID uuid.UUID) ([]database.ProvisionerKey, error) {
return fetchWithPostFilter(q.auth, policy.ActionRead, q.db.ListProvisionerKeysByOrganization)(ctx, organizationID)
}
Expand Down Expand Up @@ -8429,6 +8466,13 @@ func (q *querier) UpdatePresetsLastInvalidatedAt(ctx context.Context, arg databa
return q.db.UpdatePresetsLastInvalidatedAt(ctx, arg)
}

func (q *querier) UpdateProjectSkillByProjectIDAndName(ctx context.Context, arg database.UpdateProjectSkillByProjectIDAndNameParams) (database.Skill, error) {
if err := q.authorizeChatProjectConfig(ctx, policy.ActionUpdate, arg.ProjectID); err != nil {
return database.Skill{}, err
}
return q.db.UpdateProjectSkillByProjectIDAndName(ctx, arg)
}

func (q *querier) UpdateProvisionerDaemonLastSeenAt(ctx context.Context, arg database.UpdateProvisionerDaemonLastSeenAtParams) error {
if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceProvisionerDaemon); err != nil {
return err
Expand Down Expand Up @@ -9546,7 +9590,7 @@ func (q *querier) UpsertChatPlanModeInstructions(ctx context.Context, value stri
}

func (q *querier) UpsertChatProjectInstructions(ctx context.Context, arg database.UpsertChatProjectInstructionsParams) (database.ChatProjectInstruction, error) {
if err := q.authorizeChatProjectInstructions(ctx, policy.ActionUpdate, arg.ProjectID); err != nil {
if err := q.authorizeChatProjectConfig(ctx, policy.ActionUpdate, arg.ProjectID); err != nil {
return database.ChatProjectInstruction{}, err
}
return q.db.UpsertChatProjectInstructions(ctx, arg)
Expand Down
62 changes: 62 additions & 0 deletions coderd/database/dbauthz/dbauthz_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7157,6 +7157,68 @@ func (s *MethodTestSuite) TestOrganizationSkills() {
}))
}

func (s *MethodTestSuite) TestProjectSkills() {
projectSkill := func(projectID uuid.UUID, name string) database.Skill {
return database.Skill{
ID: uuid.New(),
ProjectID: uuid.NullUUID{UUID: projectID, Valid: true},
Name: name,
}
}
s.Run("InsertProjectSkill", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
project := testutil.Fake(s.T(), faker, database.ChatProject{})
arg := database.InsertProjectSkillParams{ID: uuid.New(), ProjectID: project.ID, Name: "test"}
skill := projectSkill(project.ID, arg.Name)
dbm.EXPECT().GetChatProjectByID(gomock.Any(), project.ID).Return(project, nil).AnyTimes()
dbm.EXPECT().InsertProjectSkill(gomock.Any(), arg).Return(skill, nil).AnyTimes()
check.Args(arg).Asserts(project, policy.ActionUpdate).Returns(skill)
}))
s.Run("GetProjectSkillByProjectIDAndName", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
project := testutil.Fake(s.T(), faker, database.ChatProject{})
arg := database.GetProjectSkillByProjectIDAndNameParams{ProjectID: project.ID, Name: "test"}
skill := projectSkill(project.ID, arg.Name)
dbm.EXPECT().GetChatProjectByID(gomock.Any(), project.ID).Return(project, nil).AnyTimes()
dbm.EXPECT().GetProjectSkillByProjectIDAndName(gomock.Any(), arg).Return(skill, nil).AnyTimes()
check.Args(arg).Asserts(project, policy.ActionRead).Returns(skill)
}))
s.Run("ListProjectSkillMetadataByProjectID", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
project := testutil.Fake(s.T(), faker, database.ChatProject{})
rows := []database.ListProjectSkillMetadataByProjectIDRow{
testutil.Fake(s.T(), faker, database.ListProjectSkillMetadataByProjectIDRow{ProjectID: uuid.NullUUID{UUID: project.ID, Valid: true}}),
}
dbm.EXPECT().GetChatProjectByID(gomock.Any(), project.ID).Return(project, nil).AnyTimes()
dbm.EXPECT().ListProjectSkillMetadataByProjectID(gomock.Any(), project.ID).Return(rows, nil).AnyTimes()
check.Args(project.ID).Asserts(project, policy.ActionRead).Returns(rows)
}))
s.Run("UpdateProjectSkillByProjectIDAndName", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
project := testutil.Fake(s.T(), faker, database.ChatProject{})
arg := database.UpdateProjectSkillByProjectIDAndNameParams{
ProjectID: project.ID,
Name: "test",
Enabled: sql.NullBool{Bool: false, Valid: true},
}
updated := projectSkill(project.ID, arg.Name)
dbm.EXPECT().GetChatProjectByID(gomock.Any(), project.ID).Return(project, nil).AnyTimes()
dbm.EXPECT().UpdateProjectSkillByProjectIDAndName(gomock.Any(), arg).Return(updated, nil).AnyTimes()
check.Args(arg).Asserts(project, policy.ActionUpdate).Returns(updated)
}))
s.Run("DeleteProjectSkillByProjectIDAndName", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
project := testutil.Fake(s.T(), faker, database.ChatProject{})
arg := database.DeleteProjectSkillByProjectIDAndNameParams{ProjectID: project.ID, Name: "test"}
skill := projectSkill(project.ID, arg.Name)
dbm.EXPECT().GetChatProjectByID(gomock.Any(), project.ID).Return(project, nil).AnyTimes()
dbm.EXPECT().DeleteProjectSkillByProjectIDAndName(gomock.Any(), arg).Return(skill, nil).AnyTimes()
check.Args(arg).Asserts(project, policy.ActionUpdate).Returns(skill)
}))
s.Run("GetProjectSkillByIDForUpdate", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
project := testutil.Fake(s.T(), faker, database.ChatProject{})
skill := projectSkill(project.ID, "test")
dbm.EXPECT().GetProjectSkillByIDForUpdate(gomock.Any(), skill.ID).Return(skill, nil).AnyTimes()
dbm.EXPECT().GetChatProjectByID(gomock.Any(), project.ID).Return(project, nil).AnyTimes()
check.Args(skill.ID).Asserts(project, policy.ActionRead).Returns(skill)
}))
}

func (s *MethodTestSuite) TestUsageEvents() {
s.Run("InsertUsageEvent", s.Mocked(func(db *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
params := database.InsertUsageEventParams{
Expand Down
48 changes: 48 additions & 0 deletions coderd/database/dbmetrics/querymetrics.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading