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

Commitfc96bef

Browse files
committed
feat!: require new Share action for workspace ACL actions
1 parent9b3f94e commitfc96bef

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

‎coderd/database/dbauthz/dbauthz.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1789,7 +1789,7 @@ func (q *querier) DeleteWorkspaceACLByID(ctx context.Context, id uuid.UUID) erro
17891789
returnw.WorkspaceTable(),nil
17901790
}
17911791

1792-
returnfetchAndExec(q.log,q.auth,policy.ActionUpdate,fetch,q.db.DeleteWorkspaceACLByID)(ctx,id)
1792+
returnfetchAndExec(q.log,q.auth,policy.ActionShare,fetch,q.db.DeleteWorkspaceACLByID)(ctx,id)
17931793
}
17941794

17951795
func (q*querier)DeleteWorkspaceAgentPortShare(ctx context.Context,arg database.DeleteWorkspaceAgentPortShareParams)error {
@@ -3377,7 +3377,7 @@ func (q *querier) GetWorkspaceACLByID(ctx context.Context, id uuid.UUID) (databa
33773377
iferr!=nil {
33783378
return database.GetWorkspaceACLByIDRow{},err
33793379
}
3380-
iferr:=q.authorizeContext(ctx,policy.ActionCreate,workspace);err!=nil {
3380+
iferr:=q.authorizeContext(ctx,policy.ActionShare,workspace);err!=nil {
33813381
return database.GetWorkspaceACLByIDRow{},err
33823382
}
33833383
returnq.db.GetWorkspaceACLByID(ctx,id)
@@ -5271,7 +5271,7 @@ func (q *querier) UpdateWorkspaceACLByID(ctx context.Context, arg database.Updat
52715271
returnw.WorkspaceTable(),nil
52725272
}
52735273

5274-
returnfetchAndExec(q.log,q.auth,policy.ActionCreate,fetch,q.db.UpdateWorkspaceACLByID)(ctx,arg)
5274+
returnfetchAndExec(q.log,q.auth,policy.ActionShare,fetch,q.db.UpdateWorkspaceACLByID)(ctx,arg)
52755275
}
52765276

52775277
func (q*querier)UpdateWorkspaceAgentConnectionByID(ctx context.Context,arg database.UpdateWorkspaceAgentConnectionByIDParams)error {

‎coderd/database/dbauthz/dbauthz_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1690,20 +1690,20 @@ func (s *MethodTestSuite) TestWorkspace() {
16901690
ws:=testutil.Fake(s.T(),faker, database.Workspace{})
16911691
dbM.EXPECT().GetWorkspaceByID(gomock.Any(),ws.ID).Return(ws,nil).AnyTimes()
16921692
dbM.EXPECT().GetWorkspaceACLByID(gomock.Any(),ws.ID).Return(database.GetWorkspaceACLByIDRow{},nil).AnyTimes()
1693-
check.Args(ws.ID).Asserts(ws,policy.ActionCreate)
1693+
check.Args(ws.ID).Asserts(ws,policy.ActionShare)
16941694
}))
16951695
s.Run("UpdateWorkspaceACLByID",s.Mocked(func(dbm*dbmock.MockStore,faker*gofakeit.Faker,check*expects) {
16961696
w:=testutil.Fake(s.T(),faker, database.Workspace{})
16971697
arg:= database.UpdateWorkspaceACLByIDParams{ID:w.ID}
16981698
dbm.EXPECT().GetWorkspaceByID(gomock.Any(),w.ID).Return(w,nil).AnyTimes()
16991699
dbm.EXPECT().UpdateWorkspaceACLByID(gomock.Any(),arg).Return(nil).AnyTimes()
1700-
check.Args(arg).Asserts(w,policy.ActionCreate)
1700+
check.Args(arg).Asserts(w,policy.ActionShare)
17011701
}))
17021702
s.Run("DeleteWorkspaceACLByID",s.Mocked(func(dbm*dbmock.MockStore,faker*gofakeit.Faker,check*expects) {
17031703
w:=testutil.Fake(s.T(),faker, database.Workspace{})
17041704
dbm.EXPECT().GetWorkspaceByID(gomock.Any(),w.ID).Return(w,nil).AnyTimes()
17051705
dbm.EXPECT().DeleteWorkspaceACLByID(gomock.Any(),w.ID).Return(nil).AnyTimes()
1706-
check.Args(w.ID).Asserts(w,policy.ActionUpdate)
1706+
check.Args(w.ID).Asserts(w,policy.ActionShare)
17071707
}))
17081708
s.Run("GetLatestWorkspaceBuildByWorkspaceID",s.Mocked(func(dbm*dbmock.MockStore,faker*gofakeit.Faker,check*expects) {
17091709
w:=testutil.Fake(s.T(),faker, database.Workspace{})

0 commit comments

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