Ruby: Deprecate models-as-data CSV interface

ruby/ql/lib/codeql/ruby/Frameworks.qll

@@ -26,7 +26,6 @@ private import codeql.ruby.frameworks.XmlParsing
 private import codeql.ruby.frameworks.ActionDispatch
 private import codeql.ruby.frameworks.PosixSpawn
 private import codeql.ruby.frameworks.StringFormatters
-private import codeql.ruby.frameworks.Json
 private import codeql.ruby.frameworks.Erb
 private import codeql.ruby.frameworks.Slim
 private import codeql.ruby.frameworks.Sinatra

ruby/ql/lib/codeql/ruby/frameworks/ActiveStorage.model.yml

@@ -0,0 +1,22 @@
+extensions:
+  - addsTo:
+      pack: codeql/ruby-all
+      extensible: summaryModel
+    data:
+      - ['ActiveStorage::Filename!', 'Method[new]', 'Argument[0]', 'ReturnValue', 'taint']
+      - ['ActiveStorage::Filename', 'Method[sanitized]', 'Argument[self]', 'ReturnValue', 'taint']
+
+  - addsTo:
+      pack: codeql/ruby-all
+      extensible: typeModel
+    data:
+      # ActiveStorage::Blob.compose(blobs : [Blob]) : Blob
+      - ['ActiveStorage::Blob', 'ActiveStorage::Blob!', 'Method[compose].ReturnValue']
+      # ActiveStorage::Blob.create_and_upload! : Blob
+      - ['ActiveStorage::Blob', 'ActiveStorage::Blob!', 'Method[create_and_upload!].ReturnValue']
+      # ActiveStorage::Blob.create_before_direct_upload! : Blob
+      - ['ActiveStorage::Blob', 'ActiveStorage::Blob!', 'Method[create_before_direct_upload!].ReturnValue']
+      # ActiveStorage::Blob.find_signed(!) : Blob
+      - ['ActiveStorage::Blob', 'ActiveStorage::Blob!', 'Method[find_signed,find_signed!].ReturnValue']
+      # gives error: Invalid name 'Element' in access path
+      # - ['ActiveStorage::Blob', 'ActiveStorage::Blob!', 'Method[compose].Argument[0].Element[any]']

ruby/ql/lib/codeql/ruby/frameworks/ActiveStorage.qll

@@ -26,39 +26,6 @@ module ActiveStorage {
     }
   }
 
