Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/archival/tar.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/archival/tar.c (modified) (27 diffs)

branches/3.2/mindi-busybox/archival/tar.c

@@ -24 +24 @@
  */
 
+/* TODO: security with -C DESTDIR option can be enhanced.
+ * Consider tar file created via:
+ * $ tar cvf bug.tar anything.txt
+ * $ ln -s /tmp symlink
+ * $ tar --append -f bug.tar symlink
+ * $ rm symlink
+ * $ mkdir symlink
+ * $ tar --append -f bug.tar symlink/evil.py
+ *
+ * This will result in an archive which contains:
+ * $ tar --list -f bug.tar
+ * anything.txt
+ * symlink
+ * symlink/evil.py
+ *
+ * Untarring it puts evil.py in '/tmp' even if the -C DESTDIR is given.
+ * This doesn't feel right, and IIRC GNU tar doesn't do that.
+ */
+
 #include <fnmatch.h>
 #include "libbb.h"
-#include "archive.h"
+#include "bb_archive.h"
 /* FIXME: Stop using this non-standard feature */
 #ifndef FNM_LEADING_DIR
@@ -42 +61 @@
 #if !ENABLE_FEATURE_SEAMLESS_GZ && !ENABLE_FEATURE_SEAMLESS_BZ2
 /* Do not pass gzip flag to writeTarFile() */
-#define writeTarFile(tar_fd, verboseFlag, dereferenceFlag, include, exclude, gzip) \
-    writeTarFile(tar_fd, verboseFlag, dereferenceFlag, include, exclude)
+#define writeTarFile(tar_fd, verboseFlag, recurseFlags, include, exclude, gzip) \
+    writeTarFile(tar_fd, verboseFlag, recurseFlags, include, exclude)
 #endif
 
@@ -246 +265 @@
     PUT_OCTAL(header.gid, statbuf->st_gid);
     memset(header.size, '0', sizeof(header.size)-1); /* Regular file size is handled later */
-    PUT_OCTAL(header.mtime, statbuf->st_mtime);
+    /* users report that files with negative st_mtime cause trouble, so: */
+    PUT_OCTAL(header.mtime, statbuf->st_mtime >= 0 ? statbuf->st_mtime : 0);
 
     /* Enter the user and group names */
