Merge pull request #260 from microsoft/main

Fork Sync: Update from parent repository

Author: AdamL-Microsoft

src/agent/onefuzz-task/src/tasks/report/dotnet/generic.rs

@@ -208,7 +208,7 @@ impl AsanProcessor {
                     input_blob,
                     executable,
                     crash_type: exception.exception,
-                    crash_site: exception.call_stack[0].clone(),
+                    crash_site: exception.call_stack.first().cloned().unwrap_or_default(),
                     call_stack: exception.call_stack,
                     call_stack_sha256,
                     minimized_stack: None,

src/agent/onefuzz/src/input_tester.rs

@@ -16,14 +16,13 @@ use nix::sys::signal::{kill, Signal};
 use stacktrace_parser::CrashLog;
 #[cfg(any(target_os = "linux", target_family = "windows"))]
 use stacktrace_parser::StackEntry;
+use std::ffi::OsStr;
 #[cfg(target_os = "linux")]
 use std::process::Stdio;
 use std::{collections::HashMap, path::Path, time::Duration};
 use tempfile::tempdir;
 
 const DEFAULT_TIMEOUT: Duration = Duration::from_secs(5);
-#[cfg(any(target_os = "linux", target_family = "windows"))]
-const CRASH_SITE_UNAVAILABLE: &str = "<crash site unavailable>";
 
 pub struct Tester<'a> {
     setup_dir: &'a Path,
@@ -140,14 +139,14 @@ impl<'a> Tester<'a> {
     #[cfg(target_family = "windows")]
     async fn test_input_debugger(
         &self,
-        argv: Vec<String>,
-        env: HashMap<String, String>,
+        argv: &[impl AsRef<OsStr>],
+        env: &HashMap<String, String>,
     ) -> Result<Option<CrashLog>> {
         const IGNORE_FIRST_CHANCE_EXCEPTIONS: bool = true;
         let report = input_tester::crash_detector::test_process(
             self.exe_path,
-            &argv,
-            &env,
+            argv,
+            env,
             self.timeout,
             IGNORE_FIRST_CHANCE_EXCEPTIONS,
         )?;
@@ -182,18 +181,11 @@ impl<'a> Tester<'a> {
                 })
                 .collect();
 
-            let crash_site = if let Some(frame) = call_stack.get(0) {
-                frame.line.to_owned()
-            } else {
-                CRASH_SITE_UNAVAILABLE.to_owned()
-            };
-
             let fault_type = exception.description.to_string();
             let sanitizer = fault_type.to_string();
-            let summary = crash_site;
 
             Some(CrashLog::new(
-                None, summary, sanitizer, fault_type, None, None, call_stack,
+                None, None, sanitizer, fault_type, None, None, call_stack,
             )?)
         } else {
             None
@@ -205,12 +197,12 @@ impl<'a> Tester<'a> {
     #[cfg(target_os = "linux")]
     async fn test_input_debugger(
         &self,
-        args: Vec<String>,
-        env: HashMap<String, String>,
+        args: &[impl AsRef<OsStr>],
+        env: &HashMap<String, String>,
     ) -> Result<Option<CrashLog>> {
         let mut cmd = std::process::Command::new(self.exe_path);
         cmd.args(args).stdin(Stdio::null());
-        cmd.envs(&env);
+        cmd.envs(env);
 
         let (sender, receiver) = std::sync::mpsc::channel();
 
@@ -265,19 +257,11 @@ impl<'a> Tester<'a> {
                     .collect();
 
                 let crash_type = crash.signal.to_string();
-
-                let crash_site = if let Some(frame) = crash_thread.callstack.get(0) {
-                    frame.to_string()
-                } else {
-                    CRASH_SITE_UNAVAILABLE.to_owned()
-                };
-
-                let summary = crash_site;
                 let sanitizer = crash_type.clone();
                 let fault_type = crash_type;
 
                 Some(CrashLog::new(
-                    None, summary, sanitizer, fault_type, None, None, call_stack,
+                    None, None, sanitizer, fault_type, None, None, call_stack,
                 )?)
             } else {
                 None
@@ -301,9 +285,7 @@ impl<'a> Tester<'a> {
                 .target_exe(self.exe_path)
                 .target_options(self.arguments)
                 .setup_dir(self.setup_dir)
-                .set_optional(self.extra_dir.as_ref(), |expand, extra_dir| {
-                    expand.extra_dir(extra_dir)
-                });
+                .set_optional(self.extra_dir, Expand::extra_dir);
 
             let argv = expand.evaluate(self.arguments)?;
             let mut env: HashMap<String, String> = HashMap::new();
@@ -317,6 +299,7 @@ impl<'a> Tester<'a> {
                     Some(v) => update_path(v.clone().into(), setup_dir)?,
                     None => get_path_with_directory(PATH, setup_dir)?,
                 };
+
                 env.insert(PATH.to_string(), new_path.to_string_lossy().to_string());
             }
             if self.add_setup_to_ld_library_path {
@@ -343,7 +326,7 @@ impl<'a> Tester<'a> {
         let attempts = 1 + self.check_retry_count;
         for _ in 0..attempts {
             let result = if self.check_debugger {
-                match self.test_input_debugger(argv.clone(), env.clone()).await {
+                match self.test_input_debugger(&argv, &env).await {
                     Ok(crash) => (crash, None, None),
                     Err(error) => (None, Some(error), None),
                 }

src/agent/stacktrace-parser/src/lib.rs

@@ -155,7 +155,7 @@ fn filter_funcs(entry: &StackEntry, stack_filter: &RegexSet) -> Option<StackEntr
 impl CrashLog {
     pub fn new(
         text: Option<String>,
-        summary: String,
+        summary: Option<String>,
         sanitizer: String,
         fault_type: String,
         scariness_score: Option<u32>,
@@ -197,6 +197,15 @@ impl CrashLog {
         let minimized_stack_function_names = stack_names(&minimized_stack_details);
         let minimized_stack_function_lines = stack_function_lines(&minimized_stack_details);
 
+        // if summary was not supplied,
+        // use first line of minimized stack
+        // or else first line of stack,
+        // or else nothing
+        let summary = summary
+            .or_else(|| minimized_stack.first().cloned())
+            .or_else(|| call_stack.first().cloned())
+            .unwrap_or_else(|| "<crash site unavailable>".to_string());
+
         Ok(Self {
             text,
             sanitizer,
@@ -220,7 +229,7 @@ impl CrashLog {
         let (scariness_score, scariness_description) = parse_scariness(&text);
         Self::new(
             Some(text),
-            summary,
+            Some(summary),
             sanitizer,
             fault_type,
             scariness_score,
@@ -325,6 +334,8 @@ mod tests {
             if skip_files.contains(&file_name) {
                 eprintln!("skipping file: {file_name}");
                 continue;
+            } else {
+                eprintln!("parsing file: {file_name}");
             }
 
             let data_raw =

src/cli/requirements.txt

@@ -7,12 +7,12 @@ asciimatics~=1.13.0
 pydantic~=1.8.1 --no-binary=pydantic
 memoization~=0.4.0
 msrestazure==0.6.4
-azure-storage-blob~=12.8
+azure-storage-blob==12.14.1
 azure-applicationinsights==0.1.0
 tenacity==8.0.1
 docstring_parser==0.8.1
 azure-identity==1.10.0
-azure-cli-core==2.46.0
+azure-cli-core==2.47.0
 PyJWT>=2.4.0
 # install rsa version >=4.7 to fix CVE-2020-25658
 rsa>=4.7

src/deployment/requirements.txt

@@ -1,11 +1,11 @@
-azure-cli-core==2.46.0
-azure-cli==2.46.0
+azure-cli-core==2.47.0
+azure-cli==2.47.0
 azure-identity==1.10.0
 azure-cosmosdb-table==1.0.6
 azure-mgmt-eventgrid==10.2.0b2
-azure-mgmt-resource==21.1.0b1
+azure-mgmt-resource==22.0.0
 azure-mgmt-storage==21.0.0
-azure-storage-blob==12.13.1
+azure-storage-blob==12.14.1
 pyfunctional==1.4.3
 pyopenssl==22.0.0
 adal~=1.2.7

src/utils/add-corpus-storage-accounts/requirements.txt

@@ -1,3 +1,3 @@
 azure-mgmt-storage~=19.0.0
-azure-cli-core==2.46.0
+azure-cli-core==2.47.0
 azure-mgmt-eventgrid==3.0.0rc9

src/utils/check-pr/requirements.txt

@@ -1,5 +1,5 @@
 azure-common~=1.1.25
 azure-identity==1.10.0
 PyGithub==1.56
-azure-cli-core==2.46.0
+azure-cli-core==2.47.0
 msgraph-core==0.2.2