Mirror
/
seaweedfs
mirror of https://github.com/seaweedfs/seaweedfs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

remove old implementation

pull/7471/head
chrislu 2 months ago
parent
d2cf57b1ee
commit
e7c94a8643
2 changed files with 7 additions and 1048 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 792
      weed/s3api/s3_bucket_policy_simple_test.go
  2. 263
      weed/s3api/s3api_bucket_handlers.go

792
weed/s3api/s3_bucket_policy_simple_test.go
View File

@ -1,792 +0,0 @@
package s3api
import (
"encoding/json"
"fmt"
"testing"
"github.com/seaweedfs/seaweedfs/weed/iam/policy"
"github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
// TestBucketPolicyValidationBasics tests the core validation logic
func TestBucketPolicyValidationBasics(t *testing.T) {
s3Server := &S3ApiServer{}
tests := []struct {
name string
policy *policy.PolicyDocument
bucket string
expectedValid bool
expectedError string
}{
{
name: "Valid bucket policy",
policy: &policy.PolicyDocument{
Version: "2012-10-17",
Statement: []policy.Statement{
{
Sid: "TestStatement",
Effect: "Allow",
Principal: map[string]interface{}{
"AWS": "*",
},
Action: []string{"s3:GetObject"},
Resource: []string{
"arn:seaweed:s3:::test-bucket/*",
},
},
},
},
bucket: "test-bucket",
expectedValid: true,
},
{
name: "Policy without Principal (invalid)",
policy: &policy.PolicyDocument{
Version: "2012-10-17",
Statement: []policy.Statement{
{
Effect: "Allow",
Action: []string{"s3:GetObject"},
Resource: []string{"arn:seaweed:s3:::test-bucket/*"},
// Principal is missing
},
},
},
bucket: "test-bucket",
expectedValid: false,
expectedError: "bucket policies must specify a Principal",
},
{
name: "Invalid version",
policy: &policy.PolicyDocument{
Version: "2008-10-17", // Wrong version
Statement: []policy.Statement{
{
Effect: "Allow",
Principal: map[string]interface{}{
"AWS": "*",
},
Action: []string{"s3:GetObject"},
Resource: []string{"arn:seaweed:s3:::test-bucket/*"},
},
},
},
bucket: "test-bucket",
expectedValid: false,
expectedError: "unsupported policy version",
},
{
name: "Resource not matching bucket",
policy: &policy.PolicyDocument{
Version: "2012-10-17",
Statement: []policy.Statement{
{
Effect: "Allow",
Principal: map[string]interface{}{
"AWS": "*",
},
Action: []string{"s3:GetObject"},
Resource: []string{"arn:seaweed:s3:::other-bucket/*"}, // Wrong bucket
},
},
},
bucket: "test-bucket",
expectedValid: false,
expectedError: "does not match bucket",
},
{
name: "Non-S3 action",
policy: &policy.PolicyDocument{
Version: "2012-10-17",
Statement: []policy.Statement{
{
Effect: "Allow",
Principal: map[string]interface{}{
"AWS": "*",
},
Action: []string{"iam:GetUser"}, // Non-S3 action
Resource: []string{"arn:seaweed:s3:::test-bucket/*"},
},
},
},
bucket: "test-bucket",
expectedValid: false,
expectedError: "bucket policies only support S3 actions",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
err := s3Server.validateBucketPolicy(tt.policy, tt.bucket)
if tt.expectedValid {
assert.NoError(t, err, "Policy should be valid")
} else {
assert.Error(t, err, "Policy should be invalid")
if tt.expectedError != "" {
assert.Contains(t, err.Error(), tt.expectedError, "Error message should contain expected text")
}
}
})
}
}
// TestBucketResourceValidation tests the resource ARN validation
func TestBucketResourceValidation(t *testing.T) {
s3Server := &S3ApiServer{}
tests := []struct {
name string
resource string
bucket string
valid bool
}{
// SeaweedFS ARN format
{
name: "Exact bucket ARN (SeaweedFS)",
resource: "arn:seaweed:s3:::test-bucket",
bucket: "test-bucket",
valid: true,
},
{
name: "Bucket wildcard ARN (SeaweedFS)",
resource: "arn:seaweed:s3:::test-bucket/*",
bucket: "test-bucket",
valid: true,
},
{
name: "Specific object ARN (SeaweedFS)",
resource: "arn:seaweed:s3:::test-bucket/path/to/object.txt",
bucket: "test-bucket",
valid: true,
},
// AWS ARN format (compatibility)
{
name: "Exact bucket ARN (AWS)",
resource: "arn:aws:s3:::test-bucket",
bucket: "test-bucket",
valid: true,
},
{
name: "Bucket wildcard ARN (AWS)",
resource: "arn:aws:s3:::test-bucket/*",
bucket: "test-bucket",
valid: true,
},
{
name: "Specific object ARN (AWS)",
resource: "arn:aws:s3:::test-bucket/path/to/object.txt",
bucket: "test-bucket",
valid: true,
},
// Simplified format (without ARN prefix)
{
name: "Simplified bucket name",
resource: "test-bucket",
bucket: "test-bucket",
valid: true,
},
{
name: "Simplified bucket wildcard",
resource: "test-bucket/*",
bucket: "test-bucket",
valid: true,
},
{
name: "Simplified specific object",
resource: "test-bucket/path/to/object.txt",
bucket: "test-bucket",
valid: true,
},
// Invalid cases
{
name: "Different bucket ARN (SeaweedFS)",
resource: "arn:seaweed:s3:::other-bucket/*",
bucket: "test-bucket",
valid: false,
},
{
name: "Different bucket ARN (AWS)",
resource: "arn:aws:s3:::other-bucket/*",
bucket: "test-bucket",
valid: false,
},
{
name: "Different bucket simplified",
resource: "other-bucket/*",
bucket: "test-bucket",
valid: false,
},
{
name: "Global S3 wildcard (SeaweedFS)",
resource: "arn:seaweed:s3:::*",
bucket: "test-bucket",
valid: false,
},
{
name: "Global S3 wildcard (AWS)",
resource: "arn:aws:s3:::*",
bucket: "test-bucket",
valid: false,
},
{
name: "Invalid ARN format",
resource: "invalid-arn",
bucket: "test-bucket",
valid: false,
},
{
name: "Bucket name prefix match but different bucket",
resource: "test-bucket-different/*",
bucket: "test-bucket",
valid: false,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
result := s3Server.validateResourceForBucket(tt.resource, tt.bucket)
assert.Equal(t, tt.valid, result, "Resource validation result should match expected")
})
}
}
// TestBucketPolicyJSONSerialization tests policy JSON handling
func TestBucketPolicyJSONSerialization(t *testing.T) {
policy := &policy.PolicyDocument{
Version: "2012-10-17",
Statement: []policy.Statement{
{
Sid: "PublicReadGetObject",
Effect: "Allow",
Principal: map[string]interface{}{
"AWS": "*",
},
Action: []string{"s3:GetObject"},
Resource: []string{
"arn:seaweed:s3:::public-bucket/*",
},
},
},
}
// Test that policy can be marshaled and unmarshaled correctly
jsonData := marshalPolicy(t, policy)
assert.NotEmpty(t, jsonData, "JSON data should not be empty")
// Verify the JSON contains expected elements
jsonStr := string(jsonData)
assert.Contains(t, jsonStr, "2012-10-17", "JSON should contain version")
assert.Contains(t, jsonStr, "s3:GetObject", "JSON should contain action")
assert.Contains(t, jsonStr, "arn:seaweed:s3:::public-bucket/*", "JSON should contain resource")
assert.Contains(t, jsonStr, "PublicReadGetObject", "JSON should contain statement ID")
}
// Helper function for marshaling policies
func marshalPolicy(t *testing.T, policyDoc *policy.PolicyDocument) []byte {
data, err := json.Marshal(policyDoc)
require.NoError(t, err)
return data
}
// TestBucketPolicyAnonymousAccessHelpers tests the helper functions for anonymous access evaluation (Issue #7469)
func TestBucketPolicyAnonymousAccessHelpers(t *testing.T) {
tests := []struct {
name string
statement policy.Statement
s3Action string
resource string
expectedMatch bool
description string
}{
{
name: "Allow anonymous GetObject on specific path",
statement: policy.Statement{
Sid: "PublicReadForTranscodedObjects",
Effect: "Allow",
Principal: map[string]interface{}{
"AWS": "*",
},
Action: []string{"s3:GetObject"},
Resource: []string{"arn:aws:s3:::orbit/transcoded/*"},
},
s3Action: "s3:GetObject",
resource: "arn:aws:s3:::orbit/transcoded/video.mp4",
expectedMatch: true,
description: "Should match anonymous GetObject on transcoded/* path",
},
{
name: "Deny anonymous GetObject on different path",
statement: policy.Statement{
Sid: "PublicReadForTranscodedObjects",
Effect: "Allow",
Principal: map[string]interface{}{
"AWS": "*",
},
Action: []string{"s3:GetObject"},
Resource: []string{"arn:aws:s3:::orbit/transcoded/*"},
},
s3Action: "s3:GetObject",
resource: "arn:aws:s3:::orbit/private/document.pdf",
expectedMatch: false,
description: "Should not match paths outside of policy resource pattern",
},
{
name: "String principal wildcard",
statement: policy.Statement{
Effect: "Allow",
Principal: "*",
Action: []string{"s3:GetObject"},
Resource: []string{"arn:aws:s3:::public-bucket/*"},
},
s3Action: "s3:GetObject",
resource: "arn:aws:s3:::public-bucket/any/file.txt",
expectedMatch: true,
description: "Should match with string principal wildcard",
},
{
name: "Wildcard action matching",
statement: policy.Statement{
Effect: "Allow",
Principal: map[string]interface{}{
"AWS": "*",
},
Action: []string{"s3:*"},
Resource: []string{"arn:aws:s3:::bucket/*"},
},
s3Action: "s3:GetObject",
resource: "arn:aws:s3:::bucket/file.txt",
expectedMatch: true,
description: "Wildcard action should match any S3 action",
},
{
name: "ListBucket on bucket resource",
statement: policy.Statement{
Effect: "Allow",
Principal: map[string]interface{}{
"AWS": "*",
},
Action: []string{"s3:ListBucket"},
Resource: []string{"arn:aws:s3:::bucket"},
},
s3Action: "s3:ListBucket",
resource: "arn:aws:s3:::bucket",
expectedMatch: true,
description: "Should match ListBucket on exact bucket resource",
},
{
name: "Non-anonymous principal",
statement: policy.Statement{
Effect: "Allow",
Principal: map[string]interface{}{
"AWS": "arn:aws:iam::123456789012:user/alice",
},
Action: []string{"s3:GetObject"},
Resource: []string{"arn:aws:s3:::bucket/*"},
},
s3Action: "s3:GetObject",
resource: "arn:aws:s3:::bucket/file.txt",
expectedMatch: false,
description: "Should not match when principal is not anonymous",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
matched := statementMatchesAnonymousRequest(tt.statement, tt.s3Action, tt.resource)
assert.Equal(t, tt.expectedMatch, matched, "Statement match result: %s", tt.description)
})
}
}
// TestPrincipalMatchesAnonymous tests the principal matching logic
func TestPrincipalMatchesAnonymous(t *testing.T) {
tests := []struct {
name string
principal interface{}
expected bool
}{
{"String wildcard", "*", true},
{"AWS map with wildcard", map[string]interface{}{"AWS": "*"}, true},
{"AWS map with array containing wildcard", map[string]interface{}{"AWS": []interface{}{"*"}}, true},
{"AWS map with string array containing wildcard", map[string]interface{}{"AWS": []string{"*"}}, true},
{"Specific ARN", map[string]interface{}{"AWS": "arn:aws:iam::123:user/alice"}, false},
{"Empty principal", nil, false},
{"Empty map", map[string]interface{}{}, false},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
result := principalMatchesAnonymous(tt.principal)
assert.Equal(t, tt.expected, result)
})
}
}
// TestActionToS3Action tests the action conversion
func TestActionToS3Action(t *testing.T) {
tests := []struct {
action Action
expected string
}{
{s3_constants.ACTION_READ, "s3:GetObject"},
{s3_constants.ACTION_WRITE, "s3:PutObject"},
{s3_constants.ACTION_LIST, "s3:ListBucket"},
{s3_constants.ACTION_TAGGING, "s3:PutObjectTagging"},
{s3_constants.ACTION_ADMIN, "s3:*"},
{Action("s3:DeleteObject"), "s3:DeleteObject"},
{Action("CustomAction"), "s3:CustomAction"},
}
for _, tt := range tests {
t.Run(string(tt.action), func(t *testing.T) {
result := actionToS3Action(tt.action)
assert.Equal(t, tt.expected, result)
})
}
}
// TestBuildResourceARN tests the resource ARN building
func TestBuildResourceARN(t *testing.T) {
tests := []struct {
bucket string
object string
expected string
}{
{"bucket", "", "arn:aws:s3:::bucket"},
{"bucket", "/", "arn:aws:s3:::bucket"},
{"bucket", "file.txt", "arn:aws:s3:::bucket/file.txt"},
{"bucket", "/file.txt", "arn:aws:s3:::bucket/file.txt"},
{"bucket", "path/to/file.txt", "arn:aws:s3:::bucket/path/to/file.txt"},
}
for _, tt := range tests {
t.Run(fmt.Sprintf("%s/%s", tt.bucket, tt.object), func(t *testing.T) {
result := buildResourceARN(tt.bucket, tt.object)
assert.Equal(t, tt.expected, result)
})
}
}
// TestResourceMatching tests the resource pattern matching
func TestResourceMatching(t *testing.T) {
tests := []struct {
pattern string
resource string
expected bool
}{
{"*", "anything", true},
{"arn:aws:s3:::bucket/*", "arn:aws:s3:::bucket/file.txt", true},
{"arn:aws:s3:::bucket/*", "arn:aws:s3:::bucket/path/to/file.txt", true},
{"arn:aws:s3:::bucket/*", "arn:aws:s3:::other-bucket/file.txt", false},
{"bucket/*", "bucket/file.txt", true},
{"bucket/prefix/*", "bucket/prefix/file.txt", true},
{"bucket/prefix/*", "bucket/other/file.txt", false},
{"arn:aws:s3:::bucket", "arn:aws:s3:::bucket", true},
}
for _, tt := range tests {
t.Run(fmt.Sprintf("%s matches %s", tt.pattern, tt.resource), func(t *testing.T) {
result := matchesResourcePattern(tt.pattern, tt.resource)
assert.Equal(t, tt.expected, result)
})
}
}
// TestMatchesPatternRegexEscaping tests that regex metacharacters are properly escaped
// This is a critical security test - ensures policies like "*.json" don't match "filexjson"
func TestMatchesPatternRegexEscaping(t *testing.T) {
tests := []struct {
name string
pattern string
str string
expected bool
reason string
}{
{
name: "Wildcard .json extension - should match",
pattern: "*.json",
str: "file.json",
expected: true,
reason: "*.json should match file.json",
},
{
name: "Wildcard .json extension - should NOT match without dot",
pattern: "*.json",
str: "filexjson",
expected: false,
reason: "*.json should NOT match filexjson (critical security test)",
},
{
name: "Pattern with dots - exact match",
pattern: "file.test.json",
str: "file.test.json",
expected: true,
reason: "Exact match should work",
},
{
name: "Pattern with dots - should NOT match different chars",
pattern: "file.test.json",
str: "filextestxjson",
expected: false,
reason: "Dots should be literal, not regex wildcards",
},
{
name: "ARN with colons and slashes",
pattern: "arn:aws:s3:::bucket/*.json",
str: "arn:aws:s3:::bucket/file.json",
expected: true,
reason: "ARN pattern should match",
},
{
name: "ARN with colons - should NOT match without dots",
pattern: "arn:aws:s3:::bucket/*.json",
str: "arn:aws:s3:::bucket/filexjson",
expected: false,
reason: "ARN pattern should NOT match without literal dot (critical security test)",
},
{
name: "Question mark wildcard",
pattern: "file?.txt",
str: "file1.txt",
expected: true,
reason: "? should match single character",
},
{
name: "Question mark wildcard - should NOT match multiple chars",
pattern: "file?.txt",
str: "file123.txt",
expected: false,
reason: "? should only match single character",
},
{
name: "Parentheses in pattern",
pattern: "file(1).txt",
str: "file(1).txt",
expected: true,
reason: "Parentheses should be literal, not regex groups",
},
{
name: "Brackets in pattern",
pattern: "file[1].txt",
str: "file[1].txt",
expected: true,
reason: "Brackets should be literal, not regex character classes",
},
{
name: "Dollar sign in pattern",
pattern: "file$.txt",
str: "file$.txt",
expected: true,
reason: "Dollar sign should be literal, not regex anchor",
},
{
name: "Plus sign in pattern",
pattern: "file+.txt",
str: "file+.txt",
expected: true,
reason: "Plus should be literal, not regex quantifier",
},
{
name: "Complex pattern with multiple wildcards",
pattern: "prefix/*/file?.json",
str: "prefix/subdir/file1.json",
expected: true,
reason: "Multiple wildcards should work together",
},
{
name: "Complex pattern - should NOT match without dots",
pattern: "prefix/*/file?.json",
str: "prefix/subdir/file1xjson",
expected: false,
reason: "Dot should be literal even with multiple wildcards",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
result := matchesPattern(tt.pattern, tt.str, true) // case-sensitive for resource tests
assert.Equal(t, tt.expected, result, tt.reason)
})
}
}
// TestActionMatchingCaseInsensitive tests that S3 actions are case-insensitive
func TestActionMatchingCaseInsensitive(t *testing.T) {
tests := []struct {
name string
pattern string
action string
expected bool
}{
{"Exact match same case", "s3:GetObject", "s3:GetObject", true},
{"Different case - lowercase", "s3:GetObject", "s3:getobject", true},
{"Different case - uppercase", "s3:GetObject", "S3:GETOBJECT", true},
{"Different case - mixed", "s3:GetObject", "S3:getObject", true},
{"Wildcard with different case", "s3:Get*", "s3:getobject", true},
{"Wildcard with uppercase", "s3:GET*", "s3:GetObject", true},
{"No match different action", "s3:GetObject", "s3:PutObject", false},
{"Question mark wildcard case-insensitive", "s3:?etObject", "s3:GetObject", true},
{"Question mark wildcard different case", "s3:?etObject", "s3:GETOBJECT", true},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
result := matchesPattern(tt.pattern, tt.action, false) // case-insensitive for actions
assert.Equal(t, tt.expected, result)
})
}
}
// TestResourceMatchingCaseSensitive tests that resources are case-sensitive
func TestResourceMatchingCaseSensitive(t *testing.T) {
tests := []struct {
name string
pattern string
resource string
expected bool
}{
{"Exact match same case", "bucket/file.txt", "bucket/file.txt", true},
{"Different case should NOT match", "bucket/file.txt", "bucket/File.txt", false},
{"Different case should NOT match - uppercase", "bucket/file.txt", "BUCKET/FILE.TXT", false},
{"Wildcard pattern case-sensitive", "bucket/*.txt", "bucket/file.txt", true},
{"Wildcard pattern different case should NOT match", "bucket/*.txt", "bucket/File.TXT", false},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
result := matchesPattern(tt.pattern, tt.resource, true) // case-sensitive for resources
assert.Equal(t, tt.expected, result)
})
}
}
// TestActionMatchingWithRegexChars tests action matching with regex special characters
func TestActionMatchingWithRegexChars(t *testing.T) {
tests := []struct {
name string
pattern string
action string
expected bool
}{
{"Wildcard action", "s3:*", "s3:GetObject", true},
{"Specific action with colon", "s3:GetObject", "s3:GetObject", true},
{"Action should not match without colon", "s3GetObject", "s3:GetObject", false},
{"Pattern with wildcard at end", "s3:Get*", "s3:GetObject", true},
{"Pattern with wildcard at end", "s3:Get*", "s3:PutObject", false},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
result := actionMatches([]string{tt.pattern}, tt.action)
assert.Equal(t, tt.expected, result)
})
}
}
// TestIssue7252Examples tests the specific examples from GitHub issue #7252
func TestIssue7252Examples(t *testing.T) {
s3Server := &S3ApiServer{}
tests := []struct {
name string
policy *policy.PolicyDocument
bucket string
expectedValid bool
description string
}{
{
name: "Issue #7252 - Standard ARN with wildcard",
policy: &policy.PolicyDocument{
Version: "2012-10-17",
Statement: []policy.Statement{
{
Effect: "Allow",
Principal: map[string]interface{}{
"AWS": "*",
},
Action: []string{"s3:GetObject"},
Resource: []string{"arn:aws:s3:::main-bucket/*"},
},
},
},
bucket: "main-bucket",
expectedValid: true,
description: "AWS ARN format should be accepted",
},
{
name: "Issue #7252 - Simplified resource with wildcard",
policy: &policy.PolicyDocument{
Version: "2012-10-17",
Statement: []policy.Statement{
{
Effect: "Allow",
Principal: map[string]interface{}{
"AWS": "*",
},
Action: []string{"s3:GetObject"},
Resource: []string{"main-bucket/*"},
},
},
},
bucket: "main-bucket",
expectedValid: true,
description: "Simplified format with wildcard should be accepted",
},
{
name: "Issue #7252 - Resource as exact bucket name",
policy: &policy.PolicyDocument{
Version: "2012-10-17",
Statement: []policy.Statement{
{
Effect: "Allow",
Principal: map[string]interface{}{
"AWS": "*",
},
Action: []string{"s3:GetObject"},
Resource: []string{"main-bucket"},
},
},
},
bucket: "main-bucket",
expectedValid: true,
description: "Exact bucket name should be accepted",
},
{
name: "Public read policy with AWS ARN",
policy: &policy.PolicyDocument{
Version: "2012-10-17",
Statement: []policy.Statement{
{
Sid: "PublicReadGetObject",
Effect: "Allow",
Principal: map[string]interface{}{
"AWS": "*",
},
Action: []string{"s3:GetObject"},
Resource: []string{"arn:aws:s3:::my-public-bucket/*"},
},
},
},
bucket: "my-public-bucket",
expectedValid: true,
description: "Standard public read policy with AWS ARN should work",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
err := s3Server.validateBucketPolicy(tt.policy, tt.bucket)
if tt.expectedValid {
assert.NoError(t, err, "Policy should be valid: %s", tt.description)
} else {
assert.Error(t, err, "Policy should be invalid: %s", tt.description)
}
})
}
}

