|
21 | 21 |
|
22 | 22 | #ifdef _WIN32 |
23 | 23 | #include <Windows.h> |
| 24 | +#include "core/platform/windows/env.h" |
24 | 25 | #endif |
25 | 26 |
|
26 | 27 | using namespace ::onnxruntime::utils; |
@@ -715,6 +716,125 @@ TEST_F(PathValidationTest, ValidateExternalDataPathEmptyModelPathWithSymlinkOuts |
715 | 716 | EXPECT_THAT(status.ErrorMessage(), testing::HasSubstr("escapes working directory")); |
716 | 717 | } |
717 | 718 |
|
| 719 | +#if defined(_WIN32) |
| 720 | +// Direct tests for the Windows AppContainer fallback used by |
| 721 | +// WindowsEnv::GetWeaklyCanonicalPath. The AppContainer trigger itself can't be |
| 722 | +// reproduced in a unit test environment; see microsoft/onnxruntime#28508. |
| 723 | +TEST_F(PathValidationTest, WeaklyCanonicalPathNtVolumeFallback_ExistingDirectory) { |
| 724 | + std::filesystem::path canonical; |
| 725 | + ASSERT_TRUE(onnxruntime::internal::WeaklyCanonicalPathNtVolumeFallbackForTesting(base_dir_, canonical)); |
| 726 | + |
| 727 | + EXPECT_THAT(canonical.wstring(), testing::StartsWith(L"\\\\?\\GLOBALROOT\\Device\\")); |
| 728 | + |
| 729 | + std::error_code ec; |
| 730 | + EXPECT_TRUE(std::filesystem::exists(canonical, ec)) << "ec=" << ec.message(); |
| 731 | +} |
| 732 | + |
| 733 | +TEST_F(PathValidationTest, WeaklyCanonicalPathNtVolumeFallback_ExistingFile) { |
| 734 | + CreateEmptyFile(base_dir_ / "data.bin"); |
| 735 | + |
| 736 | + std::filesystem::path canonical; |
| 737 | + ASSERT_TRUE( |
| 738 | + onnxruntime::internal::WeaklyCanonicalPathNtVolumeFallbackForTesting(base_dir_ / "data.bin", canonical)); |
| 739 | + |
| 740 | + EXPECT_THAT(canonical.wstring(), testing::StartsWith(L"\\\\?\\GLOBALROOT\\Device\\")); |
| 741 | + |
| 742 | + std::error_code ec; |
| 743 | + EXPECT_TRUE(std::filesystem::exists(canonical, ec)) << "ec=" << ec.message(); |
| 744 | + EXPECT_TRUE(std::filesystem::is_regular_file(canonical, ec)) << "ec=" << ec.message(); |
| 745 | +} |
| 746 | + |
| 747 | +TEST_F(PathValidationTest, WeaklyCanonicalPathNtVolumeFallback_NonExistentLeafLexicallyAppended) { |
| 748 | + const std::filesystem::path leaf{L"does_not_exist.bin"}; |
| 749 | + std::filesystem::path canonical; |
| 750 | + ASSERT_TRUE(onnxruntime::internal::WeaklyCanonicalPathNtVolumeFallbackForTesting(base_dir_ / leaf, canonical)); |
| 751 | + |
| 752 | + EXPECT_THAT(canonical.wstring(), testing::StartsWith(L"\\\\?\\GLOBALROOT\\Device\\")); |
| 753 | + EXPECT_EQ(canonical.filename(), leaf); |
| 754 | + |
| 755 | + // The canonicalized parent must be a path-component prefix of the result so that the |
| 756 | + // containment check in ValidateExternalDataPath still works. |
| 757 | + std::filesystem::path parent_canonical; |
| 758 | + ASSERT_TRUE(onnxruntime::internal::WeaklyCanonicalPathNtVolumeFallbackForTesting(base_dir_, parent_canonical)); |
| 759 | + auto [parent_end, full_it] = std::mismatch(parent_canonical.begin(), parent_canonical.end(), |
| 760 | + canonical.begin(), canonical.end()); |
| 761 | + EXPECT_EQ(parent_end, parent_canonical.end()) |
| 762 | + << "parent: " << parent_canonical << " full: " << canonical; |
| 763 | +} |
| 764 | + |
| 765 | +TEST_F(PathValidationTest, WeaklyCanonicalPathNtVolumeFallback_NonExistentMiddleAndLeaf) { |
| 766 | + std::filesystem::path canonical; |
| 767 | + ASSERT_TRUE(onnxruntime::internal::WeaklyCanonicalPathNtVolumeFallbackForTesting( |
| 768 | + base_dir_ / L"missing_dir" / L"data.bin", canonical)); |
| 769 | + |
| 770 | + EXPECT_THAT(canonical.wstring(), testing::StartsWith(L"\\\\?\\GLOBALROOT\\Device\\")); |
| 771 | + EXPECT_EQ(canonical.filename(), std::filesystem::path{L"data.bin"}); |
| 772 | + EXPECT_EQ(canonical.parent_path().filename(), std::filesystem::path{L"missing_dir"}); |
| 773 | +} |
| 774 | + |
| 775 | +TEST_F(PathValidationTest, WeaklyCanonicalPathNtVolumeFallback_AllNonExistentReturnsFalse) { |
| 776 | + // Synthetic absolute path on a non-existent volume. The fallback must return false so |
| 777 | + // the caller surfaces the original weakly_canonical error rather than substituting an |
| 778 | + // unverified path. |
| 779 | + const std::filesystem::path bogus{L"\\\\?\\Volume{00000000-0000-0000-0000-000000000000}\\nope\\data.bin"}; |
| 780 | + std::filesystem::path canonical; |
| 781 | + EXPECT_FALSE(onnxruntime::internal::WeaklyCanonicalPathNtVolumeFallbackForTesting(bogus, canonical)); |
| 782 | +} |
| 783 | + |
| 784 | +TEST_F(PathValidationTest, WeaklyCanonicalPathNtVolumeFallback_MatchesWeaklyCanonicalAtFile) { |
| 785 | + // Compare via std::filesystem::equivalent: the fallback returns the NT form |
| 786 | + // (\\?\GLOBALROOT\Device\HarddiskVolumeN\...) while weakly_canonical returns the DOS |
| 787 | + // form (C:\...), but both must point at the same file. |
| 788 | + CreateEmptyFile(base_dir_ / "compare.bin"); |
| 789 | + const auto target = base_dir_ / "compare.bin"; |
| 790 | + |
| 791 | + std::error_code ec; |
| 792 | + const auto reference = std::filesystem::weakly_canonical(target, ec); |
| 793 | + ASSERT_FALSE(ec) << ec.message(); |
| 794 | + |
| 795 | + std::filesystem::path fallback; |
| 796 | + ASSERT_TRUE(onnxruntime::internal::WeaklyCanonicalPathNtVolumeFallbackForTesting(target, fallback)); |
| 797 | + |
| 798 | + EXPECT_TRUE(std::filesystem::equivalent(reference, fallback, ec)) |
| 799 | + << "reference=" << reference << " fallback=" << fallback << " ec=" << ec.message(); |
| 800 | +} |
| 801 | + |
| 802 | +TEST_F(PathValidationTest, WeaklyCanonicalPathNtVolumeFallback_ResolvesSymlinks) { |
| 803 | + const auto target = base_dir_ / "symlink_target.bin"; |
| 804 | + const auto link = base_dir_ / "symlink_link.bin"; |
| 805 | + try { |
| 806 | + std::ofstream{target}; |
| 807 | + std::filesystem::create_symlink(target, link); |
| 808 | + } catch (const std::exception& e) { |
| 809 | + GTEST_SKIP() << "Symlink creation not supported in this environment: " << e.what(); |
| 810 | + } |
| 811 | + |
| 812 | + std::filesystem::path link_canonical; |
| 813 | + std::filesystem::path target_canonical; |
| 814 | + ASSERT_TRUE(onnxruntime::internal::WeaklyCanonicalPathNtVolumeFallbackForTesting(link, link_canonical)); |
| 815 | + ASSERT_TRUE(onnxruntime::internal::WeaklyCanonicalPathNtVolumeFallbackForTesting(target, target_canonical)); |
| 816 | + |
| 817 | + std::error_code ec; |
| 818 | + EXPECT_TRUE(std::filesystem::equivalent(link_canonical, target_canonical, ec)) |
| 819 | + << "link=" << link_canonical << " target=" << target_canonical << " ec=" << ec.message(); |
| 820 | +} |
| 821 | + |
| 822 | +TEST_F(PathValidationTest, WeaklyCanonicalPathNtVolumeFallback_ResolvesDotDot) { |
| 823 | + CreateDirectories(base_dir_ / "sub_for_dotdot"); |
| 824 | + |
| 825 | + std::filesystem::path canonical; |
| 826 | + ASSERT_TRUE(onnxruntime::internal::WeaklyCanonicalPathNtVolumeFallbackForTesting( |
| 827 | + base_dir_ / "sub_for_dotdot" / "..", canonical)); |
| 828 | + |
| 829 | + std::filesystem::path base_canonical; |
| 830 | + ASSERT_TRUE(onnxruntime::internal::WeaklyCanonicalPathNtVolumeFallbackForTesting(base_dir_, base_canonical)); |
| 831 | + |
| 832 | + std::error_code ec; |
| 833 | + EXPECT_TRUE(std::filesystem::equivalent(canonical, base_canonical, ec)) |
| 834 | + << "canonical=" << canonical << " base=" << base_canonical << " ec=" << ec.message(); |
| 835 | +} |
| 836 | +#endif // defined(_WIN32) |
| 837 | + |
718 | 838 | TEST(TensorProtoUtilsTest, GetNodeProtoLayeringAnnotation) { |
719 | 839 | // Case 1: Annotation exists |
720 | 840 | { |
|
0 commit comments