Don't recursive copy

dotnet · Mar 19, 2021 · dca5ec4 · dca5ec4
1 parent 254ab40
commit dca5ec4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp
@@ -304,7 +304,7 @@ APPLICATION_INFO::HandleShadowCopy(const ShimOptions& options, IHttpContext& pHt
         }
 
         shadowCopyPath = shadowCopyPath / directoryNameStr;
-        HRESULT hr = Environment::CopyToDirectory(physicalPath, shadowCopyPath, options.QueryCleanShadowCopyDirectory(), shadowCopyBaseDirectory.path().parent_path());
+        HRESULT hr = Environment::CopyToDirectory(physicalPath, shadowCopyPath, options.QueryCleanShadowCopyDirectory(), std::filesystem::canonical(shadowCopyBaseDirectory.path()));
         if (hr != S_OK)
         {
             return std::wstring();

diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/Environment.cpp
@@ -192,8 +192,10 @@ void Environment::CopyToDirectoryInner(const std::filesystem::path& source, cons
         }
         else if (path.is_directory())
         {
-            auto sourceInnerDirectory = std::filesystem::directory_entry(path);
-            if (sourceInnerDirectory.path() != directoryToIgnore)
+            auto sourceInnerDirectory = path.path();
+
+            // Make sure we aren't navigating into shadow copy directory.
+            if (sourceInnerDirectory.wstring().rfind(directoryToIgnore, 0) != 0)
             {
                 CopyToDirectoryInner(path.path(), destination / path.path().filename(), directoryToIgnore);
             }

diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp
@@ -366,7 +366,7 @@ DWORD WINAPI FILE_WATCHER::CopyAndShutdown(FILE_WATCHER* watcher)
     // Copy contents before shutdown
     try
     {
-        Environment::CopyToDirectory(watcher->_strDirectoryName.QueryStr(), destination, false, parentDirectory);
+        Environment::CopyToDirectory(watcher->_strDirectoryName.QueryStr(), destination, false, std::filesystem::canonical(parentDirectory));
     }
     catch (...)
     {