From 9b5555a247dd623a07fcf02fc205ae750cb390bc Mon Sep 17 00:00:00 2001 From: Martin Vogel Date: Fri, 14 Aug 2026 14:32:28 +0200 Subject: [PATCH] style(windows): clang-format the threaded ancestor signatures CI lint flagged two continuation lines from the previous commit. Formatting collapsed the runtime-directory call onto one line, so the contract pin that asserted ancestor=false there stopped matching; the pin now keys on the formatted text. Both revert directions re-verified: capability-only fails, and relaxing the runtime directory to ancestor=true fails. Signed-off-by: Martin Vogel --- src/daemon/ipc.c | 5 ++--- tests/test_windows_bundle_contract.sh | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/daemon/ipc.c b/src/daemon/ipc.c index 0c96ae1ce..5fdb7efe1 100644 --- a/src/daemon/ipc.c +++ b/src/daemon/ipc.c @@ -4120,7 +4120,7 @@ static bool win_file_acl_secure(win_security_t *security, HANDLE file, DWORD mut size_t sid_capacity = (size_t)header->AceSize - sid_offset; bool creator_owner_inherit_only = (header->AceFlags & INHERIT_ONLY_ACE) != 0U; if (!win_bounded_sid_trusted(security, sid, sid_capacity, creator_owner_inherit_only, - ancestor)) { + ancestor)) { /* Name the untrusted identity class so a harness/profile ACL leak * (an inherited Users / Authenticated Users / Everyone ACE) is * distinguishable from a genuinely hostile grant. */ @@ -4219,8 +4219,7 @@ static bool win_runtime_directory_secure(const wchar_t *runtime_dir) { } bool final_private = secure_result == ERROR_SUCCESS && - win_file_security_secure(&security, directory, true, win_private_mutation_rights(), - false); + win_file_security_secure(&security, directory, true, win_private_mutation_rights(), false); (void)CloseHandle(directory); win_security_destroy(&security); return valid_handle && owner_ok && final_private; diff --git a/tests/test_windows_bundle_contract.sh b/tests/test_windows_bundle_contract.sh index 292790f02..fab5023d5 100644 --- a/tests/test_windows_bundle_contract.sh +++ b/tests/test_windows_bundle_contract.sh @@ -446,7 +446,7 @@ require( # APP_PACKAGE identifier authority "sid[7] != 15U", # the private runtime directory is validated with ancestor=false - "win_private_mutation_rights(),\n false)", + "win_private_mutation_rights(), false)", ) ), "AppContainer SIDs must be tolerated on ancestors ONLY, covering both package "