Skip to content

feat: Implement list roles & enforce authorize examples #1273

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
May 3, 2022
Merged

feat: Implement list roles & enforce authorize examples #1273

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
30e2031
feat: First draft of adding authorize to an http endpoint
Emyrk May 3, 2022
2161f84
WIP: Using middleware to change auth object params
Emyrk May 3, 2022
54bc054
feat: Implement basic authorize and unit test
Emyrk May 3, 2022
d083a7c
Some cleanup
Emyrk May 3, 2022
95b9a14
Merge remote-tracking branch 'origin/main' into stevenmasley/list_roles
Emyrk May 3, 2022
1498dcd
Expand 'orgs' to 'organizations' in func namings
Emyrk May 3, 2022
f36ae37
Renamings
Emyrk May 3, 2022
b831260
Use rbac.object directly
Emyrk May 3, 2022
db04d67
Fix broken tests
Emyrk May 3, 2022
b76f373
Add some comments
Emyrk May 3, 2022
117f838
Linting
Emyrk May 3, 2022
42b42ab
Handle out of order lists
Emyrk May 3, 2022
0efe72c
Add unit test
Emyrk May 3, 2022
dba617d
Add unit test for mw
Emyrk May 3, 2022
190940f
parallel unit test
Emyrk May 3, 2022
c86c67c
style order
Emyrk May 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Linting
  • Loading branch information
@Emyrk
Emyrk committed May 3, 2022
commit 117f838c5c527e983a667d70b6d3a0e565d49f48
14 changes: 0 additions & 14 deletions coderd/coderd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,8 @@ package coderd_test

import (
"context"
"fmt"
"net/http"
"testing"

"github.com/coder/coder/coderd"
"github.com/go-chi/chi/v5"

"go.uber.org/goleak"

"github.com/stretchr/testify/require"
Expand All @@ -29,12 +24,3 @@ func TestBuildInfo(t *testing.T) {
require.Equal(t, buildinfo.ExternalURL(), buildInfo.ExternalURL, "external URL")
require.Equal(t, buildinfo.Version(), buildInfo.Version, "version")
}

func TestWalk(t *testing.T) {
r, _ := coderd.New(&coderd.Options{})
chiRouter := r.(chi.Router)
chi.Walk(chiRouter, func(method string, route string, handler http.Handler, middlewares ...func(http.Handler) http.Handler) error {
fmt.Println(method, route)
return nil
})
}
3 changes: 2 additions & 1 deletion coderd/database/databasefake/databasefake.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,14 +245,15 @@ func (q *fakeQuerier) GetUsers(_ context.Context, params database.GetUsersParams
return tmp, nil
}

func (q *fakeQuerier) GetAllUserRoles(ctx context.Context, userID uuid.UUID) (database.GetAllUserRolesRow, error) {
func (q *fakeQuerier) GetAllUserRoles(_ context.Context, userID uuid.UUID) (database.GetAllUserRolesRow, error) {
q.mutex.RLock()
defer q.mutex.RUnlock()

var user *database.User
roles := make([]string, 0)
for _, u := range q.users {
if u.ID == userID {
u := u
roles = append(roles, u.RBACRoles...)
user = &u
break
Expand Down
3 changes: 1 addition & 2 deletions coderd/httpmw/authorize.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package httpmw

import (
"context"
"fmt"
"net/http"

"golang.org/x/xerrors"
Expand Down Expand Up @@ -111,7 +110,7 @@ func ExtractUserRoles(db database.Store) func(http.Handler) http.Handler {
role, err := db.GetAllUserRoles(r.Context(), apiKey.UserID)
if err != nil {
httpapi.Write(rw, http.StatusUnauthorized, httpapi.Response{
Message: fmt.Sprintf("roles not found", AuthCookie),
Message: "roles not found",
})
return
}
Expand Down
4 changes: 2 additions & 2 deletions coderd/roles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ import (
)

// assignableSiteRoles returns all site wide roles that can be assigned.
func (api *api) assignableSiteRoles(rw http.ResponseWriter, r *http.Request) {
func (*api) assignableSiteRoles(rw http.ResponseWriter, _ *http.Request) {
// TODO: @emyrk in the future, allow granular subsets of roles to be returned based on the
// role of the user.
roles := rbac.SiteRoles()
httpapi.Write(rw, http.StatusOK, roles)
}

// assignableSiteRoles returns all site wide roles that can be assigned.
func (api *api) assignableOrgRoles(rw http.ResponseWriter, r *http.Request) {
func (*api) assignableOrgRoles(rw http.ResponseWriter, r *http.Request) {
// TODO: @emyrk in the future, allow granular subsets of roles to be returned based on the
// role of the user.
organization := httpmw.OrganizationParam(r)
Expand Down
3 changes: 2 additions & 1 deletion coderd/roles_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ import (
"net/http"
"testing"

"github.com/stretchr/testify/require"

"github.com/coder/coder/coderd/coderdtest"
"github.com/coder/coder/coderd/rbac"
"github.com/coder/coder/codersdk"
"github.com/stretchr/testify/require"
)

func TestListRoles(t *testing.T) {
Expand Down