Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit635218d

Browse files
committed
removed the 'InOrg' check for provisioner jobs
1 parent4351529 commit635218d

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2316,15 +2316,9 @@ func (q *querier) GetProvisionerJobTimingsByJobID(ctx context.Context, jobID uui
23162316
}
23172317

23182318
func (q*querier)GetProvisionerJobsByIDs(ctx context.Context,ids []uuid.UUID) ([]database.ProvisionerJob,error) {
2319-
provisionerJobs,err:=q.db.GetProvisionerJobsByIDs(ctx,ids)
2320-
iferr!=nil {
2319+
iferr:=q.authorizeContext(ctx,policy.ActionRead,rbac.ResourceProvisionerJobs);err!=nil {
23212320
returnnil,err
23222321
}
2323-
for_,job:=rangeprovisionerJobs {
2324-
iferr:=q.authorizeContext(ctx,policy.ActionRead,rbac.ResourceProvisionerJobs.InOrg(job.OrganizationID));err!=nil {
2325-
returnnil,err
2326-
}
2327-
}
23282322
returnq.db.GetProvisionerJobsByIDs(ctx,ids)
23292323
}
23302324

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ func (s *MethodTestSuite) TestProvisionerJob() {
698698
a:=dbgen.ProvisionerJob(s.T(),db,nil, database.ProvisionerJob{OrganizationID:orgID})
699699
b:=dbgen.ProvisionerJob(s.T(),db,nil, database.ProvisionerJob{OrganizationID:orgID})
700700
check.Args([]uuid.UUID{a.ID,b.ID}).
701-
Asserts(rbac.ResourceProvisionerJobs.InOrg(orgID),policy.ActionRead,rbac.ResourceProvisionerJobs.InOrg(orgID),policy.ActionRead).
701+
Asserts(rbac.ResourceProvisionerJobs,policy.ActionRead).
702702
Returns(slice.New(a,b))
703703
}))
704704
s.Run("GetProvisionerLogsAfterID",s.Subtest(func(db database.Store,check*expects) {
@@ -3982,7 +3982,7 @@ func (s *MethodTestSuite) TestSystemFunctions() {
39823982
a:=dbgen.ProvisionerJob(s.T(),db,nil, database.ProvisionerJob{OrganizationID:orgID})
39833983
b:=dbgen.ProvisionerJob(s.T(),db,nil, database.ProvisionerJob{OrganizationID:orgID})
39843984
check.Args([]uuid.UUID{a.ID,b.ID}).
3985-
Asserts(rbac.ResourceProvisionerJobs.InOrg(orgID),policy.ActionRead,rbac.ResourceProvisionerJobs.InOrg(orgID),policy.ActionRead).
3985+
Asserts(rbac.ResourceProvisionerJobs,policy.ActionRead).
39863986
Returns(slice.New(a,b))
39873987
}))
39883988
s.Run("InsertWorkspaceAgent",s.Subtest(func(db database.Store,check*expects) {
@@ -4283,7 +4283,7 @@ func (s *MethodTestSuite) TestSystemFunctions() {
42834283
check.Args([]uuid.UUID{uuid.New()}).Asserts(rbac.ResourceSystem,policy.ActionRead)
42844284
}))
42854285
s.Run("GetProvisionerJobsByIDsWithQueuePosition",s.Subtest(func(db database.Store,check*expects) {
4286-
check.Args([]uuid.UUID{}).Asserts(/* rbac.ResourceProvisionerJobs.InOrg(orgID), policy.ActionRead */)
4286+
check.Args([]uuid.UUID{}).Asserts()
42874287
}))
42884288
s.Run("GetReplicaByID",s.Subtest(func(db database.Store,check*expects) {
42894289
check.Args(uuid.New()).Asserts(rbac.ResourceSystem,policy.ActionRead).Errors(sql.ErrNoRows)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp