Changeset 85002 in vbox

Timestamp:

Jun 30, 2020 9:34:16 AM (5 years ago)

Author:

vboxsync

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

138900

Message:

DnD: More work on path conversion / validation.

Location:

trunk

Files:

• include/VBox/GuestHost/DragAndDrop.h (modified) (1 diff)
• src/VBox/GuestHost/DragAndDrop/DnDPath.cpp (modified) (3 diffs)
• src/VBox/GuestHost/DragAndDrop/DnDURIList.cpp (modified) (2 diffs)
• src/VBox/GuestHost/DragAndDrop/DnDURIObject.cpp (modified) (1 diff)
• src/VBox/Main/src-client/GuestDnDSourceImpl.cpp (modified) (1 diff)

trunk/include/VBox/GuestHost/DragAndDrop.h

@@ -95 +95 @@
 bool DnDMIMENeedsDropDir(const char *pcszFormat, size_t cchFormatMax);
 
+int DnDPathValidate(const char *pcszPath, bool fMustExist);
+
+/** DnD path conversion flags. */
+typedef uint32_t DNDPATHCONVERTFLAGS;
+
+/** No flags specified.
+ *  This also will convert the path to the universal tansport style. */
+#define DNDPATHCONVERT_FLAGS_NONE                 0
+/** Converts the path to a OS-dependent path. */
+#define DNDPATHCONVERT_FLAGS_TO_NATIVE            RT_BIT(0)
+
+/** Mask of all valid DnD path conversion flags. */
+#define DNDPATHCONVERT_FLAGS_VALID_MASK           UINT32_C(0x1)
+
+int DnDPathConvert(char *pszPath, size_t cbPath, DNDPATHCONVERTFLAGS fFlags);
 int DnDPathSanitizeFilename(char *pszPath, size_t cbPath);
-int DnDPathSanitize(char *pszPath, size_t cbPath);
 
 /** DnDURIObject flags. */

trunk/src/VBox/GuestHost/DragAndDrop/DnDPath.cpp

@@ -23 +23 @@
 #include <VBox/GuestHost/DragAndDrop.h>
 
+#include <iprt/dir.h>
 #include <iprt/err.h>
+#include <iprt/file.h>
 #include <iprt/path.h>
 #include <iprt/string.h>
@@ -55 +57 @@
         '\0'
     };
-    ssize_t cReplaced = RTStrPurgeComplementSet(pszPath, s_uszValidRangePairs, '_' /* chReplacement */);
-    if (cReplaced < 0)
-        rc = VERR_INVALID_UTF8_ENCODING;
+    char *pszFilename = RTPathFilename(pszPath);
+    if (pszFilename)
+    {
+        ssize_t cReplaced = RTStrPurgeComplementSet(, s_uszValidRangePairs, '_' /* chReplacement */);
+        if (cReplaced < 0)
+            rc = VERR_INVALID_UTF8_ENCODING;
+    }
+    else
+        rc = VERR_INVALID_PARAMETER;
 #else
     RT_NOREF2(pszPath, cbPath);
@@ -64 +72 @@
 }
 
