Add file extension check to service.

Author: 49081

src/windows/common/WslClient.cpp

@@ -363,17 +363,6 @@ int ImportDistribution(_In_ std::wstring_view commandLine)
     }
     else
     {
-        if (WI_IsFlagClear(flags, LXSS_IMPORT_DISTRO_FLAGS_VHD))
-        {
-            // Fail if expecting a tar, but the file name has the .vhd or .vhdx extension.
-            if (wsl::windows::common::string::IsPathComponentEqual(filePath.extension().native(), wsl::windows::common::wslutil::c_vhdFileExtension) ||
-                wsl::windows::common::string::IsPathComponentEqual(filePath.extension().native(), wsl::windows::common::wslutil::c_vhdxFileExtension))
-            {
-                wsl::windows::common::wslutil::PrintMessage(wsl::shared::Localization::MessagePassVhdFlag());
-                return -1;
-            }
-        }
-
         file.reset(CreateFileW(
             filePath.c_str(), GENERIC_READ, (FILE_SHARE_READ | FILE_SHARE_DELETE), nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr));
 

src/windows/service/exe/LxssUserSession.cpp

@@ -1081,15 +1081,18 @@ HRESULT LxssUserSessionImpl::ExportDistribution(_In_opt_ LPCGUID DistroGuid, _In
                 auto runAsUser = wil::impersonate_token(userToken.get());
 
                 // Ensure the target file has the correct file extension.
-                std::wstring exportPath;
-                THROW_IF_FAILED(wil::GetFinalPathNameByHandleW(FileHandle, exportPath));
-
-                const auto sourceFileExtension = configuration.VhdFilePath.extension().native();
-                const auto targetFileExtension = std::filesystem::path(std::move(exportPath)).extension().native();
-                if (!wsl::windows::common::string::IsPathComponentEqual(sourceFileExtension, targetFileExtension))
+                if (GetFileType(FileHandle) == FILE_TYPE_DISK)
                 {
-                    THROW_HR_WITH_USER_ERROR(
-                        WSL_E_EXPORT_FAILED, wsl::shared::Localization::MessageRequiresFileExtension(sourceFileExtension.c_str()));
+                    std::wstring exportPath;
+                    THROW_IF_FAILED(wil::GetFinalPathNameByHandleW(FileHandle, exportPath));
+
+                    const auto sourceFileExtension = configuration.VhdFilePath.extension().native();
+                    const auto targetFileExtension = std::filesystem::path(std::move(exportPath)).extension().native();
+                    if (!wsl::windows::common::string::IsPathComponentEqual(sourceFileExtension, targetFileExtension))
+                    {
+                        THROW_HR_WITH_USER_ERROR(
+                            WSL_E_EXPORT_FAILED, wsl::shared::Localization::MessageRequiresFileExtension(sourceFileExtension.c_str()));
+                    }
                 }
 
                 const wil::unique_hfile vhdFile(CreateFileW(
@@ -1461,24 +1464,42 @@ HRESULT LxssUserSessionImpl::RegisterDistribution(
                 wil::CreateDirectoryDeep(distributionPath.c_str());
             }
 
-            // If importing a vhd, determine if it is a .vhd or .vhdx.
             std::wstring vhdName{LXSS_VM_MODE_VHD_NAME};
-            if (WI_IsFlagSet(Flags, LXSS_IMPORT_DISTRO_FLAGS_VHD))
+            if (GetFileType(FileHandle) == FILE_TYPE_DISK)
             {
                 std::wstring pathBuffer;
                 THROW_IF_FAILED(wil::GetFinalPathNameByHandleW(FileHandle, pathBuffer));
 
-                std::filesystem::path vhdPath{std::move(pathBuffer)};
+                std::filesystem::path filePath{std::move(pathBuffer)};
 
-                using namespace wsl::windows::common::wslutil;
-                if (!wsl::windows::common::string::IsPathComponentEqual(vhdPath.extension().native(), c_vhdFileExtension) &&
-                    !wsl::windows::common::string::IsPathComponentEqual(vhdPath.extension().native(), c_vhdxFileExtension))
+                // If importing a vhd, determine if it is a .vhd or .vhdx.
+                if (WI_IsFlagSet(Flags, LXSS_IMPORT_DISTRO_FLAGS_VHD))
                 {
-                    THROW_HR_WITH_USER_ERROR(
-                        WSL_E_IMPORT_FAILED, wsl::shared::Localization::MessageRequiresFileExtensions(c_vhdFileExtension, c_vhdxFileExtension));
-                }
+                    std::wstring pathBuffer;
+                    THROW_IF_FAILED(wil::GetFinalPathNameByHandleW(FileHandle, pathBuffer));
+
+                    std::filesystem::path vhdPath{std::move(pathBuffer)};
+
+                    using namespace wsl::windows::common::wslutil;
+                    if (!wsl::windows::common::string::IsPathComponentEqual(filePath.extension().native(), c_vhdFileExtension) &&
+                        !wsl::windows::common::string::IsPathComponentEqual(filePath.extension().native(), c_vhdxFileExtension))
+                    {
+                        THROW_HR_WITH_USER_ERROR(
+                            WSL_E_IMPORT_FAILED,
+                            wsl::shared::Localization::MessageRequiresFileExtensions(c_vhdFileExtension, c_vhdxFileExtension));
+                    }
 
-                vhdName = vhdPath.filename();
+                    vhdName = filePath.filename();
+                }
+                else
+                {
+                    // Fail if expecting a tar, but the file name has the .vhd or .vhdx extension.
+                    if (wsl::windows::common::string::IsPathComponentEqual(filePath.extension().native(), wsl::windows::common::wslutil::c_vhdFileExtension) ||
+                        wsl::windows::common::string::IsPathComponentEqual(filePath.extension().native(), wsl::windows::common::wslutil::c_vhdxFileExtension))
+                    {
+                        THROW_HR_WITH_USER_ERROR(WSL_E_IMPORT_FAILED, wsl::shared::Localization::MessagePassVhdFlag());
+                    }
+                }
             }
 
             registration = DistributionRegistration::Create(