Skip to content

Commit 370ce09

Browse files
MathiasVPMathiasVP
committed
Java: Fixup queries and accept test changes.
1 parent 58ef97c commit 370ce09

13 files changed

+25
-24
lines changed

‎java/ql/src/utils/modelgenerator/CaptureContentSummaryModels.ql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
import internal.CaptureModels
1010

1111
from DataFlowSummaryTargetApi api, string flow
12-
where flow = ContentSensitive::captureFlow(api, _)
12+
where flow = ContentSensitive::captureFlow(api, _, _)
1313
select flow order by flow

‎java/ql/src/utils/modelgenerator/debug/CaptureSummaryModelsPartialPath.ql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import PartialFlow::PartialPathGraph
1515

1616
int explorationLimit() { result = 3 }
1717

18-
module PartialFlow = Heuristic::PropagateFlow::FlowExplorationFwd<explorationLimit/0>;
18+
module PartialFlow = Heuristic::PropagateTaintFlow::FlowExplorationFwd<explorationLimit/0>;
1919

2020
from
2121
PartialFlow::PartialPathNode source, PartialFlow::PartialPathNode sink,

‎java/ql/src/utils/modelgenerator/debug/CaptureSummaryModelsPath.ql‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ import java
1212
import semmle.code.java.dataflow.DataFlow
1313
import utils.modelgenerator.internal.CaptureModels
1414
import Heuristic
15-
import PropagateFlow::PathGraph
15+
import PropagateTaintFlow::PathGraph
1616

1717
from
18-
PropagateFlow::PathNode source, PropagateFlow::PathNode sink, DataFlowSummaryTargetApi api,
19-
DataFlow::Node p, DataFlow::Node returnNodeExt
18+
PropagateTaintFlow::PathNode source, PropagateTaintFlow::PathNode sink,
19+
DataFlowSummaryTargetApi api, DataFlow::Node p, DataFlow::Node returnNodeExt
2020
where
21-
PropagateFlow::flowPath(source, sink) and
21+
PropagateTaintFlow::flowPath(source, sink) and
2222
p = source.getNode() and
2323
returnNodeExt = sink.getNode() and
24-
exists(captureThroughFlow0(api, p, returnNodeExt))
24+
exists(captureThroughFlow0(api, p, returnNodeExt, [false, true]))
2525
select sink.getNode(), source, sink, "There is flow from $@ to the $@.", source.getNode(),
2626
"parameter", sink.getNode(), "return value"

‎java/ql/test/utils/modelgenerator/dataflow/CaptureContentSummaryModels.ql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import utils.modelgenerator.internal.CaptureModels
33
import utils.test.InlineMadTest
44

55
module InlineMadTestConfig implements InlineMadTestConfigSig {
6-
string getCapturedModel(Callable c) { result = ContentSensitive::captureFlow(c, _) }
6+
string getCapturedModel(Callable c) { result = ContentSensitive::captureFlow(c, _, _) }
77

88
string getKind() { result = "contentbased-summary" }
99
}

‎java/ql/test/utils/modelgenerator/dataflow/CaptureHeuristicSummaryModels.ql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import utils.modelgenerator.internal.CaptureModels
33
import utils.test.InlineMadTest
44

55
module InlineMadTestConfig implements InlineMadTestConfigSig {
6-
string getCapturedModel(Callable c) { result = Heuristic::captureFlow(c) }
6+
string getCapturedModel(Callable c) { result = Heuristic::captureHeuristicFlow(c, _) }
77

88
string getKind() { result = "heuristic-summary" }
99
}

