[PATCH 1/2] advapi32/tests: Add some tests for querying the security of pseudo-handles.

[Zebediah Figura]

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
 dlls/advapi32/tests/security.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index 6d2d5f56f1b..0c1c498bbce 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -7871,6 +7871,34 @@ static void test_create_process_token_child(void)
     }
 }
 
+static void test_pseudo_handle_security(void)
+{
+    char buffer[200];
+    PSECURITY_DESCRIPTOR sd = buffer, *sd_ptr;
+    DWORD size;
+    BOOL ret;
+
+    ret = GetKernelObjectSecurity(GetCurrentProcess(), OWNER_SECURITY_INFORMATION, &sd, sizeof(buffer), &size);
+    ok(ret, "got error %u\n", GetLastError());
+
+    ret = GetKernelObjectSecurity(GetCurrentThread(), OWNER_SECURITY_INFORMATION, &sd, sizeof(buffer), &size);
+    ok(ret, "got error %u\n", GetLastError());
+
+    SetLastError(0xdeadbeef);
+    ret = GetKernelObjectSecurity(HKEY_CLASSES_ROOT, OWNER_SECURITY_INFORMATION, &sd, sizeof(buffer), &size);
+    ok(!ret, "expected failure\n");
+    ok(GetLastError() == ERROR_INVALID_HANDLE, "got error %u\n", GetLastError());
+
+    todo_wine ret = GetSecurityInfo(HKEY_CLASSES_ROOT, SE_REGISTRY_KEY,
+            DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL, &sd_ptr);
+    ok(!ret, "got error %u\n", ret);
+    LocalFree(sd_ptr);
+
+    ret = GetSecurityInfo(HKEY_CLASSES_ROOT, SE_KERNEL_OBJECT,
+            DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL, &sd_ptr);
+    ok(ret == ERROR_INVALID_HANDLE, "got error %u\n", ret);
+}
+
 START_TEST(security)
 {
     init();
@@ -7935,6 +7963,7 @@ START_TEST(security)
     test_BuildSecurityDescriptorW();
     test_duplicate_handle_access();
     test_create_process_token();
+    test_pseudo_handle_security();
 
     /* Must be the last test, modifies process token */
     test_token_security_descriptor();
-- 
2.29.2

[PATCH 2/2] advapi32: Support GetSecurityInfo() with special root HKEY constants.

[Zebediah Figura]

This fixes a message box with the ASCOM Platform installer.

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
 dlls/advapi32/security.c       | 31 ++++++++++++++++++++++++++++++-
 dlls/advapi32/tests/security.c |  2 +-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
index a01791bbf0b..d6b69483f68 100644
--- a/dlls/advapi32/security.c
+++ b/dlls/advapi32/security.c
@@ -1467,6 +1467,9 @@ BOOL WINAPI PrivilegedServiceAuditAlarmA( LPCSTR SubsystemName, LPCSTR ServiceNa
     return TRUE;
 }
 
+#define HKEY_SPECIAL_ROOT_FIRST   HKEY_CLASSES_ROOT
+#define HKEY_SPECIAL_ROOT_LAST    HKEY_DYN_DATA
+
 /******************************************************************************
  * GetSecurityInfo [ADVAPI32.@]
  *
@@ -1522,17 +1525,43 @@ DWORD WINAPI GetSecurityInfo( HANDLE handle, SE_OBJECT_TYPE type, SECURITY_INFOR
     }
     else
     {
+        HKEY key = NULL;
+
+        if (type == SE_REGISTRY_KEY && (HandleToUlong(handle) >= HandleToUlong(HKEY_SPECIAL_ROOT_FIRST))
+                && (HandleToUlong(handle) <= HandleToUlong(HKEY_SPECIAL_ROOT_LAST)))
+        {
+            REGSAM access = READ_CONTROL;
+            DWORD ret;
+
+            if (SecurityInfo & SACL_SECURITY_INFORMATION)
+                access |= ACCESS_SYSTEM_SECURITY;
+
+            if ((ret = RegOpenKeyExW( handle, L"\\", 0, access, &key )))
+                return ret;
+
+            handle = key;
+        }
+
         status = NtQuerySecurityObject( handle, SecurityInfo, NULL, 0, &size );
         if (status != STATUS_SUCCESS && status != STATUS_BUFFER_TOO_SMALL)
+        {
+            RegCloseKey( key );
             return RtlNtStatusToDosError( status );
+        }
 
-        if (!(sd = LocalAlloc( 0, size ))) return ERROR_NOT_ENOUGH_MEMORY;
+        if (!(sd = LocalAlloc( 0, size )))
+        {
+            RegCloseKey( key );
+            return ERROR_NOT_ENOUGH_MEMORY;
+        }
 
         if ((status = NtQuerySecurityObject( handle, SecurityInfo, sd, size, &size )))
         {
+            RegCloseKey( key );
             LocalFree(sd);
             return RtlNtStatusToDosError( status );
         }
+        RegCloseKey( key );
     }
 
     if (ppsidOwner)
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index 0c1c498bbce..96192973447 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -7889,7 +7889,7 @@ static void test_pseudo_handle_security(void)
     ok(!ret, "expected failure\n");
     ok(GetLastError() == ERROR_INVALID_HANDLE, "got error %u\n", GetLastError());
 
-    todo_wine ret = GetSecurityInfo(HKEY_CLASSES_ROOT, SE_REGISTRY_KEY,
+    ret = GetSecurityInfo(HKEY_CLASSES_ROOT, SE_REGISTRY_KEY,
             DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL, &sd_ptr);
     ok(!ret, "got error %u\n", ret);
     LocalFree(sd_ptr);
-- 
2.29.2

[PATCH 2/2] advapi32: Support GetSecurityInfo() with special root HKEY constants.

[Dmitry Timoshkov]

Zebediah Figura <z.figura12(a)gmail.com> wrote:
> @@ -1522,17 +1525,43 @@ DWORD WINAPI GetSecurityInfo( HANDLE handle, SE_OBJECT_TYPE type, SECURITY_INFOR
>      }
>      else
>      {
> +        HKEY key = NULL;
> +
> +        if (type == SE_REGISTRY_KEY && (HandleToUlong(handle) >= HandleToUlong(HKEY_SPECIAL_ROOT_FIRST))
> +                && (HandleToUlong(handle) <= HandleToUlong(HKEY_SPECIAL_ROOT_LAST)))
> +        {
> +            REGSAM access = READ_CONTROL;
> +            DWORD ret;
> +
> +            if (SecurityInfo & SACL_SECURITY_INFORMATION)
> +                access |= ACCESS_SYSTEM_SECURITY;
> +
> +            if ((ret = RegOpenKeyExW( handle, L"\\", 0, access, &key )))
> +                return ret;
> +
> +            handle = key;
> +        }
> +
>          status = NtQuerySecurityObject( handle, SecurityInfo, NULL, 0, &size );
>          if (status != STATUS_SUCCESS && status != STATUS_BUFFER_TOO_SMALL)
> +        {
> +            RegCloseKey( key );
>              return RtlNtStatusToDosError( status );
> +        }

It would be helpful to test whether NtQuerySecurityObject() is supposed to
handle such case on its own, without hacks on GetSecurityInfo() side.

-- 
Dmitry.

[PATCH 2/2] advapi32: Support GetSecurityInfo() with special root HKEY constants.

[Zebediah Figura (she/her)]

On 1/24/21 2:47 AM, Dmitry Timoshkov wrote:
> Zebediah Figura <z.figura12(a)gmail.com> wrote:
> > @@ -1522,17 +1525,43 @@ DWORD WINAPI GetSecurityInfo( HANDLE handle, SE_OBJECT_TYPE type, SECURITY_INFOR
> >      }
> >      else
> >      {
> > +        HKEY key = NULL;
> > +
> > +        if (type == SE_REGISTRY_KEY && (HandleToUlong(handle) >= HandleToUlong(HKEY_SPECIAL_ROOT_FIRST))
> > +                && (HandleToUlong(handle) <= HandleToUlong(HKEY_SPECIAL_ROOT_LAST)))
> > +        {
> > +            REGSAM access = READ_CONTROL;
> > +            DWORD ret;
> > +
> > +            if (SecurityInfo & SACL_SECURITY_INFORMATION)
> > +                access |= ACCESS_SYSTEM_SECURITY;
> > +
> > +            if ((ret = RegOpenKeyExW( handle, L"\\", 0, access, &key )))
> > +                return ret;
> > +
> > +            handle = key;
> > +        }
> > +
> >          status = NtQuerySecurityObject( handle, SecurityInfo, NULL, 0, &size );
> >          if (status != STATUS_SUCCESS && status != STATUS_BUFFER_TOO_SMALL)
> > +        {
> > +            RegCloseKey( key );
> >              return RtlNtStatusToDosError( status );
> > +        }
>
> It would be helpful to test whether NtQuerySecurityObject() is supposed to
> handle such case on its own, without hacks on GetSecurityInfo() side.

That GetKernelObjectSecurity() and SE_KERNEL_OBJECT both fail is a
pretty good indicator, I think, but sure, there's no harm in adding
extra tests.