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

Timestamp:

Dec 15, 2011 11:33:47 AM (13 years ago)

Author:

vboxsync

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

75420

Message:

more symlink stuff

Location:

trunk/src/VBox/HostServices/SharedFolders

Files:

• service.cpp (modified) (1 diff)
• vbsf.cpp (modified) (18 diffs)

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

@@ -244 +244 @@
             else
             {
-                pszFolderName = (char*)RTStrAlloc(cbFolderName);
+                pszFolderName = (char*)RTStrAlloc(cbFolderName + 1);
                 AssertReturn(pszFolderName, VERR_NO_MEMORY);
 
-                rc = SSMR3GetStrZ(pSSM, mapping.pszFolderName, cbFolderName);
+                rc = SSMR3GetStrZ(pSSM, pszFolderName, cbFolderName + 1);
                 AssertRCReturn(rc, rc);
                 mapping.pszFolderName = pszFolderName;

trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp

@@ -42 +42 @@
 #endif
 
-// never follow symbolic links */
-//#define SHFL_RT_LINK(pClient) ((pClient)->fu32Flags & SHFL_CF_SYMLINKS ? RTPATH_F_ON_LINK : RTPATH_F_FOLLOW_LINK)
-#define SHFL_RT_LINK(pClient) (RTPATH_F_ON_LINK)
-
 /**
  * @todo find a better solution for supporting the execute bit for non-windows
@@ -139 +135 @@
     strcat(pDirEntry->szName, szWildCard);
 
-    rc = RTDirOpenFiltered(&hSearch, pDirEntry->szName, RTDIRFILTER_WINNT, RTDIROPENFILTERED_FLAGS_NO_SYMLINKS);
+    rc = RTDirOpenFiltered(&hSearch, pDirEntry->szName, RTDIRFILTER_WINNT, RTDIROPEN_FLAGS_NO_SYMLINKS);
     *(pszStartComponent-1) = RTPATH_DELIMITER;
     if (RT_FAILURE(rc))
@@ -148 +144 @@
         size_t cbDirEntrySize = cbDirEntry;
 
-        rc = RTDirReadEx(hSearch, pDirEntry, &cbDirEntrySize, RTFSOBJATTRADD_NOTHING, SHFL_RT_LINK(pClient));
+        rc = RTDirReadEx(hSearch, pDirEntry, &cbDirEntrySize, RTFSOBJATTRADD_NOTHING,
+                         RTPATH_F_ON_LINK | RTPATH_F_NO_SYMLINKS);
         if (rc == VERR_NO_MORE_FILES)
             break;
@@ -426 +423 @@
     if (RT_SUCCESS(rc))
     {
-        /* When the host file system is case sensitive and the guest expects a case insensitive fs, then problems can occur */
+        /* When the host file system is case sensitive and the guest expects
+         * a case insensitive fs, then problems can occur */
         if (     vbsfIsHostMappingCaseSensitive(root)
             &&  !vbsfIsGuestMappingCaseSensitive(root))
@@ -435 +433 @@
             if (fWildCard || fPreserveLastComponent)
             {
-                /* strip off the last path component, that has to be preserved: contains the wildcard(s) or a 'rename' target. */
+                /* strip off the last path component, that has to be preserved:
+                 * contains the wildcard(s) or a 'rename' target. */
                 size_t cb = strlen(pszFullPath);
                 char *pszSrc = pszFullPath + cb - 1;
@@ -470 +469 @@
 
             /** @todo don't check when creating files or directories; waste of time */
-            rc = RTPathQueryInfoEx(pszFullPath, &info, RTFSOBJATTRADD_NOTHING, SHFL_RT_LINK(pClient));
+            rc = RTPathQueryInfoEx(pszFullPath, &info, RTFSOBJATTRADD_NOTHING,
+                                   RTPATH_F_ON_LINK | RTPATH_F_NO_SYMLINKS);
             if (rc == VERR_FILE_NOT_FOUND || rc == VERR_PATH_NOT_FOUND)
             {
@@ -484 +484 @@
                     {
                         *pszSrc = 0;
-                        rc = RTPathQueryInfoEx(pszFullPath, &info, RTFSOBJATTRADD_NOTHING, SHFL_RT_LINK(pClient));
+                        rc = RTPathQueryInfoEx(pszFullPath, &info, RTFSOBJATTRADD_NOTHING,
+                                               RTPATH_F_ON_LINK | RTPATH_F_NO_SYMLINKS);
                         *pszSrc = RTPATH_DELIMITER;
                         if (rc == VINF_SUCCESS)
@@ -520 +521 @@
                             fEndOfString = false;
                             *pszEnd = 0;
-                            rc = RTPathQueryInfoEx(pszSrc, &info, RTFSOBJATTRADD_NOTHING, SHFL_RT_LINK(pClient));
+                            rc = RTPathQueryInfoEx(pszSrc, &info, RTFSOBJATTRADD_NOTHING,
+                                                   RTPATH_F_ON_LINK | RTPATH_F_NO_SYMLINKS);
                             Assert(rc == VINF_SUCCESS || rc == VERR_FILE_NOT_FOUND || rc == VERR_PATH_NOT_FOUND);
                         }
@@ -860 +862 @@
 
             /** @todo Possible race left here. */
-            if (RT_SUCCESS(RTPathQueryInfoEx(pszPath, &info, RTFSOBJATTRADD_NOTHING, SHFL_RT_LINK(pClient))))
+            if (RT_SUCCESS(RTPathQueryInfoEx(pszPath, &info, RTFSOBJATTRADD_NOTHING,
+                                             RTPATH_F_ON_LINK | RTPATH_F_NO_SYMLINKS)))
             {
 #ifdef RT_OS_WINDOWS
@@ -1032 +1035 @@
             /* Open the directory now */
             rc = RTDirOpenFiltered(&pHandle->dir.Handle, pszPath,
-                                   RTDIRFILTER_NONE, RTDIROPENFILTERED_FLAGS_NO_SYMLINKS);
+                                   RTDIRFILTER_NONE, RTDIROPEN_FLAGS_NO_SYMLINKS);
             if (RT_SUCCESS(rc))
             {
@@ -1130 +1133 @@
  * @retval  pParms->Info   On success, information returned about the file
  */
-static int vbsfLookupFile(SHFLCLIENTDATA *pClient, char *pszPath, SHFLCREATEPARMS *pParms)
+static int vbsfLookupFile(SHFLCLIENTDATA *pClient, SHFLROOT root, char *pszPath, SHFLCREATEPARMS *pParms)
 {
     RTFSOBJINFO info;
     int rc;
 
-    rc = RTPathQueryInfoEx(pszPath, &info, RTFSOBJATTRADD_NOTHING, SHFL_RT_LINK(pClient));
+    char szRealPath[RTPATH_MAX + 1];
+    const char *pszRoot = vbsfMappingsQueryHostRoot(root);
+    AssertReturn(pszRoot, VERR_INVALID_PARAMETER);
+    rc = RTPathReal(pszPath, szRealPath, sizeof(szRealPath));
+    AssertRCReturn(rc, rc);
+    if (!RTPathStartsWith(szRealPath, pszRoot))
+        return VERR_TOO_MANY_SYMLINKS;
+
+    rc = RTPathQueryInfoEx(pszPath, &info, RTFSOBJATTRADD_NOTHING,
+                           RTPATH_F_ON_LINK | RTPATH_F_NO_SYMLINKS);
     LogFlow(("SHFL_CF_LOOKUP\n"));
     /* Client just wants to know if the object exists. */
@@ -1234 +1246 @@
         if (BIT_FLAG(pParms->CreateFlags, SHFL_CF_LOOKUP))
         {
-            rc = vbsfLookupFile(pClient, pszFullPath, pParms);
+            rc = vbsfLookupFile(pClient, root, pszFullPath, pParms);
         }
         else
@@ -1241 +1253 @@
             RTFSOBJINFO info;
 
-            rc = RTPathQueryInfoEx(pszFullPath, &info, RTFSOBJATTRADD_NOTHING, SHFL_RT_LINK(pClient));
+            rc = RTPathQueryInfoEx(pszFullPath, &info, RTFSOBJATTRADD_NOTHING,
+                                   RTPATH_F_ON_LINK | RTPATH_F_NO_SYMLINKS);
             LogFlow(("RTPathQueryInfoEx returned %Rrc\n", rc));
 
@@ -1295 +1308 @@
             {
                 if (BIT_FLAG(pParms->CreateFlags, SHFL_CF_DIRECTORY))
-                {
                     rc = vbsfOpenDir(pClient, pszFullPath, pParms);
-                }
                 else
-                {
                     rc = vbsfOpenFile(pClient, pszFullPath, pParms);
-                }
             }
             else
@@ -1505 +1514 @@
     PRTDIR         DirHandle;
     bool           fUtf8;
-
+    
     fUtf8 = BIT_FLAG(pClient->fu32Flags, SHFL_CF_UTF8) != 0;
 
@@ -1546 +1555 @@
             if (RT_SUCCESS(rc))
             {
+#if 0
+                const char *pszRoot = vbsfMappingsQueryHostRoot(root);
+                if (!pszRoot)
+                {
+                    rc = VERR_INVALID_PARAMETER;
+                    goto end;
+                }
+                char szRealPath[RTPATH_MAX + 1];
+                rc = RTPathReal(pszFullPath, szRealPath, sizeof(szRealPath));
+                if (RT_FAILURE(rc))
+                    goto end;
+                if (!RTPathStartsWith(szRealPath, pszRoot))
+                {
+                    rc = VERR_TOO_MANY_SYMLINKS;
+                    goto end;
+                }
+#endif
                 rc = RTDirOpenFiltered(&pHandle->dir.SearchHandle, pszFullPath,
-                                       RTDIRFILTER_WINNT, RTDIROPENFILTERED_FLAGS_NO_SYMLINKS);
+                                       RTDIRFILTER_WINNT, RTDIROPEN_FLAGS_NO_SYMLINKS);
 
                 /* free the path string */
@@ -1576 +1602 @@
             pDirEntry = pDirEntryOrg;
 
-            rc = RTDirReadEx(DirHandle, pDirEntry, &cbDirEntrySize, RTFSOBJATTRADD_NOTHING, SHFL_RT_LINK(pClient));
+            rc = RTDirReadEx(DirHandle, pDirEntry, &cbDirEntrySize, RTFSOBJATTRADD_NOTHING,
+                             RTPATH_F_ON_LINK | RTPATH_F_NO_SYMLINKS);
             if (rc == VERR_NO_MORE_FILES)
             {
@@ -2295 +2322 @@
     {
         RTFSOBJINFO info;
-        rc = RTPathQueryInfoEx(pszFullNewPath, &info, RTFSOBJATTRADD_NOTHING, SHFL_RT_LINK(pClient));
+        rc = RTPathQueryInfoEx(pszFullNewPath, &info, RTFSOBJATTRADD_NOTHING,
+                               RTPATH_F_ON_LINK | RTPATH_F_NO_SYMLINKS);
         if (RT_SUCCESS(rc))
             vbfsCopyFsObjInfoFromIprt(pInfo, &info);