Sync ignored v4 presign headers (#1639)

fixes #1629
minio · Apr 16, 2022 · 8142170 · 8142170
1 parent deb9ab4
commit 8142170
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/pkg/signer/request-signature-v4.go b/pkg/signer/request-signature-v4.go
@@ -46,21 +46,22 @@ const (
 // Excerpts from @lsegal -
 // https:/github.com/aws/aws-sdk-js/issues/659#issuecomment-120477258.
 //
-//  User-Agent:
+// * User-Agent
+// This is ignored from signing because signing this causes problems with generating pre-signed
+// URLs (that are executed by other agents) or when customers pass requests through proxies, which
+// may modify the user-agent.
 //
-//      This is ignored from signing because signing this causes
-//      problems with generating pre-signed URLs (that are executed
-//      by other agents) or when customers pass requests through
-//      proxies, which may modify the user-agent.
+// * Authorization
+// Is skipped for obvious reasons.
 //
-//
-//  Authorization:
-//
-//      Is skipped for obvious reasons
+// * Accept-Encoding
+// Some S3 servers like Hitachi Content Platform do not honor this header for signature
+// calculation.
 //
 var v4IgnoredHeaders = map[string]bool{
-	"Authorization": true,
-	"User-Agent":    true,
+	"Accept-Encoding": true,
+	"Authorization":   true,
+	"User-Agent":      true,
 }
 
 // getSigningKey hmac seed to calculate final signature.

diff --git a/pkg/signer/request-signature-v4_test.go b/pkg/signer/request-signature-v4_test.go
@@ -41,11 +41,12 @@ func buildRequest(serviceName, region, body string) (*http.Request, io.ReadSeeke
 	reader := strings.NewReader(body)
 	req, _ := http.NewRequest(http.MethodPost, endpoint, reader)
 	req.URL.Opaque = "//example.org/bucket/key-._~,!@#$%^&*()"
-	req.Header.Add("X-Amz-Target", "prefix.Operation")
+	req.Header.Add("Accept-Encoding", "identity")
 	req.Header.Add("Content-Type", "application/x-amz-json-1.0")
 	req.Header.Add("Content-Length", fmt.Sprint(len(body)))
 	req.Header.Add("X-Amz-Meta-Other-Header", "some-value=!@#$%^&* (+)")
 	req.Header.Add("X-Amz-Meta-Other-Header_With_Underscore", "some-value=!@#$%^&* (+)")
 	req.Header.Add("X-amz-Meta-Other-Header_With_Underscore", "some-value=!@#$%^&* (+)")
+	req.Header.Add("X-Amz-Target", "prefix.Operation")
 	return req, reader
 }