-  /** Taint related to `ActiveStorage::Filename`. */
-  private class FilenameSummaries extends ModelInput::SummaryModelCsv {
-    override predicate row(string row) {
-      row =
-        [
-          "ActiveStorage::Filename!;Method[new];Argument[0];ReturnValue;taint",
-          "ActiveStorage::Filename;Method[sanitized];Argument[self];ReturnValue;taint",
-        ]
-    }
-  }
-
-  /**
-   * `Blob` is an instance of `ActiveStorage::Blob`.
-   */
-  private class BlobTypeSummary extends ModelInput::TypeModelCsv {
-    override predicate row(string row) {
-      // package1;type1;package2;type2;path
-      row =
-        [
-          // ActiveStorage::Blob.create_and_upload! : Blob
-          "ActiveStorage::Blob;ActiveStorage::Blob!;Method[create_and_upload!].ReturnValue",
-          // ActiveStorage::Blob.create_before_direct_upload! : Blob
-          "ActiveStorage::Blob;ActiveStorage::Blob!;Method[create_before_direct_upload!].ReturnValue",
-          // ActiveStorage::Blob.compose(blobs : [Blob]) : Blob
-          "ActiveStorage::Blob;ActiveStorage::Blob!;Method[compose].ReturnValue",
-          // gives error: Invalid name 'Element' in access path
-          // "ActiveStorage::Blob;ActiveStorage::Blob!;Method[compose].Argument[0].Element[any]",
-          // ActiveStorage::Blob.find_signed(!) : Blob
-          "ActiveStorage::Blob;ActiveStorage::Blob!;Method[find_signed,find_signed!].ReturnValue",
-        ]
-    }
-  }
-
   private class BlobInstance extends DataFlow::Node {
     BlobInstance() {
       this = ModelOutput::getATypeNode("ActiveStorage::Blob").getAValueReachableFromSource()

ruby/ql/lib/codeql/ruby/frameworks/ActiveSupport.model.yml

@@ -0,0 +1,30 @@
+extensions:
+  - addsTo:
+      pack: codeql/ruby-all
+      extensible: summaryModel
+    data:
+      # `ActiveSupport::SafeBuffer` wraps a string, providing HTML-safe methods
+      # for concatenation.
+      # It is possible to insert tainted data into `SafeBuffer` that won't get
+      # sanitized, and this taint is then propagated via most of the methods.
+      #
+      # TODO: SafeBuffer also reponds to all String methods.
+      # Can we model this without repeating all the existing summaries we have
+      # for String?
+
+      # SafeBuffer.new(x) does not sanitize x
+      - ['ActionView::SafeBuffer!', 'Method[new]', 'Argument[0]', 'ReturnValue', 'taint']
+      # These methods preserve taint in self
+      - ['ActionView::SafeBuffer', 'Method[concat,insert,prepend,to_s,to_param]', 'Argument[self]', 'ReturnValue', 'taint']
+      # SafeBuffer#safe_concat(x) does not sanitize x
+      - ['ActionView::SafeBuffer', 'Method[safe_concat]', 'Argument[0]', 'Argument[self]', 'taint']
+      - ['ActionView::SafeBuffer', 'Method[safe_concat]', 'Argument[0]', 'ReturnValue', 'taint']
+      - ['ActiveSupport::JSON!', 'Method[decode,load]', 'Argument[0]', 'ReturnValue', 'taint']
+      - ['ActiveSupport::JSON!', 'Method[encode,dump]', 'Argument[0]', 'ReturnValue', 'taint']
+      - ['Pathname', 'Method[existence]', 'Argument[self]', 'ReturnValue', 'taint']
+
+  - addsTo:
+      pack: codeql/ruby-all
+      extensible: typeModel
+    data:
+      - ['Pathname', 'Pathname', 'Method[existence].ReturnValue']

ruby/ql/lib/codeql/ruby/frameworks/ActiveSupport.qll

@@ -478,60 +478,4 @@ module ActiveSupport {
       }
     }
   }
-
-  /**
-   * Type summaries for extensions to the `Pathname` module.
-   */
-  private class PathnameTypeSummary extends ModelInput::TypeModelCsv {
-    override predicate row(string row) {
-      // type1;type2;path
-      // Pathname#existence : Pathname
-      row = "Pathname;Pathname;Method[existence].ReturnValue"
-    }
-  }
-
-  /** Taint flow summaries for extensions to the `Pathname` module. */
-  private class PathnameTaintSummary extends ModelInput::SummaryModelCsv {
-    override predicate row(string row) {
-      // Pathname#existence
-      row = "Pathname;Method[existence];Argument[self];ReturnValue;taint"
-    }
-  }
-
-  /**
-   * `ActiveSupport::SafeBuffer` wraps a string, providing HTML-safe methods
-   * for concatenation.
-   * It is possible to insert tainted data into `SafeBuffer` that won't get
-   * sanitized, and this taint is then propagated via most of the methods.
-   */
-  private class SafeBufferSummary extends ModelInput::SummaryModelCsv {
-    // TODO: SafeBuffer also reponds to all String methods.
-    // Can we model this without repeating all the existing summaries we have
-    // for String?
-    override predicate row(string row) {
-      row =
-        [
-          // SafeBuffer.new(x) does not sanitize x
-          "ActionView::SafeBuffer!;Method[new];Argument[0];ReturnValue;taint",
-          // SafeBuffer#safe_concat(x) does not sanitize x
-          "ActionView::SafeBuffer;Method[safe_concat];Argument[0];ReturnValue;taint",
-          "ActionView::SafeBuffer;Method[safe_concat];Argument[0];Argument[self];taint",
-          // These methods preserve taint in self
-          "ActionView::SafeBuffer;Method[concat,insert,prepend,to_s,to_param];Argument[self];ReturnValue;taint",
-        ]
-    }
-  }
-
-  /** `ActiveSupport::JSON` */
-  module Json {
-    private class JsonSummary extends ModelInput::SummaryModelCsv {
-      override predicate row(string row) {
-        row =
-          [
-            "ActiveSupport::JSON!;Method[encode,dump];Argument[0];ReturnValue;taint",
-            "ActiveSupport::JSON!;Method[decode,load];Argument[0];ReturnValue;taint",
-          ]
-      }
-    }
-  }
 }

