X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=libatalk%2Fadouble%2Fad_open.c;h=53ec4eb97ba96c600580898ae8015a48addacf43;hp=6b6aa6a4378c6de6e398c918195dfa74253dbcb4;hb=1fd316930fbb61d754cf7df36e584348bb95cfc3;hpb=5322c1003f6b694840ab512d97f841de1e41809d diff --git a/libatalk/adouble/ad_open.c b/libatalk/adouble/ad_open.c index 6b6aa6a4..53ec4eb9 100644 --- a/libatalk/adouble/ad_open.c +++ b/libatalk/adouble/ad_open.c @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -104,20 +105,22 @@ static uid_t default_uid = -1; /* Forward declarations */ static int ad_mkrf(const char *path); -static int ad_header_read(const char *path, struct adouble *ad, struct stat *hst); +static int ad_header_read(const char *path, struct adouble *ad, const struct stat *hst); static int ad_header_upgrade(struct adouble *ad, const char *name); +#ifdef HAVE_EAFD static int ad_mkrf_ea(const char *path); -static int ad_header_read_ea(const char *path, struct adouble *ad, struct stat *hst); +#endif +static int ad_header_read_ea(const char *path, struct adouble *ad, const struct stat *hst); static int ad_header_upgrade_ea(struct adouble *ad, const char *name); -static int ad_reso_size(const char *path, int adflags, struct adouble *ad); +off_t ad_reso_size(const char *path, int adflags, struct adouble *ad); static int ad_mkrf_osx(const char *path); static struct adouble_fops ad_adouble = { &ad_path, &ad_mkrf, - &ad_rebuild_adouble_header, + &ad_rebuild_adouble_header_v2, &ad_header_read, &ad_header_upgrade, }; @@ -130,19 +133,11 @@ static struct adouble_fops ad_adouble_ea = { &ad_path_osx, &ad_mkrf_osx, #endif - &ad_rebuild_adouble_header, + &ad_rebuild_adouble_header_ea, &ad_header_read_ea, &ad_header_upgrade_ea, }; -static struct adouble_fops ad_osx = { - &ad_path_osx, - &ad_mkrf_osx, - &ad_rebuild_adouble_header, - &ad_header_read, - &ad_header_upgrade, -}; - static const struct entry entry_order2[ADEID_NUM_V2 + 1] = { {ADEID_NAME, ADEDOFF_NAME_V2, ADEDLEN_INIT}, {ADEID_COMMENT, ADEDOFF_COMMENT_V2, ADEDLEN_INIT}, @@ -173,13 +168,6 @@ static const struct entry entry_order_ea[ADEID_NUM_EA + 1] = { {0, 0, 0} }; -/* fallback for EAs */ -static const struct entry entry_order_osx[ADEID_NUM_OSX +1] = { - {ADEID_FINDERI, ADEDOFF_FINDERI_OSX, ADEDLEN_FINDERI}, - {ADEID_RFORK, ADEDOFF_RFORK_OSX, ADEDLEN_INIT}, - {0, 0, 0} -}; - #define ADFLAGS2LOGSTRBUFSIZ 128 const char *adflags2logstr(int adflags) { @@ -323,20 +311,16 @@ static uint32_t get_eid(uint32_t eid) return 0; } -/* ----------------------------------- */ -static int new_ad_header(struct adouble *ad, const char *path, struct stat *stp, int adflags) + +/** + * Initialize offset pointers + */ +int ad_init_offsets(struct adouble *ad) { const struct entry *eid; - uint16_t ashort; - struct stat st; - LOG(log_debug, logtype_default, "new_ad_header(\"%s\")", path); - - if (stp == NULL) { - stp = &st; - if (lstat(path, &st) != 0) - return -1; - } + if (ad->ad_magic == AD_MAGIC) + return 0; ad->ad_magic = AD_MAGIC; ad->ad_version = ad->ad_vers & 0x0f0000; @@ -350,11 +334,8 @@ static int new_ad_header(struct adouble *ad, const char *path, struct stat *stp, eid = entry_order2; else if (ad->ad_vers == AD_VERSION_EA) eid = entry_order_ea; - else if (ad->ad_vers == AD_VERSION2_OSX) - eid = entry_order_osx; - else { + else return -1; - } while (eid->id) { ad->ad_eid[eid->id].ade_off = eid->offset; @@ -362,45 +343,65 @@ static int new_ad_header(struct adouble *ad, const char *path, struct stat *stp, eid++; } - /* put something sane in the directory finderinfo */ - if (ad->ad_vers != AD_VERSION2_OSX) { - if ((adflags & ADFLAGS_DIR)) { - /* set default view */ - ashort = htons(FINDERINFO_CLOSEDVIEW); - memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRVIEWOFF, &ashort, sizeof(ashort)); - } else { - /* set default creator/type fields */ - memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRTYPEOFF,"\0\0\0\0", 4); - memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRCREATOFF,"\0\0\0\0", 4); - } + /* + * Ensure the resource fork offset is always set + */ +#ifndef HAVE_EAFD + if (ad->ad_vers == AD_VERSION_EA) + ad_setentryoff(ad, ADEID_RFORK, ADEDOFF_RFORK_OSX); +#endif - /* make things invisible */ - if ((ad->ad_options & ADVOL_INVDOTS) - && (*path == '.') - && !((adflags & ADFLAGS_DIR) && (path[1] == 0)) - ) { - ashort = htons(ATTRBIT_INVISIBLE); - ad_setattr(ad, ashort); - ashort = htons(FINDERINFO_INVISIBLE); - memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRFLAGOFF, &ashort, sizeof(ashort)); - } + return 0; +} - /* put something sane in the date fields */ - ad_setdate(ad, AD_DATE_CREATE | AD_DATE_UNIX, stp->st_mtime); - ad_setdate(ad, AD_DATE_MODIFY | AD_DATE_UNIX, stp->st_mtime); - ad_setdate(ad, AD_DATE_ACCESS | AD_DATE_UNIX, stp->st_mtime); - ad_setdate(ad, AD_DATE_BACKUP, AD_DATE_START); +/* ----------------------------------- */ +static int new_ad_header(struct adouble *ad, const char *path, struct stat *stp, int adflags) +{ + const struct entry *eid; + uint16_t ashort; + struct stat st; + + LOG(log_debug, logtype_ad, "new_ad_header(\"%s\")", path); + + if (ad_init_offsets(ad) != 0) + return -1; + + /* set default creator/type fields */ + memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRTYPEOFF,"\0\0\0\0", 4); + memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRCREATOFF,"\0\0\0\0", 4); + + /* make things invisible */ + if ((ad->ad_options & ADVOL_INVDOTS) + && (*path == '.') + && !((adflags & ADFLAGS_DIR) && (path[1] == 0)) + ) { + ashort = htons(ATTRBIT_INVISIBLE); + ad_setattr(ad, ashort); + ashort = htons(FINDERINFO_INVISIBLE); + memcpy(ad_entry(ad, ADEID_FINDERI) + FINDERINFO_FRFLAGOFF, &ashort, sizeof(ashort)); } + + /* put something sane in the date fields */ + if (stp == NULL) { + stp = &st; + if (lstat(path, &st) != 0) + return -1; + } + ad_setdate(ad, AD_DATE_CREATE | AD_DATE_UNIX, stp->st_mtime); + ad_setdate(ad, AD_DATE_MODIFY | AD_DATE_UNIX, stp->st_mtime); + ad_setdate(ad, AD_DATE_ACCESS | AD_DATE_UNIX, stp->st_mtime); + ad_setdate(ad, AD_DATE_BACKUP, AD_DATE_START); + return 0; } -/* ------------------------------------- - read in the entries -*/ -static void parse_entries(struct adouble *ad, char *buf, uint16_t nentries) +/** + * Read an AppleDouble buffer, returns 0 on success, -1 if an entry was malformatted + **/ +static int parse_entries(struct adouble *ad, char *buf, uint16_t nentries) { uint32_t eid, len, off; - int warning = 0; + int ret = 0; /* now, read in the entry bits */ for (; nentries > 0; nentries-- ) { @@ -414,17 +415,21 @@ static void parse_entries(struct adouble *ad, char *buf, uint16_t nentries) len = ntohl( len ); buf += sizeof( len ); - if (eid - && eid < ADEID_MAX - && off < sizeof(ad->ad_data) - && (off + len <= sizeof(ad->ad_data) || eid == ADEID_RFORK)) { - ad->ad_eid[ eid ].ade_off = off; - ad->ad_eid[ eid ].ade_len = len; - } else if (!warning) { - warning = 1; - LOG(log_warning, logtype_default, "parse_entries: bogus eid: %d", eid); + ad->ad_eid[eid].ade_off = off; + ad->ad_eid[eid].ade_len = len; + + if (!eid + || eid > ADEID_MAX + || off >= sizeof(ad->ad_data) + || ((eid != ADEID_RFORK) && (off + len > sizeof(ad->ad_data)))) + { + ret = -1; + LOG(log_warning, logtype_ad, "parse_entries: bogus eid: %u, off: %u, len: %u", + (uint)eid, (uint)off, (uint)len); } } + + return ret; } /* this reads enough of the header so that we can figure out all of @@ -434,7 +439,7 @@ static void parse_entries(struct adouble *ad, char *buf, uint16_t nentries) * NOTE: we're assuming that the resource fork is kept at the end of * the file. also, mmapping won't work for the hfs fs until it * understands how to mmap header files. */ -static int ad_header_read(const char *path _U_, struct adouble *ad, struct stat *hst) +static int ad_header_read(const char *path, struct adouble *ad, const struct stat *hst) { char *buf = ad->ad_data; uint16_t nentries; @@ -443,7 +448,7 @@ static int ad_header_read(const char *path _U_, struct adouble *ad, struct stat struct stat st; /* read the header */ - if ((header_len = adf_pread( ad->ad_mdp, buf, AD_DATASZ, 0)) < 0) { + if ((header_len = adf_pread( ad->ad_mdp, buf, AD_DATASZ2, 0)) < 0) { return -1; } if (header_len < AD_HEADER_LEN) { @@ -457,7 +462,7 @@ static int ad_header_read(const char *path _U_, struct adouble *ad, struct stat ad->ad_version = ntohl( ad->ad_version ); if ((ad->ad_magic != AD_MAGIC) || (ad->ad_version != AD_VERSION2)) { - LOG(log_error, logtype_default, "ad_open: can't parse AppleDouble header."); + LOG(log_error, logtype_ad, "ad_open: can't parse AppleDouble header."); errno = EIO; return -1; } @@ -474,7 +479,7 @@ static int ad_header_read(const char *path _U_, struct adouble *ad, struct stat buf += AD_HEADER_LEN; if (len > header_len - AD_HEADER_LEN) { - LOG(log_error, logtype_default, "ad_header_read: can't read entry info."); + LOG(log_error, logtype_ad, "ad_header_read: can't read entry info."); errno = EIO; return -1; } @@ -482,17 +487,22 @@ static int ad_header_read(const char *path _U_, struct adouble *ad, struct stat /* figure out all of the entry offsets and lengths. if we aren't * able to read a resource fork entry, bail. */ nentries = len / AD_ENTRY_LEN; - parse_entries(ad, buf, nentries); + if (parse_entries(ad, buf, nentries) != 0) { + LOG(log_warning, logtype_ad, "ad_header_read(%s): malformed AppleDouble", + path ? fullpathname(path) : ""); + errno = EIO; + return -1; + } if (!ad_getentryoff(ad, ADEID_RFORK) || (ad_getentryoff(ad, ADEID_RFORK) > sizeof(ad->ad_data)) ) { - LOG(log_error, logtype_default, "ad_header_read: problem with rfork entry offset."); + LOG(log_error, logtype_ad, "ad_header_read: problem with rfork entry offset."); errno = EIO; return -1; } if (ad_getentryoff(ad, ADEID_RFORK) > header_len) { - LOG(log_error, logtype_default, "ad_header_read: can't read in entries."); + LOG(log_error, logtype_ad, "ad_header_read: can't read in entries."); errno = EIO; return -1; } @@ -509,18 +519,147 @@ static int ad_header_read(const char *path _U_, struct adouble *ad, struct stat return 0; } -/* Read an ._ file, only uses the resofork, finderinfo is taken from EA */ -static int ad_header_read_osx(const char *path _U_, struct adouble *ad, struct stat *hst) +/* error here means it's not ad ._ adouble:osx file and thus we return 1 */ +int ad_valid_header_osx(const char *path) { EC_INIT; + int fd = -1; struct adouble adosx; char *buf = &adosx.ad_data[0]; + ssize_t header_len; + + LOG(log_debug, logtype_ad, "ad_valid_header_osx(\"%s\"): BEGIN", fullpathname(path)); + + EC_NEG1( fd = open(path, O_RDONLY) ); + + /* read the header */ + EC_NEG1( header_len = read(fd, buf, AD_DATASZ_OSX) ); + + if (header_len < AD_HEADER_LEN) + EC_FAIL; + + memcpy(&adosx.ad_magic, buf, sizeof(adosx.ad_magic)); + memcpy(&adosx.ad_version, buf + ADEDOFF_VERSION, sizeof(adosx.ad_version)); + adosx.ad_magic = ntohl(adosx.ad_magic); + adosx.ad_version = ntohl(adosx.ad_version); + + if ((adosx.ad_magic != AD_MAGIC) || (adosx.ad_version != AD_VERSION2)) { + LOG(log_warning, logtype_ad, "ad_valid_header_osx(\"%s\"): not an adouble:osx file", fullpathname(path)); + EC_FAIL; + } + + if (strncmp(buf + ADEDOFF_FILLER, + AD_FILLER_NETATALK, + strlen(AD_FILLER_NETATALK)) != 0) + /* + * It's a split fork created by OS X, it's not our "own" ._ file + * and thus not a valid header in this context. + * We allow enumeration and access. + */ + EC_FAIL; + +EC_CLEANUP: + LOG(log_debug, logtype_ad, "ad_valid_header_osx(\"%s\"): END: %d", fullpathname(path), ret); + if (fd != -1) + close(fd); + if (ret != 0) + return 1; + return 0; +} + +/** + * Convert from Apple's ._ file to Netatalk + * + * Apple's AppleDouble may contain a FinderInfo entry longer then 32 bytes + * containing packed xattrs. Netatalk can't deal with that, so we + * simply discard the packed xattrs. + * + * As we call ad_open() which might result in a recursion, just to be sure + * use static variable in_conversion to check for that. + * + * Returns -1 in case an error occured, 0 if no conversion was done, 1 otherwise + **/ +static int ad_convert_osx(const char *path, struct adouble *ad) +{ + EC_INIT; + static bool in_conversion = false; + char *map; + int finderlen = ad_getentrylen(ad, ADEID_FINDERI); + ssize_t origlen; + + if (in_conversion || finderlen == ADEDLEN_FINDERI) + return 0; + in_conversion = true; + + LOG(log_debug, logtype_ad, "Converting OS X AppleDouble %s, FinderInfo length: %d", + fullpathname(path), finderlen); + + origlen = ad_getentryoff(ad, ADEID_RFORK) + ad_getentrylen(ad, ADEID_RFORK); + + map = mmap(NULL, origlen, PROT_READ | PROT_WRITE, MAP_SHARED, ad_reso_fileno(ad), 0); + if (map == MAP_FAILED) { + LOG(log_error, logtype_ad, "mmap AppleDouble: %s\n", strerror(errno)); + EC_FAIL; + } + + memmove(map + ad_getentryoff(ad, ADEID_FINDERI) + ADEDLEN_FINDERI, + map + ad_getentryoff(ad, ADEID_RFORK), + ad_getentrylen(ad, ADEID_RFORK)); + + ad_setentrylen(ad, ADEID_FINDERI, ADEDLEN_FINDERI); + ad->ad_rlen = ad_getentrylen(ad, ADEID_RFORK); + ad_setentryoff(ad, ADEID_RFORK, ad_getentryoff(ad, ADEID_FINDERI) + ADEDLEN_FINDERI); + + EC_ZERO_LOG( ftruncate(ad_reso_fileno(ad), + ad_getentryoff(ad, ADEID_RFORK) + + ad_getentrylen(ad, ADEID_RFORK)) ); + + (void)ad_rebuild_adouble_header_osx(ad, map); + munmap(map, origlen); + + /* Create a metadata EA if one doesn't exit */ + if (strlen(path) < 3) + EC_EXIT_STATUS(0); + struct adouble adea; + ad_init_old(&adea, AD_VERSION_EA, ad->ad_options); + + if (ad_open(&adea, path + 2, ADFLAGS_HF | ADFLAGS_RDWR | ADFLAGS_CREATE, 0666) < 0) { + LOG(log_error, logtype_ad, "create metadata: %s\n", strerror(errno)); + EC_FAIL; + } + if (adea.ad_mdp->adf_flags & O_CREAT) { + memcpy(ad_entry(&adea, ADEID_FINDERI), + ad_entry(ad, ADEID_FINDERI), + ADEDLEN_FINDERI); + ad_flush(&adea); + } + ad_close(&adea, ADFLAGS_HF); + +EC_CLEANUP: + in_conversion = false; + if (ret != 0) + return -1; + return 1; +} + +/* Read an ._ file, only uses the resofork, finderinfo is taken from EA */ +static int ad_header_read_osx(const char *path, struct adouble *ad, const struct stat *hst) +{ + EC_INIT; + struct adouble adosx; + char *buf; uint16_t nentries; int len; ssize_t header_len; struct stat st; + int retry_read = 0; +reread: + LOG(log_debug, logtype_ad, "ad_header_read_osx: %s", path ? fullpathname(path) : ""); + ad_init_old(&adosx, AD_VERSION_EA, ad->ad_options); + buf = &adosx.ad_data[0]; memset(buf, 0, sizeof(adosx.ad_data)); + adosx.ad_rfp->adf_fd = ad_reso_fileno(ad); /* read the header */ EC_NEG1( header_len = adf_pread(ad->ad_rfp, buf, AD_DATASZ_OSX, 0) ); @@ -536,7 +675,7 @@ static int ad_header_read_osx(const char *path _U_, struct adouble *ad, struct s adosx.ad_version = ntohl(adosx.ad_version); if ((adosx.ad_magic != AD_MAGIC) || (adosx.ad_version != AD_VERSION2)) { - LOG(log_error, logtype_afpd, "ad_header_read_osx: can't parse AppleDouble header"); + LOG(log_error, logtype_ad, "ad_header_read_osx: can't parse AppleDouble header"); errno = EIO; return -1; } @@ -550,19 +689,39 @@ static int ad_header_read_osx(const char *path _U_, struct adouble *ad, struct s buf += AD_HEADER_LEN; if (len > header_len - AD_HEADER_LEN) { - LOG(log_error, logtype_afpd, "ad_header_read_osx: can't read entry info."); + LOG(log_error, logtype_ad, "ad_header_read_osx: can't read entry info."); errno = EIO; return -1; } nentries = len / AD_ENTRY_LEN; - parse_entries(&adosx, buf, nentries); + if (parse_entries(&adosx, buf, nentries) != 0) { + LOG(log_warning, logtype_ad, "ad_header_read(%s): malformed AppleDouble", + path ? fullpathname(path) : ""); + } + + if (ad_getentrylen(&adosx, ADEID_FINDERI) != ADEDLEN_FINDERI) { + LOG(log_warning, logtype_ad, "Convert OS X to Netatalk AppleDouble: %s", + path ? fullpathname(path) : ""); + + if (retry_read > 0) { + LOG(log_error, logtype_ad, "ad_header_read_osx: %s, giving up", path ? fullpathname(path) : ""); + errno = EIO; + EC_FAIL; + } + retry_read++; + if (ad_convert_osx(path, &adosx) == 1) { + goto reread; + } + errno = EIO; + EC_FAIL; + } if (ad_getentryoff(&adosx, ADEID_RFORK) == 0 || ad_getentryoff(&adosx, ADEID_RFORK) > sizeof(ad->ad_data) || ad_getentryoff(&adosx, ADEID_RFORK) > header_len ) { - LOG(log_error, logtype_afpd, "ad_header_read_osx: problem with rfork entry offset."); + LOG(log_error, logtype_ad, "ad_header_read_osx: problem with rfork entry offset."); errno = EIO; return -1; } @@ -579,8 +738,9 @@ EC_CLEANUP: EC_EXIT; } -static int ad_header_read_ea(const char *path, struct adouble *ad, struct stat *hst _U_) +static int ad_header_read_ea(const char *path, struct adouble *ad, const struct stat *hst _U_) { + EC_INIT; uint16_t nentries; int len; ssize_t header_len; @@ -589,16 +749,16 @@ static int ad_header_read_ea(const char *path, struct adouble *ad, struct stat * if (ad_meta_fileno(ad) != -1) header_len = sys_fgetxattr(ad_meta_fileno(ad), AD_EA_META, ad->ad_data, AD_DATASZ_EA); else - header_len = sys_lgetxattr(path, AD_EA_META, ad->ad_data, AD_DATASZ_EA); - if (header_len < 1) { - LOG(log_debug, logtype_default, "ad_header_read_ea: %s", strerror(errno)); - return -1; + header_len = sys_getxattr(path, AD_EA_META, ad->ad_data, AD_DATASZ_EA); + if (header_len < 1) { + LOG(log_debug, logtype_ad, "ad_header_read_ea: %s", strerror(errno)); + EC_FAIL; } - if (header_len < AD_HEADER_LEN) { - LOG(log_error, logtype_default, "ad_header_read_ea: bogus AppleDouble header."); - errno = EIO; - return -1; + if (header_len < AD_DATASZ_EA) { + LOG(log_error, logtype_ad, "ad_header_read_ea(\"%s\"): short metadata EA", fullpathname(path)); + errno = EINVAL; + EC_FAIL; } memcpy(&ad->ad_magic, buf, sizeof( ad->ad_magic )); @@ -608,29 +768,58 @@ static int ad_header_read_ea(const char *path, struct adouble *ad, struct stat * ad->ad_version = ntohl( ad->ad_version ); if ((ad->ad_magic != AD_MAGIC) || (ad->ad_version != AD_VERSION2)) { - LOG(log_error, logtype_default, "ad_header_read_ea: wrong magic or version"); - errno = EIO; - return -1; + LOG(log_error, logtype_ad, "ad_header_read_ea(\"%s\"): wrong magic or version", fullpathname(path)); + errno = EINVAL; + EC_FAIL; } memcpy(&nentries, buf + ADEDOFF_NENTRIES, sizeof( nentries )); nentries = ntohs( nentries ); - - /* Protect against bogus nentries */ - len = nentries * AD_ENTRY_LEN; - if (len + AD_HEADER_LEN > sizeof(ad->ad_data)) - len = sizeof(ad->ad_data) - AD_HEADER_LEN; - if (len > header_len - AD_HEADER_LEN) { - LOG(log_error, logtype_default, "ad_header_read_ea: can't read entry info."); - errno = EIO; - return -1; + if (nentries != ADEID_NUM_EA) { + LOG(log_error, logtype_ad, "ad_header_read_ea(\"%s\"): invalid number of entries: %d", fullpathname(path), nentries); + errno = EINVAL; + EC_FAIL; } - nentries = len / AD_ENTRY_LEN; /* Now parse entries */ - parse_entries(ad, buf + AD_HEADER_LEN, nentries); + if (parse_entries(ad, buf + AD_HEADER_LEN, nentries)) { + LOG(log_warning, logtype_ad, "ad_header_read(%s): malformed AppleDouble", + path ? fullpathname(path) : ""); + errno = EINVAL; + EC_FAIL; + } - return 0; + if (nentries != ADEID_NUM_EA + || !ad_entry(ad, ADEID_FINDERI) + || !ad_entry(ad, ADEID_COMMENT) + || !ad_entry(ad, ADEID_FILEDATESI) + || !ad_entry(ad, ADEID_AFPFILEI) + || !ad_entry(ad, ADEID_PRIVDEV) + || !ad_entry(ad, ADEID_PRIVINO) + || !ad_entry(ad, ADEID_PRIVSYN) + || !ad_entry(ad, ADEID_PRIVID)) { + LOG(log_error, logtype_ad, "ad_header_read_ea(\"%s\"): invalid metadata EA", fullpathname(path)); + errno = EINVAL; + EC_FAIL; + } + + /* + * Ensure the resource fork offset is always set + */ +#ifndef HAVE_EAFD + if (ad->ad_vers == AD_VERSION_EA) + ad_setentryoff(ad, ADEID_RFORK, ADEDOFF_RFORK_OSX); +#endif + +EC_CLEANUP: + if (ret != 0 && errno == EINVAL) { + become_root(); + (void)sys_removexattr(path, AD_EA_META); + unbecome_root(); + LOG(log_error, logtype_ad, "ad_header_read_ea(\"%s\"): deleted invalid metadata EA", fullpathname(path), nentries); + errno = ENOENT; + } + EC_EXIT; } /*! @@ -658,11 +847,13 @@ static int ad_mkrf(const char *path) return 0; } +#ifdef HAVE_EAFD static int ad_mkrf_ea(const char *path _U_) { AFP_PANIC("ad_mkrf_ea: dont use"); return 0; } +#endif static int ad_mkrf_osx(const char *path _U_) { @@ -729,7 +920,8 @@ static int ad_header_upgrade_ea(struct adouble *ad _U_, const char *name _U_) * * We're called because opening ADFLAGS_HF caused an error. * 1. In case ad_open is called with ADFLAGS_NOHF the error is suppressed. - * 2. If ad_open was called with ADFLAGS_DF we may have opened the datafork and thus + * 2. Open non-existent ressource fork, this will just result in first read return EOF + * 3. If ad_open was called with ADFLAGS_DF we may have opened the datafork and thus * ought to close it before returning with an error condition. */ static int ad_error(struct adouble *ad, int adflags) @@ -738,7 +930,9 @@ static int ad_error(struct adouble *ad, int adflags) if (adflags & ADFLAGS_NOHF) { /* 1 */ return 0; } - if (adflags & (ADFLAGS_DF | ADFLAGS_SETSHRMD | ADFLAGS_CHECK_OF)) { /* 2 */ + if ((adflags & ADFLAGS_RDONLY) && (adflags & ADFLAGS_RF) && (errno == ENOENT)) /* 2 */ + return 0; + if (adflags & (ADFLAGS_DF | ADFLAGS_SETSHRMD | ADFLAGS_CHECK_OF)) { /* 3 */ ad_close( ad, ADFLAGS_DF ); err = errno; } @@ -775,6 +969,9 @@ static int ad2openflags(const struct adouble *ad, int adfile, int adflags) if (adflags & ADFLAGS_TRUNC) oflags |= O_TRUNC; + if (!(ad->ad_options & ADVOL_FOLLO_SYML)) + oflags |= O_NOFOLLOW; + return oflags; } @@ -787,7 +984,7 @@ static int ad_open_df(const char *path, int adflags, mode_t mode, struct adouble int st_invalid = -1; ssize_t lsz; - LOG(log_debug, logtype_default, + LOG(log_debug, logtype_ad, "ad_open_df(\"%s\", %s): BEGIN [dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]", fullpathname(path), adflags2logstr(adflags), ad_data_fileno(ad), ad->ad_data_fork.adf_refcount, @@ -808,7 +1005,7 @@ static int ad_open_df(const char *path, int adflags, mode_t mode, struct adouble goto EC_CLEANUP; } - oflags = O_NOFOLLOW | ad2openflags(ad, ADFLAGS_DF, adflags); + oflags = ad2openflags(ad, ADFLAGS_DF, adflags); admode = mode; if ((adflags & ADFLAGS_CREATE)) { @@ -838,7 +1035,7 @@ static int ad_open_df(const char *path, int adflags, mode_t mode, struct adouble EC_FAIL; } ad->ad_data_fork.adf_syml[lsz] = 0; - ad->ad_data_fork.adf_fd = -2; /* -2 means its a symlink */ + ad->ad_data_fork.adf_fd = AD_SYMLINK; break; default: EC_FAIL; @@ -853,7 +1050,7 @@ static int ad_open_df(const char *path, int adflags, mode_t mode, struct adouble ad->ad_data_fork.adf_refcount++; EC_CLEANUP: - LOG(log_debug, logtype_default, + LOG(log_debug, logtype_ad, "ad_open_df(\"%s\", %s): END: %d [dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]", fullpathname(path), adflags2logstr(adflags), ret, ad_data_fileno(ad), ad->ad_data_fork.adf_refcount, @@ -873,7 +1070,7 @@ static int ad_open_hf_v2(const char *path, int adflags, mode_t mode, struct adou mode_t admode; int st_invalid = -1; - LOG(log_debug, logtype_default, + LOG(log_debug, logtype_ad, "ad_open_hf_v2(\"%s\", %s): BEGIN [dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]", fullpathname(path), adflags2logstr(adflags), ad_data_fileno(ad), ad->ad_data_fork.adf_refcount, @@ -896,8 +1093,8 @@ static int ad_open_hf_v2(const char *path, int adflags, mode_t mode, struct adou } ad_p = ad->ad_ops->ad_path(path, adflags); - oflags = O_NOFOLLOW | ad2openflags(ad, ADFLAGS_HF, adflags); - LOG(log_debug, logtype_default,"ad_open_hf_v2(\"%s\"): open flags: %s", + oflags = ad2openflags(ad, ADFLAGS_HF, adflags); + LOG(log_debug, logtype_ad,"ad_open_hf_v2(\"%s\"): open flags: %s", fullpathname(path), openflags2logstr(oflags)); nocreatflags = oflags & ~(O_CREAT | O_EXCL); @@ -924,7 +1121,7 @@ static int ad_open_hf_v2(const char *path, int adflags, mode_t mode, struct adou /* * We're expecting to create a new adouble header file here */ - LOG(log_debug, logtype_default, "ad_open(\"%s\"): creating adouble file", + LOG(log_debug, logtype_ad, "ad_open(\"%s\"): creating adouble file", fullpathname(path)); admode = mode; errno = 0; @@ -985,7 +1182,7 @@ EC_CLEANUP: ad_meta_fileno(ad) = -1; ad->ad_mdp->adf_refcount = 0; } - LOG(log_debug, logtype_default, + LOG(log_debug, logtype_ad, "ad_open_hf_v2(\"%s\", %s): END: %d [dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]", fullpathname(path), adflags2logstr(adflags), ret, ad_data_fileno(ad), ad->ad_data_fork.adf_refcount, @@ -997,29 +1194,27 @@ EC_CLEANUP: static int ad_open_hf_ea(const char *path, int adflags, int mode, struct adouble *ad) { EC_INIT; - ssize_t rforklen; int oflags; int opened = 0; - LOG(log_debug, logtype_default, + LOG(log_debug, logtype_ad, "ad_open_hf_ea(\"%s\", %s): BEGIN [dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]", fullpathname(path), adflags2logstr(adflags), ad_data_fileno(ad), ad->ad_data_fork.adf_refcount, ad_meta_fileno(ad), ad->ad_mdp->adf_refcount, ad_reso_fileno(ad), ad->ad_rfp->adf_refcount); - oflags = O_NOFOLLOW | (ad2openflags(ad, ADFLAGS_DF, adflags) & ~(O_CREAT | O_TRUNC)); + oflags = ad2openflags(ad, ADFLAGS_DF, adflags) & ~(O_CREAT | O_TRUNC); - if (ad_meta_fileno(ad) == -2) - /* symlink */ - EC_EXIT; + if (ad_meta_fileno(ad) == AD_SYMLINK) + goto EC_CLEANUP; if (ad_meta_fileno(ad) != -1) { /* the file is already open, but we want write access: */ if ((oflags & O_RDWR) && /* and it was already denied: */ (ad->ad_mdp->adf_flags & O_RDONLY)) { - LOG(log_error, logtype_default, "ad_open_hf_ea(%s): rw request for ro file: %s", + LOG(log_error, logtype_ad, "ad_open_hf_ea(%s): rw request for ro file: %s", fullpathname(path), strerror(errno)); errno = EACCES; EC_FAIL; @@ -1032,7 +1227,7 @@ static int ad_open_hf_ea(const char *path, int adflags, int mode, struct adouble if (adflags & ADFLAGS_DIR) /* For directories we open the directory RDONYL so we can later fchdir() */ oflags = (oflags & ~O_RDWR) | O_RDONLY; - LOG(log_debug, logtype_default, "ad_open_hf_ea(\"%s\"): opening base file for meta adouble EA", path); + LOG(log_debug, logtype_ad, "ad_open_hf_ea(\"%s\"): opening base file for meta adouble EA", path); EC_NEG1(ad_meta_fileno(ad) = open(path, oflags)); opened = 1; ad->ad_mdp->adf_flags = oflags; @@ -1042,16 +1237,20 @@ static int ad_open_hf_ea(const char *path, int adflags, int mode, struct adouble /* Read the adouble header in and parse it.*/ if (ad->ad_ops->ad_header_read(path, ad, NULL) != 0) { if (!(adflags & ADFLAGS_CREATE)) { - LOG(log_debug, logtype_default, "ad_open_hf_ea(\"%s\"): can't read metadata EA", path); + LOG(log_debug, logtype_ad, "ad_open_hf_ea(\"%s\"): can't read metadata EA", path); errno = ENOENT; EC_FAIL; } + if ((adflags & ADFLAGS_CREATE) && (ad->ad_options & ADVOL_RO)) { + errno = EROFS; + EC_FAIL; + } - LOG(log_debug, logtype_default, "ad_open_hf_ea(\"%s\"): creating metadata EA", path); + LOG(log_debug, logtype_ad, "ad_open_hf_ea(\"%s\"): creating metadata EA", path); /* It doesnt exist, EPERM or another error */ if (!(errno == ENOATTR || errno == ENOENT)) { - LOG(log_error, logtype_default, "ad_open_hf_ea: unexpected: %s", strerror(errno)); + LOG(log_error, logtype_ad, "ad_open_hf_ea: unexpected: %s", strerror(errno)); EC_FAIL; } @@ -1059,11 +1258,12 @@ static int ad_open_hf_ea(const char *path, int adflags, int mode, struct adouble EC_NEG1_LOG(new_ad_header(ad, path, NULL, adflags)); ad->ad_mdp->adf_flags |= O_CREAT; /* mark as just created */ ad_flush(ad); - LOG(log_debug, logtype_default, "ad_open_hf_ea(\"%s\"): created metadata EA", path); + LOG(log_debug, logtype_ad, "ad_open_hf_ea(\"%s\"): created metadata EA", path); } - ad->ad_mdp->adf_refcount++; - (void)ad_reso_size(path, adflags, ad); + if (ad_meta_fileno(ad) != -1) + ad->ad_mdp->adf_refcount++; + ad->ad_rlen = ad_reso_size(path, adflags, ad); EC_CLEANUP: if (ret != 0 && opened && ad_meta_fileno(ad) != -1) { @@ -1071,7 +1271,7 @@ EC_CLEANUP: ad_meta_fileno(ad) = -1; ad->ad_mdp->adf_refcount = 0; } - LOG(log_debug, logtype_default, + LOG(log_debug, logtype_ad, "ad_open_hf_ea(\"%s\", %s): END: %d [dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]", fullpathname(path), adflags2logstr(adflags), ret, ad_data_fileno(ad), ad->ad_data_fork.adf_refcount, @@ -1085,8 +1285,7 @@ static int ad_open_hf(const char *path, int adflags, int mode, struct adouble *a { int ret = 0; - memset(ad->ad_eid, 0, sizeof( ad->ad_eid )); - ad->ad_rlen = 0; + ad->ad_meta_refcount++; switch (ad->ad_vers) { case AD_VERSION2: @@ -1100,77 +1299,93 @@ static int ad_open_hf(const char *path, int adflags, int mode, struct adouble *a break; } - if (ret != 0) + if (ret != 0) { + ad->ad_meta_refcount--; ret = ad_error(ad, adflags); + } return ret; } /*! - * Get resofork length for adouble:ea + * Get resofork length for adouble:ea, parameter 'ad' may be NULL */ -static int ad_reso_size(const char *path, int adflags, struct adouble *ad) +off_t ad_reso_size(const char *path, int adflags, struct adouble *ad) { EC_INIT; struct stat st; + off_t rlen; + + if (adflags & ADFLAGS_DIR) + EC_FAIL; - LOG(log_debug, logtype_default, "ad_reso_size(\"%s\")", path); + LOG(log_debug, logtype_ad, "ad_reso_size(\"%s\"): BEGIN", path); #ifdef HAVE_EAFD ssize_t easz; - if (ad_reso_fileno(ad) != -1) { + if (ad && ad_reso_fileno(ad) != -1) { EC_NEG1( fstat(ad_reso_fileno(ad), &st) ); - ad->ad_rlen = st.st_size; - } else if (ad_meta_fileno(ad) != -1) { - EC_NEG1( easz = sys_fgetxattr(ad_meta_fileno(ad), AD_EA_RESO, NULL, 0) ); - ad->ad_rlen = easz; + rlen = st.st_size; + } else if (ad && ad_meta_fileno(ad) != -1) { + EC_NEG1( (rlen = sys_fgetxattr(ad_meta_fileno(ad), AD_EA_RESO, NULL, 0)) ); } else { - EC_FAIL; + EC_NEG1( (rlen = sys_lgetxattr(path, AD_EA_RESO, NULL, 0)) ); } #else const char *rfpath; - EC_NULL_LOG( rfpath = ad->ad_ops->ad_path(path, adflags)); + EC_NULL_LOG( rfpath = ad_path_osx(path, adflags)); EC_ZERO( lstat(rfpath, &st)); if (st.st_size > ADEDOFF_RFORK_OSX) - ad->ad_rlen = st.st_size - ADEDOFF_RFORK_OSX; + rlen = st.st_size - ADEDOFF_RFORK_OSX; else - ad->ad_rlen = 0; + rlen = 0; #endif - LOG(log_debug, logtype_default, "ad_reso_size(\"%s\"): size: %zd", path, ad->ad_rlen); + LOG(log_debug, logtype_ad, "ad_reso_size(\"%s\"): size: %zd", path, rlen); EC_CLEANUP: if (ret != 0) - ad->ad_rlen = 0; + rlen = 0; + return rlen; +} + +static int ad_open_rf_v2(const char *path, int adflags, int mode, struct adouble *ad) +{ + EC_INIT; + + /* + * ad_open_hf_v2() does the work, but if it failed and adflags are ADFLAGS_NOHF | ADFLAGS_RF + * ad_open_hf_v2() didn't give an error, but we're supposed to return a reso fork fd + */ + + LOG(log_debug, logtype_ad, "ad_open_rf_v2(\"%s\"): BEGIN", fullpathname(path)); + + if (!AD_META_OPEN(ad) && !(adflags & (ADFLAGS_NORF | ADFLAGS_RDONLY))) + EC_FAIL; + if (AD_META_OPEN(ad)) + ad->ad_reso_refcount++; + +EC_CLEANUP: + LOG(log_debug, logtype_ad, "ad_open_rf_v2(\"%s\"): END: %d", fullpathname(path), ret); EC_EXIT; } -/*! - * Open ressource fork - * - * Only for adouble:ea, a nullop otherwise because adouble:v2 has the ressource fork as part - * of the adouble file which is openend by ADFLAGS_HF. - */ -static int ad_open_rf(const char *path, int adflags, int mode, struct adouble *ad) +static int ad_open_rf_ea(const char *path, int adflags, int mode, struct adouble *ad) { EC_INIT; int oflags; int opened = 0; int closeflags = adflags & (ADFLAGS_DF | ADFLAGS_HF); - ssize_t rlen; #ifndef HAVE_EAFD const char *rfpath; struct stat st; #endif - if (ad->ad_vers != AD_VERSION_EA) - return 0; - - LOG(log_debug, logtype_default, "ad_open_rf(\"%s\"): BEGIN", fullpathname(path)); + LOG(log_debug, logtype_ad, "ad_open_rf(\"%s\"): BEGIN", fullpathname(path)); - oflags = O_NOFOLLOW | (ad2openflags(ad, ADFLAGS_RF, adflags) & ~O_CREAT); + oflags = ad2openflags(ad, ADFLAGS_RF, adflags) & ~O_CREAT; if (ad_reso_fileno(ad) != -1) { /* the file is already open, but we want write access: */ @@ -1181,61 +1396,107 @@ static int ad_open_rf(const char *path, int adflags, int mode, struct adouble *a EC_FAIL; } ad->ad_rfp->adf_flags &= ~( O_TRUNC | O_CREAT ); + ad->ad_reso_refcount++; ad->ad_rfp->adf_refcount++; - EC_NEG1_LOG( ad_reso_size(path, adflags, ad)); + EC_NEG1_LOG( ad->ad_rlen = ad_reso_size(path, adflags, ad)); goto EC_CLEANUP; } #ifdef HAVE_EAFD - if (ad_meta_fileno(ad) == -1) + if (ad_meta_fileno(ad) < 0) EC_FAIL; if ((ad_reso_fileno(ad) = sys_getxattrfd(ad_meta_fileno(ad), AD_EA_RESO, oflags)) == -1) { if (!(adflags & ADFLAGS_CREATE)) { - errno = ENOENT; - EC_FAIL; + switch (errno) { + case EACCES: + case EPERM: + case EROFS: + if (!(adflags & ADFLAGS_RDONLY)) { + LOG(log_error, logtype_ad, "ad_open_rf_ea(\"%s\"): \"%s\"", fullpathname(path), strerror(errno)); + EC_FAIL; + } + oflags &= ~O_RDWR; + oflags |= O_RDONLY; + if ((ad_reso_fileno(ad) = sys_getxattrfd(ad_meta_fileno(ad), AD_EA_RESO, oflags)) == -1) { + LOG(log_error, logtype_ad, "ad_open_rf_ea(\"%s\"): \"%s\"", fullpathname(path), strerror(errno)); + EC_FAIL; + } + break; + case ENOENT: + EC_EXIT_STATUS(0); + default: + LOG(log_error, logtype_ad, "ad_open_rf_ea(\"%s\"): \"%s\"", fullpathname(path), strerror(errno)); + EC_FAIL; + } + } else { + oflags |= O_CREAT; + EC_NEG1_LOG( ad_reso_fileno(ad) = sys_getxattrfd(ad_meta_fileno(ad), + AD_EA_RESO, oflags, 0666) ); } - oflags |= O_CREAT; - EC_NEG1_LOG( ad_reso_fileno(ad) = sys_getxattrfd(ad_meta_fileno(ad), - AD_EA_RESO, oflags, 0666) ); } #else EC_NULL_LOG( rfpath = ad->ad_ops->ad_path(path, adflags) ); if ((ad_reso_fileno(ad) = open(rfpath, oflags)) == -1) { - if (!(adflags & ADFLAGS_CREATE)) - EC_FAIL; - oflags |= O_CREAT; - EC_NEG1_LOG( ad_reso_fileno(ad) = open(rfpath, oflags, mode) ); - LOG(log_debug, logtype_default, "ad_open_rf(\"%s\"): created adouble rfork: \"%s\"", - path, rfpath); + if (!(adflags & ADFLAGS_CREATE)) { + switch (errno) { + case EACCES: + case EPERM: + case EROFS: + if (!(adflags & ADFLAGS_RDONLY)) { + LOG(log_error, logtype_ad, "ad_open_rf_ea(\"%s\"): \"%s\"", fullpathname(rfpath), strerror(errno)); + EC_FAIL; + } + oflags &= ~O_RDWR; + oflags |= O_RDONLY; + if ((ad_reso_fileno(ad) = open(rfpath, oflags)) == -1) { + LOG(log_error, logtype_ad, "ad_open_rf_ea(\"%s\"): \"%s\"", fullpathname(rfpath), strerror(errno)); + EC_FAIL; + } + break; + case ENOENT: + EC_EXIT_STATUS(0); + default: + LOG(log_error, logtype_ad, "ad_open_rf_ea(\"%s\"): \"%s\"", fullpathname(rfpath), strerror(errno)); + EC_FAIL; + } + } else { + oflags |= O_CREAT; + EC_NEG1_LOG( ad_reso_fileno(ad) = open(rfpath, oflags, mode) ); + LOG(log_debug, logtype_ad, "ad_open_rf(\"%s\"): created adouble rfork: \"%s\"", + path, rfpath); + } } #endif opened = 1; ad->ad_rfp->adf_refcount = 1; ad->ad_rfp->adf_flags = oflags; + ad->ad_reso_refcount++; #ifndef HAVE_EAFD EC_ZERO_LOG( fstat(ad_reso_fileno(ad), &st) ); if (ad->ad_rfp->adf_flags & O_CREAT) { /* This is a new adouble header file, create it */ - LOG(log_debug, logtype_default, "ad_open_rf(\"%s\"): created adouble rfork, initializing: \"%s\"", + LOG(log_debug, logtype_ad, "ad_open_rf(\"%s\"): created adouble rfork, initializing: \"%s\"", path, rfpath); - LOG(log_debug, logtype_default, "ad_open_rf(\"%s\"): created adouble rfork, flushing: \"%s\"", + EC_NEG1_LOG( new_ad_header(ad, path, NULL, adflags) ); + LOG(log_debug, logtype_ad, "ad_open_rf(\"%s\"): created adouble rfork, flushing: \"%s\"", path, rfpath); ad_flush(ad); } else { /* Read the adouble header */ - LOG(log_debug, logtype_default, "ad_open_rf(\"%s\"): reading adouble rfork: \"%s\"", + LOG(log_debug, logtype_ad, "ad_open_rf(\"%s\"): reading adouble rfork: \"%s\"", path, rfpath); - EC_NEG1_LOG( ad_header_read_osx(NULL, ad, &st) ); + EC_NEG1_LOG( ad_header_read_osx(rfpath, ad, &st) ); } #endif - (void)ad_reso_size(path, adflags, ad); + ad->ad_rlen = ad_reso_size(path, adflags, ad); EC_CLEANUP: if (ret != 0) { if (opened && (ad_reso_fileno(ad) != -1)) { close(ad_reso_fileno(ad)); ad_reso_fileno(ad) = -1; + ad->ad_reso_refcount--; ad->ad_rfp->adf_refcount = 0; } if (adflags & ADFLAGS_NORF) { @@ -1248,11 +1509,33 @@ EC_CLEANUP: ad->ad_rlen = 0; } - LOG(log_debug, logtype_default, "ad_open_rf(\"%s\"): END: %d", fullpathname(path), ret); + LOG(log_debug, logtype_ad, "ad_open_rf(\"%s\"): END: %d", fullpathname(path), ret); EC_EXIT; } +/*! + * Open ressource fork + */ +static int ad_open_rf(const char *path, int adflags, int mode, struct adouble *ad) +{ + int ret = 0; + + switch (ad->ad_vers) { + case AD_VERSION2: + ret = ad_open_rf_v2(path, adflags, mode, ad); + break; + case AD_VERSION_EA: + ret = ad_open_rf_ea(path, adflags, mode, ad); + break; + default: + ret = -1; + break; + } + + return ret; +} + /*********************************************************************************** * API functions ********************************************************************************* */ @@ -1269,7 +1552,7 @@ off_t ad_getentryoff(const struct adouble *ad, int eid) #ifdef HAVE_EAFD return 0; #else - return ADEDOFF_RFORK_OSX; + return ad->ad_eid[eid].ade_off; #endif default: return ad->ad_eid[eid].ade_off; @@ -1424,7 +1707,7 @@ int ad_stat(const char *path, struct stat *stbuf) p = ad_dir(path); if (!p) return -1; - return lstat( p, stbuf ); + return stat( p, stbuf ); } /* ---------------- @@ -1446,7 +1729,7 @@ int ad_mkdir( const char *path, mode_t mode) int st_invalid; struct stat stbuf; - LOG(log_debug, logtype_default, "ad_mkdir(\"%s\", %04o) {cwd: \"%s\"}", + LOG(log_debug, logtype_ad, "ad_mkdir(\"%s\", %04o) {cwd: \"%s\"}", path, mode, getcwdpath()); st_invalid = ad_mode_st(path, &mode, &stbuf); @@ -1480,6 +1763,7 @@ static void ad_init_func(struct adouble *ad) ad_reso_fileno(ad) = -1; ad_meta_fileno(ad) = -1; ad->ad_refcount = 1; + ad->ad_rlen = 0; return; } @@ -1541,6 +1825,12 @@ void ad_init(struct adouble *ad, const struct vol * restrict vol) * - we remember open fds for files because me must avoid a single close releasing fcntl locks for other * fds of the same file * + * BUGS: + * + * * on Solaris (HAVE_EAFD) ADFLAGS_RF doesn't work without + * ADFLAGS_HF, because it checks whether ad_meta_fileno() is already + * openend. As a workaround pass ADFLAGS_SETSHRMD. + * * @returns 0 on success, any other value indicates an error */ int ad_open(struct adouble *ad, const char *path, int adflags, ...) @@ -1549,9 +1839,11 @@ int ad_open(struct adouble *ad, const char *path, int adflags, ...) va_list args; mode_t mode = 0; - LOG(log_debug, logtype_default, - "ad_open(\"%s\", %s): BEGIN [dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]", + LOG(log_debug, logtype_ad, + "ad_open(\"%s\", %s): BEGIN {d: %d, m: %d, r: %d}" + "[dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]", fullpathname(path), adflags2logstr(adflags), + ad->ad_data_refcount, ad->ad_meta_refcount, ad->ad_reso_refcount, ad_data_fileno(ad), ad->ad_data_fork.adf_refcount, ad_meta_fileno(ad), ad->ad_mdp->adf_refcount, ad_reso_fileno(ad), ad->ad_rfp->adf_refcount); @@ -1560,10 +1852,11 @@ int ad_open(struct adouble *ad, const char *path, int adflags, ...) /* Checking for open forks requires sharemode lock support (ie RDWR instead of RDONLY) */ adflags |= ADFLAGS_SETSHRMD; + if (adflags & ADFLAGS_SETSHRMD) + /* sharemode locks are stored in the data fork */ + adflags |= ADFLAGS_DF; + if (ad->ad_vers == AD_VERSION2) { - if (adflags & ADFLAGS_SETSHRMD) - /* sharemode locks are stored in the data fork, adouble:v2 needs this extra handling here */ - adflags |= ADFLAGS_DF; if (adflags & ADFLAGS_RF) adflags |= ADFLAGS_HF; if (adflags & ADFLAGS_NORF) @@ -1581,19 +1874,27 @@ int ad_open(struct adouble *ad, const char *path, int adflags, ...) va_start(args, adflags); if (adflags & ADFLAGS_CREATE) - mode = va_arg(args, mode_t); + mode = (sizeof(mode_t) < sizeof(int) ? va_arg (args, int) : va_arg (args, mode_t)); va_end(args); if (adflags & ADFLAGS_DF) { - EC_ZERO( ad_open_df(path, adflags, mode, ad) ); + ad->ad_data_refcount++; + if (ad_open_df(path, adflags, mode, ad) != 0) { + ad->ad_data_refcount--; + EC_FAIL; + } } if (adflags & ADFLAGS_HF) { - EC_ZERO( ad_open_hf(path, adflags, mode, ad) ); + if (ad_open_hf(path, adflags, mode, ad) != 0) { + EC_FAIL; + } } if (adflags & ADFLAGS_RF) { - EC_ZERO( ad_open_rf(path, adflags, mode, ad) ); + if (ad_open_rf(path, adflags, mode, ad) != 0) { + EC_FAIL; + } } if (adflags & ADFLAGS_CHECK_OF) { @@ -1601,9 +1902,11 @@ int ad_open(struct adouble *ad, const char *path, int adflags, ...) } EC_CLEANUP: - LOG(log_debug, logtype_default, - "ad_open(\"%s\"): END: %d [dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]", + LOG(log_debug, logtype_ad, + "ad_open(\"%s\"): END: %d {d: %d, m: %d, r: %d}" + "[dfd: %d (ref: %d), mfd: %d (ref: %d), rfd: %d (ref: %d)]", fullpathname(path), ret, + ad->ad_data_refcount, ad->ad_meta_refcount, ad->ad_reso_refcount, ad_data_fileno(ad), ad->ad_data_fork.adf_refcount, ad_meta_fileno(ad), ad->ad_mdp->adf_refcount, ad_reso_fileno(ad), ad->ad_rfp->adf_refcount); @@ -1624,26 +1927,16 @@ EC_CLEANUP: */ int ad_metadata(const char *name, int flags, struct adouble *adp) { - uid_t uid; int ret, err, oflags; /* Sanitize flags */ oflags = (flags & (ADFLAGS_CHECK_OF | ADFLAGS_DIR)) | ADFLAGS_HF | ADFLAGS_RDONLY; if ((ret = ad_open(adp, name, oflags)) < 0 && errno == EACCES) { - uid = geteuid(); - if (seteuid(0)) { - LOG(log_error, logtype_default, "ad_metadata(%s): seteuid failed %s", name, strerror(errno)); - errno = EACCES; - return -1; - } - /* we are root open read only */ + become_root(); ret = ad_open(adp, name, oflags); + unbecome_root(); err = errno; - if ( seteuid(uid) < 0) { - LOG(log_error, logtype_default, "ad_metadata: can't seteuid back"); - exit(EXITERR_SYS); - } errno = err; } @@ -1659,7 +1952,7 @@ int ad_metadataat(int dirfd, const char *name, int flags, struct adouble *adp) int cwdfd = -1; if (dirfd != -1) { - if ((cwdfd = open(".", O_RDONLY) == -1) || (fchdir(dirfd) != 0)) { + if (((cwdfd = open(".", O_RDONLY)) == -1) || (fchdir(dirfd) != 0)) { ret = -1; goto exit; } @@ -1673,7 +1966,7 @@ int ad_metadataat(int dirfd, const char *name, int flags, struct adouble *adp) if (dirfd != -1) { if (fchdir(cwdfd) != 0) { - LOG(log_error, logtype_afpd, "ad_openat: cant chdir back, exiting"); + LOG(log_error, logtype_ad, "ad_openat: cant chdir back, exiting"); exit(EXITERR_SYS); } } @@ -1740,16 +2033,16 @@ int ad_openat(struct adouble *ad, EC_INIT; int cwdfd = -1; va_list args; - mode_t mode; + mode_t mode = 0; if (dirfd != -1) { - if ((cwdfd = open(".", O_RDONLY) == -1) || (fchdir(dirfd) != 0)) + if (((cwdfd = open(".", O_RDONLY)) == -1) || (fchdir(dirfd) != 0)) EC_FAIL; } va_start(args, adflags); if (adflags & ADFLAGS_CREATE) - mode = va_arg(args, mode_t); + mode = (sizeof(mode_t) < sizeof(int) ? va_arg (args, int) : va_arg (args, mode_t)); va_end(args); EC_NEG1( ad_open(ad, path, adflags, mode) ); @@ -1766,3 +2059,28 @@ EC_CLEANUP: return ret; } + +/* build a resource fork mode from the data fork mode: + * remove X mode and extend header to RW if R or W (W if R for locking), + */ +mode_t ad_hf_mode(mode_t mode) +{ + mode &= ~(S_IXUSR | S_IXGRP | S_IXOTH); + /* fnctl lock need write access */ + if ((mode & S_IRUSR)) + mode |= S_IWUSR; + if ((mode & S_IRGRP)) + mode |= S_IWGRP; + if ((mode & S_IROTH)) + mode |= S_IWOTH; + + /* if write mode set add read mode */ + if ((mode & S_IWUSR)) + mode |= S_IRUSR; + if ((mode & S_IWGRP)) + mode |= S_IRGRP; + if ((mode & S_IWOTH)) + mode |= S_IROTH; + + return mode; +}