Skip to content

Commit c962897

Browse files
EmyrkEmyrk
committed
All insert generic functions use rbac.ActionCreate
1 parent 38a90de commit c962897

File tree

10 files changed

+16
-19
lines changed

10 files changed

+16
-19
lines changed

‎coderd/authzquery/apikey.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ func (q *AuthzQuerier) GetAPIKeysLastUsedAfter(ctx context.Context, lastUsed tim
2727

2828
func (q *AuthzQuerier) InsertAPIKey(ctx context.Context, arg database.InsertAPIKeyParams) (database.APIKey, error) {
2929
return insertWithReturn(q.log, q.auth,
30-
rbac.ActionCreate,
3130
rbac.ResourceAPIKey.WithOwner(arg.UserID.String()),
3231
q.db.InsertAPIKey)(ctx, arg)
3332
}

‎coderd/authzquery/audit.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
)
99

1010
func (q *AuthzQuerier) InsertAuditLog(ctx context.Context, arg database.InsertAuditLogParams) (database.AuditLog, error) {
11-
return insertWithReturn(q.log, q.auth, rbac.ActionCreate, rbac.ResourceAuditLog, q.db.InsertAuditLog)(ctx, arg)
11+
return insertWithReturn(q.log, q.auth, rbac.ResourceAuditLog, q.db.InsertAuditLog)(ctx, arg)
1212
}
1313

