Changeset 92880 in vbox

Timestamp:

Dec 13, 2021 11:16:44 AM (3 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Resolved @todo: Implemented mode handling and secure bit of GuestSession::directoryCreateTemp(), added testcases.

Location:

trunk/src/VBox

Files:

• Main/idl/VirtualBox.xidl (modified) (1 diff)
• Main/include/GuestSessionImpl.h (modified) (1 diff)
• Main/src-client/GuestSessionImpl.cpp (modified) (4 diffs)
• ValidationKit/tests/additions/tdAddGuestCtrl.py (modified) (1 diff)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -14369 +14369 @@
           OS.
 
-          This parameter is ignore if the @a secure parameter is set to @c true.
+          This parameter is ignored if the @a secure parameter is set to @c true.
           <note>It is strongly recommended to use 0700.</note>
         </desc>

trunk/src/VBox/Main/include/GuestSessionImpl.h

@@ -303 +303 @@
     int                     i_fileQuerySize(const Utf8Str &strPath, bool fFollowSymlinks, int64_t *pllSize, int *pGuestRc);
     int                     i_fsCreateTemp(const Utf8Str &strTemplate, const Utf8Str &strPath, bool fDirectory,
-                                           Utf8Str &strName, int *pGuestRc);
+                                           Utf8Str &strName, uint32_t fMode, bool fSecure, int *pGuestRc);
     int                     i_fsQueryInfo(const Utf8Str &strPath, bool fFollowSymlinks, GuestFsObjData &objData, int *pGuestRc);
     const GuestCredentials &i_getCredentials(void);

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

@@ -1082 +1082 @@
 }
 
+/**
+ * Creates a temporary directory / file on the guest.
+ *
+ * @returns VBox status code.
+ * @returns VERR_GSTCTL_GUEST_ERROR on received guest error.
+ * @param   strTemplate         Name template to use.
+ *                              \sa RTDirCreateTemp / RTDirCreateTempSecure.
+ * @param   strPath             Path where to create the temporary directory / file.
+ * @param   fDirectory          Whether to create a temporary directory or file.
+ * @param   strName             Where to return the created temporary name on success.
+ * @param   fMode               File mode to use for creation (octal).
+ * @param   fSecure             Whether to perform a secure creation or not.
+ * @param   prcGuest            Guest rc, when returning VERR_GSTCTL_GUEST_ERROR.
+ */
 int GuestSession::i_fsCreateTemp(const Utf8Str &strTemplate, const Utf8Str &strPath, bool fDirectory, Utf8Str &strName,
-                                 int *prcGuest)
+                                 uint32_t fMode, bool fSecure, int *prcGuest)
 {
     AssertPtrReturn(prcGuest, VERR_INVALID_POINTER);
 
-    LogFlowThisFunc(("strTemplate=%s, strPath=%s, fDirectory=%RTbool\n",
-                     strTemplate.c_str(), strPath.c_str(), fDirectory));
+    LogFlowThisFunc(("strTemplate=%s, strPath=%s, fDirectory=%RTbool, fMode=%o, fSecure=%RTbool\n",
+                     strTemplate.c_str(), strPath.c_str(), fDirectory, fMode, fSecure));
 
     GuestProcessStartupInfo procInfo;
@@ -1103 +1117 @@
             procInfo.mArguments.push_back(Utf8Str("-t"));
             procInfo.mArguments.push_back(strPath);
+        }
+        /* Note: Secure flag and mode cannot be specified at the same time. */
+        if (fSecure)
+        {
+            procInfo.mArguments.push_back(Utf8Str("--secure"));
+        }
+        else
+        {
+            procInfo.mArguments.push_back(Utf8Str("--mode"));
+            procInfo.mArguments.push_back(Utf8Str("%o", fMode)); /* Octal mode. */
         }
         procInfo.mArguments.push_back("--"); /* strTemplate could be '--help'. */
