Skip to content

Java: Update file that was forgotten in #157 #159

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

Merged
MathiasVP merged 2 commits into from
Jan 31, 2025
Merged

Java: Update file that was forgotten in #157 #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
712d8aa
Java: Update file that was forgotten in the dataflow-stack PR.
MathiasVP Jan 31, 2025
403ad3c
Shared: Add missing transitive closure.
MathiasVP Jan 31, 2025
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
34 changes: 28 additions & 6 deletions java/ql/lib/semmle/code/java/dataflow/DataFlowStack.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,36 @@
import java
private import semmle.code.java.dataflow.DataFlow
private import semmle.code.java.dataflow.internal.DataFlowImplSpecific

private import codeql.dataflowstack.DataFlowStack as DFS
private import DFS::DataFlowStackMake<Location, JavaDataFlow> as DataFlowStackFactory

module DataFlowStackMake<DataFlowStackFactory::DataFlow::GlobalFlowSig Flow>{
import DataFlowStackFactory::FlowStack<Flow>
private module DataFlowStackInput<DataFlowStackFactory::DataFlow::ConfigSig Config> implements
DFS::DataFlowStackSig<Location, JavaDataFlow, Config>
{
private module Flow = DataFlow::Global<Config>;

JavaDataFlow::Node getNode(Flow::PathNode n) { result = n.getNode() }

predicate isSource(Flow::PathNode n) { n.isSource() }

Flow::PathNode getASuccessor(Flow::PathNode n) { result = n.getASuccessor() }

JavaDataFlow::DataFlowCallable getARuntimeTarget(JavaDataFlow::DataFlowCall call) {
result.asCallable() = call.asCall().getCallee()
}

JavaDataFlow::Node getAnArgumentNode(JavaDataFlow::DataFlowCall call) {
result = JavaDataFlow::exprNode(call.asCall().getAnArgument())
}
}

module DataFlowStackMake<DataFlowStackFactory::DataFlow::ConfigSig Config> {
import DataFlowStackFactory::FlowStack<Config, DataFlowStackInput<Config>>
}

module BiStackAnalysisMake<DataFlowStackFactory::DataFlow::GlobalFlowSig FlowA, DataFlowStackFactory::DataFlow::GlobalFlowSig FlowB>{
import DataFlowStackFactory::BiStackAnalysis<FlowA, FlowB>
}
module BiStackAnalysisMake<
DataFlowStackFactory::DataFlow::ConfigSig ConfigA,
DataFlowStackFactory::DataFlow::ConfigSig ConfigB>
{
import DataFlowStackFactory::BiStackAnalysis<ConfigA, DataFlowStackInput<ConfigA>, ConfigB, DataFlowStackInput<ConfigB>>
}
2 changes: 1 addition & 1 deletion shared/dataflowstack/codeql/dataflowstack/DataFlowStack.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ module DataFlowStackMake<LocationSig Location, DF::InputSig<Location> Lang> {
exists(Flow::PathNode source, Flow::PathNode sink |
flowStack = TFlowStack(source, sink) and
frame.getPathNode() = DataFlowStack::getASuccessor*(source) and
DataFlowStack::getASuccessor(frame.getPathNode()) = sink
DataFlowStack::getASuccessor*(frame.getPathNode()) = sink
)
}

Expand Down
2 changes: 1 addition & 1 deletion shared/dataflowstack/codeql/dataflowstack/TaintTrackingStack.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ module TaintTrackingStackMake<
exists(Flow::PathNode source, Flow::PathNode sink |
flowStack = TFlowStack(source, sink) and
frame.getPathNode() = TaintTrackingStack::getASuccessor*(source) and
TaintTrackingStack::getASuccessor(frame.getPathNode()) = sink
TaintTrackingStack::getASuccessor*(frame.getPathNode()) = sink
)
}

Expand Down