Changeset 70727 in vbox for trunk/src/VBox/HostServices

Timestamp:

Jan 24, 2018 2:01:03 PM (7 years ago)

Author:

vboxsync

Message:

Enforce that host-side configuration guest properties are read-only-guest.
bugref:9047: Clean up Linux guest vboxuser device
We use certain guest properties for passing configuration information to the
Guest Additions, and these are not intended to be set or changed from inside
the guest. Enforce this.

Location:

trunk/src/VBox/HostServices/GuestProperties

Files:

• service.cpp (modified) (3 diffs)
• testcase/tstGuestPropSvc.cpp (modified) (2 diffs)

trunk/src/VBox/HostServices/GuestProperties/service.cpp

@@ -268 +268 @@
 
     /**
+     * Check whether the property name is reserved for host changes only.
+     *
+     * @returns Boolean true (host reserved) or false (available to guest).
+     *
+     * @param   pszName  The property name to check.
+     */
+    bool checkHostReserved(const char *pszName)
+    {
+        if (RTStrStartsWith(pszName, "/VirtualBox/GuestAdd/"))
+            return true;
+        if (RTStrStartsWith(pszName, "/VirtualBox/HostInfo/"))
+            return true;
+        return false;
+    }
+
+    /**
      * Gets a property.
      *
@@ -539 +555 @@
                 rc = GuestPropValidateFlags(papszFlags[i], &fFlags);
                 AssertRCBreak(rc);
+                /*
+                 * Handle names which are read-only for the guest.
+                 */
+                if (checkHostReserved(papszNames[i]))
+                    fFlags |= GUEST_PROP_F_RDONLYGUEST;
 
                 Property *pProp = getPropertyInternal(papszNames[i]);
@@ -715 +736 @@
     Property *pProp = getPropertyInternal(pcszName);
     rc = checkPermission(pProp ? pProp->mFlags : GUEST_PROP_F_NILFLAG, isGuest);
+    /*
+     * Handle names which are read-only for the guest.
+     */
+    if (rc == VINF_SUCCESS && checkHostReserved(pcszName))
+    {
+        if (isGuest)
+            rc = VERR_PERMISSION_DENIED;
+        else
+            fFlags |= GUEST_PROP_F_RDONLYGUEST;
+    }
     if (rc == VINF_SUCCESS)
     {

trunk/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp

@@ -464 +464 @@
         { "Green", "gone out...", "", false, false, false },
         { "Green", "gone out...", "", true, false, false },
+        { "/VirtualBox/GuestAdd/SharedFolders/MountDir", "test", "", false, true, false },
+        { "/VirtualBox/HostInfo/VRDP/Client/1/Name", "test", "", false, false, false },
+        { "/VirtualBox/GuestAdd/SharedFolders/MountDir", "test", "", true, true, true },
+        { "/VirtualBox/HostInfo/VRDP/Client/1/Name", "test", "TRANSRESET", true, true, true },
     };
 
@@ -662 +666 @@
     { "Green\0Go!\0READONLY", sizeof("Green\0Go!\0READONLY") },
     { "Blue\0What on earth...?\0", sizeof("Blue\0What on earth...?\0") },
+    { "/VirtualBox/GuestAdd/SharedFolders/MountDir\0test\0RDONLYGUEST",
+      sizeof("/VirtualBox/GuestAdd/SharedFolders/MountDir\0test\0RDONLYGUEST") },
+    { "/VirtualBox/HostInfo/VRDP/Client/1/Name\0test\0TRANSIENT, RDONLYGUEST, TRANSRESET",
+      sizeof("/VirtualBox/HostInfo/VRDP/Client/1/Name\0test\0TRANSIENT, RDONLYGUEST, TRANSRESET") },
     { "Red\0\0", sizeof("Red\0\0") },
     { "Amber\0\0", sizeof("Amber\0\0") },