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
141 lines
5.4 KiB
C
141 lines
5.4 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$");
|
|
|
|
DEFINE_TEST(test_strip_components)
|
|
{
|
|
assertMakeDir("d0", 0755);
|
|
assertChdir("d0");
|
|
assertMakeDir("d1", 0755);
|
|
assertMakeDir("d1/d2", 0755);
|
|
assertMakeDir("d1/d2/d3", 0755);
|
|
assertMakeFile("d1/d2/f1", 0644, "");
|
|
assertMakeHardlink("l1", "d1/d2/f1");
|
|
assertMakeHardlink("d1/l2", "d1/d2/f1");
|
|
if (canSymlink()) {
|
|
assertMakeSymlink("s1", "d1/d2/f1", 0);
|
|
assertMakeSymlink("d1/s2", "d2/f1", 0);
|
|
}
|
|
assertChdir("..");
|
|
|
|
/*
|
|
* Test 1: Strip components when extracting archives.
|
|
*/
|
|
if (canSymlink())
|
|
assertEqualInt(0, systemf("%s -cf test.tar d0/l1 d0/s1 d0/d1",
|
|
testprog));
|
|
else
|
|
assertEqualInt(0, systemf("%s -cf test.tar d0/l1 d0/d1",
|
|
testprog));
|
|
|
|
assertMakeDir("target", 0755);
|
|
assertEqualInt(0, systemf("%s -x -C target --strip-components 2 "
|
|
"-f test.tar", testprog));
|
|
|
|
failure("d0/ is too short and should not get restored");
|
|
assertFileNotExists("target/d0");
|
|
failure("d0/d1/ is too short and should not get restored");
|
|
assertFileNotExists("target/d1");
|
|
failure("d0/s1 is too short and should not get restored");
|
|
assertFileNotExists("target/s1");
|
|
failure("d0/d1/s2 is a symlink to something that won't be extracted");
|
|
/* If platform supports symlinks, target/s2 is a broken symlink. */
|
|
/* If platform does not support symlink, target/s2 doesn't exist. */
|
|
if (canSymlink())
|
|
assertIsSymlink("target/s2", "d2/f1", 0);
|
|
else
|
|
assertFileNotExists("target/s2");
|
|
failure("d0/d1/d2 should be extracted");
|
|
assertIsDir("target/d2", -1);
|
|
|
|
/*
|
|
* Test 1b: Strip components extracting archives involving hardlinks.
|
|
*
|
|
* This next is a complicated case. d0/l1, d0/d1/l2, and
|
|
* d0/d1/d2/f1 are all hardlinks to the same file; d0/l1 can't
|
|
* be extracted with --strip-components=2 and the other two
|
|
* can. Remember that tar normally stores the first file with
|
|
* a body and the other as hardlink entries to the first
|
|
* appearance. So the final result depends on the order in
|
|
* which these three names get archived. If d0/l1 is first,
|
|
* none of the three can be restored. If either of the longer
|
|
* names are first, then the two longer ones can both be
|
|
* restored. Note that the "tar -cf" command above explicitly
|
|
* lists d0/l1 before d0/d1.
|
|
*
|
|
* It may be worth extending this test to exercise other
|
|
* archiving orders.
|
|
*
|
|
* Of course, this is all totally different for cpio and newc
|
|
* formats because the hardlink management is different.
|
|
* TODO: Rename this to test_strip_components_tar and create
|
|
* parallel tests for cpio and newc formats.
|
|
*/
|
|
failure("d0/l1 is too short and should not get restored");
|
|
assertFileNotExists("target/l1");
|
|
failure("d0/d1/l2 is a hardlink to file whose name was too short");
|
|
assertFileNotExists("target/l2");
|
|
failure("d0/d1/d2/f1 is a hardlink to file whose name was too short");
|
|
assertFileNotExists("target/d2/f1");
|
|
|
|
/*
|
|
* Test 2: Strip components when creating archives.
|
|
*/
|
|
if (canSymlink())
|
|
assertEqualInt(0, systemf("%s --strip-components 2 -cf test2.tar "
|
|
"d0/l1 d0/s1 d0/d1", testprog));
|
|
else
|
|
assertEqualInt(0, systemf("%s --strip-components 2 -cf test2.tar "
|
|
"d0/l1 d0/d1", testprog));
|
|
|
|
assertMakeDir("target2", 0755);
|
|
assertEqualInt(0, systemf("%s -x -C target2 -f test2.tar", testprog));
|
|
|
|
failure("d0/ is too short and should not have been archived");
|
|
assertFileNotExists("target2/d0");
|
|
failure("d0/d1/ is too short and should not have been archived");
|
|
assertFileNotExists("target2/d1");
|
|
failure("d0/s1 is too short and should not get restored");
|
|
assertFileNotExists("target/s1");
|
|
/* If platform supports symlinks, target/s2 is included. */
|
|
if (canSymlink()) {
|
|
failure("d0/d1/s2 is a symlink to something included in archive");
|
|
assertIsSymlink("target2/s2", "d2/f1", 0);
|
|
}
|
|
failure("d0/d1/d2 should be archived");
|
|
assertIsDir("target2/d2", -1);
|
|
|
|
/*
|
|
* Test 2b: Strip components creating archives involving hardlinks.
|
|
*/
|
|
failure("d0/l1 is too short and should not have been archived");
|
|
assertFileNotExists("target/l1");
|
|
failure("d0/d1/l2 is a hardlink to file whose name was too short");
|
|
assertFileNotExists("target/l2");
|
|
failure("d0/d1/d2/f1 is a hardlink to file whose name was too short");
|
|
assertFileNotExists("target/d2/f1");
|
|
}
|