Fix local fuzzing mode (microsoft#2669)

* repairing local fuzzing mode

* make clippy happy

* make the ui an option

Author: chkeita

src/agent/onefuzz-task/src/local/cmd.rs

@@ -10,7 +10,6 @@ use crate::local::{
 };
 use anyhow::{Context, Result};
 use clap::{App, Arg, SubCommand};
-use crossterm::tty::IsTty;
 use std::str::FromStr;
 use std::time::Duration;
 use strum::IntoEnumIterator;
@@ -36,9 +35,11 @@ enum Commands {
 }
 
 const TIMEOUT: &str = "timeout";
+const TUI: &str = "tui";
 
 pub async fn run(args: clap::ArgMatches<'static>) -> Result<()> {
     let running_duration = value_t!(args, TIMEOUT, u64).ok();
+    let start_ui = args.is_present(TUI);
 
     let (cmd, sub_args) = args.subcommand();
     let command =
@@ -48,7 +49,7 @@ pub async fn run(args: clap::ArgMatches<'static>) -> Result<()> {
         .ok_or_else(|| anyhow!("missing subcommand arguments"))?
         .to_owned();
 
-    let terminal = if std::io::stdout().is_tty() {
+    let terminal = if start_ui {
         Some(TerminalUi::init()?)
     } else {
         env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init();
@@ -111,6 +112,12 @@ pub fn args(name: &str) -> App<'static, 'static> {
                 .long(TIMEOUT)
                 .help("The maximum running time in seconds")
                 .takes_value(true),
+        )
+        .arg(
+            Arg::with_name(TUI)
+                .long(TUI)
+                .help("Enable the terminal UI")
+                .takes_value(false),
         );
 
     for subcommand in Commands::iter() {

src/agent/onefuzz-task/src/local/common.rs

@@ -251,7 +251,11 @@ pub async fn build_local_context(
         task_id,
         instance_id,
         setup_dir,
-        machine_identity: MachineIdentity::from_metadata().await?,
+        machine_identity: MachineIdentity {
+            machine_id: Uuid::nil(),
+            machine_name: "local".to_string(),
+            scaleset_name: None,
+        },
         instance_telemetry_key: None,
         heartbeat_queue: None,
         microsoft_telemetry_key: None,

src/agent/onefuzz-task/src/local/coverage.rs

@@ -28,7 +28,7 @@ pub fn build_coverage_config(
 ) -> Result<Config> {
     let target_exe = get_cmd_exe(CmdType::Target, args)?.into();
     let target_env = get_cmd_env(CmdType::Target, args)?;
-    let target_options = get_cmd_arg(CmdType::Target, args);
+    let mut target_options = get_cmd_arg(CmdType::Target, args);
     let target_timeout = value_t!(args, TARGET_TIMEOUT, u64).ok();
     let coverage_filter = value_t!(args, TARGET_TIMEOUT, String).ok();
 
@@ -47,6 +47,10 @@ pub fn build_coverage_config(
     let coverage = get_synced_dir(COVERAGE_DIR, common.job_id, common.task_id, args)?
         .monitor_count(&event_sender)?;
 
+    if target_options.is_empty() {
+        target_options.push("{input}".to_string());
+    }
+
     let config = Config {
         target_exe,
         target_env,

src/agent/onefuzz-task/src/tasks/analysis/generic.rs

@@ -157,7 +157,8 @@ async fn poll_inputs(
             heartbeat.alive();
             if let Some(message) = input_queue.pop().await? {
                 let input_url = message
-                    .parse(|data| BlobUrl::parse(str::from_utf8(data)?))
+                    .get::<reqwest::Url>()
+                    .and_then(BlobUrl::parse)
                     .with_context(|| format!("unable to parse URL from queue: {:?}", message))?;
                 if !already_checked(config, &input_url).await? {
                     let destination_path = _copy(input_url, &tmp_dir).await?;

src/agent/onefuzz-task/src/tasks/generic/input_poller/callback.rs

@@ -97,10 +97,7 @@ where
     P: Processor + Send,
 {
     fn parse(&mut self, msg: &Message) -> Result<Url> {
-        let url = msg.parse(|data| {
-            let data = std::str::from_utf8(data)?;
-            Ok(Url::parse(data)?)
-        })?;
+        let url = msg.get()?;
         Ok(url)
     }
 }

src/agent/onefuzz-task/src/tasks/merge/generic.rs

@@ -55,7 +55,7 @@ pub async fn spawn(config: Arc<Config>) -> Result<()> {
         config.unique_inputs.sync_pull().await?;
         let queue = QueueClient::new(config.input_queue.clone())?;
         if let Some(msg) = queue.pop().await? {
-            let input_url = msg.parse(utils::parse_url_data);
+            let input_url = msg.get();
             let input_url = match input_url {
                 Ok(url) => url,
                 Err(err) => {

src/agent/onefuzz-task/src/tasks/merge/libfuzzer_merge.rs

@@ -85,10 +85,7 @@ async fn process_message(config: Arc<Config>, input_queue: QueueClient) -> Resul
     utils::reset_tmp_dir(tmp_dir).await?;
 
     if let Some(msg) = input_queue.pop().await? {
-        let input_url = msg.parse(|data| {
-            let data = std::str::from_utf8(data)?;
-            Ok(Url::parse(data)?)
-        });
+        let input_url = msg.get();
         let input_url: Url = match input_url {
             Ok(url) => url,
             Err(err) => {

src/agent/onefuzz-task/src/tasks/utils.rs

@@ -62,13 +62,6 @@ pub async fn reset_tmp_dir(tmp_dir: impl AsRef<Path>) -> Result<()> {
     Ok(())
 }
 
-pub fn parse_url_data(data: &[u8]) -> Result<Url> {
-    let text = std::str::from_utf8(data)?;
-    let url = Url::parse(text)?;
-
-    Ok(url)
-}
-
 #[async_trait]
 pub trait CheckNotify {
     async fn is_notified(&self, delay: Duration) -> bool;

src/agent/onefuzz/src/sanitizer.rs

@@ -4,10 +4,11 @@
 use std::collections::HashMap;
 use std::path::Path;
 
-use anyhow::{bail, Result};
+use anyhow::{bail, Context, Result};
 
 pub fn default_llvm_symbolizer_path() -> Result<String> {
-    Ok(std::env::var("LLVM_SYMBOLIZER_PATH")?)
+    std::env::var("LLVM_SYMBOLIZER_PATH")
+        .context("LLVM_SYMBOLIZER_PATH environment variable is not set")
 }
 
 pub fn default_sanitizer_env_vars() -> Result<HashMap<String, String>> {

src/agent/storage-queue/Cargo.toml

@@ -21,6 +21,7 @@ serde = { version = "1.0", features = ["derive"]}
 serde_derive = "1.0"
 serde_json = "1.0"
 serde-xml-rs = "0.6"
+bincode = "1.3"
 tokio = { version = "1.16" , features=["full"] }
 queue-file = "1.4"
 uuid = { version = "0.8", features = ["serde", "v4"] }