Changeset 70890 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Feb 7, 2018 2:05:43 PM (7 years ago)

Author:

vboxsync

Message:

IPRT: dir.c,dir-posix.cpp,direnum-nt.cpp: Implemented RTDIR_F_NO_FOLLOW on posix, adjusted NT implementation and documented the VERR_IS_A_SYMLINK return code for the relevant APIs.

Location:

trunk/src/VBox/Runtime/r3

Files:

• dir.cpp (modified) (3 diffs)
• nt/direnum-r3-nt.cpp (modified) (1 diff)
• posix/dir-posix.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/r3/dir.cpp

@@ -527 +527 @@
      * As a sideeffect we also validate the path here.
      */
-    char szRealPath[RTPATH_MAX + 1];
-    int rc;
+    char   szRealPath[RTPATH_MAX + 1];
+    int    rc;
     size_t cbFilter;                    /* includes '\0' (thus cb and not cch). */
     size_t cucFilter0;                  /* includes U+0. */
+    bool   fDirSlash = false;
     if (!pszFilter)
     {
+        /* Note! RTPathAbs currently strips trailing slashes, so we have
+           to inspect pszPath to figure it out. */
+        if (*pszPath != '\0')
+        {
+            const char *pszLast = strchr(pszPath, '\0') - 1;
+            if (RTPATH_IS_SLASH(*pszLast))
+                fDirSlash = true;
+        }
+
         cbFilter = cucFilter0 = 0;
         rc = RTPathAbs(pszPath, szRealPath, sizeof(szRealPath) - 1);
@@ -553 +563 @@
         else
             rc = RTPathReal(".", szRealPath, sizeof(szRealPath) - 1);
+        fDirSlash = true;
     }
     if (RT_FAILURE(rc))
@@ -618 +629 @@
             break;
     }
-    pDir->cchPath = cchRealPath;
-    pDir->pszPath = (char *)memcpy(pb, szRealPath, cchRealPath + 1);
+    pDir->cchPath       = cchRealPath;
+    pDir->pszPath       = (char *)memcpy(pb, szRealPath, cchRealPath + 1);
     Assert(pb - (uint8_t *)pDir + cchRealPath + 1 <= cbAllocated);
-    pDir->pszName = NULL;
-    pDir->cchName = 0;
-    pDir->fFlags  = fFlags;
-    pDir->fDataUnread = false;
+    pDir->pszName       = NULL;
+    pDir->cchName       = 0;
+    pDir->fFlags        = fFlags;
+    pDir->fDirSlash     = fDirSlash;
+    pDir->fDataUnread   = false;
 
     /*

trunk/src/VBox/Runtime/r3/nt/direnum-r3-nt.cpp

@@ -121 +121 @@
         uint32_t            fOptions         = FILE_DIRECTORY_FILE | FILE_OPEN_FOR_BACKUP_INTENT | FILE_SYNCHRONOUS_IO_NONALERT;
         int fReparsePoints = g_fReparsePoints;
-        if (fReparsePoints != 0 && (pDir->fFlags & RTDIR_F_NO_FOLLOW))
+        if (   fReparsePoints != 0
+            && (pDir->fFlags & RTDIR_F_NO_FOLLOW)
+            && !pDir->fDirSlash)
             fOptions |= FILE_OPEN_REPARSE_POINT;
 

trunk/src/VBox/Runtime/r3/posix/dir-posix.cpp

@@ -36 +36 @@
 #include <fcntl.h>
 #include <dirent.h>
+#include <dlfcn.h>
 #include <stdio.h>
 
@@ -42 +43 @@
 
 #include <iprt/alloca.h>
+#include <iprt/asm.h>
 #include <iprt/assert.h>
 #include <iprt/err.h>
@@ -233 +235 @@
      * Convert to a native path and try opendir.
      */
+    char       *pszSlash = NULL;
     char const *pszNativePath;
