Skip to content

[WIP] Add initial rbac actions and roles #191

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[WIP] Add initial rbac actions and roles #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e8efd8
configstore: add actions and roles
sgotti Dec 11, 2019
d1f8463
gateway: initial rbac handling
sgotti Dec 11, 2019
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
2 changes: 1 addition & 1 deletion cmd/agola/cmd/orgmemberadd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func orgMemberAdd(cmd *cobra.Command, args []string) error {
gwclient := gwclient.NewClient(gatewayURL, token)

log.Infof("adding/updating member %q to organization %q with role %q", orgMemberAddOpts.username, orgMemberAddOpts.orgname, orgMemberAddOpts.role)
_, _, err := gwclient.AddOrgMember(context.TODO(), orgMemberAddOpts.orgname, orgMemberAddOpts.username, gwapitypes.MemberRole(orgMemberAddOpts.role))
_, _, err := gwclient.AddOrgMember(context.TODO(), orgMemberAddOpts.orgname, orgMemberAddOpts.username, gwapitypes.OrgMemberRole(orgMemberAddOpts.role))
if err != nil {
return errors.Errorf("failed to add/update organization member: %w", err)
}
Expand Down
8 changes: 4 additions & 4 deletions internal/services/configstore/action/org.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (

type OrgMemberResponse struct {
User *types.User
Role types.MemberRole
Role types.OrgMemberRole
}

func orgMemberResponse(orgUser *readdb.OrgUser) *OrgMemberResponse {
Expand Down Expand Up @@ -138,7 +138,7 @@ func (h *ActionHandler) CreateOrg(ctx context.Context, org *types.Organization)
ID: uuid.NewV4().String(),
OrganizationID: org.ID,
UserID: org.CreatorUserID,
MemberRole: types.MemberRoleOwner,
MemberRole: types.OrgMemberRoleOwner,
}
orgmemberj, err := json.Marshal(orgmember)
if err != nil {
Expand Down Expand Up @@ -221,8 +221,8 @@ func (h *ActionHandler) DeleteOrg(ctx context.Context, orgRef string) error {

// AddOrgMember add/updates an org member.
// TODO(sgotti) handle invitation when implemented
func (h *ActionHandler) AddOrgMember(ctx context.Context, orgRef, userRef string, role types.MemberRole) (*types.OrganizationMember, error) {
if !types.IsValidMemberRole(role) {
func (h *ActionHandler) AddOrgMember(ctx context.Context, orgRef, userRef string, role types.OrgMemberRole) (*types.OrganizationMember, error) {
if !types.IsValidOrgMemberRole(role) {
return nil, util.NewErrBadRequest(errors.Errorf("invalid role %q", role))
}

Expand Down
2 changes: 1 addition & 1 deletion internal/services/configstore/action/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ func (h *ActionHandler) DeleteUserToken(ctx context.Context, userRef, tokenName

type UserOrgsResponse struct {
Organization *types.Organization
Role types.MemberRole
Role types.OrgMemberRole
}

func userOrgsResponse(userOrg *readdb.UserOrg) *UserOrgsResponse {
Expand Down
6 changes: 3 additions & 3 deletions internal/services/configstore/configstore_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1206,7 +1206,7 @@ func TestOrgMembers(t *testing.T) {
expectedResponse := []*action.UserOrgsResponse{
{
Organization: org,
Role: types.MemberRoleOwner,
Role: types.OrgMemberRoleOwner,
},
}
res, err := cs.ah.GetUserOrgs(ctx, user.ID)
Expand Down Expand Up @@ -1239,13 +1239,13 @@ func TestOrgMembers(t *testing.T) {
expectedResponse := []*action.UserOrgsResponse{
{
Organization: org,
Role: types.MemberRoleOwner,
Role: types.OrgMemberRoleOwner,
},
}
for i := 5; i < 10; i++ {
expectedResponse = append(expectedResponse, &action.UserOrgsResponse{
Organization: orgs[i],
Role: types.MemberRoleOwner,
Role: types.OrgMemberRoleOwner,
})
}
res, err := cs.ah.GetUserOrgs(ctx, user.ID)
Expand Down
4 changes: 2 additions & 2 deletions internal/services/configstore/readdb/org.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ func scanOrgMembers(rows *sql.Rows) ([]*types.OrganizationMember, []string, erro

type OrgUser struct {
User *types.User
Role types.MemberRole
Role types.OrgMemberRole
}

// TODO(sgotti) implement cursor fetching
Expand Down Expand Up @@ -348,7 +348,7 @@ func (r *ReadDB) GetOrgUsers(tx *db.Tx, orgID string) ([]*OrgUser, error) {

type UserOrg struct {
Organization *types.Organization
Role types.MemberRole
Role types.OrgMemberRole
}

// TODO(sgotti) implement cursor fetching
Expand Down
Loading