C#/Java: Add isRelevantSinkKind predicate with language specific implementation.

michaelnebel · michaelnebel · commit 8a65efbae4ef · 2022-03-29T11:07:57.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
@@ -163,7 +163,7 @@ string captureSink(TargetApi api) {
     config.hasFlow(src, sink) and
     ExternalFlow::sinkNode(sink, kind) and
     api = src.getEnclosingCallable() and
-    not kind = "logging" and
+    isRelevantSinkKind(kind) and
     result = asSinkModel(api, asInputArgument(src), kind)
   )
 }
diff --git a/csharp/ql/src/utils/model-generator/internal/CaptureModelsSpecific.qll b/csharp/ql/src/utils/model-generator/internal/CaptureModelsSpecific.qll
@@ -26,6 +26,12 @@ predicate isOwnInstanceAccessNode(ReturnNode node) { node.asExpr() instanceof Th
  */
 string qualifierString() { result = "Argument[Qualifier]" }
 
+/**
+ * Holds if `kind` is a relevant sink kind for creating sink models.
+ */
+bindingset[kind]
+predicate isRelevantSinkKind(string kind) { any() }
+
 /**
  * Language specific parts of the `PropagateToSinkConfiguration`.
  */
diff --git a/java/ql/src/utils/model-generator/internal/CaptureModels.qll b/java/ql/src/utils/model-generator/internal/CaptureModels.qll
@@ -163,7 +163,7 @@ string captureSink(TargetApi api) {
     config.hasFlow(src, sink) and
     ExternalFlow::sinkNode(sink, kind) and
     api = src.getEnclosingCallable() and
-    not kind = "logging" and
+    isRelevantSinkKind(kind) and
     result = asSinkModel(api, asInputArgument(src), kind)
   )
 }
diff --git a/java/ql/src/utils/model-generator/internal/CaptureModelsSpecific.qll b/java/ql/src/utils/model-generator/internal/CaptureModelsSpecific.qll
@@ -61,6 +61,12 @@ string asInputArgument(DataFlow::Node source) {
   result = qualifierString()
 }
 
+/**
+ * Holds if `kind` is a relevant sink kind for creating sink models.
+ */
+bindingset[kind]
+predicate isRelevantSinkKind(string kind) { not kind = "logging" }
+
 module DataFlowImplCommon {
   predicate store = Dfic::store/4;
 

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ string captureSink(TargetApi api) {`
`163`	`163`	`config.hasFlow(src, sink) and`
`164`	`164`	`ExternalFlow::sinkNode(sink, kind) and`
`165`	`165`	`api = src.getEnclosingCallable() and`
`166`		`- not kind = "logging" and`
	`166`	`+ isRelevantSinkKind(kind) and`
`167`	`167`	`result = asSinkModel(api, asInputArgument(src), kind)`
`168`	`168`	`)`
`169`	`169`	`}`