X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Ftest_support.c;h=15c707773bc73b6e26e8e3a8e9beeeb14615bc4c;hp=bc7fde192d8dc922d85994afeb4544514ff26b03;hb=8f7d929a9eaf15773fc0647204bdf5911001939f;hpb=e14f2a9299f809e7f82b5eccfbfc6df8e9229920 diff --git a/src/test_support.c b/src/test_support.c index bc7fde19..15c70777 100644 --- a/src/test_support.c +++ b/src/test_support.c @@ -251,13 +251,13 @@ generate_random_security_descriptor(void *_desc, struct generation_context *ctx) static int set_random_metadata(struct wim_inode *inode, struct generation_context *ctx) { - u32 v = rand32(); - u32 attrib = (v & (FILE_ATTRIBUTE_READONLY | - FILE_ATTRIBUTE_HIDDEN | - FILE_ATTRIBUTE_SYSTEM | - FILE_ATTRIBUTE_ARCHIVE | - FILE_ATTRIBUTE_NOT_CONTENT_INDEXED | - FILE_ATTRIBUTE_COMPRESSED)); + u32 attrib = (rand32() & (FILE_ATTRIBUTE_READONLY | + FILE_ATTRIBUTE_HIDDEN | + FILE_ATTRIBUTE_SYSTEM | + FILE_ATTRIBUTE_ARCHIVE | + FILE_ATTRIBUTE_NOT_CONTENT_INDEXED | + FILE_ATTRIBUTE_COMPRESSED | + FILE_ATTRIBUTE_SPARSE_FILE)); /* File attributes */ inode->i_attributes |= attrib; @@ -323,8 +323,10 @@ generate_data(u8 *buffer, size_t size, struct generation_context *ctx) size_t mask = -1; size_t num_byte_fills = rand32() % 256; + /* Start by initializing to a random byte */ memset(buffer, rand32() % 256, size); + /* Add some random bytes in some random places */ for (size_t i = 0; i < num_byte_fills; i++) { u8 b = rand8(); @@ -342,6 +344,7 @@ generate_data(u8 *buffer, size_t size, struct generation_context *ctx) mask = (size_t)-1 << rand32() % 4; } + /* Sometimes add a wave pattern */ if (rand32() % 8 == 0) { double magnitude = rand32() % 128; double scale = 1.0 / (1 + (rand32() % 256)); @@ -349,6 +352,17 @@ generate_data(u8 *buffer, size_t size, struct generation_context *ctx) for (size_t i = 0; i < size; i++) buffer[i] += (int)(magnitude * cos(i * scale)); } + + /* Sometimes add some zero regions (holes) */ + if (rand32() % 4 == 0) { + size_t num_holes = 1 + (rand32() % 16); + for (size_t i = 0; i < num_holes; i++) { + size_t hole_offset = rand32() % size; + size_t hole_len = min(size - hole_offset, + size / (1 + (rand32() % 16))); + memset(&buffer[hole_offset], 0, hole_len); + } + } } static int @@ -432,14 +446,13 @@ add_random_data_stream(struct wim_inode *inode, struct generation_context *ctx, } static int -set_random_streams(struct wim_inode *inode, struct generation_context *ctx, - bool reparse_ok) +set_random_streams(struct wim_inode *inode, struct generation_context *ctx) { int ret; u32 r; /* Reparse point (sometimes) */ - if (reparse_ok && rand32() % 8 == 0) { + if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) { ret = set_random_reparse_point(inode, ctx); if (ret) return ret; @@ -526,6 +539,7 @@ generate_random_filename(utf16lechar name[], int max_len, } len = min(len, max_len); +retry: /* Generate the characters in the name. */ for (int i = 0; i < len; i++) { do { @@ -536,6 +550,11 @@ generate_random_filename(utf16lechar name[], int max_len, /* Add a null terminator. */ name[len] = cpu_to_le16('\0'); + /* Don't generate . and .. */ + if (name[0] == cpu_to_le16('.') && + (len == 1 || (len == 2 && name[1] == cpu_to_le16('.')))) + goto retry; + return len; } @@ -546,18 +565,8 @@ static const char valid_short_name_chars[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '!', '#', '$', '%', '&', '\'', '(', ')', '-', '@', '^', '_', '`', '{', '}', '~', - /* TODO: why doesn't Windows accept these characters? */ - /* ' ', */ - /*128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,*/ - /*142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155,*/ - /*156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,*/ - /*170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183,*/ - /*184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197,*/ - /*198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211,*/ - /*212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225,*/ - /*226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,*/ - /*240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253,*/ - /*254, 255*/ + /* Note: Windows does not allow space and 128-255 in short filenames + * (tested on both NTFS and FAT). */ }; static int @@ -568,12 +577,6 @@ generate_short_name_component(utf16lechar p[], int len) ARRAY_LEN(valid_short_name_chars)]; p[i] = cpu_to_le16(c); } -#if 0 /* TODO: we aren't using space yet anyway */ - while (len > 1 && p[len - 1] == cpu_to_le16(' ')) - len--; - if (p[len - 1] == cpu_to_le16(' ')) - p[len - 1] = cpu_to_le16('A'); -#endif return len; } @@ -585,8 +588,7 @@ generate_random_short_name(utf16lechar name[], struct generation_context *ctx) /* * Legal short names on Windows consist of 1 to 8 characters, optionally * followed by a dot then 1 to 3 more characters. Only certain - * characters are allowed. In addition, trailing spaces are not - * significant. + * characters are allowed. */ int base_len = 1 + (rand32() % 8); int ext_len = rand32() % 4; @@ -635,29 +637,12 @@ is_name_valid_in_win32_namespace(const utf16lechar *name) { const utf16lechar *p; - static const utf16lechar forbidden_names[][5] = { - { cpu_to_le16('C'), cpu_to_le16('O'), cpu_to_le16('N'), }, - { cpu_to_le16('P'), cpu_to_le16('R'), cpu_to_le16('N'), }, - { cpu_to_le16('A'), cpu_to_le16('U'), cpu_to_le16('X'), }, - { cpu_to_le16('N'), cpu_to_le16('U'), cpu_to_le16('L'), }, - { cpu_to_le16('C'), cpu_to_le16('O'), cpu_to_le16('M'), cpu_to_le16('1'), }, - { cpu_to_le16('C'), cpu_to_le16('O'), cpu_to_le16('M'), cpu_to_le16('2'), }, - { cpu_to_le16('C'), cpu_to_le16('O'), cpu_to_le16('M'), cpu_to_le16('3'), }, - { cpu_to_le16('C'), cpu_to_le16('O'), cpu_to_le16('M'), cpu_to_le16('4'), }, - { cpu_to_le16('C'), cpu_to_le16('O'), cpu_to_le16('M'), cpu_to_le16('5'), }, - { cpu_to_le16('C'), cpu_to_le16('O'), cpu_to_le16('M'), cpu_to_le16('6'), }, - { cpu_to_le16('C'), cpu_to_le16('O'), cpu_to_le16('M'), cpu_to_le16('7'), }, - { cpu_to_le16('C'), cpu_to_le16('O'), cpu_to_le16('M'), cpu_to_le16('8'), }, - { cpu_to_le16('C'), cpu_to_le16('O'), cpu_to_le16('M'), cpu_to_le16('9'), }, - { cpu_to_le16('L'), cpu_to_le16('P'), cpu_to_le16('T'), cpu_to_le16('1'), }, - { cpu_to_le16('L'), cpu_to_le16('P'), cpu_to_le16('T'), cpu_to_le16('2'), }, - { cpu_to_le16('L'), cpu_to_le16('P'), cpu_to_le16('T'), cpu_to_le16('3'), }, - { cpu_to_le16('L'), cpu_to_le16('P'), cpu_to_le16('T'), cpu_to_le16('4'), }, - { cpu_to_le16('L'), cpu_to_le16('P'), cpu_to_le16('T'), cpu_to_le16('5'), }, - { cpu_to_le16('L'), cpu_to_le16('P'), cpu_to_le16('T'), cpu_to_le16('6'), }, - { cpu_to_le16('L'), cpu_to_le16('P'), cpu_to_le16('T'), cpu_to_le16('7'), }, - { cpu_to_le16('L'), cpu_to_le16('P'), cpu_to_le16('T'), cpu_to_le16('8'), }, - { cpu_to_le16('L'), cpu_to_le16('P'), cpu_to_le16('T'), cpu_to_le16('9'), }, + static const char * const reserved_names[] = { + "CON", "PRN", "AUX", "NUL", + "COM1", "COM2", "COM3", "COM4", "COM5", + "COM6", "COM7", "COM8", "COM9", + "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", + "LPT6", "LPT7", "LPT8", "LPT9", }; /* The name must be nonempty. */ @@ -672,10 +657,21 @@ is_name_valid_in_win32_namespace(const utf16lechar *name) /* Note: a trailing dot or space is permitted, even though on Windows * such a file can only be accessed using a WinNT-style path. */ - /* The name can't be one of the reserved names (case insensitively). */ - for (size_t i = 0; i < ARRAY_LEN(forbidden_names); i++) - if (!cmp_utf16le_strings_z(forbidden_names[i], name, true)) - return false; + /* The name can't be one of the reserved names or be a reserved name + * with an extension. Case insensitive. */ + for (size_t i = 0; i < ARRAY_LEN(reserved_names); i++) { + for (size_t j = 0; ; j++) { + u16 c1 = le16_to_cpu(name[j]); + u16 c2 = reserved_names[i][j]; + if (c2 == '\0') { + if (c1 == '\0' || c1 == '.') + return false; + break; + } + if (upcase[c1] != upcase[c2]) + break; + } + } return true; } @@ -764,23 +760,27 @@ generate_dentry_tree_recursive(struct wim_dentry *dir, u32 depth, /* Generate the next child dentry. */ struct wim_inode *inode; u64 ino; - bool is_directory; + bool is_directory = (rand32() % 16 <= 6); + bool is_reparse = (rand32() % 8 == 0); utf16lechar name[63 + 1]; /* for UNIX extraction: 63 * 4 <= 255 */ int name_len; struct wim_dentry *duplicate; - /* Decide whether to create a directory or not. If not a - * directory, also decide on the inode number (i.e. we may - * generate a "hard link" to an existing file). */ - is_directory = ((rand32() % 16) <= 6); - if (is_directory) + /* + * Select an inode number for the new file. Sometimes choose an + * existing inode number (i.e. create a hard link). However, + * wimlib intentionally doesn't honor directory hard links, and + * reparse points cannot be represented in the WIM file format + * at all; so don't create hard links for such files. + */ + if (is_directory || is_reparse) ino = 0; else ino = select_inode_number(ctx); /* Create the dentry. */ ret = inode_table_new_dentry(ctx->params->inode_table, NULL, - ino, 0, is_directory, &child); + ino, 0, ino == 0, &child); if (ret) return ret; @@ -811,19 +811,19 @@ generate_dentry_tree_recursive(struct wim_dentry *dir, u32 depth, if (is_directory) inode->i_attributes |= FILE_ATTRIBUTE_DIRECTORY; + if (is_reparse) + inode->i_attributes |= FILE_ATTRIBUTE_REPARSE_POINT; - ret = set_random_metadata(inode, ctx); + ret = set_random_streams(inode, ctx); if (ret) return ret; - ret = set_random_streams(inode, ctx, true); + ret = set_random_metadata(inode, ctx); if (ret) return ret; /* Recurse if it's a directory. */ - if (is_directory && - !(inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT)) - { + if (is_directory && !is_reparse) { ret = generate_dentry_tree_recursive(child, depth + 1, ctx); if (ret) @@ -858,10 +858,10 @@ generate_dentry_tree(struct wim_dentry **root_ret, const tchar *_ignored, ret = inode_table_new_dentry(params->inode_table, NULL, 0, 0, true, &root); if (!ret) { root->d_inode->i_attributes = FILE_ATTRIBUTE_DIRECTORY; - ret = set_random_metadata(root->d_inode, &ctx); + ret = set_random_streams(root->d_inode, &ctx); } if (!ret) - ret = set_random_streams(root->d_inode, &ctx, false); + ret = set_random_metadata(root->d_inode, &ctx); if (!ret) ret = generate_dentry_tree_recursive(root, 1, &ctx); if (!ret) @@ -919,7 +919,7 @@ calc_corresponding_files_recursive(struct wim_dentry *d1, struct wim_dentry *d2, /* Compare short filenames, case insensitively. */ if (!(d2->d_short_name_nbytes == 0 && - (cmp_flags & WIMLIB_CMP_FLAG_SHORT_NAMES_NOT_PRESERVED)) && + (cmp_flags & WIMLIB_CMP_FLAG_UNIX_MODE)) && cmp_utf16le_strings(d1->d_short_name, d1->d_short_name_nbytes / 2, d2->d_short_name, d2->d_short_name_nbytes / 2, true)) @@ -997,59 +997,108 @@ check_hard_link(struct wim_dentry *dentry, void *_ignore) return WIMLIB_ERR_IMAGES_ARE_DIFFERENT; } +static const struct { + u32 flag; + const char *name; +} file_attr_flags[] = { + {FILE_ATTRIBUTE_READONLY, "READONLY"}, + {FILE_ATTRIBUTE_HIDDEN, "HIDDEN"}, + {FILE_ATTRIBUTE_SYSTEM, "SYSTEM"}, + {FILE_ATTRIBUTE_DIRECTORY, "DIRECTORY"}, + {FILE_ATTRIBUTE_ARCHIVE, "ARCHIVE"}, + {FILE_ATTRIBUTE_DEVICE, "DEVICE"}, + {FILE_ATTRIBUTE_NORMAL, "NORMAL"}, + {FILE_ATTRIBUTE_TEMPORARY, "TEMPORARY"}, + {FILE_ATTRIBUTE_SPARSE_FILE, "SPARSE_FILE"}, + {FILE_ATTRIBUTE_REPARSE_POINT, "REPARSE_POINT"}, + {FILE_ATTRIBUTE_COMPRESSED, "COMPRESSED"}, + {FILE_ATTRIBUTE_OFFLINE, "OFFLINE"}, + {FILE_ATTRIBUTE_NOT_CONTENT_INDEXED, "NOT_CONTENT_INDEXED"}, + {FILE_ATTRIBUTE_ENCRYPTED, "ENCRYPTED"}, + {FILE_ATTRIBUTE_VIRTUAL, "VIRTUAL"}, +}; + +static int +cmp_attributes(const struct wim_inode *inode1, + const struct wim_inode *inode2, int cmp_flags) +{ + const u32 changed = inode1->i_attributes ^ inode2->i_attributes; + const u32 set = inode2->i_attributes & ~inode1->i_attributes; + const u32 cleared = inode1->i_attributes & ~inode2->i_attributes; + + /* NORMAL may change, but it must never be set along with other + * attributes. */ + if ((inode2->i_attributes & FILE_ATTRIBUTE_NORMAL) && + (inode2->i_attributes & ~FILE_ATTRIBUTE_NORMAL)) + goto mismatch; + + /* DIRECTORY must not change. */ + if (changed & FILE_ATTRIBUTE_DIRECTORY) + goto mismatch; + + /* REPARSE_POINT may be cleared in UNIX mode if the inode is not a + * symlink. */ + if ((changed & FILE_ATTRIBUTE_REPARSE_POINT) && + !((cleared & FILE_ATTRIBUTE_REPARSE_POINT) && + (cmp_flags & WIMLIB_CMP_FLAG_UNIX_MODE) && + !inode_is_symlink(inode1))) + goto mismatch; + + /* SPARSE_FILE may be cleared in UNIX and NTFS-3G modes, or in Windows + * mode if the inode is a directory. */ + if ((changed & FILE_ATTRIBUTE_SPARSE_FILE) && + !((cleared & FILE_ATTRIBUTE_SPARSE_FILE) && + ((cmp_flags & (WIMLIB_CMP_FLAG_UNIX_MODE | + WIMLIB_CMP_FLAG_NTFS_3G_MODE)) || + ((cmp_flags & WIMLIB_CMP_FLAG_WINDOWS_MODE) && + (inode1->i_attributes & FILE_ATTRIBUTE_DIRECTORY))))) + goto mismatch; + + /* COMPRESSED may change in UNIX and NTFS-3G modes. (It *should* be + * preserved in NTFS-3G mode, but it's not implemented yet.) */ + if ((changed & FILE_ATTRIBUTE_COMPRESSED) && + !(cmp_flags & (WIMLIB_CMP_FLAG_UNIX_MODE | + WIMLIB_CMP_FLAG_NTFS_3G_MODE))) + goto mismatch; + + /* All other attributes can change in UNIX mode, but not in any other + * mode. */ + if ((changed & ~(FILE_ATTRIBUTE_NORMAL | + FILE_ATTRIBUTE_DIRECTORY | + FILE_ATTRIBUTE_REPARSE_POINT | + FILE_ATTRIBUTE_SPARSE_FILE | + FILE_ATTRIBUTE_COMPRESSED)) && + !(cmp_flags & WIMLIB_CMP_FLAG_UNIX_MODE)) + goto mismatch; + + return 0; + +mismatch: + ERROR("Attribute mismatch for %"TS": 0x%08"PRIx32" vs. 0x%08"PRIx32":", + inode_any_full_path(inode1), inode1->i_attributes, + inode2->i_attributes); + for (size_t i = 0; i < ARRAY_LEN(file_attr_flags); i++) { + u32 flag = file_attr_flags[i].flag; + if (changed & flag) { + fprintf(stderr, "\tFILE_ATTRIBUTE_%s was %s\n", + file_attr_flags[i].name, + (set & flag) ? "set" : "cleared"); + } + } + return WIMLIB_ERR_IMAGES_ARE_DIFFERENT; +} + static int cmp_inodes(const struct wim_inode *inode1, const struct wim_inode *inode2, const struct wim_image_metadata *imd1, const struct wim_image_metadata *imd2, int cmp_flags) { - const u32 attrib_diff = inode1->i_attributes ^ inode2->i_attributes; - bool reparse_point_should_preserved = true; + int ret; /* Compare attributes */ - if (cmp_flags & WIMLIB_CMP_FLAG_ATTRIBUTES_NOT_PRESERVED) { - - /* In this mode, we expect that most attributes are not - * preserved. However, FILE_ATTRIBUTE_DIRECTORY should always - * match. */ - if (attrib_diff & FILE_ATTRIBUTE_DIRECTORY) - goto attrib_mismatch; - - /* We may also expect FILE_ATTRIBUTE_REPARSE_POINT to be - * preserved for symlinks. It also shouldn't be set if it - * wasn't set before. */ - - if ((cmp_flags & WIMLIB_CMP_FLAG_IMAGE2_SHOULD_HAVE_SYMLINKS) && - inode_is_symlink(inode1)) - reparse_point_should_preserved = true; - else - reparse_point_should_preserved = false; - - if ((attrib_diff & FILE_ATTRIBUTE_REPARSE_POINT) && - (reparse_point_should_preserved || - (inode2->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT))) - goto attrib_mismatch; - } else { - - /* Most attributes should be preserved. */ - - /* Nothing other than COMPRESSED and NORMAL should have changed. - */ - if (attrib_diff & ~(FILE_ATTRIBUTE_COMPRESSED | - FILE_ATTRIBUTE_NORMAL)) - goto attrib_mismatch; - - /* COMPRESSED shouldn't have changed unless specifically - * excluded. */ - if ((attrib_diff & FILE_ATTRIBUTE_COMPRESSED) && - !(cmp_flags & WIMLIB_CMP_FLAG_COMPRESSION_NOT_PRESERVED)) - goto attrib_mismatch; - - /* We allow NORMAL to change, but not if the file ended up with - * other attributes set as well. */ - if ((attrib_diff & FILE_ATTRIBUTE_NORMAL) && - (inode2->i_attributes & ~FILE_ATTRIBUTE_NORMAL)) - goto attrib_mismatch; - } + ret = cmp_attributes(inode1, inode2, cmp_flags); + if (ret) + return ret; /* Compare security descriptors */ if (inode_has_security_descriptor(inode1)) { @@ -1064,7 +1113,7 @@ cmp_inodes(const struct wim_inode *inode1, const struct wim_inode *inode2, inode_any_full_path(inode1)); return WIMLIB_ERR_IMAGES_ARE_DIFFERENT; } - } else if (!(cmp_flags & WIMLIB_CMP_FLAG_SECURITY_NOT_PRESERVED)) { + } else if (!(cmp_flags & WIMLIB_CMP_FLAG_UNIX_MODE)) { ERROR("%"TS" has a security descriptor in the first image but " "not in the second image!", inode_any_full_path(inode1)); return WIMLIB_ERR_IMAGES_ARE_DIFFERENT; @@ -1083,7 +1132,8 @@ cmp_inodes(const struct wim_inode *inode1, const struct wim_inode *inode2, const struct wim_inode_stream *strm2; if (strm1->stream_type == STREAM_TYPE_REPARSE_POINT && - !reparse_point_should_preserved) + (cmp_flags & WIMLIB_CMP_FLAG_UNIX_MODE && + !inode_is_symlink(inode1))) continue; if (strm1->stream_type == STREAM_TYPE_UNKNOWN) @@ -1095,7 +1145,7 @@ cmp_inodes(const struct wim_inode *inode1, const struct wim_inode *inode2, if (!strm2) { /* Corresponding stream not found */ if (stream_is_named(strm1) && - (cmp_flags & WIMLIB_CMP_FLAG_ADS_NOT_PRESERVED)) + (cmp_flags & WIMLIB_CMP_FLAG_UNIX_MODE)) continue; ERROR("Stream of %"TS" is missing in second image; " "type %d, named=%d, empty=%d", @@ -1114,13 +1164,6 @@ cmp_inodes(const struct wim_inode *inode1, const struct wim_inode *inode2, } return 0; - -attrib_mismatch: - ERROR("Attribute mismatch; %"TS" has attributes 0x%08"PRIx32" " - "in first image but attributes 0x%08"PRIx32" in second image", - inode_any_full_path(inode1), inode1->i_attributes, - inode2->i_attributes); - return WIMLIB_ERR_IMAGES_ARE_DIFFERENT; } static int