Skip to content

fix(bug-detectors): handle connect(port, host) in ssrf tcp hook #890

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

Open
metsw24-max wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −1
Open

fix(bug-detectors): handle connect(port, host) in ssrf tcp hook #890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions packages/bug-detectors/internal/ssrf.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,13 @@ describe("SSRF", () => {
expect(() =>
hookTCPSocket(undefined, [80, "localhost", "callback"], 0),
).not.toThrow();
// connect(port, host) without a listener
expect(() => hookTCPSocket(undefined, [8080, "local"], 0)).toThrow(
"Server Side Request Forgery",
);
expect(() =>
hookTCPSocket(undefined, [80, "localhost"], 0),
).not.toThrow();
});

test("Call TCP socket hook with ports as strings", () => {
Expand Down Expand Up @@ -194,6 +201,13 @@ describe("SSRF", () => {
expect(() =>
hookTCPSocket(undefined, ["80", "localhost", "callback"], 0),
).not.toThrow();
// connect(port, host) without a listener
expect(() => hookTCPSocket(undefined, ["81", "local"], 0)).toThrow(
"Server Side Request Forgery",
);
expect(() =>
hookTCPSocket(undefined, ["80", "localhost"], 0),
).not.toThrow();
});
});

Expand Down
5 changes: 4 additions & 1 deletion packages/bug-detectors/internal/ssrf.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,14 @@ export function hookTCPSocket(_thisPtr: unknown, args: unknown[], _id: number) {
detectSSRF(port, host, "Attempted connection via TCP");
}
} else if (args.length === 2) {
// connect(options: SocketConnectOpts, connectionListener?: () => void): this;
const firstArgument = args[0];
if (typeof firstArgument === "object" && firstArgument !== null) {
// connect(options: SocketConnectOpts, connectionListener?: () => void): this;
const options = firstArgument as TcpSocketConnectOpts;
detectSSRF(options.port, options.host, "Attempted connection via TCP");
} else if (typeof args[1] === "string") {
// connect(port: number, host: string): this;
detectSSRF(firstArgument, args[1], "Attempted connection via TCP");
}
} else if (args.length === 3) {
// connect(port: number, host: string, connectionListener?: () => void): this;
Expand Down