@@ -3437 +3461 @@
                                           BOOL aSecure, com::Utf8Str &aDirectory)
 {
-    RT_NOREF(aMode, aSecure); /** @todo r=bird: WTF? */
-
     if (RT_UNLIKELY((aTemplateName.c_str()) == NULL || *(aTemplateName.c_str()) == '\0'))
         return setError(E_INVALIDARG, tr("No template specified"));
     if (RT_UNLIKELY((aPath.c_str()) == NULL || *(aPath.c_str()) == '\0'))
         return setError(E_INVALIDARG, tr("No directory name specified"));
+    if (!aSecure) /* Ignore what mode is specified when a secure temp thing needs to be created. */
+        if (RT_UNLIKELY(!(aMode & ~07777)))
+            return setError(E_INVALIDARG, tr("Mode invalid (must be specified in octal mode)"));
 
     HRESULT hrc = i_isStartedExternal();
@@ -3451 +3476 @@
 
     int rcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-    int vrc = i_fsCreateTemp(aTemplateName, aPath, true /* Directory */, aDirectory, &rcGuest);
+    int vrc = i_fsCreateTemp(aTemplateName, aPath, true /* Directory */, aDirectory, aMode, RT_BOOL(aSecure), &rcGuest);
     if (!RT_SUCCESS(vrc))
     {

trunk/src/VBox/ValidationKit/tests/additions/tdAddGuestCtrl.py

@@ -3542 +3542 @@
               tdTestResultFailure() ],
             [ tdTestDirCreateTemp(sTemplate = 'tmpXXXtst', sDirectory = self.oTstDrv.getGuestTempDir(oTestVm)),
-               tdTestResultFailure() ],
-            ## @todo test fSecure and pass weird fMode values once these parameters are implemented in the API.
+              tdTestResultFailure() ],
         ];
+
+        if self.oTstDrv.fpApiVer >= 7.0:
+            # Weird mode set.
+            atTests.extend([
+                [ tdTestDirCreateTemp(sTemplate = 'XXX', sDirectory = self.oTstDrv.getGuestTempDir(oTestVm), fMode = 0o42333),
+                  tdTestResultFailure() ]
+            ]);
+            # Same as working stuff above, but with a different mode set.
+            atTests.extend([
+                [ tdTestDirCreateTemp(sTemplate = 'X', sDirectory = self.oTstDrv.getGuestTempDir(oTestVm), fMode = 0o777),
+                  tdTestResultFailure() ],
+                [ tdTestDirCreateTemp(sTemplate = 'XX', sDirectory = self.oTstDrv.getGuestTempDir(oTestVm), fMode = 0o777),
+                  tdTestResultFailure() ],
+                [ tdTestDirCreateTemp(sTemplate = 'XXX', sDirectory = self.oTstDrv.getGuestTempDir(oTestVm), fMode = 0o777),
+                  tdTestResultFailure() ],
+                [ tdTestDirCreateTemp(sTemplate = 'XXXXXXX', sDirectory = self.oTstDrv.getGuestTempDir(oTestVm), fMode = 0o777),
+                  tdTestResultFailure() ],
+                [ tdTestDirCreateTemp(sTemplate = 'tmpXXXtst', sDirectory = self.oTstDrv.getGuestTempDir(oTestVm), fMode = 0o777),
+                  tdTestResultFailure() ],
+                [ tdTestDirCreateTemp(sTemplate = 'tmpXXXtst', sDirectory = self.oTstDrv.getGuestTempDir(oTestVm), fMode = 0o777),
+                  tdTestResultFailure() ],
+                [ tdTestDirCreateTemp(sTemplate = 'tmpXXXtst', sDirectory = self.oTstDrv.getGuestTempDir(oTestVm), fMode = 0o777),
+                  tdTestResultFailure() ]
+            ]);
+            # Same as working stuff above, but with secure mode set.
+            atTests.extend([
+                [ tdTestDirCreateTemp(sTemplate = 'X', sDirectory = self.oTstDrv.getGuestTempDir(oTestVm), fSecure = True),
+                  tdTestResultFailure() ],
+                [ tdTestDirCreateTemp(sTemplate = 'XX', sDirectory = self.oTstDrv.getGuestTempDir(oTestVm), fSecure = True),
+                  tdTestResultFailure() ],
+                [ tdTestDirCreateTemp(sTemplate = 'XXX', sDirectory = self.oTstDrv.getGuestTempDir(oTestVm), fSecure = True),
+                  tdTestResultFailure() ],
+                [ tdTestDirCreateTemp(sTemplate = 'XXXXXXX', sDirectory = self.oTstDrv.getGuestTempDir(oTestVm), fSecure = True),
+                  tdTestResultFailure() ],
+                [ tdTestDirCreateTemp(sTemplate = 'tmpXXXtst', sDirectory = self.oTstDrv.getGuestTempDir(oTestVm),
+                                      fSecure = True),
+                  tdTestResultFailure() ],
+                [ tdTestDirCreateTemp(sTemplate = 'tmpXXXtst', sDirectory = self.oTstDrv.getGuestTempDir(oTestVm),
+                                      fSecure = True),
+                  tdTestResultFailure() ],
+                [ tdTestDirCreateTemp(sTemplate = 'tmpXXXtst', sDirectory = self.oTstDrv.getGuestTempDir(oTestVm),
+                                      fSecure = True),
+                  tdTestResultFailure() ]
+            ]);
 
         fRc = True;