‎java/ql/test/utils/modelgenerator/dataflow/p/FinalClass.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ public final class FinalClass {
44

55
private static final String C = "constant";
66

7-
// heuristic-summary=p;FinalClass;false;returnsInput;(String);;Argument[0];ReturnValue;taint;df-generated
7+
// heuristic-summary=p;FinalClass;false;returnsInput;(String);;Argument[0];ReturnValue;value;df-generated
88
// contentbased-summary=p;FinalClass;false;returnsInput;(String);;Argument[0];ReturnValue;value;dfc-generated
99
public String returnsInput(String input) {
1010
return input;

‎java/ql/test/utils/modelgenerator/dataflow/p/ImmutablePojo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public long getX() {
2424
return x;
2525
}
2626

27-
// heuristic-summary=p;ImmutablePojo;false;or;(String);;Argument[0];ReturnValue;taint;df-generated
27+
// heuristic-summary=p;ImmutablePojo;false;or;(String);;Argument[0];ReturnValue;value;df-generated
2828
// heuristic-summary=p;ImmutablePojo;false;or;(String);;Argument[this];ReturnValue;taint;df-generated
2929
// contentbased-summary=p;ImmutablePojo;false;or;(String);;Argument[0];ReturnValue;value;dfc-generated
3030
// contentbased-summary=p;ImmutablePojo;false;or;(String);;Argument[this].SyntheticField[p.ImmutablePojo.value];ReturnValue;value;dfc-generated

‎java/ql/test/utils/modelgenerator/dataflow/p/Inheritance.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public abstract class BasePublic {
1010
}
1111

1212
public class AImplBasePrivateImpl extends BasePrivate {
13-
// heuristic-summary=p;Inheritance$AImplBasePrivateImpl;true;id;(String);;Argument[0];ReturnValue;taint;df-generated
13+
// heuristic-summary=p;Inheritance$AImplBasePrivateImpl;true;id;(String);;Argument[0];ReturnValue;value;df-generated
1414
// contentbased-summary=p;Inheritance$AImplBasePrivateImpl;true;id;(String);;Argument[0];ReturnValue;value;dfc-generated
1515
@Override
1616
public String id(String s) {
@@ -19,7 +19,7 @@ public String id(String s) {
1919
}
2020

2121
public class AImplBasePublic extends BasePublic {
22-
// heuristic-summary=p;Inheritance$BasePublic;true;id;(String);;Argument[0];ReturnValue;taint;df-generated
22+
// heuristic-summary=p;Inheritance$BasePublic;true;id;(String);;Argument[0];ReturnValue;value;df-generated
2323
// contentbased-summary=p;Inheritance$BasePublic;true;id;(String);;Argument[0];ReturnValue;value;dfc-generated
2424
@Override
2525
public String id(String s) {
@@ -60,7 +60,7 @@ private abstract class E implements IPrivate2 {
6060
}
6161

6262
public class BImpl extends B {
63-
// heuristic-summary=p;Inheritance$IPublic1;true;id;(String);;Argument[0];ReturnValue;taint;df-generated
63+
// heuristic-summary=p;Inheritance$IPublic1;true;id;(String);;Argument[0];ReturnValue;value;df-generated
6464
// contentbased-summary=p;Inheritance$IPublic1;true;id;(String);;Argument[0];ReturnValue;value;dfc-generated
6565
@Override
6666
public String id(String s) {
@@ -69,7 +69,7 @@ public String id(String s) {
6969
}
7070

7171
public class CImpl extends C {
72-
// heuristic-summary=p;Inheritance$C;true;id;(String);;Argument[0];ReturnValue;taint;df-generated
72+
// heuristic-summary=p;Inheritance$C;true;id;(String);;Argument[0];ReturnValue;value;df-generated
7373
// contentbased-summary=p;Inheritance$C;true;id;(String);;Argument[0];ReturnValue;value;dfc-generated
7474
@Override
7575
public String id(String s) {
@@ -78,7 +78,7 @@ public String id(String s) {
7878
}
7979

8080
public class DImpl extends D {
81-
// heuristic-summary=p;Inheritance$IPublic2;true;id;(String);;Argument[0];ReturnValue;taint;df-generated
81+
// heuristic-summary=p;Inheritance$IPublic2;true;id;(String);;Argument[0];ReturnValue;value;df-generated
8282
// contentbased-summary=p;Inheritance$IPublic2;true;id;(String);;Argument[0];ReturnValue;value;dfc-generated
8383
@Override
8484
public String id(String s) {
@@ -87,7 +87,7 @@ public String id(String s) {
8787
}
8888

8989
public class EImpl extends E {
90-
// heuristic-summary=p;Inheritance$EImpl;true;id;(String);;Argument[0];ReturnValue;taint;df-generated
90+
// heuristic-summary=p;Inheritance$EImpl;true;id;(String);;Argument[0];ReturnValue;value;df-generated
9191
// contentbased-summary=p;Inheritance$EImpl;true;id;(String);;Argument[0];ReturnValue;value;dfc-generated
9292
@Override
9393
public String id(String s) {

‎java/ql/test/utils/modelgenerator/dataflow/p/InnerClasses.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ public String no(String input) {
99
}
1010

1111
public class CaptureMe {
12-
// heuristic-summary=p;InnerClasses$CaptureMe;true;yesCm;(String);;Argument[0];ReturnValue;taint;df-generated
12+
// heuristic-summary=p;InnerClasses$CaptureMe;true;yesCm;(String);;Argument[0];ReturnValue;value;df-generated
1313
// contentbased-summary=p;InnerClasses$CaptureMe;true;yesCm;(String);;Argument[0];ReturnValue;value;dfc-generated
1414
public String yesCm(String input) {
1515
return input;
1616
}
1717
}
1818

19-
// heuristic-summary=p;InnerClasses;true;yes;(String);;Argument[0];ReturnValue;taint;df-generated
19+
// heuristic-summary=p;InnerClasses;true;yes;(String);;Argument[0];ReturnValue;value;df-generated
2020
// contentbased-summary=p;InnerClasses;true;yes;(String);;Argument[0];ReturnValue;value;dfc-generated
2121
public String yes(String input) {
2222
return input;

‎java/ql/test/utils/modelgenerator/dataflow/p/MultiPaths.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
public class MultiPaths {
44

5+
// heuristic-summary=p;MultiPaths;true;cond;(String,String);;Argument[0];ReturnValue;value;df-generated
56
// heuristic-summary=p;MultiPaths;true;cond;(String,String);;Argument[0];ReturnValue;taint;df-generated
67
// contentbased-summary=p;MultiPaths;true;cond;(String,String);;Argument[0];ReturnValue;value;dfc-generated
78
public String cond(String x, String other) {

0 commit comments

Comments
 (0)