X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fdirectory.c;h=84b5093d12c355543d0e4dfac64ff73f49c87027;hb=b362b6f7b22b6e4e9e74760989f389149677917b;hp=b981af66c03fb6c4b94cff562402dcc78dbcd13d;hpb=2c9a1f08209564c8bb0d9c57e1ff0369034d824b;p=netatalk.git diff --git a/etc/afpd/directory.c b/etc/afpd/directory.c index b981af66..84b5093d 100644 --- a/etc/afpd/directory.c +++ b/etc/afpd/directory.c @@ -29,6 +29,8 @@ #include #include #include +#include +#include #include "directory.h" #include "dircache.h" @@ -37,7 +39,6 @@ #include "fork.h" #include "file.h" #include "filedir.h" -#include "globals.h" #include "unix.h" #include "mangle.h" #include "hash.h" @@ -131,7 +132,7 @@ static int netatalk_mkdir(const struct vol *vol, const char *name) } /* ------------------- */ -static int deletedir(int dirfd, char *dir) +static int deletedir(const struct vol *vol, int dirfd, char *dir) { char path[MAXPATHLEN + 1]; DIR *dp; @@ -162,11 +163,11 @@ static int deletedir(int dirfd, char *dir) break; } strcpy(path + len, de->d_name); - if (lstatat(dirfd, path, &st)) { + if (ostatat(dirfd, path, &st, vol_syml_opt(vol))) { continue; } if (S_ISDIR(st.st_mode)) { - err = deletedir(dirfd, path); + err = deletedir(vol, dirfd, path); } else { err = netatalk_unlinkat(dirfd, path); } @@ -228,7 +229,7 @@ static int copydir(const struct vol *vol, int dirfd, char *src, char *dst) } strcpy(spath + slen, de->d_name); - if (lstatat(dirfd, spath, &st) == 0) { + if (ostatat(dirfd, spath, &st, vol_syml_opt(vol)) == 0) { if (strlen(de->d_name) > drem) { err = AFPERR_PARAM; break; @@ -250,7 +251,7 @@ static int copydir(const struct vol *vol, int dirfd, char *src, char *dst) } /* keep the same time stamp. */ - if (lstatat(dirfd, src, &st) == 0) { + if (ostatat(dirfd, src, &st, vol_syml_opt(vol)) == 0) { ut.actime = ut.modtime = st.st_mtime; utime(dst, &ut); } @@ -265,7 +266,7 @@ copydir_done: */ static int diroffcnt(struct dir *dir, struct stat *st) { - return st->st_ctime == dir->ctime; + return st->st_ctime == dir->d_ctime; } /* --------------------- */ @@ -462,13 +463,25 @@ struct dir *dirlookup_bypath(const struct vol *vol, const char *path) cnid = htonl(2); dir = vol->v_root; + LOG(log_debug, logtype_afpd, "dirlookup_bypath(\"%s\")", path); + + if (strcmp(vol->v_path, path) == 0) + return dir; + EC_NULL(rpath = rel_path_in_vol(path, vol->v_path)); /* 1. */ + + LOG(log_debug, logtype_afpd, "dirlookup_bypath: rpath: \"%s\"", cfrombstr(rpath)); + EC_NULL(statpath = bfromcstr(vol->v_path)); /* 2. */ l = bsplit(rpath, '/'); for (int i = 0; i < l->qty ; i++) { /* 3. */ did = cnid; + EC_ZERO(bcatcstr(statpath, "/")); EC_ZERO(bconcat(statpath, l->entry[i])); + + LOG(log_debug, logtype_afpd, "dirlookup_bypath: statpath: \"%s\"", cfrombstr(statpath)); + EC_ZERO_LOGSTR(lstat(cfrombstr(statpath), &st), "lstat(rpath: %s, elem: %s): %s: %s", cfrombstr(rpath), cfrombstr(l->entry[i]), @@ -480,22 +493,19 @@ struct dir *dirlookup_bypath(const struct vol *vol, const char *path) if ((dir = dircache_search_by_name(vol, /* 5. */ dir, cfrombstr(l->entry[i]), - blength(l->entry[i]), - st.st_ctime)) == NULL) { + blength(l->entry[i]))) == NULL) { + if ((cnid = cnid_add(vol->v_cdb, /* 6. */ &st, did, cfrombstr(l->entry[i]), blength(l->entry[i]), - 0)) == CNID_INVALID) { + 0)) == CNID_INVALID) EC_FAIL; - } if ((dir = dirlookup(vol, cnid)) == NULL) /* 7. */ EC_FAIL; } - - EC_ZERO(bcatcstr(statpath, "/")); } EC_CLEANUP: @@ -505,6 +515,9 @@ EC_CLEANUP: if (ret != 0) return NULL; + LOG(log_debug, logtype_afpd, "dirlookup_bypath: result: \"%s\"", + cfrombstr(dir->d_fullpath)); + return dir; } @@ -514,7 +527,7 @@ EC_CLEANUP: * Resolve a DID, allocate a struct dir for it * 1. Check for special CNIDs 0 (invalid), 1 and 2. * 2a. Check if the DID is in the cache. - * 2b. Check if it's really a dir (d_fullpath != NULL) because we cache files too. + * 2b. Check if it's really a dir because we cache files too. * 3. If it's not in the cache resolve it via the database. * 4. Build complete server-side path to the dir. * 5. Check if it exists and is a directory. @@ -539,7 +552,7 @@ struct dir *dirlookup(const struct vol *vol, cnid_t did) int utf8; int err = 0; - LOG(log_debug, logtype_afpd, "dirlookup(did: %u)", ntohl(did)); + LOG(log_debug, logtype_afpd, "dirlookup(did: %u): START", ntohl(did)); /* check for did 0, 1 and 2 */ if (did == 0 || vol == NULL) { /* 1 */ @@ -557,18 +570,19 @@ struct dir *dirlookup(const struct vol *vol, cnid_t did) /* Search the cache */ if ((ret = dircache_search_by_did(vol, did)) != NULL) { /* 2a */ - if (ret->d_fullpath == NULL) { /* 2b */ + if (ret->d_flags & DIRF_ISFILE) { /* 2b */ afp_errno = AFPERR_BADTYPE; ret = NULL; goto exit; } if (lstat(cfrombstr(ret->d_fullpath), &st) != 0) { - LOG(log_debug, logtype_afpd, "dirlookup(did: %u) {lstat: %s}", ntohl(did), strerror(errno)); + LOG(log_debug, logtype_afpd, "dirlookup(did: %u, path: \"%s\"): lstat: %s", + ntohl(did), cfrombstr(ret->d_fullpath), strerror(errno)); switch (errno) { case ENOENT: case ENOTDIR: /* It's not there anymore, so remove it */ - LOG(log_debug, logtype_afpd, "dirlookup(did: %u) {calling dir_remove()}", ntohl(did)); + LOG(log_debug, logtype_afpd, "dirlookup(did: %u): calling dir_remove", ntohl(did)); dir_remove(vol, ret); afp_errno = AFPERR_NOOBJ; ret = NULL; @@ -590,6 +604,7 @@ struct dir *dirlookup(const struct vol *vol, cnid_t did) /* Get it from the database */ cnid = did; + LOG(log_debug, logtype_afpd, "dirlookup(did: %u): querying CNID database", ntohl(did)); if ((upath = cnid_resolve(vol->v_cdb, &cnid, buffer, buflen)) == NULL) { afp_errno = AFPERR_NOOBJ; err = 1; @@ -607,7 +622,8 @@ struct dir *dirlookup(const struct vol *vol, cnid_t did) * - DIRDID_ROOT is hit * - a cached entry is found */ - LOG(log_debug, logtype_afpd, "dirlookup(did: %u) {recursion for did: %u}", ntohl(pdid)); + LOG(log_debug, logtype_afpd, "dirlookup(did: %u): recursion for did: %u", + ntohl(did), ntohl(pdid)); if ((pdir = dirlookup(vol, pdid)) == NULL) { err = 1; goto exit; @@ -622,9 +638,10 @@ struct dir *dirlookup(const struct vol *vol, cnid_t did) } /* stat it and check if it's a dir */ - LOG(log_debug, logtype_afpd, "dirlookup: {stating %s}", cfrombstr(fullpath)); + LOG(log_debug, logtype_afpd, "dirlookup(did: %u): stating \"%s\"", + ntohl(did), cfrombstr(fullpath)); - if (stat(cfrombstr(fullpath), &st) != 0) { /* 5a */ + if (ostat(cfrombstr(fullpath), &st, vol_syml_opt(vol)) != 0) { /* 5a */ switch (errno) { case ENOENT: afp_errno = AFPERR_NOOBJ; @@ -655,7 +672,7 @@ struct dir *dirlookup(const struct vol *vol, cnid_t did) } /* Create struct dir */ - if ((ret = dir_new(mpath, upath, vol, pdid, did, fullpath, st.st_ctime)) == NULL) { /* 6 */ + if ((ret = dir_new(mpath, upath, vol, pdid, did, fullpath, &st)) == NULL) { /* 6 */ LOG(log_error, logtype_afpd, "dirlookup(did: %u) {%s, %s}: %s", ntohl(did), mpath, upath, strerror(errno)); err = 1; goto exit; @@ -680,7 +697,7 @@ exit: } } if (ret) - LOG(log_debug, logtype_afpd, "dirlookup(did: %u): pdid: %u, \"%s\"", + LOG(log_debug, logtype_afpd, "dirlookup(did: %u): RESULT: pdid: %u, path: \"%s\"", ntohl(ret->d_did), ntohl(ret->d_pdid), cfrombstr(ret->d_fullpath)); return ret; @@ -712,7 +729,7 @@ int caseenumerate(const struct vol *vol, struct path *path, struct dir *dir) if ( dir->d_did == did && strcmp(lname, path->u_name) == 0) { path->u_name = cname; path->d_dir = NULL; - if (of_stat( path ) == 0 ) { + if (of_stat(vol, path ) == 0 ) { return 0; } /* something changed, we cannot stat ... */ @@ -743,7 +760,7 @@ int caseenumerate(const struct vol *vol, struct path *path, struct dir *dir) strlcpy(cname, de->d_name, sizeof(cname)); path->u_name = cname; path->d_dir = NULL; - if (of_stat( path ) == 0 ) { + if (of_stat(vol, path ) == 0 ) { LOG(log_debug, logtype_afpd, "caseenumerate: using dir: %s, path: %s", de->d_name, path->u_name); strlcpy(lname, tmp, sizeof(lname)); did = dir->d_did; @@ -778,8 +795,8 @@ int caseenumerate(const struct vol *vol, struct path *path, struct dir *dir) * @param vol (r) pointer to struct vol * @param pdid (r) Parent CNID * @param did (r) CNID - * @param path (r) Full unix path to dir or NULL for files - * @param ctime (r) st_ctime from stat + * @param path (r) Full unix path to object + * @param st (r) struct stat of object * * @returns pointer to new struct dir or NULL on error * @@ -791,7 +808,7 @@ struct dir *dir_new(const char *m_name, cnid_t pdid, cnid_t did, bstring path, - time_t ctime) + struct stat *st) { struct dir *dir; @@ -825,7 +842,11 @@ struct dir *dir_new(const char *m_name, dir->d_pdid = pdid; dir->d_vid = vol->v_vid; dir->d_fullpath = path; - dir->ctime_dircache = ctime; + dir->dcache_ctime = st->st_ctime; + dir->dcache_ino = st->st_ino; + if (!S_ISDIR(st->st_mode)) + dir->d_flags = DIRF_ISFILE; + dir->d_rights_cache = 0xffffffff; return dir; } @@ -879,7 +900,7 @@ struct dir *dir_add(struct vol *vol, const struct dir *dir, struct path *path, i AFP_ASSERT(path); AFP_ASSERT(len > 0); - if ((cdir = dircache_search_by_name(vol, dir, path->u_name, strlen(path->u_name), path->st.st_ctime)) != NULL) { + if ((cdir = dircache_search_by_name(vol, dir, path->u_name, strlen(path->u_name))) != NULL) { /* there's a stray entry in the dircache */ LOG(log_debug, logtype_afpd, "dir_add(did:%u,'%s/%s'): {stray cache entry: did:%u,'%s', removing}", ntohl(dir->d_did), cfrombstr(dir->d_fullpath), path->u_name, @@ -923,7 +944,13 @@ struct dir *dir_add(struct vol *vol, const struct dir *dir, struct path *path, i } /* Allocate and initialize struct dir */ - if ((cdir = dir_new( path->m_name, path->u_name, vol, dir->d_did, id, fullpath, path->st.st_ctime)) == NULL) { /* 3 */ + if ((cdir = dir_new(path->m_name, + path->u_name, + vol, + dir->d_did, + id, + fullpath, + &path->st)) == NULL) { /* 3 */ err = 4; goto exit; } @@ -1232,7 +1259,7 @@ struct path *cname(struct vol *vol, struct dir *dir, char **cpath) * and thus call continue which should terminate the while loop because * len = 0. Ok? */ - if (of_stat(&ret) != 0) { /* 9 */ + if (of_stat(vol, &ret) != 0) { /* 9 */ /* * ret.u_name doesn't exist, might be afp_createfile|dir * that means it should have been the last part @@ -1281,7 +1308,7 @@ struct path *cname(struct vol *vol, struct dir *dir, char **cpath) /* Search the cache */ int unamelen = strlen(ret.u_name); - cdir = dircache_search_by_name(vol, dir, ret.u_name, unamelen, ret.st.st_ctime); /* 14 */ + cdir = dircache_search_by_name(vol, dir, ret.u_name, unamelen); /* 14 */ if (cdir == NULL) { /* Not in cache, create one */ if ((cdir = dir_add(vol, dir, &ret, unamelen)) == NULL) { /* 15 */ @@ -1350,9 +1377,9 @@ int movecwd(const struct vol *vol, struct dir *dir) LOG(log_debug, logtype_afpd, "movecwd(to: did: %u, \"%s\")", ntohl(dir->d_did), cfrombstr(dir->d_fullpath)); - if ((ret = lchdir(cfrombstr(dir->d_fullpath))) != 0 ) { - LOG(log_debug, logtype_afpd, "movecwd(\"%s\"): ret: %u, %s", - cfrombstr(dir->d_fullpath), ret, strerror(errno)); + if ((ret = ochdir(cfrombstr(dir->d_fullpath), vol_syml_opt(vol))) != 0 ) { + LOG(log_debug, logtype_afpd, "movecwd(\"%s\"): %s", + cfrombstr(dir->d_fullpath), strerror(errno)); if (ret == 1) { /* p is a symlink or getcwd failed */ afp_errno = AFPERR_BADTYPE; @@ -1397,7 +1424,7 @@ int check_access(char *path, int mode) if (!p) return -1; - accessmode(p, &ma, curdir, NULL); + accessmode(current_vol, p, &ma, curdir, NULL); if ((mode & OPENACC_WR) && !(ma.ma_user & AR_UWRITE)) return -1; if ((mode & OPENACC_RD) && !(ma.ma_user & AR_UREAD)) @@ -1411,7 +1438,7 @@ int file_access(struct path *path, int mode) { struct maccess ma; - accessmode(path->u_name, &ma, curdir, &path->st); + accessmode(current_vol, path->u_name, &ma, curdir, &path->st); LOG(log_debug, logtype_afpd, "file_access(\"%s\"): mapped user mode: 0x%02x", path->u_name, ma.ma_user); @@ -1431,8 +1458,8 @@ int file_access(struct path *path, int mode) /* --------------------- */ void setdiroffcnt(struct dir *dir, struct stat *st, u_int32_t count) { - dir->offcnt = count; - dir->ctime = st->st_ctime; + dir->d_offcnt = count; + dir->d_ctime = st->st_ctime; dir->d_flags &= ~DIRF_CNID; } @@ -1442,7 +1469,7 @@ void setdiroffcnt(struct dir *dir, struct stat *st, u_int32_t count) */ int dirreenumerate(struct dir *dir, struct stat *st) { - return st->st_ctime == dir->ctime && (dir->d_flags & DIRF_CNID); + return st->st_ctime == dir->d_ctime && (dir->d_flags & DIRF_CNID); } /* ------------------------------ @@ -1478,6 +1505,17 @@ int getdirparams(const struct vol *vol, isad = 1; if (ad.ad_md->adf_flags & O_CREAT) { /* We just created it */ + if (s_path->m_name == NULL) { + if ((s_path->m_name = utompath(vol, + upath, + dir->d_did, + utf8_encoding())) == NULL) { + LOG(log_error, logtype_afpd, + "getdirparams(\"%s\"): can't assign macname", + cfrombstr(dir->d_fullpath)); + return AFPERR_MISC; + } + } ad_setname(&ad, s_path->m_name); ad_setid( &ad, s_path->st.st_dev, @@ -1507,7 +1545,6 @@ int getdirparams(const struct vol *vol, ashort = htons(ATTRBIT_INVISIBLE); } else ashort = 0; - ashort |= htons(ATTRBIT_SHARED); memcpy( data, &ashort, sizeof( ashort )); data += sizeof( ashort ); break; @@ -1581,11 +1618,11 @@ int getdirparams(const struct vol *vol, ashort = 0; /* this needs to handle current directory access rights */ if (diroffcnt(dir, st)) { - ashort = (dir->offcnt > 0xffff)?0xffff:dir->offcnt; + ashort = (dir->d_offcnt > 0xffff)?0xffff:dir->d_offcnt; } else if ((ret = for_each_dirent(vol, upath, NULL,NULL)) >= 0) { setdiroffcnt(dir, st, ret); - ashort = (dir->offcnt > 0xffff)?0xffff:dir->offcnt; + ashort = (dir->d_offcnt > 0xffff)?0xffff:dir->d_offcnt; } ashort = htons( ashort ); memcpy( data, &ashort, sizeof( ashort )); @@ -1605,7 +1642,7 @@ int getdirparams(const struct vol *vol, break; case DIRPBIT_ACCESS : - accessmode( upath, &ma, dir , st); + accessmode(vol, upath, &ma, dir , st); *data++ = ma.ma_user; *data++ = ma.ma_world; @@ -1640,6 +1677,9 @@ int getdirparams(const struct vol *vol, break; case DIRPBIT_UNIXPR : + /* accessmode may change st_mode with ACLs */ + accessmode(vol, upath, &ma, dir, st); + aint = htonl(st->st_uid); memcpy( data, &aint, sizeof( aint )); data += sizeof( aint ); @@ -1652,8 +1692,6 @@ int getdirparams(const struct vol *vol, memcpy( data, &aint, sizeof( aint )); data += sizeof( aint ); - accessmode( upath, &ma, dir , st); - *data++ = ma.ma_user; *data++ = ma.ma_world; *data++ = ma.ma_group; @@ -2229,11 +2267,11 @@ int afp_createdir(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_ return err; } - if (of_stat(s_path) < 0) { + if (of_stat(vol, s_path) < 0) { return AFPERR_MISC; } - curdir->offcnt++; + curdir->d_offcnt++; if ((dir = dir_add(vol, curdir, s_path, strlen(s_path->u_name))) == NULL) { return AFPERR_MISC; @@ -2252,6 +2290,8 @@ int afp_createdir(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_ ad_setname(&ad, s_path->m_name); ad_setid( &ad, s_path->st.st_dev, s_path->st.st_ino, dir->d_did, did, vol->v_stamp); + fce_register_new_dir(s_path); + ad_flush( &ad); ad_close_metadata( &ad); @@ -2295,10 +2335,10 @@ int renamedir(const struct vol *vol, /* this needs to copy and delete. bleah. that means we have * to deal with entire directory hierarchies. */ if ((err = copydir(vol, dirfd, src, dst)) < 0) { - deletedir(-1, dst); + deletedir(vol, -1, dst); return err; } - if ((err = deletedir(dirfd, src)) < 0) + if ((err = deletedir(vol, dirfd, src)) < 0) return err; break; default : @@ -2349,7 +2389,7 @@ int deletecurdir(struct vol *vol) err = vol->vfs->vfs_deletecurdir(vol); if (err) { LOG(log_error, logtype_afpd, "deletecurdir: error deleting .AppleDouble in \"%s\"", - curdir->d_fullpath); + cfrombstr(curdir->d_fullpath)); return err; } @@ -2389,7 +2429,7 @@ int deletecurdir(struct vol *vol) dir_remove( vol, fdir ); } else { LOG(log_error, logtype_afpd, "deletecurdir(\"%s\"): netatalk_rmdir_all_errors error", - curdir->d_fullpath); + cfrombstr(curdir->d_fullpath)); } delete_done: @@ -2489,9 +2529,6 @@ int afp_mapid(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *r rbuf += sizeof( id ); *rbuflen = 2 * sizeof( id ); break; - case UUID_LOCAL: - free(name); - return (AFPERR_NOITEM); default: return AFPERR_MISC; } @@ -2581,12 +2618,12 @@ int afp_mapname(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, siz case 2 : /* unicode */ case 4 : - LOG(log_debug, logtype_afpd, "afp_mapname: gettgrnam for name: %s",ibuf); + LOG(log_debug, logtype_afpd, "afp_mapname: getgrnam for name: %s",ibuf); if (NULL == ( gr = (struct group *)getgrnam( ibuf ))) { return( AFPERR_NOITEM ); } id = gr->gr_gid; - LOG(log_debug, logtype_afpd, "afp_mapname: gettgrnam for name: %s -> id: %d",ibuf, id); + LOG(log_debug, logtype_afpd, "afp_mapname: getgrnam for name: %s -> id: %d",ibuf, id); id = htonl(id); memcpy( rbuf, &id, sizeof( id )); *rbuflen = sizeof( id ); @@ -2680,7 +2717,7 @@ int afp_opendir(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, si return path_error(path, AFPERR_NOOBJ); } - if ( !path->st_valid && of_stat(path ) < 0 ) { + if ( !path->st_valid && of_stat(vol, path) < 0 ) { return( AFPERR_NOOBJ ); } if ( path->st_errno ) {