Changeset 6402 in vbox

Timestamp:

Jan 21, 2008 11:09:00 AM (17 years ago)

Author:

vboxsync

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

27354

Message:

more places to check if writing is allowed

File:

• trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp (modified) (5 diffs)

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

@@ -1019 +1019 @@
             }
 
+            rc = VINF_SUCCESS;
+
             /* write access requested? */
             if (pParms->CreateFlags & (  SHFL_CF_ACT_REPLACE_IF_EXISTS
@@ -1029 +1031 @@
                 rc = vbsfMappingsQueryWritable (pClient, root, &fWritable);
                 if (RT_FAILURE(rc) || !fWritable)
-                    return VERR_WRITE_PROTECT;
-            }
-
-            if (BIT_FLAG(pParms->CreateFlags, SHFL_CF_DIRECTORY))
-            {
-                rc = vbsfOpenDir (pszFullPath, pParms);
-            }
-            else
-            {
-                rc = vbsfOpenFile (pszFullPath, pParms);
+                    rc = VERR_WRITE_PROTECT;
+            }
+
+            if (RT_SUCCESS(rc))
+            {
+                if (BIT_FLAG(pParms->CreateFlags, SHFL_CF_DIRECTORY))
+                    rc = vbsfOpenDir (pszFullPath, pParms);
+                else
+                    rc = vbsfOpenFile (pszFullPath, pParms);
             }
         }
@@ -1388 +1389 @@
     }
 
+    /* is the guest allowed to write to this share? */
+    bool fWritable;
+    rc = vbsfMappingsQueryWritable (pClient, root, &fWritable);
+    if (RT_FAILURE(rc) || !fWritable)
+        return VERR_WRITE_PROTECT;
+
     *pcbBuffer  = 0;
     pSFDEntry   = (RTFSOBJINFO *)pBuffer;
@@ -1687 +1694 @@
 
     rc = vbsfBuildFullPath (pClient, root, pPath, cbPath, &pszFullPath, NULL);
-
     if (VBOX_SUCCESS (rc))
     {
-        if (flags & SHFL_REMOVE_FILE)
-            rc = RTFileDelete(pszFullPath);
-        else
-            rc = RTDirRemove(pszFullPath);
+        /* is the guest allowed to write to this share? */
+        bool fWritable;
+        rc = vbsfMappingsQueryWritable (pClient, root, &fWritable);
+        if (RT_FAILURE(rc) || !fWritable)
+            rc = VERR_WRITE_PROTECT;
+
+        if (VBOX_SUCCESS (rc))
+        {
+            if (flags & SHFL_REMOVE_FILE)
+                rc = RTFileDelete(pszFullPath);
+            else
+                rc = RTDirRemove(pszFullPath);
+        }
 
 #ifndef DEBUG_dmik
@@ -1733 +1748 @@
     {
         Log(("Rename %s to %s\n", pszFullPathSrc, pszFullPathDest));
-        if (flags & SHFL_RENAME_FILE)
-        {
-            rc = RTFileMove(pszFullPathSrc, pszFullPathDest, (flags & SHFL_RENAME_REPLACE_IF_EXISTS) ? RTFILEMOVE_FLAGS_REPLACE : 0);
-        }
-        else
-        {
-            /* NT ignores the REPLACE flag and simply return and already exists error. */
-            rc = RTDirRename(pszFullPathSrc, pszFullPathDest, (flags & SHFL_RENAME_REPLACE_IF_EXISTS) ? RTPATHRENAME_FLAGS_REPLACE : 0);
+
+        /* is the guest allowed to write to this share? */
+        bool fWritable;
+        rc = vbsfMappingsQueryWritable (pClient, root, &fWritable);
+        if (RT_FAILURE(rc) || !fWritable)
+            rc = VERR_WRITE_PROTECT;
+
+        if (VBOX_SUCCESS (rc))
+        {
+            if (flags & SHFL_RENAME_FILE)
+            {
+                rc = RTFileMove(pszFullPathSrc, pszFullPathDest, (flags & SHFL_RENAME_REPLACE_IF_EXISTS) ? RTFILEMOVE_FLAGS_REPLACE : 0);
+            }
+            else
+            {
+                /* NT ignores the REPLACE flag and simply return and already exists error. */
+                rc = RTDirRename(pszFullPathSrc, pszFullPathDest, (flags & SHFL_RENAME_REPLACE_IF_EXISTS) ? RTPATHRENAME_FLAGS_REPLACE : 0);
+            }
         }