Merge branch 'mandiant:main' into main

Author: jkcoxson

Cargo.toml

@@ -11,22 +11,22 @@ keywords = ["forensics", "macOS", "unifiedlog"]
 
 [dependencies]
 nom = "8.0.0"
-serde_json = "1.0.142"
-serde = { version = "1.0.219", features = ["derive"] }
-log = "0.4.27"
+serde_json = "1.0.145"
+serde = { version = "1.0.228", features = ["derive"] }
+log = "0.4.28"
 lz4_flex = "0.11.5"
 byteorder = "1.5.0"
-plist = "1.7.4"
-regex = "1.11.1"
+plist = "1.8.0"
+regex = "1.11.3"
 base64 = "0.22.1"
-chrono = "0.4.41"
+chrono = "0.4.42"
 walkdir = "2.5.0"
 sunlight = "0.1.1"
 
 [dev-dependencies]
-chrono = "0.4.41"
+chrono = "0.4.42"
 criterion = "0.7.0"
-anyhow = "1.0.98"
+anyhow = "1.0.100"
 test-case = "3.3"
 
 [[bench]]

src/filesystem.rs

@@ -114,6 +114,7 @@ impl FileProvider for LiveSystemProvider {
         let path = PathBuf::from("/private/var/db/diagnostics");
         Box::new(
             WalkDir::new(path)
+                .sort_by(|a, b| a.file_name().cmp(b.file_name()))
                 .into_iter()
                 .filter_map(|entry| entry.ok())
                 .filter(|entry| matches!(LogFileType::from(entry.path()), LogFileType::TraceV3))
@@ -347,6 +348,7 @@ impl FileProvider for LogarchiveProvider {
     fn tracev3_files(&self) -> Box<dyn Iterator<Item = Box<dyn SourceFile>>> {
         Box::new(
             WalkDir::new(&self.base)
+                .sort_by(|a, b| a.file_name().cmp(b.file_name()))
                 .into_iter()
                 .filter_map(|entry| entry.ok())
                 .filter(|entry| matches!(LogFileType::from(entry.path()), LogFileType::TraceV3))