Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions coderd/audit/diff.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ type Auditable interface {
database.ChatProject |
database.ChatProjectMemory |
database.AuditableChatProjectInstructions |
database.AuditableChatProjectTemplates |
database.ChatModelConfig |
database.MCPServerConfig |
database.AuditableGroupAIBudget |
Expand Down
9 changes: 9 additions & 0 deletions coderd/audit/request.go
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ func ResourceTarget[T Auditable](tgt T) string {
return typed.Name
case database.AuditableChatProjectInstructions:
return typed.ProjectName
case database.AuditableChatProjectTemplates:
return typed.ProjectName
case database.ChatModelConfig:
return cmp.Or(typed.DisplayName, typed.ID.String())
case database.MCPServerConfig:
Expand Down Expand Up @@ -283,6 +285,8 @@ func ResourceID[T Auditable](tgt T) uuid.UUID {
case database.AuditableChatProjectInstructions:
// One row per project, keyed by the project.
return typed.ProjectID
case database.AuditableChatProjectTemplates:
return typed.ProjectID
case database.ChatModelConfig:
return typed.ID
case database.MCPServerConfig:
Expand Down Expand Up @@ -380,6 +384,9 @@ func ResourceType[T Auditable](tgt T) database.ResourceType {
return database.ResourceTypeChatProjectMemory
case database.AuditableChatProjectInstructions:
return database.ResourceTypeChatProjectInstructions
case database.AuditableChatProjectTemplates:
// Attachments are part of the project, so they share its type.
return database.ResourceTypeChatProject
case database.ChatModelConfig:
return database.ResourceTypeChatModelConfig
case database.MCPServerConfig:
Expand Down Expand Up @@ -488,6 +495,8 @@ func ResourceRequiresOrgID[T Auditable]() bool {
return true
case database.AuditableChatProjectInstructions:
return true
case database.AuditableChatProjectTemplates:
return true
case database.ChatModelConfig:
return true
case database.MCPServerConfig:
Expand Down
13 changes: 13 additions & 0 deletions coderd/chat_projects.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"unicode/utf8"

"github.com/google/uuid"
"github.com/sqlc-dev/pqtype"
"golang.org/x/xerrors"

"github.com/coder/coder/v2/coderd/audit"
Expand Down Expand Up @@ -120,6 +121,11 @@ func (api *API) postChatProject(rw http.ResponseWriter, r *http.Request) {
Name: req.Name,
Description: req.Description,
Icon: req.Icon,

LimitTemplates: false,
DefaultTemplateID: uuid.NullUUID{},
DefaultTemplateVersionPresetID: uuid.NullUUID{},
DefaultParameters: pqtype.NullRawMessage{},
})
return err
}, nil)
Expand Down Expand Up @@ -217,6 +223,13 @@ func (api *API) patchChatProject(rw http.ResponseWriter, r *http.Request) {
Name: name,
Description: description,
Icon: icon,

// The template settings are left as they are.
LimitTemplates: sql.NullBool{},
UpdateDefaultTemplate: false,
DefaultTemplateID: uuid.NullUUID{},
DefaultTemplateVersionPresetID: uuid.NullUUID{},
DefaultParameters: pqtype.NullRawMessage{},
})
if err != nil {
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
Expand Down
1 change: 1 addition & 0 deletions coderd/database/check_constraint.go

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

42 changes: 42 additions & 0 deletions coderd/database/dbauthz/dbauthz.go
Original file line number Diff line number Diff line change
Expand Up @@ -2389,6 +2389,22 @@ func (q *querier) DeleteChatProjectMemoryByName(ctx context.Context, arg databas
return q.db.DeleteChatProjectMemoryByName(ctx, arg)
}

// DeleteChatProjectTemplate requires read on the template as well as update
// on the project, so an actor cannot detach a template they cannot see.
func (q *querier) DeleteChatProjectTemplate(ctx context.Context, arg database.DeleteChatProjectTemplateParams) (database.ChatProjectTemplate, error) {
if err := q.authorizeChatProjectConfig(ctx, policy.ActionUpdate, arg.ProjectID); err != nil {
return database.ChatProjectTemplate{}, err
}
template, err := q.db.GetTemplateByID(ctx, arg.TemplateID)
if err != nil {
return database.ChatProjectTemplate{}, err
}
if err := q.authorizeContext(ctx, policy.ActionRead, template); err != nil {
return database.ChatProjectTemplate{}, err
}
return q.db.DeleteChatProjectTemplate(ctx, arg)
}

func (q *querier) DeleteChatQueuedMessageReturningCount(ctx context.Context, arg database.DeleteChatQueuedMessageReturningCountParams) (int64, error) {
chat, err := q.db.GetChatByID(ctx, arg.ChatID)
if err != nil {
Expand Down Expand Up @@ -3850,6 +3866,13 @@ func (q *querier) GetChatProjectMemoryByName(ctx context.Context, arg database.G
return row, nil
}

// GetChatProjectTemplatesByProjectIDs authorizes each attachment through its
// project. It does not check the attached templates, so callers must not
// expose a template the actor cannot read.
func (q *querier) GetChatProjectTemplatesByProjectIDs(ctx context.Context, projectIDs []uuid.UUID) ([]database.GetChatProjectTemplatesByProjectIDsRow, error) {
return fetchWithPostFilter(q.auth, policy.ActionRead, q.db.GetChatProjectTemplatesByProjectIDs)(ctx, projectIDs)
}

func (q *querier) GetChatProjectsOwnedOrSharedWithUserID(ctx context.Context, userID uuid.UUID) ([]database.ChatProject, error) {
return fetchWithPostFilter(q.auth, policy.ActionRead, q.db.GetChatProjectsOwnedOrSharedWithUserID)(ctx, userID)
}
Expand Down Expand Up @@ -6602,6 +6625,25 @@ func (q *querier) InsertChatProjectMemory(ctx context.Context, arg database.Inse
return q.db.InsertChatProjectMemory(ctx, arg)
}

// InsertChatProjectTemplates requires use on every template as well as
// update on the project, so attaching can never reach a template the actor
// cannot use.
func (q *querier) InsertChatProjectTemplates(ctx context.Context, arg database.InsertChatProjectTemplatesParams) ([]database.ChatProjectTemplate, error) {
if err := q.authorizeChatProjectConfig(ctx, policy.ActionUpdate, arg.ProjectID); err != nil {
return nil, err
}
for _, templateID := range arg.TemplateIDs {
template, err := q.db.GetTemplateByID(ctx, templateID)
if err != nil {
return nil, err
}
if err := q.authorizeContext(ctx, policy.ActionUse, template); err != nil {
return nil, err
}
}
return q.db.InsertChatProjectTemplates(ctx, arg)
}

func (q *querier) InsertChatQueuedMessageWithCreator(ctx context.Context, arg database.InsertChatQueuedMessageWithCreatorParams) (database.ChatQueuedMessage, error) {
chat, err := q.db.GetChatByID(ctx, arg.ChatID)
if err != nil {
Expand Down
29 changes: 29 additions & 0 deletions coderd/database/dbauthz/dbauthz_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1409,6 +1409,35 @@ func (s *MethodTestSuite) TestChats() {
dbm.EXPECT().GetChatProjectByID(gomock.Any(), project.ID).Return(project, nil).AnyTimes()
check.Args(project.ID).Asserts(project, policy.ActionRead).Returns(project)
}))
s.Run("GetChatProjectTemplatesByProjectIDs", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
project := testutil.Fake(s.T(), faker, database.ChatProject{})
rows := []database.GetChatProjectTemplatesByProjectIDsRow{{
ChatProjectTemplate: testutil.Fake(s.T(), faker, database.ChatProjectTemplate{ProjectID: project.ID}),
ChatProject: project,
}}
dbm.EXPECT().GetChatProjectTemplatesByProjectIDs(gomock.Any(), []uuid.UUID{project.ID}).Return(rows, nil).AnyTimes()
check.Args([]uuid.UUID{project.ID}).Asserts(project, policy.ActionRead).Returns(rows)
}))
s.Run("InsertChatProjectTemplates", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
project := testutil.Fake(s.T(), faker, database.ChatProject{})
template := testutil.Fake(s.T(), faker, database.Template{})
arg := database.InsertChatProjectTemplatesParams{ProjectID: project.ID, TemplateIDs: []uuid.UUID{template.ID}, CreatedBy: uuid.New()}
rows := []database.ChatProjectTemplate{{ProjectID: project.ID, TemplateID: template.ID, CreatedBy: arg.CreatedBy}}
dbm.EXPECT().GetChatProjectByID(gomock.Any(), project.ID).Return(project, nil).AnyTimes()
dbm.EXPECT().GetTemplateByID(gomock.Any(), template.ID).Return(template, nil).AnyTimes()
dbm.EXPECT().InsertChatProjectTemplates(gomock.Any(), arg).Return(rows, nil).AnyTimes()
check.Args(arg).Asserts(project, policy.ActionUpdate, template, policy.ActionUse).Returns(rows)
}))
s.Run("DeleteChatProjectTemplate", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
project := testutil.Fake(s.T(), faker, database.ChatProject{})
template := testutil.Fake(s.T(), faker, database.Template{})
arg := database.DeleteChatProjectTemplateParams{ProjectID: project.ID, TemplateID: template.ID}
row := database.ChatProjectTemplate{ProjectID: project.ID, TemplateID: template.ID}
dbm.EXPECT().GetChatProjectByID(gomock.Any(), project.ID).Return(project, nil).AnyTimes()
dbm.EXPECT().GetTemplateByID(gomock.Any(), template.ID).Return(template, nil).AnyTimes()
dbm.EXPECT().DeleteChatProjectTemplate(gomock.Any(), arg).Return(row, nil).AnyTimes()
check.Args(arg).Asserts(project, policy.ActionUpdate, template, policy.ActionRead).Returns(row)
}))
s.Run("GetChatProjectInstructionsByProjectID", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
project := testutil.Fake(s.T(), faker, database.ChatProject{})
row := database.GetChatProjectInstructionsByProjectIDRow{
Expand Down
19 changes: 19 additions & 0 deletions coderd/database/dbgen/dbgen.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,30 @@ func ChatProject(t testing.TB, db database.Store, seed database.ChatProject) dat
Name: takeFirst(seed.Name, testutil.GetRandomName(t)),
Description: seed.Description,
Icon: seed.Icon,

LimitTemplates: seed.LimitTemplates,
DefaultTemplateID: seed.DefaultTemplateID,
DefaultTemplateVersionPresetID: seed.DefaultTemplateVersionPresetID,
DefaultParameters: pqtype.NullRawMessage{RawMessage: seed.DefaultParameters, Valid: len(seed.DefaultParameters) > 0},
})
require.NoError(t, err, "insert chat project")
return project
}

// ChatProjectTemplate attaches a template to a chat project.
func ChatProjectTemplate(t testing.TB, db database.Store, seed database.ChatProjectTemplate) database.ChatProjectTemplate {
t.Helper()

attached, err := db.InsertChatProjectTemplates(genCtx, database.InsertChatProjectTemplatesParams{
ProjectID: seed.ProjectID,
TemplateIDs: []uuid.UUID{seed.TemplateID},
CreatedBy: takeFirst(seed.CreatedBy, uuid.New()),
})
require.NoError(t, err, "attach chat project template")
require.Len(t, attached, 1, "template was already attached or is outside the project's organization")
return attached[0]
}

func ChatProjectMemory(t testing.TB, db database.Store, seed database.ChatProjectMemory) database.ChatProjectMemory {
t.Helper()

Expand Down
24 changes: 24 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.

45 changes: 45 additions & 0 deletions coderd/database/dbmock/dbmock.go

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

Loading
Loading