Preserve Windows runtime state and qualify native guarded adapters
Rust development slice / linux (push) Failing after 7s
Rust development slice / linux (push) Failing after 7s
This commit is contained in:
@@ -37,6 +37,90 @@ fn sid_string(sid: *mut c_void) -> Result<String> {
|
||||
}
|
||||
Ok(result)
|
||||
}
|
||||
/// Verify the actual SCM process token; an administrator probe cannot stand in
|
||||
/// for this check. No account switching or SYSTEM fallback exists.
|
||||
pub fn require_local_service() -> Result<()> {
|
||||
use std::os::windows::io::{AsRawHandle, FromRawHandle, OwnedHandle};
|
||||
use windows_sys::Win32::System::Threading::{GetCurrentProcess, OpenProcessToken};
|
||||
let mut token = ptr::null_mut();
|
||||
ensure!(
|
||||
unsafe { OpenProcessToken(GetCurrentProcess(), Security::TOKEN_QUERY, &mut token) } != 0,
|
||||
"SERVICE_TOKEN_REQUIRED"
|
||||
);
|
||||
let token = unsafe { OwnedHandle::from_raw_handle(token) };
|
||||
// Native structures require alignment, even though GetTokenInformation
|
||||
// accepts a void pointer. Allocate pointer-aligned storage, with fixed cap.
|
||||
let mut storage = vec![0usize; 256];
|
||||
let mut size = 0;
|
||||
ensure!(
|
||||
unsafe {
|
||||
Security::GetTokenInformation(
|
||||
token.as_raw_handle(),
|
||||
Security::TokenUser,
|
||||
storage.as_mut_ptr().cast(),
|
||||
(storage.len() * std::mem::size_of::<usize>()) as u32,
|
||||
&mut size,
|
||||
)
|
||||
} != 0,
|
||||
"SERVICE_TOKEN_USER"
|
||||
);
|
||||
let user = unsafe { &*storage.as_ptr().cast::<Security::TOKEN_USER>() };
|
||||
ensure!(
|
||||
sid_string(user.User.Sid)? == "S-1-5-19",
|
||||
"LOCAL_SERVICE_REQUIRED"
|
||||
);
|
||||
// A native SCM probe showed LocalService's unfiltered service token reports
|
||||
// TokenElevation=1, type=Default, while SID19 has no enabled administrator
|
||||
// membership. UAC elevation alone is not an account/administrator check.
|
||||
// Reject thread impersonation before querying effective membership.
|
||||
use windows_sys::Win32::{
|
||||
Foundation::{ERROR_NO_TOKEN, GetLastError},
|
||||
System::Threading::{GetCurrentThread, OpenThreadToken},
|
||||
};
|
||||
let mut thread_token = ptr::null_mut();
|
||||
if unsafe {
|
||||
OpenThreadToken(
|
||||
GetCurrentThread(),
|
||||
Security::TOKEN_QUERY,
|
||||
1,
|
||||
&mut thread_token,
|
||||
)
|
||||
} != 0
|
||||
{
|
||||
let _thread_token = unsafe { OwnedHandle::from_raw_handle(thread_token) };
|
||||
anyhow::bail!("IMPERSONATED_EXECUTOR_FORBIDDEN");
|
||||
}
|
||||
ensure!(
|
||||
unsafe { GetLastError() } == ERROR_NO_TOKEN,
|
||||
"THREAD_TOKEN_UNVERIFIED"
|
||||
);
|
||||
let mut admin_sid = [0usize; 16];
|
||||
let mut admin_size = std::mem::size_of_val(&admin_sid) as u32;
|
||||
ensure!(
|
||||
unsafe {
|
||||
Security::CreateWellKnownSid(
|
||||
Security::WinBuiltinAdministratorsSid,
|
||||
ptr::null_mut(),
|
||||
admin_sid.as_mut_ptr().cast(),
|
||||
&mut admin_size,
|
||||
)
|
||||
} != 0,
|
||||
"ADMINISTRATOR_SID_QUERY"
|
||||
);
|
||||
let mut admin_member = 0;
|
||||
ensure!(
|
||||
unsafe {
|
||||
Security::CheckTokenMembership(
|
||||
ptr::null_mut(),
|
||||
admin_sid.as_mut_ptr().cast(),
|
||||
&mut admin_member,
|
||||
)
|
||||
} != 0
|
||||
&& admin_member == 0,
|
||||
"ADMINISTRATOR_EXECUTOR_FORBIDDEN"
|
||||
);
|
||||
Ok(())
|
||||
}
|
||||
pub fn service_sid() -> Result<String> {
|
||||
let account = wide(format!("NT SERVICE\\{}", crate::SERVICE_NAME));
|
||||
let mut sid_len = 0;
|
||||
@@ -191,15 +275,19 @@ pub fn snapshot() -> Result<Value> {
|
||||
let build = registry_string("CurrentBuildNumber")?;
|
||||
let os = format!("{product}; DisplayVersion={display}; Build={build}");
|
||||
let completed = Utc::now();
|
||||
Ok(
|
||||
json!({"os":os,"hostname":hostname,"architecture":std::env::consts::ARCH,"root_total_bytes":total,"root_available_bytes":available,"root_available_inodes":null,
|
||||
"collection_started_at":started,"collection_completed_at":completed,
|
||||
"observations":[
|
||||
{"scope":"windows.os","source_id":"windows.registry:CurrentVersion;GetComputerNameExW","observed_at":completed,"quality":"valid","completeness":"partial","truncated":false,"error_code":null,"data":{"product_name":product,"display_version":display,"build":build}},
|
||||
{"scope":"windows.volumes","source_id":"windows.win32:GetDiskFreeSpaceExW","observed_at":completed,"quality":"valid","completeness":"partial","truncated":false,"error_code":null,"data":{"system_volume_total_bytes":total,"system_volume_available_bytes":available}},
|
||||
{"scope":"windows.inodes","source_id":"windows.win32","observed_at":completed,"quality":"unsupported","completeness":"unknown","truncated":false,"error_code":"NOT_APPLICABLE","data":null}
|
||||
]}),
|
||||
)
|
||||
let mut snapshot = json!({"os":os,"hostname":hostname,"architecture":std::env::consts::ARCH,"root_total_bytes":total,"root_available_bytes":available,"root_available_inodes":null,
|
||||
"collection_started_at":started,"collection_completed_at":completed,
|
||||
"observations":[
|
||||
{"scope":"windows.os","source_id":"windows.registry:CurrentVersion;GetComputerNameExW","observed_at":completed,"quality":"valid","completeness":"partial","truncated":false,"error_code":null,"data":{"product_name":product,"display_version":display,"build":build}},
|
||||
{"scope":"windows.volumes","source_id":"windows.win32:GetDiskFreeSpaceExW","observed_at":completed,"quality":"valid","completeness":"partial","truncated":false,"error_code":null,"data":{"system_volume_total_bytes":total,"system_volume_available_bytes":available}},
|
||||
{"scope":"windows.inodes","source_id":"windows.win32","observed_at":completed,"quality":"unsupported","completeness":"unknown","truncated":false,"error_code":"NOT_APPLICABLE","data":null}
|
||||
]});
|
||||
snapshot["observations"]
|
||||
.as_array_mut()
|
||||
.context("INVENTORY_OBSERVATIONS")?
|
||||
.extend(crate::inventory::observations());
|
||||
snapshot["collection_completed_at"] = json!(Utc::now());
|
||||
Ok(snapshot)
|
||||
}
|
||||
pub async fn boot_id() -> Result<String> {
|
||||
// Fixed passive query only. Never interpolates a job or caller-supplied code.
|
||||
@@ -235,6 +323,19 @@ mod tests {
|
||||
assert!(v["root_total_bytes"].as_u64().unwrap() > 0);
|
||||
assert!(v["root_available_inodes"].is_null());
|
||||
assert!(!v["hostname"].as_str().unwrap().is_empty());
|
||||
let hardware = v["observations"]
|
||||
.as_array()
|
||||
.unwrap()
|
||||
.iter()
|
||||
.find(|o| o["scope"] == "windows.hardware")
|
||||
.unwrap();
|
||||
assert!(hardware["data"]["memory_total_bytes"].as_u64().unwrap() > 0);
|
||||
assert!(
|
||||
hardware["data"]["logical_processors_visible"]
|
||||
.as_u64()
|
||||
.unwrap()
|
||||
> 0
|
||||
);
|
||||
assert!(
|
||||
v["observations"]
|
||||
.as_array()
|
||||
|
||||
Reference in New Issue
Block a user