C#: Move isRelevantMemberAccess out of PropagateToSinkConfigurationSpecific.

michaelnebel · michaelnebel · commit dd267b353a5b · 2022-03-29T11:07:58.000+02:00
diff --git a/csharp/ql/src/utils/model-generator/internal/CaptureModelsSpecific.qll b/csharp/ql/src/utils/model-generator/internal/CaptureModelsSpecific.qll
@@ -107,24 +107,24 @@ string qualifierString() { result = "Argument[Qualifier]" }
 bindingset[kind]
 predicate isRelevantSinkKind(string kind) { any() }
 
+private predicate isRelevantMemberAccess(DataFlow::Node node) {
+  exists(CS::MemberAccess access | access = node.asExpr() |
+    access.hasThisQualifier() and
+    access.getTarget().isEffectivelyPublic() and
+    (
+      access instanceof CS::FieldAccess
+      or
+      access.getTarget().(CS::Property).getSetter().isPublic()
+    )
+  )
+}
+
 /**
  * Language specific parts of the `PropagateToSinkConfiguration`.
  */
 class PropagateToSinkConfigurationSpecific extends CS::TaintTracking::Configuration {
   PropagateToSinkConfigurationSpecific() { this = "parameters or fields flowing into sinks" }
 
-  private predicate isRelevantMemberAccess(DataFlow::Node node) {
-    exists(CS::MemberAccess access | access = node.asExpr() |
-      access.hasThisQualifier() and
-      access.getTarget().isEffectivelyPublic() and
-      (
-        access instanceof CS::FieldAccess
-        or
-        access.getTarget().(CS::Property).getSetter().isPublic()
-      )
-    )
-  }
-
   override predicate isSource(DataFlow::Node source) {
     (isRelevantMemberAccess(source) or source instanceof DataFlow::ParameterNode) and
     isRelevantForModels(source.getEnclosingCallable())
