Skip to content

Commit 0b4f636

Browse files
authored
don't sign transfer-encoding header (#2991)
1 parent b820c57 commit 0b4f636

File tree

5 files changed

+28
-7
lines changed

5 files changed

+28
-7
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"id": "39bec3d6-24bb-499b-af58-012de54829f1",
3+
"type": "bugfix",
4+
"description": "Do not sign Transfer-Encoding header in Sigv4[a]. Fixes a signer mismatch issue with S3 Accelerate.",
5+
"modules": [
6+
".",
7+
"internal/v4a"
8+
]
9+
}

aws/signer/internal/v4/headers.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ package v4
44
var IgnoredHeaders = Rules{
55
ExcludeList{
66
MapRule{
7-
"Authorization": struct{}{},
8-
"User-Agent": struct{}{},
9-
"X-Amzn-Trace-Id": struct{}{},
10-
"Expect": struct{}{},
7+
"Authorization": struct{}{},
8+
"User-Agent": struct{}{},
9+
"X-Amzn-Trace-Id": struct{}{},
10+
"Expect": struct{}{},
11+
"Transfer-Encoding": struct{}{},
1112
},
1213
},
1314
}

aws/signer/v4/v4_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,11 @@ func TestPresignBodyWithArrayRequest(t *testing.T) {
162162

163163
func TestSignRequest(t *testing.T) {
164164
req, body := buildRequest("dynamodb", "us-east-1", "{}")
165+
// test ignored headers
166+
req.Header.Set("User-Agent", "foo")
167+
req.Header.Set("X-Amzn-Trace-Id", "bar")
168+
req.Header.Set("Expect", "baz")
169+
req.Header.Set("Transfer-Encoding", "qux")
165170
signer := NewSigner()
166171
err := signer.SignHTTP(context.Background(), testCredentials, req, body, "dynamodb", "us-east-1", time.Unix(0, 0))
167172
if err != nil {

internal/v4a/internal/v4/headers.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ package v4
44
var IgnoredHeaders = Rules{
55
DenyList{
66
MapRule{
7-
"Authorization": struct{}{},
8-
"User-Agent": struct{}{},
9-
"X-Amzn-Trace-Id": struct{}{},
7+
"Authorization": struct{}{},
8+
"User-Agent": struct{}{},
9+
"X-Amzn-Trace-Id": struct{}{},
10+
"Transfer-Encoding": struct{}{},
1011
},
1112
},
1213
}

internal/v4a/v4a_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@ func TestDeriveECDSAKeyPairFromSecret(t *testing.T) {
5757
func TestSignHTTP(t *testing.T) {
5858
req := buildRequest("dynamodb", "us-east-1")
5959

60+
// test ignored headers
61+
req.Header.Set("User-Agent", "foo")
62+
req.Header.Set("X-Amzn-Trace-Id", "bar")
63+
req.Header.Set("Transfer-Encoding", "qux")
64+
6065
signer, credProvider := buildSigner(t, true)
6166

6267
key, err := credProvider.RetrievePrivateKey(context.Background())

0 commit comments

Comments
 (0)