Merge branch 'russellbanks:main' into main

b0t-at · May 17, 2024 · 0d158b8 · 0d158b8
2 parents 7e7cbea + 8cab840
commit 0d158b8
Show file tree

Hide file tree

Showing 23 changed files with 2,056 additions and 851 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,7 +26,7 @@ strip = true
 base16ct = { version = "0.2.0", features = ["std"] }
 base64ct = { version = "1.6.0", features = ["std"] }
 bitflags = "2.5.0"
-camino = { version = "1.1.6", features = ["serde1"] }
+camino = { version = "1.1.7", features = ["serde1"] }
 chrono = { version = "0.4.38", features = ["serde"] }
 clap = { version = "4.5.4", features = ["derive", "cargo", "env"] }
 color-eyre = { version = "0.6.3", default-features = false }
@@ -44,10 +44,8 @@ itertools = "0.12.1"
 keyring = "2.3.3"
 memmap2 = "0.9.4"
 msi = "0.7.0"
-num-traits = "0.2.19"
 num_cpus = "1.16.0"
 nutype = { version = "0.4.2", features = ["serde"] }
-object = "0.35.0"
 once_cell = "1.19.0"
 open = "5.1.2"
 ordinal = "0.3.2"
@@ -74,6 +72,7 @@ tui-textarea = { version = "0.4.0", features = ["search"] }
 url = { version = "2.5.0", features = ["serde"] }
 uuid = { version = "1.8.0", features = ["v4"] }
 versions = "6.2.0"
+yara-x = { version = "0.2.1", default-features = false, features = ["pe-module"], git = "https://github.com/VirusTotal/yara-x.git" }
 zip = { version = "1.2.3", default-features = false, features = ["deflate"] }
 
 [build-dependencies]

diff --git a/src/download_file.rs b/src/download_file.rs
@@ -3,7 +3,6 @@ use std::cmp::min;
 use std::collections::HashMap;
 use std::fs::File;
 use std::future::Future;
-use std::io::Cursor;
 
 use camino::Utf8Path;
 use chrono::{DateTime, NaiveDate};
@@ -196,8 +195,7 @@ pub async fn process_files<'a>(
              last_modified,
          }| async move {
             let map = unsafe { Mmap::map(&file) }?;
-            let mut file_analyser =
-                FileAnalyser::new(Cursor::new(map.as_ref()), Cow::Owned(file_name))?;
+            let mut file_analyser = FileAnalyser::new(map.as_ref(), Cow::Owned(file_name))?;
             file_analyser.architecture =
                 Architecture::get_from_url(url.as_str()).or(file_analyser.architecture);
             file_analyser.installer_sha_256 = sha_256;

diff --git a/src/exe/mod.rs b/src/exe/mod.rs
diff --git a/src/exe/utils.rs b/src/exe/utils.rs
diff --git a/src/exe/var_dword.rs b/src/exe/var_dword.rs
diff --git a/src/exe/vs_file_flags.rs b/src/exe/vs_file_flags.rs
diff --git a/src/exe/vs_fixed_file_info.rs b/src/exe/vs_fixed_file_info.rs
diff --git a/src/exe/vs_header.rs b/src/exe/vs_header.rs
diff --git a/src/exe/vs_string.rs b/src/exe/vs_string.rs
diff --git a/src/exe/vs_string_file_info.rs b/src/exe/vs_string_file_info.rs
diff --git a/src/exe/vs_string_table.rs b/src/exe/vs_string_table.rs
diff --git a/src/exe/vs_var.rs b/src/exe/vs_var.rs
diff --git a/src/exe/vs_var_file_info.rs b/src/exe/vs_var_file_info.rs