fix: do not sign content-type in s3-request-presigner

aws · Mar 19, 2020 · d26a90b · d26a90b
1 parent 22900d4
commit d26a90b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/packages/s3-request-presigner/src/index.spec.ts b/packages/s3-request-presigner/src/index.spec.ts
@@ -77,4 +77,23 @@ describe("s3 presigner", () => {
     });
     expect(minimalRequest).toMatchObject(originalRequest);
   });
+
+  it("should not sign content-type header", async () => {
+    const signer = new S3RequestPresigner(s3ResolvedConfig);
+    const requestWithContentTypeHeader = {
+      ...minimalRequest,
+      headers: {
+        ...minimalRequest.headers,
+        "Content-Type": "application/octet-stream"
+      }
+    };
+    const signed = await signer.presignRequest(
+      requestWithContentTypeHeader,
+      expiration,
+      presigningOptions
+    );
+    expect(signed.query).toMatchObject({
+      [SIGNED_HEADERS_QUERY_PARAM]: HOST_HEADER
+    });
+  });
 });
diff --git a/packages/s3-request-presigner/src/index.ts b/packages/s3-request-presigner/src/index.ts
@@ -39,9 +39,13 @@ export class S3RequestPresigner implements RequestPresigner {
   public async presignRequest(
     requestToSign: IHttpRequest,
     expiration: DateInput,
-    options?: RequestSigningArguments
+    { unsignableHeaders = new Set(), ...options }: RequestSigningArguments = {}
   ): Promise<IHttpRequest> {
+    unsignableHeaders.add("content-type");
     requestToSign.headers[SHA256_HEADER] = UNSIGNED_PAYLOAD;
-    return this.signer.presignRequest(requestToSign, expiration, options);
+    return this.signer.presignRequest(requestToSign, expiration, {
+      unsignableHeaders,
+      ...options
+    });
   }
 }