263
weed/s3api/s3api_bucket_handlers.go
View File

@ -10,14 +10,11 @@ import (
"math" "math"
"net/http" "net/http"
"path" "path"
"regexp"
"sort" "sort"
"strconv" "strconv"
"strings" "strings"
"sync"
"time" "time"
"github.com/seaweedfs/seaweedfs/weed/iam/policy"
"github.com/seaweedfs/seaweedfs/weed/util" "github.com/seaweedfs/seaweedfs/weed/util"
"github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil" "github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil"
@ -37,15 +34,6 @@ import (
util_http "github.com/seaweedfs/seaweedfs/weed/util/http" util_http "github.com/seaweedfs/seaweedfs/weed/util/http"
) )
// Pattern cache for regex compilation performance
// Limited to prevent unbounded memory growth
const maxPatternCacheSize = 1000
var (
patternCache = make(map[string]*regexp.Regexp)
patternCacheMu sync.RWMutex
)
func (s3a *S3ApiServer) ListBucketsHandler(w http.ResponseWriter, r *http.Request) { func (s3a *S3ApiServer) ListBucketsHandler(w http.ResponseWriter, r *http.Request) {
glog.V(3).Infof("ListBucketsHandler") glog.V(3).Infof("ListBucketsHandler")
@ -589,249 +577,8 @@ func isPublicReadGrants(grants []*s3.Grant) bool {
return false return false
} }
// isBucketPolicyAllowed checks if a bucket policy allows anonymous access for the given action and resource
func (s3a *S3ApiServer) isBucketPolicyAllowed(bucket, object string, action Action) bool {
// Get cached bucket config which includes the policy
config, errCode := s3a.getBucketConfig(bucket)
if errCode != s3err.ErrNone {
glog.V(4).Infof("isBucketPolicyAllowed: failed to get bucket config for %s: %v", bucket, errCode)
return false
}
// Check if bucket has a policy
if config.BucketPolicy == nil {
glog.V(4).Infof("isBucketPolicyAllowed: no bucket policy for %s", bucket)
return false
}
policyDoc := config.BucketPolicy
// Convert action to S3 action format
s3Action := actionToS3Action(action)
// Build resource ARN
resource := buildResourceARN(bucket, object)
glog.V(4).Infof("isBucketPolicyAllowed: evaluating bucket=%s, resource=%s, action=%s (cached policy)", bucket, resource, s3Action)
// Evaluate policy using AWS policy evaluation logic:
// 1. Check for explicit Deny - if found, return false
// 2. Check for explicit Allow - if found, return true
// 3. If no explicit Allow is found, return false (default deny)
hasExplicitAllow := false
for _, statement := range policyDoc.Statement {
// Check if statement matches the request
if !statementMatchesAnonymousRequest(statement, s3Action, resource) {
continue
}
glog.V(4).Infof("isBucketPolicyAllowed: statement %s matches", statement.Sid)
// Check effect
if statement.Effect == "Deny" {
glog.V(3).Infof("isBucketPolicyAllowed: explicit deny for %s/%s action %s", bucket, object, s3Action)
return false // Explicit deny trumps everything
}
if statement.Effect == "Allow" {
hasExplicitAllow = true
}
}
if hasExplicitAllow {
glog.V(3).Infof("isBucketPolicyAllowed: explicit allow for %s/%s action %s", bucket, object, s3Action)
return true
}
glog.V(4).Infof("isBucketPolicyAllowed: no explicit allow for %s/%s action %s", bucket, object, s3Action)
return false // Default deny
}
// statementMatchesAnonymousRequest checks if a policy statement matches an anonymous request
func statementMatchesAnonymousRequest(statement policy.Statement, s3Action, resource string) bool {
// Check if principal matches anonymous (*)
if !principalMatchesAnonymous(statement.Principal) {
return false
}
// Check if action matches
if !actionMatches(statement.Action, s3Action) {
return false
}
// Check if resource matches
if !resourceMatches(statement.Resource, resource) {
return false
}
return true
}
// principalMatchesAnonymous checks if the principal includes anonymous access (*)
func principalMatchesAnonymous(principal interface{}) bool {
if principal == nil {
return false
}
switch p := principal.(type) {
case string:
return p == "*"
case map[string]interface{}:
// Check for AWS format: {"AWS": "*"} or {"AWS": ["*"]}
if aws, ok := p["AWS"]; ok {
switch awsVal := aws.(type) {
case string:
return awsVal == "*"
case []interface{}:
for _, v := range awsVal {
if s, ok := v.(string); ok && s == "*" {
return true
}
}
case []string:
// Handles manually constructed policies (not from JSON)
for _, v := range awsVal {
if v == "*" {
return true
}
}
}
}
}
return false
}
// actionMatches checks if the requested action matches any action in the statement
// S3 actions are case-insensitive per AWS specification
func actionMatches(actions []string, requestedAction string) bool {
for _, action := range actions {
if matchesPattern(action, requestedAction, false) { // case-insensitive
return true
}
}
return false
}
// resourceMatches checks if the requested resource matches any resource in the statement
func resourceMatches(resources []string, requestedResource string) bool {
for _, resource := range resources {
if matchesResourcePattern(resource, requestedResource) {
return true
}
}
return false
}
// matchesPattern checks if a pattern matches a string (supports wildcards)
// caseSensitive determines if the match should be case-sensitive
func matchesPattern(pattern, str string, caseSensitive bool) bool {
// Fast path for common cases
if pattern == "*" {
return true
}
if caseSensitive {
if pattern == str {
return true
}
} else {
if strings.EqualFold(pattern, str) {
return true
}
}
// If no wildcards, we already checked equality above
if !strings.ContainsAny(pattern, "*?") {
return false
}
// Build cache key
cacheKey := pattern
if !caseSensitive {
cacheKey = "(?i)" + pattern
}
// Check cache first
patternCacheMu.RLock()
re, exists := patternCache[cacheKey]
patternCacheMu.RUnlock()
if !exists {
// Escape regex metacharacters before expanding wildcards
// This prevents patterns like "*.json" from matching "filexjson" (no dot)
escaped := regexp.QuoteMeta(pattern)
// Convert S3 wildcard pattern to regex
// * matches any sequence of characters
// ? matches any single character
escaped = strings.ReplaceAll(strings.ReplaceAll(escaped, "\\*", ".*"), "\\?", ".")
regexPattern := "^" + escaped + "$"
// Add case-insensitive flag if needed
if !caseSensitive {
regexPattern = "(?i)" + regexPattern
}
var err error
re, err = regexp.Compile(regexPattern)
if err != nil {
return false // Invalid patterns do not match
}
// Cache the compiled regex (with double-check locking and size limit)
patternCacheMu.Lock()
if re2, ok := patternCache[cacheKey]; ok {
re = re2 // Another goroutine already cached it
} else {
// Enforce cache size limit to prevent unbounded memory growth
if len(patternCache) >= maxPatternCacheSize {
// Simple eviction: clear oldest entries (clear half the cache)
// More sophisticated LRU could be added if needed
for k := range patternCache {
delete(patternCache, k)
if len(patternCache) < maxPatternCacheSize/2 {
break
}
}
glog.V(2).Infof("Pattern cache size limit reached, evicted entries (new size: %d)", len(patternCache))
}
patternCache[cacheKey] = re
}
patternCacheMu.Unlock()
}
return re.MatchString(str)
}
// matchesResourcePattern checks if a resource pattern matches a resource ARN
// Resources are case-sensitive per AWS S3 specification
func matchesResourcePattern(pattern, resource string) bool {
if pattern == "*" || pattern == resource {
return true
}
// Normalize both pattern and resource to handle different ARN formats
normalizedPattern := normalizeResourceARN(pattern)
normalizedResource := normalizeResourceARN(resource)
// Check exact match after normalization
if normalizedPattern == normalizedResource {
return true
}
// Check wildcard match (case-sensitive for resources)
return matchesPattern(normalizedPattern, normalizedResource, true)
}
// normalizeResourceARN normalizes a resource ARN to a consistent format
func normalizeResourceARN(arn string) string {
// Strip common ARN prefixes to get the resource path
arn = strings.TrimPrefix(arn, "arn:aws:s3:::")
arn = strings.TrimPrefix(arn, "arn:seaweed:s3:::")
return arn
}
// buildResourceARN builds a resource ARN from bucket and object // buildResourceARN builds a resource ARN from bucket and object
// Used by the policy engine wrapper
func buildResourceARN(bucket, object string) string { func buildResourceARN(bucket, object string) string {
if object == "" || object == "/" { if object == "" || object == "/" {
return fmt.Sprintf("arn:aws:s3:::%s", bucket) return fmt.Sprintf("arn:aws:s3:::%s", bucket)
@ -883,8 +630,12 @@ func (s3a *S3ApiServer) AuthWithPublicRead(handler http.HandlerFunc, action Acti
return return
} }
// Check bucket policy for public access
if s3a.isBucketPolicyAllowed(bucket, object, action) {
// Check bucket policy for anonymous access using the policy engine
principal := "*" // Anonymous principal
allowed, evaluated, err := s3a.policyEngine.EvaluatePolicy(bucket, object, string(action), principal)
if err != nil {
glog.Errorf("AuthWithPublicRead: error evaluating bucket policy: %v", err)
} else if evaluated && allowed {
glog.V(3).Infof("AuthWithPublicRead: allowing anonymous access to bucket %s (bucket policy)", bucket) glog.V(3).Infof("AuthWithPublicRead: allowing anonymous access to bucket %s (bucket policy)", bucket)
handler(w, r) handler(w, r)
return return

Write Preview
Loading…
Cancel
Save