fix(javascript): keep computed-method XHR request URLs
A computed XHR method, as in `xhr.open(method, "/api")`, no longer discarded an endpoint that main reports. Keep the URL when it is an HTTP(S)/WebSocket URL or a path; fs flags and window targets such as `r` and `_blank` still produce no endpoint. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
8e8921d40c
commit
602d0021d4
|
|
@ -356,18 +356,31 @@ const XHR_METHODS = new Set([
|
|||
"TRACE",
|
||||
]);
|
||||
|
||||
/** An absolute HTTP(S)/WebSocket URL, or an absolute or relative path. */
|
||||
const isRequestUrlLiteral = (value: string): boolean =>
|
||||
/^(?:https?|wss?):\/\//iu.test(value) ||
|
||||
value.startsWith("/") ||
|
||||
value.startsWith("./") ||
|
||||
value.startsWith("../");
|
||||
|
||||
/**
|
||||
* Require a literal HTTP method: `fs.open(path, "r")` and
|
||||
* `window.open(url, "_blank")` share the callee name but take no URL second.
|
||||
* Read `XMLHttpRequest.open(method, url)`. `fs.open(path, "r")` and
|
||||
* `window.open(url, "_blank")` share the callee name, so a literal method
|
||||
* must be an HTTP method, and a computed method needs a request URL literal.
|
||||
* XHR normalizes the standard methods' case; extension methods such as
|
||||
* WebDAV `PROPFIND` are conventionally uppercase tokens.
|
||||
*/
|
||||
const isXhrMethodArgument = (node: t.Node | null | undefined): boolean => {
|
||||
const value = stringValue(node);
|
||||
return (
|
||||
value !== undefined &&
|
||||
(XHR_METHODS.has(value.toUpperCase()) || /^[A-Z][A-Z-]*$/u.test(value))
|
||||
);
|
||||
const xhrOpenUrl = (
|
||||
methodNode: t.Node | null | undefined,
|
||||
urlNode: t.Node | null | undefined,
|
||||
): string | undefined => {
|
||||
const url = stringValue(urlNode);
|
||||
if (url === undefined) return undefined;
|
||||
const method = stringValue(methodNode);
|
||||
if (method === undefined) return isRequestUrlLiteral(url) ? url : undefined;
|
||||
return XHR_METHODS.has(method.toUpperCase()) || /^[A-Z][A-Z-]*$/u.test(method)
|
||||
? url
|
||||
: undefined;
|
||||
};
|
||||
|
||||
/** Select the literal URL argument for recognized network callees. */
|
||||
|
|
@ -382,9 +395,7 @@ export const endpointArgument = (
|
|||
): string | undefined => {
|
||||
if (name === "fetch" || name.endsWith(".fetch") || name === "WebSocket")
|
||||
return stringValue(args[0]);
|
||||
// `XMLHttpRequest.open(method, url)`.
|
||||
if (name.endsWith(".open") && isXhrMethodArgument(args[0]))
|
||||
return stringValue(args[1]);
|
||||
if (name.endsWith(".open")) return xhrOpenUrl(args[0], args[1]);
|
||||
if (
|
||||
["get", "post", "put", "patch", "delete", "request"].some(
|
||||
(method) => name === method || name.endsWith(`.${method}`),
|
||||
|
|
|
|||
|
|
@ -183,11 +183,18 @@ describe("web bundle static-analysis parity", () => {
|
|||
fs.open("/tmp/data.txt", "r", done);
|
||||
window.open("https://help.example.test/", "_blank");
|
||||
xhr.open(method, "/dynamic-method");
|
||||
fs.open(path, "r", done);
|
||||
window.open(url, "_blank");
|
||||
`),
|
||||
);
|
||||
expect(
|
||||
result.observations.endpoints.map(({ value }) => value).sort(),
|
||||
).toEqual(["/dav/", "/xhr-get", "https://xhr.example.test/submit"]);
|
||||
).toEqual([
|
||||
"/dav/",
|
||||
"/dynamic-method",
|
||||
"/xhr-get",
|
||||
"https://xhr.example.test/submit",
|
||||
]);
|
||||
});
|
||||
|
||||
it("recognizes loadURL endpoints like static analysis", () => {
|
||||
|
|
|
|||
Loading…
Reference in New Issue