Skip to content

Commit 580826f

Browse files
committed
Revert "try: Use GetAuthorizedTemplates"
This reverts commit 81146cd.
1 parent 81146cd commit 580826f

File tree

1 file changed

+21
-24
lines changed

1 file changed

+21
-24
lines changed

coderd/database/dbauthz/dbauthz.go

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,18 +1190,17 @@ func (q *querier) GetTemplateDAUs(ctx context.Context, arg database.GetTemplateD
11901190
}
11911191

11921192
func (q *querier) GetTemplateDailyInsights(ctx context.Context, arg database.GetTemplateDailyInsightsParams) ([]database.GetTemplateDailyInsightsRow, error) {
1193-
if len(arg.TemplateIDs) > 0 {
1194-
prep, err := prepareSQLFilter(ctx, q.auth, rbac.ActionUpdate, rbac.ResourceTemplate.Type)
1193+
for _, templateID := range arg.TemplateIDs {
1194+
template, err := q.db.GetTemplateByID(ctx, templateID)
11951195
if err != nil {
1196-
return nil, xerrors.Errorf("(dev error) prepare sql filter: %w", err)
1196+
return nil, err
11971197
}
1198-
_, err = q.db.GetAuthorizedTemplates(ctx, database.GetTemplatesWithFilterParams{
1199-
IDs: arg.TemplateIDs,
1200-
}, prep)
1201-
if err != nil {
1198+
1199+
if err := q.authorizeContext(ctx, rbac.ActionUpdate, template); err != nil {
12021200
return nil, err
12031201
}
1204-
} else {
1202+
}
1203+
if len(arg.TemplateIDs) == 0 {
12051204
if err := q.authorizeContext(ctx, rbac.ActionUpdate, rbac.ResourceTemplate.All()); err != nil {
12061205
return nil, err
12071206
}
@@ -1210,18 +1209,17 @@ func (q *querier) GetTemplateDailyInsights(ctx context.Context, arg database.Get
12101209
}
12111210

12121211
func (q *querier) GetTemplateInsights(ctx context.Context, arg database.GetTemplateInsightsParams) (database.GetTemplateInsightsRow, error) {
1213-
if len(arg.TemplateIDs) > 0 {
1214-
prep, err := prepareSQLFilter(ctx, q.auth, rbac.ActionUpdate, rbac.ResourceTemplate.Type)
1212+
for _, templateID := range arg.TemplateIDs {
1213+
template, err := q.db.GetTemplateByID(ctx, templateID)
12151214
if err != nil {
1216-
return database.GetTemplateInsightsRow{}, xerrors.Errorf("(dev error) prepare sql filter: %w", err)
1215+
return database.GetTemplateInsightsRow{}, err
12171216
}
1218-
_, err = q.db.GetAuthorizedTemplates(ctx, database.GetTemplatesWithFilterParams{
1219-
IDs: arg.TemplateIDs,
1220-
}, prep)
1221-
if err != nil {
1217+
1218+
if err := q.authorizeContext(ctx, rbac.ActionUpdate, template); err != nil {
12221219
return database.GetTemplateInsightsRow{}, err
12231220
}
1224-
} else {
1221+
}
1222+
if len(arg.TemplateIDs) == 0 {
12251223
if err := q.authorizeContext(ctx, rbac.ActionUpdate, rbac.ResourceTemplate.All()); err != nil {
12261224
return database.GetTemplateInsightsRow{}, err
12271225
}
@@ -1230,18 +1228,17 @@ func (q *querier) GetTemplateInsights(ctx context.Context, arg database.GetTempl
12301228
}
12311229

12321230
func (q *querier) GetTemplateParameterInsights(ctx context.Context, arg database.GetTemplateParameterInsightsParams) ([]database.GetTemplateParameterInsightsRow, error) {
1233-
if len(arg.TemplateIDs) > 0 {
1234-
prep, err := prepareSQLFilter(ctx, q.auth, rbac.ActionUpdate, rbac.ResourceTemplate.Type)
1231+
for _, templateID := range arg.TemplateIDs {
1232+
template, err := q.db.GetTemplateByID(ctx, templateID)
12351233
if err != nil {
1236-
return nil, xerrors.Errorf("(dev error) prepare sql filter: %w", err)
1234+
return nil, err
12371235
}
1238-
_, err = q.db.GetAuthorizedTemplates(ctx, database.GetTemplatesWithFilterParams{
1239-
IDs: arg.TemplateIDs,
1240-
}, prep)
1241-
if err != nil {
1236+
1237+
if err := q.authorizeContext(ctx, rbac.ActionUpdate, template); err != nil {
12421238
return nil, err
12431239
}
1244-
} else {
1240+
}
1241+
if len(arg.TemplateIDs) == 0 {
12451242
if err := q.authorizeContext(ctx, rbac.ActionUpdate, rbac.ResourceTemplate.All()); err != nil {
12461243
return nil, err
12471244
}

0 commit comments

Comments
 (0)