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
160 lines
5.6 KiB
C
160 lines
5.6 KiB
C
/*-
|
|
* Copyright (c) 2010 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_option_U_upper)
|
|
{
|
|
int r;
|
|
|
|
assertMakeFile("file1", 0644, "file1");
|
|
assertMakeDir("d1", 0755);
|
|
assertMakeFile("d1/file1", 0644, "d1/file1");
|
|
assertEqualInt(0, systemf("%s -cf archive.tar file1 d1/file1", testprog));
|
|
|
|
/*
|
|
* bsdtar's man page used to claim that -x without -U would
|
|
* not break hard links. This was and is nonsense. The first
|
|
* two tests here simply verify that existing hard links get
|
|
* broken regardless.
|
|
*/
|
|
|
|
/* Test 1: -x without -U */
|
|
assertMakeDir("test1", 0755);
|
|
assertChdir("test1");
|
|
assertMakeFile("file1", 0644, "file1new");
|
|
assertMakeHardlink("file2", "file1");
|
|
assertEqualInt(0,
|
|
systemf("%s -xf ../archive.tar >test.out 2>test.err", testprog));
|
|
assertFileContents("file1", 5, "file1");
|
|
assertFileContents("file1new", 8, "file2");
|
|
assertEmptyFile("test.out");
|
|
assertEmptyFile("test.err");
|
|
assertChdir("..");
|
|
|
|
|
|
/* Test 2: -x with -U */
|
|
assertMakeDir("test2", 0755);
|
|
assertChdir("test2");
|
|
assertMakeFile("file1", 0644, "file1new");
|
|
assertMakeHardlink("file2", "file1");
|
|
assertEqualInt(0,
|
|
systemf("%s -xUf ../archive.tar >test.out 2>test.err", testprog));
|
|
assertFileContents("file1", 5, "file1");
|
|
assertFileContents("file1new", 8, "file2");
|
|
assertEmptyFile("test.out");
|
|
assertEmptyFile("test.err");
|
|
assertChdir("..");
|
|
|
|
/*
|
|
* -U does make a difference in how bsdtar handles unwanted symlinks,
|
|
* though. It interacts with -P.
|
|
*/
|
|
if (!canSymlink())
|
|
return;
|
|
|
|
/* Test 3: Intermediate dir symlink causes error by default */
|
|
assertMakeDir("test3", 0755);
|
|
assertChdir("test3");
|
|
assertMakeDir("realDir", 0755);
|
|
assertMakeSymlink("d1", "realDir", 1);
|
|
r = systemf("%s -xf ../archive.tar d1/file1 >test.out 2>test.err", testprog);
|
|
assert(r != 0);
|
|
assertIsSymlink("d1", "realDir", 1);
|
|
assertFileNotExists("d1/file1");
|
|
assertEmptyFile("test.out");
|
|
assertNonEmptyFile("test.err");
|
|
assertChdir("..");
|
|
|
|
/* Test 4: Intermediate dir symlink gets removed with -U */
|
|
assertMakeDir("test4", 0755);
|
|
assertChdir("test4");
|
|
assertMakeDir("realDir", 0755);
|
|
assertMakeSymlink("d1", "realDir", 1);
|
|
assertEqualInt(0,
|
|
systemf("%s -xUf ../archive.tar >test.out 2>test.err", testprog));
|
|
assertIsDir("d1", -1);
|
|
assertFileContents("d1/file1", 8, "d1/file1");
|
|
assertEmptyFile("test.out");
|
|
assertEmptyFile("test.err");
|
|
assertChdir("..");
|
|
|
|
/* Test 5: Intermediate dir symlink is followed with -P */
|
|
assertMakeDir("test5", 0755);
|
|
assertChdir("test5");
|
|
assertMakeDir("realDir", 0755);
|
|
assertMakeSymlink("d1", "realDir", 1);
|
|
assertEqualInt(0,
|
|
systemf("%s -xPf ../archive.tar d1/file1 >test.out 2>test.err", testprog));
|
|
assertIsSymlink("d1", "realDir", 1);
|
|
assertFileContents("d1/file1", 8, "d1/file1");
|
|
assertEmptyFile("test.out");
|
|
assertEmptyFile("test.err");
|
|
assertChdir("..");
|
|
|
|
/* Test 6: Intermediate dir symlink is followed with -PU */
|
|
assertMakeDir("test6", 0755);
|
|
assertChdir("test6");
|
|
assertMakeDir("realDir", 0755);
|
|
assertMakeSymlink("d1", "realDir", 1);
|
|
assertEqualInt(0,
|
|
systemf("%s -xPUf ../archive.tar d1/file1 >test.out 2>test.err", testprog));
|
|
assertIsSymlink("d1", "realDir", 1);
|
|
assertFileContents("d1/file1", 8, "d1/file1");
|
|
assertEmptyFile("test.out");
|
|
assertEmptyFile("test.err");
|
|
assertChdir("..");
|
|
|
|
/* Test 7: Final file symlink replaced by default */
|
|
assertMakeDir("test7", 0755);
|
|
assertChdir("test7");
|
|
assertMakeDir("d1", 0755);
|
|
assertMakeFile("d1/realfile1", 0644, "realfile1");
|
|
assertMakeSymlink("d1/file1", "d1/realfile1", 0);
|
|
assertEqualInt(0,
|
|
systemf("%s -xf ../archive.tar d1/file1 >test.out 2>test.err", testprog));
|
|
assertIsReg("d1/file1", umasked(0644));
|
|
assertFileContents("d1/file1", 8, "d1/file1");
|
|
assertFileContents("realfile1", 9, "d1/realfile1");
|
|
assertEmptyFile("test.out");
|
|
assertEmptyFile("test.err");
|
|
assertChdir("..");
|
|
|
|
/* Test 8: Final file symlink replaced with -PU */
|
|
assertMakeDir("test8", 0755);
|
|
assertChdir("test8");
|
|
assertMakeDir("d1", 0755);
|
|
assertMakeFile("d1/realfile1", 0644, "realfile1");
|
|
assertMakeSymlink("d1/file1", "d1/realfile1", 0);
|
|
assertEqualInt(0,
|
|
systemf("%s -xPUf ../archive.tar d1/file1 >test.out 2>test.err", testprog));
|
|
assertIsReg("d1/file1", umasked(0644));
|
|
assertFileContents("d1/file1", 8, "d1/file1");
|
|
assertFileContents("realfile1", 9, "d1/realfile1");
|
|
assertEmptyFile("test.out");
|
|
assertEmptyFile("test.err");
|
|
assertChdir("..");
|
|
}
|