Skip to content

[dataflowengineoss] Fix JS dataflow FN for captured closures in higher-order callbacks #5947

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
ZiyaoZh wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −2
Open

[dataflowengineoss] Fix JS dataflow FN for captured closures in higher-order callbacks #5947

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
4 changes: 3 additions & 1 deletion ...engineoss/src/main/scala/io/joern/dataflowengineoss/passes/reachingdef/DdgGenerator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,9 @@ private class UsageAnalyzer(problem: DataFlowProblem[CfgNode, mutable.BitSet], i
def uses(node: CfgNode): Set[CfgNode] = {
val n: Set[CfgNode] = node match {
case ret: Return => ret.astChildren.collect { case x: Expression => x }.toSet
case call: Call => call.argument.toSet
case call: Call =>
val parameterReceivers = call.receiver.collectAll[Identifier].filter(_.refsTo.collectAll[MethodParameterIn].nonEmpty)
(call.argument ++ parameterReceivers).toSet
case paramOut: MethodParameterOut => Set(paramOut)
case _ => Set()
}
Expand Down
4 changes: 3 additions & 1 deletion ...neoss/src/main/scala/io/joern/dataflowengineoss/queryengine/SourcesToStartingPoints.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,14 +208,16 @@ abstract class BaseSourceToStartingPoints extends Callable[Unit] {
case x: Identifier =>
val fieldAndIndexAccesses = withFieldAndIndexAccesses(x :: Nil)
val capturedReferences = x.refsTo.capturedByMethodRef.referencedMethod.flatMap(firstUsagesForName(x.name, _)).l
val capturingClosures = x.refsTo.capturedByMethodRef.l

(
(x :: fieldAndIndexAccesses ++ capturedReferences) flatMap {
(x :: fieldAndIndexAccesses ++ capturedReferences ++ capturingClosures) flatMap {
case x: Call => handleCallNode(x) // Handle the case if this is an arg to another call
case x => x :: Nil
},
Nil
)
case x: MethodParameterIn => (x :: Nil, Nil)
case x: Call => (handleCallNode(x), Nil)
case x: CfgNode => (x :: Nil, Nil)
case _ => (Nil, Nil)
Expand Down