Handle missing DisplayVersion in Windows inventory
This commit is contained in:
@@ -227,28 +227,51 @@ pub fn private_path(path: &Path, directory: bool) -> Result<()> {
|
|||||||
}
|
}
|
||||||
fn registry_string(name: &str) -> Result<String> {
|
fn registry_string(name: &str) -> Result<String> {
|
||||||
let key = wide("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion");
|
let key = wide("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion");
|
||||||
let name = wide(name);
|
let value_name = wide(name);
|
||||||
let mut bytes = vec![0u16; 2048];
|
let mut bytes = vec![0u16; 2048];
|
||||||
let mut size = (bytes.len() * 2) as u32;
|
let mut size = (bytes.len() * 2) as u32;
|
||||||
ensure!(
|
let status = unsafe {
|
||||||
unsafe {
|
|
||||||
RegGetValueW(
|
RegGetValueW(
|
||||||
HKEY_LOCAL_MACHINE,
|
HKEY_LOCAL_MACHINE,
|
||||||
key.as_ptr(),
|
key.as_ptr(),
|
||||||
name.as_ptr(),
|
value_name.as_ptr(),
|
||||||
RRF_RT_REG_SZ,
|
RRF_RT_REG_SZ,
|
||||||
ptr::null_mut(),
|
ptr::null_mut(),
|
||||||
bytes.as_mut_ptr().cast(),
|
bytes.as_mut_ptr().cast(),
|
||||||
&mut size,
|
&mut size,
|
||||||
)
|
)
|
||||||
} == 0,
|
};
|
||||||
"OS_REGISTRY"
|
ensure!(status == 0, "OS_REGISTRY {name} (Win32 {status})");
|
||||||
);
|
|
||||||
ensure!(
|
ensure!(
|
||||||
size >= 2 && size as usize <= bytes.len() * 2,
|
size >= 2 && size % 2 == 0 && size as usize <= bytes.len() * 2,
|
||||||
"OS_REGISTRY_SIZE"
|
"OS_REGISTRY_SIZE {name}"
|
||||||
);
|
);
|
||||||
Ok(String::from_utf16(&bytes[..size as usize / 2 - 1])?)
|
String::from_utf16(&bytes[..size as usize / 2 - 1])
|
||||||
|
.with_context(|| format!("OS_REGISTRY_ENCODING {name}"))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn os_inventory(read: impl Fn(&str) -> Result<String>) -> Result<(String, Value)> {
|
||||||
|
let product = read("ProductName")?;
|
||||||
|
let build = read("CurrentBuildNumber")?;
|
||||||
|
// Older Windows releases can omit DisplayVersion. Both version labels are
|
||||||
|
// optional; the product and build still identify the OS without either.
|
||||||
|
let version = |name| read(name).ok().filter(|s| !s.trim().is_empty());
|
||||||
|
let display = version("DisplayVersion");
|
||||||
|
let release = if display.is_none() {
|
||||||
|
version("ReleaseId")
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
|
let os = match (&display, &release) {
|
||||||
|
(Some(display), _) => format!("{product}; DisplayVersion={display}; Build={build}"),
|
||||||
|
(None, Some(release)) => format!("{product}; ReleaseId={release}; Build={build}"),
|
||||||
|
(None, None) => format!("{product}; Build={build}"),
|
||||||
|
};
|
||||||
|
let mut data = json!({"product_name":product,"display_version":display,"build":build});
|
||||||
|
if let Some(release) = release {
|
||||||
|
data["release_id"] = json!(release);
|
||||||
|
}
|
||||||
|
Ok((os, data))
|
||||||
}
|
}
|
||||||
pub(crate) fn computer_name(format: COMPUTER_NAME_FORMAT) -> Result<String> {
|
pub(crate) fn computer_name(format: COMPUTER_NAME_FORMAT) -> Result<String> {
|
||||||
let mut name = [0u16; 256];
|
let mut name = [0u16; 256];
|
||||||
@@ -289,15 +312,14 @@ pub fn snapshot_with_boot(booted_at: Option<DateTime<Utc>>) -> Result<Value> {
|
|||||||
"VOLUME_QUERY"
|
"VOLUME_QUERY"
|
||||||
);
|
);
|
||||||
ensure!(total > 0 && available <= total, "VOLUME_VALUES");
|
ensure!(total > 0 && available <= total, "VOLUME_VALUES");
|
||||||
let product = registry_string("ProductName")?;
|
let (os, mut os_data) = os_inventory(registry_string)?;
|
||||||
let display = registry_string("DisplayVersion")?;
|
os_data["installed_at"] = json!(install_date());
|
||||||
let build = registry_string("CurrentBuildNumber")?;
|
os_data["booted_at"] = json!(booted_at);
|
||||||
let os = format!("{product}; DisplayVersion={display}; Build={build}");
|
|
||||||
let completed = Utc::now();
|
let completed = Utc::now();
|
||||||
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,
|
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,
|
"collection_started_at":started,"collection_completed_at":completed,
|
||||||
"observations":[
|
"observations":[
|
||||||
{"scope":"windows.os","source_id":"windows.registry:CurrentVersion;GetComputerNameExW;Kernel-General/12","observed_at":completed,"quality":"valid","completeness":"partial","truncated":false,"error_code":null,"data":{"product_name":product,"display_version":display,"build":build,"installed_at":install_date(),"booted_at":booted_at}},
|
{"scope":"windows.os","source_id":"windows.registry:CurrentVersion;GetComputerNameExW;Kernel-General/12","observed_at":completed,"quality":"valid","completeness":"partial","truncated":false,"error_code":null,"data":os_data},
|
||||||
{"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.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}
|
{"scope":"windows.inodes","source_id":"windows.win32","observed_at":completed,"quality":"unsupported","completeness":"unknown","truncated":false,"error_code":"NOT_APPLICABLE","data":null}
|
||||||
]});
|
]});
|
||||||
@@ -356,6 +378,47 @@ pub async fn boot_id() -> Result<String> {
|
|||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
|
fn os_fixture(display: Option<&str>, release: Option<&str>) -> (String, serde_json::Value) {
|
||||||
|
super::os_inventory(|name| {
|
||||||
|
match name {
|
||||||
|
"ProductName" => Some("Windows 10 Enterprise LTSC"),
|
||||||
|
"CurrentBuildNumber" => Some("17763"),
|
||||||
|
"DisplayVersion" => display,
|
||||||
|
"ReleaseId" => release,
|
||||||
|
_ => panic!("unexpected registry value: {name}"),
|
||||||
|
}
|
||||||
|
.map(str::to_owned)
|
||||||
|
.ok_or_else(|| anyhow::anyhow!("missing {name}"))
|
||||||
|
})
|
||||||
|
.unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn os_inventory_prefers_display_version() {
|
||||||
|
let (os, data) = os_fixture(Some("22H2"), Some("2009"));
|
||||||
|
assert!(os.contains("DisplayVersion=22H2"));
|
||||||
|
assert_eq!(data["display_version"], "22H2");
|
||||||
|
assert!(data.get("release_id").is_none());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn os_inventory_uses_legacy_release_id_when_display_version_is_missing() {
|
||||||
|
let (os, data) = os_fixture(None, Some("1809"));
|
||||||
|
assert_eq!(os, "Windows 10 Enterprise LTSC; ReleaseId=1809; Build=17763");
|
||||||
|
assert!(data["display_version"].is_null());
|
||||||
|
assert_eq!(data["release_id"], "1809");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn os_inventory_keeps_product_and_build_without_version_labels() {
|
||||||
|
for display in [None, Some(" ")] {
|
||||||
|
let (os, data) = os_fixture(display, None);
|
||||||
|
assert_eq!(os, "Windows 10 Enterprise LTSC; Build=17763");
|
||||||
|
assert!(data["display_version"].is_null());
|
||||||
|
assert_eq!(data["build"], "17763");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn native_inventory_has_real_windows_sources_and_no_fake_inodes() {
|
fn native_inventory_has_real_windows_sources_and_no_fake_inodes() {
|
||||||
let v = super::snapshot().unwrap();
|
let v = super::snapshot().unwrap();
|
||||||
|
|||||||
Reference in New Issue
Block a user