Changeset 97553 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Nov 15, 2022 4:29:49 PM (2 years ago)

Author:

vboxsync

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

154584

Message:

Guest Control/Main: Some more fixes wrt resolving host sources which are symbolic links. bugref:10286

File:

• trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (modified) (5 diffs)

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

@@ -1614 +1614 @@
         if (strErrorInfo.isEmpty())
             strErrorInfo.printf(tr("Failed with %Rrc"), vrc);
-        hrc = setProgressErrorMsg(VBOX_E_IPRT_ERROR, strErrorInfo);
+        setProgressErrorMsg(VBOX_E_IPRT_ERROR, strErrorInfo);
     }
 
@@ -1973 +1973 @@
 
             RTFSOBJINFO srcFsObjInfo;
-            vrc = RTPathQueryInfoEx(strSrc.c_str(), &srcFsObjInfo, RTFSOBJATTRADD_NOTHING,
-                                    fFollowSymlinks ? RTPATH_F_FOLLOW_LINK : RTPATH_F_ON_LINK /* fFlags */);
+            vrc = RTPathQueryInfoEx(strSrc.c_str(), &srcFsObjInfo, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK /* fFlags */);
             if (RT_FAILURE(vrc))
             {
@@ -1981 +1980 @@
             }
 
-            if (RTFS_IS_DIRECTORY(srcFsObjInfo.Attr.fMode))
-            {
-                if (itSrc->enmType != FsObjType_Directory)
-                {
-                    strErrorInfo.printf(tr("Host source is not a file: %s"), strSrc.c_str());
-                    vrc = VERR_NOT_A_FILE;
+            switch (srcFsObjInfo.Attr.fMode & RTFS_TYPE_MASK)
+            {
+                case RTFS_TYPE_DIRECTORY:
+                {
+                    if (itSrc->enmType != FsObjType_Directory)
+                    {
+                        strErrorInfo.printf(tr("Host source \"%s\" is not a file (is a directory)"), strSrc.c_str());
+                        vrc = VERR_NOT_A_FILE;
+                    }
                     break;
                 }
-            }
-            else
-            {
-                if (itSrc->enmType == FsObjType_Directory)
-                {
-                    strErrorInfo.printf(tr("Host source is not a directory: %s"), strSrc.c_str());
-                    vrc = VERR_NOT_A_DIRECTORY;
+
+                case RTFS_TYPE_FILE:
+                {
+                    if (itSrc->enmType == FsObjType_Directory)
+                    {
+                        strErrorInfo.printf(tr("Host source \"%s\" is not a directory (is a file)"), strSrc.c_str());
+                        vrc = VERR_NOT_A_DIRECTORY;
+                    }
                     break;
                 }
-            }
+
+                case RTFS_TYPE_SYMLINK:
+                {
+                    if (!fFollowSymlinks)
+                    {
+                        strErrorInfo.printf(tr("Host source \"%s\" is a symbolic link"), strSrc.c_str());
+                        vrc = VERR_IS_A_SYMLINK;
+                        break;
+                    }
+
+                    char szPathReal[RTPATH_MAX];
+                    vrc = RTPathReal(strSrc.c_str(), szPathReal, sizeof(szPathReal));
+                    if (RT_SUCCESS(vrc))
+                    {
+                        vrc = RTPathQueryInfoEx(szPathReal, &srcFsObjInfo, RTFSOBJATTRADD_NOTHING, RTPATH_F_FOLLOW_LINK);
+                        if (RT_SUCCESS(vrc))
+                        {
+                            LogRel2(("Guest Control: Host source symbolic link '%s' -> '%s' (%s)\n",
+                                     strSrc.c_str(), szPathReal,
+                                     GuestBase::fsObjTypeToStr(GuestBase::fileModeToFsObjType(srcFsObjInfo.Attr.fMode))));
+
+                            /* We want to keep the symbolic link name of the source instead of the target pointing to,
+                             * so don't touch the source's name here. */
+                            itSrc->enmType = GuestBase::fileModeToFsObjType(srcFsObjInfo.Attr.fMode);
+                        }
+                        else
+                        {
+                            strErrorInfo.printf(tr("Querying symbolic link info for host source \"%s\" failed"), strSrc.c_str());
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        strErrorInfo.printf(tr("Resolving symbolic link for host source \"%s\" failed"), strSrc.c_str());
+                        break;
+                    }
+                    break;
+                }
+
+                default:
+                    LogRel2(("Guest Control: Warning: Unknown host file system type %#x for source \"%s\", skipping\n",
+                             srcFsObjInfo.Attr.fMode & RTFS_TYPE_MASK, strSrc.c_str()));
+                    break;
+            }
+
+            if (RT_FAILURE(vrc))
+                break;
 
             FsList *pFsList = NULL;
@@ -2022 +2071 @@
                             break;
 
+                        case FsObjType_Symlink:
+                            AssertFailed(); /* Should never get here, as we do the resolving above. */
+                            break;
+
                         default:
-                            LogRel2(("Guest Control: Warning: Unknown guest host system type %#x for source \"%s\", skipping\n",
+                            LogRel2(("Guest Control: Warning: Unknown source type %#x for host source \"%s\", skipping\n",
                                      itSrc->enmType, strSrc.c_str()));
                             break;
@@ -2086 +2139 @@
         if (strErrorInfo.isEmpty())
             strErrorInfo.printf(tr("Failed with %Rrc"), vrc);
-        hrc = setProgressErrorMsg(VBOX_E_IPRT_ERROR, strErrorInfo);
+        setProgressErrorMsg(VBOX_E_IPRT_ERROR, strErrorInfo);
     }