mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-16 20:31:14 +00:00
# Description <!-- > Please provide a summary of the changes made in this PR. Include details such as: > * What issue does this PR address or fix? > * What new features or enhancements does this PR introduce? > * Are there any breaking changes or dependencies that need to be considered? --> Windows traditionally limits many file operations to `MAX_PATH` (260 characters). Deeply nested plugin packages can exceed this limit during `.whl` extraction, leaving files missing and causing the plugin to fail to load. This change adds a shared extended_path helper that prepares paths for Windows file operations using the extended-length prefixes `\\?\` or `\\?\UNC\`. The helper is used for ZIP archive I/O and extraction destinations, including plugin wheel extraction. This avoids relying on the Windows long-path setting, which changes machine-wide settings. Paths remain unprefixed outside file operations. Code that bypasses the shared ZIP helpers may still require separate long-path handling. See [Microsoft's documentation on path length limitation](https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=registry) # Screenshots/Recordings/Graphs <!-- > Please attach relevant screenshots to showcase the UI changes. > Please attach images that can help explain the changes. --> ## Tests <!-- > Please describe the tests that you have conducted to verify the changes made in this PR. --> Tested on Windows 11 by using a portable installation of OrcaSlicer and placing it in some really long filepath length e.g. `C:/somename/<240 characters long folder path>/OrcaSlicer` and then running and trying to install any plugin locally or on OrcaCloud. <!-- > A guide for users on how to download the artifacts from this PR. --> [How to Download Pull Requests Artifacts for Testing](https://www.orcaslicer.com/wiki/how_to_download_pr_artifacts)
255 lines
11 KiB
C++
255 lines
11 KiB
C++
#include <boost/filesystem/path.hpp>
|
|
#include <boost/filesystem/directory.hpp>
|
|
#include <boost/filesystem/operations.hpp>
|
|
#include <boost/filesystem/file_status.hpp>
|
|
#include <catch2/catch_all.hpp>
|
|
|
|
#include <catch2/catch_test_macros.hpp>
|
|
#include <catch2/generators/catch_generators.hpp>
|
|
#include <catch2/catch_message.hpp>
|
|
#include "libslic3r/miniz_extension.hpp"
|
|
|
|
#include "test_utils.hpp"
|
|
|
|
#include <boost/filesystem.hpp>
|
|
|
|
#include <algorithm>
|
|
#include <cstddef>
|
|
#include <fstream>
|
|
#include <ios>
|
|
#include <iterator>
|
|
#include <libslic3r/Utils.hpp>
|
|
#include <miniz.h>
|
|
#include <string>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
using namespace Slic3r;
|
|
namespace fs = boost::filesystem;
|
|
|
|
namespace {
|
|
|
|
void write_zip(const fs::path &zip_file, const std::vector<std::pair<std::string, std::string>> &entries)
|
|
{
|
|
mz_zip_archive zip;
|
|
mz_zip_zero_struct(&zip);
|
|
REQUIRE(open_zip_writer(&zip, zip_file.string()));
|
|
for (const auto &[name, content] : entries)
|
|
REQUIRE(mz_zip_writer_add_mem(&zip, name.c_str(), content.data(), content.size(), MZ_DEFAULT_COMPRESSION));
|
|
REQUIRE(mz_zip_writer_finalize_archive(&zip));
|
|
REQUIRE(close_zip_writer(&zip));
|
|
}
|
|
|
|
// miniz refuses to write a name starting with '/', so write a placeholder of the same length and patch it in place.
|
|
void rename_entry(const fs::path &zip_file, const std::string &from, const std::string &to)
|
|
{
|
|
REQUIRE(from.size() == to.size());
|
|
std::string bytes;
|
|
{
|
|
std::ifstream in(zip_file.string(), std::ios::binary);
|
|
bytes.assign(std::istreambuf_iterator<char>(in), std::istreambuf_iterator<char>());
|
|
}
|
|
size_t count = 0;
|
|
for (size_t pos = bytes.find(from); pos != std::string::npos; pos = bytes.find(from, pos + to.size()), ++count)
|
|
bytes.replace(pos, from.size(), to);
|
|
// Once in the local header and once in the central directory.
|
|
REQUIRE(count == 2);
|
|
std::ofstream out(zip_file.string(), std::ios::binary | std::ios::trunc);
|
|
out << bytes;
|
|
}
|
|
|
|
std::vector<std::string> list_dir(const fs::path &dir)
|
|
{
|
|
std::vector<std::string> names;
|
|
for (const fs::directory_entry &entry : fs::directory_iterator(dir))
|
|
names.push_back(entry.path().filename().string());
|
|
std::sort(names.begin(), names.end());
|
|
return names;
|
|
}
|
|
|
|
std::string read_file(const fs::path &file)
|
|
{
|
|
std::ifstream in(file.string(), std::ios::binary);
|
|
return std::string(std::istreambuf_iterator<char>(in), std::istreambuf_iterator<char>());
|
|
}
|
|
|
|
} // namespace
|
|
|
|
TEST_CASE("Confined extraction writes a well-formed archive under the target directory", "[MinizExtension]")
|
|
{
|
|
ScopedTemporaryDir tmp;
|
|
const fs::path zip_file = tmp.path() / "bundle.zip";
|
|
const fs::path target = tmp.path() / "cache";
|
|
fs::create_directories(target);
|
|
write_zip(zip_file, {{"vendor/", ""}, {"vendor/machine/", ""}, {"vendor.json", "{\"a\":1}"}, {"vendor/machine/printer.json", "{\"b\":2}"}});
|
|
|
|
REQUIRE(extract_archive_confined(zip_file.string(), target.string()));
|
|
CHECK(fs::is_directory(target / "vendor"));
|
|
CHECK(read_file(target / "vendor.json") == "{\"a\":1}");
|
|
CHECK(read_file(target / "vendor" / "machine" / "printer.json") == "{\"b\":2}");
|
|
}
|
|
|
|
TEST_CASE("Confined extraction rejects an archive with an entry outside the target directory", "[MinizExtension]")
|
|
{
|
|
ScopedTemporaryDir tmp;
|
|
const fs::path zip_file = tmp.path() / "bundle.zip";
|
|
const fs::path target = tmp.path() / "cache";
|
|
fs::create_directories(target);
|
|
|
|
const std::string escaping_entry = GENERATE(std::string("../escape.txt"), std::string("..\\escape.txt"),
|
|
std::string("sub/../../escape.txt"), std::string("C:/escape.txt"),
|
|
std::string("C:escape.txt"), std::string("\\escape.txt"));
|
|
// The normal entry comes first so a per-entry check would already have written it.
|
|
write_zip(zip_file, {{"normal.json", "{}"}, {escaping_entry, "escaped"}});
|
|
|
|
CAPTURE(escaping_entry);
|
|
CHECK_FALSE(extract_archive_confined(zip_file.string(), target.string()));
|
|
CHECK_FALSE(fs::exists(tmp.path() / "escape.txt"));
|
|
CHECK(fs::is_empty(target));
|
|
}
|
|
|
|
TEST_CASE("Confined extraction rejects an archive with an absolute entry name", "[MinizExtension]")
|
|
{
|
|
ScopedTemporaryDir tmp;
|
|
const fs::path zip_file = tmp.path() / "bundle.zip";
|
|
const fs::path target = tmp.path() / "cache";
|
|
fs::create_directories(target);
|
|
|
|
const std::string absolute = (tmp.path() / "escape.txt").generic_string();
|
|
const std::string placeholder = "#" + absolute.substr(1);
|
|
write_zip(zip_file, {{"normal.json", "{}"}, {placeholder, "escaped"}});
|
|
rename_entry(zip_file, placeholder, absolute);
|
|
|
|
CHECK_FALSE(extract_archive_confined(zip_file.string(), target.string()));
|
|
CHECK_FALSE(fs::exists(tmp.path() / "escape.txt"));
|
|
CHECK(fs::is_empty(target));
|
|
}
|
|
|
|
TEST_CASE("Confined extraction rejects a directory entry outside the target directory", "[MinizExtension]")
|
|
{
|
|
ScopedTemporaryDir tmp;
|
|
const fs::path zip_file = tmp.path() / "bundle.zip";
|
|
const fs::path target = tmp.path() / "cache";
|
|
fs::create_directories(target);
|
|
write_zip(zip_file, {{"vendor/", ""}, {"../outside/", ""}});
|
|
|
|
CHECK_FALSE(extract_archive_confined(zip_file.string(), target.string()));
|
|
CHECK_FALSE(fs::exists(tmp.path() / "outside"));
|
|
CHECK(fs::is_empty(target));
|
|
}
|
|
|
|
TEST_CASE("Confined extraction validates zero-size entries like any other", "[MinizExtension]")
|
|
{
|
|
ScopedTemporaryDir tmp;
|
|
const fs::path zip_file = tmp.path() / "bundle.zip";
|
|
const fs::path target = tmp.path() / "cache";
|
|
fs::create_directories(target);
|
|
|
|
SECTION("an empty file inside the target does not fail the archive") {
|
|
write_zip(zip_file, {{"empty.json", ""}, {"vendor.json", "{}"}});
|
|
CHECK(extract_archive_confined(zip_file.string(), target.string()));
|
|
CHECK(read_file(target / "vendor.json") == "{}");
|
|
}
|
|
SECTION("an empty file outside the target rejects the archive") {
|
|
write_zip(zip_file, {{"vendor.json", "{}"}, {"../escape.txt", ""}});
|
|
CHECK_FALSE(extract_archive_confined(zip_file.string(), target.string()));
|
|
CHECK_FALSE(fs::exists(tmp.path() / "escape.txt"));
|
|
CHECK(fs::is_empty(target));
|
|
}
|
|
}
|
|
|
|
TEST_CASE("Confined extraction writes nothing outside the target for Windows-specific name forms", "[MinizExtension]")
|
|
{
|
|
ScopedTemporaryDir tmp;
|
|
const fs::path zip_file = tmp.path() / "bundle.zip";
|
|
const fs::path target = tmp.path() / "cache";
|
|
fs::create_directories(target);
|
|
|
|
// Windows strips trailing dots and spaces and maps device names; whether these extract depends on the
|
|
// platform, but none of them may land beside the target.
|
|
const std::string name = GENERATE(std::string("name."), std::string("name "), std::string("..."), std::string(".. "),
|
|
std::string(".. /escape.txt"), std::string(".../escape.txt"), std::string("CON"),
|
|
std::string("sub/NUL.txt"), std::string("C:escape.txt"));
|
|
write_zip(zip_file, {{name, "payload"}});
|
|
|
|
CAPTURE(name);
|
|
extract_archive_confined(zip_file.string(), target.string());
|
|
CHECK(list_dir(tmp.path()) == std::vector<std::string>{"bundle.zip", "cache"});
|
|
}
|
|
|
|
TEST_CASE("Confined extraction writes files under a target path longer than MAX_PATH", "[MinizExtension]")
|
|
{
|
|
ScopedTemporaryDir tmp;
|
|
const fs::path zip_file = tmp.path() / "bundle.zip";
|
|
// Directory entries are explicit: extract_archive_confined recreates directories only for them.
|
|
write_zip(zip_file, {{"vendor/", ""}, {"vendor/machine/", ""}, {"vendor.json", "{\"a\":1}"},
|
|
{"vendor/machine/printer.json", "{\"b\":2}"}});
|
|
|
|
// One 240-char component keeps every name below the NTFS 255 limit while pushing the full
|
|
// target path past the 260-char MAX_PATH the Win32 APIs enforce when LongPathsEnabled is off.
|
|
const fs::path target = tmp.path() / std::string(240, 'd');
|
|
REQUIRE(target.string().size() > 260);
|
|
fs::create_directories(extended_path(target));
|
|
|
|
REQUIRE(extract_archive_confined(zip_file.string(), target.string()));
|
|
// Verify through extended-length paths, otherwise the checks themselves are bounded by MAX_PATH.
|
|
CHECK(fs::is_directory(extended_path(target / "vendor")));
|
|
CHECK(read_file(extended_path(target / "vendor.json")) == "{\"a\":1}");
|
|
CHECK(read_file(extended_path(target / "vendor" / "machine" / "printer.json")) == "{\"b\":2}");
|
|
|
|
// The temporary dir guard cannot remove a deep tree on Windows, so drop it here.
|
|
boost::system::error_code ec;
|
|
fs::remove_all(extended_path(target), ec);
|
|
CHECK_FALSE(ec);
|
|
}
|
|
|
|
TEST_CASE("A zip archive under a path longer than MAX_PATH can be written and read", "[MinizExtension]")
|
|
{
|
|
ScopedTemporaryDir tmp;
|
|
|
|
// Create the long directory with the extended-length path, then exercise the archive
|
|
// reader/writer against an archive whose own path is past MAX_PATH.
|
|
const fs::path long_dir = tmp.path() / std::string(240, 'z');
|
|
fs::create_directories(extended_path(long_dir));
|
|
const fs::path zip_file = long_dir / "bundle.zip";
|
|
REQUIRE(zip_file.string().size() > 260);
|
|
|
|
write_zip(zip_file, {{"vendor.json", "{\"a\":1}"}});
|
|
|
|
const fs::path target = tmp.path() / "out";
|
|
fs::create_directories(target);
|
|
REQUIRE(extract_archive_confined(zip_file.string(), target.string()));
|
|
CHECK(read_file(target / "vendor.json") == "{\"a\":1}");
|
|
|
|
boost::system::error_code ec;
|
|
fs::remove_all(extended_path(long_dir), ec);
|
|
CHECK_FALSE(ec);
|
|
}
|
|
|
|
#ifndef _WIN32
|
|
TEST_CASE("Confined extraction replaces a symlink at the destination instead of writing through it", "[MinizExtension]")
|
|
{
|
|
ScopedTemporaryDir tmp;
|
|
const fs::path zip_file = tmp.path() / "bundle.zip";
|
|
const fs::path target = tmp.path() / "cache";
|
|
const fs::path outside = tmp.path() / "outside";
|
|
fs::create_directories(target);
|
|
fs::create_directories(outside);
|
|
write_zip(zip_file, {{"vendor.json", "{\"a\":1}"}});
|
|
|
|
SECTION("a dangling symlink") {
|
|
fs::create_symlink(outside / "vendor.json", target / "vendor.json");
|
|
CHECK(extract_archive_confined(zip_file.string(), target.string()));
|
|
CHECK_FALSE(fs::exists(outside / "vendor.json"));
|
|
CHECK_FALSE(fs::is_symlink(fs::symlink_status(target / "vendor.json")));
|
|
CHECK(read_file(target / "vendor.json") == "{\"a\":1}");
|
|
}
|
|
SECTION("a symlink to an existing file") {
|
|
{ std::ofstream((outside / "vendor.json").string()) << "original"; }
|
|
fs::create_symlink(outside / "vendor.json", target / "vendor.json");
|
|
extract_archive_confined(zip_file.string(), target.string());
|
|
CHECK(read_file(outside / "vendor.json") == "original");
|
|
}
|
|
}
|
|
#endif
|