Local refactoring (#3117)

* WIP local mode refactoring

* .

* Adding coverage

* Updated schema and basic template to use anchors

* Libfuzzer with template works

* Coverage task works

* fixup

* bug fixes

* format

* format

* update the basic yaml

* update libfuzzer basic

* remove schema.yml

---------

Co-authored-by: Teo Voinea <58236992+tevoinea@users.noreply.github.com>

Author: chkeita

src/agent/Cargo.lock

@@ -36,6 +36,7 @@ reqwest = { version = "0.11", features = [
 ], default-features = false }
 serde = "1.0"
 serde_json = "1.0"
+serde_yaml = "0.9.21"
 onefuzz = { path = "../onefuzz" }
 onefuzz-telemetry = { path = "../onefuzz-telemetry" }
 path-absolutize = "3.1"
@@ -71,6 +72,7 @@ azure_storage_blobs = { version = "0.13", default-features = false, features = [
 ] }
 
 flexi_logger = "0.25"
+schemars =  {version = "0.8.12", features = ["uuid1"]}
 
 [dev-dependencies]
 pretty_assertions = "1.4"

src/agent/onefuzz-task/Cargo.toml

@@ -10,12 +10,14 @@ use crate::local::{
 };
 use anyhow::{Context, Result};
 use clap::{Arg, ArgAction, Command};
-use std::str::FromStr;
 use std::time::Duration;
+use std::{path::PathBuf, str::FromStr};
 use strum::IntoEnumIterator;
 use strum_macros::{EnumIter, EnumString, IntoStaticStr};
 use tokio::{select, time::timeout};
 
+use super::template;
+
 #[derive(Debug, PartialEq, Eq, EnumString, IntoStaticStr, EnumIter)]
 #[strum(serialize_all = "kebab-case")]
 enum Commands {
@@ -32,6 +34,7 @@ enum Commands {
     Generator,
     Analysis,
     TestInput,
+    Template,
 }
 
 const TIMEOUT: &str = "timeout";
@@ -82,6 +85,13 @@ pub async fn run(args: clap::ArgMatches) -> Result<()> {
             Commands::Generator => generic_generator::run(&sub_args, event_sender).await,
             Commands::Analysis => generic_analysis::run(&sub_args, event_sender).await,
             Commands::TestInput => test_input::run(&sub_args, event_sender).await,
+            Commands::Template => {
+                let config = sub_args
+                    .get_one::<PathBuf>("config")
+                    .expect("is marked required");
+
+                template::launch(config, event_sender).await
+            }
         }
     });
 
@@ -126,6 +136,7 @@ pub fn args(name: &'static str) -> Command {
         );
 
     for subcommand in Commands::iter() {
+        let add_common = subcommand != Commands::Template;
         let app = match subcommand {
             #[cfg(any(target_os = "linux", target_os = "windows"))]
             Commands::Coverage => coverage::args(subcommand.into()),
@@ -140,8 +151,18 @@ pub fn args(name: &'static str) -> Command {
             Commands::Generator => generic_generator::args(subcommand.into()),
             Commands::Analysis => generic_analysis::args(subcommand.into()),
             Commands::TestInput => test_input::args(subcommand.into()),
+            Commands::Template => Command::new("template")
+                .about("uses the template to generate a run")
+                .args(vec![Arg::new("config")
+                    .value_parser(value_parser!(std::path::PathBuf))
+                    .required(true)]),
         };
-        cmd = cmd.subcommand(add_common_config(app));
+
+        cmd = if add_common {
+            cmd.subcommand(add_common_config(app))
+        } else {
+            cmd.subcommand(app)
+        }
     }
 
     cmd

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

@@ -0,0 +1,43 @@
+# yaml-language-server: $schema=schema.json
+
+# What I had to do to get this working:
+# 1. Update target_exe to point to the target exe
+
+# 2. Install llvm and export LLVM_SYMBOLIZER_PATH like we do in setup.sh
+
+target_args: &target_args
+  target_env: {}
+  target_exe: "C:\\temp\\onefuzz\\integration\\windows-libfuzzer\\fuzz.exe"
+  target_options: []
+
+inputs: &inputs "C:\\temp\\onefuzz\\integration\\windows-libfuzzer\\seeds"
+
+tasks:
+  - type: LibFuzzer
+    <<: *target_args
+    inputs: *inputs
+    crashes: &crash "./crashes"
+    readonly_inputs: []
+    check_fuzzer_help: true
+
+  - type: "Report"
+    <<: *target_args
+    input_queue: *crash
+    crashes: *crash
+    reports: "./reports"
+    unique_reports: "./unique_reports"
+    no_repro: "./noe_repro"
+    check_fuzzer_help: true
+
+  - type: "Coverage"
+    <<: *target_args
+    target_options:
+      - "{input}"
+    input_queue: *inputs
+    readonly_inputs: [*inputs]
+    coverage: "./coverage"
+
+  # - type: Analysis
+  #   <<: *target_args
+
+

src/agent/onefuzz-task/src/local/libfuzzer_basic.yml

@@ -15,5 +15,6 @@ pub mod libfuzzer_merge;
 pub mod libfuzzer_regression;
 pub mod libfuzzer_test_input;
 pub mod radamsa;
+pub mod template;
 pub mod test_input;
 pub mod tui;