- Notifications
You must be signed in to change notification settings - Fork928
feat: Add rbac to templateversion+orgmember endpoints#1713
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
10 commits Select commitHold shift + click to select a range
a96a5ba feat: Add rbac to templateversion endpoints
Emyrk99d4073 feat: Rbac workspace resources
Emyrkf86484e feat: Rbac on assign organization roles
Emyrk65ccc98 Golangci-lint
Emyrk3f4888b Fix setting org member roles
Emyrkd7f29a6 Make new resource for org roles
Emyrkeb7ffd4 fixup! Make new resource for org roles
Emyrk24430ff Merge remote-tracking branch 'origin/main' into stevenmasley/rbac_tem…
Emyrk5646b7b remove unused const
Emyrk4ee5eca Add doc comment to ChangeRoleSet
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
3 changes: 3 additions & 0 deletionscoderd/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
95 changes: 74 additions & 21 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
3 changes: 1 addition & 2 deletionscoderd/coderdtest/coderdtest.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
5 changes: 5 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
23 changes: 17 additions & 6 deletionscoderd/httpmw/organizationparam.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 |
|---|---|---|
| @@ -28,12 +28,12 @@ func OrganizationParam(r *http.Request) database.Organization { | ||
| funcOrganizationMemberParam(r*http.Request) database.OrganizationMember { | ||
| organizationMember,ok:=r.Context().Value(organizationMemberParamContextKey{}).(database.OrganizationMember) | ||
| if!ok { | ||
| panic("developer error: organizationmemberparam middleware not provided") | ||
| } | ||
| returnorganizationMember | ||
| } | ||
| // ExtractOrganizationParam grabs an organization from the "organization" URL parameter. | ||
| // This middleware requires the API key middleware higher in the call stack for authentication. | ||
| funcExtractOrganizationParam(db database.Store)func(http.Handler) http.Handler { | ||
| returnfunc(next http.Handler) http.Handler { | ||
| @@ -56,11 +56,23 @@ func ExtractOrganizationParam(db database.Store) func(http.Handler) http.Handler | ||
| }) | ||
| return | ||
| } | ||
| ctx:=context.WithValue(r.Context(),organizationParamContextKey{},organization) | ||
| next.ServeHTTP(rw,r.WithContext(ctx)) | ||
| }) | ||
| } | ||
| } | ||
| // ExtractOrganizationMemberParam grabs a user membership from the "organization" and "user" URL parameter. | ||
| // This middleware requires the ExtractUser and ExtractOrganization middleware higher in the stack | ||
| funcExtractOrganizationMemberParam(db database.Store)func(http.Handler) http.Handler { | ||
Comment on lines +65 to +67 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. Before So I changed this to use the user from | ||
| returnfunc(next http.Handler) http.Handler { | ||
| returnhttp.HandlerFunc(func(rw http.ResponseWriter,r*http.Request) { | ||
| organization:=OrganizationParam(r) | ||
| user:=UserParam(r) | ||
| organizationMember,err:=db.GetOrganizationMemberByUserID(r.Context(), database.GetOrganizationMemberByUserIDParams{ | ||
| OrganizationID:organization.ID, | ||
| UserID:user.ID, | ||
| }) | ||
| iferrors.Is(err,sql.ErrNoRows) { | ||
| httpapi.Write(rw,http.StatusForbidden, httpapi.Response{ | ||
| @@ -74,9 +86,8 @@ func ExtractOrganizationParam(db database.Store) func(http.Handler) http.Handler | ||
| }) | ||
| return | ||
| } | ||
| ctx:=context.WithValue(r.Context(),organizationMemberParamContextKey{},organizationMember) | ||
| next.ServeHTTP(rw,r.WithContext(ctx)) | ||
| }) | ||
| } | ||
8 changes: 7 additions & 1 deletioncoderd/httpmw/organizationparam_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
28 changes: 15 additions & 13 deletionscoderd/members.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
1 change: 1 addition & 0 deletionscoderd/rbac/authz.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 |
|---|---|---|
| @@ -3,6 +3,7 @@ package rbac | ||
| import ( | ||
| "context" | ||
| _ "embed" | ||
| "golang.org/x/xerrors" | ||
| "github.com/open-policy-agent/opa/rego" | ||
37 changes: 37 additions & 0 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -135,6 +135,12 @@ var ( | ||
| Action: ActionRead, | ||
| ResourceID: "*", | ||
| }, | ||
| { | ||
| // Can read available roles. | ||
| ResourceType: ResourceOrgRoleAssignment.Type, | ||
| ResourceID: "*", | ||
| Action: ActionRead, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| @@ -217,6 +223,37 @@ func SiteRoles() []Role { | ||
| return roles | ||
| } | ||
| // ChangeRoleSet is a helper function that finds the difference of 2 sets of | ||
| // roles. When setting a user's new roles, it is equivalent to adding and | ||
| // removing roles. This set determines the changes, so that the appropriate | ||
| // RBAC checks can be applied using "ActionCreate" and "ActionDelete" for | ||
| // "added" and "removed" roles respectively. | ||
| func ChangeRoleSet(from []string, to []string) (added []string, removed []string) { | ||
Emyrk marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| has := make(map[string]struct{}) | ||
| for _, exists := range from { | ||
| has[exists] = struct{}{} | ||
| } | ||
| for _, roleName := range to { | ||
| // If the user already has the role assigned, we don't need to check the permission | ||
| // to reassign it. Only run permission checks on the difference in the set of | ||
| // roles. | ||
| if _, ok := has[roleName]; ok { | ||
| delete(has, roleName) | ||
| continue | ||
| } | ||
| added = append(added, roleName) | ||
| } | ||
| // Remaining roles are the ones removed/deleted. | ||
| for roleName := range has { | ||
| removed = append(removed, roleName) | ||
| } | ||
| return added, removed | ||
| } | ||
| // roleName is a quick helper function to return | ||
| // role_name:scopeID | ||
| // If no scopeID is required, only 'role_name' is returned | ||
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.