X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fntfs-capture.c;h=d23776b889d39cc4c990ebcd4cb130439fefef75;hp=4ea23048b5404c21ee8fc65a80ab3bd09029d04f;hb=52cccded7706cd556f78ce7d2506937d2a216293;hpb=e901f5bc2e56a930ac71c545586aaf70b0fd2b56 diff --git a/src/ntfs-capture.c b/src/ntfs-capture.c index 4ea23048..d23776b8 100644 --- a/src/ntfs-capture.c +++ b/src/ntfs-capture.c @@ -24,7 +24,14 @@ * along with wimlib; if not, see http://www.gnu.org/licenses/. */ + #include "config.h" + +#ifdef WITH_NTFS_3G +#include +#include +#endif + #include "wimlib_internal.h" @@ -37,19 +44,13 @@ #include #include #include -#include +#include /* security.h before xattrs.h */ +#include #include #include #include #include -#ifndef WITH_NEW_NTFS_3G -extern int ntfs_get_inode_security(ntfs_inode *ni, u32 selection, char *buf, - u32 buflen, u32 *psize); - -extern u32 ntfs_get_inode_attributes(ntfs_inode *ni); -#endif - /* Structure that allows searching the security descriptors by SHA1 message * digest. */ struct sd_set { @@ -86,12 +87,12 @@ static void insert_sd_node(struct sd_node *new, struct sd_node *root) if (cmp < 0) { if (root->left) insert_sd_node(new, root->left); - else + else root->left = new; } else if (cmp > 0) { if (root->right) insert_sd_node(new, root->right); - else + else root->right = new; } else { wimlib_assert(0); @@ -99,7 +100,7 @@ static void insert_sd_node(struct sd_node *new, struct sd_node *root) } /* Returns the security ID of the security data having a SHA1 message digest of - * @hash in the security descriptor index tree rooted at @root. + * @hash in the security descriptor index tree rooted at @root. * * If not found, return -1. */ static int lookup_sd(const u8 hash[SHA1_HASH_SIZE], struct sd_node *root) @@ -190,7 +191,7 @@ static inline ntfschar *attr_record_name(ATTR_RECORD *ar) return (ntfschar*)((u8*)ar + le16_to_cpu(ar->name_offset)); } -/* Calculates the SHA1 message digest of a NTFS attribute. +/* Calculates the SHA1 message digest of a NTFS attribute. * * @ni: The NTFS inode containing the attribute. * @ar: The ATTR_RECORD describing the attribute. @@ -203,6 +204,7 @@ static inline ntfschar *attr_record_name(ATTR_RECORD *ar) */ static int ntfs_attr_sha1sum(ntfs_inode *ni, ATTR_RECORD *ar, u8 md[SHA1_HASH_SIZE], + bool is_reparse_point, u32 *reparse_tag_ret) { s64 pos = 0; @@ -219,19 +221,20 @@ static int ntfs_attr_sha1sum(ntfs_inode *ni, ATTR_RECORD *ar, } bytes_remaining = na->data_size; - sha1_init(&ctx); - DEBUG2("Calculating SHA1 message digest (%"PRIu64" bytes)", - bytes_remaining); + if (is_reparse_point) { + if (ntfs_attr_pread(na, 0, 8, buf) != 8) + goto out_error; + *reparse_tag_ret = le32_to_cpu(*(u32*)buf); + pos = 8; + bytes_remaining -= 8; + } + sha1_init(&ctx); while (bytes_remaining) { s64 to_read = min(bytes_remaining, sizeof(buf)); - if (ntfs_attr_pread(na, pos, to_read, buf) != to_read) { - ERROR_WITH_ERRNO("Error reading NTFS attribute"); - return WIMLIB_ERR_NTFS_3G; - } - if (bytes_remaining == na->data_size && reparse_tag_ret) - *reparse_tag_ret = le32_to_cpu(*(u32*)buf); + if (ntfs_attr_pread(na, pos, to_read, buf) != to_read) + goto out_error; sha1_update(&ctx, buf, to_read); pos += to_read; bytes_remaining -= to_read; @@ -239,17 +242,19 @@ static int ntfs_attr_sha1sum(ntfs_inode *ni, ATTR_RECORD *ar, sha1_final(md, &ctx); ntfs_attr_close(na); return 0; +out_error: + ERROR_WITH_ERRNO("Error reading NTFS attribute"); + return WIMLIB_ERR_NTFS_3G; } -/* Load the streams from a WIM file or reparse point in the NTFS volume into the - * WIM lookup table */ +/* Load the streams from a file or reparse point in the NTFS volume into the WIM + * lookup table */ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni, char path[], size_t path_len, struct lookup_table *lookup_table, ntfs_volume **ntfs_vol_p, ATTR_TYPES type) { - ntfs_attr_search_ctx *actx; u8 attr_hash[SHA1_HASH_SIZE]; struct ntfs_location *ntfs_loc = NULL; @@ -271,12 +276,11 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni, CASE_SENSITIVE, 0, NULL, 0, actx)) { char *stream_name_utf8; - size_t stream_name_utf16_len; u32 reparse_tag; u64 data_size = ntfs_get_attribute_value_length(actx->attr); u64 name_length = actx->attr->name_length; - if (data_size == 0) { + if (data_size == 0) { if (errno != 0) { ERROR_WITH_ERRNO("Failed to get size of attribute of " "`%s'", path); @@ -287,12 +291,14 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni, lte = NULL; } else { if (type == AT_REPARSE_POINT && data_size < 8) { - ERROR("`%s': reparse point buffer too small"); + ERROR("`%s': reparse point buffer too small", + path); ret = WIMLIB_ERR_NTFS_3G; goto out_put_actx; } /* Checksum the stream. */ - ret = ntfs_attr_sha1sum(ni, actx->attr, attr_hash, &reparse_tag); + ret = ntfs_attr_sha1sum(ni, actx->attr, attr_hash, + type == AT_REPARSE_POINT, &reparse_tag); if (ret != 0) goto out_put_actx; @@ -327,7 +333,7 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni, lte->ntfs_loc = ntfs_loc; lte->resource_location = RESOURCE_IN_NTFS_VOLUME; if (type == AT_REPARSE_POINT) { - dentry->reparse_tag = reparse_tag; + dentry->d_inode->reparse_tag = reparse_tag; ntfs_loc->is_reparse_point = true; lte->resource_entry.original_size = data_size - 8; lte->resource_entry.size = data_size - 8; @@ -346,14 +352,14 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni, } if (name_length == 0) { /* Unnamed data stream. Put the reference to it in the - * dentry. */ - if (dentry->lte) { + * dentry's inode. */ + if (dentry->d_inode->lte) { ERROR("Found two un-named data streams for " "`%s'", path); ret = WIMLIB_ERR_NTFS_3G; goto out_free_lte; } - dentry->lte = lte; + dentry->d_inode->lte = lte; } else { /* Named data stream. Put the reference to it in the * alternate data stream entries */ @@ -364,13 +370,13 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni, &stream_name_utf8_len); if (!stream_name_utf8) goto out_free_lte; - new_ads_entry = dentry_add_ads(dentry, stream_name_utf8); + new_ads_entry = inode_add_ads(dentry->d_inode, stream_name_utf8); FREE(stream_name_utf8); if (!new_ads_entry) goto out_free_lte; wimlib_assert(new_ads_entry->stream_name_len == name_length * 2); - + new_ads_entry->lte = lte; } } @@ -406,8 +412,9 @@ struct readdir_ctx { }; static int -build_dentry_tree_ntfs_recursive(struct dentry **root_p, ntfs_inode *ni, - char path[], size_t path_len, +build_dentry_tree_ntfs_recursive(struct dentry **root_p, ntfs_inode *dir_ni, + ntfs_inode *ni, char path[], size_t path_len, + int name_type, struct lookup_table *lookup_table, struct sd_set *sd_set, const struct capture_config *config, @@ -448,20 +455,21 @@ static int wim_ntfs_capture_filldir(void *dirent, const ntfschar *name, ntfs_inode *ni = ntfs_inode_open(ctx->dir_ni->vol, mref); if (!ni) { ERROR_WITH_ERRNO("Failed to open NTFS inode"); - ret = 1; + goto out_free_utf8_name; } path_len = ctx->path_len; if (path_len != 1) ctx->path[path_len++] = '/'; memcpy(ctx->path + path_len, utf8_name, utf8_name_len + 1); path_len += utf8_name_len; - ret = build_dentry_tree_ntfs_recursive(&child, ni, ctx->path, path_len, + ret = build_dentry_tree_ntfs_recursive(&child, ctx->dir_ni, + ni, ctx->path, path_len, name_type, ctx->lookup_table, ctx->sd_set, ctx->config, ctx->ntfs_vol_p, ctx->flags); if (child) - link_dentry(child, ctx->parent); + dentry_add_child(ctx->parent, child); ntfs_inode_close(ni); out_free_utf8_name: @@ -470,14 +478,33 @@ out: return ret; } +static int change_dentry_short_name(struct dentry *dentry, + const char short_name_utf8[], + int short_name_utf8_len) +{ + size_t short_name_utf16_len; + char *short_name_utf16; + short_name_utf16 = utf8_to_utf16(short_name_utf8, short_name_utf8_len, + &short_name_utf16_len); + if (!short_name_utf16) { + ERROR_WITH_ERRNO("Failed to convert short name to UTF-16"); + return WIMLIB_ERR_NOMEM; + } + dentry->short_name = short_name_utf16; + dentry->short_name_len = short_name_utf16_len; + return 0; +} + /* Recursively build a WIM dentry tree corresponding to a NTFS volume. * At the same time, update the WIM lookup table with lookup table entries for * the NTFS streams, and build an array of security descriptors. */ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p, + ntfs_inode *dir_ni, ntfs_inode *ni, char path[], size_t path_len, + int name_type, struct lookup_table *lookup_table, struct sd_set *sd_set, const struct capture_config *config, @@ -486,12 +513,22 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p, { u32 attributes; int mrec_flags; - u32 sd_size = 0; - int ret = 0; + int ret; + char dos_name_utf8[64]; struct dentry *root; mrec_flags = ni->mrec->flags; - attributes = ntfs_get_inode_attributes(ni); + struct SECURITY_CONTEXT ctx; + memset(&ctx, 0, sizeof(ctx)); + ctx.vol = ni->vol; + ret = ntfs_xattr_system_getxattr(&ctx, XATTR_NTFS_ATTRIB, + ni, dir_ni, (char *)&attributes, + sizeof(u32)); + if (ret != 4) { + ERROR_WITH_ERRNO("Failed to get NTFS attributes from `%s'", + path); + return WIMLIB_ERR_NTFS_3G; + } if (exclude_path(path, config, false)) { if (flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE) { @@ -510,17 +547,39 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p, if (flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE) printf("Scanning `%s'\n", path); - root = new_dentry(path_basename(path)); + root = new_dentry_with_timeless_inode(path_basename(path)); if (!root) return WIMLIB_ERR_NOMEM; - *root_p = root; - root->creation_time = le64_to_cpu(ni->creation_time); - root->last_write_time = le64_to_cpu(ni->last_data_change_time); - root->last_access_time = le64_to_cpu(ni->last_access_time); - root->attributes = le32_to_cpu(attributes); - root->link_group_id = ni->mft_no; - root->resolved = true; + + if (dir_ni && (name_type == FILE_NAME_WIN32_AND_DOS + || name_type == FILE_NAME_WIN32)) + { + ret = ntfs_get_ntfs_dos_name(ni, dir_ni, dos_name_utf8, + sizeof(dos_name_utf8)); + if (ret > 0) { + DEBUG("Changing short name of `%s'", path); + ret = change_dentry_short_name(root, dos_name_utf8, + ret); + if (ret != 0) + return ret; + } else { + #ifdef ENODATA + if (errno != ENODATA) { + ERROR_WITH_ERRNO("Error getting DOS name " + "of `%s'", path); + return WIMLIB_ERR_NTFS_3G; + } + #endif + } + } + + root->d_inode->creation_time = le64_to_cpu(ni->creation_time); + root->d_inode->last_write_time = le64_to_cpu(ni->last_data_change_time); + root->d_inode->last_access_time = le64_to_cpu(ni->last_access_time); + root->d_inode->attributes = le32_to_cpu(attributes); + root->d_inode->ino = ni->mft_no; + root->d_inode->resolved = true; if (attributes & FILE_ATTR_REPARSE_POINT) { /* Junction point, symbolic link, or other reparse point */ @@ -556,38 +615,33 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p, if (ret != 0) return ret; - ret = ntfs_get_inode_security(ni, - OWNER_SECURITY_INFORMATION | - GROUP_SECURITY_INFORMATION | - DACL_SECURITY_INFORMATION | - SACL_SECURITY_INFORMATION, - NULL, 0, &sd_size); - char sd[sd_size]; - ret = ntfs_get_inode_security(ni, - OWNER_SECURITY_INFORMATION | - GROUP_SECURITY_INFORMATION | - DACL_SECURITY_INFORMATION | - SACL_SECURITY_INFORMATION, - sd, sd_size, &sd_size); - if (ret == 0) { + char _sd[1]; + char *sd = _sd; + errno = 0; + ret = ntfs_xattr_system_getxattr(&ctx, XATTR_NTFS_ACL, + ni, dir_ni, sd, + sizeof(sd)); + if (ret > sizeof(sd)) { + sd = alloca(ret); + ret = ntfs_xattr_system_getxattr(&ctx, XATTR_NTFS_ACL, + ni, dir_ni, sd, ret); + } + if (ret > 0) { + root->d_inode->security_id = sd_set_add_sd(sd_set, sd, ret); + if (root->d_inode->security_id == -1) { + ERROR("Out of memory"); + return WIMLIB_ERR_NOMEM; + } + DEBUG("Added security ID = %u for `%s'", + root->d_inode->security_id, path); + ret = 0; + } else if (ret < 0) { ERROR_WITH_ERRNO("Failed to get security information from " "`%s'", path); ret = WIMLIB_ERR_NTFS_3G; } else { - if (ret > 0) { - /*print_security_descriptor(sd, sd_size);*/ - root->security_id = sd_set_add_sd(sd_set, sd, sd_size); - if (root->security_id == -1) { - ERROR("Out of memory"); - return WIMLIB_ERR_NOMEM; - } - DEBUG("Added security ID = %u for `%s'", - root->security_id, path); - } else { - root->security_id = -1; - DEBUG("No security ID for `%s'", path); - } - ret = 0; + root->d_inode->security_id = -1; + DEBUG("No security ID for `%s'", path); } return ret; } @@ -610,7 +664,7 @@ static int build_dentry_tree_ntfs(struct dentry **root_p, ntfs_volume **ntfs_vol_p = extra_arg; DEBUG("Mounting NTFS volume `%s' read-only", device); - + vol = ntfs_mount(device, MS_RDONLY); if (!vol) { ERROR_WITH_ERRNO("Failed to mount NTFS volume `%s' read-only", @@ -643,9 +697,10 @@ static int build_dentry_tree_ntfs(struct dentry **root_p, path[0] = '/'; path[1] = '\0'; - ret = build_dentry_tree_ntfs_recursive(root_p, root_ni, path, 1, - lookup_table, &sd_set, - config, ntfs_vol_p, flags); + ret = build_dentry_tree_ntfs_recursive(root_p, NULL, root_ni, path, 1, + FILE_NAME_POSIX, lookup_table, + &sd_set, config, ntfs_vol_p, + flags); out_cleanup: FREE(path); ntfs_inode_close(root_ni);