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

add logging to generic analysis task (#522)

Browse Source
This commit is contained in:
bmc-msft
2021-02-08 18:39:39 -05:00
committed by GitHub
parent 5114332ea0
commit c9455fdfa5
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/agent/onefuzz-agent/src/tasks/analysis/generic.rs
View File

@ -2,14 +2,16 @@
// Licensed under the MIT License. // Licensed under the MIT License.
use crate::tasks::{config::CommonConfig, heartbeat::HeartbeatSender}; use crate::tasks::{config::CommonConfig, heartbeat::HeartbeatSender};
use anyhow::Result; use anyhow::{Context, Result};
use futures::stream::StreamExt; use futures::stream::StreamExt;
use onefuzz::{az_copy, blob::url::BlobUrl}; use onefuzz::{az_copy, blob::url::BlobUrl};
use onefuzz::{ use onefuzz::{
expand::Expand, fs::set_executable, fs::OwnedDir, jitter::delay_with_jitter, syncdir::SyncedDir, expand::Expand, fs::set_executable, fs::OwnedDir, jitter::delay_with_jitter,
process::monitor_process, syncdir::SyncedDir,
}; };
use reqwest::Url; use reqwest::Url;
use serde::Deserialize; use serde::Deserialize;
use std::process::Stdio;
use std::{ use std::{
collections::HashMap, collections::HashMap,
path::{Path, PathBuf}, path::{Path, PathBuf},
@ -53,12 +55,15 @@ pub async fn spawn(config: Config) -> Result<()> {
async fn run_existing(config: &Config) -> Result<()> { async fn run_existing(config: &Config) -> Result<()> {
if let Some(crashes) = &config.crashes { if let Some(crashes) = &config.crashes {
crashes.init_pull().await?; crashes.init_pull().await?;
let mut count = 0;
let mut read_dir = fs::read_dir(&crashes.path).await?; let mut read_dir = fs::read_dir(&crashes.path).await?;
while let Some(file) = read_dir.next().await { while let Some(file) = read_dir.next().await {
verbose!("Processing file {:?}", file); verbose!("Processing file {:?}", file);
let file = file?; let file = file?;
run_tool(file.path(), &config).await?; run_tool(file.path(), &config).await?;
count += 1;
} }
info!("processed {} initial inputs", count);
config.analysis.sync_push().await?; config.analysis.sync_push().await?;
} }
Ok(()) Ok(())
@ -128,8 +133,12 @@ pub async fn run_tool(input: impl AsRef<Path>, config: &Config) -> Result<()> {
let analyzer_path = expand.evaluate_value(&config.analyzer_exe)?; let analyzer_path = expand.evaluate_value(&config.analyzer_exe)?;
let mut cmd = Command::new(analyzer_path); let mut cmd = Command::new(&analyzer_path);
cmd.kill_on_drop(true).env_remove("RUST_LOG"); cmd.kill_on_drop(true)
.env_remove("RUST_LOG")
.stdin(Stdio::null())
.stdout(Stdio::piped())
.stderr(Stdio::piped());
for arg in expand.evaluate(&config.analyzer_options)? { for arg in expand.evaluate(&config.analyzer_options)? {
cmd.arg(arg); cmd.arg(arg);
@ -139,6 +148,13 @@ pub async fn run_tool(input: impl AsRef<Path>, config: &Config) -> Result<()> {
cmd.env(k, expand.evaluate_value(v)?); cmd.env(k, expand.evaluate_value(v)?);
} }
cmd.output().await?; info!("analyzing input with {:?}", cmd);
let output = cmd
.spawn()
.with_context(|| format!("analyzer failed to start: {}", analyzer_path))?;
monitor_process(output, "analyzer".to_string(), true, None)
.await
.with_context(|| format!("analyzer failed to run: {}", analyzer_path))?;
Ok(()) Ok(())
} }