mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-04 14:20:58 +00:00
* Ignore Clipper, libpng, mcut and Boost.Polygon Internals in clang-tidy Each only works through a wrapper or umbrella header: libslic3r/clipper.hpp or clipper_z.hpp configure Clipper before including it, png.h pulls in libpng's config headers, and Boost.Polygon's headers only compile through polygon.hpp or voronoi.hpp. * Ignore minilzo's Config Headers in clang-tidy lzoconf.h and lzodefs.h are internal to minilzo.h, which is what the code includes. * Add Missing Includes Across the Remaining Sources and Tests Covers src/slic3r/Utils, src/slic3r/plugin, src/slic3r/Config, src/libvgcode, src/dev-utils, src/OrcaSlicer.cpp and tests/, the directories left after src/slic3r/GUI and src/libslic3r. Generated with clang-tidy misc-include-cleaner. libvgcode's own headers are included by relative path as in the rest of that library, and Catch2 and pybind11 with angle brackets as elsewhere in the repo. * Make the GUI and Test Headers Compile on Their Own Each now includes, or forward-declares, what it uses instead of relying on what its includers happened to include first. Headers that only compile on one platform, or that nothing built includes, are left alone. * Keep Windows and nanosvg Setup Ahead of the Added Includes OrcaSlicer.cpp and several tests set _WIN32_WINNT, WIN32_LEAN_AND_MEAN or NOMINMAX before including Windows.h, and the profile validator defines NANOSVG_IMPLEMENTATION before any libslic3r header. The added includes had landed above those blocks, which broke the Windows build. * Add the GUI Includes the First Pass Missed Covers headers that only became editable once they compiled on their own, and wx symbols whose suggested header changed as the clang-tidy ignore list grew after the src/slic3r/GUI pass. * Keep the Added Test Includes Below the NOMINMAX Guard test_marchingsquares.cpp and test_texture_displacement.cpp had includes inside #ifndef NOMINMAX, which the tests inherit as defined on Windows from libslic3r, so those were skipped there. .clang-tidy also ignores the MSVC STL and UCRT internals, Boost.Multiprecision's fwd.hpp and CPython's Windows include directory, as in #16068.
205 lines
8.4 KiB
C++
205 lines
8.4 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 <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"});
|
|
}
|
|
|
|
#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
|