From: Tobias Stoeckmann Date: Thu, 14 May 2026 18:22:10 +0000 (+0200) Subject: mtree: Add dot dot regression test X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b5a4fd535032d6a6cd2bd5aafaf762a856e3c63;p=thirdparty%2Flibarchive.git mtree: Add dot dot regression test Check if resolving dot dot does work as expected. Signed-off-by: Tobias Stoeckmann --- diff --git a/Makefile.am b/Makefile.am index cf54b4e54..158787ebe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -670,6 +670,7 @@ libarchive_test_SOURCES= \ libarchive/test/test_write_format_mtree_absolute_path.c \ libarchive/test/test_write_format_mtree_classic.c \ libarchive/test/test_write_format_mtree_classic_indent.c\ + libarchive/test/test_write_format_mtree_dotdot.c \ libarchive/test/test_write_format_mtree_fflags.c \ libarchive/test/test_write_format_mtree_no_separator.c \ libarchive/test/test_write_format_mtree_preset_digests.c \ diff --git a/libarchive/test/CMakeLists.txt b/libarchive/test/CMakeLists.txt index f6f5beba7..20a20bafb 100644 --- a/libarchive/test/CMakeLists.txt +++ b/libarchive/test/CMakeLists.txt @@ -302,6 +302,7 @@ IF(ENABLE_TEST) test_write_format_mtree_absolute_path.c test_write_format_mtree_classic.c test_write_format_mtree_classic_indent.c + test_write_format_mtree_dotdot.c test_write_format_mtree_fflags.c test_write_format_mtree_no_separator.c test_write_format_mtree_preset_digests.c diff --git a/libarchive/test/test_write_format_mtree_dotdot.c b/libarchive/test/test_write_format_mtree_dotdot.c new file mode 100644 index 000000000..731b11434 --- /dev/null +++ b/libarchive/test/test_write_format_mtree_dotdot.c @@ -0,0 +1,103 @@ +/*- + * Copyright (c) 2026 Tobias Stoeckmann + * 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 + * in this position and unchanged. + * 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" + +#ifdef HAVE_SYS_STAT_H +#include +#endif + +static char buff[4096]; + +DEFINE_TEST(test_write_format_mtree_dotdot) +{ + struct archive_entry *ae; + struct archive* a; + size_t used; + + /* Create an mtree format archive. */ + assert((a = archive_write_new()) != NULL); + assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_mtree(a)); + assertEqualIntA(a, ARCHIVE_OK, + archive_write_open_memory(a, buff, sizeof(buff)-1, &used)); + + /* Write "./dir0/dir1" directory. */ + assert((ae = archive_entry_new()) != NULL); + archive_entry_copy_pathname(ae, "./dir0/dir1"); + archive_entry_set_mode(ae, AE_IFDIR | 0755); + assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae)); + archive_entry_free(ae); + + /* Write "dir0/../../dir0/dir1/file1" file. */ + assert((ae = archive_entry_new()) != NULL); + archive_entry_copy_pathname(ae, "dir0/../../dir0/dir1/file1"); + archive_entry_set_size(ae, 0); + archive_entry_set_mode(ae, AE_IFREG | 0644); + assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae)); + archive_entry_free(ae); + + /* Write "dir0/..//dir0/dir1/file2" file. */ + assert((ae = archive_entry_new()) != NULL); + archive_entry_copy_pathname(ae, "dir0/..//dir0/dir1/file2"); + archive_entry_set_size(ae, 0); + archive_entry_set_mode(ae, AE_IFREG | 0644); + assertEqualIntA(a, ARCHIVE_OK, archive_write_header(a, ae)); + archive_entry_free(ae); + + assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); + + /* + * Read the data and check it. + */ + assert((a = archive_read_new()) != NULL); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used)); + + /* Read "./dir0/dir1" directory. */ + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + failure("The path should be just \"./dir0/dir1\""); + assertEqualString(archive_entry_pathname(ae), "./dir0/dir1"); + assertEqualInt(archive_entry_mode(ae), AE_IFDIR | 0755); + + /* Read "./dir0/dir1/file1" file. */ + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + failure("The path should be just \"./dir0/dir1/file1\""); + assertEqualString(archive_entry_pathname(ae), "./dir0/dir1/file1"); + assertEqualInt(archive_entry_mode(ae), AE_IFREG | 0644); + + /* Read "./dir0/dir1/file2" file. */ + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + failure("The path should be just \"./dir0/dir1/file2\""); + assertEqualString(archive_entry_pathname(ae), "./dir0/dir1/file2"); + assertEqualInt(archive_entry_size(ae), 0); + assertEqualInt(archive_entry_mode(ae), AE_IFREG | 0644); + + assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); +} +