1414
func (q *AuthzQuerier) GetAuditLogsOffset(ctx context.Context, arg database.GetAuditLogsOffsetParams) ([]database.GetAuditLogsOffsetRow, error) {

‎coderd/authzquery/authz.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,10 @@ func insert[ArgumentType any,
5959
// Arguments
6060
logger slog.Logger,
6161
authorizer rbac.Authorizer,
62-
action rbac.Action,
6362
object rbac.Objecter,
6463
insertFunc Insert) Insert {
6564
return func(ctx context.Context, arg ArgumentType) error {
66-
_, err := insertWithReturn(logger, authorizer, action, object, func(ctx context.Context, arg ArgumentType) (rbac.Objecter, error) {
65+
_, err := insertWithReturn(logger, authorizer, object, func(ctx context.Context, arg ArgumentType) (rbac.Objecter, error) {
6766
return rbac.Object{}, insertFunc(ctx, arg)
6867
})(ctx, arg)
6968
return err
@@ -75,7 +74,6 @@ func insertWithReturn[ObjectType any, ArgumentType any,
7574
// Arguments
7675
logger slog.Logger,
7776
authorizer rbac.Authorizer,
78-
action rbac.Action,
7977
object rbac.Objecter,
8078
insertFunc Insert) Insert {
8179
return func(ctx context.Context, arg ArgumentType) (empty ObjectType, err error) {
@@ -86,7 +84,7 @@ func insertWithReturn[ObjectType any, ArgumentType any,
8684
}
8785

8886
// Authorize the action
89-
err = authorizer.Authorize(ctx, act, action, object.RBACObject())
87+
err = authorizer.Authorize(ctx, act, rbac.ActionCreate, object.RBACObject())
9088
if err != nil {
9189
return empty, LogNotAuthorizedError(ctx, logger, err)
9290
}

‎coderd/authzquery/file.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ func (q *AuthzQuerier) GetFileByID(ctx context.Context, id uuid.UUID) (database.
1919
}
2020

2121
func (q *AuthzQuerier) InsertFile(ctx context.Context, arg database.InsertFileParams) (database.File, error) {
22-
return insertWithReturn(q.log, q.auth, rbac.ActionCreate, rbac.ResourceFile.WithOwner(arg.CreatedBy.String()), q.db.InsertFile)(ctx, arg)
22+
return insertWithReturn(q.log, q.auth, rbac.ResourceFile.WithOwner(arg.CreatedBy.String()), q.db.InsertFile)(ctx, arg)
2323
}

‎coderd/authzquery/group.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ func (q *AuthzQuerier) GetGroupMembers(ctx context.Context, groupID uuid.UUID) (
5858

5959
func (q *AuthzQuerier) InsertAllUsersGroup(ctx context.Context, organizationID uuid.UUID) (database.Group, error) {
6060
// This method creates a new group.
61-
return insertWithReturn(q.log, q.auth, rbac.ActionCreate, rbac.ResourceGroup.InOrg(organizationID), q.db.InsertAllUsersGroup)(ctx, organizationID)
61+
return insertWithReturn(q.log, q.auth, rbac.ResourceGroup.InOrg(organizationID), q.db.InsertAllUsersGroup)(ctx, organizationID)
6262
}
6363

6464
func (q *AuthzQuerier) InsertGroup(ctx context.Context, arg database.InsertGroupParams) (database.Group, error) {
65-
return insertWithReturn(q.log, q.auth, rbac.ActionCreate, rbac.ResourceGroup.InOrg(arg.OrganizationID), q.db.InsertGroup)(ctx, arg)
65+
return insertWithReturn(q.log, q.auth, rbac.ResourceGroup.InOrg(arg.OrganizationID), q.db.InsertGroup)(ctx, arg)
6666
}
6767

6868
func (q *AuthzQuerier) InsertGroupMember(ctx context.Context, arg database.InsertGroupMemberParams) error {

‎coderd/authzquery/license.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ func (q *AuthzQuerier) GetLicenses(ctx context.Context) ([]database.License, err
1616
}
1717

1818
func (q *AuthzQuerier) InsertLicense(ctx context.Context, arg database.InsertLicenseParams) (database.License, error) {
19-
return insertWithReturn(q.log, q.auth, rbac.ActionCreate, rbac.ResourceLicense, q.db.InsertLicense)(ctx, arg)
19+
return insertWithReturn(q.log, q.auth, rbac.ResourceLicense, q.db.InsertLicense)(ctx, arg)
2020
}
2121

2222
func (q *AuthzQuerier) InsertOrUpdateLogoURL(ctx context.Context, value string) error {
23-
return insert(q.log, q.auth, rbac.ActionUpdate, rbac.ResourceDeploymentConfig, q.db.InsertOrUpdateLogoURL)(ctx, value)
23+
return insert(q.log, q.auth, rbac.ResourceDeploymentConfig, q.db.InsertOrUpdateLogoURL)(ctx, value)
2424
}
2525

2626
func (q *AuthzQuerier) InsertOrUpdateServiceBanner(ctx context.Context, value string) error {
27-
return insert(q.log, q.auth, rbac.ActionUpdate, rbac.ResourceDeploymentConfig, q.db.InsertOrUpdateServiceBanner)(ctx, value)
27+
return insert(q.log, q.auth, rbac.ResourceDeploymentConfig, q.db.InsertOrUpdateServiceBanner)(ctx, value)
2828
}
2929

3030
func (q *AuthzQuerier) GetLicenseByID(ctx context.Context, id int32) (database.License, error) {

‎coderd/authzquery/organization.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func (q *AuthzQuerier) GetOrganizationsByUserID(ctx context.Context, userID uuid
4848
}
4949

5050
func (q *AuthzQuerier) InsertOrganization(ctx context.Context, arg database.InsertOrganizationParams) (database.Organization, error) {
51-
return insertWithReturn(q.log, q.auth, rbac.ActionCreate, rbac.ResourceOrganization, q.db.InsertOrganization)(ctx, arg)
51+
return insertWithReturn(q.log, q.auth, rbac.ResourceOrganization, q.db.InsertOrganization)(ctx, arg)
5252
}
5353

5454
func (q *AuthzQuerier) InsertOrganizationMember(ctx context.Context, arg database.InsertOrganizationMemberParams) (database.OrganizationMember, error) {
@@ -60,7 +60,7 @@ func (q *AuthzQuerier) InsertOrganizationMember(ctx context.Context, arg databas
6060
}
6161

6262
obj := rbac.ResourceOrganizationMember.InOrg(arg.OrganizationID).WithID(arg.UserID)
63-
return insertWithReturn(q.log, q.auth, rbac.ActionCreate, obj, q.db.InsertOrganizationMember)(ctx, arg)
63+
return insertWithReturn(q.log, q.auth, obj, q.db.InsertOrganizationMember)(ctx, arg)
6464
}
6565

6666
func (q *AuthzQuerier) UpdateMemberRoles(ctx context.Context, arg database.UpdateMemberRolesParams) (database.OrganizationMember, error) {

‎coderd/authzquery/template.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ func (q *AuthzQuerier) GetTemplatesWithFilter(ctx context.Context, arg database.
210210

211211
func (q *AuthzQuerier) InsertTemplate(ctx context.Context, arg database.InsertTemplateParams) (database.Template, error) {
212212
obj := rbac.ResourceTemplate.InOrg(arg.OrganizationID)
213-
return insertWithReturn(q.log, q.auth, rbac.ActionCreate, obj, q.db.InsertTemplate)(ctx, arg)
213+
return insertWithReturn(q.log, q.auth, obj, q.db.InsertTemplate)(ctx, arg)
214214
}
215215

216216
func (q *AuthzQuerier) InsertTemplateVersion(ctx context.Context, arg database.InsertTemplateVersionParams) (database.TemplateVersion, error) {

‎coderd/authzquery/user.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func (q *AuthzQuerier) InsertUser(ctx context.Context, arg database.InsertUserPa
104104
return database.User{}, err
105105
}
106106
obj := rbac.ResourceUser
107-
return insertWithReturn(q.log, q.auth, rbac.ActionCreate, obj, q.db.InsertUser)(ctx, arg)
107+
return insertWithReturn(q.log, q.auth, obj, q.db.InsertUser)(ctx, arg)
108108
}
109109

110110
// TODO: Should this be in system.go?
@@ -185,7 +185,7 @@ func (q *AuthzQuerier) GetGitSSHKey(ctx context.Context, userID uuid.UUID) (data
185185
}
186186

187187
func (q *AuthzQuerier) InsertGitSSHKey(ctx context.Context, arg database.InsertGitSSHKeyParams) (database.GitSSHKey, error) {
188-
return insertWithReturn(q.log, q.auth, rbac.ActionCreate, rbac.ResourceUserData.WithOwner(arg.UserID.String()).WithID(arg.UserID), q.db.InsertGitSSHKey)(ctx, arg)
188+
return insertWithReturn(q.log, q.auth, rbac.ResourceUserData.WithOwner(arg.UserID.String()).WithID(arg.UserID), q.db.InsertGitSSHKey)(ctx, arg)
189189
}
190190

191191
func (q *AuthzQuerier) UpdateGitSSHKey(ctx context.Context, arg database.UpdateGitSSHKeyParams) (database.GitSSHKey, error) {
@@ -200,7 +200,7 @@ func (q *AuthzQuerier) GetGitAuthLink(ctx context.Context, arg database.GetGitAu
200200
}
201201

202202
func (q *AuthzQuerier) InsertGitAuthLink(ctx context.Context, arg database.InsertGitAuthLinkParams) (database.GitAuthLink, error) {
203-
return insertWithReturn(q.log, q.auth, rbac.ActionCreate, rbac.ResourceUserData.WithOwner(arg.UserID.String()).WithID(arg.UserID), q.db.InsertGitAuthLink)(ctx, arg)
203+
return insertWithReturn(q.log, q.auth, rbac.ResourceUserData.WithOwner(arg.UserID.String()).WithID(arg.UserID), q.db.InsertGitAuthLink)(ctx, arg)
204204
}
205205

206206
func (q *AuthzQuerier) UpdateGitAuthLink(ctx context.Context, arg database.UpdateGitAuthLinkParams) error {

‎coderd/authzquery/workspace.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ func (q *AuthzQuerier) GetWorkspaceResourcesByJobIDs(ctx context.Context, ids []
304304

305305
func (q *AuthzQuerier) InsertWorkspace(ctx context.Context, arg database.InsertWorkspaceParams) (database.Workspace, error) {
306306
obj := rbac.ResourceWorkspace.WithOwner(arg.OwnerID.String()).InOrg(arg.OrganizationID)
307-
return insertWithReturn(q.log, q.auth, rbac.ActionCreate, obj, q.db.InsertWorkspace)(ctx, arg)
307+
return insertWithReturn(q.log, q.auth, obj, q.db.InsertWorkspace)(ctx, arg)
308308
}
309309

310310
func (q *AuthzQuerier) InsertWorkspaceBuild(ctx context.Context, arg database.InsertWorkspaceBuildParams) (database.WorkspaceBuild, error) {

0 commit comments

Comments
 (0)