Fixes for actions workflow failures 3

Fixes to templates used to generate new queries languages such as:

- cpp
- csharp
- go
- java
- ruby

Author: data-douser

.github/workflows/internal-validate-cli-outputs.yml

@@ -45,8 +45,19 @@ jobs:
           # Copy configuration file
           cp example/qlt.conf.json "$TEST_DIR"
 
-      - name: Install `codeql` CLI via CodeQLToolkit
-        run: dotnet run --project src/CodeQLToolkit.Core -- codeql run install --base "$TEST_DIR"
+      ## Using the 'latest' version of the `codeql` CLI may eventually
+      ## cause issues, where the `qlt.conf.json` file specifies an exact
+      ## version of the CLI. For now, we live with the risk, and the issues
+      ## surfaced might actually be useful to identify emerging problems
+      ## in the `codeql` CLI -- which is only required here for extra
+      ## debugging of any queries with test failures.
+      - name: Install `codeql` CLI
+        id: install-codeql
+        uses: ./.github/actions/install-codeql
+        with:
+          add-to-path: 'true'
+          codeql-cli-version: 'latest'
+          codeql-stdlib-version: 'latest'
 
       - name: Run end-to-end CLI validation
         run: ./scripts/validate-cli-e2e.sh

src/CodeQLToolkit.Features/Templates/Query/cpp/new-dataflow-query.liquid

@@ -9,23 +9,23 @@
  */
 
 import cpp
-import semmle.code.cpp.dataflow.TaintTracking
-import DataFlow::PathGraph
+import semmle.code.cpp.ir.dataflow.TaintTracking
+import Flow::PathGraph
 
-class Config extends TaintTracking::Configuration {
-  Config() { this = "{{query_name}}" }
-
-  override predicate isSource(DataFlow::Node source) {
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) {
     // Define your sources here
     none()
   }
 
-  override predicate isSink(DataFlow::Node sink) {
+  predicate isSink(DataFlow::Node sink) {
     // Define your sinks here  
     none()
   }
 }
 
-from Config config, DataFlow::PathNode source, DataFlow::PathNode sink
-where config.hasFlowPath(source, sink)
+module Flow = TaintTracking::Global<Config>;
+
+from Flow::PathNode source, Flow::PathNode sink
+where Flow::flowPath(source, sink)
 select sink.getNode(), source, sink, "Replace this with your dataflow query."

src/CodeQLToolkit.Features/Templates/Query/csharp/new-dataflow-query.liquid

@@ -8,9 +8,7 @@
  * @tags {{query_pack_name}}
  */
 
-import {{ql_language_import}}
-import semmle.code.{{ql_language_import}}.dataflow.TaintTracking
-import DataFlow::PathGraph
+import csharp
 
 module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
@@ -24,7 +22,8 @@ module Config implements DataFlow::ConfigSig {
   }
 }
 
-module Flow = TaintTracking::Global<Config>;
+module Flow = DataFlow::Global<Config>;
+import Flow::PathGraph
 
 from Flow::PathNode source, Flow::PathNode sink
 where Flow::flowPath(source, sink)

src/CodeQLToolkit.Features/Templates/Query/csharp/new-query.liquid

@@ -8,7 +8,7 @@
  * @tags {{query_pack_name}}
  */
 
-import {{ql_language_import}}
+import csharp
 
-from File f
-select f, "Replace this with your query."
+from Expr e
+select e, "Replace this with your query."

src/CodeQLToolkit.Features/Templates/Query/go/new-dataflow-query.liquid

@@ -8,9 +8,7 @@
  * @tags {{query_pack_name}}
  */
 
-import {{ql_language_import}}
-import semmle.code.{{ql_language_import}}.dataflow.TaintTracking
-import DataFlow::PathGraph
+import go
 
 module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
@@ -24,7 +22,8 @@ module Config implements DataFlow::ConfigSig {
   }
 }
 
-module Flow = TaintTracking::Global<Config>;
+module Flow = DataFlow::Global<Config>;
+import Flow::PathGraph
 
 from Flow::PathNode source, Flow::PathNode sink
 where Flow::flowPath(source, sink)

src/CodeQLToolkit.Features/Templates/Query/go/new-query.liquid

@@ -8,7 +8,22 @@
  * @tags {{query_pack_name}}
  */
 
-import {{ql_language_import}}
+import go
 
-from File f
-select f, "Replace this with your query."
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) {
+    // Define your sources here
+    none()
+  }
+
+  predicate isSink(DataFlow::Node sink) {
+    // Define your sinks here  
+    none()
+  }
+}
+
+module Flow = DataFlow::Global<Config>;
+
+from DataFlow::Node source, string msg
+where Flow::flow(source, _) and msg = "Replace this with your query."
+select source, msg

src/CodeQLToolkit.Features/Templates/Query/java/new-dataflow-query.liquid

@@ -8,9 +8,8 @@
  * @tags {{query_pack_name}}
  */
 
-import {{ql_language_import}}
-import semmle.code.{{ql_language_import}}.dataflow.TaintTracking
-import DataFlow::PathGraph
+import java
+import semmle.code.java.dataflow.DataFlow
 
 module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node node) {
@@ -24,7 +23,8 @@ module Config implements DataFlow::ConfigSig {
   }
 }
 
-module Flow = TaintTracking::Global<Config>;
+module Flow = DataFlow::Global<Config>;
+import Flow::PathGraph
 
 from Flow::PathNode source, Flow::PathNode sink
 where Flow::flowPath(source, sink)

src/CodeQLToolkit.Features/Templates/Query/java/new-query.liquid

@@ -8,7 +8,23 @@
  * @tags {{query_pack_name}}
  */
 
-import {{ql_language_import}}
+import java
+import semmle.code.java.dataflow.DataFlow
 
-from Expr e
-select e, "Replace this with your query."
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) {
+    // Define your sources here
+    none()
+  }
+
+  predicate isSink(DataFlow::Node sink) {
+    // Define your sinks here  
+    none()
+  }
+}
+
+module Flow = DataFlow::Global<Config>;
+
+from DataFlow::Node source, string msg
+where Flow::flow(source, _) and msg = "Replace this with your query."
+select source, msg

src/CodeQLToolkit.Features/Templates/Query/ruby/new-dataflow-query.liquid

@@ -8,9 +8,8 @@
  * @tags {{query_pack_name}}
  */
 
-import {{ql_language_import}}
-import codeql.ruby.TaintTracking
-import DataFlow::PathGraph
+import codeql.ruby.AST
+import codeql.ruby.DataFlow
 
 module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node node) {
@@ -24,7 +23,8 @@ module Config implements DataFlow::ConfigSig {
   }
 }
 
-module Flow = TaintTracking::Global<Config>;
+module Flow = DataFlow::Global<Config>;
+import Flow::PathGraph
 
 from Flow::PathNode source, Flow::PathNode sink
 where Flow::flowPath(source, sink)

src/CodeQLToolkit.Features/Templates/Query/ruby/new-query.liquid

@@ -8,7 +8,7 @@
  * @tags {{query_pack_name}}
  */
 
-import {{ql_language_import}}
+import codeql.ruby.AST
 
 from File f
 select f, "Replace this with your query."