diff options
author | Samanta Navarro <ferivoz@riseup.net> | 2021-08-29 11:59:29 +0000 |
---|---|---|
committer | Samanta Navarro <ferivoz@riseup.net> | 2021-09-05 11:54:48 +0000 |
commit | fe83fc33da3ca494e9ee932622f9bfab682a3a73 (patch) | |
tree | 50e47f6da1af9b3d78e78a1128304afb69032e33 | |
parent | 12d74cff72dd3505861ac1ba32deb8bd53d8bb43 (diff) | |
download | libarchive-fe83fc33da3ca494e9ee932622f9bfab682a3a73.tar.gz |
Added test case for ustar directory handling
Based on test_compat_tar_hardlink.c and with input by Tim Kientzle.
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | libarchive/test/CMakeLists.txt | 1 | ||||
-rw-r--r-- | libarchive/test/test_compat_tar_directory.c | 77 | ||||
-rw-r--r-- | libarchive/test/test_compat_tar_directory_1.tar.uu | 50 | ||||
-rw-r--r-- | libarchive/test/test_fuzz.c | 5 |
5 files changed, 135 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index c93a82e9..54d29251 100644 --- a/Makefile.am +++ b/Makefile.am @@ -414,6 +414,7 @@ libarchive_test_SOURCES= \ libarchive/test/test_compat_solaris_tar_acl.c \ libarchive/test/test_compat_solaris_pax_sparse.c \ libarchive/test/test_compat_star_acl.c \ + libarchive/test/test_compat_tar_directory.c \ libarchive/test/test_compat_tar_hardlink.c \ libarchive/test/test_compat_uudecode.c \ libarchive/test/test_compat_uudecode_large.c \ @@ -695,6 +696,7 @@ libarchive_test_EXTRA_DIST=\ libarchive/test/test_compat_solaris_tar_acl.tar.uu \ libarchive/test/test_compat_star_acl_nfs4.tar.uu \ libarchive/test/test_compat_star_acl_posix1e.tar.uu \ + libarchive/test/test_compat_tar_directory_1.tar.uu \ libarchive/test/test_compat_tar_hardlink_1.tar.uu \ libarchive/test/test_compat_uudecode_large.tar.Z.uu \ libarchive/test/test_compat_xz_1.txz.uu \ diff --git a/libarchive/test/CMakeLists.txt b/libarchive/test/CMakeLists.txt index 53cc3e22..6d819954 100644 --- a/libarchive/test/CMakeLists.txt +++ b/libarchive/test/CMakeLists.txt @@ -63,6 +63,7 @@ IF(ENABLE_TEST) test_compat_solaris_pax_sparse.c test_compat_solaris_tar_acl.c test_compat_star_acl.c + test_compat_tar_directory.c test_compat_tar_hardlink.c test_compat_uudecode.c test_compat_uudecode_large.c diff --git a/libarchive/test/test_compat_tar_directory.c b/libarchive/test/test_compat_tar_directory.c new file mode 100644 index 00000000..5750db36 --- /dev/null +++ b/libarchive/test/test_compat_tar_directory.c @@ -0,0 +1,77 @@ +/*- + * Copyright (c) 2021 Samanta Navarro + * 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$"); + +/* + * Background: Original tar file format did not use its linkflag to + * specify directories. Instead regular files simply have a slash + * appended to their names. No data blocks follow directories in + * archives. This means that a possibly specified file size must not + * be used to determine the amount of data blocks to skip. + */ + +static void +test_compat_tar_directory_1(void) +{ + char name[] = "test_compat_tar_directory_1.tar"; + struct archive_entry *ae; + struct archive *a; + + assert((a = archive_read_new()) != NULL); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); + extract_reference_file(name); + assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, name, 10240)); + + /* Read first entry, which is a directory in a regular file header. */ + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualString("directory1/", archive_entry_pathname(ae)); + assertEqualInt(AE_IFDIR, archive_entry_filetype(ae)); + assertEqualInt(1, archive_entry_size(ae)); + + /* Read second entry, which is a ustar directory entry. */ + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualString("directory2/", archive_entry_pathname(ae)); + assertEqualInt(AE_IFDIR, archive_entry_filetype(ae)); + assertEqualInt(0, archive_entry_size(ae)); + + /* Verify the end-of-archive. */ + assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); + + /* Verify that the format detection worked. */ + assertEqualInt(archive_filter_code(a, 0), ARCHIVE_FILTER_NONE); + assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR); + + assertEqualInt(ARCHIVE_OK, archive_read_close(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); +} + +DEFINE_TEST(test_compat_tar_directory) +{ + test_compat_tar_directory_1(); +} + + diff --git a/libarchive/test/test_compat_tar_directory_1.tar.uu b/libarchive/test/test_compat_tar_directory_1.tar.uu new file mode 100644 index 00000000..3e1ead9b --- /dev/null +++ b/libarchive/test/test_compat_tar_directory_1.tar.uu @@ -0,0 +1,50 @@ +$FreeBSD$ +begin 644 test_compat_tar_directory_1.tar +M9&ER96-T;W)Y,2\````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M`````````````#`P,#`W,#``,#`P,#`P,``P,#`P,#`P`#`P,#`P,#`P,#`Q +M`#`P,#`P,#`P,#`P`#`P-C4Q-0`@```````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M``````````````````````!D:7)E8W1O<GDR+P`````````````````````` +M```````````````````````````````````````````````````````````` +M````````````````````````````````````,#`P,#<P,``P,#`P,#`P`#`P +M,#`P,#``,#`P,#`P,#`P,#``,#`P,#`P,#`P,#``,#`V-3$U`"`````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +M```````````````````````````````````````````````````````````` +7```````````````````````````````` +` +end diff --git a/libarchive/test/test_fuzz.c b/libarchive/test/test_fuzz.c index b2654c4a..3fbe6441 100644 --- a/libarchive/test/test_fuzz.c +++ b/libarchive/test/test_fuzz.c @@ -428,6 +428,10 @@ DEFINE_TEST(test_fuzz_tar) NULL }; #endif + static const char *fileset11[] = { + "test_compat_tar_directory_1.tar", + NULL + }; static const struct files filesets[] = { {0, fileset1}, /* Exercise bzip2 decompressor. */ {1, fileset1}, @@ -444,6 +448,7 @@ DEFINE_TEST(test_fuzz_tar) #if HAVE_ZSTD_H && HAVE_LIBZSTD {0, fileset10}, /* Exercise zstd decompressor. */ #endif + {0, fileset11}, {1, NULL} }; test_fuzz(filesets); |