C#: Avoid generating new source models on 'file' kind sources.

michaelnebel · michaelnebel · commit be4c2231d101 · 2022-08-26T09:30:07.000+02:00
diff --git a/csharp/ql/src/utils/model-generator/internal/CaptureModels.qll b/csharp/ql/src/utils/model-generator/internal/CaptureModels.qll
@@ -234,6 +234,7 @@ string captureSource(TargetApi api) {
     config.hasFlow(source, sink) and
     ExternalFlow::sourceNode(source, kind) and
     api = sink.getEnclosingCallable() and
+    isRelevantSourceKind(kind) and
     result = asSourceModel(api, returnNodeAsOutput(sink), kind)
   )
 }
diff --git a/csharp/ql/src/utils/model-generator/internal/CaptureModelsSpecific.qll b/csharp/ql/src/utils/model-generator/internal/CaptureModelsSpecific.qll
@@ -193,3 +193,9 @@ string asInputArgument(DataFlow::Node source) {
  */
 bindingset[kind]
 predicate isRelevantSinkKind(string kind) { any() }
+
+/**
+ * Holds if `kind` is a relevant source kind for creating source models.
+ */
+bindingset[kind]
+predicate isRelevantSourceKind(string kind) { not kind = "file" }
diff --git a/java/ql/src/utils/model-generator/internal/CaptureModels.qll b/java/ql/src/utils/model-generator/internal/CaptureModels.qll
@@ -234,6 +234,7 @@ string captureSource(TargetApi api) {
     config.hasFlow(source, sink) and
     ExternalFlow::sourceNode(source, kind) and
     api = sink.getEnclosingCallable() and
+    isRelevantSourceKind(kind) and
     result = asSourceModel(api, returnNodeAsOutput(sink), kind)
   )
 }
diff --git a/java/ql/src/utils/model-generator/internal/CaptureModelsSpecific.qll b/java/ql/src/utils/model-generator/internal/CaptureModelsSpecific.qll
@@ -259,3 +259,9 @@ predicate isRelevantSinkKind(string kind) {
   not kind.matches("regex-use%") and
   not kind = "write-file"
 }
+
+/**
+ * Holds if `kind` is a relevant source kind for creating source models.
+ */
+bindingset[kind]
+predicate isRelevantSourceKind(string kind) { any() }

Original file line number	Diff line number	Diff line change
`@@ -234,6 +234,7 @@ string captureSource(TargetApi api) {`
`234`	`234`	`config.hasFlow(source, sink) and`
`235`	`235`	`ExternalFlow::sourceNode(source, kind) and`
`236`	`236`	`api = sink.getEnclosingCallable() and`
	`237`	`+ isRelevantSourceKind(kind) and`
`237`	`238`	`result = asSourceModel(api, returnNodeAsOutput(sink), kind)`
`238`	`239`	`)`
`239`	`240`	`}`