Merge pull request #8482 from michaelnebel/csharp/capturesourcesink-models

C#: Capture[Source|Sink]Models utility.

Author: michaelnebel

config/identical-files.json

@@ -75,13 +75,9 @@
     "java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll",
     "csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll"
   ],
-  "Model as Data Generation Java/C# - Utils": [
-    "java/ql/src/utils/model-generator/ModelGeneratorUtils.qll",
-    "csharp/ql/src/utils/model-generator/ModelGeneratorUtils.qll"
-  ],
-  "Model as Data Generation Java/C# - SummaryModels": [
-    "java/ql/src/utils/model-generator/CaptureSummaryModels.qll",
-    "csharp/ql/src/utils/model-generator/CaptureSummaryModels.qll"
+  "Model as Data Generation Java/C# - CaptureModels": [
+    "java/ql/src/utils/model-generator/internal/CaptureModels.qll",
+    "csharp/ql/src/utils/model-generator/internal/CaptureModels.qll"
   ],
   "Sign Java/C#": [
     "java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/Sign.qll",
@@ -549,4 +545,4 @@
     "javascript/ql/lib/semmle/javascript/security/dataflow/HttpToFileAccessCustomizations.qll",
     "ruby/ql/lib/codeql/ruby/security/HttpToFileAccessCustomizations.qll"
   ]
-}
+}

csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll

@@ -1461,7 +1461,10 @@ private class InstanceFieldOrProperty extends FieldOrProperty {
   InstanceFieldOrProperty() { not this.isStatic() }
 }
 
-private class FieldOrPropertyAccess extends AssignableAccess, QualifiableExpr {
+/**
+ * An access to a field or a property.
+ */
+class FieldOrPropertyAccess extends AssignableAccess, QualifiableExpr {
   FieldOrPropertyAccess() { this.getTarget() instanceof FieldOrProperty }
 }
 

csharp/ql/src/utils/model-generator/CaptureSinkModels.ql

@@ -0,0 +1,11 @@
+/**
+ * @name Capture sink models.
+ * @description Finds public methods that act as sinks as they flow into a a known sink.
+ * @id csharp/utils/model-generator/sink-models
+ */
+
+private import internal.CaptureModels
+
+from TargetApi api, string sink
+where sink = captureSink(api)
+select sink order by sink

csharp/ql/src/utils/model-generator/CaptureSourceModels.ql

@@ -0,0 +1,11 @@
+/**
+ * @name Capture source models.
+ * @description Finds APIs that act as sources as they expose already known sources.
+ * @id csharp/utils/model-generator/sink-models
+ */
+
+private import internal.CaptureModels
+
+from TargetApi api, string source
+where source = captureSource(api)
+select source order by source

csharp/ql/src/utils/model-generator/CaptureSummaryModels.ql

@@ -4,7 +4,7 @@
  * @id csharp/utils/model-generator/summary-models
  */
 
-private import CaptureSummaryModels
+private import internal.CaptureModels
 
 /**
  * Capture fluent APIs that return `this`.