Changeset 80788 in vbox

Timestamp:

Sep 13, 2019 8:08:53 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

133355

Message:

Main/ClientToken.cpp,ClientTokenHolder.cpp: Fixed the SDDL tweak that grants access to the token mutex to the user via the SID rather than by 'owner' (whatever that is). Fixes troubles starting VMs from non-elevated setups, at least for me. Also changed the client token holder assertion into a AssertLogRel so we might have a chance of seeing something in release setups if the client got a release log configured already. Finally, changed the mutex name to start with 'VBoxSession-' and replaced the '/' infix with '-VM-'. bugref:9560 bugref:9341

Location:

trunk/src/VBox/Main

Files:

• src-client/ClientTokenHolder.cpp (modified) (1 diff)
• src-server/ClientToken.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/ClientTokenHolder.cpp

@@ -254 +254 @@
 
     //AssertMsg(mutex, ("cannot open token, err=%u\n", ::GetLastError()));
-    AssertMsg(mutex, ("cannot open token %ls, err=%u\n", bstrSessionId.raw(), ::GetLastError()));
+    AssertLogRelMsg(mutex, ("cannot open token %ls, err=%u\n", bstrSessionId.raw(), ::GetLastError()));
     if (mutex)
     {

trunk/src/VBox/Main/src-server/ClientToken.cpp

@@ -128 +128 @@
         AssertMsgFailed(("Cannot get thread access token, err=%u", ::GetLastError()));
 
-    Bstr tokenId = Bstr(Utf8Str("Global\\") + strUserSid + "/" + pMachine->mData->mUuid.toString());
+    BstrFmt tokenId("Global\\VBoxSession-%s-VM-%RTuuid", strUserSid.c_str(), pMachine->mData->mUuid.raw());
 
     /* create security descriptor to allow SYNCHRONIZE access from any windows sessions and users.
@@ -142 +142 @@
 
     //static const RTUTF16 s_wszSecDesc[] = L"D:(A;;0x1F0001;;;CO)(A;;0x1F0001;;;SY)(A;;0x1F0001;;;BA)(A;;0x100001;;;WD)";
-    com::BstrFmt bstrSecDesc("O:%sD:(A;;0x1F0001;;;CO)(A;;0x1F0001;;;SY)(A;;0x1F0001;;;BA)", strUserSid.c_str());
+    com::BstrFmt bstrSecDesc("D:(A;;0x1F0001;;;CO)"
+                             "(A;;0x1F0001;;;SY)"
+                             "(A;;0x1F0001;;;BA)"
+                             "(A;;0x1F0001;;;BA)"
+                             "(A;;0x1F0001;;;%s)"
+                             , strUserSid.c_str());
     PSECURITY_DESCRIPTOR pSecDesc = NULL;
     //AssertMsgStmt(::ConvertStringSecurityDescriptorToSecurityDescriptor(s_wszSecDesc, SDDL_REVISION_1, &pSecDesc, NULL),