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:
Chris LuandClaude Opus 5.5 authored and GitHub committed 2026-11-19 00:01:32 -08:00
1 parent 2089abecf3
commit f88751c3ff
4 files changed
+181 -16

No files matched your search

+25 -16
View File
@@ -416,10 +416,33 @@ func ExtractPrincipalVariables(principal string) map[string][]string {
// ExtractConditionValuesFromRequest extracts condition values from HTTP request
func (engine *PolicyEngine) ExtractConditionValuesFromRequest(r *http.Request) map[string][]string {
values := RequestConditionValues(r)
values["aws:SourceIp"] = []string{engine.extractSourceIP(r)}
// S3 bucket-level conditions
if delimiter := r.URL.Query().Get("delimiter"); delimiter != "" {
values["s3:delimiter"] = []string{delimiter}
}
if prefix := r.URL.Query().Get("prefix"); prefix != "" {
values["s3:prefix"] = []string{prefix}
}
// Multipart listings use max-uploads, so max-keys cannot constrain them.
if maxKeys := r.URL.Query().Get("max-keys"); maxKeys != "" && !r.URL.Query().Has("uploads") {
values["s3:max-keys"] = []string{maxKeys}
}
return values
}
// RequestConditionValues returns the condition keys read from the request
// itself, leaving out aws:SourceIp and the bucket-listing keys, which depend
// on the caller's proxy and listing handling.
func RequestConditionValues(r *http.Request) map[string][]string {
values := make(map[string][]string)
// AWS condition keys
values["aws:SourceIp"] = []string{engine.extractSourceIP(r)}
values["aws:SecureTransport"] = []string{fmt.Sprintf("%t", r.TLS != nil)}
// Use AWS standard condition key for current time
values["aws:CurrentTime"] = []string{time.Now().Format(time.RFC3339)}
@@ -445,20 +468,6 @@ func (engine *PolicyEngine) ExtractConditionValuesFromRequest(r *http.Request) m
values[RequestObjectTagKeys] = slices.Sorted(maps.Keys(tags))
}
// S3 bucket-level conditions
if delimiter := r.URL.Query().Get("delimiter"); delimiter != "" {
values["s3:delimiter"] = []string{delimiter}
}
if prefix := r.URL.Query().Get("prefix"); prefix != "" {
values["s3:prefix"] = []string{prefix}
}
// Multipart listings use max-uploads, so max-keys cannot constrain them.
if maxKeys := r.URL.Query().Get("max-keys"); maxKeys != "" && !r.URL.Query().Has("uploads") {
values["s3:max-keys"] = []string{maxKeys}
}
// Authentication method
if authHeader := r.Header.Get("Authorization"); authHeader != "" {
if strings.HasPrefix(authHeader, "AWS4-HMAC-SHA256") {
@@ -466,7 +475,7 @@ func (engine *PolicyEngine) ExtractConditionValuesFromRequest(r *http.Request) m
} else if strings.HasPrefix(authHeader, "AWS ") {
values["s3:authType"] = []string{"REST-HEADER"}
}
} else if r.URL.Query().Get("AWSAccessKeyId") != "" {
} else if query := r.URL.Query(); query.Get("AWSAccessKeyId") != "" || query.Get("X-Amz-Credential") != "" {
values["s3:authType"] = []string{"REST-QUERY-STRING"}
}
+21
View File
@@ -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