Skip to content

Commit cf3a62d

Browse files
committed
Java: Address review comments.
1 parent dca3934 commit cf3a62d

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ private MethodAccess callReturningSameType(Expr ref) {
618618
}
619619

620620
private SrcRefType entrypointType() {
621-
exists(RemoteFlowSource s, RefType t |
621+
exists(ThreatModelFlowSource s, RefType t |
622622
s instanceof DataFlow::ExplicitParameterNode and
623623
t = pragma[only_bind_out](s).getType() and
624624
not t instanceof TypeObject and
@@ -629,6 +629,10 @@ private SrcRefType entrypointType() {
629629
}
630630

631631
private predicate entrypointFieldStep(DataFlow::Node src, DataFlow::Node sink) {
632-
src = DataFlow::getFieldQualifier(sink.asExpr().(FieldRead)) and
632+
exists(FieldRead fa |
633+
fa = sink.asExpr() and
634+
src = DataFlow::getFieldQualifier(fa) and
635+
not fa.getField().isStatic()
636+
) and
633637
src.getType().(RefType).getSourceDeclaration() = entrypointType()
634638
}

java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjectionLib.qll

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,18 +86,8 @@ module ThreatModelFlowConfig implements DataFlow::ConfigSig {
8686
}
8787
}
8888

89-
/**
90-
* DEPRECATED: Use `ThreatModelFlowConfig` instead.
91-
*/
92-
deprecated module RemoteFlowConfig = ThreatModelFlowConfig;
93-
9489
module ThreatModelFlow = DataFlow::Global<ThreatModelFlowConfig>;
9590

96-
/**
97-
* DEPRECATED: Use `ThreatModelFlow` instead.
98-
*/
99-
deprecated module RemoteFlow = ThreatModelFlow;
100-
10191
/** A data flow configuration tracing flow from json data into the argument `json` of JSONP-like string `someFunctionName + "(" + json + ")"`. */
10292
module JsonDataFlowConfig implements DataFlow::ConfigSig {
10393
predicate isSource(DataFlow::Node src) { src instanceof JsonStringSource }

0 commit comments

Comments
 (0)