ruby/ql/lib/codeql/ruby/frameworks/Core.qll

@@ -13,7 +13,6 @@ import core.Module
 import core.Array
 import core.Hash
 import core.String
-import core.Regexp
 import core.IO
 import core.Digest
 import core.Base64

ruby/ql/lib/codeql/ruby/frameworks/Json.model.yml

@@ -0,0 +1,11 @@
+extensions:
+  - addsTo:
+      pack: codeql/ruby-all
+      extensible: summaryModel
+    data:
+      # Not all of these methods are strictly defined in the `json` gem.
+      # The `JSON` namespace is heavily overloaded by other JSON parsing gems such as `oj`, `json_pure`, `multi_json` etc.
+      # This summary covers common methods we've seen called on `JSON` in the wild.
+      - ['JSON!', 'Method[generate,fast_generate,pretty_generate,dump,unparse,fast_unparse]', 'Argument[0]', 'ReturnValue', 'taint']
+      - ['JSON!', 'Method[parse,parse!,load,restore]', 'Argument[0]', 'ReturnValue', 'taint']
+  

ruby/ql/lib/codeql/ruby/frameworks/Json.qll

@@ -1,22 +0,0 @@
-/** Provides modeling for the `json` gem. */
-
-private import codeql.ruby.frameworks.data.ModelsAsData
-
-/** Provides modeling for the `json` gem. */
-module Json {
-  /**
-   * Flow summaries for common `JSON` methods.
-   * Not all of these methods are strictly defined in the `json` gem.
-   * The `JSON` namespace is heavily overloaded by other JSON parsing gems such as `oj`, `json_pure`, `multi_json` etc.
-   * This summary covers common methods we've seen called on `JSON` in the wild.
-   */
-  private class JsonSummary extends ModelInput::SummaryModelCsv {
-    override predicate row(string row) {
-      row =
-        [
-          "JSON!;Method[parse,parse!,load,restore];Argument[0];ReturnValue;taint",
-          "JSON!;Method[generate,fast_generate,pretty_generate,dump,unparse,fast_unparse];Argument[0];ReturnValue;taint",
-        ]
-    }
-  }
-}

ruby/ql/lib/codeql/ruby/frameworks/actiondispatch/internal/Mime.model.yml

@@ -0,0 +1,10 @@
+extensions:
+  - addsTo:
+      pack: codeql/ruby-all
+      extensible: typeModel
+    data:
+      - ['Mime::Type', 'Mime!', 'Method[fetch].ReturnValue']
+      - ['Mime::Type', 'Mime::Type!', 'Method[lookup].ReturnValue']
+      - ['Mime::Type', 'Mime::Type!', 'Method[lookup_by_extension].ReturnValue']
+      - ['Mime::Type', 'Mime::Type!', 'Method[register].ReturnValue']
+      - ['Mime::Type', 'Mime::Type!', 'Method[register_alias].ReturnValue']

ruby/ql/lib/codeql/ruby/frameworks/actiondispatch/internal/Mime.qll

