C#: Only lift summary models in the model generator.

Author: michaelnebel

csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll

@@ -38,7 +38,9 @@ class DataFlowSourceTargetApi = SourceTargetApi;
 class DataFlowSinkTargetApi = SinkTargetApi;
 
 private module ModelPrintingInput implements ModelPrintingSig {
-  class Api = TargetApiBase;
+  class SummaryApi = DataFlowSummaryTargetApi;
+
+  class SourceOrSinkApi = SourceOrSinkTargetApi;
 
   string getProvenance() { result = "df-generated" }
 }

csharp/ql/src/utils/modelgenerator/internal/CaptureModelsSpecific.qll

@@ -112,38 +112,41 @@ predicate isUninterestingForDataFlowModels(CS::Callable api) { isHigherOrder(api
 predicate isUninterestingForTypeBasedFlowModels(CS::Callable api) { none() }
 
 /**
- * A class of callables that are potentially relevant for generating summary and
- * neutral models.
+ * A class of callables that are potentially relevant for generating source or
+ * sink models.
  */
-class SummaryTargetApi extends TargetApiBase {
-  SummaryTargetApi() { not hasManualSummaryModel(this.lift()) }
+class SourceOrSinkTargetApi extends Callable {
+  SourceOrSinkTargetApi() { relevant(this) }
 }
 
 /**
  * A class of callables that are potentially relevant for generating sink models.
  */
-class SinkTargetApi extends TargetApiBase {
-  SinkTargetApi() { not hasManualSinkModel(this.lift()) }
+class SinkTargetApi extends SourceOrSinkTargetApi {
+  SinkTargetApi() { not hasManualSinkModel(this) }
 }
 
 /**
  * A class of callables that are potentially relevant for generating source models.
  */
-class SourceTargetApi extends TargetApiBase {
-  SourceTargetApi() { not hasManualSourceModel(this.lift()) }
+class SourceTargetApi extends SourceOrSinkTargetApi {
+  SourceTargetApi() { not hasManualSourceModel(this) }
 }
 
 /**
- * A class of callables that are potentially relevant for generating summary, source, sink
- * and neutral models.
+ * A class of callables that are potentially relevant for generating summary or
+ * neutral models.
  *
  * In the Standard library and 3rd party libraries it is the callables (or callables that have a
  * super implementation) that can be called from outside the library itself.
  */
-class TargetApiBase extends Callable {
+class SummaryTargetApi extends Callable {
   private Callable lift;
 
-  TargetApiBase() { lift = liftedImpl(this) }
+  SummaryTargetApi() {
+    lift = liftedImpl(this) and
+    not hasManualSummaryModel(lift)
+  }
 
   /**
    * Gets the callable that a model will be lifted to.

csharp/ql/src/utils/modelgenerator/internal/CaptureTypeBasedSummaryModels.qll

@@ -178,7 +178,9 @@ private predicate output(Callable callable, TypeParameter tp, string output) {
 }
 
 private module ModelPrintingInput implements ModelPrintingSig {
-  class Api = TypeBasedFlowTargetApi;
+  class SummaryApi = TypeBasedFlowTargetApi;
+
+  class SourceOrSinkApi = TypeBasedFlowTargetApi;
 
   string getProvenance() { result = "tb-generated" }
 }

shared/mad/codeql/mad/modelgenerator/ModelPrinting.qll

@@ -19,10 +19,12 @@ module ModelPrintingImpl<ModelPrintingLangSig Lang> {
     /**
      * The class of APIs relevant for model generation.
      */
-    class Api extends Lang::Callable {
+    class SummaryApi extends Lang::Callable {
       Lang::Callable lift();
     }
 
+    class SourceOrSinkApi extends Lang::Callable;
+
     /**
      * Gets the string representation of the provenance of the models.
      */
@@ -33,9 +35,9 @@ module ModelPrintingImpl<ModelPrintingLangSig Lang> {
     /**
      * Computes the first 6 columns for MaD rows used for summaries, sources and sinks.
      */
-    private string asPartialModel(Printing::Api api) {
+    private string asPartialModel(Lang::Callable api) {
       exists(string container, string type, string extensible, string name, string parameters |
-        Lang::partialModel(api.lift(), container, type, extensible, name, parameters) and
+        Lang::partialModel(api, container, type, extensible, name, parameters) and
         result =
           container + ";" //
             + type + ";" //
@@ -49,7 +51,7 @@ module ModelPrintingImpl<ModelPrintingLangSig Lang> {
     /**
      * Computes the first 4 columns for neutral MaD rows.
      */
-    private string asPartialNeutralModel(Printing::Api api) {
+    private string asPartialNeutralModel(Printing::SummaryApi api) {
       exists(string container, string type, string name, string parameters |
         Lang::partialModel(api, container, type, _, name, parameters) and
         result =
@@ -64,15 +66,15 @@ module ModelPrintingImpl<ModelPrintingLangSig Lang> {
      * Gets the summary model for `api` with `input`, `output` and `kind`.
      */
     bindingset[input, output, kind]
-    private string asSummaryModel(Printing::Api api, string input, string output, string kind) {
+    private string asSummaryModel(Printing::SummaryApi api, string input, string output, string kind) {
       result =
-        asPartialModel(api) + input + ";" //
+        asPartialModel(api.lift()) + input + ";" //
           + output + ";" //
           + kind + ";" //
           + Printing::getProvenance()
     }
 
-    string asNeutralSummaryModel(Printing::Api api) {
+    string asNeutralSummaryModel(Printing::SummaryApi api) {
       result =
         asPartialNeutralModel(api) //
           + "summary" + ";" //
@@ -83,23 +85,23 @@ module ModelPrintingImpl<ModelPrintingLangSig Lang> {
      * Gets the value summary model for `api` with `input` and `output`.
      */
     bindingset[input, output]
-    string asValueModel(Printing::Api api, string input, string output) {
+    string asValueModel(Printing::SummaryApi api, string input, string output) {
       result = asSummaryModel(api, input, output, "value")
     }
 
     /**
      * Gets the taint summary model for `api` with `input` and `output`.
      */
     bindingset[input, output]
-    string asTaintModel(Printing::Api api, string input, string output) {
+    string asTaintModel(Printing::SummaryApi api, string input, string output) {
       result = asSummaryModel(api, input, output, "taint")
     }
 
     /**
      * Gets the sink model for `api` with `input` and `kind`.
      */
     bindingset[input, kind]
-    string asSinkModel(Printing::Api api, string input, string kind) {
+    string asSinkModel(Printing::SourceOrSinkApi api, string input, string kind) {
       result =
         asPartialModel(api) + input + ";" //
           + kind + ";" //
@@ -110,7 +112,7 @@ module ModelPrintingImpl<ModelPrintingLangSig Lang> {
      * Gets the source model for `api` with `output` and `kind`.
      */
     bindingset[output, kind]
-    string asSourceModel(Printing::Api api, string output, string kind) {
+    string asSourceModel(Printing::SourceOrSinkApi api, string output, string kind) {
       result =
         asPartialModel(api) + output + ";" //
           + kind + ";" //