- Notifications
You must be signed in to change notification settings - Fork928
feat: Add template-admin + user-admin role for managing templates + users#3490
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
11 commits Select commitHold shift + click to select a range
7ce0b46 feat: Add template-manager role for managing templates site-wide
Emyrke9e4a42 Fix unit tests
Emyrk6309ab8 Add user-admin role
Emyrk30338b4 Protect workspace execution
Emyrk99d6f50 Remove unused perm
Emyrkb91903e Fix unit test
Emyrk21aed8a Add provisioner daemon crud to template admin
Emyrk6791247 Add tooltip to user roles
Emyrk61df361 Make fmt
Emyrkbeea2e0 Update coderd/rbac/builtin_test.go
Emyrkeb0e986 Add authorization check in /turn for users
EmyrkFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
2 changes: 1 addition & 1 deletioncoderd/coderd.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
14 changes: 9 additions & 5 deletionscoderd/coderd_test.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletionscoderd/database/modelmethods.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
53 changes: 45 additions & 8 deletionscoderd/rbac/builtin.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletionscoderd/rbac/builtin_internal_test.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
68 changes: 43 additions & 25 deletionscoderd/rbac/builtin_test.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -111,6 +111,7 @@ func TestRolePermissions(t *testing.T) { | ||
| // currentUser is anything that references "me", "mine", or "my". | ||
| currentUser := uuid.New() | ||
| adminID := uuid.New() | ||
| templateAdminID := uuid.New() | ||
| orgID := uuid.New() | ||
| otherOrg := uuid.New() | ||
| @@ -124,9 +125,12 @@ func TestRolePermissions(t *testing.T) { | ||
| otherOrgMember := authSubject{Name: "org_member_other", UserID: uuid.NewString(), Roles: []string{rbac.RoleMember(), rbac.RoleOrgMember(otherOrg)}} | ||
| otherOrgAdmin := authSubject{Name: "org_admin_other", UserID: uuid.NewString(), Roles: []string{rbac.RoleMember(), rbac.RoleOrgMember(otherOrg), rbac.RoleOrgAdmin(otherOrg)}} | ||
| templateAdmin := authSubject{Name: "template-admin", UserID: templateAdminID.String(), Roles: []string{rbac.RoleMember(), rbac.RoleTemplateAdmin()}} | ||
| userAdmin := authSubject{Name: "user-admin", UserID: templateAdminID.String(), Roles: []string{rbac.RoleMember(), rbac.RoleUserAdmin()}} | ||
| // requiredSubjects are required to be asserted in each test case. This is | ||
| // to make sure one is not forgotten. | ||
| requiredSubjects := []authSubject{memberMe, admin, orgMemberMe, orgAdmin, otherOrgAdmin, otherOrgMember, templateAdmin, userAdmin} | ||
| testCases := []struct { | ||
| // Name the test case to better locate the failing test case. | ||
| @@ -146,7 +150,7 @@ func TestRolePermissions(t *testing.T) { | ||
| Actions: []rbac.Action{rbac.ActionRead}, | ||
| Resource: rbac.ResourceUser, | ||
| AuthorizeMap: map[bool][]authSubject{ | ||
| true: {admin, memberMe, orgMemberMe, orgAdmin, otherOrgMember, otherOrgAdmin, templateAdmin, userAdmin}, | ||
| false: {}, | ||
| }, | ||
| }, | ||
| @@ -155,8 +159,8 @@ func TestRolePermissions(t *testing.T) { | ||
| Actions: []rbac.Action{rbac.ActionCreate, rbac.ActionUpdate, rbac.ActionDelete}, | ||
| Resource: rbac.ResourceUser, | ||
| AuthorizeMap: map[bool][]authSubject{ | ||
| true: {admin, userAdmin}, | ||
| false: {memberMe, orgMemberMe, orgAdmin, otherOrgMember, otherOrgAdmin, templateAdmin}, | ||
| }, | ||
| }, | ||
| { | ||
| @@ -165,44 +169,54 @@ func TestRolePermissions(t *testing.T) { | ||
| Actions: []rbac.Action{rbac.ActionCreate, rbac.ActionRead, rbac.ActionUpdate, rbac.ActionDelete}, | ||
| Resource: rbac.ResourceWorkspace.InOrg(orgID).WithOwner(currentUser.String()), | ||
| AuthorizeMap: map[bool][]authSubject{ | ||
| true: {admin, orgMemberMe, orgAdmin, templateAdmin}, | ||
| false: {memberMe, otherOrgAdmin, otherOrgMember, userAdmin}, | ||
| }, | ||
| }, | ||
| { | ||
| Name: "MyWorkspaceInOrgExecution", | ||
| // When creating the WithID won't be set, but it does not change the result. | ||
| Actions: []rbac.Action{rbac.ActionCreate, rbac.ActionRead, rbac.ActionUpdate, rbac.ActionDelete}, | ||
| Resource: rbac.ResourceWorkspaceExecution.InOrg(orgID).WithOwner(currentUser.String()), | ||
| AuthorizeMap: map[bool][]authSubject{ | ||
| true: {admin, orgAdmin, orgMemberMe}, | ||
| false: {memberMe, otherOrgAdmin, otherOrgMember, templateAdmin, userAdmin}, | ||
Comment on lines +177 to +183 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Workspace execution can only be done by | ||
| }, | ||
| }, | ||
| { | ||
| Name: "Templates", | ||
| Actions: []rbac.Action{rbac.ActionCreate, rbac.ActionUpdate, rbac.ActionDelete}, | ||
| Resource: rbac.ResourceTemplate.InOrg(orgID), | ||
| AuthorizeMap: map[bool][]authSubject{ | ||
| true: {admin, orgAdmin, templateAdmin}, | ||
| false: {memberMe, orgMemberMe, otherOrgAdmin, otherOrgMember, userAdmin}, | ||
| }, | ||
| }, | ||
| { | ||
| Name: "ReadTemplates", | ||
| Actions: []rbac.Action{rbac.ActionRead}, | ||
| Resource: rbac.ResourceTemplate.InOrg(orgID), | ||
| AuthorizeMap: map[bool][]authSubject{ | ||
| true: {admin, orgMemberMe, orgAdmin, templateAdmin}, | ||
| false: {memberMe, otherOrgAdmin, otherOrgMember, userAdmin}, | ||
| }, | ||
| }, | ||
| { | ||
| Name: "Files", | ||
| Actions: []rbac.Action{rbac.ActionCreate}, | ||
| Resource: rbac.ResourceFile, | ||
| AuthorizeMap: map[bool][]authSubject{ | ||
| true: {admin, templateAdmin}, | ||
| false: {orgMemberMe, orgAdmin, memberMe, otherOrgAdmin, otherOrgMember, userAdmin}, | ||
| }, | ||
| }, | ||
| { | ||
| Name: "MyFile", | ||
| Actions: []rbac.Action{rbac.ActionRead, rbac.ActionUpdate, rbac.ActionDelete}, | ||
| Resource: rbac.ResourceFile.WithOwner(currentUser.String()), | ||
| AuthorizeMap: map[bool][]authSubject{ | ||
| true: {admin, memberMe, orgMemberMe, templateAdmin}, | ||
| false: {orgAdmin, otherOrgAdmin, otherOrgMember, userAdmin}, | ||
| }, | ||
| }, | ||
| { | ||
| @@ -211,7 +225,7 @@ func TestRolePermissions(t *testing.T) { | ||
| Resource: rbac.ResourceOrganization, | ||
| AuthorizeMap: map[bool][]authSubject{ | ||
| true: {admin}, | ||
| false: {orgAdmin, otherOrgAdmin, otherOrgMember, memberMe, orgMemberMe, templateAdmin, userAdmin}, | ||
| }, | ||
| }, | ||
| { | ||
| @@ -220,7 +234,7 @@ func TestRolePermissions(t *testing.T) { | ||
| Resource: rbac.ResourceOrganization.InOrg(orgID), | ||
| AuthorizeMap: map[bool][]authSubject{ | ||
| true: {admin, orgAdmin}, | ||
| false: {otherOrgAdmin, otherOrgMember, memberMe, orgMemberMe, templateAdmin, userAdmin}, | ||
| }, | ||
| }, | ||
| { | ||
| @@ -229,7 +243,7 @@ func TestRolePermissions(t *testing.T) { | ||
| Resource: rbac.ResourceOrganization.InOrg(orgID), | ||
| AuthorizeMap: map[bool][]authSubject{ | ||
| true: {admin, orgAdmin, orgMemberMe}, | ||
| false: {otherOrgAdmin, otherOrgMember, memberMe, templateAdmin, userAdmin}, | ||
| }, | ||
| }, | ||
| { | ||
| @@ -238,15 +252,15 @@ func TestRolePermissions(t *testing.T) { | ||
| Resource: rbac.ResourceRoleAssignment, | ||
| AuthorizeMap: map[bool][]authSubject{ | ||
| true: {admin}, | ||
| false: {orgAdmin, orgMemberMe, otherOrgAdmin, otherOrgMember, memberMe, templateAdmin, userAdmin}, | ||
| }, | ||
| }, | ||
| { | ||
| Name: "ReadRoleAssignment", | ||
| Actions: []rbac.Action{rbac.ActionRead}, | ||
| Resource: rbac.ResourceRoleAssignment, | ||
| AuthorizeMap: map[bool][]authSubject{ | ||
| true: {admin, orgAdmin, orgMemberMe, otherOrgAdmin, otherOrgMember, memberMe, templateAdmin, userAdmin}, | ||
| false: {}, | ||
| }, | ||
| }, | ||
| @@ -256,7 +270,7 @@ func TestRolePermissions(t *testing.T) { | ||
| Resource: rbac.ResourceOrgRoleAssignment.InOrg(orgID), | ||
| AuthorizeMap: map[bool][]authSubject{ | ||
| true: {admin, orgAdmin}, | ||
| false: {orgMemberMe, otherOrgAdmin, otherOrgMember, memberMe, templateAdmin, userAdmin}, | ||
| }, | ||
| }, | ||
| { | ||
| @@ -265,7 +279,7 @@ func TestRolePermissions(t *testing.T) { | ||
| Resource: rbac.ResourceOrgRoleAssignment.InOrg(orgID), | ||
| AuthorizeMap: map[bool][]authSubject{ | ||
| true: {admin, orgAdmin, orgMemberMe}, | ||
| false: {otherOrgAdmin, otherOrgMember, memberMe, templateAdmin, userAdmin}, | ||
| }, | ||
| }, | ||
| { | ||
| @@ -274,7 +288,7 @@ func TestRolePermissions(t *testing.T) { | ||
| Resource: rbac.ResourceAPIKey.WithOwner(currentUser.String()), | ||
| AuthorizeMap: map[bool][]authSubject{ | ||
| true: {admin, orgMemberMe, memberMe}, | ||
| false: {orgAdmin, otherOrgAdmin, otherOrgMember, templateAdmin, userAdmin}, | ||
| }, | ||
| }, | ||
| { | ||
| @@ -283,7 +297,7 @@ func TestRolePermissions(t *testing.T) { | ||
| Resource: rbac.ResourceUserData.WithOwner(currentUser.String()), | ||
| AuthorizeMap: map[bool][]authSubject{ | ||
| true: {admin, orgMemberMe, memberMe}, | ||
| false: {orgAdmin, otherOrgAdmin, otherOrgMember, templateAdmin, userAdmin}, | ||
| }, | ||
| }, | ||
| { | ||
| @@ -292,7 +306,7 @@ func TestRolePermissions(t *testing.T) { | ||
| Resource: rbac.ResourceOrganizationMember.InOrg(orgID), | ||
| AuthorizeMap: map[bool][]authSubject{ | ||
| true: {admin, orgAdmin}, | ||
| false: {orgMemberMe, memberMe, otherOrgAdmin, otherOrgMember, templateAdmin, userAdmin}, | ||
| }, | ||
| }, | ||
| { | ||
| @@ -301,7 +315,7 @@ func TestRolePermissions(t *testing.T) { | ||
| Resource: rbac.ResourceOrganizationMember.InOrg(orgID), | ||
| AuthorizeMap: map[bool][]authSubject{ | ||
| true: {admin, orgAdmin, orgMemberMe}, | ||
| false: {memberMe, otherOrgAdmin, otherOrgMember, templateAdmin, userAdmin}, | ||
| }, | ||
| }, | ||
| } | ||
| @@ -396,10 +410,14 @@ func TestListRoles(t *testing.T) { | ||
| // If this test is ever failing, just update the list to the roles | ||
| // expected from the builtin set. | ||
| // Always use constant strings, as if the names change, we need to write | ||
| // a SQL migration to change the name on the backend. | ||
| require.ElementsMatch(t, []string{ | ||
| "admin", | ||
| "member", | ||
| "auditor", | ||
| "template-admin", | ||
| "user-admin", | ||
| }, | ||
| siteRoleNames) | ||
9 changes: 9 additions & 0 deletionscoderd/rbac/object.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.