@@ -298 +318 @@
         header.typeflag = FIFOTYPE;
     } else if (S_ISREG(statbuf->st_mode)) {
-        if (sizeof(statbuf->st_size) > 4
-         && statbuf->st_size > (off_t)0777777777777LL
+        /* header.size field is 12 bytes long */
+        /* Does octal-encoded size fit? */
+        uoff_t filesize = statbuf->st_size;
+        if (sizeof(filesize) <= 4
+         || filesize <= (uoff_t)0777777777777LL
         ) {
+            PUT_OCTAL(header.size, filesize);
+        }
+        /* Does base256-encoded size fit?
+         * It always does unless off_t is wider than 64 bits.
+         */
+        else if (ENABLE_FEATURE_TAR_GNU_EXTENSIONS
+#if ULLONG_MAX > 0xffffffffffffffffLL /* 2^64-1 */
+         && (filesize <= 0x3fffffffffffffffffffffffLL)
+#endif
+        ) {
+            /* GNU tar uses "base-256 encoding" for very large numbers.
+             * Encoding is binary, with highest bit always set as a marker
+             * and sign in next-highest bit:
+             * 80 00 .. 00 - zero
+             * bf ff .. ff - largest positive number
+             * ff ff .. ff - minus 1
+             * c0 00 .. 00 - smallest negative number
+             */
+            char *p8 = header.size + sizeof(header.size);
+            do {
+                *--p8 = (uint8_t)filesize;
+                filesize >>= 8;
+            } while (p8 != header.size);
+            *p8 |= 0x80;
+        } else {
             bb_error_msg_and_die("can't store file '%s' "
                 "of size %"OFF_FMT"u, aborting",
@@ -306 +354 @@
         }
         header.typeflag = REGTYPE;
-        PUT_OCTAL(header.size, statbuf->st_size);
     } else {
         bb_error_msg("%s: unknown file type", fileName);
@@ -379 +426 @@
     DBG("writeFileToTarball('%s')", fileName);
 
-    /* Strip leading '/' (must be before memorizing hardlink's name) */
-    header_name = fileName;
-    while (header_name[0] == '/') {
-        static smallint warned;
-
-        if (!warned) {
-            bb_error_msg("removing leading '/' from member names");
-            warned = 1;
-        }
-        header_name++;
-    }
+    /* Strip leading '/' and such (must be before memorizing hardlink's name) */
+    header_name = strip_unsafe_prefix(fileName);
 
     if (header_name[0] == '\0')
@@ -561 +599 @@
 /* gcc 4.2.1 inlines it, making code bigger */
 static NOINLINE int writeTarFile(int tar_fd, int verboseFlag,
-    int dereferenceFlag, const llist_t *include,
+    int recurseFlags, const llist_t *include,
     const llist_t *exclude, int gzip)
 {
@@ -584 +622 @@
     /* Read the directory/files and iterate over them one at a time */
     while (include) {
-        if (!recursive_action(include->data, ACTION_RECURSE |
-                (dereferenceFlag ? ACTION_FOLLOWLINKS : 0),
+        if (!recursive_action(include->data, recurseFlags,
                 writeFileToTarball, writeFileToTarball, &tbInfo, 0)
         ) {
@@ -625 +662 @@
 #else
 int writeTarFile(int tar_fd, int verboseFlag,
-    int dereferenceFlag, const llist_t *include,
+    int recurseFlags, const llist_t *include,
     const llist_t *exclude, int gzip);
 #endif /* FEATURE_TAR_CREATE */
@@ -637 +674 @@
 
     while (list) {
-        src_stream = xfopen_for_read(llist_pop(&list));
+        src_stream = xfopen_stdin(llist_pop(&list));
         while ((line = xmalloc_fgetline(src_stream)) != NULL) {
             /* kill trailing '/' unless the string is just "/" */
@@ -653 +690 @@
 #endif
 
-#if ENABLE_FEATURE_SEAMLESS_Z
-static char FAST_FUNC get_header_tar_Z(archive_handle_t *archive_handle)
-{
-    /* Can't lseek over pipes */
-    archive_handle->seek = seek_by_read;
-
-    /* do the decompression, and cleanup */
-    if (xread_char(archive_handle->src_fd) != 0x1f
-     || xread_char(archive_handle->src_fd) != 0x9d
-    ) {
-        bb_error_msg_and_die("invalid magic");
-    }
-
-    open_transformer(archive_handle->src_fd, unpack_Z_stream, "uncompress");
-    archive_handle->offset = 0;
-    while (get_header_tar(archive_handle) == EXIT_SUCCESS)
-        continue;
-
-    /* Can only do one file at a time */
-    return EXIT_FAILURE;
-}
-#else
-# define get_header_tar_Z NULL
-#endif
-
-#ifdef CHECK_FOR_CHILD_EXITCODE
-/* Looks like it isn't needed - tar detects malformed (truncated)
- * archive if e.g. bunzip2 fails */
-static int child_error;
-
-static void handle_SIGCHLD(int status)
-{
-    /* Actually, 'status' is a signo. We reuse it for other needs */
-
-    /* Wait for any child without blocking */
-    if (wait_any_nohang(&status) < 0)
-        /* wait failed?! I'm confused... */
-        return;
-
-    if (WIFEXITED(status) && WEXITSTATUS(status) == 0)
-        /* child exited with 0 */
-        return;
-    /* Cannot happen?
-    if (!WIFSIGNALED(status) && !WIFEXITED(status)) return; */
-    child_error = 1;
-}
-#endif
-
 //usage:#define tar_trivial_usage
-//usage:       "-[" IF_FEATURE_TAR_CREATE("c") "xt" IF_FEATURE_SEAMLESS_GZ("z")
-//usage:    IF_FEATURE_SEAMLESS_BZ2("j") IF_FEATURE_SEAMLESS_LZMA("a")
-//usage:    IF_FEATURE_SEAMLESS_Z("Z") IF_FEATURE_TAR_NOPRESERVE_TIME("m") "vO] "
-//usage:    IF_FEATURE_TAR_FROM("[-X FILE] ")
-//usage:       "[-f TARFILE] [-C DIR] [FILE]..."
+//usage:    "-[" IF_FEATURE_TAR_CREATE("c") "xt"
+//usage:    IF_FEATURE_SEAMLESS_Z("Z")
+//usage:    IF_FEATURE_SEAMLESS_GZ("z")
+//usage:    IF_FEATURE_SEAMLESS_XZ("J")
+//usage:    IF_FEATURE_SEAMLESS_BZ2("j")
+//usage:    IF_FEATURE_SEAMLESS_LZMA("a")
+//usage:    IF_FEATURE_TAR_CREATE("h")
+//usage:    IF_FEATURE_TAR_NOPRESERVE_TIME("m")
+//usage:    "vO] "
+//usage:    IF_FEATURE_TAR_FROM("[-X FILE] [-T FILE] ")
+//usage:    "[-f TARFILE] [-C DIR] [FILE]..."
 //usage:#define tar_full_usage "\n\n"
 //usage:    IF_FEATURE_TAR_CREATE("Create, extract, ")
@@ -717 +712 @@
 //usage:     "\n    x   Extract"
 //usage:     "\n    t   List"
-//usage:     "\nOptions:"
 //usage:     "\n    f   Name of TARFILE ('-' for stdin/out)"
 //usage:     "\n    C   Change to DIR before operation"
 //usage:     "\n    v   Verbose"
+//usage:    IF_FEATURE_SEAMLESS_Z(
+//usage:     "\n    Z   (De)compress using compress"
+//usage:    )
 //usage:    IF_FEATURE_SEAMLESS_GZ(
 //usage:     "\n    z   (De)compress using gzip"
+//usage:    )
+//usage:    IF_FEATURE_SEAMLESS_XZ(
+//usage:     "\n    J   (De)compress using xz"
 //usage:    )
 //usage:    IF_FEATURE_SEAMLESS_BZ2(
@@ -729 +729 @@
 //usage:    IF_FEATURE_SEAMLESS_LZMA(
 //usage:     "\n    a   (De)compress using lzma"
-//usage:    )
-//usage:    IF_FEATURE_SEAMLESS_Z(
-//usage:     "\n    Z   (De)compress using compress"
 //usage:    )
 //usage:     "\n    O   Extract to stdout"
@@ -756 +753 @@
 //  p   same-permissions
 //  k   keep-old
+//  no-recursion
 //  numeric-owner
 //  no-same-permissions
@@ -772 +770 @@
     IF_FEATURE_TAR_FROM(     OPTBIT_EXCLUDE_FROM,)
     IF_FEATURE_SEAMLESS_GZ(  OPTBIT_GZIP        ,)
-    IF_FEATURE_SEAMLESS_Z(   OPTBIT_COMPRESS    ,) // 16th bit
+    IF_FEATURE_SEAMLESS_XZ(  OPTBIT_XZ          ,) // 16th bit
+    IF_FEATURE_SEAMLESS_Z(   OPTBIT_COMPRESS    ,)
     IF_FEATURE_TAR_NOPRESERVE_TIME(OPTBIT_NOPRESERVE_TIME,)
 #if ENABLE_FEATURE_TAR_LONG_OPTIONS
+    OPTBIT_NORECURSION,
     IF_FEATURE_TAR_TO_COMMAND(OPTBIT_2COMMAND   ,)
     OPTBIT_NUMERIC_OWNER,
@@ -796 +796 @@
     OPT_EXCLUDE_FROM = IF_FEATURE_TAR_FROM(     (1 << OPTBIT_EXCLUDE_FROM)) + 0, // X
     OPT_GZIP         = IF_FEATURE_SEAMLESS_GZ(  (1 << OPTBIT_GZIP        )) + 0, // z
+    OPT_XZ           = IF_FEATURE_SEAMLESS_XZ(  (1 << OPTBIT_XZ          )) + 0, // J
     OPT_COMPRESS     = IF_FEATURE_SEAMLESS_Z(   (1 << OPTBIT_COMPRESS    )) + 0, // Z
     OPT_NOPRESERVE_TIME = IF_FEATURE_TAR_NOPRESERVE_TIME((1 << OPTBIT_NOPRESERVE_TIME)) + 0, // m
+    OPT_NORECURSION     = IF_FEATURE_TAR_LONG_OPTIONS((1 << OPTBIT_NORECURSION    )) + 0, // no-recursion
     OPT_2COMMAND        = IF_FEATURE_TAR_TO_COMMAND(  (1 << OPTBIT_2COMMAND       )) + 0, // to-command
     OPT_NUMERIC_OWNER   = IF_FEATURE_TAR_LONG_OPTIONS((1 << OPTBIT_NUMERIC_OWNER  )) + 0, // numeric-owner
     OPT_NOPRESERVE_PERM = IF_FEATURE_TAR_LONG_OPTIONS((1 << OPTBIT_NOPRESERVE_PERM)) + 0, // no-same-permissions
     OPT_OVERWRITE       = IF_FEATURE_TAR_LONG_OPTIONS((1 << OPTBIT_OVERWRITE      )) + 0, // overwrite
+
+    OPT_ANY_COMPRESS = (OPT_BZIP2 | OPT_LZMA | OPT_GZIP | OPT_XZ | OPT_COMPRESS),
 };
 #if ENABLE_FEATURE_TAR_LONG_OPTIONS
@@ -834 +838 @@
     "gzip\0"                No_argument       "z"
 # endif
+# if ENABLE_FEATURE_SEAMLESS_XZ
+    "xz\0"                  No_argument       "J"
+# endif
 # if ENABLE_FEATURE_SEAMLESS_Z
     "compress\0"            No_argument       "Z"
@@ -840 +847 @@
     "touch\0"               No_argument       "m"
 # endif
+    "no-recursion\0"    No_argument       "\xfa"
 # if ENABLE_FEATURE_TAR_TO_COMMAND
     "to-command\0"      Required_argument "\xfb"
@@ -860 +868 @@
 int tar_main(int argc UNUSED_PARAM, char **argv)
 {
-    char FAST_FUNC (*get_header_ptr)(archive_handle_t *) = get_header_tar;
     archive_handle_t *tar_handle;
     char *base_dir = NULL;
@@ -883 +890 @@
     opt_complementary = "--:" // first arg is options
         "tt:vv:" // count -t,-v
-        "?:" // bail out with usage instead of error return
-        "X::T::" // cumulative lists
+        IF_FEATURE_TAR_FROM("X::T::") // cumulative lists
 #if ENABLE_FEATURE_TAR_LONG_OPTIONS && ENABLE_FEATURE_TAR_FROM
         "\xff::" // cumulative lists for --exclude
@@ -928 +934 @@
         IF_FEATURE_TAR_FROM(     "T:X:")
         IF_FEATURE_SEAMLESS_GZ(  "z"   )
+        IF_FEATURE_SEAMLESS_XZ(  "J"   )
         IF_FEATURE_SEAMLESS_Z(   "Z"   )
         IF_FEATURE_TAR_NOPRESERVE_TIME("m")
@@ -957 +964 @@
         signal(SIGPIPE, SIG_IGN);
         tar_handle->action_data = data_extract_to_command;
+        IF_FEATURE_TAR_TO_COMMAND(tar_handle->tar__to_command_shell = xstrdup(get_shell_name());)
     }
 
@@ -975 +983 @@
         tar_handle->ah_flags |= ARCHIVE_O_TRUNC;
     }
-
-    if (opt & OPT_GZIP)
-        get_header_ptr = get_header_tar_gz;
-
-    if (opt & OPT_BZIP2)
-        get_header_ptr = get_header_tar_bz2;
-
-    if (opt & OPT_LZMA)
-        get_header_ptr = get_header_tar_lzma;
-
-    if (opt & OPT_COMPRESS)
-        get_header_ptr = get_header_tar_Z;
 
     if (opt & OPT_NOPRESERVE_TIME)
@@ -1040 +1036 @@
             if (ENABLE_FEATURE_TAR_AUTODETECT
              && flags == O_RDONLY
-             && get_header_ptr == get_header_tar
+             && !(opt & OPT_ANY_COMPRESS)
             ) {
                 tar_handle->src_fd = open_zipped(tar_filename);
@@ -1054 +1050 @@
         xchdir(base_dir);
 
-#ifdef CHECK_FOR_CHILD_EXITCODE
-    /* We need to know whether child (gzip/bzip/etc) exits abnormally */
-    signal(SIGCHLD, handle_SIGCHLD);
-#endif
+    //if (SEAMLESS_COMPRESSION || OPT_COMPRESS)
+    //  /* We need to know whether child (gzip/bzip/etc) exits abnormally */
+    //  signal(SIGCHLD, check_errors_in_children);
 
     /* Create an archive */
@@ -1069 +1064 @@
 #endif
         /* NB: writeTarFile() closes tar_handle->src_fd */
-        return writeTarFile(tar_handle->src_fd, verboseFlag, opt & OPT_DEREFERENCE,
+        return writeTarFile(tar_handle->src_fd, verboseFlag,
+                (opt & OPT_DEREFERENCE ? ACTION_FOLLOWLINKS : 0)
+                | (opt & OPT_NORECURSION ? 0 : ACTION_RECURSE),
                 tar_handle->accept,
                 tar_handle->reject, zipMode);
     }
 
-    while (get_header_ptr(tar_handle) == EXIT_SUCCESS)
+    if (opt & OPT_ANY_COMPRESS) {
+        USE_FOR_MMU(IF_DESKTOP(long long) int FAST_FUNC (*xformer)(transformer_aux_data_t *aux, int src_fd, int dst_fd);)
+        USE_FOR_NOMMU(const char *xformer_prog;)
+
+        if (opt & OPT_COMPRESS)
+            USE_FOR_MMU(xformer = unpack_Z_stream;)
+            USE_FOR_NOMMU(xformer_prog = "uncompress";)
+        if (opt & OPT_GZIP)
+            USE_FOR_MMU(xformer = unpack_gz_stream;)
+            USE_FOR_NOMMU(xformer_prog = "gunzip";)
+        if (opt & OPT_BZIP2)
+            USE_FOR_MMU(xformer = unpack_bz2_stream;)
+            USE_FOR_NOMMU(xformer_prog = "bunzip2";)
+        if (opt & OPT_LZMA)
+            USE_FOR_MMU(xformer = unpack_lzma_stream;)
+            USE_FOR_NOMMU(xformer_prog = "unlzma";)
+        if (opt & OPT_XZ)
+            USE_FOR_MMU(xformer = unpack_xz_stream;)
+            USE_FOR_NOMMU(xformer_prog = "unxz";)
+
+        open_transformer_with_sig(tar_handle->src_fd, xformer, xformer_prog);
+        /* Can't lseek over pipes */
+        tar_handle->seek = seek_by_read;
+        /*tar_handle->offset = 0; - already is */
+    }
+
+    while (get_header_tar(tar_handle) == EXIT_SUCCESS)
         continue;
 
@@ -1090 +1113 @@
         close(tar_handle->src_fd);
 
+    if (SEAMLESS_COMPRESSION || OPT_COMPRESS) {
+        check_errors_in_children(0);
+        return bb_got_signal;
+    }
     return EXIT_SUCCESS;
 }