mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-19 13:41:03 +00:00
HanifKoh
ba468c842d
* Confine Updater Archive Extraction to the Target Directory The preset updater extracted downloaded archives by appending each entry name to the cache directory, and the network plugin installer did the same for the plugin folder, without checking that the result stays inside it. Move the updater's extraction into libslic3r as extract_archive_confined, which validates every entry with is_path_within_root before writing anything and fails the whole archive if one entry resolves outside the target. The plugin installer now rejects such an entry the same way. Well formed archives extract exactly as before. * Harden Archive Extraction Against Symlinks The plugin installer now creates a symlink entry only when its target is relative and, joined to the link's own directory, passes is_path_within_root, via the new is_symlink_target_within_root helper. Before writing any entry it checks the destination with symlink_status, so an existing symlink, dangling or not, is replaced rather than followed, and it creates parent directories inside the existing error handling. extract_archive_confined replaces a symlink at a destination file the same way. is_path_within_root now ignores a trailing separator on the root, which previously made every path fail the check. * Validate Plugin Symlink Targets Before Replacing Existing Files A symlink entry's target is now read and checked before anything already at its destination is removed or renamed aside, so an archive rejected for its link target leaves the installed plugin files in place. * Reject Paths with an Embedded NUL When Confining Extraction is_path_within_root compared each component with "..", so a name such as "..\0" passed the check. The filesystem calls stop at the NUL and act on a shorter path than the one that was checked: a symlink target read from a plugin archive as raw bytes was created as "..", pointing out of the plugin directory. A path containing a NUL is now rejected before anything touches the filesystem, which covers every caller, including entry names taken from the Unicode Path extra field.
39 lines
1.1 KiB
C++
39 lines
1.1 KiB
C++
#ifndef MINIZ_EXTENSION_HPP
|
|
#define MINIZ_EXTENSION_HPP
|
|
|
|
#include <string>
|
|
#include <miniz.h>
|
|
|
|
namespace Slic3r {
|
|
|
|
bool open_zip_reader(mz_zip_archive *zip, const std::string &fname_utf8);
|
|
bool open_zip_writer(mz_zip_archive *zip, const std::string &fname_utf8);
|
|
bool close_zip_reader(mz_zip_archive *zip);
|
|
bool close_zip_writer(mz_zip_archive *zip);
|
|
std::string decode_archive_entry_path(mz_zip_archive *zip, const mz_zip_archive_file_stat &stat);
|
|
// Extracts every entry of the archive under dest_dir. Nothing is written if any entry would resolve outside dest_dir.
|
|
bool extract_archive_confined(const std::string &zip_path_utf8, const std::string &dest_dir);
|
|
|
|
class MZ_Archive {
|
|
public:
|
|
mz_zip_archive arch;
|
|
|
|
MZ_Archive();
|
|
|
|
static std::string get_errorstr(mz_zip_error mz_err);
|
|
|
|
std::string get_errorstr() const
|
|
{
|
|
return get_errorstr(arch.m_last_error) + "!";
|
|
}
|
|
|
|
bool is_alive() const
|
|
{
|
|
return arch.m_zip_mode != MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED;
|
|
}
|
|
};
|
|
|
|
} // namespace Slic3r
|
|
|
|
#endif // MINIZ_EXTENSION_HPP
|