-    int rc = rtPathToNative(&pszNativePath, pDir->pszPath, NULL);
+    int         rc;
+    if (   !(pDir->fFlags & RTDIR_F_NO_FOLLOW)
+        || pDir->fDirSlash
+        || pDir->cchPath <= 1)
+        rc = rtPathToNative(&pszNativePath, pDir->pszPath, NULL);
+    else
+    {
+        pszSlash = (char *)&pDir->pszPath[pDir->cchPath - 1];
+        *pszSlash = '\0';
+        rc = rtPathToNative(&pszNativePath, pDir->pszPath, NULL);
+    }
     if (RT_SUCCESS(rc))
     {
-        if (!(pDir->fFlags & RTDIR_F_NO_FOLLOW))
+        if (   !(pDir->fFlags & RTDIR_F_NO_FOLLOW)
+            || pDir->fDirSlash)
             pDir->pDir = opendir(pszNativePath);
         else
         {
-            AssertMsgFailed(("implement RTDIR_F_NO_FOLLOW\n"));
-            pDir->pDir = opendir(pszNativePath);
+            /*
+             * If we can get fdopendir() and have both O_NOFOLLOW and O_DIRECTORY,
+             * we will use open() to safely open the directory without following
+             * symlinks in the final component, and then use fdopendir to get a DIR
+             * from the file descriptor.
+             *
+             * If we cannot get that, we will use lstat() + opendir() as a fallback.
+             *
+             * We ASSUME that support for the O_NOFOLLOW and O_DIRECTORY flags is
+             * older than fdopendir().
+             */
+#if defined(O_NOFOLLOW) && defined(O_DIRECTORY)
+            /* Need to resolve fdopendir dynamically. */
+            typedef DIR * (*PFNFDOPENDIR)(int);
+            static PFNFDOPENDIR  s_pfnFdOpenDir = NULL;
+            static bool volatile s_fInitalized = false;
+
+            PFNFDOPENDIR pfnFdOpenDir = s_pfnFdOpenDir;
+            ASMCompilerBarrier();
+            if (s_fInitalized)
+            { /* likely */ }
+            else
+            {
+                pfnFdOpenDir = (PFNFDOPENDIR)dlsym(RTLD_DEFAULT, "fdopendir");
+                s_pfnFdOpenDir = pfnFdOpenDir;
+                ASMAtomicWriteBool(&s_fInitalized, true);
+            }
+
+            if (pfnFdOpenDir)
+            {
+                int fd = open(pszNativePath, O_RDONLY | O_DIRECTORY | O_NOFOLLOW, 0);
+                if (fd >= 0)
+                {
+                    pDir->pDir = pfnFdOpenDir(fd);
+                    if (RT_UNLIKELY(!pDir->pDir))
+                    {
+                        rc = RTErrConvertFromErrno(errno);
+                        close(fd);
+                    }
+                }
+                else
+                {
+                    /* WSL returns ELOOP here, but we take no chances that O_NOFOLLOW
+                       takes precedence over O_DIRECTORY everywhere. */
+                    int iErr = errno;
+                    if (iErr == ELOOP || iErr == ENOTDIR)
+                    {
+                        struct stat St;
+                        if (   lstat(pszNativePath, &St) == 0
+                            && S_ISLNK(St.st_mode))
+                            rc = VERR_IS_A_SYMLINK;
+                        else
+                            rc = RTErrConvertFromErrno(iErr);
+                    }
+                }
+            }
+            else
+#endif
+            {
+                /* Fallback.  This contains a race condition. */
+                struct stat St;
+                if (   lstat(pszNativePath, &St) != 0
+                    || !S_ISLNK(St.st_mode))
+                    pDir->pDir = opendir(pszNativePath);
+                else
+                    rc = VERR_IS_A_SYMLINK;
+            }
         }
         if (pDir->pDir)
@@ -251 +330 @@
             pDir->fDataUnread = false; /* spelling it out */
         }
-        else
+        else if (RT_SUCCESS_NP(rc))
             rc = RTErrConvertFromErrno(errno);
 
         rtPathFreeNative(pszNativePath, pDir->pszPath);
     }
-
+    if (pszSlash)
+        *pszSlash = RTPATH_SLASH;
     return rc;
 }