Rust: Make sources more accurate (Option / Result contents).

Author: geoffw0

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

@@ -5,10 +5,10 @@ extensions:
     data:
       - ["lang:std", "crate::env::args", "ReturnValue", "command-line-source", "manual"]
       - ["lang:std", "crate::env::args_os", "ReturnValue", "command-line-source", "manual"]
-      - ["lang:std", "crate::env::current_dir", "ReturnValue", "command-line-source", "manual"]
-      - ["lang:std", "crate::env::current_exe", "ReturnValue", "command-line-source", "manual"]
-      - ["lang:std", "crate::env::home_dir", "ReturnValue", "command-line-source", "manual"]
-      - ["lang:std", "crate::env::var", "ReturnValue", "environment-source", "manual"]
-      - ["lang:std", "crate::env::var_os", "ReturnValue", "environment-source", "manual"]
+      - ["lang:std", "crate::env::current_dir", "ReturnValue.Variant[crate::result::Result::Ok(0)]", "command-line-source", "manual"]
+      - ["lang:std", "crate::env::current_exe", "ReturnValue.Variant[crate::result::Result::Ok(0)]", "command-line-source", "manual"]
+      - ["lang:std", "crate::env::home_dir", "ReturnValue.Variant[crate::option::Option::Some(0)]", "command-line-source", "manual"]
+      - ["lang:std", "crate::env::var", "ReturnValue.Variant[crate::result::Result::Ok(0)]", "environment-source", "manual"]
+      - ["lang:std", "crate::env::var_os", "ReturnValue.Variant[crate::option::Option::Some(0)]", "environment-source", "manual"]
       - ["lang:std", "crate::env::vars", "ReturnValue", "environment-source", "manual"]
       - ["lang:std", "crate::env::vars_os", "ReturnValue", "environment-source", "manual"]

rust/ql/test/library-tests/dataflow/sources/test.rs

@@ -5,14 +5,14 @@ fn sink<T>(_: T) { }
 // --- tests ---
 
 fn test_env_vars() {
-    sink(std::env::var("HOME")); // $ Alert[rust/summary/taint-sources] hasTaintFlow="HOME"
-    sink(std::env::var_os("PATH")); // $ Alert[rust/summary/taint-sources] hasTaintFlow="PATH"
+    sink(std::env::var("HOME")); // $ Alert[rust/summary/taint-sources] MISSING: hasTaintFlow
+    sink(std::env::var_os("PATH")); // $ Alert[rust/summary/taint-sources] MISSING: hasTaintFlow
 
     let var1 = std::env::var("HOME").expect("HOME not set"); // $ Alert[rust/summary/taint-sources]
     let var2 = std::env::var_os("PATH").unwrap(); // $ Alert[rust/summary/taint-sources]
 
     sink(var1); // $ MISSING: hasTaintFlow
-    sink(var2); // $ MISSING: hasTaintFlow
+    sink(var2); // $ hasTaintFlow="PATH"
 
     for (key, value) in std::env::vars() { // $ Alert[rust/summary/taint-sources]
         sink(key); // $ MISSING: hasTaintFlow