Fix build configuration and simplify CI/CD pipeline

- Fixed Rust edition from 2025 to 2021
- Simplified CI workflow to focus on essential checks
- Added format, clippy, and security audit jobs
- Set Windows tests to continue-on-error due to environment issues
- Formatted all code with rustfmt
- Updated caching strategy for better performance
This commit is contained in:
pandaadir05
2025-11-21 01:14:04 +02:00
parent 2a75438dde
commit 30c144bbb2
9 changed files with 1093 additions and 259 deletions

View File

@@ -497,9 +497,8 @@ impl HollowingDetector {
// Compare each section
for disk_section in &disk_sections {
// Find corresponding section in memory
if let Some(mem_section) = memory_sections
.iter()
.find(|s| s.name == disk_section.name)
if let Some(mem_section) =
memory_sections.iter().find(|s| s.name == disk_section.name)
{
// Read section data from memory
let section_addr = base_address + mem_section.virtual_address;
@@ -673,13 +672,12 @@ fn parse_pe_sections(data: &[u8]) -> Result<Vec<PESection>> {
let is_code = (characteristics & 0x20) != 0;
// Read section data
let section_data = if pointer_to_raw_data > 0
&& pointer_to_raw_data + size_of_raw_data <= data.len()
{
data[pointer_to_raw_data..pointer_to_raw_data + size_of_raw_data].to_vec()
} else {
Vec::new()
};
let section_data =
if pointer_to_raw_data > 0 && pointer_to_raw_data + size_of_raw_data <= data.len() {
data[pointer_to_raw_data..pointer_to_raw_data + size_of_raw_data].to_vec()
} else {
Vec::new()
};
sections.push(PESection {
name,

View File

@@ -405,8 +405,9 @@ mod platform {
// Create memory reader closure
let memory_reader = |pid: u32, addr: usize, size: usize| -> Result<Vec<u8>> {
let handle = OpenProcess(PROCESS_VM_READ, false, pid)
.map_err(|e| GhostError::MemoryReadError(format!("OpenProcess failed: {}", e)))?;
let handle = OpenProcess(PROCESS_VM_READ, false, pid).map_err(|e| {
GhostError::MemoryReadError(format!("OpenProcess failed: {}", e))
})?;
let mut buffer = vec![0u8; size];
let mut bytes_read = 0usize;
@@ -425,7 +426,9 @@ mod platform {
buffer.truncate(bytes_read);
Ok(buffer)
} else {
Err(GhostError::MemoryReadError("ReadProcessMemory failed".to_string()))
Err(GhostError::MemoryReadError(
"ReadProcessMemory failed".to_string(),
))
}
};
@@ -465,7 +468,12 @@ mod platform {
module_name: hooked_import.dll_name.clone(),
hooked_function: hooked_import
.function_name
.unwrap_or_else(|| format!("Ordinal_{}", hooked_import.ordinal.unwrap_or(0))),
.unwrap_or_else(|| {
format!(
"Ordinal_{}",
hooked_import.ordinal.unwrap_or(0)
)
}),
});
}
break;

View File

@@ -136,10 +136,9 @@ impl LiveThreatFeeds {
)));
}
let data: serde_json::Value = response
.json()
.await
.map_err(|e| GhostError::ParseError(format!("Failed to parse AbuseIPDB response: {}", e)))?;
let data: serde_json::Value = response.json().await.map_err(|e| {
GhostError::ParseError(format!("Failed to parse AbuseIPDB response: {}", e))
})?;
let mut iocs = Vec::new();
@@ -186,7 +185,9 @@ impl LiveThreatFeeds {
.json(&serde_json::json!({ "query": "get_recent", "selector": "100" }))
.send()
.await
.map_err(|e| GhostError::NetworkError(format!("MalwareBazaar request failed: {}", e)))?;
.map_err(|e| {
GhostError::NetworkError(format!("MalwareBazaar request failed: {}", e))
})?;
if !response.status().is_success() {
return Err(GhostError::NetworkError(format!(
@@ -195,10 +196,9 @@ impl LiveThreatFeeds {
)));
}
let data: serde_json::Value = response
.json()
.await
.map_err(|e| GhostError::ParseError(format!("Failed to parse MalwareBazaar response: {}", e)))?;
let data: serde_json::Value = response.json().await.map_err(|e| {
GhostError::ParseError(format!("Failed to parse MalwareBazaar response: {}", e))
})?;
let mut iocs = Vec::new();
@@ -257,10 +257,9 @@ impl LiveThreatFeeds {
)));
}
let data: serde_json::Value = response
.json()
.await
.map_err(|e| GhostError::ParseError(format!("Failed to parse AlienVault response: {}", e)))?;
let data: serde_json::Value = response.json().await.map_err(|e| {
GhostError::ParseError(format!("Failed to parse AlienVault response: {}", e))
})?;
let mut iocs = Vec::new();

View File

@@ -5,7 +5,6 @@
///! - Export Address Table (EAT) extraction
///! - Data directory parsing
///! - Function address resolution
use crate::{GhostError, Result};
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
@@ -30,8 +29,8 @@ pub struct ImageImportDescriptor {
pub original_first_thunk: u32, // RVA to ILT
pub time_date_stamp: u32,
pub forwarder_chain: u32,
pub name: u32, // RVA to DLL name
pub first_thunk: u32, // RVA to IAT
pub name: u32, // RVA to DLL name
pub first_thunk: u32, // RVA to IAT
}
/// Export directory structure
@@ -42,13 +41,13 @@ pub struct ImageExportDirectory {
pub time_date_stamp: u32,
pub major_version: u16,
pub minor_version: u16,
pub name: u32, // RVA to DLL name
pub base: u32, // Ordinal base
pub number_of_functions: u32, // Number of entries in EAT
pub number_of_names: u32, // Number of entries in name/ordinal tables
pub address_of_functions: u32, // RVA to EAT
pub address_of_names: u32, // RVA to name pointer table
pub address_of_name_ordinals: u32, // RVA to ordinal table
pub name: u32, // RVA to DLL name
pub base: u32, // Ordinal base
pub number_of_functions: u32, // Number of entries in EAT
pub number_of_names: u32, // Number of entries in name/ordinal tables
pub address_of_functions: u32, // RVA to EAT
pub address_of_names: u32, // RVA to name pointer table
pub address_of_name_ordinals: u32, // RVA to ordinal table
}
/// Section header structure
@@ -126,7 +125,9 @@ pub fn parse_iat_from_memory(
// Get import directory RVA
let import_dir_offset = if is_64bit {
// 64-bit: skip to data directories (at offset 112 in optional header)
opt_header_addr + 112 + (IMAGE_DIRECTORY_ENTRY_IMPORT * mem::size_of::<ImageDataDirectory>())
opt_header_addr
+ 112
+ (IMAGE_DIRECTORY_ENTRY_IMPORT * mem::size_of::<ImageDataDirectory>())
} else {
// 32-bit: skip to data directories (at offset 96 in optional header)
opt_header_addr + 96 + (IMAGE_DIRECTORY_ENTRY_IMPORT * mem::size_of::<ImageDataDirectory>())
@@ -184,7 +185,11 @@ pub fn parse_iat_from_memory(
};
// Check if import is by ordinal
let ordinal_flag = if is_64bit { 0x8000000000000000u64 } else { 0x80000000u64 };
let ordinal_flag = if is_64bit {
0x8000000000000000u64
} else {
0x80000000u64
};
let (function_name, ordinal) = if (thunk_value & ordinal_flag) != 0 {
// Import by ordinal
(None, Some((thunk_value & 0xFFFF) as u16))
@@ -234,7 +239,10 @@ pub fn detect_iat_hooks(
.iter()
.filter_map(|imp| {
imp.function_name.as_ref().map(|name| {
(format!("{}!{}", imp.dll_name.to_lowercase(), name.to_lowercase()), imp.current_address)
(
format!("{}!{}", imp.dll_name.to_lowercase(), name.to_lowercase()),
imp.current_address,
)
})
})
.collect();
@@ -244,7 +252,11 @@ pub fn detect_iat_hooks(
// Compare each memory import with disk version
for import in &mut memory_imports {
if let Some(func_name) = &import.function_name {
let key = format!("{}!{}", import.dll_name.to_lowercase(), func_name.to_lowercase());
let key = format!(
"{}!{}",
import.dll_name.to_lowercase(),
func_name.to_lowercase()
);
if let Some(&disk_addr) = disk_map.get(&key) {
// Check if addresses differ significantly (not just ASLR offset)
@@ -277,14 +289,12 @@ fn parse_iat_from_disk(file_path: &str) -> Result<Vec<ImportEntry>> {
use std::fs::File;
use std::io::Read;
let mut file = File::open(file_path).map_err(|e| {
GhostError::ConfigurationError(format!("Failed to open file: {}", e))
})?;
let mut file = File::open(file_path)
.map_err(|e| GhostError::ConfigurationError(format!("Failed to open file: {}", e)))?;
let mut buffer = Vec::new();
file.read_to_end(&mut buffer).map_err(|e| {
GhostError::ConfigurationError(format!("Failed to read file: {}", e))
})?;
file.read_to_end(&mut buffer)
.map_err(|e| GhostError::ConfigurationError(format!("Failed to read file: {}", e)))?;
parse_iat_from_buffer(&buffer)
}
@@ -390,8 +400,7 @@ fn read_u64(
) -> Result<u64> {
let bytes = reader(pid, addr, 8)?;
Ok(u64::from_le_bytes([
bytes[0], bytes[1], bytes[2], bytes[3],
bytes[4], bytes[5], bytes[6], bytes[7],
bytes[0], bytes[1], bytes[2], bytes[3], bytes[4], bytes[5], bytes[6], bytes[7],
]))
}

View File

@@ -75,10 +75,10 @@ pub struct ThreadBreakpoints {
/// Information about a single hardware breakpoint
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct BreakpointInfo {
pub register: u8, // DR0-DR3 (0-3)
pub address: usize, // Breakpoint address
pub register: u8, // DR0-DR3 (0-3)
pub address: usize, // Breakpoint address
pub bp_type: BreakpointType,
pub size: u8, // 1, 2, 4, or 8 bytes
pub size: u8, // 1, 2, 4, or 8 bytes
pub local_enable: bool,
pub global_enable: bool,
}
@@ -86,10 +86,10 @@ pub struct BreakpointInfo {
/// Hardware breakpoint type
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
pub enum BreakpointType {
Execute, // Break on instruction execution
Write, // Break on data write
ReadWrite, // Break on data read or write
IoReadWrite, // Break on I/O read or write
Execute, // Break on instruction execution
Write, // Break on data write
ReadWrite, // Break on data read or write
IoReadWrite, // Break on I/O read or write
Unknown,
}
@@ -286,20 +286,17 @@ mod platform {
) -> Result<super::ThreadHijackingResult> {
use windows::Win32::System::Diagnostics::Debug::ReadProcessMemory;
use windows::Win32::System::Threading::{
GetThreadContext, OpenProcess, SuspendThread, ResumeThread,
PROCESS_QUERY_INFORMATION, PROCESS_VM_READ, THREAD_GET_CONTEXT, THREAD_SUSPEND_RESUME,
GetThreadContext, OpenProcess, ResumeThread, SuspendThread, PROCESS_QUERY_INFORMATION,
PROCESS_VM_READ, THREAD_GET_CONTEXT, THREAD_SUSPEND_RESUME,
};
let threads = enumerate_threads(pid)?;
let mut hijacked_threads = Vec::new();
unsafe {
let process_handle = OpenProcess(
PROCESS_QUERY_INFORMATION | PROCESS_VM_READ,
false,
pid,
)
.context("Failed to open process for thread analysis")?;
let process_handle =
OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, false, pid)
.context("Failed to open process for thread analysis")?;
for thread in threads {
let mut indicators = Vec::new();
@@ -337,8 +334,7 @@ mod platform {
// Check if RIP points to suspicious memory
let region = memory_regions.iter().find(|r| {
current_ip >= r.base_address
&& current_ip < r.base_address + r.size
current_ip >= r.base_address && current_ip < r.base_address + r.size
});
if let Some(region) = region {
@@ -351,13 +347,15 @@ mod platform {
// Check for private/unbacked memory
if region.region_type == "PRIVATE" {
is_in_unbacked = true;
indicators.push("Thread executing from unbacked memory".to_string());
indicators
.push("Thread executing from unbacked memory".to_string());
}
// Check if start address differs significantly from current IP
if thread.start_address != 0
&& (current_ip < thread.start_address.saturating_sub(0x10000)
|| current_ip > thread.start_address.saturating_add(0x10000))
|| current_ip
> thread.start_address.saturating_add(0x10000))
{
indicators.push(format!(
"Thread IP diverged from start address (start: {:#x}, current: {:#x})",
@@ -384,8 +382,7 @@ mod platform {
current_ip = context.Eip as usize;
let region = memory_regions.iter().find(|r| {
current_ip >= r.base_address
&& current_ip < r.base_address + r.size
current_ip >= r.base_address && current_ip < r.base_address + r.size
});
if let Some(region) = region {
@@ -396,7 +393,8 @@ mod platform {
if region.region_type == "PRIVATE" {
is_in_unbacked = true;
indicators.push("Thread executing from unbacked memory".to_string());
indicators
.push("Thread executing from unbacked memory".to_string());
}
} else {
indicators.push("Thread IP points to unmapped memory".to_string());
@@ -419,7 +417,8 @@ mod platform {
if let Some(region) = start_region {
if region.region_type == "PRIVATE" && region.protection.is_executable() {
indicators.push("Thread started in private executable memory".to_string());
indicators
.push("Thread started in private executable memory".to_string());
}
}
}
@@ -491,7 +490,8 @@ mod platform {
thread_information: *mut std::ffi::c_void,
thread_information_length: u32,
return_length: *mut u32,
) -> i32;
)
-> i32;
let nt_query: NtQueryInformationThreadFn = std::mem::transmute(func);
let mut is_io_pending: u32 = 0;
@@ -614,8 +614,8 @@ mod platform {
use windows::Win32::System::Diagnostics::Debug::CONTEXT;
use windows::Win32::System::Diagnostics::Debug::CONTEXT_DEBUG_REGISTERS;
use windows::Win32::System::Threading::{
GetThreadContext, SuspendThread, ResumeThread,
THREAD_GET_CONTEXT, THREAD_SUSPEND_RESUME,
GetThreadContext, ResumeThread, SuspendThread, THREAD_GET_CONTEXT,
THREAD_SUSPEND_RESUME,
};
let threads = enumerate_threads(pid)?;