X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fsecurity.c;h=f4dfb8e8555fa5916af2d3de40e037773cebdae7;hp=c955050054be0662c5fa95bef9a8524e95568e4c;hb=670a0ed6a1f36bebf71f0b221f3d78e497d305c2;hpb=7231431086332de22b2556477bcc5fc2c3e4bdcf diff --git a/src/security.c b/src/security.c index c9550500..f4dfb8e8 100644 --- a/src/security.c +++ b/src/security.c @@ -1,13 +1,11 @@ /* * security.c * - * Read and write the WIM security data. The security data is a table of - * security descriptors. Each WIM image has its own security data, but it's - * possible that an image's security data have no security descriptors. + * Read and write the per-WIM-image table of security descriptors. */ /* - * Copyright (C) 2012 Eric Biggers + * Copyright (C) 2012, 2013 Eric Biggers * * This file is part of wimlib, a library for working with WIM files. * @@ -26,9 +24,103 @@ */ #include "wimlib_internal.h" -#include "io.h" +#include "buffer_io.h" #include "security.h" +/* At the start of each type of access control entry. */ +typedef struct { + /* enum ace_type, specifies what type of ACE this is. */ + u8 type; + + /* bitwise OR of the inherit ACE flags #defined above */ + u8 flags; + + /* Size of the access control entry. */ + u8 size; +} ACEHeader; + +/* Grants rights to a user or group */ +typedef struct { + ACEHeader hdr; + u32 mask; + u32 sid_start; +} AccessAllowedACE; + +/* Denies rights to a user or group */ +typedef struct { + ACEHeader hdr; + u32 mask; + u32 sid_start; +} AccessDeniedACE; + +typedef struct { + ACEHeader hdr; + u32 mask; + u32 sid_start; +} SystemAuditACE; + + +/* Header of an access control list. */ +typedef struct { + /* ACL_REVISION or ACL_REVISION_DS */ + u8 revision; + + /* padding */ + u8 sbz1; + + /* Total size of the ACL, including all access control entries */ + u16 acl_size; + + /* Number of access control entry structures that follow the ACL + * structure. */ + u16 ace_count; + + /* padding */ + u16 sbz2; +} ACL; + +/* A structure used to identify users or groups. */ +typedef struct { + + /* example: 0x1 */ + u8 revision; + u8 sub_authority_count; + + /* Identifies the authority that issued the SID. Can be, but does not + * have to be, one of enum sid_authority_value */ + u8 identifier_authority[6]; + + u32 sub_authority[0]; +} SID; + + +typedef struct { + /* Example: 0x1 */ + u8 revision; + /* Example: 0x0 */ + u8 sbz1; + /* Example: 0x4149 */ + u16 security_descriptor_control; + + /* Offset of a SID structure in the security descriptor. */ + /* Example: 0x14 */ + u32 owner_offset; + + /* Offset of a SID structure in the security descriptor. */ + /* Example: 0x24 */ + u32 group_offset; + + /* Offset of an ACL structure in the security descriptor. */ + /* System ACL. */ + /* Example: 0x00 */ + u32 sacl_offset; + + /* Offset of an ACL structure in the security descriptor. */ + /* Discretionary ACL. */ + /* Example: 0x34 */ + u32 dacl_offset; +} SecurityDescriptor; + /* * This is a hack to work around a problem in libntfs-3g. libntfs-3g validates * security descriptors with a function named ntfs_valid_descr(). @@ -40,8 +132,12 @@ * entries anyway; however this ensures that that the security descriptors pass * the validation in libntfs-3g. */ -static void empty_sacl_fixup(u8 *descr, u64 *size_p) +static void +empty_sacl_fixup(u8 *descr, u64 *size_p) { + /* No-op if no NTFS-3g support, or if NTFS-3g is version 2013 or later + * */ +#if defined(WITH_NTFS_3G) && !defined(HAVE_NTFS_MNT_RDONLY) if (*size_p >= sizeof(SecurityDescriptor)) { SecurityDescriptor *sd = (SecurityDescriptor*)descr; u32 sacl_offset = le32_to_cpu(sd->sacl_offset); @@ -50,6 +146,7 @@ static void empty_sacl_fixup(u8 *descr, u64 *size_p) *size_p -= sizeof(ACL); } } +#endif } /* @@ -57,7 +154,7 @@ static void empty_sacl_fixup(u8 *descr, u64 *size_p) * * @metadata_resource: An array that contains the uncompressed metadata * resource for the WIM file. - * @metadata_resource_len: The length of @metadata_resource. It MUST be at + * @metadata_resource_len: The length of @metadata_resource. It must be at * least 8 bytes. * @sd_p: A pointer to a pointer to a wim_security_data structure that * will be filled in with a pointer to a new wim_security_data @@ -66,14 +163,17 @@ static void empty_sacl_fixup(u8 *descr, u64 *size_p) * Note: There is no `offset' argument because the security data is located at * the beginning of the metadata resource. */ -int read_security_data(const u8 metadata_resource[], u64 metadata_resource_len, - struct wim_security_data **sd_p) +int +read_security_data(const u8 metadata_resource[], u64 metadata_resource_len, + struct wim_security_data **sd_p) { struct wim_security_data *sd; const u8 *p; int ret; u64 total_len; + wimlib_assert(metadata_resource_len >= 8); + /* * Sorry this function is excessively complicated--- I'm just being * extremely careful about integer overflows. @@ -86,7 +186,6 @@ int read_security_data(const u8 metadata_resource[], u64 metadata_resource_len, } sd->sizes = NULL; sd->descriptors = NULL; - sd->refcnt = 1; p = metadata_resource; p = get_u32(p, &sd->total_length); @@ -121,7 +220,9 @@ int read_security_data(const u8 metadata_resource[], u64 metadata_resource_len, sd->num_entries, sd->total_length); if (sd->num_entries == 0) { - /* No security descriptors. */ + /* No security descriptors. We allow the total_length field to + * be either 8 (which is correct, since there are always 2 + * 32-bit integers) or 0. */ if (sd->total_length != 0 && sd->total_length != 8) { ERROR("Invalid security data length (%u): expected 0 or 8", sd->total_length); @@ -135,14 +236,11 @@ int read_security_data(const u8 metadata_resource[], u64 metadata_resource_len, u64 size_no_descriptors = 8 + sizes_size; if (size_no_descriptors > (u64)sd->total_length) { ERROR("Security data total length of %u is too short because " - "there must be at least %"PRIu64" bytes of security data", + "there seem to be at least %"PRIu64" bytes of security data", sd->total_length, 8 + sizes_size); goto out_invalid_sd; } - if (sizeof(size_t) < 8 && sizes_size > 0xffffffff) { - ERROR("Too many security descriptors!"); - goto out_invalid_sd; - } + sd->sizes = MALLOC(sizes_size); if (!sd->sizes) { ret = WIMLIB_ERR_NOMEM; @@ -174,14 +272,15 @@ int read_security_data(const u8 metadata_resource[], u64 metadata_resource_len, goto out_invalid_sd; } total_len += sd->sizes[i]; - /* This check assures that the descriptor size fits in a 32 bit + /* This check ensures that the descriptor size fits in a 32 bit * integer. Because if it didn't, the total length would come * out bigger than sd->total_length, which is a 32 bit integer. * */ if (total_len > (u64)sd->total_length) { ERROR("Security data total length of %u is too short " - "because there are at least %"PRIu64" bytes of " - "security data", sd->total_length, total_len); + "because there seem to be at least %"PRIu64" " + "bytes of security data", + sd->total_length, total_len); goto out_invalid_sd; } sd->descriptors[i] = MALLOC(sd->sizes[i]); @@ -214,7 +313,8 @@ out_free_sd: /* * Writes security data to an in-memory buffer. */ -u8 *write_security_data(const struct wim_security_data *sd, u8 *p) +u8 * +write_security_data(const struct wim_security_data *sd, u8 *p) { DEBUG("Writing security data (total_length = %"PRIu32", num_entries " "= %"PRIu32")", sd->total_length, sd->num_entries); @@ -238,100 +338,104 @@ u8 *write_security_data(const struct wim_security_data *sd, u8 *p) return p; } -static void print_acl(const u8 *p, const char *type) +static void +print_acl(const void *p, const tchar *type) { - const ACL *acl = (const ACL*)p; + const ACL *acl = p; u8 revision = acl->revision; u16 acl_size = le16_to_cpu(acl->acl_size); u16 ace_count = le16_to_cpu(acl->ace_count); - printf(" [%s ACL]\n", type); - printf(" Revision = %u\n", revision); - printf(" ACL Size = %u\n", acl_size); - printf(" ACE Count = %u\n", ace_count); + tprintf(T(" [%"TS" ACL]\n"), type); + tprintf(T(" Revision = %u\n"), revision); + tprintf(T(" ACL Size = %u\n"), acl_size); + tprintf(T(" ACE Count = %u\n"), ace_count); p += sizeof(ACL); - for (uint i = 0; i < acl->ace_count; i++) { - const ACEHeader *hdr = (const ACEHeader*)p; - printf(" [ACE]\n"); - printf(" ACE type = %d\n", hdr->type); - printf(" ACE flags = 0x%x\n", hdr->flags); - printf(" ACE size = %u\n", hdr->size); + for (u16 i = 0; i < ace_count; i++) { + const ACEHeader *hdr = p; + tprintf(T(" [ACE]\n")); + tprintf(T(" ACE type = %d\n"), hdr->type); + tprintf(T(" ACE flags = 0x%x\n"), hdr->flags); + tprintf(T(" ACE size = %u\n"), hdr->size); const AccessAllowedACE *aaa = (const AccessAllowedACE*)hdr; - printf(" ACE mask = %x\n", le32_to_cpu(aaa->mask)); - printf(" SID start = %u\n", le32_to_cpu(aaa->sid_start)); + tprintf(T(" ACE mask = %x\n"), le32_to_cpu(aaa->mask)); + tprintf(T(" SID start = %u\n"), le32_to_cpu(aaa->sid_start)); p += hdr->size; } - putchar('\n'); + tputchar(T('\n')); } -static void print_sid(const u8 *p, const char *type) +static void +print_sid(const void *p, const tchar *type) { - const SID *sid = (const SID*)p; - printf(" [%s SID]\n", type); - printf(" Revision = %u\n", sid->revision); - printf(" Subauthority count = %u\n", sid->sub_authority_count); - printf(" Identifier authority = "); + const SID *sid = p; + tprintf(T(" [%"TS" SID]\n"), type); + tprintf(T(" Revision = %u\n"), sid->revision); + tprintf(T(" Subauthority count = %u\n"), sid->sub_authority_count); + tprintf(T(" Identifier authority = ")); print_byte_field(sid->identifier_authority, - sizeof(sid->identifier_authority)); - putchar('\n'); - for (uint i = 0; i < sid->sub_authority_count; i++) - printf(" Subauthority %u = %u\n", - i, le32_to_cpu(sid->sub_authority[i])); - putchar('\n'); + sizeof(sid->identifier_authority), stdout); + tputchar(T('\n')); + for (u8 i = 0; i < sid->sub_authority_count; i++) { + tprintf(T(" Subauthority %u = %u\n"), + i, le32_to_cpu(sid->sub_authority[i])); + } + tputchar(T('\n')); } -static void print_security_descriptor(const u8 *p, u64 size) +static void +print_security_descriptor(const void *p, u64 size) { - const SecurityDescriptor *sd = (const SecurityDescriptor*)p; + const SecurityDescriptor *sd = p; + u8 revision = sd->revision; u16 control = le16_to_cpu(sd->security_descriptor_control); u32 owner_offset = le32_to_cpu(sd->owner_offset); u32 group_offset = le32_to_cpu(sd->group_offset); u32 sacl_offset = le32_to_cpu(sd->sacl_offset); u32 dacl_offset = le32_to_cpu(sd->dacl_offset); - printf("Revision = %u\n", revision); - printf("Security Descriptor Control = %#x\n", control); - printf("Owner offset = %u\n", owner_offset); - printf("Group offset = %u\n", group_offset); - printf("System ACL offset = %u\n", sacl_offset); - printf("Discretionary ACL offset = %u\n", dacl_offset); + tprintf(T("Revision = %u\n"), revision); + tprintf(T("Security Descriptor Control = %#x\n"), control); + tprintf(T("Owner offset = %u\n"), owner_offset); + tprintf(T("Group offset = %u\n"), group_offset); + tprintf(T("System ACL offset = %u\n"), sacl_offset); + tprintf(T("Discretionary ACL offset = %u\n"), dacl_offset); if (sd->owner_offset != 0) - print_sid(p + owner_offset, "Owner"); + print_sid(p + owner_offset, T("Owner")); if (sd->group_offset != 0) - print_sid(p + group_offset, "Group"); + print_sid(p + group_offset, T("Group")); if (sd->sacl_offset != 0) - print_acl(p + sacl_offset, "System"); + print_acl(p + sacl_offset, T("System")); if (sd->dacl_offset != 0) - print_acl(p + dacl_offset, "Discretionary"); + print_acl(p + dacl_offset, T("Discretionary")); } /* * Prints the security data for a WIM file. */ -void print_security_data(const struct wim_security_data *sd) +void +print_security_data(const struct wim_security_data *sd) { wimlib_assert(sd != NULL); - puts("[SECURITY DATA]"); - printf("Length = %"PRIu32" bytes\n", sd->total_length); - printf("Number of Entries = %"PRIu32"\n", sd->num_entries); + tputs(T("[SECURITY DATA]")); + tprintf(T("Length = %"PRIu32" bytes\n"), sd->total_length); + tprintf(T("Number of Entries = %"PRIu32"\n"), sd->num_entries); for (u32 i = 0; i < sd->num_entries; i++) { - printf("[SecurityDescriptor %"PRIu32", length = %"PRIu64"]\n", - i, sd->sizes[i]); + tprintf(T("[SecurityDescriptor %"PRIu32", length = %"PRIu64"]\n"), + i, sd->sizes[i]); print_security_descriptor(sd->descriptors[i], sd->sizes[i]); - putchar('\n'); + tputchar(T('\n')); } - putchar('\n'); + tputchar(T('\n')); } -void free_security_data(struct wim_security_data *sd) +void +free_security_data(struct wim_security_data *sd) { - if (!sd) - return; - wimlib_assert(sd->refcnt != 0); - if (--sd->refcnt == 0) { + if (sd) { u8 **descriptors = sd->descriptors; u32 num_entries = sd->num_entries; if (descriptors) @@ -342,3 +446,136 @@ void free_security_data(struct wim_security_data *sd) FREE(sd); } } + +struct sd_node { + int security_id; + u8 hash[SHA1_HASH_SIZE]; + struct rb_node rb_node; +}; + +static void +free_sd_tree(struct rb_node *node) +{ + if (node) { + free_sd_tree(node->rb_left); + free_sd_tree(node->rb_right); + FREE(container_of(node, struct sd_node, rb_node)); + } +} + +/* Frees a security descriptor index set. */ +void +destroy_sd_set(struct sd_set *sd_set) +{ + free_sd_tree(sd_set->rb_root.rb_node); +} + +/* Inserts a a new node into the security descriptor index tree. */ +static void +insert_sd_node(struct sd_set *set, struct sd_node *new) +{ + struct rb_root *root = &set->rb_root; + struct rb_node **p = &(root->rb_node); + struct rb_node *rb_parent = NULL; + + while (*p) { + struct sd_node *this = container_of(*p, struct sd_node, rb_node); + int cmp = hashes_cmp(new->hash, this->hash); + + rb_parent = *p; + if (cmp < 0) + p = &((*p)->rb_left); + else if (cmp > 0) + p = &((*p)->rb_right); + else + wimlib_assert(0); /* Duplicate SHA1 message digest */ + } + rb_link_node(&new->rb_node, rb_parent, p); + rb_insert_color(&new->rb_node, root); +} + +/* Returns the index of the security descriptor having a SHA1 message digest of + * @hash. If not found, return -1. */ +int +lookup_sd(struct sd_set *set, const u8 hash[SHA1_HASH_SIZE]) +{ + struct rb_node *node = set->rb_root.rb_node; + + while (node) { + struct sd_node *sd_node = container_of(node, struct sd_node, rb_node); + int cmp = hashes_cmp(hash, sd_node->hash); + if (cmp < 0) + node = node->rb_left; + else if (cmp > 0) + node = node->rb_right; + else + return sd_node->security_id; + } + return -1; +} + +/* + * Adds a security descriptor to the indexed security descriptor set as well as + * the corresponding `struct wim_security_data', and returns the new security + * ID; or, if there is an existing security descriptor that is the same, return + * the security ID for it. If a new security descriptor cannot be allocated, + * return -1. + */ +int +sd_set_add_sd(struct sd_set *sd_set, const char descriptor[], size_t size) +{ + u8 hash[SHA1_HASH_SIZE]; + int security_id; + struct sd_node *new; + u8 **descriptors; + u64 *sizes; + u8 *descr_copy; + struct wim_security_data *sd; + + sha1_buffer((const u8*)descriptor, size, hash); + + security_id = lookup_sd(sd_set, hash); + if (security_id >= 0) /* Identical descriptor already exists */ + return security_id; + + /* Need to add a new security descriptor */ + new = MALLOC(sizeof(*new)); + if (!new) + goto out; + descr_copy = MALLOC(size); + if (!descr_copy) + goto out_free_node; + + sd = sd_set->sd; + + memcpy(descr_copy, descriptor, size); + new->security_id = sd->num_entries; + copy_hash(new->hash, hash); + + /* There typically are only a few dozen security descriptors in a + * directory tree, so expanding the array of security descriptors by + * only 1 extra space each time should not be a problem. */ + descriptors = REALLOC(sd->descriptors, + (sd->num_entries + 1) * sizeof(sd->descriptors[0])); + if (!descriptors) + goto out_free_descr; + sd->descriptors = descriptors; + sizes = REALLOC(sd->sizes, + (sd->num_entries + 1) * sizeof(sd->sizes[0])); + if (!sizes) + goto out_free_descr; + sd->sizes = sizes; + sd->descriptors[sd->num_entries] = descr_copy; + sd->sizes[sd->num_entries] = size; + sd->num_entries++; + DEBUG("There are now %d security descriptors", sd->num_entries); + sd->total_length += size + sizeof(sd->sizes[0]); + insert_sd_node(sd_set, new); + return new->security_id; +out_free_descr: + FREE(descr_copy); +out_free_node: + FREE(new); +out: + return -1; +}