X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Facls.c;h=7290b31bf24a31882e5dae3e558263987acd1398;hb=b362b6f7b22b6e4e9e74760989f389149677917b;hp=43e91042f10e0ee3850a2d3cc312b7b51ee7a038;hpb=ce40a87753e2529265da0f37808d7d41a9a7efdc;p=netatalk.git diff --git a/etc/afpd/acls.c b/etc/afpd/acls.c index 43e91042..7290b31b 100644 --- a/etc/afpd/acls.c +++ b/etc/afpd/acls.c @@ -1,5 +1,6 @@ /* Copyright (c) 2008, 2009, 2010 Frank Lahm + Copyright (c) 2011 Laura Mueller This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,6 +29,8 @@ #endif #ifdef HAVE_POSIX_ACLS #include +#endif +#ifdef HAVE_ACL_LIBACL_H #include #endif @@ -63,6 +66,10 @@ #define MAP_MASK 31 #define IS_DIR 32 +/* bit flags for set_acl() and map_aces_darwin_to_posix() */ +#define HAS_DEFAULT_ACL 0x01 +#define HAS_EXT_DEFAULT_ACL 0x02 + /******************************************************** * Solaris funcs ********************************************************/ @@ -268,11 +275,6 @@ static int map_aces_darwin_to_solaris(darwin_ace_t *darwin_aces, /* uid/gid first */ EC_ZERO(getnamefromuuid(darwin_aces->darwin_ace_uuid, &name, &uuidtype)); switch (uuidtype) { - case UUID_LOCAL: - free(name); - name = NULL; - darwin_aces++; - continue; case UUID_USER: EC_NULL_LOG(pwd = getpwnam(name)); nfsv4_aces->a_who = pwd->pw_uid; @@ -282,6 +284,9 @@ static int map_aces_darwin_to_solaris(darwin_ace_t *darwin_aces, nfsv4_aces->a_who = (uid_t)(grp->gr_gid); nfsv4_ace_flags |= ACE_IDENTIFIER_GROUP; break; + default: + LOG(log_error, logtype_afpd, "map_aces_darwin_to_solaris: unkown uuidtype"); + EC_FAIL; } free(name); name = NULL; @@ -309,8 +314,12 @@ static int map_aces_darwin_to_solaris(darwin_ace_t *darwin_aces, nfsv4_ace_rights |= darwin_to_nfsv4_rights[i].to; } - LOG(log_debug9, logtype_afpd, "map_aces_darwin_to_solaris: ACE flags: Darwin:%08x -> NFSv4:%04x", darwin_ace_flags, nfsv4_ace_flags); - LOG(log_debug9, logtype_afpd, "map_aces_darwin_to_solaris: ACE rights: Darwin:%08x -> NFSv4:%08x", darwin_ace_rights, nfsv4_ace_rights); + LOG(log_debug9, logtype_afpd, + "map_aces_darwin_to_solaris: ACE flags: Darwin:%08x -> NFSv4:%04x", + darwin_ace_flags, nfsv4_ace_flags); + LOG(log_debug9, logtype_afpd, + "map_aces_darwin_to_solaris: ACE rights: Darwin:%08x -> NFSv4:%08x", + darwin_ace_rights, nfsv4_ace_rights); nfsv4_aces->a_flags = nfsv4_ace_flags; nfsv4_aces->a_access_mask = nfsv4_ace_rights; @@ -342,12 +351,20 @@ static uint32_t posix_permset_to_darwin_rights(acl_entry_t e, int is_dir) EC_ZERO_LOG(acl_get_permset(e, &permset)); +#ifdef HAVE_ACL_GET_PERM_NP + if (acl_get_perm_np(permset, ACL_READ)) +#else if (acl_get_perm(permset, ACL_READ)) +#endif rights = DARWIN_ACE_READ_DATA | DARWIN_ACE_READ_EXTATTRIBUTES | DARWIN_ACE_READ_ATTRIBUTES | DARWIN_ACE_READ_SECURITY; +#ifdef HAVE_ACL_GET_PERM_NP + if (acl_get_perm_np(permset, ACL_WRITE)) { +#else if (acl_get_perm(permset, ACL_WRITE)) { +#endif rights |= DARWIN_ACE_WRITE_DATA | DARWIN_ACE_APPEND_DATA | DARWIN_ACE_WRITE_EXTATTRIBUTES @@ -355,7 +372,11 @@ static uint32_t posix_permset_to_darwin_rights(acl_entry_t e, int is_dir) if (is_dir) rights |= DARWIN_ACE_DELETE_CHILD; } +#ifdef HAVE_ACL_GET_PERM_NP + if (acl_get_perm_np(permset, ACL_EXECUTE)) +#else if (acl_get_perm(permset, ACL_EXECUTE)) +#endif rights |= DARWIN_ACE_EXECUTE; EC_CLEANUP: @@ -381,79 +402,81 @@ static int posix_acl_rights(const char *path, uint32_t *result) { EC_INIT; - int havemask = 0; int entry_id = ACL_FIRST_ENTRY; - uint32_t rights = 0, maskrights = 0; + uint32_t rights = 0; /* rights which do not depend on ACL_MASK */ + uint32_t acl_rights = 0; /* rights which are subject to limitations imposed by ACL_MASK */ + uint32_t mask_rights = 0xffffffff; uid_t *uid = NULL; gid_t *gid = NULL; acl_t acl = NULL; acl_entry_t e; acl_tag_t tag; - EC_NULL_LOG(acl = acl_get_file(path, ACL_TYPE_ACCESS)); - - /* itereate through all ACEs to get the mask */ - while (!havemask && acl_get_entry(acl, entry_id, &e) == 1) { - entry_id = ACL_NEXT_ENTRY; - EC_ZERO_LOG(acl_get_tag_type(e, &tag)); - switch (tag) { - case ACL_MASK: - maskrights = posix_permset_to_darwin_rights(e, S_ISDIR(sb->st_mode)); - LOG(log_maxdebug, logtype_afpd, "maskrights: 0x%08x", maskrights); - havemask = 1; - break; - default: - continue; - } - } + EC_NULL_LOGSTR(acl = acl_get_file(path, ACL_TYPE_ACCESS), + "acl_get_file(\"%s\"): %s", fullpathname(path), strerror(errno)); - /* itereate through all ACEs */ - entry_id = ACL_FIRST_ENTRY; + /* Iterate through all ACEs. If we apply mask_rights later there is no need to iterate twice. */ while (acl_get_entry(acl, entry_id, &e) == 1) { entry_id = ACL_NEXT_ENTRY; EC_ZERO_LOG(acl_get_tag_type(e, &tag)); + switch (tag) { - case ACL_USER: - EC_NULL_LOG(uid = (uid_t *)acl_get_qualifier(e)); - if (*uid == uuid) { - LOG(log_maxdebug, logtype_afpd, "ACL_USER: %u", *uid); - rights |= posix_permset_to_darwin_rights(e, S_ISDIR(sb->st_mode)); - } - acl_free(uid); - uid = NULL; - break; - case ACL_USER_OBJ: - if (sb->st_uid == uuid) { - LOG(log_maxdebug, logtype_afpd, "ACL_USER_OBJ: %u", sb->st_uid); - rights |= posix_permset_to_darwin_rights(e, S_ISDIR(sb->st_mode)); - } - break; - case ACL_GROUP: - EC_NULL_LOG(gid = (gid_t *)acl_get_qualifier(e)); - if (gmem(*gid)) { - LOG(log_maxdebug, logtype_afpd, "ACL_GROUP: %u", *gid); - rights |= (posix_permset_to_darwin_rights(e, S_ISDIR(sb->st_mode)) & maskrights); - } - acl_free(gid); - gid = NULL; - break; - case ACL_GROUP_OBJ: - if (!(sb->st_uid == uuid) && gmem(sb->st_gid)) { - LOG(log_maxdebug, logtype_afpd, "ACL_GROUP_OBJ: %u", sb->st_gid); - rights |= posix_permset_to_darwin_rights(e, S_ISDIR(sb->st_mode)); - } - break; - case ACL_OTHER: - if (!(sb->st_uid == uuid) && !gmem(sb->st_gid)) { - LOG(log_maxdebug, logtype_afpd, "ACL_OTHER"); - rights |= posix_permset_to_darwin_rights(e, S_ISDIR(sb->st_mode)); - } - break; - default: - continue; + case ACL_USER_OBJ: + if (sb->st_uid == uuid) { + LOG(log_maxdebug, logtype_afpd, "ACL_USER_OBJ: %u", sb->st_uid); + rights |= posix_permset_to_darwin_rights(e, S_ISDIR(sb->st_mode)); + } + break; + + case ACL_USER: + EC_NULL_LOG(uid = (uid_t *)acl_get_qualifier(e)); + + if (*uid == uuid) { + LOG(log_maxdebug, logtype_afpd, "ACL_USER: %u", *uid); + acl_rights |= posix_permset_to_darwin_rights(e, S_ISDIR(sb->st_mode)); + } + acl_free(uid); + uid = NULL; + break; + + case ACL_GROUP_OBJ: + if (!(sb->st_uid == uuid) && gmem(sb->st_gid)) { + LOG(log_maxdebug, logtype_afpd, "ACL_GROUP_OBJ: %u", sb->st_gid); + acl_rights |= posix_permset_to_darwin_rights(e, S_ISDIR(sb->st_mode)); + } + break; + + case ACL_GROUP: + EC_NULL_LOG(gid = (gid_t *)acl_get_qualifier(e)); + + if (gmem(*gid)) { + LOG(log_maxdebug, logtype_afpd, "ACL_GROUP: %u", *gid); + acl_rights |= posix_permset_to_darwin_rights(e, S_ISDIR(sb->st_mode)); + } + acl_free(gid); + gid = NULL; + break; + + case ACL_MASK: + mask_rights = posix_permset_to_darwin_rights(e, S_ISDIR(sb->st_mode)); + LOG(log_maxdebug, logtype_afpd, "maskrights: 0x%08x", mask_rights); + break; + + case ACL_OTHER: + if (!(sb->st_uid == uuid) && !gmem(sb->st_gid)) { + LOG(log_maxdebug, logtype_afpd, "ACL_OTHER"); + rights |= posix_permset_to_darwin_rights(e, S_ISDIR(sb->st_mode)); + } + break; + + default: + continue; } } /* while */ + /* apply the mask and collect the rights */ + rights |= (acl_rights & mask_rights); + *result |= rights; EC_CLEANUP: @@ -463,6 +486,143 @@ EC_CLEANUP: EC_EXIT; } +/*! + * Helper function for posix_acls_to_uaperms() to convert Posix ACL permissions + * into access rights needed to fill ua_permissions of a FPUnixPrivs structure. + * + * @param entry (r) Posix ACL entry + * + * @returns access rights + */ +static u_char acl_permset_to_uarights(acl_entry_t entry) { + acl_permset_t permset; + u_char rights = 0; + + if (acl_get_permset(entry, &permset) == -1) + return rights; + +#ifdef HAVE_ACL_GET_PERM_NP + if (acl_get_perm_np(permset, ACL_READ)) +#else + if (acl_get_perm(permset, ACL_READ)) +#endif + rights |= AR_UREAD; + +#ifdef HAVE_ACL_GET_PERM_NP + if (acl_get_perm_np(permset, ACL_WRITE)) +#else + if (acl_get_perm(permset, ACL_WRITE)) +#endif + rights |= AR_UWRITE; + +#ifdef HAVE_ACL_GET_PERM_NP + if (acl_get_perm_np(permset, ACL_EXECUTE)) +#else + if (acl_get_perm(permset, ACL_EXECUTE)) +#endif + rights |= AR_USEARCH; + + return rights; +} + +/*! + * Update FPUnixPrivs for a file-system object on a volume supporting ACLs + * + * Checks permissions granted by ACLS for a user to one fs-object and + * updates user and group permissions in given struct maccess. As OS X + * doesn't conform to Posix 1003.1e Draft 17 it expects proper group + * permissions in st_mode of struct stat even if the fs-object has an + * ACL_MASK entry, st_mode gets modified to properly reflect group + * permissions. + * + * @param path (r) path to filesystem object + * @param sb (rw) struct stat of path + * @param maccess (rw) struct maccess of path + * + * @returns 0 or -1 on error + */ +static int posix_acls_to_uaperms(const char *path, struct stat *sb, struct maccess *ma) { + EC_INIT; + + int entry_id = ACL_FIRST_ENTRY; + acl_entry_t entry; + acl_tag_t tag; + acl_t acl = NULL; + uid_t *uid; + gid_t *gid; + uid_t whoami = geteuid(); + + u_char group_rights = 0x00; + u_char acl_rights = 0x00; + u_char mask = 0xff; + + EC_NULL_LOG(acl = acl_get_file(path, ACL_TYPE_ACCESS)); + + /* iterate through all ACEs */ + while (acl_get_entry(acl, entry_id, &entry) == 1) { + entry_id = ACL_NEXT_ENTRY; + EC_ZERO_LOG(acl_get_tag_type(entry, &tag)); + + switch (tag) { + case ACL_USER: + EC_NULL_LOG(uid = (uid_t *)acl_get_qualifier(entry)); + + if (*uid == uuid && !(whoami == sb->st_uid)) { + LOG(log_maxdebug, logtype_afpd, "ACL_USER: %u", *uid); + acl_rights |= acl_permset_to_uarights(entry); + } + acl_free(uid); + break; + + case ACL_GROUP_OBJ: + group_rights = acl_permset_to_uarights(entry); + LOG(log_maxdebug, logtype_afpd, "ACL_GROUP_OBJ: %u", sb->st_gid); + + if (gmem(sb->st_gid) && !(whoami == sb->st_uid)) + acl_rights |= group_rights; + break; + + case ACL_GROUP: + EC_NULL_LOG(gid = (gid_t *)acl_get_qualifier(entry)); + + if (gmem(*gid) && !(whoami == sb->st_uid)) { + LOG(log_maxdebug, logtype_afpd, "ACL_GROUP: %u", *gid); + acl_rights |= acl_permset_to_uarights(entry); + } + acl_free(gid); + break; + + case ACL_MASK: + mask = acl_permset_to_uarights(entry); + LOG(log_maxdebug, logtype_afpd, "ACL_MASK: 0x%02x", mask); + break; + + default: + break; + } + } + /* apply the mask and adjust user and group permissions */ + ma->ma_user |= (acl_rights & mask); + ma->ma_group = (group_rights & mask); + + /* update st_mode to properly reflect group permissions */ + sb->st_mode &= ~S_IRWXG; + + if (ma->ma_group & AR_USEARCH) + sb->st_mode |= S_IXGRP; + + if (ma->ma_group & AR_UWRITE) + sb->st_mode |= S_IWGRP; + + if (ma->ma_group & AR_UREAD) + sb->st_mode |= S_IRGRP; + +EC_CLEANUP: + if (acl) acl_free(acl); + + EC_EXIT; +} + /*! * Add entries of one acl to another acl * @@ -507,7 +667,7 @@ static acl_perm_t map_darwin_right_to_posix_permset(uint32_t darwin_ace_rights, if (darwin_ace_rights & DARWIN_ACE_READ_DATA) perm |= ACL_READ; - if (darwin_ace_rights & (DARWIN_ACE_WRITE_DATA | (DARWIN_ACE_DELETE_CHILD & is_dir))) + if (darwin_ace_rights & (DARWIN_ACE_WRITE_DATA | (is_dir ? DARWIN_ACE_DELETE_CHILD : 0))) perm |= ACL_WRITE; if (darwin_ace_rights & DARWIN_ACE_EXECUTE) @@ -567,7 +727,7 @@ static int posix_acl_add_perm(acl_t *aclp, acl_tag_t type, uid_t id, acl_perm_t EC_ZERO_LOG(acl_add_perm(permset, perm)); EC_ZERO_LOG(acl_set_permset(e, permset)); } - + EC_CLEANUP: if (eid) acl_free(eid); @@ -584,18 +744,23 @@ EC_CLEANUP: * - we throw away DARWIN_ACE_FLAGS_LIMIT_INHERIT (can't be mapped), thus the ACL will * not be limited * - * @param darwin_aces (r) pointer to darwin_aces buffer - * @param def_aclp (rw) directories: pointer to an initialized acl_t with the default acl - * files: *def_aclp will be NULL - * @param acc_aclp (rw) pointer to an initialized acl_t with the access acl - * @param ace_count (r) number of ACEs in darwin_aces buffer + * @param darwin_aces (r) pointer to darwin_aces buffer + * @param def_aclp (rw) directories: pointer to an initialized acl_t with + the default acl files: *def_aclp will be NULL + * @param acc_aclp (rw) pointer to an initialized acl_t with the access acl + * @param ace_count (r) number of ACEs in darwin_aces buffer + * @param default_acl_flags (rw) flags to indicate if the object has a basic default + * acl or an extended default acl. * - * @returns 0 on success storing the result in aclp, -1 on error. + * @returns 0 on success storing the result in aclp, -1 on error. default_acl_flags + * is set to HAS_DEFAULT_ACL|HAS_EXT_DEFAULT_ACL in case there is at least one + * extended default ace. Otherwise default_acl_flags is left unchanged. */ static int map_aces_darwin_to_posix(const darwin_ace_t *darwin_aces, acl_t *def_aclp, acl_t *acc_aclp, - int ace_count) + int ace_count, + uint32_t *default_acl_flags) { EC_INIT; char *name = NULL; @@ -624,10 +789,6 @@ static int map_aces_darwin_to_posix(const darwin_ace_t *darwin_aces, /* uid/gid */ EC_ZERO_LOG(getnamefromuuid(darwin_aces->darwin_ace_uuid, &name, &uuidtype)); switch (uuidtype) { - case UUID_LOCAL: - free(name); - name = NULL; - continue; case UUID_USER: EC_NULL_LOG(pwd = getpwnam(name)); tag = ACL_USER; @@ -640,6 +801,8 @@ static int map_aces_darwin_to_posix(const darwin_ace_t *darwin_aces, id = (uid_t)(grp->gr_gid); LOG(log_debug, logtype_afpd, "map_ace: name: %s, gid: %u", name, id); break; + default: + continue; } free(name); name = NULL; @@ -653,7 +816,7 @@ static int map_aces_darwin_to_posix(const darwin_ace_t *darwin_aces, } /* add it as default ace */ EC_ZERO_LOG(posix_acl_add_perm(def_aclp, tag, id, perm)); - + *default_acl_flags = (HAS_DEFAULT_ACL|HAS_EXT_DEFAULT_ACL); if (! (darwin_ace_flags & DARWIN_ACE_FLAGS_ONLY_INHERIT)) /* if it not a "inherit only" ace, it must be added as access aces too */ @@ -1021,6 +1184,63 @@ EC_CLEANUP: #endif /* HAVE_SOLARIS_ACLS */ #ifdef HAVE_POSIX_ACLS +#ifndef HAVE_ACL_FROM_MODE +static acl_t acl_from_mode(mode_t mode) +{ + acl_t acl; + acl_entry_t entry; + acl_permset_t permset; + + if (!(acl = acl_init(3))) + return NULL; + + if (acl_create_entry(&acl, &entry) != 0) + goto error; + acl_set_tag_type(entry, ACL_USER_OBJ); + acl_get_permset(entry, &permset); + acl_clear_perms(permset); + if (mode & S_IRUSR) + acl_add_perm(permset, ACL_READ); + if (mode & S_IWUSR) + acl_add_perm(permset, ACL_WRITE); + if (mode & S_IXUSR) + acl_add_perm(permset, ACL_EXECUTE); + acl_set_permset(entry, permset); + + if (acl_create_entry(&acl, &entry) != 0) + goto error; + acl_set_tag_type(entry, ACL_GROUP_OBJ); + acl_get_permset(entry, &permset); + acl_clear_perms(permset); + if (mode & S_IRGRP) + acl_add_perm(permset, ACL_READ); + if (mode & S_IWGRP) + acl_add_perm(permset, ACL_WRITE); + if (mode & S_IXGRP) + acl_add_perm(permset, ACL_EXECUTE); + acl_set_permset(entry, permset); + + if (acl_create_entry(&acl, &entry) != 0) + goto error; + acl_set_tag_type(entry, ACL_OTHER); + acl_get_permset(entry, &permset); + acl_clear_perms(permset); + if (mode & S_IROTH) + acl_add_perm(permset, ACL_READ); + if (mode & S_IWOTH) + acl_add_perm(permset, ACL_WRITE); + if (mode & S_IXOTH) + acl_add_perm(permset, ACL_EXECUTE); + acl_set_permset(entry, permset); + + return acl; + +error: + acl_free(acl); + return NULL; +} +#endif + static int set_acl(const struct vol *vol, const char *name, int inherit _U_, @@ -1028,44 +1248,77 @@ static int set_acl(const struct vol *vol, uint32_t ace_count) { EC_INIT; - acl_t def_acl = NULL; - acl_t acc_acl = NULL; + struct stat st; + acl_t default_acl = NULL; + acl_t access_acl = NULL; + acl_entry_t entry; + acl_tag_t tag; + int entry_id = ACL_FIRST_ENTRY; + int has_def_acl = 0; + /* flags to indicate if the object has a minimal default acl and/or an extended + * default acl. + */ + uint32_t default_acl_flags = 0; LOG(log_maxdebug, logtype_afpd, "set_acl: BEGIN"); - struct stat st; - EC_ZERO_LOG_ERR(lstat(name, &st), AFPERR_NOOBJ); + EC_NULL_LOG_ERR(access_acl = acl_get_file(name, ACL_TYPE_ACCESS), AFPERR_MISC); + + /* Iterate through acl and remove all extended acl entries. */ + while (acl_get_entry(access_acl, entry_id, &entry) == 1) { + entry_id = ACL_NEXT_ENTRY; + EC_ZERO_LOG(acl_get_tag_type(entry, &tag)); - /* seed default ACL with access ACL */ - if (S_ISDIR(st.st_mode)) - EC_NULL_LOG_ERR(def_acl = acl_get_file(name, ACL_TYPE_ACCESS), AFPERR_MISC); + if ((tag == ACL_USER) || (tag == ACL_GROUP) || (tag == ACL_MASK)) { + EC_ZERO_LOG_ERR(acl_delete_entry(access_acl, entry), AFPERR_MISC); + } + } /* while */ - /* for files def_acl will be NULL */ + /* In case we are acting on a directory prepare a default acl. For files default_acl will be NULL. + * If the directory already has a default acl it will be preserved. + */ + EC_ZERO_LOG_ERR(lstat(name, &st), AFPERR_NOOBJ); - /* create access acl from mode */ - EC_NULL_LOG_ERR(acc_acl = acl_from_mode(st.st_mode), AFPERR_MISC); + if (S_ISDIR(st.st_mode)) { + default_acl = acl_get_file(name, ACL_TYPE_DEFAULT); + if (default_acl) { + /* If default_acl is not empty then the dir has a default acl. */ + if (acl_get_entry(default_acl, ACL_FIRST_ENTRY, &entry) == 1) + default_acl_flags = HAS_DEFAULT_ACL; + + acl_free(default_acl); + } + default_acl = acl_dup(access_acl); + } /* adds the clients aces */ - EC_ZERO_ERR(map_aces_darwin_to_posix(daces, &def_acl, &acc_acl, ace_count), AFPERR_MISC); + EC_ZERO_ERR(map_aces_darwin_to_posix(daces, &default_acl, &access_acl, ace_count, &default_acl_flags), AFPERR_MISC); /* calcuate ACL mask */ - EC_ZERO_LOG_ERR(acl_calc_mask(&acc_acl), AFPERR_MISC); + EC_ZERO_LOG_ERR(acl_calc_mask(&access_acl), AFPERR_MISC); /* is it ok? */ - EC_ZERO_LOG_ERR(acl_valid(acc_acl), AFPERR_MISC); + EC_ZERO_LOG_ERR(acl_valid(access_acl), AFPERR_MISC); /* set it */ - EC_ZERO_LOG_ERR(acl_set_file(name, ACL_TYPE_ACCESS, acc_acl), AFPERR_MISC); - EC_ZERO_LOG_ERR(vol->vfs->vfs_acl(vol, name, ACL_TYPE_ACCESS, 0, acc_acl), AFPERR_MISC); - - if (def_acl) { - EC_ZERO_LOG_ERR(acl_set_file(name, ACL_TYPE_DEFAULT, def_acl), AFPERR_MISC); - EC_ZERO_LOG_ERR(vol->vfs->vfs_acl(vol, name, ACL_TYPE_DEFAULT, 0, def_acl), AFPERR_MISC); + EC_ZERO_LOG_ERR(acl_set_file(name, ACL_TYPE_ACCESS, access_acl), AFPERR_MISC); + EC_ZERO_LOG_ERR(vol->vfs->vfs_acl(vol, name, ACL_TYPE_ACCESS, 0, access_acl), AFPERR_MISC); + + if (default_acl) { + /* If the dir has an extended default acl it's ACL_MASK must be updated.*/ + if (default_acl_flags & HAS_EXT_DEFAULT_ACL) + EC_ZERO_LOG_ERR(acl_calc_mask(&default_acl), AFPERR_MISC); + + if (default_acl_flags) { + EC_ZERO_LOG_ERR(acl_valid(default_acl), AFPERR_MISC); + EC_ZERO_LOG_ERR(acl_set_file(name, ACL_TYPE_DEFAULT, default_acl), AFPERR_MISC); + EC_ZERO_LOG_ERR(vol->vfs->vfs_acl(vol, name, ACL_TYPE_DEFAULT, 0, default_acl), AFPERR_MISC); + } } EC_CLEANUP: - acl_free(acc_acl); - acl_free(def_acl); + if (access_acl) acl_free(access_acl); + if (default_acl) acl_free(default_acl); LOG(log_maxdebug, logtype_afpd, "set_acl: END"); EC_EXIT; @@ -1078,7 +1331,7 @@ EC_CLEANUP: * Note: this gets called frequently and is a good place for optimizations ! * * @param vol (r) volume - * @param dir (r) directory + * @param dir (rw) directory * @param path (r) path to filesystem object * @param uuid (r) UUID of user * @param requested_rights (r) requested Darwin ACE @@ -1086,7 +1339,7 @@ EC_CLEANUP: * @returns AFP result code */ static int check_acl_access(const struct vol *vol, - const struct dir *dir, + struct dir *dir, const char *path, const uuidp_t uuid, uint32_t requested_rights) @@ -1097,71 +1350,90 @@ static int check_acl_access(const struct vol *vol, uuidtype_t uuidtype; struct stat st; bstring parent = NULL; + int is_dir; - LOG(log_maxdebug, logtype_afpd, "check_access: Request: 0x%08x", requested_rights); + LOG(log_maxdebug, logtype_afpd, "check_acl_access(dir: \"%s\", path: \"%s\", curdir: \"%s\", 0x%08x)", + cfrombstr(dir->d_fullpath), path, getcwdpath(), requested_rights); + /* This check is not used anymore, as OS X Server seems to be ignoring too */ +#if 0 /* Get uid or gid from UUID */ - EC_ZERO_LOG_ERR(getnamefromuuid(uuid, &username, &uuidtype), AFPERR_PARAM); - EC_ZERO_LOG_ERR(lstat(path, &st), AFPERR_PARAM); - + EC_ZERO_ERR(getnamefromuuid(uuid, &username, &uuidtype), AFPERR_PARAM); switch (uuidtype) { case UUID_USER: break; case UUID_GROUP: - LOG(log_warning, logtype_afpd, "check_access: afp_access not supported for groups"); + LOG(log_warning, logtype_afpd, "check_acl_access: afp_access not supported for groups"); EC_STATUS(AFPERR_MISC); goto EC_CLEANUP; - - case UUID_LOCAL: - LOG(log_warning, logtype_afpd, "check_access: local UUID"); + default: EC_STATUS(AFPERR_MISC); goto EC_CLEANUP; } +#endif + + EC_ZERO_LOG_ERR(ostat(path, &st, vol_syml_opt(vol)), AFPERR_PARAM); + is_dir = !strcmp(path, "."); + + if (is_dir && (curdir->d_rights_cache != 0xffffffff)) { + /* its a dir and the cache value is valid */ + allowed_rights = curdir->d_rights_cache; + LOG(log_debug, logtype_afpd, "check_access: allowed rights from dircache: 0x%08x", allowed_rights); + } else { #ifdef HAVE_SOLARIS_ACLS - EC_ZERO_LOG(solaris_acl_rights(path, &st, &allowed_rights)); + EC_ZERO_LOG(solaris_acl_rights(path, &st, &allowed_rights)); #endif #ifdef HAVE_POSIX_ACLS - EC_ZERO_LOG(posix_acl_rights(path, &st, &allowed_rights)); + EC_ZERO_LOG(posix_acl_rights(path, &st, &allowed_rights)); #endif + /* + * The DARWIN_ACE_DELETE right might implicitly result from write acces to the parent + * directory. As it seems the 10.6 AFP client is puzzled when this right is not + * allowed where a delete would succeed because the parent dir gives write perms. + * So we check the parent dir for write access and set the right accordingly. + * Currentyl acl2ownermode calls us with dir = NULL, because it doesn't make sense + * there to do this extra check -- afaict. + */ + if (vol && dir && (requested_rights & DARWIN_ACE_DELETE)) { + int i; + uint32_t parent_rights = 0; + + if (curdir->d_did == DIRDID_ROOT_PARENT) { + /* use volume path */ + EC_NULL_LOG_ERR(parent = bfromcstr(vol->v_path), AFPERR_MISC); + } else { + /* build path for parent */ + EC_NULL_LOG_ERR(parent = bstrcpy(curdir->d_fullpath), AFPERR_MISC); + EC_ZERO_LOG_ERR(bconchar(parent, '/'), AFPERR_MISC); + EC_ZERO_LOG_ERR(bcatcstr(parent, path), AFPERR_MISC); + EC_NEG1_LOG_ERR(i = bstrrchr(parent, '/'), AFPERR_MISC); + EC_ZERO_LOG_ERR(binsertch(parent, i, 1, 0), AFPERR_MISC); + } - LOG(log_debug, logtype_afpd, "allowed rights: 0x%08x", allowed_rights); - - /* - * The DARWIN_ACE_DELETE right might implicitly result from write acces to the parent - * directory. As it seems the 10.6 AFP client is puzzled when this right is not - * allowed where a delete would succeed because the parent dir gives write perms. - * So we check the parent dir for write access and set the right accordingly. - * Currentyl acl2ownermode calls us with dir = NULL, because it doesn't make sense - * there to do this extra check -- afaict. - */ - if (vol && dir && (requested_rights & DARWIN_ACE_DELETE)) { - int i; - uint32_t parent_rights = 0; - - if (dir->d_did == DIRDID_ROOT_PARENT) { - /* use volume path */ - EC_NULL_LOG_ERR(parent = bfromcstr(vol->v_path), AFPERR_MISC); - } else { - /* build path for parent */ - EC_NULL_LOG_ERR(parent = bstrcpy(dir->d_fullpath), AFPERR_MISC); - EC_ZERO_LOG_ERR(bconchar(parent, '/'), AFPERR_MISC); - EC_ZERO_LOG_ERR(bcatcstr(parent, path), AFPERR_MISC); - EC_NEG1_LOG_ERR(i = bstrrchr(parent, '/'), AFPERR_MISC); - EC_ZERO_LOG_ERR(binsertch(parent, i, 1, 0), AFPERR_MISC); - } - - LOG(log_debug, logtype_afpd,"parent: %s", cfrombstr(parent)); - EC_ZERO_LOG_ERR(lstat(cfrombstr(parent), &st), AFPERR_MISC); + LOG(log_debug, logtype_afpd,"parent: %s", cfrombstr(parent)); + EC_ZERO_LOG_ERR(lstat(cfrombstr(parent), &st), AFPERR_MISC); #ifdef HAVE_SOLARIS_ACLS - EC_ZERO_LOG(solaris_acl_rights(cfrombstr(parent), &st, &parent_rights)); + EC_ZERO_LOG(solaris_acl_rights(cfrombstr(parent), &st, &parent_rights)); #endif #ifdef HAVE_POSIX_ACLS - EC_ZERO_LOG(posix_acl_rights(path, &st, &allowed_rights)); + EC_ZERO_LOG(posix_acl_rights(path, &st, &parent_rights)); #endif - if (parent_rights & (DARWIN_ACE_WRITE_DATA | DARWIN_ACE_DELETE_CHILD)) - allowed_rights |= DARWIN_ACE_DELETE; /* man, that was a lot of work! */ + if (parent_rights & (DARWIN_ACE_WRITE_DATA | DARWIN_ACE_DELETE_CHILD)) + allowed_rights |= DARWIN_ACE_DELETE; /* man, that was a lot of work! */ + } + + if (is_dir) { + /* Without DARWIN_ACE_DELETE set OS X 10.6 refuses to rename subdirectories in a + * directory. + */ + if (allowed_rights & DARWIN_ACE_ADD_SUBDIRECTORY) + allowed_rights |= DARWIN_ACE_DELETE; + + curdir->d_rights_cache = allowed_rights; + } + LOG(log_debug, logtype_afpd, "allowed rights: 0x%08x", allowed_rights); } if ((requested_rights & allowed_rights) != requested_rights) { @@ -1444,14 +1716,13 @@ int afp_setacl(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size * This is the magic function that makes ACLs usable by calculating * the access granted by ACEs to the logged in user. */ -int acltoownermode(char *path, struct stat *st, struct maccess *ma) +int acltoownermode(const struct vol *vol, char *path, struct stat *st, struct maccess *ma) { EC_INIT; uint32_t rights = 0; if ( ! (AFPobj->options.flags & OPTION_ACL2MACCESS) - || (current_vol == NULL) - || ! (current_vol->v_flags & AFPVOL_ACLS)) + || ! (vol->v_flags & AFPVOL_ACLS)) return 0; LOG(log_maxdebug, logtype_afpd, "acltoownermode(\"%s/%s\", 0x%02x)", @@ -1459,10 +1730,6 @@ int acltoownermode(char *path, struct stat *st, struct maccess *ma) #ifdef HAVE_SOLARIS_ACLS EC_ZERO_LOG(solaris_acl_rights(path, st, &rights)); -#endif -#ifdef HAVE_POSIX_ACLS - EC_ZERO_LOG(posix_acl_rights(path, st, &rights)); -#endif LOG(log_maxdebug, logtype_afpd, "rights: 0x%08x", rights); @@ -1472,8 +1739,13 @@ int acltoownermode(char *path, struct stat *st, struct maccess *ma) ma->ma_user |= AR_UWRITE; if (rights & (DARWIN_ACE_EXECUTE | DARWIN_ACE_SEARCH)) ma->ma_user |= AR_USEARCH; +#endif + +#ifdef HAVE_POSIX_ACLS + EC_ZERO_LOG(posix_acls_to_uaperms(path, st, ma)); +#endif - LOG(log_maxdebug, logtype_afpd, "resulting user maccess: 0x%02x", ma->ma_user); + LOG(log_maxdebug, logtype_afpd, "resulting user maccess: 0x%02x group maccess: 0x%02x", ma->ma_user, ma->ma_group); EC_CLEANUP: EC_EXIT; @@ -1488,15 +1760,17 @@ EC_CLEANUP: */ int check_vol_acl_support(const struct vol *vol) { - int ret = 1; + int ret = 0; #ifdef HAVE_SOLARIS_ACLS ace_t *aces = NULL; + ret = 1; if (get_nfsv4_acl(vol->v_path, &aces) == -1) ret = 0; #endif #ifdef HAVE_POSIX_ACLS acl_t acl = NULL; + ret = 1; if ((acl = acl_get_file(vol->v_path, ACL_TYPE_ACCESS)) == NULL) ret = 0; #endif