Merge pull request github#19333 from geoffw0/consistency

Rust: Make source kinds consistent with other languages

Author: geoffw0

rust/ql/lib/codeql/rust/Concepts.qll

@@ -73,7 +73,7 @@ module CommandLineArgsSource {
  * An externally modeled source for command line arguments.
  */
 class ModeledCommandLineArgsSource extends CommandLineArgsSource::Range {
-  ModeledCommandLineArgsSource() { sourceNode(this, "command-line-source") }
+  ModeledCommandLineArgsSource() { sourceNode(this, "commandargs") }
 }
 
 /**
@@ -99,7 +99,7 @@ module EnvironmentSource {
  * An externally modeled source for data from the program's environment.
  */
 class ModeledEnvironmentSource extends EnvironmentSource::Range {
-  ModeledEnvironmentSource() { sourceNode(this, "environment-source") }
+  ModeledEnvironmentSource() { sourceNode(this, "environment") }
 }
 
 /**

rust/ql/lib/codeql/rust/frameworks/stdlib/env.model.yml

@@ -3,12 +3,12 @@ extensions:
       pack: codeql/rust-all
       extensible: sourceModel
     data:
-      - ["lang:std", "crate::env::args", "ReturnValue.Element", "command-line-source", "manual"]
-      - ["lang:std", "crate::env::args_os", "ReturnValue.Element", "command-line-source", "manual"]
-      - ["lang:std", "crate::env::current_dir", "ReturnValue.Field[crate::result::Result::Ok(0)]", "command-line-source", "manual"]
-      - ["lang:std", "crate::env::current_exe", "ReturnValue.Field[crate::result::Result::Ok(0)]", "command-line-source", "manual"]
-      - ["lang:std", "crate::env::home_dir", "ReturnValue.Field[crate::option::Option::Some(0)]", "command-line-source", "manual"]
-      - ["lang:std", "crate::env::var", "ReturnValue.Field[crate::result::Result::Ok(0)]", "environment-source", "manual"]
-      - ["lang:std", "crate::env::var_os", "ReturnValue.Field[crate::option::Option::Some(0)]", "environment-source", "manual"]
-      - ["lang:std", "crate::env::vars", "ReturnValue.Element", "environment-source", "manual"]
-      - ["lang:std", "crate::env::vars_os", "ReturnValue.Element", "environment-source", "manual"]
+      - ["lang:std", "crate::env::args", "ReturnValue.Element", "commandargs", "manual"]
+      - ["lang:std", "crate::env::args_os", "ReturnValue.Element", "commandargs", "manual"]
+      - ["lang:std", "crate::env::current_dir", "ReturnValue.Field[crate::result::Result::Ok(0)]", "commandargs", "manual"]
+      - ["lang:std", "crate::env::current_exe", "ReturnValue.Field[crate::result::Result::Ok(0)]", "commandargs", "manual"]
+      - ["lang:std", "crate::env::home_dir", "ReturnValue.Field[crate::option::Option::Some(0)]", "commandargs", "manual"]
+      - ["lang:std", "crate::env::var", "ReturnValue.Field[crate::result::Result::Ok(0)]", "environment", "manual"]
+      - ["lang:std", "crate::env::var_os", "ReturnValue.Field[crate::option::Option::Some(0)]", "environment", "manual"]
+      - ["lang:std", "crate::env::vars", "ReturnValue.Element", "environment", "manual"]
+      - ["lang:std", "crate::env::vars_os", "ReturnValue.Element", "environment", "manual"]

rust/ql/test/query-tests/security/CWE-020/RegexInjection.expected

@@ -13,7 +13,7 @@ edges
 | main.rs:5:25:5:44 | { ... } | main.rs:5:25:5:44 | ...::must_use(...) | provenance | MaD:4 |
 | main.rs:6:26:6:30 | regex | main.rs:6:25:6:30 | &regex | provenance |  |
 models
-| 1 | Source: lang:std; crate::env::var; environment-source; ReturnValue.Field[crate::result::Result::Ok(0)] |
+| 1 | Source: lang:std; crate::env::var; environment; ReturnValue.Field[crate::result::Result::Ok(0)] |
 | 2 | Summary: lang:alloc; crate::fmt::format; Argument[0]; ReturnValue; taint |
 | 3 | Summary: lang:core; <crate::result::Result>::unwrap_or; Argument[self].Field[crate::result::Result::Ok(0)]; ReturnValue; value |
 | 4 | Summary: lang:core; crate::hint::must_use; Argument[0]; ReturnValue; value |

rust/ql/test/query-tests/security/CWE-089/SqlInjection.expected

@@ -55,7 +55,7 @@ edges
 | sqlx.rs:74:25:74:38 | unsafe_query_1 [&ref] | sqlx.rs:74:25:74:47 | unsafe_query_1.as_str() | provenance | MaD:3 |
 | sqlx.rs:76:29:76:42 | unsafe_query_2 [&ref] | sqlx.rs:76:29:76:51 | unsafe_query_2.as_str() | provenance | MaD:3 |
 models
-| 1 | Source: lang:std; crate::env::args; command-line-source; ReturnValue.Element |
+| 1 | Source: lang:std; crate::env::args; commandargs; ReturnValue.Element |
 | 2 | Source: repo:https://github.com/seanmonstar/reqwest:reqwest; crate::blocking::get; remote; ReturnValue.Field[crate::result::Result::Ok(0)] |
 | 3 | Summary: lang:alloc; <crate::string::String>::as_str; Argument[self]; ReturnValue; value |
 | 4 | Summary: lang:alloc; crate::fmt::format; Argument[0]; ReturnValue; taint |

rust/ql/test/query-tests/security/CWE-770/UncontrolledAllocationSize.expected

@@ -271,7 +271,7 @@ models
 | 13 | Sink: repo:https://github.com/rust-lang/libc:libc; ::calloc; alloc-size; Argument[0,1] |
 | 14 | Sink: repo:https://github.com/rust-lang/libc:libc; ::malloc; alloc-size; Argument[0] |
 | 15 | Sink: repo:https://github.com/rust-lang/libc:libc; ::realloc; alloc-size; Argument[1] |
-| 16 | Source: lang:std; crate::env::args; command-line-source; ReturnValue.Element |
+| 16 | Source: lang:std; crate::env::args; commandargs; ReturnValue.Element |
 | 17 | Summary: lang:core; <crate::alloc::layout::Layout>::align_to; Argument[self]; ReturnValue.Field[crate::result::Result::Ok(0)]; taint |
 | 18 | Summary: lang:core; <crate::alloc::layout::Layout>::array; Argument[0]; ReturnValue.Field[crate::result::Result::Ok(0)]; taint |
 | 19 | Summary: lang:core; <crate::alloc::layout::Layout>::extend; Argument[0]; ReturnValue.Field[crate::result::Result::Ok(0)].Field[0]; taint |