Rebase against 93994dfc0b99789e3a9c1490b4d93082f34b8dcc.

2025-09-12 18:50:20 -07:00 · 2018-09-18 20:42:30 -05:00
parent 5ae728e2ec
commit 912b650b76
4 changed files with 38 additions and 136 deletions
--- a/patches/server-CreateProcess_ACLs/0003-advapi32-tests-Add-additional-tests-for-passing-a-th.patch
+++ b/patches/server-CreateProcess_ACLs/0003-advapi32-tests-Add-additional-tests-for-passing-a-th.patch
@@ -1,96 +0,0 @@
-From 2024b3a2a4d0db56c15d96b05f1be146b1f37fb9 Mon Sep 17 00:00:00 2001
-From: Joris van der Wel <joris@jorisvanderwel.com>
-Date: Wed, 15 Oct 2014 10:02:33 +0200
-Subject: advapi32/tests: Add additional tests for passing a thread sd to
- CreateProcess.
-
---
- dlls/advapi32/tests/security.c | 44 ++++++++++++++++++++++++++++++++++++++----
- 1 file changed, 40 insertions(+), 4 deletions(-)
-
-diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index b1b35aa..09fb7fa 100644
--- a/dlls/advapi32/tests/security.c
-+++ b/dlls/advapi32/tests/security.c
-@@ -2532,12 +2532,12 @@ static void test_process_security(void)
-     PTOKEN_OWNER owner;
-     PTOKEN_PRIMARY_GROUP group;
-     PSID AdminSid = NULL, UsersSid = NULL;
-    PACL Acl = NULL;
-    SECURITY_DESCRIPTOR *SecurityDescriptor = NULL;
-+    PACL Acl = NULL, ThreadAcl = NULL;
-+    SECURITY_DESCRIPTOR *SecurityDescriptor = NULL, *ThreadSecurityDescriptor = NULL;
-     char buffer[MAX_PATH];
-     PROCESS_INFORMATION info;
-     STARTUPINFOA startup;
-    SECURITY_ATTRIBUTES psa;
-+    SECURITY_ATTRIBUTES psa, tsa;
-     HANDLE token, event;
-     DWORD size;
-     SID_IDENTIFIER_AUTHORITY SIDAuthWorld = { SECURITY_WORLD_SID_AUTHORITY };
-@@ -2658,11 +2658,36 @@ static void test_process_security(void)
-     psa.lpSecurityDescriptor = SecurityDescriptor;
-     psa.bInheritHandle = TRUE;
- 
-+    ThreadSecurityDescriptor = HeapAlloc( GetProcessHeap(), 0, SECURITY_DESCRIPTOR_MIN_LENGTH );
-+    res = InitializeSecurityDescriptor( ThreadSecurityDescriptor, SECURITY_DESCRIPTOR_REVISION );
-+    ok(res, "InitializeSecurityDescriptor failed with error %d\n", GetLastError());
-+
-+    ThreadAcl = HeapAlloc( GetProcessHeap(), 0, 256 );
-+    res = InitializeAcl( ThreadAcl, 256, ACL_REVISION );
-+    ok(res, "InitializeAcl failed with error %d\n", GetLastError());
-+    res = AddAccessDeniedAce( ThreadAcl, ACL_REVISION, THREAD_SET_THREAD_TOKEN, AdminSid );
-+    ok(res, "AddAccessDeniedAce failed with error %d\n", GetLastError() );
-+    res = AddAccessAllowedAce( ThreadAcl, ACL_REVISION, THREAD_ALL_ACCESS, AdminSid );
-+    ok(res, "AddAccessAllowedAce failed with error %d\n", GetLastError());
-+
-+    res = SetSecurityDescriptorOwner( ThreadSecurityDescriptor, AdminSid, FALSE );
-+    ok(res, "SetSecurityDescriptorOwner failed with error %d\n", GetLastError());
-+    res = SetSecurityDescriptorGroup( ThreadSecurityDescriptor, UsersSid, FALSE );
-+    ok(res, "SetSecurityDescriptorGroup failed with error %d\n", GetLastError());
-+    res = SetSecurityDescriptorDacl( ThreadSecurityDescriptor, TRUE, ThreadAcl, FALSE );
-+    ok(res, "SetSecurityDescriptorDacl failed with error %d\n", GetLastError());
-+
-+    tsa.nLength = sizeof(tsa);
-+    tsa.lpSecurityDescriptor = ThreadSecurityDescriptor;
-+    tsa.bInheritHandle = TRUE;
-+
-     /* Doesn't matter what ACL say we should get full access for ourselves */
-    res = CreateProcessA( NULL, buffer, &psa, NULL, FALSE, 0, NULL, NULL, &startup, &info );
-+    res = CreateProcessA( NULL, buffer, &psa, &tsa, FALSE, 0, NULL, NULL, &startup, &info );
-     ok(res, "CreateProcess with err:%d\n", GetLastError());
-     TEST_GRANTED_ACCESS2( info.hProcess, PROCESS_ALL_ACCESS_NT4,
-                           STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL );
-+    TEST_GRANTED_ACCESS2( info.hThread, THREAD_ALL_ACCESS_NT4,
-+                          STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL );
-     winetest_wait_child_process( info.hProcess );
- 
-     FreeSid(EveryoneSid);
-@@ -2673,6 +2698,8 @@ static void test_process_security(void)
-     HeapFree(GetProcessHeap(), 0, owner);
-     HeapFree(GetProcessHeap(), 0, Acl);
-     HeapFree(GetProcessHeap(), 0, SecurityDescriptor);
-+    HeapFree(GetProcessHeap(), 0, ThreadAcl);
-+    HeapFree(GetProcessHeap(), 0, ThreadSecurityDescriptor);
- }
- 
- static void test_process_security_child(void)
-@@ -2728,6 +2755,15 @@ static void test_process_security_child(void)
-     TEST_GRANTED_ACCESS( handle1, PROCESS_VM_READ );
-     CloseHandle( handle1 );
-     CloseHandle( handle );
-+
-+    /* Test thread security */
-+    handle = OpenThread( THREAD_TERMINATE, FALSE, GetCurrentThreadId() );
-+    ok(handle != NULL, "OpenThread(THREAD_TERMINATE) with err:%d\n", GetLastError());
-+    TEST_GRANTED_ACCESS( handle, PROCESS_TERMINATE );
-+    CloseHandle( handle );
-+
-+    handle = OpenThread( THREAD_SET_THREAD_TOKEN, FALSE, GetCurrentThreadId() );
-+    ok(handle == NULL, "OpenThread(THREAD_SET_THREAD_TOKEN) should have failed\n");
- }
- 
- static void test_impersonation_level(void)
-- 
-2.1.2
-