mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-06 15:21:09 +00:00
* Remove Unused Project Includes and Forward-Declare Where a Type Is Only Referenced Generated with include-what-you-use and applied conservatively. Only OrcaSlicer's own headers, the ones under src/ and tests/, are removed or forward-declared; standard-library and third-party includes are left alone. An include is removed only when both the Release and the Debug configuration leave it unused, never from inside a conditional block, and never from a file with platform-specific blocks, which only gain includes. Files whose only use of a header sits behind a feature or debug macro (libvgcode's OpenGL ES and marker code, the ARACHNE/TESTS_EXPORT_SVGS debug output) keep their includes. clonable_ptr.hpp gains #pragma once; it had no include guard and was only safe while Config.hpp was its sole includer. * Remove Unused Project Includes From Files With Platform-Specific Code A Linux include-what-you-use run cannot see the code inside _WIN32, __APPLE__ or __linux__ blocks, so its verdict is only taken where nothing the removed header declares, directly or through what it includes, is named inside those blocks. Removals also have to hold in both the Release and Debug configuration and never touch a line inside a conditional block. * Restore the libslic3r Precompiled Header and Direct Includes Lost in the Platform Pass The platform-file pass treated pchheader.hpp as an ordinary header and emptied it, and left GUI_Preview.hpp and 14 other files relying on headers they no longer reached directly. * Restore MainFrame.hpp in ParamsDialog.cpp for the Windows-Only Reparent Call * Include Headers That Files Reached Through Ones the Cleanup Removed * Drop Includes Duplicated by the Cleanup or by Main's Own Additions * Leave PreciseSeam.cpp as Main Has It After the Precise Seam Rework
145 lines
5.6 KiB
C++
145 lines
5.6 KiB
C++
#include <boost/filesystem/path.hpp>
|
|
#include <boost/filesystem/operations.hpp>
|
|
#include <catch2/catch_all.hpp>
|
|
|
|
#include <ios>
|
|
#include <slic3r/plugin/PluginLoader.hpp>
|
|
#include <slic3r/plugin/PluginDescriptor.hpp>
|
|
#include <slic3r/plugin/PluginFsUtils.hpp>
|
|
|
|
#include <catch2/catch_test_macros.hpp>
|
|
#include <catch2/matchers/catch_matchers.hpp>
|
|
#include <catch2/matchers/catch_matchers_string.hpp>
|
|
#include "plugin_test_utils.hpp"
|
|
|
|
#include <boost/filesystem.hpp>
|
|
|
|
#include <fstream>
|
|
#include <string>
|
|
|
|
using namespace Slic3r;
|
|
namespace fs = boost::filesystem;
|
|
|
|
namespace {
|
|
|
|
fs::path write_py_file(const fs::path& dir, const std::string& filename, const std::string& contents)
|
|
{
|
|
fs::create_directories(dir);
|
|
const fs::path p = dir / filename;
|
|
std::ofstream out(p.string(), std::ios::binary);
|
|
out << contents;
|
|
return p;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
TEST_CASE("install_plugin rejects a cloud UUID containing path traversal", "[PluginInstall]")
|
|
{
|
|
ScopedDataDir data_dir_guard("cor2");
|
|
|
|
// Package contents are irrelevant: the UUID is validated before metadata is read.
|
|
const fs::path py = write_py_file(data_dir_guard.dir / "src", "evil.py", "print('hi')\n");
|
|
|
|
|
|
|
|
PluginDescriptor descriptor;
|
|
// is_cloud_plugin() -> true; cloud_uuid() -> the traversal string.
|
|
descriptor.cloud = CloudPluginState{"../../escape", true, false, false, false};
|
|
|
|
std::string error;
|
|
const bool installed = plugin_loader::install_plugin(py, /*cloud_user_id=*/"test-user", descriptor, error);
|
|
|
|
REQUIRE_FALSE(installed);
|
|
CHECK_THAT(error, Catch::Matchers::ContainsSubstring("valid identifier"));
|
|
}
|
|
|
|
TEST_CASE("install_plugin rejects a side-loaded .py with no PEP 723 metadata", "[PluginInstall]")
|
|
{
|
|
ScopedDataDir data_dir_guard("cor3-bad");
|
|
|
|
// No `# /// script` block -> name stays empty and type stays Unknown.
|
|
const fs::path py = write_py_file(data_dir_guard.dir / "src", "nameless.py", "print('no metadata here')\n");
|
|
|
|
|
|
PluginDescriptor descriptor;
|
|
std::string error;
|
|
const bool installed = plugin_loader::install_plugin(py, /*cloud_user_id=*/"", descriptor, error);
|
|
|
|
REQUIRE_FALSE(installed);
|
|
CHECK_THAT(error, Catch::Matchers::ContainsSubstring("PEP 723"));
|
|
}
|
|
|
|
TEST_CASE("install_plugin accepts a side-loaded .py with complete PEP 723 metadata", "[PluginInstall]")
|
|
{
|
|
ScopedDataDir data_dir_guard("cor3-good");
|
|
|
|
const std::string contents =
|
|
"# /// script\n"
|
|
"# requires-python = \">=3.12\"\n"
|
|
"#\n"
|
|
"# [tool.orcaslicer.plugin]\n"
|
|
"# name = \"Test Plugin\"\n"
|
|
"# type = \"script\"\n"
|
|
"# ///\n"
|
|
"print('ok')\n";
|
|
const fs::path py = write_py_file(data_dir_guard.dir / "src", "good.py", contents);
|
|
|
|
|
|
PluginDescriptor descriptor;
|
|
std::string error;
|
|
const bool installed = plugin_loader::install_plugin(py, /*cloud_user_id=*/"", descriptor, error);
|
|
|
|
// Positive control: a complete side-loaded .py must still install (guards against over-rejection).
|
|
REQUIRE(installed);
|
|
CHECK(error.empty());
|
|
}
|
|
|
|
TEST_CASE("install-state sidecar is the source of truth for a cloud plugin's installed version", "[PluginInstall]")
|
|
{
|
|
ScopedDataDir data_dir_guard("installed-version");
|
|
|
|
const fs::path plugin_dir = data_dir_guard.dir / "plugin";
|
|
fs::create_directories(plugin_dir);
|
|
|
|
// A cloud plugin whose local manifest/PEP723 header lags the version actually fetched from
|
|
// the cloud: the user bumped the version on the cloud without touching the local header.
|
|
PluginDescriptor descriptor;
|
|
descriptor.name = "Versioned Plugin";
|
|
descriptor.version = "1.0.0"; // stale header version
|
|
descriptor.installed_version = "1.2.0"; // version fetched from the cloud at install time
|
|
descriptor.cloud = CloudPluginState{"uuid-1", true, false, false, false};
|
|
|
|
REQUIRE(write_install_state(plugin_dir, descriptor));
|
|
|
|
// The writer must persist the installed_version (1.2.0), not the header version (1.0.0),
|
|
// so a subsequent re-write from a freshly-scanned descriptor cannot clobber it.
|
|
PluginInstallState state;
|
|
REQUIRE(read_install_state(plugin_dir, state));
|
|
CHECK(state.installed_version == "1.2.0");
|
|
|
|
state.permissions.fs_read = {"/path/to/read"};
|
|
state.permissions.fs_readwrite = {"/path/to/readwrite"};
|
|
state.permissions.network_http = {"https://api.example.com"};
|
|
state.permissions.network_socket = {"192.168.45.6:443"};
|
|
state.permissions.process = {"/usr/bin/curl"};
|
|
REQUIRE(write_install_state(plugin_dir, state));
|
|
|
|
// Permission data is persisted in the same sidecar as the installation metadata.
|
|
PluginInstallState persisted;
|
|
REQUIRE(read_install_state(plugin_dir, persisted));
|
|
CHECK(persisted.permissions.fs_read == state.permissions.fs_read);
|
|
CHECK(persisted.permissions.fs_readwrite == state.permissions.fs_readwrite);
|
|
CHECK(persisted.permissions.network_http == state.permissions.network_http);
|
|
CHECK(persisted.permissions.network_socket == state.permissions.network_socket);
|
|
CHECK(persisted.permissions.process == state.permissions.process);
|
|
|
|
// Reading the sidecar back onto a freshly-scanned descriptor (whose header version is still
|
|
// 1.0.0) must surface the cloud-installed 1.2.0. This is what lets update_cloud_metadata compare
|
|
// the cloud's latest version against the installed version instead of the stale header, so an
|
|
// already-updated plugin no longer looks perpetually out of date.
|
|
PluginDescriptor scanned;
|
|
scanned.version = "1.0.0"; // as parsed from the unchanged PEP723 header
|
|
read_install_state(plugin_dir, scanned);
|
|
CHECK(scanned.installed_version == "1.2.0");
|
|
}
|