Skip to content

Commit c808a7a

Browse files
committed
chore: skip checksums for x-amz-checksum-algorithm header
This reverts commit 9204de2.
1 parent 9204de2 commit c808a7a

File tree

2 files changed

+2
-36
lines changed

2 files changed

+2
-36
lines changed

packages/middleware-flexible-checksums/src/flexibleChecksumsMiddleware.spec.ts

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -174,39 +174,6 @@ describe(flexibleChecksumsMiddleware.name, () => {
174174
expect(stringHasher).toHaveBeenCalledWith(mockChecksumAlgorithmFunction, mockRequest.body);
175175
expect(mockBase64Encoder).toHaveBeenCalledWith(mockRawChecksum);
176176
});
177-
178-
it.each(["x-amz-checksum-algorithm", "X-AMZ-CHECKSUM-ALGORITHM"])(
179-
"even if '%s' header is present",
180-
async (headerName) => {
181-
const mockRawChecksum = Buffer.from(mockChecksum);
182-
const mockBase64Encoder = vi.fn().mockReturnValue(mockChecksum);
183-
vi.mocked(stringHasher).mockResolvedValue(mockRawChecksum);
184-
vi.mocked(hasHeader).mockReturnValue(false);
185-
186-
const handler = flexibleChecksumsMiddleware(
187-
{ ...mockConfig, base64Encoder: mockBase64Encoder },
188-
mockMiddlewareConfig
189-
)(mockNext, {});
190-
const mockHeadersWithAlgoHeader = { ...mockHeaders, [headerName]: "mockHeaderValue" };
191-
const mockArgsWithAlgoHeader = {
192-
...mockArgs,
193-
request: { ...mockRequest, headers: mockHeadersWithAlgoHeader },
194-
};
195-
await handler(mockArgsWithAlgoHeader);
196-
197-
expect(hasHeader).toHaveBeenCalledTimes(1);
198-
expect(mockNext).toHaveBeenCalledWith({
199-
...mockArgs,
200-
request: {
201-
...mockRequest,
202-
headers: { ...mockHeadersWithAlgoHeader, [mockChecksumLocationName]: mockChecksum },
203-
},
204-
});
205-
expect(hasHeader).toHaveBeenCalledWith(mockChecksumLocationName, mockHeadersWithAlgoHeader);
206-
expect(stringHasher).toHaveBeenCalledWith(mockChecksumAlgorithmFunction, mockRequest.body);
207-
expect(mockBase64Encoder).toHaveBeenCalledWith(mockRawChecksum);
208-
}
209-
);
210177
});
211178

212179
describe("set feature", () => {

packages/middleware-flexible-checksums/src/flexibleChecksumsMiddleware.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,8 @@ export const flexibleChecksumsMiddleware =
5757
return next(args);
5858
}
5959

60-
for (const originalHeader of Object.keys(args.request.headers)) {
61-
const header = originalHeader.toLowerCase();
62-
if (header.startsWith("x-amz-checksum-") && header !== "x-amz-checksum-algorithm") {
60+
for (const header of Object.keys(args.request.headers)) {
61+
if (header.toLowerCase().startsWith("x-amz-checksum-")) {
6362
return next(args);
6463
}
6564
}

0 commit comments

Comments
 (0)