52c2bb7516
Sync libarchive with vendor. Relevant vendor changes: Issue #795: XAR - do not try to add xattrs without an allocated name PR #812: non-recursive option for extract and list PR #958: support reading metadata from compressed files PR #999: add --exclude-vcs option to bsdtar Issue #1062: treat empty archives with a GNU volume header as valid PR #1074: Handle ZIP files with trailing 0s in the extra fields (Android APK archives) PR #1109: Ignore padding in Zip extra field data (Android APK archives) PR #1167: fix problems related to unreadable directories Issue #1168: fix handling of strtol() and strtoul() PR #1172: RAR5 - fix invalid window buffer read in E8E9 filter PR #1174: ZIP reader - fix of MSZIP signature parsing PR #1175: gzip filter - fix reading files larger than 4GB from memory PR #1177: gzip filter - fix memory leak with repeated header reads PR #1180: ZIP reader - add support for Info-ZIP Unicode Path Extra Field PR #1181: RAR5 - fix merge_block() recursion (OSS-Fuzz 12999, 13029, 13144, 13478, 13490) PR #1183: fix memory leak when decompressing ZIP files with LZMA PR #1184: fix RAR5 OSS-Fuzz issues 12466, 14490, 14491, 12817 OSS-Fuzz 12466: RAR5 - fix buffer overflow when parsing huffman tables OSS-Fuzz 14490, 14491: RAR5 - fix bad shift-left operations OSS-Fuzz 12817: RAR5 - handle a case with truncated huffman tables PR #1186: RAR5 - fix invalid type used for dictionary size mask (OSS-Fuzz 14537) PR #1187: RAR5 - fix integer overflow (OSS-Fuzz 14555) PR #1190: RAR5 - RAR5 don't try to unpack entries marked as directories (OSS-Fuzz 14574) PR #1196: RAR5 - fix a potential SIGSEGV on 32-bit builds OSS-Fuzz 2582: RAR - fix use after free if there is an invalid entry OSS-Fuzz 14331: RAR5 - fix maximum owner name length OSS-Fuzz 13965: RAR5 - use unsigned int for volume number + range check Additional RAR5 reader changes: - support symlinks, hardlinks, file owner, file group, versioned files - change ARCHIVE_FORMAT_RAR_V5 to 0x100000 - set correct mode for readonly directories - support readonly, hidden and system Windows file attributes MFC after: 2 weeks
161 lines
6.1 KiB
C
161 lines
6.1 KiB
C
/*-
|
|
* Copyright (c) 2003-2007 Tim Kientzle
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
#include "test.h"
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
/*
|
|
* tar -x -P should follow existing symlinks for dirs, but not other
|
|
* content. Plain tar -x should remove symlinks when they're in the
|
|
* way of a dir extraction.
|
|
*/
|
|
|
|
DEFINE_TEST(test_symlink_dir)
|
|
{
|
|
assertUmask(0);
|
|
|
|
assertMakeDir("source", 0755);
|
|
assertMakeFile("source/file", 0755, "a");
|
|
assertMakeFile("source/file2", 0755, "ab");
|
|
assertMakeDir("source/dir", 0755);
|
|
assertMakeDir("source/dir/d", 0755);
|
|
assertMakeFile("source/dir/f", 0755, "abc");
|
|
assertMakeDir("source/dir2", 0755);
|
|
assertMakeDir("source/dir2/d2", 0755);
|
|
assertMakeFile("source/dir2/f2", 0755, "abcd");
|
|
assertMakeDir("source/dir3", 0755);
|
|
assertMakeDir("source/dir3/d3", 0755);
|
|
assertMakeFile("source/dir3/f3", 0755, "abcde");
|
|
assertMakeDir("source/dir4", 0755);
|
|
assertMakeFile("source/dir4/file3", 0755, "abcdef");
|
|
assertMakeHardlink("source/dir4/file4", "source/dir4/file3");
|
|
|
|
assertEqualInt(0,
|
|
systemf("%s -cf test.tar -C source dir dir2 dir3 file file2",
|
|
testprog));
|
|
|
|
/* Second archive with hardlinks */
|
|
assertEqualInt(0,
|
|
systemf("%s -cf test2.tar -C source dir4", testprog));
|
|
|
|
/*
|
|
* Extract with -x and without -P.
|
|
*/
|
|
assertMakeDir("dest1", 0755);
|
|
/* "dir" is a symlink to an existing "dest1/real_dir" */
|
|
assertMakeDir("dest1/real_dir", 0755);
|
|
if (canSymlink()) {
|
|
assertMakeSymlink("dest1/dir", "real_dir", 1);
|
|
/* "dir2" is a symlink to a non-existing "real_dir2" */
|
|
assertMakeSymlink("dest1/dir2", "real_dir2", 1);
|
|
} else {
|
|
skipping("Symlinks are not supported on this platform");
|
|
}
|
|
/* "dir3" is a symlink to an existing "non_dir3" */
|
|
assertMakeFile("dest1/non_dir3", 0755, "abcdef");
|
|
if (canSymlink())
|
|
assertMakeSymlink("dest1/dir3", "non_dir3", 1);
|
|
/* "file" is a symlink to existing "real_file" */
|
|
assertMakeFile("dest1/real_file", 0755, "abcdefg");
|
|
if (canSymlink()) {
|
|
assertMakeSymlink("dest1/file", "real_file", 0);
|
|
/* "file2" is a symlink to non-existing "real_file2" */
|
|
assertMakeSymlink("dest1/file2", "real_file2", 0);
|
|
}
|
|
assertEqualInt(0, systemf("%s -xf test.tar -C dest1", testprog));
|
|
|
|
/* dest1/dir symlink should be replaced */
|
|
failure("symlink to dir was followed when it shouldn't be");
|
|
assertIsDir("dest1/dir", -1);
|
|
/* dest1/dir2 symlink should be replaced */
|
|
failure("Broken symlink wasn't replaced with dir");
|
|
assertIsDir("dest1/dir2", -1);
|
|
/* dest1/dir3 symlink should be replaced */
|
|
failure("Symlink to non-dir wasn't replaced with dir");
|
|
assertIsDir("dest1/dir3", -1);
|
|
/* dest1/file symlink should be replaced */
|
|
failure("Symlink to existing file should be replaced");
|
|
assertIsReg("dest1/file", -1);
|
|
/* dest1/file2 symlink should be replaced */
|
|
failure("Symlink to non-existing file should be replaced");
|
|
assertIsReg("dest1/file2", -1);
|
|
|
|
/*
|
|
* Extract with both -x and -P
|
|
*/
|
|
assertMakeDir("dest2", 0755);
|
|
/* "dir" is a symlink to existing "real_dir" */
|
|
assertMakeDir("dest2/real_dir", 0755);
|
|
if (canSymlink())
|
|
assertMakeSymlink("dest2/dir", "real_dir", 1);
|
|
/* "dir2" is a symlink to a non-existing "real_dir2" */
|
|
if (canSymlink())
|
|
assertMakeSymlink("dest2/dir2", "real_dir2", 1);
|
|
/* "dir3" is a symlink to an existing "non_dir3" */
|
|
assertMakeFile("dest2/non_dir3", 0755, "abcdefgh");
|
|
if (canSymlink())
|
|
assertMakeSymlink("dest2/dir3", "non_dir3", 1);
|
|
/* "file" is a symlink to existing "real_file" */
|
|
assertMakeFile("dest2/real_file", 0755, "abcdefghi");
|
|
if (canSymlink())
|
|
assertMakeSymlink("dest2/file", "real_file", 0);
|
|
/* "file2" is a symlink to non-existing "real_file2" */
|
|
if (canSymlink())
|
|
assertMakeSymlink("dest2/file2", "real_file2", 0);
|
|
assertEqualInt(0, systemf("%s -xPf test.tar -C dest2", testprog));
|
|
|
|
/* "dir4" is a symlink to existing "real_dir" */
|
|
if (canSymlink())
|
|
assertMakeSymlink("dest2/dir4", "real_dir", 1);
|
|
assertEqualInt(0, systemf("%s -xPf test2.tar -C dest2", testprog));
|
|
|
|
/* dest2/dir and dest2/dir4 symlinks should be followed */
|
|
if (canSymlink()) {
|
|
assertIsSymlink("dest2/dir", "real_dir", 1);
|
|
assertIsSymlink("dest2/dir4", "real_dir", 1);
|
|
assertIsDir("dest2/real_dir", -1);
|
|
}
|
|
|
|
/* Contents of 'dir' should be restored */
|
|
assertIsDir("dest2/dir/d", -1);
|
|
assertIsReg("dest2/dir/f", -1);
|
|
assertFileSize("dest2/dir/f", 3);
|
|
/* dest2/dir2 symlink should be removed */
|
|
failure("Broken symlink wasn't replaced with dir");
|
|
assertIsDir("dest2/dir2", -1);
|
|
/* dest2/dir3 symlink should be removed */
|
|
failure("Symlink to non-dir wasn't replaced with dir");
|
|
assertIsDir("dest2/dir3", -1);
|
|
/* dest2/file symlink should be removed;
|
|
* even -P shouldn't follow symlinks for files */
|
|
failure("Symlink to existing file should be removed");
|
|
assertIsReg("dest2/file", -1);
|
|
/* dest2/file2 symlink should be removed */
|
|
failure("Symlink to non-existing file should be removed");
|
|
assertIsReg("dest2/file2", -1);
|
|
|
|
/* dest2/dir4/file3 and dest2/dir4/file4 should be hard links */
|
|
assertIsHardlink("dest2/dir4/file3", "dest2/dir4/file4");
|
|
}
|