Skip to content

Audit winreg key queries before OS calls #9593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 3 commits into from
Nov 5, 2026
Merged

Audit winreg key queries before OS calls #9593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ca85e4
Audit winreg key queries before OS calls
youknowdot Nov 3, 2026
a169772
Accept owned WTF-8 strings in winreg QueryValue
youknowdot Nov 3, 2026
bc92a27
Merge current main into registry audit fix
youknowdot Nov 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions crates/vm/src/builtins/str.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@ impl<'a> TryFromBorrowedObject<'a> for String {
}
}

impl<'a> TryFromBorrowedObject<'a> for Wtf8Buf {
fn try_from_borrowed_object(vm: &VirtualMachine, obj: &'a PyObject) -> PyResult<Self> {
let pystr: &Py<PyStr> = TryFromBorrowedObject::try_from_borrowed_object(vm, obj)?;
Ok(pystr.as_wtf8().to_owned())
}
}

impl<'a> TryFromBorrowedObject<'a> for &'a str {
fn try_from_borrowed_object(vm: &VirtualMachine, obj: &'a PyObject) -> PyResult<Self> {
let pystr: &Py<PyUtf8Str> = TryFromBorrowedObject::try_from_borrowed_object(vm, obj)?;
Expand Down
19 changes: 14 additions & 5 deletions crates/vm/src/stdlib/winreg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,7 @@ mod winreg {
#[pyfunction]
fn QueryInfoKey(key: HKEYArg, vm: &VirtualMachine) -> PyResult<PyRef<PyTuple>> {
let key = key.0;
vm.audit("winreg.QueryInfoKey", || (key as isize,))?;
let info = host_winreg::query_info_key_full(key)
.map_err(|err| vm.new_os_error(format!("error code: {err}")))?;
let tup: Vec<PyObjectRef> = vec![
Expand All @@ -645,22 +646,30 @@ mod winreg {
#[pyfunction]
fn QueryValue(
key: HKEYArg,
sub_key: Option<String>,
sub_key: Option<Wtf8Buf>,
vm: &VirtualMachine,
) -> PyResult<PyRef<PyStr>> {
let hkey = key.0;

let sub_key = sub_key
.as_ref()
.map(|s| s.to_wide_cstring().map_err(|_| nul_char_error(vm)))
.transpose()?;
vm.audit("winreg.QueryValue", || {
let sub_key: PyObjectRef = sub_key.as_ref().map_or_else(
|| vm.ctx.none(),
|s| vm.ctx.new_str(Wtf8Buf::from_wide(s.as_slice())).into(),
);
(hkey as isize, sub_key, vm.ctx.none())
})?;

if hkey == host_winreg::HKEY_PERFORMANCE_DATA {
return Err(os_error_from_windows_code(
vm,
host_winreg::ERROR_INVALID_HANDLE as i32,
));
}

let sub_key = sub_key
.map(WideCString::from_str)
.transpose()
.map_err(|e| e.to_pyexception(vm))?;
host_winreg::query_default_value_wtf8(hkey, sub_key.as_deref())
.map(|value| vm.ctx.new_str(value))
.map_err(|err| err.to_pyexception(vm))
Expand Down
Loading