From 6958fd94cff2df73999e7df6cc7bc997aa8a884a Mon Sep 17 00:00:00 2001 From: Jeongsoo Lee Date: Mon, 31 Mar 2025 11:18:08 -0400 Subject: [PATCH 1/2] Remove RemoteFlowSources.qll --- .../frameworks/xsjs/RemoteFlowSources.qll | 30 ------------------- .../src/Diagnostics/ListRemoteFlowSources.ql | 2 +- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 javascript/frameworks/xsjs/lib/advanced_security/javascript/frameworks/xsjs/RemoteFlowSources.qll diff --git a/javascript/frameworks/xsjs/lib/advanced_security/javascript/frameworks/xsjs/RemoteFlowSources.qll b/javascript/frameworks/xsjs/lib/advanced_security/javascript/frameworks/xsjs/RemoteFlowSources.qll deleted file mode 100644 index 0346afc30..000000000 --- a/javascript/frameworks/xsjs/lib/advanced_security/javascript/frameworks/xsjs/RemoteFlowSources.qll +++ /dev/null @@ -1,30 +0,0 @@ -import javascript -import DataFlow -import advanced_security.javascript.frameworks.xsjs.AsyncXSJS - -class XSJSZipClassInstantiation extends NewNode { - XSJSZipClassInstantiation() { - exists(XSJSUtilNamespace util | - this = util.getAConstructorInvocation("Zip") and - this.getAnArgument().getALocalSource() instanceof RemoteFlowSource - ) - } -} - -private SourceNode xsjsRequestBody(DataFlow::TypeTracker t) { - t.start() and - exists(XSJSRequest dollarRequest | result = dollarRequest.getAPropertyRead("body")) - or - exists(DataFlow::TypeTracker t2 | result = xsjsRequestBody(t2).track(t2, t)) -} - -private SourceNode xsjsRequestBody() { result = xsjsRequestBody(DataFlow::TypeTracker::end()) } - -class XSJSRequestBody extends SourceNode { - XSJSRequestBody() { - exists(SourceNode dollarRequestBody | dollarRequestBody = xsjsRequestBody() | - this = dollarRequestBody or - this = dollarRequestBody.getAMethodCall(["asArrayBuffer", "asString", "asWebRequest"]) - ) - } -} diff --git a/javascript/frameworks/xsjs/src/Diagnostics/ListRemoteFlowSources.ql b/javascript/frameworks/xsjs/src/Diagnostics/ListRemoteFlowSources.ql index 22d9e1e82..0f8c77e3e 100644 --- a/javascript/frameworks/xsjs/src/Diagnostics/ListRemoteFlowSources.ql +++ b/javascript/frameworks/xsjs/src/Diagnostics/ListRemoteFlowSources.ql @@ -9,7 +9,7 @@ */ import javascript -import advanced_security.javascript.frameworks.xsjs.RemoteFlowSources +import advanced_security.javascript.frameworks.xsjs.AsyncXSJS from RemoteFlowSource source, string type where type = source.getSourceType() From 64189bc285e5e5ffae65ef61aa0dcf9871352648 Mon Sep 17 00:00:00 2001 From: Jeongsoo Lee Date: Mon, 31 Mar 2025 11:34:32 -0400 Subject: [PATCH 2/2] Remove reference to RemoteFlowSources in ZipSlipQuery --- .../javascript/frameworks/xsjs/XSJSZipSlipQuery.qll | 1 - 1 file changed, 1 deletion(-) diff --git a/javascript/frameworks/xsjs/lib/advanced_security/javascript/frameworks/xsjs/XSJSZipSlipQuery.qll b/javascript/frameworks/xsjs/lib/advanced_security/javascript/frameworks/xsjs/XSJSZipSlipQuery.qll index 07a8ef91b..a065a964b 100644 --- a/javascript/frameworks/xsjs/lib/advanced_security/javascript/frameworks/xsjs/XSJSZipSlipQuery.qll +++ b/javascript/frameworks/xsjs/lib/advanced_security/javascript/frameworks/xsjs/XSJSZipSlipQuery.qll @@ -1,6 +1,5 @@ import javascript import advanced_security.javascript.frameworks.xsjs.AsyncXSJS -import advanced_security.javascript.frameworks.xsjs.RemoteFlowSources import semmle.javascript.security.dataflow.ZipSlipQuery as ZipSlip import semmle.javascript.security.dataflow.TaintedPathCustomizations::TaintedPath as TaintedPath