-int DnDPathSanitize(char *pszPath, size_t cbPath)
+/**
+ * Validates whether a given path matches our set of rules or not.
+ *
+ * @returns VBox status code.
+ * @param   pcszPath            Path to validate.
+ * @param   fMustExist          Whether the path to validate also must exist.
+ * @sa      shClTransferValidatePath().
+ */
+int DnDPathValidate(const char *pcszPath, bool fMustExist)
 {
-    /** @todo */
-    RT_NOREF2(pszPath, cbPath);
+    int rc = VINF_SUCCESS;
+
+    if (!strlen(pcszPath))
+        rc = VERR_INVALID_PARAMETER;
+
+    if (   RT_SUCCESS(rc)
+        && !RTStrIsValidEncoding(pcszPath))
+    {
+        rc = VERR_INVALID_UTF8_ENCODING;
+    }
+
+    if (   RT_SUCCESS(rc)
+        && RTStrStr(pcszPath, ".."))
+    {
+        rc = VERR_INVALID_PARAMETER;
+    }
+
+    if (   RT_SUCCESS(rc)
+        && fMustExist)
+    {
+        RTFSOBJINFO objInfo;
+        rc = RTPathQueryInfo(pcszPath, &objInfo, RTFSOBJATTRADD_NOTHING);
+        if (RT_SUCCESS(rc))
+        {
+            if (RTFS_IS_DIRECTORY(objInfo.Attr.fMode))
+            {
+                if (!RTDirExists(pcszPath)) /* Path must exist. */
+                    rc = VERR_PATH_NOT_FOUND;
+            }
+            else if (RTFS_IS_FILE(objInfo.Attr.fMode))
+            {
+                if (!RTFileExists(pcszPath)) /* File must exist. */
+                    rc = VERR_FILE_NOT_FOUND;
+            }
+            else /* Everything else (e.g. symbolic links) are not supported. */
+                rc = VERR_NOT_SUPPORTED;
+        }
+    }
+
+    return rc;
+}
+
+/**
+ * Converts a DnD path.
+ *
+ * @returns VBox status code.
+ * @param   pszPath             Path to convert.
+ * @param   cbPath              Size (in bytes) of path to convert.
+ * @param   fFlags              Conversion flags of type DNDPATHCONVERT_FLAGS_.
+ */
+int DnDPathConvert(char *pszPath, size_t cbPath, DNDPATHCONVERTFLAGS fFlags)
+{
+    RT_NOREF(cbPath);
+    AssertReturn(!(fFlags & ~DNDPATHCONVERT_FLAGS_VALID_MASK), VERR_INVALID_FLAGS);
+
+#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
+    if (fFlags & DNDPATHCONVERT_FLAGS_TO_NATIVE)
+        RTPathChangeToDosSlashes(pszPath, true);
+    else
+#else
+    RT_NOREF(fFlags);
+#endif
+    {
+        RTPathChangeToUnixSlashes(pszPath, true /* fForce */);
+    }
+
     return VINF_SUCCESS;
 }

trunk/src/VBox/GuestHost/DragAndDrop/DnDURIList.cpp

@@ -385 +385 @@
                                   : pszFileName - pszSrcPath;
                 char *pszDstPath = &pszSrcPath[cchDstBase];
-                rc = DnDPathSanitize(pszDstPath, strlen(pszDstPath));
+                rc = DnDPathConvert(pszDstPath, strlen(pszDstPath), DNDPATHCONVERT_FLAGS_NONE);
                 if (RT_SUCCESS(rc))
                 {
@@ -499 +499 @@
         if (pszFilePath)
         {
-            rc = DnDPathSanitize(pszFilePath, strlen(pszFilePath));
+            rc = DnDPathConvert(pszFilePath, strlen(pszFilePath), DNDPATHCONVERT_FLAGS_NONE);
             if (RT_SUCCESS(rc))
             {

trunk/src/VBox/GuestHost/DragAndDrop/DnDURIObject.cpp

@@ -170 +170 @@
     {
         AssertReturn(m_strPathAbs.isNotEmpty(), VERR_INVALID_PARAMETER);
-        rc = DnDPathSanitize(m_strPathAbs.mutableRaw(), m_strPathAbs.capacity());
+        rc = DnDPathConvert(m_strPathAbs.mutableRaw(), m_strPathAbs.capacity(), DNDPATHCONVERT_FLAGS_TO_NATIVE);
         if (RT_SUCCESS(rc))
         {

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

@@ -816 +816 @@
             }
 
-            rc = DnDPathSanitize(pszPathAbs, sizeof(pszPathAbs));
-            if (RT_FAILURE(rc))
-            {
-                LogFlowFunc(("Warning: Rebasing current file failed with rc=%Rrc\n", rc));
-                break;
-            }
-
-            LogRel2(("DnD: Absolute file path for guest file on the host is now '%s'\n", pszPathAbs));
-
             rc = pObj->Init(DnDURIObject::Type_File, pszPathAbs);
             if (RT_SUCCESS(rc))