Changeset 102754 in vbox for trunk/src/VBox/Additions

Timestamp:

Jan 3, 2024 5:49:16 PM (13 months ago)

Author:

vboxsync

Message:

Guest Properties/VBoxService: Deal with long(er) user name / domain name combinations on Windows guests. See comments for details [NT4 build fix]. bugref:10575

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceVMInfo-win.cpp (modified) (5 diffs)
• VBoxServiceVMInfo.h (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp

@@ -63 +63 @@
 *   Structures and Typedefs                                                                                                      *
 *********************************************************************************************************************************/
+/* advapi32.dll: */
+typedef BOOL (WINAPI *PFNCONVERTSIDTOSTRINGSIDW)(PSID, LPWSTR *);
+
+/* advapi32.dll: */
+static PFNCONVERTSIDTOSTRINGSIDW g_pfnConvertSidToStringSidW = NULL;
+
 /** Structure for storing the looked up user information. */
 typedef struct VBOXSERVICEVMINFOUSER
@@ -221 +227 @@
     }
     RTLdrClose(hLdrMod);
+
+    /* advapi32: */
+    rc = RTLdrLoadSystem("advapi32.dll", true /*fNoUnload*/, &hLdrMod);
+    if (RT_SUCCESS(rc))
+        RTLdrGetSymbol(hLdrMod, "ConvertSidToStringSidW", (void **)&g_pfnConvertSidToStringSidW);
 
     return VINF_SUCCESS;
@@ -1026 +1037 @@
  * @param   pszUser                 Name of guest user to update.
  * @param   pszDomain               Domain of guest user to update. Optional.
+ * @param   pwszSid                 The user's SID as a string. Might be NULL if not supported (NT4).
  * @param   pszKey                  Key name of guest property to update.
  * @param   pszValueFormat          Guest property value to set. Pass NULL for deleting
@@ -1035 +1047 @@
 {
     int rc = VGSvcUserUpdateF(pCache, pszUser, NULL /* pszDomain */, "Domain", pszDomain);
-    if (RT_SUCCESS(rc))
+    if (pwszSid && RT_SUCCESS(rc))
         rc = VGSvcUserUpdateF(pCache, pszUser, NULL /* pszDomain */, "SID", "%ls", pwszSid);
 
@@ -1082 +1094 @@
         if (RT_SUCCESS(rc))
         {
-            WCHAR *pwszSid;
-            if (ConvertSidToStringSidW(pSid, &pwszSid)) /** @todo Ditto. */
+            WCHAR *pwszSid = NULL;
+            if (g_pfnConvertSidToStringSidW)
+                g_pfnConvertSidToStringSidW(pSid, &pwszSid); /** @todo Ditto. */
+
+            rc = vgsvcVMInfoWinUserUpdateFallbackV(pCache, pszUser, pszDomain, pwszSid, pszKey, pszValueFormat, va);
+            if (RT_FAILURE(rc))
             {
-                rc = vgsvcVMInfoWinUserUpdateFallbackV(pCache, pszUser, pszDomain, pwszSid, pszKey, pszValueFormat, va);
-                if (RT_FAILURE(rc))
+                /**
+                 * If using the sole user name as a property name still is too long or something else failed,
+                 * at least try to look up the user's RID (relative identifier). Note that the RID always is bound to the
+                 * to the authority that issued the SID.
+                 */
+                int const cSubAuth = *GetSidSubAuthorityCount(pSid);
+                if (cSubAuth > 1)
                 {
-                    /**
-                     * If using the sole user name as a property name still is too long or something else failed,
-                     * at least try to look up the user's RID (relative identifier). Note that the RID always is bound to the
-                     * to the authority that issued the SID.
-                     */
-                    int const cSubAuth = *GetSidSubAuthorityCount(pSid);
-                    if (cSubAuth > 1)
-                    {
-                        DWORD const dwUserRid = *GetSidSubAuthority(pSid, cSubAuth - 1);
-                        char  szUserRid[16 + 1];
-                        if (RTStrPrintf2(szUserRid, sizeof(szUserRid), "%ld", dwUserRid) > 0)
-                            rc = vgsvcVMInfoWinUserUpdateFallbackV(pCache, szUserRid, pszDomain, pwszSid, pszKey,
-                                                                   pszValueFormat, va);
-                        else
-                            rc = VERR_BUFFER_OVERFLOW;
-                    }
-                    /* else not much else we can do then. */
+                    DWORD const dwUserRid = *GetSidSubAuthority(pSid, cSubAuth - 1);
+                    char  szUserRid[16 + 1];
+                    if (RTStrPrintf2(szUserRid, sizeof(szUserRid), "%ld", dwUserRid) > 0)
+                        rc = vgsvcVMInfoWinUserUpdateFallbackV(pCache, szUserRid, pszDomain, pwszSid, pszKey,
+                                                               pszValueFormat, va);
+                    else
+                        rc = VERR_BUFFER_OVERFLOW;
                 }
-
+                /* else not much else we can do then. */
+            }
+
+            if (pwszSid)
+            {
                 LocalFree(pwszSid);
                 pwszSid = NULL;
             }
-            else
-                rc = RTErrConvertFromWin32(GetLastError());
 
             vgsvcVMInfoWinUserSidDestroy(pSid);

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.h

@@ -38 +38 @@
                             const char *pszKey, const char *pszFormat, va_list va);
 
-extern int vgsvcVMInfoWinUserUpdateF(PVBOXSERVICEVEPROPCACHE pCache, const char *pszUser, const char *pszDomain,
-                                     const char *pszKey, const char *pszValueFormat, ...);
-
 extern uint32_t g_uVMInfoUserIdleThresholdMS;