From cf6d166d29ca20e2abfd516b390b0ae579f0d9db Mon Sep 17 00:00:00 2001 From: Asger F Date: Fri, 13 Dec 2024 15:00:50 +0100 Subject: [PATCH] JS: Also update tutorial code --- ...lyzing-data-flow-in-javascript-and-typescript.rst | 12 ++++++------ .../Global data flow/query4.ql | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/codeql/codeql-language-guides/analyzing-data-flow-in-javascript-and-typescript.rst b/docs/codeql/codeql-language-guides/analyzing-data-flow-in-javascript-and-typescript.rst index 44da0912d4a..2a65fbe5dc5 100644 --- a/docs/codeql/codeql-language-guides/analyzing-data-flow-in-javascript-and-typescript.rst +++ b/docs/codeql/codeql-language-guides/analyzing-data-flow-in-javascript-and-typescript.rst @@ -416,11 +416,11 @@ additional taint step from the first argument of ``resolveSymlinks`` to its resu // ... - predicate isAdditionalFlowStep(DataFlow::Node pred, DataFlow::Node succ) { + predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) { exists(DataFlow::CallNode c | c = DataFlow::moduleImport("resolve-symlinks").getACall() and - pred = c.getArgument(0) and - succ = c + node1 = c.getArgument(0) and + node2 = c ) } } @@ -431,11 +431,11 @@ to wrap it in a new subclass of ``TaintTracking::SharedTaintStep`` like this: .. code-block:: ql class StepThroughResolveSymlinks extends TaintTracking::SharedTaintStep { - override predicate step(DataFlow::Node pred, DataFlow::Node succ) { + override predicate step(DataFlow::Node node1, DataFlow::Node node2) { exists(DataFlow::CallNode c | c = DataFlow::moduleImport("resolve-symlinks").getACall() and - pred = c.getArgument(0) and - succ = c + node1 = c.getArgument(0) and + node2 = c ) } } diff --git a/javascript/ql/test/tutorials/Analyzing data flow in JavaScript/Global data flow/query4.ql b/javascript/ql/test/tutorials/Analyzing data flow in JavaScript/Global data flow/query4.ql index dff069d72e2..b4980bc9173 100644 --- a/javascript/ql/test/tutorials/Analyzing data flow in JavaScript/Global data flow/query4.ql +++ b/javascript/ql/test/tutorials/Analyzing data flow in JavaScript/Global data flow/query4.ql @@ -9,11 +9,11 @@ module CommandLineFileNameConfig implements DataFlow::ConfigSig { DataFlow::moduleMember("fs", "readFile").getACall().getArgument(0) = sink } - predicate isAdditionalFlowStep(DataFlow::Node pred, DataFlow::Node succ) { + predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) { exists(DataFlow::CallNode c | c = DataFlow::moduleImport("resolve-symlinks").getACall() and - pred = c.getArgument(0) and - succ = c + node1 = c.getArgument(0) and + node2 = c ) } }