OrgGo
/
Mainflux.mainflux
mirror of https://github.com/mainflux/mainflux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

NOISSUE - Evaluate Group Access (#1818) 

Signed-off-by: rodneyosodo <blackd0t@protonmail.com>
This commit is contained in:
b1ackd0t 2023-06-19 15:52:01 +03:00 committed by GitHub
parent 87ad06689a
commit f5bc71c7c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
users/groups/service.go
View File

@ -25,7 +25,6 @@ const (
updateRelationKey = "g_update"
listRelationKey = "g_list"
deleteRelationKey = "g_delete"
entityType = "group"
)
type service struct {
@ -68,7 +67,11 @@ func (svc service) CreateGroup(ctx context.Context, token string, g groups.Group
}
func (svc service) ViewGroup(ctx context.Context, token string, id string) (groups.Group, error) {
if err := svc.authorizeByToken(ctx, token, id, listRelationKey); err != nil {
userID, err := svc.identify(ctx, token)
if err != nil {
return groups.Group{}, err
}
if err := svc.authorizeByID(ctx, userID, id, listRelationKey); err != nil {
return groups.Group{}, err
}
@ -175,21 +178,13 @@ func (svc service) authorizeByID(ctx context.Context, subject, object, action st
if err := svc.policies.CheckAdmin(ctx, policy.Subject); err == nil {
return nil
}
aReq := policies.AccessRequest{Subject: subject, Object: object, Action: action, Entity: entityType}
if _, err := svc.policies.EvaluateUserAccess(ctx, aReq); err != nil {
aReq := policies.AccessRequest{Subject: subject, Object: object, Action: action}
if _, err := svc.policies.EvaluateGroupAccess(ctx, aReq); err != nil {
return err
}
return nil
}
func (svc service) authorizeByToken(ctx context.Context, token, object, action string) error {
id, err := svc.identify(ctx, token)
if err != nil {
return err
}
return svc.authorizeByID(ctx, id, object, action)
}
func (svc service) identify(ctx context.Context, token string) (string, error) {
claims, err := svc.tokens.Parse(ctx, token)
if err != nil {