s3api: fix static IAM policy enforcement after reload (#8532)
* s3api: honor attached IAM policies over legacy actions * s3api: hydrate IAM policy docs during config reload * s3api: use policy-aware auth when listing buckets * credential: propagate context through filer_etc policy reads * credential: make legacy policy deletes durable * s3api: exercise managed policy runtime loader * s3api: allow static IAM users without session tokens * iam: deny unmatched attached policies under default allow * iam: load embedded policy files from filer store * s3api: require session tokens for IAM presigning * s3api: sync runtime policies into zero-config IAM * credential: respect context in policy file loads * credential: serialize legacy policy deletes * iam: align filer policy store naming * s3api: use authenticated principals for presigning * iam: deep copy policy conditions * s3api: require request creation in policy tests * filer: keep ReadInsideFiler as the context-aware API * iam: harden filer policy store writes * credential: strengthen legacy policy serialization test * credential: forward runtime policy loaders through wrapper * s3api: harden runtime policy merging * iam: require typed already-exists errors
This commit is contained in:
@@ -101,21 +101,10 @@ func (pm *S3PresignedURLManager) GeneratePresignedURLWithIAM(ctx context.Context
|
||||
if pm.s3iam == nil || !pm.s3iam.enabled {
|
||||
return nil, fmt.Errorf("IAM integration not enabled")
|
||||
}
|
||||
|
||||
// Validate session token and get identity
|
||||
// Use a proper ARN format for the principal
|
||||
principalArn := fmt.Sprintf("arn:aws:sts::assumed-role/PresignedUser/presigned-session")
|
||||
iamIdentity := &IAMIdentity{
|
||||
SessionToken: req.SessionToken,
|
||||
Principal: principalArn,
|
||||
Name: "presigned-user",
|
||||
Account: &AccountAdmin,
|
||||
if req == nil || strings.TrimSpace(req.SessionToken) == "" {
|
||||
return nil, fmt.Errorf("IAM authorization failed: session token is required")
|
||||
}
|
||||
|
||||
// Determine S3 action from method
|
||||
action := determineS3ActionFromMethodAndPath(req.Method, req.Bucket, req.ObjectKey)
|
||||
|
||||
// Check IAM permissions before generating URL
|
||||
authRequest := &http.Request{
|
||||
Method: req.Method,
|
||||
URL: &url.URL{Path: "/" + req.Bucket + "/" + req.ObjectKey},
|
||||
@@ -124,7 +113,16 @@ func (pm *S3PresignedURLManager) GeneratePresignedURLWithIAM(ctx context.Context
|
||||
authRequest.Header.Set("Authorization", "Bearer "+req.SessionToken)
|
||||
authRequest = authRequest.WithContext(ctx)
|
||||
|
||||
errCode := pm.s3iam.AuthorizeAction(ctx, iamIdentity, action, req.Bucket, req.ObjectKey, authRequest)
|
||||
iamIdentity, errCode := pm.s3iam.AuthenticateJWT(ctx, authRequest)
|
||||
if errCode != s3err.ErrNone {
|
||||
return nil, fmt.Errorf("IAM authorization failed: invalid session token")
|
||||
}
|
||||
|
||||
// Determine S3 action from method
|
||||
action := determineS3ActionFromMethodAndPath(req.Method, req.Bucket, req.ObjectKey)
|
||||
|
||||
// Check IAM permissions before generating URL
|
||||
errCode = pm.s3iam.AuthorizeAction(ctx, iamIdentity, action, req.Bucket, req.ObjectKey, authRequest)
|
||||
if errCode != s3err.ErrNone {
|
||||
return nil, fmt.Errorf("IAM authorization failed: user does not have permission for action %s on resource %s/%s", action, req.Bucket, req.ObjectKey)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user