Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions cmd/frontend/graphqlbackend/rbac.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ type PermissionResolver interface {
type RBACResolver interface {
// MUTATIONS
DeleteRole(ctx context.Context, args *DeleteRoleArgs) (*EmptyResponse, error)
CreateRole(ctx context.Context, args *CreateRoleArgs) (RoleResolver, error)

// QUERIES
Roles(ctx context.Context, args *ListRoleArgs) (*graphqlutil.ConnectionResolver[RoleResolver], error)
Expand All @@ -40,6 +41,10 @@ type DeleteRoleArgs struct {
Role graphql.ID
}

type CreateRoleArgs struct {
Name string
}

type ListRoleArgs struct {
graphqlutil.ConnectionResolverArgs

Expand Down
5 changes: 5 additions & 0 deletions cmd/frontend/graphqlbackend/rbac.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,11 @@ extend type Mutation {
Any users who were assigned to the role will be unassigned and lose any permissions associated with it.
"""
deleteRole(role: ID!): EmptyResponse!

"""
Creates a role.
"""
createRole(name: String!): Role!
}

extend type User {
Expand Down
17 changes: 17 additions & 0 deletions enterprise/cmd/frontend/internal/rbac/resolvers/roles.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,20 @@ func (r *Resolver) DeleteRole(ctx context.Context, args *gql.DeleteRoleArgs) (_

return &gql.EmptyResponse{}, nil
}

func (r *Resolver) CreateRole(ctx context.Context, args *gql.CreateRoleArgs) (gql.RoleResolver, error) {
// 🚨 SECURITY: Only site administrators can create roles.
if err := auth.CheckCurrentUserIsSiteAdmin(ctx, r.db); err != nil {
return nil, err
}

newRole, err := r.db.Roles().Create(ctx, args.Name, false)
if err != nil {
return nil, err
}

return &roleResolver{
db: r.db,
role: newRole,
}, nil
}
61 changes: 61 additions & 0 deletions enterprise/cmd/frontend/internal/rbac/resolvers/roles_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -295,3 +295,64 @@ mutation DeleteRole($role: ID!) {
}
}
`

func TestCreateRole(t *testing.T) {
logger := logtest.Scoped(t)
if testing.Short() {
t.Skip()
}

ctx := context.Background()
db := database.NewDB(logger, dbtest.NewDB(logger, t))

userID := createTestUser(t, db, false).ID
actorCtx := actor.WithActor(ctx, actor.FromUser(userID))

adminUserID := createTestUser(t, db, true).ID
adminActorCtx := actor.WithActor(ctx, actor.FromUser(adminUserID))

r := &Resolver{logger: logger, db: db}
s, err := newSchema(db, r)
assert.NoError(t, err)

t.Run("as non site-admin", func(t *testing.T) {
input := map[string]any{"name": "TEST-ROLE"}

var response struct{ CreateRole apitest.Role }
errs := apitest.Exec(actorCtx, t, s, input, &response, createRoleMutation)

if len(errs) != 1 {
t.Fatalf("expected a single error, but got %d", len(errs))
}
if have, want := errs[0].Message, "must be site admin"; have != want {
t.Fatalf("wrong error. want=%q, have=%q", want, have)
}
})

t.Run("as site-admin", func(t *testing.T) {
input := map[string]any{"name": "TEST-ROLE"}

var response struct{ CreateRole apitest.Role }
// First time it should work, because the role exists
apitest.MustExec(adminActorCtx, t, s, input, &response, createRoleMutation)

// Second time it should fail because role names must be unique
errs := apitest.Exec(adminActorCtx, t, s, input, &response, createRoleMutation)
if len(errs) != 1 {
t.Fatalf("expected a single error, but got %d", len(errs))
}
if have, want := errs[0].Message, "cannot create role: err_name_exists"; have != want {
t.Fatalf("wrong error code. want=%q, have=%q", want, have)
}
})
}

const createRoleMutation = `
mutation CreateRole($name: String!) {
createRole(name: $name) {
id
name
system
}
}
`
21 changes: 21 additions & 0 deletions internal/database/roles.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"database/sql"
"fmt"

"github.com/jackc/pgconn"
"github.com/keegancsmith/sqlf"

"github.com/sourcegraph/sourcegraph/internal/database/basestore"
Expand All @@ -13,6 +14,22 @@ import (
"github.com/sourcegraph/sourcegraph/lib/errors"
)

// errCannotCreateRole is the error returned when a role cannot be inserted
// into the database due to a constraint.
type errCannotCreateRole struct {
code string
}

const errorCodeRoleNameExists = "err_name_exists"

func (err errCannotCreateRole) Error() string {
return fmt.Sprintf("cannot create role: %v", err.code)
}

func (err errCannotCreateRole) Code() string {
return err.code
}

var roleColumns = []*sqlf.Query{
sqlf.Sprintf("roles.id"),
sqlf.Sprintf("roles.name"),
Expand Down Expand Up @@ -230,6 +247,10 @@ func (r *roleStore) Create(ctx context.Context, name string, isSystemRole bool)

role, err := scanRole(r.QueryRow(ctx, q))
if err != nil {
var e *pgconn.PgError
if errors.As(err, &e) && e.ConstraintName == "roles_name" {
return nil, errCannotCreateRole{errorCodeRoleNameExists}
}
return nil, errors.Wrap(err, "scanning role")
}

Expand Down