Skip to content
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.

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

feat(HMS-1246): Use permission checks in statuser #504

Merged
merged 1 commit into from
Jul 19, 2023
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
20 changes: 13 additions & 7 deletions cmd/pbackend/statuser.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,7 @@ func checkSourceAvailabilityAzure(ctx context.Context) {
Identity: s.Identity,
ResourceType: "Application",
}
// TODO: check if source is avavliable - WIP
sr.Status = kafka.StatusAvaliable
sr.Status = kafka.StatusAvailable
chSend <- sr
metrics.IncTotalSentAvailabilityCheckReqs(models.ProviderTypeAzure.String(), sr.Status.String(), nil)

Expand All @@ -148,21 +147,28 @@ func checkSourceAvailabilityAWS(ctx context.Context) {
logger.Trace().Msgf("Checking AWS source availability status %s", s.SourceApplicationID)
metrics.ObserveAvailabilityCheckReqsDuration(models.ProviderTypeAWS.String(), func() error {
var err error
var permissions []string
sr := kafka.SourceResult{
ResourceID: s.SourceApplicationID,
Identity: s.Identity,
ResourceType: "Application",
}
_, err = clients.GetEC2Client(ctx, &s.Authentication, "")
ec2Client, err := clients.GetEC2Client(ctx, &s.Authentication, "")
if err != nil {
sr.Status = kafka.StatusUnavailable
sr.Err = err
logger.Warn().Err(err).Msg("Could not get aws assumed client")
ezr-ondrej marked this conversation as resolved.
Show resolved Hide resolved
chSend <- sr
} else {
sr.Status = kafka.StatusAvaliable
chSend <- sr
sr.Status = kafka.StatusAvailable
permissions, err = ec2Client.CheckPermission(ctx, &s.Authentication)
if err != nil {
sr.Err = err
sr.Status = kafka.StatusUnavailable
sr.MissingPermissions = permissions
logger.Warn().Err(err).Bool("missing_permissions", true).Str("source_id", sr.ResourceID).Msg("AWS permission check failed")
}
}
chSend <- sr
metrics.IncTotalSentAvailabilityCheckReqs(models.ProviderTypeAWS.String(), sr.Status.String(), err)
return fmt.Errorf("error during check: %w", err)
})
Expand Down Expand Up @@ -196,7 +202,7 @@ func checkSourceAvailabilityGCP(ctx context.Context) {
logger.Warn().Err(err).Msg("Could not list gcp regions")
chSend <- sr
} else {
sr.Status = kafka.StatusAvaliable
sr.Status = kafka.StatusAvailable
chSend <- sr
}
metrics.IncTotalSentAvailabilityCheckReqs(models.ProviderTypeGCP.String(), sr.Status.String(), err)
Expand Down
9 changes: 8 additions & 1 deletion internal/clients/http/ec2/iam_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package ec2
import (
"context"
"encoding/json"
"errors"
"fmt"
"net/url"
"strings"
Expand All @@ -15,6 +16,8 @@ import (
"github.com/aws/aws-sdk-go-v2/service/iam"
)

var AWSPermissionsMissing = errors.New("AWS permissions missing")

// Statement is a main policy element.
type Statement struct {
// Sid is an optional identifier of the Statement
Expand Down Expand Up @@ -271,7 +274,11 @@ func (c *ec2Client) checkInlinePolicies(ctx context.Context, missingPermissions
Effect: "Allow",
Action: missingPermissions,
}
return listMissingPermissions(inlinePoliciesStatement, missingStatement), nil
missing := listMissingPermissions(inlinePoliciesStatement, missingStatement)
if len(missingPermissions) != 0 {
return missing, fmt.Errorf("%w: %s", AWSPermissionsMissing, strings.Join(missing, ", "))
}
return nil, nil
}

func (c *ec2Client) CheckPermission(ctx context.Context, auth *clients.Authentication) ([]string, error) {
Expand Down
4 changes: 3 additions & 1 deletion internal/kafka/source_result.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ type StatusType string

const (
StatusUnavailable StatusType = "unavailable"
StatusAvaliable StatusType = "available"
StatusAvailable StatusType = "available"
)

type SourceResult struct {
Expand All @@ -24,6 +24,8 @@ type SourceResult struct {
Err error `json:"error"`

Identity identity.Principal `json:"-"`

MissingPermissions []string `json:"-"`
}
avitova marked this conversation as resolved.
Show resolved Hide resolved

func (sr SourceResult) GenericMessage(ctx context.Context) (GenericMessage, error) {
Expand Down
6 changes: 3 additions & 3 deletions internal/services/aws_iam_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ func ValidatePermissions(w http.ResponseWriter, r *http.Request) {
}

logger.Info().Msgf("Listing permissions.")
permissions, err := ec2Client.CheckPermission(r.Context(), authentication)
if err != nil {
missingPermissions, err := ec2Client.CheckPermission(r.Context(), authentication)
if err != nil && missingPermissions == nil {
renderError(w, r, payloads.NewAWSError(r.Context(), "unable to check aws permissions", err))
return
}

if err := render.Render(w, r, payloads.NewPermissionsResponse(permissions)); err != nil {
if err := render.Render(w, r, payloads.NewPermissionsResponse(missingPermissions)); err != nil {
renderError(w, r, payloads.NewRenderError(r.Context(), "unable to render missing permissions", err))
return
}
Expand Down