Skip to content

Commit c6fcc64

Browse files
authored
fix: add org role read permissions to site wide template admins and auditors (#16733)
resolves coder/internal#388 Since site-wide admins and auditors are able to access the members page of any org, they should have read access to org roles
1 parent b7ea479 commit c6fcc64

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

coderd/rbac/roles.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,8 @@ func ReloadBuiltinRoles(opts *RoleOptions) {
298298
Identifier: RoleAuditor(),
299299
DisplayName: "Auditor",
300300
Site: Permissions(map[string][]policy.Action{
301-
ResourceAuditLog.Type: {policy.ActionRead},
301+
ResourceAssignOrgRole.Type: {policy.ActionRead},
302+
ResourceAuditLog.Type: {policy.ActionRead},
302303
// Allow auditors to see the resources that audit logs reflect.
303304
ResourceTemplate.Type: {policy.ActionRead, policy.ActionViewInsights},
304305
ResourceUser.Type: {policy.ActionRead},
@@ -318,7 +319,8 @@ func ReloadBuiltinRoles(opts *RoleOptions) {
318319
Identifier: RoleTemplateAdmin(),
319320
DisplayName: "Template Admin",
320321
Site: Permissions(map[string][]policy.Action{
321-
ResourceTemplate.Type: ResourceTemplate.AvailableActions(),
322+
ResourceAssignOrgRole.Type: {policy.ActionRead},
323+
ResourceTemplate.Type: ResourceTemplate.AvailableActions(),
322324
// CRUD all files, even those they did not upload.
323325
ResourceFile.Type: {policy.ActionCreate, policy.ActionRead},
324326
ResourceWorkspace.Type: {policy.ActionRead},

coderd/rbac/roles_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,8 @@ func TestRolePermissions(t *testing.T) {
341341
Actions: []policy.Action{policy.ActionRead},
342342
Resource: rbac.ResourceAssignOrgRole.InOrg(orgID),
343343
AuthorizeMap: map[bool][]hasAuthSubjects{
344-
true: {owner, setOrgNotMe, orgMemberMe, userAdmin},
345-
false: {setOtherOrg, memberMe, templateAdmin},
344+
true: {owner, setOrgNotMe, orgMemberMe, userAdmin, templateAdmin},
345+
false: {setOtherOrg, memberMe},
346346
},
347347
},
348348
{

0 commit comments

Comments
 (0)