[pbs-devel] [PATCH v4 many] fix #4995: Include symlinks in zip file restore

Folke Gleumes f.gleumes at proxmox.com
Mon Jan 29 13:44:15 CET 2024



On Wed, 2024-01-24 at 11:15 +0100, Filip Schauer wrote:
> Include symlinks when restoring files from a backup as a zip file.
> 
> Resulting ZIP files were successfully tested on Linux with: zipinfo,
> unzip, unar
> 
> On Windows the extracted symlinks show up as regular files containing
> the path to the destination. As far as I am aware Windows Explorer
> does
> not support symlinks in ZIP files.
> 
> Changes since v3:
> * Move content to Regular FileType enum
> * Make ZipEntry private
> * Add take_reader function to FileType enum
> 
> Changes since v2:
> * Add a FileType enum and embed the symlink target into the enum.
> * Add unit tests for ZipEncoder to the proxmox-compression crate
> 
> Changes since v1:
> * Use P instead of &Path
> * Fix compile error due to misplaced comma
> * Check content before symlink_target, since regular files are more
>   common than symlinks
> 
> proxmox:
> 
> Filip Schauer (3):
>   compression: Refactor ZipEntry creation and add FileType enum
>   compression: Add support for symlinks in zip files
>   compression: Add unit tests for the ZipEncoder
> 
>  proxmox-compression/Cargo.toml   |   2 +-
>  proxmox-compression/src/zip.rs   | 159 +++++++++++++++++++----------
> --
>  proxmox-compression/tests/zip.rs | 123 ++++++++++++++++++++++++
>  3 files changed, 223 insertions(+), 61 deletions(-)
>  create mode 100644 proxmox-compression/tests/zip.rs
> 
> proxmox-backup:
> 
> Filip Schauer (2):
>   pxar: Adopt FileType enum when adding a zip entry
>   fix #4995: pxar: Include symlinks in zip file creation
> 
>  pbs-client/src/pxar/extract.rs | 59 +++++++++++++++++++++-----------
> --
>  1 file changed, 36 insertions(+), 23 deletions(-)
> 

Tested this with some handcrafted directory/symlink structures and my
home directory for some organic data. Restore was tested on Windows 11
and Debian 12.

Everything worked as intended.

Tested-by: Folke Gleumes <f.gleumes at proxmox.com>




More information about the pbs-devel mailing list