Skip to content

Commit

Permalink
Complete artifact merge (#119)
Browse files Browse the repository at this point in the history
  • Loading branch information
puffyCid committed Mar 12, 2024
1 parent 5f71e81 commit fd92e45
Show file tree
Hide file tree
Showing 128 changed files with 1,182 additions and 1,756 deletions.
118 changes: 71 additions & 47 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 10 additions & 14 deletions artemis-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,35 +33,31 @@ jsonwebtoken = "9.2.0"
rusty-s3 = "0.5.0"
quick-xml = { version = "0.31.0", default-features = false }
xml2json-rs = "1.0.1"

common = { path = "../common" }

# Deno Runtime integration
deno_core = { version = "0.268.0" }
tokio = { workspace = true }

# Windows Dependencies
[target.'cfg(target_family = "windows")'.dependencies]
ntapi = "0.4.1"
evtx = { version = "0.8.1", default-features = false, features = [
"multithreading",
] }
ntfs = "0.4.0"
pelite = "0.10.0"

# Unix Dependencies
[target.'cfg(target_family = "unix")'.dependencies]
elf = "0.7.4"
ruzstd = "0.6.0"
lz4_flex = "0.11.2"
xz2 = { version = "0.1.7", default-features = false, features = ["static"] }
macos-unifiedlogs = { git = "https://github.com/mandiant/macos-UnifiedLogs", rev = "315da6f59b4995bbcc053fcf100ebae9869a186b" }
plist = "1.6.0"

common = { path = "../common" }

# Deno Runtime integration
deno_core = { version = "0.270.0" }
tokio = { workspace = true }

# Windows API Dependencies
[target.'cfg(target_os = "windows")'.dependencies]
ntapi = "0.4.1"

# Dependencies at compile time
[build-dependencies]
deno_core = { version = "0.268.0" }
deno_core = { version = "0.270.0" }

# Dependencies for tests
[dev-dependencies]
Expand Down
2 changes: 0 additions & 2 deletions artemis-core/src/artifacts/applications/artifacts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ use log::{error, warn};
use serde_json::Value;

/// Parse macOS Safari history
#[cfg(target_family = "unix")]
pub(crate) fn safari_history(output: &mut Output, filter: &bool) -> Result<(), ApplicationError> {
use super::safari::history::get_safari_history;

Expand Down Expand Up @@ -42,7 +41,6 @@ pub(crate) fn safari_history(output: &mut Output, filter: &bool) -> Result<(), A
}

/// Parse macOS Safari downloads
#[cfg(target_family = "unix")]
pub(crate) fn safari_downloads(output: &mut Output, filter: &bool) -> Result<(), ApplicationError> {
use super::safari::downloads::get_safari_downloads;

Expand Down
Loading

0 comments on commit fd92e45

Please sign in to comment.