]> wimlib.net Git - wimlib/blobdiff - src/win32_apply.c
Improve handling of invalid filenames
[wimlib] / src / win32_apply.c
index 66ca89a90804c4b7e08ffbd0cabfb5d415523e4c..ffee267c61bfdee2b4e8a9ae4289129e28ce23da 100644 (file)
 
 #ifdef __WIN32__
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <aclapi.h> /* for SetSecurityInfo() */
 
-#include "win32_common.h"
-#include "wimlib_internal.h"
-#include "dentry.h"
-#include "lookup_table.h"
-#include "endianness.h"
+#include "wimlib/win32_common.h"
+
+#include "wimlib/apply.h"
+#include "wimlib/dentry.h"
+#include "wimlib/endianness.h"
+#include "wimlib/error.h"
+#include "wimlib/lookup_table.h"
+#include "wimlib/metadata.h"
+#include "wimlib/reparse.h"
+#include "wimlib/security.h"
 
 #define MAX_CREATE_HARD_LINK_WARNINGS 5
 #define MAX_CREATE_SOFT_LINK_WARNINGS 5
@@ -48,6 +57,7 @@ L"If you are not running this program as the administrator, you may\n"
 
 static int
 win32_extract_try_rpfix(u8 *rpbuf,
+                       u16 *rpbuflen_p,
                        const wchar_t *extract_root_realpath,
                        unsigned extract_root_realpath_nchars)
 {
@@ -65,8 +75,7 @@ win32_extract_try_rpfix(u8 *rpbuf,
        size_t new_print_name_nchars;
        utf16lechar *p;
 
-       ret = parse_reparse_data(rpbuf, 8 + le16_to_cpu(*(u16*)(rpbuf + 4)),
-                                &rpdata);
+       ret = parse_reparse_data(rpbuf, *rpbuflen_p, &rpdata);
        if (ret)
                return ret;
 
@@ -88,7 +97,7 @@ win32_extract_try_rpfix(u8 *rpbuf,
        stripped_nchars = ret;
        target = rpdata.substitute_name;
        target_nchars = rpdata.substitute_name_nbytes / sizeof(utf16lechar);
-       stripped_target = target + 6;
+       stripped_target = target + stripped_nchars;
        stripped_target_nchars = target_nchars - stripped_nchars;
 
        new_target = alloca((6 + extract_root_realpath_nchars +
@@ -97,8 +106,7 @@ win32_extract_try_rpfix(u8 *rpbuf,
        p = new_target;
        if (stripped_nchars == 6) {
                /* Include \??\ prefix if it was present before */
-               wmemcpy(p, L"\\??\\", 4);
-               p += 4;
+               p = wmempcpy(p, L"\\??\\", 4);
        }
 
        /* Print name excludes the \??\ if present. */
@@ -110,12 +118,10 @@ win32_extract_try_rpfix(u8 *rpbuf,
                *p++ = extract_root_realpath[1];
        }
        /* Copy the rest of the extract root */
-       wmemcpy(p, extract_root_realpath + 2, extract_root_realpath_nchars - 2);
-       p += extract_root_realpath_nchars - 2;
+       p = wmempcpy(p, extract_root_realpath + 2, extract_root_realpath_nchars - 2);
 
        /* Append the stripped target */
-       wmemcpy(p, stripped_target, stripped_target_nchars);
-       p += stripped_target_nchars;
+       p = wmempcpy(p, stripped_target, stripped_target_nchars);
        new_target_nchars = p - new_target;
        new_print_name_nchars = p - new_print_name;
 
@@ -129,7 +135,7 @@ win32_extract_try_rpfix(u8 *rpbuf,
        rpdata.substitute_name_nbytes = new_target_nchars * sizeof(utf16lechar);
        rpdata.print_name = new_print_name;
        rpdata.print_name_nbytes = new_print_name_nchars * sizeof(utf16lechar);
-       return make_reparse_buffer(&rpdata, rpbuf);
+       return make_reparse_buffer(&rpdata, rpbuf, rpbuflen_p);
 }
 
 /* Wrapper around the FSCTL_SET_REPARSE_POINT ioctl to set the reparse data on
@@ -142,12 +148,13 @@ win32_set_reparse_data(HANDLE h,
                       struct apply_args *args)
 {
        int ret;
-       u8 rpbuf[REPARSE_POINT_MAX_SIZE];
+       u8 rpbuf[REPARSE_POINT_MAX_SIZE] _aligned_attribute(8);
        DWORD bytesReturned;
+       u16 rpbuflen;
 
        DEBUG("Setting reparse data on \"%ls\"", path);
 
-       ret = wim_inode_get_reparse_data(inode, rpbuf);
+       ret = wim_inode_get_reparse_data(inode, rpbuf, &rpbuflen);
        if (ret)
                return ret;
 
@@ -157,6 +164,7 @@ win32_set_reparse_data(HANDLE h,
            !inode->i_not_rpfixed)
        {
                ret = win32_extract_try_rpfix(rpbuf,
+                                             &rpbuflen,
                                              args->target_realpath,
                                              args->target_realpath_len);
                if (ret)
@@ -185,7 +193,7 @@ win32_set_reparse_data(HANDLE h,
         *  "Not used with this operation; set to NULL."
         */
        if (!DeviceIoControl(h, FSCTL_SET_REPARSE_POINT, rpbuf,
-                            8 + le16_to_cpu(*(u16*)(rpbuf + 4)),
+                            rpbuflen,
                             NULL, 0,
                             &bytesReturned /* lpBytesReturned */,
                             NULL /* lpOverlapped */))
@@ -668,7 +676,6 @@ win32_finish_extract_stream(HANDLE h, const struct wim_dentry *dentry,
 {
        int ret = 0;
        const struct wim_inode *inode = dentry->d_inode;
-       const wchar_t *short_name;
        if (stream_name_utf16 == NULL) {
                /* Unnamed stream. */
 
@@ -724,17 +731,9 @@ win32_finish_extract_stream(HANDLE h, const struct wim_dentry *dentry,
                }
 
                if (dentry_has_short_name(dentry))
-                       short_name = dentry->short_name;
-               else
-                       short_name = L"";
-               /* Set short name */
-               if (!SetFileShortNameW(h, short_name)) {
-               #if 0
-                       DWORD err = GetLastError();
-                       ERROR("Could not set short name on \"%ls\"", stream_path);
-                       win32_error(err);
-               #endif
-               }
+                       SetFileShortNameW(h, dentry->short_name);
+               else if (running_on_windows_7_or_later())
+                       SetFileShortNameW(h, L"");
        } else {
                /* Extract the data for a named data stream. */
                if (lte != NULL) {
@@ -1042,37 +1041,83 @@ out:
        return ret;
 }
 
+static int
+dentry_clear_inode_visited(struct wim_dentry *dentry, void *_ignore)
+{
+       dentry->d_inode->i_visited = 0;
+       return 0;
+}
+
+static int
+dentry_get_features(struct wim_dentry *dentry, void *_features_p)
+{
+       DWORD features = 0;
+       DWORD *features_p = _features_p;
+       struct wim_inode *inode = dentry->d_inode;
+
+       if (inode->i_visited) {
+               features |= FILE_SUPPORTS_HARD_LINKS;
+       } else {
+               inode->i_visited = 1;
+               if (inode->i_attributes & FILE_ATTRIBUTE_SPARSE_FILE)
+                       features |= FILE_SUPPORTS_SPARSE_FILES;
+               if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT)
+                       features |= FILE_SUPPORTS_REPARSE_POINTS;
+               for (unsigned i = 0; i < inode->i_num_ads; i++)
+                       if (inode->i_ads_entries[i].stream_name_nbytes)
+                               features |= FILE_NAMED_STREAMS;
+               if (inode->i_attributes & FILE_ATTRIBUTE_ENCRYPTED)
+                       features |= FILE_SUPPORTS_ENCRYPTION;
+               if (inode->i_attributes & FILE_ATTRIBUTE_COMPRESSED)
+                       features |= FILE_FILE_COMPRESSION;
+               if (inode->i_security_id != -1)
+                       features |= FILE_PERSISTENT_ACLS;
+       }
+       *features_p |= features;
+       return 0;
+}
+
 /* If not done already, load the supported feature flags for the volume onto
  * which the image is being extracted, and warn the user about any missing
  * features that could be important. */
 static int
-win32_check_vol_flags(const wchar_t *output_path, struct apply_args *args)
+win32_check_vol_flags(const wchar_t *output_path,
+                     struct wim_dentry *root, struct apply_args *args)
 {
+       DWORD dentry_features = 0;
+       DWORD missing_features;
+
        if (args->have_vol_flags)
                return 0;
 
+       for_dentry_in_tree(root, dentry_clear_inode_visited, NULL);
+       for_dentry_in_tree(root, dentry_get_features, &dentry_features);
+
        win32_get_vol_flags(output_path, &args->vol_flags);
        args->have_vol_flags = true;
+
+       missing_features = dentry_features & ~args->vol_flags;
+
        /* Warn the user about data that may not be extracted. */
-       if (!(args->vol_flags & FILE_SUPPORTS_SPARSE_FILES))
+       if (missing_features & FILE_SUPPORTS_SPARSE_FILES)
                WARNING("Volume does not support sparse files!\n"
                        "          Sparse files will be extracted as non-sparse.");
-       if (!(args->vol_flags & FILE_SUPPORTS_REPARSE_POINTS))
+       if (missing_features & FILE_SUPPORTS_REPARSE_POINTS)
                WARNING("Volume does not support reparse points!\n"
                        "          Reparse point data will not be extracted.");
-       if (!(args->vol_flags & FILE_NAMED_STREAMS)) {
+       if (missing_features & FILE_NAMED_STREAMS) {
                WARNING("Volume does not support named data streams!\n"
                        "          Named data streams will not be extracted.");
        }
-       if (!(args->vol_flags & FILE_SUPPORTS_ENCRYPTION)) {
+       if (missing_features & FILE_SUPPORTS_ENCRYPTION) {
                WARNING("Volume does not support encryption!\n"
                        "          Encrypted files will be extracted as raw data.");
        }
-       if (!(args->vol_flags & FILE_FILE_COMPRESSION)) {
+       if (missing_features & FILE_FILE_COMPRESSION) {
                WARNING("Volume does not support transparent compression!\n"
                        "          Compressed files will be extracted as non-compressed.");
        }
-       if (!(args->vol_flags & FILE_PERSISTENT_ACLS)) {
+       if (missing_features & FILE_PERSISTENT_ACLS) {
                if (args->extract_flags & WIMLIB_EXTRACT_FLAG_STRICT_ACLS) {
                        ERROR("Strict ACLs requested, but the volume does not "
                              "support ACLs!");
@@ -1082,6 +1127,12 @@ win32_check_vol_flags(const wchar_t *output_path, struct apply_args *args)
                                "          File permissions will not be extracted.");
                }
        }
+       if (running_on_windows_7_or_later() &&
+           (missing_features & FILE_SUPPORTS_HARD_LINKS))
+       {
+               WARNING("Volume does not support hard links!\n"
+                       "          Hard links will be extracted as duplicate files.");
+       }
        return 0;
 }
 
@@ -1112,12 +1163,18 @@ win32_try_hard_link(const wchar_t *output_path, const struct wim_inode *inode,
        DWORD err;
 
        /* There is a volume flag for this (FILE_SUPPORTS_HARD_LINKS),
-        * but it's only available on Windows 7 and later.  So no use
-        * even checking it, really.  Instead, CreateHardLinkW() will
-        * apparently return ERROR_INVALID_FUNCTION if the volume does
-        * not support hard links. */
+        * but it's only available on Windows 7 and later.
+        *
+        * Otherwise, CreateHardLinkW() will apparently return
+        * ERROR_INVALID_FUNCTION if the volume does not support hard links. */
+
        DEBUG("Creating hard link \"%ls => %ls\"",
              output_path, inode->i_extracted_file);
+
+       if (running_on_windows_7_or_later() &&
+           !(args->vol_flags & FILE_SUPPORTS_HARD_LINKS))
+               goto hard_links_unsupported;
+
        if (CreateHardLinkW(output_path, inode->i_extracted_file, NULL))
                return 0;
 
@@ -1127,19 +1184,24 @@ win32_try_hard_link(const wchar_t *output_path, const struct wim_inode *inode,
                      output_path, inode->i_extracted_file);
                win32_error(err);
                return WIMLIB_ERR_LINK;
-       } else {
-               args->num_hard_links_failed++;
-               if (args->num_hard_links_failed <= MAX_CREATE_HARD_LINK_WARNINGS) {
-                       WARNING("Can't create hard link \"%ls => %ls\":\n"
+       }
+hard_links_unsupported:
+       args->num_hard_links_failed++;
+       if (args->num_hard_links_failed <= MAX_CREATE_HARD_LINK_WARNINGS) {
+               if (running_on_windows_7_or_later())
+               {
+                       WARNING("Extracting duplicate copy of \"%ls\" "
+                               "rather than hard link", output_path);
+               } else {
+                       WARNING("Can't create hard link \"%ls\" => \"%ls\":\n"
                                "          Volume does not support hard links!\n"
                                "          Falling back to extracting a copy of the file.",
                                output_path, inode->i_extracted_file);
                }
-               if (args->num_hard_links_failed == MAX_CREATE_HARD_LINK_WARNINGS) {
-                       WARNING("Suppressing further hard linking warnings...");
-               }
-               return -1;
        }
+       if (args->num_hard_links_failed == MAX_CREATE_HARD_LINK_WARNINGS)
+               WARNING("Suppressing further hard linking warnings...");
+       return -1;
 }
 
 /* Extract a file, directory, reparse point, or hard link to an
@@ -1153,7 +1215,7 @@ win32_do_apply_dentry(const wchar_t *output_path,
        int ret;
        struct wim_inode *inode = dentry->d_inode;
 
-       ret = win32_check_vol_flags(output_path, args);
+       ret = win32_check_vol_flags(output_path, dentry, args);
        if (ret)
                return ret;
        if (inode->i_nlink > 1 && inode->i_extracted_file != NULL) {
@@ -1172,9 +1234,8 @@ win32_do_apply_dentry(const wchar_t *output_path,
        if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT &&
            !(args->vol_flags & FILE_SUPPORTS_REPARSE_POINTS))
        {
-               WARNING("Skipping extraction of reparse point \"%ls\":\n"
-                       "          Not supported by destination filesystem",
-                       output_path);
+               WARNING("Not extracting reparse point \"%ls\"", output_path);
+               dentry->not_extracted = 1;
        } else {
                /* Create the file, directory, or reparse point, and extract the
                 * data streams. */
@@ -1217,13 +1278,6 @@ win32_do_apply_dentry_timestamps(const wchar_t *path,
        HANDLE h;
        const struct wim_inode *inode = dentry->d_inode;
 
-       if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT &&
-           !(args->vol_flags & FILE_SUPPORTS_REPARSE_POINTS))
-       {
-               /* Skip reparse points not extracted */
-               return 0;
-       }
-
        /* Windows doesn't let you change the timestamps of the root directory
         * (at least on FAT, which is dumb but expected since FAT doesn't store
         * any metadata about the root directory...) */