Rust: normalize file paths for PathResolutionConsistency.ql

Author: aibaars

rust/ql/consistency-queries/PathResolutionConsistency.ql

@@ -5,4 +5,25 @@
  * @id rust/diagnostics/path-resolution-consistency
  */
 
-import codeql.rust.internal.PathResolutionConsistency
+private import codeql.rust.internal.PathResolutionConsistency as PathResolutionConsistency
+private import codeql.rust.elements.Locatable
+private import codeql.Locations
+import PathResolutionConsistency
+
+class SourceLocatable instanceof Locatable {
+  string toString() { result = super.toString() }
+
+  Location getLocation() {
+    if super.getLocation().fromSource()
+    then result = super.getLocation()
+    else result instanceof EmptyLocation
+  }
+}
+
+query predicate multipleMethodCallTargets(SourceLocatable a, SourceLocatable b) {
+  PathResolutionConsistency::multipleMethodCallTargets(a, b)
+}
+
+query predicate multiplePathResolutions(SourceLocatable a, SourceLocatable b) {
+  PathResolutionConsistency::multiplePathResolutions(a, b)
+}

rust/ql/test/library-tests/dataflow/sources/CONSISTENCY/PathResolutionConsistency.expected

@@ -0,0 +1,3 @@
+multipleMethodCallTargets
+| web_frameworks.rs:194:30:194:74 | ... .get(...) | file://:0:0:0:0 | fn get |
+| web_frameworks.rs:194:30:194:74 | ... .get(...) | file://:0:0:0:0 | fn get |

rust/ql/test/query-tests/security/CWE-696/CONSISTENCY/PathResolutionConsistency.expected

@@ -0,0 +1,27 @@
+multiplePathResolutions
+| test.rs:50:3:50:6 | ctor | file://:0:0:0:0 | Crate([email protected]) |
+| test.rs:50:3:50:6 | ctor | file://:0:0:0:0 | fn ctor |
+| test.rs:55:3:55:6 | ctor | file://:0:0:0:0 | Crate([email protected]) |
+| test.rs:55:3:55:6 | ctor | file://:0:0:0:0 | fn ctor |
+| test.rs:60:3:60:6 | ctor | file://:0:0:0:0 | Crate([email protected]) |
+| test.rs:60:3:60:6 | ctor | file://:0:0:0:0 | fn ctor |
+| test.rs:65:3:65:6 | ctor | file://:0:0:0:0 | Crate([email protected]) |
+| test.rs:65:3:65:6 | ctor | file://:0:0:0:0 | fn ctor |
+| test.rs:73:3:73:6 | ctor | file://:0:0:0:0 | Crate([email protected]) |
+| test.rs:73:3:73:6 | ctor | file://:0:0:0:0 | fn ctor |
+| test.rs:78:3:78:6 | ctor | file://:0:0:0:0 | Crate([email protected]) |
+| test.rs:78:3:78:6 | ctor | file://:0:0:0:0 | fn ctor |
+| test.rs:87:3:87:6 | ctor | file://:0:0:0:0 | Crate([email protected]) |
+| test.rs:87:3:87:6 | ctor | file://:0:0:0:0 | fn ctor |
+| test.rs:94:3:94:6 | ctor | file://:0:0:0:0 | Crate([email protected]) |
+| test.rs:94:3:94:6 | ctor | file://:0:0:0:0 | fn ctor |
+| test.rs:128:3:128:6 | ctor | file://:0:0:0:0 | Crate([email protected]) |
+| test.rs:128:3:128:6 | ctor | file://:0:0:0:0 | fn ctor |
+| test.rs:139:3:139:6 | ctor | file://:0:0:0:0 | Crate([email protected]) |
+| test.rs:139:3:139:6 | ctor | file://:0:0:0:0 | fn ctor |
+| test.rs:144:3:144:6 | ctor | file://:0:0:0:0 | Crate([email protected]) |
+| test.rs:144:3:144:6 | ctor | file://:0:0:0:0 | fn ctor |
+| test.rs:150:3:150:6 | ctor | file://:0:0:0:0 | Crate([email protected]) |
+| test.rs:150:3:150:6 | ctor | file://:0:0:0:0 | fn ctor |
+| test.rs:168:3:168:6 | ctor | file://:0:0:0:0 | Crate([email protected]) |
+| test.rs:168:3:168:6 | ctor | file://:0:0:0:0 | fn ctor |