Skip to content

Commit b2856c1

Browse files
michaelnebelmichaelnebel
authored
Merge pull request github#11705 from michaelnebel/dataextensiontests
C#/Java: Migrate tests to use implicitly loaded extensions.
2 parents e45edcc + c34bde9 commit b2856c1

File tree

28 files changed

+235
-265
lines changed

28 files changed

+235
-265
lines changed

‎csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.ext.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
extensions:
2+
- addsTo:
3+
pack: codeql/csharp-all
4+
extensible: summaryModel
5+
data:
6+
# "namespace", "type", "overrides", "name", "signature", "ext", "inputspec", "outputspec", "kind", "provenance"
7+
- ["My.Qltest", "D", false, "StepArgRes", "(System.Object)","", "Argument[0]", "ReturnValue", "taint", "manual"]
8+
- ["My.Qltest", "D", false, "StepArgArg", "(System.Object,System.Object)", "", "Argument[0]", "Argument[1]", "taint", "manual"]
9+
- ["My.Qltest", "D", false, "StepArgQual", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
10+
- ["My.Qltest", "D", false, "StepFieldGetter", "()", "", "Argument[this].Field[My.Qltest.D.Field]", "ReturnValue", "value", "manual"]
11+
- ["My.Qltest", "D", false, "StepFieldSetter", "(System.Object)", "", "Argument[0]", "Argument[this].Field[My.Qltest.D.Field]", "value", "manual"]
12+
- ["My.Qltest", "D", false, "StepFieldSetter", "(System.Object)", "", "Argument[this]", "ReturnValue.Field[My.Qltest.D.Field2]", "value", "manual"]
13+
- ["My.Qltest", "D", false, "StepPropertyGetter", "()", "", "Argument[this].Property[My.Qltest.D.Property]", "ReturnValue", "value", "manual"]
14+
- ["My.Qltest", "D", false, "StepPropertySetter", "(System.Object)", "", "Argument[0]", "Argument[this].Property[My.Qltest.D.Property]", "value", "manual"]
15+
- ["My.Qltest", "D", false, "StepElementGetter", "()", "", "Argument[this].Element", "ReturnValue", "value", "manual"]
16+
- ["My.Qltest", "D", false, "StepElementSetter", "(System.Object)", "", "Argument[0]", "Argument[this].Element", "value", "manual"]
17+
- ["My.Qltest", "D", false, "Apply<,>", "(System.Func<S,T>,S)", "", "Argument[1]", "Argument[0].Parameter[0]", "value", "manual"]
18+
- ["My.Qltest", "D", false, "Apply<,>", "(System.Func<S,T>,S)", "", "Argument[0].ReturnValue", "ReturnValue", "value", "manual"]
19+
- ["My.Qltest", "D", false, "Apply2<>", "(System.Action<S>,S,S)", "", "Argument[1].Field[My.Qltest.D.Field]", "Argument[0].Parameter[0]", "value", "manual"]
20+
- ["My.Qltest", "D", false, "Apply2<>", "(System.Action<S>,S,S)", "", "Argument[2].Field[My.Qltest.D.Field2]", "Argument[0].Parameter[0]", "value", "manual"]
21+
- ["My.Qltest", "D", false, "Map<,>", "(S[],System.Func<S,T>)", "", "Argument[0].Element", "Argument[1].Parameter[0]", "value", "manual"]
22+
- ["My.Qltest", "D", false, "Map<,>", "(S[],System.Func<S,T>)", "", "Argument[1].ReturnValue", "ReturnValue.Element", "value", "manual"]
23+
- ["My.Qltest", "D", false, "Parse", "(System.String,System.Int32)", "", "Argument[0]", "Argument[1]", "taint", "manual"]
24+
- ["My.Qltest", "D", false, "Reverse", "(System.Object[])", "", "Argument[0].WithElement", "ReturnValue", "value", "manual"]
25+
- ["My.Qltest", "E", true, "get_MyProp", "()", "", "Argument[this].Field[My.Qltest.E.MyField]", "ReturnValue", "value", "manual"]
26+
- ["My.Qltest", "E", true, "set_MyProp", "(System.Object)", "", "Argument[0]", "Argument[this].Field[My.Qltest.E.MyField]", "value", "manual"]
27+
- ["My.Qltest", "G", false, "GeneratedFlow", "(System.Object)", "", "Argument[0]", "ReturnValue", "value", "generated"]
28+
- ["My.Qltest", "G", false, "GeneratedFlowArgs", "(System.Object,System.Object)", "", "Argument[0]", "ReturnValue", "value", "generated"]
29+
- ["My.Qltest", "G", false, "GeneratedFlowArgs", "(System.Object,System.Object)", "", "Argument[1]", "ReturnValue", "value", "generated"]
30+
- ["My.Qltest", "G", false, "MixedFlowArgs", "(System.Object,System.Object)", "", "Argument[0]", "ReturnValue", "value", "generated"]
31+
- ["My.Qltest", "G", false, "MixedFlowArgs", "(System.Object,System.Object)", "", "Argument[1]", "ReturnValue", "value", "manual"]

‎csharp/ql/test/library-tests/dataflow/external-models/ext/test.model.yml

Lines changed: 0 additions & 85 deletions
This file was deleted.

‎csharp/ql/test/library-tests/dataflow/external-models/sinks.ext.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
extensions:
2+
- addsTo:
3+
pack: codeql/csharp-all
4+
extensible: sinkModel
5+
data:
6+
# "namespace", "type", "overrides", "name", "signature", "ext", "spec", "kind", "provenance"
7+
- ["My.Qltest", "B", false, "Sink1", "(System.Object)", "", "Argument[0]", "code", "manual"]
8+
- ["My.Qltest", "B", false, "SinkMethod", "()", "", "ReturnValue", "xss", "manual"]
9+
- ["My.Qltest", "SinkAttribute", false, "", "", "Attribute", "ReturnValue", "html", "manual"]
10+
- ["My.Qltest", "SinkAttribute", false, "", "", "Attribute", "Argument", "remote", "manual"]
11+
- ["My.Qltest", "SinkAttribute", false, "", "", "Attribute", "", "sql", "manual"]

‎csharp/ql/test/library-tests/dataflow/external-models/srcs.ext.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
extensions:
2+
- addsTo:
3+
pack: codeql/csharp-all
4+
extensible: sourceModel
5+
data:
6+
# "namespace", "type", "overrides", "name", "signature", "ext", "spec", "kind", "provenance",
7+
- ["My.Qltest", "A", false, "Src1", "()", "", "ReturnValue", "local", "manual"]
8+
- ["My.Qltest", "A", false, "Src1", "(System.String)", "", "ReturnValue", "local", "manual"]
9+
- ["My.Qltest", "A", false, "Src1", "", "", "ReturnValue", "local", "manual"]
10+
- ["My.Qltest", "A", false, "Src2", "()", "", "ReturnValue", "local", "manual"]
11+
- ["My.Qltest", "A", false, "Src3", "()", "", "ReturnValue", "local", "manual"]
12+
- ["My.Qltest", "A", true, "Src2", "()", "", "ReturnValue", "local", "manual"]
13+
- ["My.Qltest", "A", true, "Src3", "()", "", "ReturnValue", "local", "manual"]
14+
- ["My.Qltest", "A", false, "SrcArg", "(System.Object)", "", "Argument[0]", "local", "manual"]
15+
- ["My.Qltest", "A", false, "SrcArg", "(System.Object)", "", "Argument", "local", "manual"]
16+
- ["My.Qltest", "A", true, "SrcParam", "(System.Object)", "", "Parameter[0]", "local", "manual"]
17+
- ["My.Qltest", "SourceAttribute", false, "", "", "Attribute", "ReturnValue", "local", "manual"]
18+
- ["My.Qltest", "SourceAttribute", false, "", "", "Attribute", "Parameter", "local", "manual"]
19+
- ["My.Qltest", "SourceAttribute", false, "", "", "Attribute", "", "local", "manual"]
20+
- ["My.Qltest", "A", false, "SrcTwoArg", "(System.String,System.String)", "", "ReturnValue", "local", "manual"]

‎csharp/ql/test/library-tests/dataflow/external-models/steps.ext.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
extensions:
2+
- addsTo:
3+
pack: codeql/csharp-all
4+
extensible: summaryModel
5+
# "namespace", "type", "overrides", "name", "signature", "ext", "inputspec", "outputspec", "kind", "provenance"
6+
data:
7+
- ["My.Qltest", "C", false, "StepArgRes", "(System.Object)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
8+
- ["My.Qltest", "C", false, "StepArgArg", "(System.Object,System.Object)", "", "Argument[0]", "Argument[1]", "taint", "manual"]
9+
- ["My.Qltest", "C", false, "StepArgQual", "(System.Object)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
10+
- ["My.Qltest", "C", false, "StepQualRes", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
11+
- ["My.Qltest", "C", false, "StepQualArg", "(System.Object)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
12+
- ["My.Qltest", "C", false, "StepFieldGetter", "()", "", "Argument[this].Field[My.Qltest.C.Field]", "ReturnValue", "value", "manual"]
13+
- ["My.Qltest", "C", false, "StepFieldSetter", "(System.Int32)", "", "Argument[0]", "Argument[this].Field[My.Qltest.C.Field]", "value", "manual"]
14+
- ["My.Qltest", "C", false, "StepPropertyGetter", "()", "", "Argument[this].Property[My.Qltest.C.Property]", "ReturnValue", "value", "manual"]
15+
- ["My.Qltest", "C", false, "StepPropertySetter", "(System.Int32)", "", "Argument[0]", "Argument[this].Property[My.Qltest.C.Property]", "value", "manual"]
16+
- ["My.Qltest", "C", false, "StepElementGetter", "()", "", "Argument[this].Element", "ReturnValue", "value", "manual"]
17+
- ["My.Qltest", "C", false, "StepElementSetter", "(System.Int32)", "", "Argument[0]", "Argument[this].Element", "value", "manual"]
18+
- ["My.Qltest", "C+Generic<,>", false, "StepGeneric", "(T)", "", "Argument[0]", "ReturnValue", "value", "manual"]
19+
- ["My.Qltest", "C+Generic<,>", false, "StepGeneric2<>", "(S)", "", "Argument[0]", "ReturnValue", "value", "manual"]
20+
- ["My.Qltest", "C+Base<>", true, "StepOverride", "(T)", "", "Argument[0]", "ReturnValue", "value", "manual"]

‎csharp/ql/test/library-tests/dataflow/external-models/steps.ql

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,24 @@ import semmle.code.csharp.dataflow.FlowSummary
66
import semmle.code.csharp.dataflow.internal.DataFlowDispatch as DataFlowDispatch
77
import semmle.code.csharp.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
88

9-
private SummarizedCallable getRelevantSummarizedCallable() {
10-
exists(SummarizedCallable sc |
11-
sc.getDeclaringType*().getName() = "C" and
12-
sc instanceof DataFlowDispatch::DataFlowSummarizedCallable and
13-
result = sc
14-
)
15-
}
16-
179
query predicate summaryThroughStep(
1810
DataFlow::Node node1, DataFlow::Node node2, boolean preservesValue
1911
) {
2012
FlowSummaryImpl::Private::Steps::summaryThroughStepValue(node1, node2,
21-
getRelevantSummarizedCallable()) and
13+
any(DataFlowDispatch::DataFlowSummarizedCallable sc)) and
2214
preservesValue = true
2315
or
2416
FlowSummaryImpl::Private::Steps::summaryThroughStepTaint(node1, node2,
25-
getRelevantSummarizedCallable()) and
17+
any(DataFlowDispatch::DataFlowSummarizedCallable sc)) and
2618
preservesValue = false
2719
}
2820

2921
query predicate summaryGetterStep(DataFlow::Node arg, DataFlow::Node out, Content c) {
30-
FlowSummaryImpl::Private::Steps::summaryGetterStep(arg, c, out, getRelevantSummarizedCallable())
22+
FlowSummaryImpl::Private::Steps::summaryGetterStep(arg, c, out,
23+
any(DataFlowDispatch::DataFlowSummarizedCallable sc))
3124
}
3225

3326
query predicate summarySetterStep(DataFlow::Node arg, DataFlow::Node out, Content c) {
34-
FlowSummaryImpl::Private::Steps::summarySetterStep(arg, c, out, getRelevantSummarizedCallable())
27+
FlowSummaryImpl::Private::Steps::summarySetterStep(arg, c, out,
28+
any(DataFlowDispatch::DataFlowSummarizedCallable sc))
3529
}

‎csharp/ql/test/qlpack.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@ dependencies:
44
codeql/csharp-all: ${workspace}
55
codeql/csharp-queries: ${workspace}
66
extractor: csharp
7-
dataExtensions:
8-
- library-tests/dataflow/external-models/ext/*.model.yml
97
tests: .

‎java/ql/integration-tests/all-platforms/kotlin/annotation-id-consistency/qlpack.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@ dependencies:
55
codeql/java-queries: '*'
66
dataExtensions:
77
ext/*.model.yml
8-

‎java/ql/integration-tests/all-platforms/kotlin/annotation-id-consistency/ext/test.model.yml renamed to ‎java/ql/integration-tests/all-platforms/kotlin/annotation-id-consistency/test.ext.yml

File renamed without changes.

‎java/ql/integration-tests/all-platforms/kotlin/default-parameter-mad-flow/ext/test.model.yml renamed to ‎java/ql/integration-tests/all-platforms/kotlin/default-parameter-mad-flow/test.ext.yml

File renamed without changes.

0 commit comments

Comments
 (0)