@@ -9,31 +9,6 @@ private import codeql.ruby.frameworks.data.ModelsAsData
  * Models MIME type handling using the `ActionDispatch` library, which is part of Rails.
  */
 module Mime {
-  /**
-   * Type summaries for the `Mime::Type` class, i.e. method calls that produce new
-   * `Mime::Type` instances.
-   */
-  private class MimeTypeTypeSummary extends ModelInput::TypeModelCsv {
-    override predicate row(string row) {
-      // type1;type2;path
-      row =
-        [
-          // Mime[type] : Mime::Type (omitted)
-          // Method names with brackets like [] cannot be represented in MaD.
-          // Mime.fetch(type) : Mime::Type
-          "Mime::Type;Mime!;Method[fetch].ReturnValue",
-          // Mime::Type.lookup(str) : Mime::Type
-          "Mime::Type;Mime::Type!;Method[lookup].ReturnValue",
-          // Mime::Type.lookup_by_extension(str) : Mime::Type
-          "Mime::Type;Mime::Type!;Method[lookup_by_extension].ReturnValue",
-          // Mime::Type.register(str) : Mime::Type
-          "Mime::Type;Mime::Type!;Method[register].ReturnValue",
-          // Mime::Type.register_alias(str) : Mime::Type
-          "Mime::Type;Mime::Type!;Method[register_alias].ReturnValue",
-        ]
-    }
-  }
-
   /**
    * An argument to `Mime::Type#match?`, which is converted to a RegExp via
    * `Regexp.new`.

ruby/ql/lib/codeql/ruby/frameworks/core/Regexp.model.yml

@@ -0,0 +1,7 @@
+extensions:
+  - addsTo:
+      pack: codeql/ruby-all
+      extensible: summaryModel
+    data:
+      - ['Regexp!', 'Method[escape,quote]', 'Argument[0]', 'ReturnValue', 'taint']
+  

ruby/ql/lib/codeql/ruby/frameworks/core/Regexp.qll

@@ -1,19 +0,0 @@
-/**
- * Provides modeling for the `Regexp` class.
- */
-
-private import codeql.ruby.ApiGraphs
-private import codeql.ruby.dataflow.FlowSummary
-private import codeql.ruby.frameworks.data.ModelsAsData
-
-/**
- * Provides modeling for the `Regexp` class.
- */
-module Regexp {
-  /** A flow summary for `Regexp.escape` and its alias, `Regexp.quote`. */
-  class RegexpEscapeSummary extends ModelInput::SummaryModelCsv {
-    override predicate row(string row) {
-      row = "Regexp!;Method[escape,quote];Argument[0];ReturnValue;taint"
-    }
-  }
-}

ruby/ql/lib/codeql/ruby/frameworks/data/internal/ApiGraphModels.qll

@@ -1,17 +1,17 @@
 /**
  * INTERNAL use only. This is an experimental API subject to change without notice.
  *
- * Provides classes and predicates for dealing with flow models specified in CSV format.
+ * Provides classes and predicates for dealing with flow models specified in extensible predicates.
  *
- * The CSV specification has the following columns:
+ * The extensible predicates have the following columns:
  * - Sources:
- *   `type; path; kind`
+ *   `type, path, kind`
  * - Sinks:
- *   `type; path; kind`
+ *   `type, path, kind`
  * - Summaries:
- *   `type; path; input; output; kind`
+ *   `type, path, input, output, kind`
  * - Types:
- *   `type1; type2; path`
+ *   `type1, type2, path`
  *
  * The interpretation of a row is similar to API-graphs with a left-to-right
  * reading.
@@ -80,7 +80,7 @@ module ModelInput {
    *
    * Extend this class to add additional source definitions.
    */
-  class SourceModelCsv extends Unit {
+  deprecated class SourceModelCsv extends Unit {
     /**
      * Holds if `row` specifies a source definition.
      *
@@ -93,7 +93,7 @@ module ModelInput {
      *
      * The kind `remote` represents a general remote flow source.
      */
-    abstract predicate row(string row);
+    abstract deprecated predicate row(string row);
   }
 
   /**
@@ -101,7 +101,7 @@ module ModelInput {
    *
    * Extend this class to add additional sink definitions.
    */
-  class SinkModelCsv extends Unit {
+  deprecated class SinkModelCsv extends Unit {
     /**
      * Holds if `row` specifies a sink definition.
      *
@@ -112,7 +112,7 @@ module ModelInput {
      * indicates that the value at `(type, path)` should be seen as a sink
      * of the given `kind`.
      */
-    abstract predicate row(string row);
+    abstract deprecated predicate row(string row);
   }
 
   /**
@@ -120,7 +120,7 @@ module ModelInput {
    *
    * Extend this class to add additional flow summary definitions.
    */
-  class SummaryModelCsv extends Unit {
+  deprecated class SummaryModelCsv extends Unit {
     /**
      * Holds if `row` specifies a summary definition.
      *
@@ -134,7 +134,7 @@ module ModelInput {
      * `kind` should be either `value` or `taint`, for value-preserving or taint-preserving steps,
      * respectively.
      */
-    abstract predicate row(string row);
+    abstract deprecated predicate row(string row);
   }
 
   /**
@@ -142,7 +142,7 @@ module ModelInput {
    *
    * Extend this class to add additional type definitions.
    */
-  class TypeModelCsv extends Unit {
+  deprecated class TypeModelCsv extends Unit {
     /**
      * Holds if `row` specifies a type definition.
      *
@@ -152,7 +152,7 @@ module ModelInput {
      * ```
      * indicates that `(type2, path)` should be seen as an instance of `type1`.
      */
-    abstract predicate row(string row);
+    abstract deprecated predicate row(string row);
   }
 
   /**
@@ -187,7 +187,7 @@ module ModelInput {
   /**
    * A unit class for adding additional type variable model rows.
    */
-  class TypeVariableModelCsv extends Unit {
+  deprecated class TypeVariableModelCsv extends Unit {
     /**
      * Holds if `row` specifies a path through a type variable.
      *
@@ -197,7 +197,7 @@ module ModelInput {
      * ```
      * means `path` can be substituted for a token `TypeVar[name]`.
      */
-    abstract predicate row(string row);
+    abstract deprecated predicate row(string row);
   }
 }
 
@@ -216,27 +216,88 @@ abstract class TestAllModels extends Unit { }
  * does not preserve empty trailing substrings.
  */
 bindingset[result]
-private string inversePad(string s) { s = result + ";dummy" }
+deprecated private string inversePad(string s) { s = result + ";dummy" }
 
-private predicate sourceModel(string row) { any(SourceModelCsv s).row(inversePad(row)) }
+deprecated private predicate sourceModel(string row) { any(SourceModelCsv s).row(inversePad(row)) }
 
-private predicate sinkModel(string row) { any(SinkModelCsv s).row(inversePad(row)) }
+deprecated private predicate sinkModel(string row) { any(SinkModelCsv s).row(inversePad(row)) }
 
-private predicate summaryModel(string row) { any(SummaryModelCsv s).row(inversePad(row)) }
+deprecated private predicate summaryModel(string row) {
+  any(SummaryModelCsv s).row(inversePad(row))
+}
 
-private predicate typeModel(string row) { any(TypeModelCsv s).row(inversePad(row)) }
+deprecated private predicate typeModel(string row) { any(TypeModelCsv s).row(inversePad(row)) }
 
-private predicate typeVariableModel(string row) { any(TypeVariableModelCsv s).row(inversePad(row)) }
+deprecated private predicate typeVariableModel(string row) {
+  any(TypeVariableModelCsv s).row(inversePad(row))
+}
+
+private class DeprecationAdapter extends Unit {
+  abstract predicate sourceModel(string type, string path, string kind);
+
+  abstract predicate sinkModel(string type, string path, string kind);
+
+  abstract predicate summaryModel(string type, string path, string input, string output, string kind);
+
+  abstract predicate typeModel(string type1, string type2, string path);
+
+  abstract predicate typeVariableModel(string name, string path);
+}
+
+private class DeprecationAdapterImpl extends DeprecationAdapter {
+  deprecated override predicate sourceModel(string type, string path, string kind) {
+    exists(string row |
+      sourceModel(row) and
+      row.splitAt(";", 0) = type and
+      row.splitAt(";", 1) = path and
+      row.splitAt(";", 2) = kind
+    )
+  }
+
+  deprecated override predicate sinkModel(string type, string path, string kind) {
+    exists(string row |
+      sinkModel(row) and
+      row.splitAt(";", 0) = type and
+      row.splitAt(";", 1) = path and
+      row.splitAt(";", 2) = kind
+    )
+  }
+
+  deprecated override predicate summaryModel(
+    string type, string path, string input, string output, string kind
+  ) {
+    exists(string row |
+      summaryModel(row) and
+      row.splitAt(";", 0) = type and
+      row.splitAt(";", 1) = path and
+      row.splitAt(";", 2) = input and
+      row.splitAt(";", 3) = output and
+      row.splitAt(";", 4) = kind
+    )
+  }
+
+  deprecated override predicate typeModel(string type1, string type2, string path) {
+    exists(string row |
+      typeModel(row) and
+      row.splitAt(";", 0) = type1 and
+      row.splitAt(";", 1) = type2 and
+      row.splitAt(";", 2) = path
+    )
+  }
+
+  deprecated override predicate typeVariableModel(string name, string path) {
+    exists(string row |
+      typeVariableModel(row) and
+      row.splitAt(";", 0) = name and
+      row.splitAt(";", 1) = path
+    )
+  }
+}
 
 /** Holds if a source model exists for the given parameters. */
 predicate sourceModel(string type, string path, string kind, string model) {
-  exists(string row |
-    sourceModel(row) and
-    row.splitAt(";", 0) = type and
-    row.splitAt(";", 1) = path and
-    row.splitAt(";", 2) = kind and
-    model = "SourceModelCsv"
-  )
+  any(DeprecationAdapter a).sourceModel(type, path, kind) and
+  model = "SourceModelCsv"
   or
   exists(QlBuiltins::ExtensionId madId |
     Extensions::sourceModel(type, path, kind, madId) and
@@ -246,13 +307,8 @@ predicate sourceModel(string type, string path, string kind, string model) {
 
 /** Holds if a sink model exists for the given parameters. */
 private predicate sinkModel(string type, string path, string kind, string model) {
-  exists(string row |
-    sinkModel(row) and
-    row.splitAt(";", 0) = type and
-    row.splitAt(";", 1) = path and
-    row.splitAt(";", 2) = kind and
-    model = "SinkModelCsv"
-  )
+  any(DeprecationAdapter a).sinkModel(type, path, kind) and
+  model = "SinkModelCsv"
   or
   exists(QlBuiltins::ExtensionId madId |
     Extensions::sinkModel(type, path, kind, madId) and
@@ -264,15 +320,8 @@ private predicate sinkModel(string type, string path, string kind, string model)
 private predicate summaryModel(
   string type, string path, string input, string output, string kind, string model
 ) {
-  exists(string row |
-    summaryModel(row) and
-    row.splitAt(";", 0) = type and
-    row.splitAt(";", 1) = path and
-    row.splitAt(";", 2) = input and
-    row.splitAt(";", 3) = output and
-    row.splitAt(";", 4) = kind and
-    model = "SummaryModelCsv"
-  )
+  any(DeprecationAdapter a).summaryModel(type, path, input, output, kind) and
+  model = "SummaryModelCsv"
   or
   exists(QlBuiltins::ExtensionId madId |
     Extensions::summaryModel(type, path, input, output, kind, madId) and
@@ -282,29 +331,20 @@ private predicate summaryModel(
 
 /** Holds if a type model exists for the given parameters. */
 private predicate typeModel(string type1, string type2, string path) {
-  exists(string row |
-    typeModel(row) and
-    row.splitAt(";", 0) = type1 and
-    row.splitAt(";", 1) = type2 and
-    row.splitAt(";", 2) = path
-  )
+  any(DeprecationAdapter a).typeModel(type1, type2, path)
   or
   Extensions::typeModel(type1, type2, path)
 }
 
 /** Holds if a type variable model exists for the given parameters. */
 private predicate typeVariableModel(string name, string path) {
-  exists(string row |
-    typeVariableModel(row) and
-    row.splitAt(";", 0) = name and
-    row.splitAt(";", 1) = path
-  )
+  any(DeprecationAdapter a).typeVariableModel(name, path)
   or
   Extensions::typeVariableModel(name, path)
 }
 
 /**
- * Holds if CSV rows involving `type` might be relevant for the analysis of this database.
+ * Holds if rows involving `type` might be relevant for the analysis of this database.
  */
 predicate isRelevantType(string type) {
   (
@@ -327,7 +367,7 @@ predicate isRelevantType(string type) {
 }
 
 /**
- * Holds if `type,path` is used in some CSV row.
+ * Holds if `type,path` is used in some row.
  */
 pragma[nomagic]
 predicate isRelevantFullPath(string type, string path) {
@@ -340,7 +380,7 @@ predicate isRelevantFullPath(string type, string path) {
   )
 }
 
-/** A string from a CSV row that should be parsed as an access path. */
+/** A string from a row that should be parsed as an access path. */
 private predicate accessPathRange(string s) {
   isRelevantFullPath(_, s)
   or
@@ -632,7 +672,7 @@ module ModelOutput {
   cached
   private module Cached {
     /**
-     * Holds if a CSV source model contributed `source` with the given `kind`.
+     * Holds if a source model contributed `source` with the given `kind`.
      */
     cached
     API::Node getASourceNode(string kind, string model) {
@@ -643,7 +683,7 @@ module ModelOutput {
     }
 
     /**
-     * Holds if a CSV sink model contributed `sink` with the given `kind`.
+     * Holds if a sink model contributed `sink` with the given `kind`.
      */
     cached
     API::Node getASinkNode(string kind, string model) {
@@ -654,7 +694,7 @@ module ModelOutput {
     }
 
     /**
-     * Holds if a relevant CSV summary exists for these parameters.
+     * Holds if a relevant summary exists for these parameters.
      */
     cached
     predicate relevantSummaryModel(
@@ -684,7 +724,7 @@ module ModelOutput {
 
     /**
      * Holds if `node` is seen as an instance of `type` due to a type definition
-     * contributed by a CSV model.
+     * contributed by a model.
      */
     cached
     API::Node getATypeNode(string type) { result = getNodeFromType(type) }
@@ -718,25 +758,6 @@ module ModelOutput {
    * Gets an error message relating to an invalid CSV row in a model.
    */
   string getAWarning() {
-    // Check number of columns
-    exists(string row, string kind, int expectedArity, int actualArity |
-      any(SourceModelCsv csv).row(row) and kind = "source" and expectedArity = 3
-      or
-      any(SinkModelCsv csv).row(row) and kind = "sink" and expectedArity = 3
-      or
-      any(SummaryModelCsv csv).row(row) and kind = "summary" and expectedArity = 5
-      or
-      any(TypeModelCsv csv).row(row) and kind = "type" and expectedArity = 3
-      or
-      any(TypeVariableModelCsv csv).row(row) and kind = "type-variable" and expectedArity = 2
-    |
-      actualArity = count(row.indexOf(";")) + 1 and
-      actualArity != expectedArity and
-      result =
-        "CSV " + kind + " row should have " + expectedArity + " columns but has " + actualArity +
-          ": " + row
-    )
-    or
     // Check names and arguments of access path tokens
     exists(AccessPath path, AccessPathToken token |
       (isRelevantFullPath(_, path) or typeVariableModel(_, path)) and

ruby/ql/lib/codeql/ruby/frameworks/stdlib/Pathname.model.yml

@@ -0,0 +1,34 @@
+extensions:
+  - addsTo:
+      pack: codeql/ruby-all
+      extensible: summaryModel
+    data:
+      - ['Pathname!', 'Method[new]', 'Argument[0]', 'ReturnValue', 'taint']
+      - ['Pathname', 'Method[basename]', 'Argument[self]', 'ReturnValue', 'taint']
+      - ['Pathname', 'Method[cleanpath]', 'Argument[self]', 'ReturnValue', 'taint']
+      - ['Pathname', 'Method[dirname]', 'Argument[self]', 'ReturnValue', 'taint']
+      - ['Pathname', 'Method[each_filename]', 'Argument[self]', 'Argument[block].Parameter[0]', 'taint']
+      - ['Pathname', 'Method[expand_path]', 'Argument[self]', 'ReturnValue', 'taint']
+      - ['Pathname', 'Method[join]', 'Argument[self,any]', 'ReturnValue', 'taint']
+      - ['Pathname', 'Method[parent]', 'Argument[self]', 'ReturnValue', 'taint']
+      - ['Pathname', 'Method[realpath]', 'Argument[self]', 'ReturnValue', 'taint']
+      - ['Pathname', 'Method[relative_path_from]', 'Argument[self]', 'ReturnValue', 'taint']
+      - ['Pathname', 'Method[sub]', 'Argument[self]', 'ReturnValue', 'taint']
+      - ['Pathname', 'Method[sub_ext]', 'Argument[self]', 'ReturnValue', 'taint']
+      - ['Pathname', 'Method[to_path]', 'Argument[self]', 'ReturnValue', 'taint']
+
+  - addsTo:
+      pack: codeql/ruby-all
+      extensible: typeModel
+    data:
+      - ['Pathname', 'Pathname', 'Method[+].ReturnValue']
+      - ['Pathname', 'Pathname', 'Method[/].ReturnValue']
+      - ['Pathname', 'Pathname', 'Method[basename].ReturnValue']
+      - ['Pathname', 'Pathname', 'Method[cleanpath].ReturnValue']
+      - ['Pathname', 'Pathname', 'Method[expand_path].ReturnValue']
+      - ['Pathname', 'Pathname', 'Method[join].ReturnValue']
+      - ['Pathname', 'Pathname', 'Method[realpath].ReturnValue']
+      - ['Pathname', 'Pathname', 'Method[relative_path_from].ReturnValue']
+      - ['Pathname', 'Pathname', 'Method[sub].ReturnValue']
+      - ['Pathname', 'Pathname', 'Method[sub_ext].ReturnValue']
+      - ['Pathname', 'Pathname', 'Method[to_path].ReturnValue']

ruby/ql/lib/codeql/ruby/frameworks/stdlib/Pathname.qll

@@ -116,74 +116,4 @@ module Pathname {
 
     override DataFlow::Node getAPermissionNode() { result = permissionArg }
   }
-
-  /**
-   * Type summaries for the `Pathname` class, i.e. method calls that produce new
-   * `Pathname` instances.
-   */
-  private class PathnameTypeSummary extends ModelInput::TypeModelCsv {
-    override predicate row(string row) {
-      // type1;type2;path
-      row =
-        [
-          // Pathname#+(path) : Pathname
-          "Pathname;Pathname;Method[+].ReturnValue",
-          // Pathname#/(path) : Pathname
-          "Pathname;Pathname;Method[/].ReturnValue",
-          // Pathname#basename(path) : Pathname
-          "Pathname;Pathname;Method[basename].ReturnValue",
-          // Pathname#cleanpath(path) : Pathname
-          "Pathname;Pathname;Method[cleanpath].ReturnValue",
-          // Pathname#expand_path(path) : Pathname
-          "Pathname;Pathname;Method[expand_path].ReturnValue",
-          // Pathname#join(path) : Pathname
-          "Pathname;Pathname;Method[join].ReturnValue",
-          // Pathname#realpath(path) : Pathname
-          "Pathname;Pathname;Method[realpath].ReturnValue",
-          // Pathname#relative_path_from(path) : Pathname
-          "Pathname;Pathname;Method[relative_path_from].ReturnValue",
-          // Pathname#sub(path) : Pathname
-          "Pathname;Pathname;Method[sub].ReturnValue",
-          // Pathname#sub_ext(path) : Pathname
-          "Pathname;Pathname;Method[sub_ext].ReturnValue",
-          // Pathname#to_path(path) : Pathname
-          "Pathname;Pathname;Method[to_path].ReturnValue",
-        ]
-    }
-  }
-
-  /** Taint flow summaries for the `Pathname` class. */
-  private class PathnameTaintSummary extends ModelInput::SummaryModelCsv {
-    override predicate row(string row) {
-      row =
-        [
-          // Pathname.new(path)
-          "Pathname!;Method[new];Argument[0];ReturnValue;taint",
-          // Pathname#dirname
-          "Pathname;Method[dirname];Argument[self];ReturnValue;taint",
-          // Pathname#each_filename
-          "Pathname;Method[each_filename];Argument[self];Argument[block].Parameter[0];taint",
-          // Pathname#expand_path
-          "Pathname;Method[expand_path];Argument[self];ReturnValue;taint",
-          // Pathname#join
-          "Pathname;Method[join];Argument[self,any];ReturnValue;taint",
-          // Pathname#parent
-          "Pathname;Method[parent];Argument[self];ReturnValue;taint",
-          // Pathname#realpath
-          "Pathname;Method[realpath];Argument[self];ReturnValue;taint",
-          // Pathname#relative_path_from
-          "Pathname;Method[relative_path_from];Argument[self];ReturnValue;taint",
-          // Pathname#to_path
-          "Pathname;Method[to_path];Argument[self];ReturnValue;taint",
-          // Pathname#basename
-          "Pathname;Method[basename];Argument[self];ReturnValue;taint",
-          // Pathname#cleanpath
-          "Pathname;Method[cleanpath];Argument[self];ReturnValue;taint",
-          // Pathname#sub
-          "Pathname;Method[sub];Argument[self];ReturnValue;taint",
-          // Pathname#sub_ext
-          "Pathname;Method[sub_ext];Argument[self];ReturnValue;taint",
-        ]
-    }
-  }
 }