SYS-OSS/FRET-LibAFL
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Address recursion Clippy in sync.rs (#2402)

Browse Source
This commit is contained in:
Dominik Maier 2024-07-16 03:26:45 +02:00 committed by GitHub
parent aa21815a97
commit 7850b9bce6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
libafl/src/stages/sync.rs
View File

@ -54,6 +54,40 @@ impl SyncFromDiskMetadata {
/// Default name for `SyncFromDiskStage`; derived from AFL++ /// Default name for `SyncFromDiskStage`; derived from AFL++
pub const SYNC_FROM_DISK_STAGE_NAME: &str = "sync"; pub const SYNC_FROM_DISK_STAGE_NAME: &str = "sync";
/// Loads new files from a directory, taking the last time we looked at this path as parameter.
/// If `last` is `None`, it'll load all file.
fn load_new_from_directory(path: &PathBuf, last: &Option<Duration>) -> Result<Vec<PathBuf>, Error> {
let mut left_to_sync = Vec::<PathBuf>::new();
for entry in fs::read_dir(path)? {
let entry = entry?;
let path = entry.path();
let attributes = fs::metadata(&path);
if attributes.is_err() {
continue;
}
let attr = attributes?;
if attr.is_file() && attr.len() > 0 {
if let Ok(time) = attr.modified() {
if let Some(last) = last {
if time.duration_since(SystemTime::UNIX_EPOCH).unwrap() < *last {
continue;
}
}
log::info!("Syncing file: {:?}", path);
left_to_sync.push(path.clone());
}
} else if attr.is_dir() {
let dir_left_to_sync = load_new_from_directory(&entry.path(), last)?;
left_to_sync.extend(dir_left_to_sync);
}
}
Ok(left_to_sync)
}
/// A stage that loads testcases from disk to sync with other fuzzers such as AFL++ /// A stage that loads testcases from disk to sync with other fuzzers such as AFL++
#[derive(Debug)] #[derive(Debug)]
pub struct SyncFromDiskStage<CB, E, EM, Z> { pub struct SyncFromDiskStage<CB, E, EM, Z> {
@ -113,7 +147,7 @@ where
let mut new_files = vec![]; let mut new_files = vec![];
for dir in &self.sync_dirs { for dir in &self.sync_dirs {
log::debug!("Syncing from dir: {:?}", dir); log::debug!("Syncing from dir: {:?}", dir);
let new_dir_files = self.load_from_directory(dir, &max_time)?; let new_dir_files = load_new_from_directory(dir, &max_time)?;
new_files.extend(new_dir_files); new_files.extend(new_dir_files);
} }
*state.metadata_mut::<SyncFromDiskMetadata>().unwrap() = SyncFromDiskMetadata { *state.metadata_mut::<SyncFromDiskMetadata>().unwrap() = SyncFromDiskMetadata {
@ -171,43 +205,6 @@ impl<CB, E, EM, Z> SyncFromDiskStage<CB, E, EM, Z> {
load_callback, load_callback,
} }
} }
#[allow(clippy::only_used_in_recursion)]
fn load_from_directory(
&self,
path: &PathBuf,
last: &Option<Duration>,
) -> Result<Vec<PathBuf>, Error> {
let mut left_to_sync = Vec::<PathBuf>::new();
for entry in fs::read_dir(path)? {
let entry = entry?;
let path = entry.path();
let attributes = fs::metadata(&path);
if attributes.is_err() {
continue;
}
let attr = attributes?;
if attr.is_file() && attr.len() > 0 {
if let Ok(time) = attr.modified() {
if let Some(last) = last {
if time.duration_since(SystemTime::UNIX_EPOCH).unwrap() < *last {
continue;
}
}
log::info!("Syncing file: {:?}", path);
left_to_sync.push(path.clone());
}
} else if attr.is_dir() {
let dir_left_to_sync = self.load_from_directory(&entry.path(), last)?;
left_to_sync.extend(dir_left_to_sync);
}
}
Ok(left_to_sync)
}
} }
/// Function type when the callback in `SyncFromDiskStage` is not a lambda /// Function type when the callback in `SyncFromDiskStage` is not a lambda