Changeset 98789 in vbox

Timestamp:

Feb 28, 2023 4:34:10 PM (2 years ago)

Author:

vboxsync

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

156100

Message:

Guest Control: Made temporary directory / file creation using dedicated commands also pass the test driver. bugref:9783

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxService/VBoxServiceControlSession.cpp (modified) (2 diffs)
• Main/src-client/GuestCtrlPrivate.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp

@@ -1909 +1909 @@
         if (!(fFlags & ~GSTCTL_CREATETEMP_F_VALID_MASK))
         {
-            const char *pszWhat = fMode & GSTCTL_CREATETEMP_F_DIRECTORY ? "directory" : "file";
-            VGSvcVerbose(4, "Creating temporary %s (szTemplate='%s', fFlags=%#x), rc=%Rrc\n", pszWhat, szTemplate, fFlags, rc);
-
-            bool const fSecure = RT_BOOL(fMode & GSTCTL_CREATETEMP_F_SECURE);
-            if (fMode & GSTCTL_CREATETEMP_F_DIRECTORY)
+            const char *pszWhat = fFlags & GSTCTL_CREATETEMP_F_DIRECTORY ? "directory" : "file";
+
+            /* Validate that the template is as IPRT requires (asserted by IPRT). */
+            if (   RTPathHasPath(szTemplate)
+                || (   !strstr(szTemplate, "XXX")
+                    && szTemplate[strlen(szTemplate) - 1] != 'X'))
             {
-                if (fSecure)
-                    rc = RTDirCreateTempSecure(szTemplate); /* File mode is fixed to 0700. */
+                VGSvcError("createtemp: Template '%s' should contain a file name with no path and at least three consecutive 'X' characters or ending in 'X'\n",
+                            szTemplate);
+                rc = VERR_INVALID_PARAMETER;
+            }
+
+            if (   RT_SUCCESS(rc)
+                && szPath[0] != '\0' && !RTPathStartsWithRoot(szPath))
+            {
+                VGSvcError("createtemp: Path '%s' must be absolute\n", szPath);
+                rc = VERR_INVALID_PARAMETER;
+            }
+
+            if (RT_SUCCESS(rc))
+            {
+                char szTemplateWithPath[RTPATH_MAX] = "";
+                if (szPath[0] != '\0')
+                {
+                    rc = RTStrCopy(szTemplateWithPath, sizeof(szTemplateWithPath), szPath);
+                    if (RT_FAILURE(rc))
+                    {
+                        VGSvcError("createtemp: Path '%s' too long\n", szPath);
+                        rc = VERR_INVALID_PARAMETER;
+                    }
+                }
                 else
-                    rc = RTDirCreateTemp(szTemplate, fMode);
-            }
-            else /* File */
-            {
-                if (fSecure)
-                    rc = RTFileCreateTempSecure(szTemplate); /* File mode is fixed to 0700. */
-                else
-                    rc = RTFileCreateTemp(szTemplate, fMode);
+                {
+                    rc = RTPathTemp(szTemplateWithPath, sizeof(szTemplateWithPath));
+                    if (RT_FAILURE(rc))
+                    {
+                        VGSvcError("createtemp: Failed to get the temporary directory (%Rrc)", rc);
+                        rc = VERR_INVALID_PARAMETER;
+                    }
+                }
+
+                if (RT_SUCCESS(rc))
+                {
+                    rc = RTPathAppend(szTemplateWithPath, sizeof(szTemplateWithPath), szTemplate);
+                    if (RT_FAILURE(rc))
+                    {
+                        VGSvcError("createtemp: Template '%s' too long for path\n", szTemplate);
+                        rc = VERR_INVALID_PARAMETER;
+                    }
+                    else
+                    {
+                        bool const fSecure = RT_BOOL(fFlags & GSTCTL_CREATETEMP_F_SECURE);
+                        if (fFlags & GSTCTL_CREATETEMP_F_DIRECTORY)
+                        {
+                            if (fSecure)
+                                rc = RTDirCreateTempSecure(szTemplateWithPath); /* File mode is fixed to 0700. */
+                            else
+                                rc = RTDirCreateTemp(szTemplate, fMode);
+                        }
+                        else /* File */
+                        {
+                            if (fSecure)
+                                rc = RTFileCreateTempSecure(szTemplateWithPath); /* File mode is fixed to 0700. */
+                            else
+                                rc = RTFileCreateTemp(szTemplate, fMode);
+                        }
+
+                        VGSvcVerbose(3, "Creating temporary %s (szTemplate='%s', fFlags=%#x, fMode=%#x) -> rc=%Rrc\n",
+                                     pszWhat, szTemplate, fFlags, fMode, rc);
+                    }
+                }
             }
         }
@@ -1950 +2004 @@
         VbglR3GuestCtrlMsgSkip(pHostCtx->uClientID, rc, UINT32_MAX);
     }
-    VGSvcVerbose(5, "Creating temporary file/directory returned rc=%Rrc\n", rc);
+    VGSvcVerbose(3, "Creating temporary file/directory returned rc=%Rrc\n", rc);
     return rc;
 }

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

@@ -77 +77 @@
             break;
 
+        case VERR_INVALID_PARAMETER:
+            strErr.printf(tr("Invalid parameter specified"));
+            break;
+
         case VERR_INVALID_VM_HANDLE:
             strErr.printf(tr("VMM device is not available (is the VM running?)"));
@@ -111 +115 @@
         case VERR_NOT_FOUND:
             strErr.printf(tr("The guest execution service is not ready (yet)"));
+            break;
+
+        case VERR_NOT_SUPPORTED:
+            strErr.printf(tr("Specified mode or flag is not supported on the guest"));
             break;