Ruby: Use data flow consistency checks from shared pack

Author: hvitved

config/identical-files.json

@@ -61,7 +61,6 @@
     "cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplConsistency.qll",
     "csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplConsistency.qll",
     "python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImplConsistency.qll",
-    "ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImplConsistency.qll",
     "swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImplConsistency.qll"
   ],
   "DataFlow Java/C#/Go/Ruby/Python/Swift Flow Summaries": [
@@ -561,4 +560,4 @@
     "python/ql/test/experimental/dataflow/model-summaries/InlineTaintTest.ext.yml",
     "python/ql/test/experimental/dataflow/model-summaries/NormalDataflowTest.ext.yml"
   ]
-}
+}

ruby/ql/consistency-queries/DataFlowConsistency.ql

@@ -1,13 +1,16 @@
-import codeql.ruby.AST
-import codeql.ruby.CFG
-import codeql.ruby.DataFlow::DataFlow
-import codeql.ruby.dataflow.internal.DataFlowPrivate
-import codeql.ruby.dataflow.internal.DataFlowImplConsistency::Consistency
+import codeql.ruby.DataFlow::DataFlow as DataFlow
+private import codeql.ruby.AST
+private import codeql.ruby.CFG
+private import codeql.ruby.dataflow.internal.DataFlowImplSpecific
+private import codeql.ruby.dataflow.internal.TaintTrackingImplSpecific
+private import codeql.dataflow.internal.DataFlowImplConsistency
 
-private class MyConsistencyConfiguration extends ConsistencyConfiguration {
-  override predicate postWithInFlowExclude(Node n) { n instanceof FlowSummaryNode }
+private module Input implements InputSig<RubyDataFlow> {
+  private import RubyDataFlow
 
-  override predicate argHasPostUpdateExclude(ArgumentNode n) {
+  predicate postWithInFlowExclude(Node n) { n instanceof FlowSummaryNode }
+
+  predicate argHasPostUpdateExclude(ArgumentNode n) {
     n instanceof BlockArgumentNode
     or
     n instanceof FlowSummaryNode
@@ -17,15 +20,15 @@ private class MyConsistencyConfiguration extends ConsistencyConfiguration {
     not isNonConstantExpr(getAPostUpdateNodeForArg(n.asExpr()))
   }
 
-  override predicate postHasUniquePreExclude(PostUpdateNode n) {
+  predicate postHasUniquePreExclude(PostUpdateNode n) {
     exists(CfgNodes::ExprCfgNode e, CfgNodes::ExprCfgNode arg |
       e = getAPostUpdateNodeForArg(arg) and
       e != arg and
       n = TExprPostUpdateNode(e)
     )
   }
 
-  override predicate uniquePostUpdateExclude(Node n) {
+  predicate uniquePostUpdateExclude(Node n) {
     exists(CfgNodes::ExprCfgNode e, CfgNodes::ExprCfgNode arg |
       e = getAPostUpdateNodeForArg(arg) and
       e != arg and
@@ -34,7 +37,9 @@ private class MyConsistencyConfiguration extends ConsistencyConfiguration {
   }
 }
 
-query predicate multipleToString(Node n, string s) {
+import MakeConsistency<RubyDataFlow, RubyTaintTracking, Input>
+
+query predicate multipleToString(DataFlow::Node n, string s) {
   s = strictconcat(n.toString(), ",") and
   strictcount(n.toString()) > 1
 }