Skip to content
This repository has been archived by the owner on Feb 18, 2021. It is now read-only.

Add auth resource to CreateConsumerGroup and refactor code a little bit #213

Merged
merged 1 commit into from
May 25, 2017
Merged

Add auth resource to CreateConsumerGroup and refactor code a little bit #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions common/log_tag.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,9 @@ const TagSubject = `subject`
// TagResource is for resource
const TagResource = `resource`

// TagOperation is for operation
const TagOperation = `operation`

const checkFormatAndPanic = false // TODO : Enable is staging

var longLowercaseGUIDRegex = regexp.MustCompile(`^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$`)
Expand Down
51 changes: 32 additions & 19 deletions services/frontendhost/frontend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,17 +598,8 @@ func (h *Frontend) CreateDestination(ctx thrift.Context, createRequest *c.Create

authResource := common.GetResourceURNCreateDestination(h.SCommon, createRequest.Path)

authContext := context.WithValue(ctx, ResourceUrnKey, authResource)
authSubject, err := h.GetAuthManager().Authenticate(authContext)
if err != nil {
// TODO add metrics
return nil, err
}

err = h.GetAuthManager().Authorize(authSubject, common.OperationCreate, common.Resource(authResource))
err = h.checkAuth(ctx, authResource, common.OperationCreate, lclLg)
if err != nil {
lclLg.WithField(common.TagSubject, authSubject).WithField(common.TagResource, authResource).Info("Not allowed to create destination")
// TODO add metrics
return nil, err
}

Expand Down Expand Up @@ -1110,17 +1101,10 @@ func (h *Frontend) CreateConsumerGroup(ctx thrift.Context, createRequest *c.Crea
common.TagCnsPth: common.FmtCnsPth(createRequest.GetConsumerGroupName()),
})

authSubject, err := h.GetAuthManager().Authenticate(ctx)
if err != nil {
// TODO add metrics
return nil, err
}

authResource := common.GetResourceURNCreateConsumerGroup(h.SCommon, createRequest.DestinationPath)
err = h.GetAuthManager().Authorize(authSubject, common.OperationRead, common.Resource(authResource))

err = h.checkAuth(ctx, authResource, common.OperationRead, lclLg)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should OperationRead actually be OperationCreate?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here we use "Read Destination" as the permission to create consumer group. Try to model the CRUD permission on destination.

if err != nil {
lclLg.WithField(common.TagSubject, authSubject).WithField(common.TagResource, authResource).Info("Not allowed to create consumer group")
// TODO add metrics
return nil, err
}

Expand Down Expand Up @@ -1660,3 +1644,32 @@ func (h *Frontend) getControllerClient() (controller.TChanController, error) {

return cf.GetControllerClient()
}

func (h *Frontend) checkAuth(ctx context.Context, authResource string, operation common.Operation, logger bark.Logger) error {
authContext := context.WithValue(ctx, ResourceUrnKey, authResource)
authSubject, err := h.GetAuthManager().Authenticate(authContext)
if err != nil {
logger.WithFields(bark.Fields{
common.TagErr: err,
common.TagSubject: authSubject,
common.TagResource: authResource,
common.TagOperation: operation,
}).Info("Authenticate failed")
// TODO add metrics
return err
}

err = h.GetAuthManager().Authorize(authSubject, operation, common.Resource(authResource))
if err != nil {
logger.WithFields(bark.Fields{
common.TagErr: err,
common.TagSubject: authSubject,
common.TagResource: authResource,
common.TagOperation: operation,
}).Info("Authorize failed")
// TODO add metrics
return err
}

return nil
}