wip

Author: hvitved

rust/ql/lib/codeql/rust/dataflow/internal/DataFlowConsistency.qll

@@ -29,3 +29,25 @@ private module Input implements InputSig<Location, RustDataFlow> {
 }
 
 import MakeConsistency<Location, RustDataFlow, RustTaintTracking, Input>
+private import codeql.rust.dataflow.internal.ModelsAsData
+
+query predicate missingMadSummaryCanonicalPath(string crate, string path, Addressable a) {
+  summaryModel(crate, path, _, _, _, _, _) and
+  a.getCrateOrigin() = crate and
+  a.getExtendedCanonicalPath() = path and
+  not exists(a.getCanonicalPath())
+}
+
+query predicate missingMadSourceCanonicalPath(string crate, string path, Addressable a) {
+  sourceModel(crate, path, _, _, _, _) and
+  a.getCrateOrigin() = crate and
+  a.getExtendedCanonicalPath() = path and
+  not exists(a.getCanonicalPath())
+}
+
+query predicate missingMadSinkCanonicalPath(string crate, string path, Addressable a) {
+  sinkModel(crate, path, _, _, _, _) and
+  a.getCrateOrigin() = crate and
+  a.getExtendedCanonicalPath() = path and
+  not exists(a.getCanonicalPath())
+}

rust/ql/lib/codeql/rust/elements/internal/AddressableImpl.qll

@@ -24,10 +24,21 @@ module Impl {
     /**
      * Gets the canonical path of this item, if any.
      *
+     * The crate `c` is the root of the path.
+     *
      * See [The Rust Reference][1] for more details.
      *
      * [1]: https://doc.rust-lang.org/reference/paths.html#canonical-paths
      */
     string getCanonicalPath(Crate c) { result = this.(ItemNode).getCanonicalPath(c) }
+
+    /**
+     * Gets the canonical path of this item, if any.
+     *
+     * See [The Rust Reference][1] for more details.
+     *
+     * [1]: https://doc.rust-lang.org/reference/paths.html#canonical-paths
+     */
+    string getCanonicalPath() { result = this.getCanonicalPath(_) }
   }
 }

rust/ql/lib/codeql/rust/frameworks/stdlib/Stdlib.qll

@@ -22,22 +22,16 @@ private class StartswithCall extends Path::SafeAccessCheck::Range, CfgNodes::Met
   }
 }
 
+private import codeql.rust.internal.PathResolution
+private import codeql.rust.elements.internal.generated.ParentChild
+
 /**
  * The [`Option` enum][1].
  *
  * [1]: https://doc.rust-lang.org/std/option/enum.Option.html
  */
 class OptionEnum extends Enum {
-  OptionEnum() {
-    // todo: replace with canonical path, once calculated in QL
-    exists(Crate core, Module m |
-      core.getName() = "core" and
-      m = core.getModule().getItemList().getAnItem() and
-      m.getName().getText() = "option" and
-      this = m.getItemList().getAnItem() and
-      this.getName().getText() = "Option"
-    )
-  }
+  OptionEnum() { this.getCanonicalPath() = "core::option::Option" }
 
   /** Gets the `Some` variant. */
   Variant getSome() { result = this.getVariant("Some") }
@@ -49,16 +43,7 @@ class OptionEnum extends Enum {
  * [1]: https://doc.rust-lang.org/stable/std/result/enum.Result.html
  */
 class ResultEnum extends Enum {
-  ResultEnum() {
-    // todo: replace with canonical path, once calculated in QL
-    exists(Crate core, Module m |
-      core.getName() = "core" and
-      m = core.getModule().getItemList().getAnItem() and
-      m.getName().getText() = "result" and
-      this = m.getItemList().getAnItem() and
-      this.getName().getText() = "Result"
-    )
-  }
+  ResultEnum() { this.getCanonicalPath() = "core::result::Result" }
 
   /** Gets the `Ok` variant. */
   Variant getOk() { result = this.getVariant("Ok") }

rust/ql/lib/codeql/rust/internal/PathResolution.qll

@@ -360,11 +360,13 @@ class CrateItemNode extends ItemNode instanceof Crate {
 
   override predicate providesCanonicalPathPrefixFor(Crate c, ItemNode child) {
     this.hasCanonicalPath(c) and
-    exists(ModuleLikeNode m | m = this.getModuleNode() |
-      child = m
-      or
-      child.getImmediateParent() = m.(SourceFile) and
+    exists(ModuleLikeNode m |
+      child.getImmediateParent() = m and
       not m = child.(SourceFileItemNode).getSuper()
+    |
+      m = super.getModule() // the special `crate` root module inserted by the extractor
+      or
+      m = super.getSourceFile()
     )
   }
 
@@ -650,6 +652,16 @@ private class MacroCallItemNode extends AssocItemNode instanceof MacroCall {
 
   override Visibility getVisibility() { none() }
 
+  override predicate providesCanonicalPathPrefixFor(Crate c, ItemNode child) {
+    any(ItemNode parent).providesCanonicalPathPrefixFor(c, this) and
+    child.getImmediateParent() = this
+  }
+
+  override string getCanonicalPathPrefixFor(Crate c, ItemNode child) {
+    result = this.getCanonicalPathPrefix(c) and
+    this.providesCanonicalPathPrefixFor(c, child)
+  }
+
   override predicate hasCanonicalPath(Crate c) { none() }
 
   override string getCanonicalPath(Crate c) { none() }
@@ -1415,8 +1427,8 @@ private module Debug {
   private Locatable getRelevantLocatable() {
     exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
       result.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) and
-      filepath.matches("%/test_logging.rs") and
-      startline = 163
+      filepath.matches("%/clean/types.rs") and
+      startline = [5, 350]
     )
   }
 
@@ -1452,4 +1464,14 @@ private module Debug {
     m = getRelevantLocatable() and
     fileImport(m, f)
   }
+
+  predicate debugPreludeEdge(SourceFile f, string name, ItemNode i) {
+    preludeEdge(f, name, i) and
+    f = getRelevantLocatable()
+  }
+
+  string debugGetCanonicalPath(ItemNode i, Crate c) {
+    result = i.getCanonicalPath(c) and
+    i = getRelevantLocatable()
+  }
 }

rust/ql/src/queries/telemetry/RustAnalyzerComparison.qll

@@ -145,3 +145,8 @@ private module QlCallGraph implements CompareSig<CallGraph> {
 }
 
 module CallGraphCompare = Compare<CallGraph, RustAnalyzerCallGraph, QlCallGraph>;
+
+private predicate qlMissingCanonicalPath(Addressable a, string path) {
+  path = a.getExtendedCanonicalPath() and
+  not exists(a.getCanonicalPath(_))
+}