mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-11-20 03:13:53 +01:00
s3api: evaluate request condition keys for STS sessions (#12762)
* s3api: build request condition keys in one helper Split the keys ExtractConditionValuesFromRequest reads from the request itself into RequestConditionValues, keeping aws:SourceIp and the bucket-listing keys in the method. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * s3api: evaluate request condition keys for STS sessions The IAM integration context for STS and OIDC sessions carried only the source IP, legacy user agent/referer keys and claims, so role and session policy conditions on s3:x-amz-*, aws:SecureTransport, aws:CurrentTime, s3:RequestObjectTag/* and the other request keys never matched: a Deny on them never fired, and a negated Deny always did. Add the same request keys the static identity path evaluates. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * s3api: report SigV4 presigned requests as REST-QUERY-STRING s3:authType recognized only SigV2 query authentication, so a policy condition on REST-QUERY-STRING never matched a SigV4 presigned URL. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
2089abecf3
commit
f88751c3ff
4 files changed
+181
-16
No files matched your search
@@ -436,6 +436,27 @@ func TestExtractConditionValuesFromRequestMaxKeys(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestExtractConditionValuesFromRequestAuthType(t *testing.T) {
|
||||
for _, tt := range []struct {
|
||||
query string
|
||||
header string
|
||||
want []string
|
||||
}{
|
||||
{"X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=key%2F20261119%2Fus-east-1%2Fs3%2Faws4_request", "", []string{"REST-QUERY-STRING"}},
|
||||
{"AWSAccessKeyId=key&Expires=1&Signature=sig", "", []string{"REST-QUERY-STRING"}},
|
||||
{"", "AWS4-HMAC-SHA256 Credential=key/20261119/us-east-1/s3/aws4_request", []string{"REST-HEADER"}},
|
||||
{"", "", nil},
|
||||
} {
|
||||
req := &http.Request{Method: "GET", URL: &url.URL{Path: "/test-bucket/key", RawQuery: tt.query}, Header: http.Header{}, RemoteAddr: "10.0.0.5:54321"}
|
||||
if tt.header != "" {
|
||||
req.Header.Set("Authorization", tt.header)
|
||||
}
|
||||
if got := NewPolicyEngine().ExtractConditionValuesFromRequest(req)["s3:authType"]; !slices.Equal(got, tt.want) {
|
||||
t.Errorf("%q %q: s3:authType = %v, want %v", tt.query, tt.header, got, tt.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestExtractConditionValuesFromRequestSourceIPPrecedence(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
|
||||
Reference in new issue
Block a user