Provide the native computer name to Windows script processes
This commit is contained in:
Generated
+1
-1
@@ -2213,7 +2213,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rmm-agent-windows"
|
name = "rmm-agent-windows"
|
||||||
version = "0.1.14"
|
version = "0.1.15"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "rmm-agent-windows"
|
name = "rmm-agent-windows"
|
||||||
version = "0.1.14"
|
version = "0.1.15"
|
||||||
edition.workspace = true
|
edition.workspace = true
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
|
|
||||||
|
|||||||
@@ -250,16 +250,20 @@ fn registry_string(name: &str) -> Result<String> {
|
|||||||
);
|
);
|
||||||
Ok(String::from_utf16(&bytes[..size as usize / 2 - 1])?)
|
Ok(String::from_utf16(&bytes[..size as usize / 2 - 1])?)
|
||||||
}
|
}
|
||||||
pub fn snapshot() -> Result<Value> {
|
pub(crate) fn computer_name(format: COMPUTER_NAME_FORMAT) -> Result<String> {
|
||||||
let started = Utc::now();
|
let mut name = [0u16; 256];
|
||||||
let mut hostname = vec![0u16; 256];
|
let mut len = name.len() as u32;
|
||||||
let mut len = hostname.len() as u32;
|
|
||||||
ensure!(
|
ensure!(
|
||||||
unsafe { GetComputerNameExW(ComputerNameDnsHostname, hostname.as_mut_ptr(), &mut len) }
|
unsafe { GetComputerNameExW(format, name.as_mut_ptr(), &mut len) } != 0
|
||||||
!= 0,
|
&& len > 0 && (len as usize) < name.len(),
|
||||||
"HOSTNAME_QUERY"
|
"HOSTNAME_QUERY"
|
||||||
);
|
);
|
||||||
let hostname = String::from_utf16(&hostname[..len as usize])?;
|
Ok(String::from_utf16(&name[..len as usize])?)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn snapshot() -> Result<Value> {
|
||||||
|
let started = Utc::now();
|
||||||
|
let hostname = computer_name(ComputerNameDnsHostname)?;
|
||||||
let volume = wide(std::env::var("SystemDrive").context("SYSTEM_DRIVE")? + "\\");
|
let volume = wide(std::env::var("SystemDrive").context("SYSTEM_DRIVE")? + "\\");
|
||||||
let mut available = 0;
|
let mut available = 0;
|
||||||
let mut total = 0;
|
let mut total = 0;
|
||||||
|
|||||||
@@ -299,9 +299,13 @@ pub(crate) fn run_observed(
|
|||||||
"SYSTEM_DRIVE_REQUIRED"
|
"SYSTEM_DRIVE_REQUIRED"
|
||||||
);
|
);
|
||||||
let system_drive = &system_text[..2];
|
let system_drive = &system_text[..2];
|
||||||
|
let computer = crate::native::computer_name(
|
||||||
|
windows_sys::Win32::System::SystemInformation::ComputerNameNetBIOS,
|
||||||
|
)?;
|
||||||
for value in [
|
for value in [
|
||||||
format!("SystemDrive={system_drive}"),
|
format!("COMPUTERNAME={computer}"),
|
||||||
format!("PATH={}\\System32;{}", system.display(), system.display()),
|
format!("PATH={}\\System32;{}", system.display(), system.display()),
|
||||||
|
format!("SystemDrive={system_drive}"),
|
||||||
format!("SystemRoot={}", system.display()),
|
format!("SystemRoot={}", system.display()),
|
||||||
format!("TEMP={}", cwd.display()),
|
format!("TEMP={}", cwd.display()),
|
||||||
format!("TMP={}", cwd.display()),
|
format!("TMP={}", cwd.display()),
|
||||||
@@ -455,6 +459,16 @@ pub(crate) fn run_observed(
|
|||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
#[test]
|
||||||
|
fn script_process_receives_the_native_computer_name() {
|
||||||
|
let args = ["-NoProfile", "-NonInteractive", "-Command",
|
||||||
|
"if (!$env:COMPUTERNAME -or $env:COMPUTERNAME -ine [Environment]::MachineName) { exit 1 }"]
|
||||||
|
.map(OsString::from);
|
||||||
|
let output = run(&crate::actions::powershell().unwrap(), &args,
|
||||||
|
&std::env::temp_dir(), 20, 4096, &AtomicBool::new(false)).unwrap();
|
||||||
|
assert_eq!(output.exit_code, Some(0));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn arguments_never_become_shell_code_and_trailing_slashes_are_quoted() {
|
fn arguments_never_become_shell_code_and_trailing_slashes_are_quoted() {
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
|
|||||||
Reference in New Issue
Block a user