Use a character table to check safe characters in filenames in a mtree archive,

and add a test for it.

diff --git a/Makefile.am b/Makefile.am
index fe30c5b66afea1fbb46a34f9d55083789ace3ded..928fc82e3842b2f142c9683eae58740e4541629d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -426,11 +426,12 @@ libarchive_test_SOURCES=                                  \
        libarchive/test/test_write_format_iso9660_filename.c    \
        libarchive/test/test_write_format_iso9660_zisofs.c      \
        libarchive/test/test_write_format_mtree.c               \
+       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_fflags.c        \
        libarchive/test/test_write_format_mtree_no_separator.c  \
-       libarchive/test/test_write_format_mtree_absolute_path.c \
+       libarchive/test/test_write_format_mtree_quoted_filename.c\
        libarchive/test/test_write_format_pax.c                 \
        libarchive/test/test_write_format_shar_empty.c          \
        libarchive/test/test_write_format_tar.c                 \

diff --git a/libarchive/archive_write_set_format_mtree.c b/libarchive/archive_write_set_format_mtree.c
index 5446af112032ec13c81927519d94572c0e2e7ff6..8e984ca8d59b8bfb8d80125edecd345f438eac46 100644 (file)
--- a/libarchive/archive_write_set_format_mtree.c
+++ b/libarchive/archive_write_set_format_mtree.c
@@ -314,26 +314,30 @@ static const uint32_t crctab[] = {
        0xa2f33668, 0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4
 };
 
-static int
-mtree_safe_char(char c)
-{
-       if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'))
-               return 1;
-       if (c >= '0' && c <= '9')
-               return 1;
-       if (c == 35 || c == 61 || c == 92)
-               return 0; /* #, = and \ are always quoted */
-       
-       if (c >= 33 && c <= 47) /* !"$%&'()*+,-./ */
-               return 1;
-       if (c >= 58 && c <= 64) /* :;<>?@ */
-               return 1;
-       if (c >= 91 && c <= 96) /* []^_` */
-               return 1;
-       if (c >= 123 && c <= 126) /* {|}~ */
-               return 1;
-       return 0;
-}
+static const unsigned char safe_char[256] = {
+       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 00 - 0F */
+       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 10 - 1F */
+       /* !"$%&'()*+,-./  EXCLUSION:0x20( ) 0x23(#) */
+       0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 20 - 2F */
+       /* 0123456789:;<>?  EXCLUSION:0x3d(=) */
+       1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, /* 30 - 3F */
+       /* @ABCDEFGHIJKLMNO */
+       1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 40 - 4F */
+       /* PQRSTUVWXYZ[]^_ EXCLUSION:0x5c(\)  */
+       1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, /* 50 - 5F */
+       /* `abcdefghijklmno */
+       1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 60 - 6F */
+       /* pqrstuvwxyz{|}~ */
+       1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, /* 70 - 7F */
+       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 80 - 8F */
+       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 90 - 9F */
+       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* A0 - AF */
+       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* B0 - BF */
+       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* C0 - CF */
+       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* D0 - DF */
+       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* E0 - EF */
+       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* F0 - FF */
+};
 
 static void
 mtree_quote(struct archive_string *s, const char *str)
@@ -343,7 +347,7 @@ mtree_quote(struct archive_string *s, const char *str)
        unsigned char c;
 
        for (start = str; *str != '\0'; ++str) {
-               if (mtree_safe_char(*str))
+               if (safe_char[*(const unsigned char *)str])
                        continue;
                if (start != str)
                        archive_strncat(s, start, str - start);

diff --git a/libarchive/test/test_write_format_mtree_quoted_filename.c b/libarchive/test/test_write_format_mtree_quoted_filename.c
new file mode 100644 (file)
index 0000000..1ffbe05
--- /dev/null
+++ b/libarchive/test/test_write_format_mtree_quoted_filename.c
@@ -0,0 +1,86 @@
+/*-
+ * Copyright (c) 2012 Michihiro NAKAJIMA
+ * 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"
+__FBSDID("$FreeBSD$");
+
+static char buff[4096];
+
+static const char image [] = {
+"#mtree\n"
+"./a\\040!$\\043&\\075_\\134^z\\177~ mode=644 type=file\n"
+};
+
+
+DEFINE_TEST(test_write_format_mtree_quoted_filename)
+{
+       struct archive_entry *ae;
+       struct archive* a;
+       size_t used;
+
+       /* Create a 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_set_format_option(a, NULL, "all", NULL));
+       assertEqualIntA(a, ARCHIVE_OK,
+               archive_write_set_format_option(a, NULL, "type", "1"));
+       assertEqualIntA(a, ARCHIVE_OK,
+               archive_write_set_format_option(a, NULL, "mode", "1"));
+       assertEqualIntA(a, ARCHIVE_OK,
+               archive_write_open_memory(a, buff, sizeof(buff)-1, &used));
+
+       /* Write entry which has #, = , \ and DEL(0177) in the filename. */
+       assert((ae = archive_entry_new()) != NULL);
+       archive_entry_set_mode(ae, AE_IFREG | 0644);
+       assertEqualInt(AE_IFREG | 0644, archive_entry_mode(ae));
+       archive_entry_copy_pathname(ae, "./a !$#&=_\\^z\177~");
+       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));
+
+       buff[used] = '\0';
+       failure("#, = and \\ in the filename should be quoted");
+       assertEqualString(buff, image);
+
+       /*
+        * 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 entry */
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
+       assertEqualInt(AE_IFREG | 0644, archive_entry_mode(ae));
+       assertEqualString("./a !$#&=_\\^z\177~", archive_entry_pathname(ae));
+       assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
+       assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+}
+