temp

hvitved · hvitved · commit 16bec3f18f3f · 2024-01-23T09:06:39.000+01:00
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl1.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl1.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl1.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl1.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl1.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl1.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl1.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl1.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl2.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl2.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl1.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl1.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl1.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl1.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl1.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl1.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll
@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {
   }
 
   predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }
+
+  predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {
+    none()
+  }
 }
 
 deprecated private import Impl<Config> as I
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll
@@ -1992,6 +1992,15 @@ private predicate isHashClass(DataFlowType t) {
   t = TModuleDataFlowType(any(TypeInference::HashClass m).getADescendent())
 }
 
+pragma[nomagic]
+predicate isStringClass(DataFlowType t, boolean descendant) {
+  t = TModuleDataFlowType(any(TypeInference::StringClass s)) and
+  descendant = false
+  or
+  t = TModuleDataFlowType(any(TypeInference::StringClass s).getAnImmediateDescendent+()) and
+  descendant = true
+}
+
 private predicate isCollectionClass(DataFlowType t) { isArrayClass(t) or isHashClass(t) }
 
 predicate typeStrongerThan(DataFlowType t1, DataFlowType t2) {
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingImplSpecific.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingImplSpecific.qll
@@ -6,5 +6,10 @@ private import codeql.dataflow.TaintTracking
 private import DataFlowImplSpecific
 
 module RubyTaintTracking implements InputSig<RubyDataFlow> {
-  import TaintTrackingPrivate
+  private import TaintTrackingPrivate as Priv
+  import Priv
+
+  predicate defaultAdditionalTypedLocalTaintStep = Priv::defaultAdditionalTypedLocalTaintStep/2;
+
+  predicate defaultAdditionalTypedLocalTaintStep = Priv::defaultAdditionalTypedLocalTaintStep/4;
 }
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPrivate.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPrivate.qll
diff --git a/ruby/ql/test/library-tests/dataflow/global/Flow.expected b/ruby/ql/test/library-tests/dataflow/global/Flow.expected
diff --git a/shared/dataflow/codeql/dataflow/DataFlow.qll b/shared/dataflow/codeql/dataflow/DataFlow.qll
diff --git a/shared/dataflow/codeql/dataflow/TaintTracking.qll b/shared/dataflow/codeql/dataflow/TaintTracking.qll
diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl1.qll b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl1.qll

Original file line number	Diff line number	Diff line change
`@@ -296,6 +296,12 @@ deprecated private module Config implements FullStateConfigSig {`
`296`	`296`	`}`
`297`	`297`
`298`	`298`	`predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }`
	`299`	`+`
	`300`	`+ predicate isAdditionalTypedLocalFlowStep(Node node1, Node node2) { none() }`
	`301`	`+`
	`302`	`+ predicate isAdditionalTypedLocalFlowStep(Node node1, DataFlowType t1, Node node2, DataFlowType t2) {`
	`303`	`+ none()`
	`304`	`+ }`
`299`	`305`	`}`
`300`	`306`
`301`	`307`	`deprecated private import Impl<Config> as I`