Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(middleware-websocket): pass options to presign in WebsocketSignatureV4 sign #5015

Merged
merged 2 commits into from
Jul 26, 2023
Merged

fix(middleware-websocket): pass options to presign in WebsocketSignatureV4 sign #5015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5586651
fix(middleware-websocket): pass signing options in WebsocketSignature…
trivikr Jul 26, 2023
ce3fadb
test(middleware-websocket): case for options being passed in presign
trivikr Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/middleware-websocket/src/WebsocketSignatureV4.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ describe("WebsocketSignatureV4", () => {
(isInstance as unknown as jest.Mock).mockReturnValueOnce(true);
});

const expectSignArgs = (result: any) => {
const expectSignArgs = (result: any, options: RequestPresigningArguments = {}) => {
expect(result).toStrictEqual({
...mockPresignedRequest,
body: request.body,
Expand All @@ -69,6 +69,7 @@ describe("WebsocketSignatureV4", () => {
expect(presign).toHaveBeenCalledWith(
{ ...request, body: "" },
{
...options,
expiresIn: 60,
unsignableHeaders: new Set(Object.keys(request.headers).filter((header) => header !== "host")),
}
Expand All @@ -82,11 +83,10 @@ describe("WebsocketSignatureV4", () => {
});

it("with options", async () => {
const options = {
unsignableHeaders: new Set(Object.keys(headers)),
};
const signingDate = new Date();
const options = { signingDate };
const result = await sigV4.sign(request as any, options);
expectSignArgs(result);
expectSignArgs(result, options);
});
});

Expand Down
1 change: 1 addition & 0 deletions packages/middleware-websocket/src/WebsocketSignatureV4.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export class WebsocketSignatureV4 implements RequestSigner, RequestPresigner {
const signedRequest = await this.signer.presign(
{ ...toSign, body: "" },
{
...options,
// presigned url must be expired within 1 min.
expiresIn: 60,
// Not to sign headers. Transcribe-streaming WebSocket
Expand Down