ExternalVendorCode/onefuzz
1
0
Fork 0
mirror of https://github.com/microsoft/onefuzz.git synced 2025-06-18 04:38:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

add setup_dir to generator task (#901)

Browse Source 
fixes #848
This commit is contained in:
bmc-msft
2021-05-19 12:10:13 -04:00
committed by GitHub
parent 776e8fa909
commit 2b67c7b02f
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
docs/command-replacements.md
View File

@ -47,19 +47,25 @@ If you need `supervisor_options` to expand to: `"a", "b", "c", "d"`, you should
These are currently used in the following tasks: These are currently used in the following tasks:
* libfuzzer\_fuzz: `target_exe`, `target_options`, `input_corpus`, `crashes` * libfuzzer\_fuzz: `target_exe`, `target_options`, `input_corpus`, `crashes`,
* libfuzzer\_crash\_report: `target_exe`, `target_options`, `input` `setup_dir`
* libfuzzer\_merge: `target_exe`, `target_options`, `input_corpus` * libfuzzer\_crash\_report: `target_exe`, `target_options`, `input`,
`setup_dir`
* libfuzzer\_merge: `target_exe`, `target_options`, `input_corpus`, `setup_dir`
* libfuzzer\_coverage: None * libfuzzer\_coverage: None
* generic\_analysis: `input`, `target_exe`, `target_options`, `analyzer_exe`, * generic\_analysis: `input`, `target_exe`, `target_options`, `analyzer_exe`,
`analyzer_options`, `output_dir`, `tools_dir`, `job_id`, `task_id`, `analyzer_options`, `output_dir`, `tools_dir`, `job_id`, `task_id`,
`crashes_account`, `crashes_container`, `reports_dir`, `microsoft_telemetry_key`, `instance_telemetry_key` `crashes_account`, `crashes_container`, `reports_dir`,
`microsoft_telemetry_key`, `instance_telemetry_key`, `setup_dir`
* generic\_generator: `generated_inputs`, `input_corpus`, `tools_dir`, * generic\_generator: `generated_inputs`, `input_corpus`, `tools_dir`,
`generator_exe`, `generator_options`, `target_exe`, `target_options`, `generator_exe`, `generator_options`, `target_exe`, `target_options`,
`input`, `job_id`, `task_id`, `microsoft_telemetry_key`, `instance_telemetry_key` `input`, `job_id`, `task_id`, `microsoft_telemetry_key`,
`instance_telemetry_key`, `setup_dir`
* generic\_supervisor: `crashes`, `runtime_dir`, `target_exe`, `target_options`, * generic\_supervisor: `crashes`, `runtime_dir`, `target_exe`, `target_options`,
`input_corpus`, `input`, `supervisor_exe`, `supervisor_options`, `tools_dir`, `input_corpus`, `input`, `supervisor_exe`, `supervisor_options`, `tools_dir`,
`job_id`, `task_id`, `crashes_account`, `crashes_container`, `reports_dir`, `microsoft_telemetry_key`, `instance_telemetry_key` `job_id`, `task_id`, `crashes_account`, `crashes_container`, `reports_dir`,
`microsoft_telemetry_key`, `instance_telemetry_key`, `setup_dir`
* generic\_merge: `input`, `input_corpus`, `output_dir`, `target_exe`, * generic\_merge: `input`, `input_corpus`, `output_dir`, `target_exe`,
`target_options`, `supervisor_exe`, `supervisor_options`, `tools_dir`, `target_options`, `supervisor_exe`, `supervisor_options`, `tools_dir`,
`job_id`, `task_id`, `microsoft_telemetry_key`, `instance_telemetry_key` `job_id`, `task_id`, `microsoft_telemetry_key`, `instance_telemetry_key`,
`setup_dir`

1
src/agent/onefuzz-agent/src/tasks/fuzz/generator.rs
View File

@ -148,6 +148,7 @@ impl GeneratorTask {
utils::reset_tmp_dir(&output_dir).await?; utils::reset_tmp_dir(&output_dir).await?;
let (mut generator, generator_path) = { let (mut generator, generator_path) = {
let expand = Expand::new() let expand = Expand::new()
.setup_dir(&self.config.common.setup_dir)
.generated_inputs(&output_dir) .generated_inputs(&output_dir)
.input_corpus(&corpus_dir) .input_corpus(&corpus_dir)
.generator_exe(&self.config.generator_exe) .generator_exe(&self.config.generator_exe)