X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=etc%2Fafpd%2Ffiledir.c;h=7adbeed61c94e9fb02bfa80ed75f21b8e8e9912b;hp=16c329ab72d6b38c7580d416b8fe6c1e57ed88b5;hb=d3dff4ba4b8db3131a16641d35a6554be5fb5160;hpb=e22bbf78a53bf739dd38383de42a23c95d43c15d diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c index 16c329ab..7adbeed6 100644 --- a/etc/afpd/filedir.c +++ b/etc/afpd/filedir.c @@ -9,24 +9,7 @@ #include #include -/* STDC check */ -#if STDC_HEADERS #include -#else /* STDC_HEADERS */ -#ifndef HAVE_STRCHR -#define strchr index -#define strrchr index -#endif /* HAVE_STRCHR */ -char *strchr (), *strrchr (); -#ifndef HAVE_MEMCPY -#define memcpy(d,s,n) bcopy ((s), (d), (n)) -#define memmove(d,s,n) bcopy ((s), (d), (n)) -#endif /* ! HAVE_MEMCPY */ -#endif /* STDC_HEADERS */ - -#ifdef HAVE_STRINGS_H -#include -#endif #include #include @@ -42,6 +25,8 @@ char *strchr (), *strrchr (); #include #include #include +#include +#include #include "directory.h" #include "dircache.h" @@ -52,96 +37,15 @@ char *strchr (), *strrchr (); #include "filedir.h" #include "unix.h" -#ifdef DROPKLUDGE -int matchfile2dirperms( -/* Since it's kinda' big; I decided against an - inline function */ - char *upath, - struct vol *vol, - int did) -/* The below code changes the way file ownership is determined in the name of - fixing dropboxes. It has known security problem. See the netatalk FAQ for - more information */ -{ - struct stat st, sb; - struct dir *dir; - char *adpath; - uid_t uid; - int ret = AFP_OK; -#ifdef DEBUG - LOG(log_debug9, logtype_afpd, "begin matchfile2dirperms:"); -#endif - - if (stat(upath, &st ) < 0) { - LOG(log_error, logtype_afpd, "Could not stat %s: %s", upath, strerror(errno)); - return AFPERR_NOOBJ ; - } - - adpath = vol->vfs->ad_path( upath, ADFLAGS_HF ); - /* FIXME dirsearch doesn't move cwd to did ! */ - if (( dir = dirlookup( vol, did )) == NULL ) { - LOG(log_error, logtype_afpd, "matchfile2dirperms: Unable to get directory info."); - ret = AFPERR_NOOBJ; - } - else if (stat(".", &sb) < 0) { - LOG(log_error, logtype_afpd, - "matchfile2dirperms: Error checking directory \"%s\": %s", - dir->d_m_name, strerror(errno)); - ret = AFPERR_NOOBJ; - } - else { - uid=geteuid(); - if ( uid != sb.st_uid ) - { - seteuid(0); - if (lchown(upath, sb.st_uid, sb.st_gid) < 0) - { - LOG(log_error, logtype_afpd, - "matchfile2dirperms(%s): Error changing owner/gid: %s", - upath, strerror(errno)); - ret = AFPERR_ACCESS; - } - else if ((!S_ISLNK(st->st_mode)) && (chmod(upath,(st.st_mode&~default_options.umask)| S_IRGRP| S_IROTH) < 0)) - { - LOG(log_error, logtype_afpd, - "matchfile2dirperms(%s): Error adding file read permissions: %s", - upath, strerror(errno)); - ret = AFPERR_ACCESS; - } - else if (lchown(adpath, sb.st_uid, sb.st_gid) < 0) - { - LOG(log_error, logtype_afpd, - "matchfile2dirperms(%s): Error changing AppleDouble owner/gid: %s", - adpath, strerror(errno)); - ret = AFPERR_ACCESS; - } - else if (chmod(adpath, (st.st_mode&~default_options.umask)| S_IRGRP| S_IROTH) < 0) - { - LOG(log_error, logtype_afpd, - "matchfile2dirperms(%s): Error adding AD file read permissions: %s", - adpath, strerror(errno)); - ret = AFPERR_ACCESS; - } - seteuid(uid); - } - } /* end else if stat success */ - -#ifdef DEBUG - LOG(log_debug9, logtype_afpd, "end matchfile2dirperms:"); -#endif - return ret; -} -#endif - int afp_getfildirparams(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t *rbuflen) { struct stat *st; struct vol *vol; struct dir *dir; - u_int32_t did; + uint32_t did; int ret; size_t buflen; - u_int16_t fbitmap, dbitmap, vid; + uint16_t fbitmap, dbitmap, vid; struct path *s_path; *rbuflen = 0; @@ -201,22 +105,22 @@ int afp_getfildirparams(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *r if (!dir) return AFPERR_NOOBJ; - ret = getdirparams(vol, dbitmap, s_path, dir, - rbuf + 3 * sizeof( u_int16_t ), &buflen ); + ret = getdirparams(obj, vol, dbitmap, s_path, dir, + rbuf + 3 * sizeof( uint16_t ), &buflen ); if (ret != AFP_OK ) return( ret ); } /* this is a directory */ - *(rbuf + 2 * sizeof( u_int16_t )) = (char) FILDIRBIT_ISDIR; + *(rbuf + 2 * sizeof( uint16_t )) = (char) FILDIRBIT_ISDIR; } else { - if (fbitmap && AFP_OK != (ret = getfilparams(vol, fbitmap, s_path, curdir, - rbuf + 3 * sizeof( u_int16_t ), &buflen )) ) { + if (fbitmap && AFP_OK != (ret = getfilparams(obj, vol, fbitmap, s_path, curdir, + rbuf + 3 * sizeof( uint16_t ), &buflen, 0)) ) { return( ret ); } /* this is a file */ - *(rbuf + 2 * sizeof( u_int16_t )) = FILDIRBIT_ISFILE; + *(rbuf + 2 * sizeof( uint16_t )) = FILDIRBIT_ISFILE; } - *rbuflen = buflen + 3 * sizeof( u_int16_t ); + *rbuflen = buflen + 3 * sizeof( uint16_t ); fbitmap = htons( fbitmap ); memcpy( rbuf, &fbitmap, sizeof( fbitmap )); rbuf += sizeof( fbitmap ); @@ -234,7 +138,7 @@ int afp_setfildirparams(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf struct vol *vol; struct dir *dir; struct path *path; - u_int16_t vid, bitmap; + uint16_t vid, bitmap; int did, rc; *rbuflen = 0; @@ -286,7 +190,7 @@ int afp_setfildirparams(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf if (S_ISDIR(st->st_mode)) { rc = setdirparams(vol, path, bitmap, ibuf ); } else { - rc = setfilparams(vol, path, bitmap, ibuf ); + rc = setfilparams(obj, vol, path, bitmap, ibuf ); } if ( rc == AFP_OK ) { setvoltime(obj, vol ); @@ -300,13 +204,6 @@ int afp_setfildirparams(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf */ int check_name(const struct vol *vol, char *name) { - /* check for illegal characters in the unix filename */ - if (!wincheck(vol, name)) - return AFPERR_PARAM; - - if ((vol->v_flags & AFPVOL_NOHEX) && strchr(name, '/')) - return AFPERR_PARAM; - if (!vol->vfs->vfs_validupath(vol, name)) { LOG(log_error, logtype_afpd, "check_name: illegal name: '%s'", name); return AFPERR_EXIST; @@ -322,7 +219,8 @@ int check_name(const struct vol *vol, char *name) move and rename sdir:oldname to curdir:newname in volume vol special care is needed for lock */ -static int moveandrename(const struct vol *vol, +static int moveandrename(const AFPObj *obj, + struct vol *vol, struct dir *sdir, int sdir_fd, char *oldname, @@ -341,18 +239,16 @@ static int moveandrename(const struct vol *vol, cnid_t id; int cwd_fd = -1; - LOG(log_debug, logtype_afpd, - "moveandrename: [\"%s\"/\"%s\"] -> \"%s\"", - cfrombstr(sdir->d_u_name), oldname, newname); - - ad_init(&ad, vol->v_adouble, vol->v_ad_options); + ad_init(&ad, vol); adp = &ad; adflags = 0; if (!isdir) { - if ((oldunixname = strdup(mtoupath(vol, oldname, sdir->d_did, utf8_encoding()))) == NULL) + if ((oldunixname = strdup(mtoupath(vol, oldname, sdir->d_did, utf8_encoding(vol->v_obj)))) == NULL) return AFPERR_PARAM; /* can't convert */ + AFP_CNID_START("cnid_get"); id = cnid_get(vol->v_cdb, sdir->d_did, oldunixname, strlen(oldunixname)); + AFP_CNID_DONE(); #ifndef HAVE_ATFUNCS /* Need full path */ @@ -367,7 +263,7 @@ static int moveandrename(const struct vol *vol, #ifdef HAVE_ATFUNCS opened = of_findnameat(sdir_fd, &path); #else - opened = of_findname(&path); + opened = of_findname(vol, &path); #endif /* HAVE_ATFUNCS */ if (opened) { @@ -399,11 +295,12 @@ static int moveandrename(const struct vol *vol, } } if (!ad_metadata(oldunixname, adflags, adp)) { - u_int16_t bshort; + uint16_t bshort; ad_getattr(adp, &bshort); - ad_close_metadata( adp); - if ((bshort & htons(ATTRBIT_NORENAME))) { + + ad_close(adp, ADFLAGS_HF); + if (!(vol->v_ignattr & ATTRBIT_NORENAME) && (bshort & htons(ATTRBIT_NORENAME))) { rc = AFPERR_OLOCK; goto exit; } @@ -416,7 +313,7 @@ static int moveandrename(const struct vol *vol, } } - if (NULL == (upath = mtoupath(vol, newname, curdir->d_did, utf8_encoding()))){ + if (NULL == (upath = mtoupath(vol, newname, curdir->d_did, utf8_encoding(vol->v_obj)))){ rc = AFPERR_PARAM; goto exit; } @@ -426,6 +323,15 @@ static int moveandrename(const struct vol *vol, goto exit; } + if (isdir) + LOG(log_debug, logtype_afpd, + "moveandrename(\"%s\" -> \"%s/%s\")", + oldunixname, bdata(curdir->d_fullpath), upath); + else + LOG(log_debug, logtype_afpd, + "moveandrename(\"%s/%s\" -> \"%s/%s\")", + bdata(sdir->d_fullpath), oldunixname, bdata(curdir->d_fullpath), upath); + /* source == destination. we just silently accept this. */ if ((!isdir && curdir == sdir) || (isdir && curdir->d_did == sdir->d_pdid)) { if (strcmp(oldname, newname) == 0) { @@ -433,7 +339,7 @@ static int moveandrename(const struct vol *vol, goto exit; } - if (stat(upath, st) == 0 || caseenumerate(vol, &path, curdir) == 0) { + if (stat(upath, st) == 0) { if (!stat(oldunixname, &nst) && !(nst.st_dev == st->st_dev && nst.st_ino == st->st_ino) ) { /* not the same file */ rc = AFPERR_EXIST; @@ -441,7 +347,7 @@ static int moveandrename(const struct vol *vol, } errno = 0; } - } else if (stat(upath, st ) == 0 || caseenumerate(vol, &path, curdir) == 0) { + } else if (stat(upath, st ) == 0) { rc = AFPERR_EXIST; goto exit; } @@ -449,10 +355,10 @@ static int moveandrename(const struct vol *vol, if ( !isdir ) { path.st_valid = 1; path.st_errno = errno; - if (of_findname(&path)) { + if (of_findname(vol, &path)) { rc = AFPERR_EXIST; /* was AFPERR_BUSY; */ } else { - rc = renamefile(vol, sdir_fd, oldunixname, upath, newname, adp ); + rc = renamefile(vol, curdir, sdir_fd, oldunixname, upath, newname, adp ); if (rc == AFP_OK) of_rename(vol, opened, sdir, oldname, curdir, newname); } @@ -477,11 +383,22 @@ static int moveandrename(const struct vol *vol, if (!ad_metadata(upath, adflags, adp)) { ad_setid(adp, st->st_dev, st->st_ino, id, curdir->d_did, vol->v_stamp); ad_flush(adp); - ad_close_metadata(adp); + ad_close(adp, ADFLAGS_HF); } /* fix up the catalog entry */ + AFP_CNID_START("cnid_update"); cnid_update(vol->v_cdb, id, st, curdir->d_did, upath, strlen(upath)); + AFP_CNID_DONE(); + + /* Send FCE event */ + if (isdir) { + fce_register(obj, FCE_DIR_MOVE, fullpathname(upath), oldunixname); + } else { + bstring srcpath = bformat("%s/%s", bdata(sdir->d_fullpath), oldunixname); + fce_register(obj, FCE_FILE_MOVE, fullpathname(upath), bdata(srcpath)); + bdestroy(srcpath); + } } exit: @@ -499,9 +416,9 @@ int afp_rename(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size struct dir *sdir; char *oldname, *newname; struct path *path; - u_int32_t did; + uint32_t did; int plen; - u_int16_t vid; + uint16_t vid; int isdir = 0; int rc; @@ -559,7 +476,7 @@ int afp_rename(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size return AFP_OK; /* newname == oldname same dir */ } - rc = moveandrename(vol, sdir, -1, oldname, newname, isdir); + rc = moveandrename(obj, vol, sdir, -1, oldname, newname, isdir); if ( rc == AFP_OK ) { setvoltime(obj, vol ); } @@ -567,15 +484,93 @@ int afp_rename(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size return( rc ); } +/* + * Recursivley delete vetoed files and directories if the volume option is set + * + * @param vol (r) volume handle + * @param upath (r) path of directory + * + * If the volume option delete veto files is set, this function recursively scans the + * directory "upath" for vetoed files and tries deletes these, the it will try to delete + * the directory. That may fail if the directory contains normal files that aren't vetoed. + * + * @returns 0 if the directory upath and all of its contents were deleted, otherwise -1. + * If the volume option is not set it returns -1. + */ +int delete_vetoed_files(struct vol *vol, const char *upath, bool in_vetodir) +{ + EC_INIT; + DIR *dp = NULL; + struct dirent *de; + struct stat sb; + int pwd = -1; + bool vetoed; + + if (!(vol->v_flags & AFPVOL_DELVETO)) + return -1; + + EC_NEG1( pwd = open(".", O_RDONLY)); + EC_ZERO( chdir(upath) ); + EC_NULL( dp = opendir(".") ); + + while ((de = readdir(dp))) { + if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, "..")) + continue; + + if (stat(de->d_name, &sb) != 0) { + LOG(log_error, logtype_afpd, "delete_vetoed_files(\"%s/%s\"): %s", + upath, de->d_name, strerror(errno)); + EC_EXIT_STATUS(AFPERR_DIRNEMPT); + } + + if (in_vetodir || veto_file(vol->v_veto, de->d_name)) + vetoed = true; + else + vetoed = false; + + if (vetoed) { + LOG(log_debug, logtype_afpd, "delete_vetoed_files(\"%s/%s\"): deleting vetoed file", + upath, de->d_name); + switch (sb.st_mode & S_IFMT) { + case S_IFDIR: + /* recursion */ + EC_ZERO( delete_vetoed_files(vol, de->d_name, vetoed)); + break; + case S_IFREG: + case S_IFLNK: + EC_ZERO( netatalk_unlink(de->d_name) ); + break; + default: + break; + } + } + } + + EC_ZERO_LOG( fchdir(pwd) ); + pwd = -1; + EC_ZERO_LOG( rmdir(upath) ); + +EC_CLEANUP: + if (dp) + closedir(dp); + if (pwd != -1) { + if (fchdir(pwd) != 0) + ret = -1; + } + + EC_EXIT; +} + /* ------------------------------- */ int afp_delete(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size_t *rbuflen) { - struct vol *vol; - struct dir *dir; - struct path *s_path; + struct vol *vol; + struct dir *dir; + struct path *s_path; char *upath; - int did, rc; - u_int16_t vid; + int did; + int rc = AFP_OK; + uint16_t vid; *rbuflen = 0; ibuf += 2; @@ -601,9 +596,41 @@ int afp_delete(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size } upath = s_path->u_name; - if ( path_isadir( s_path) ) { + if (path_isadir(s_path)) { if (*s_path->m_name != '\0' || curdir->d_did == DIRDID_ROOT) { - rc = AFPERR_ACCESS; + if (vol->v_adouble == AD_VERSION2) + return AFPERR_ACCESS; + if (*s_path->m_name == '\0' && curdir->d_did == DIRDID_ROOT) + return AFPERR_ACCESS; + if (rmdir(upath) != 0) { + switch (errno) { + case ENOTEMPTY: + if (delete_vetoed_files(vol, upath, false) != 0) + return AFPERR_DIRNEMPT; + break; + case EACCES: + return AFPERR_ACCESS; + default: + return AFPERR_MISC; + } + } + struct dir *deldir; + cnid_t delcnid = CNID_INVALID; + if ((deldir = dircache_search_by_name(vol, curdir, upath, strlen(upath)))) { + delcnid = deldir->d_did; + dir_remove(vol, deldir); + } + if (delcnid == CNID_INVALID) { + AFP_CNID_START("cnid_get"); + delcnid = cnid_get(vol->v_cdb, curdir->d_did, upath, strlen(upath)); + AFP_CNID_DONE(); + } + if (delcnid != CNID_INVALID) { + AFP_CNID_START("cnid_delete"); + cnid_delete(vol->v_cdb, delcnid); + AFP_CNID_DONE(); + } + fce_register(obj, FCE_DIR_DELETE, fullpathname(upath), NULL); } else { /* we have to cache this, the structs are lost in deletcurdir*/ /* but we need the positive returncode to send our event */ @@ -611,10 +638,10 @@ int afp_delete(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size if ((dname = bstrcpy(curdir->d_u_name)) == NULL) return AFPERR_MISC; if ((rc = deletecurdir(vol)) == AFP_OK) - fce_register_delete_dir(cfrombstr(dname)); + fce_register(obj, FCE_DIR_DELETE, fullpathname(cfrombstr(dname)), NULL); bdestroy(dname); } - } else if (of_findname(s_path)) { + } else if (of_findname(vol, s_path)) { rc = AFPERR_BUSY; } else { /* it's a file st_valid should always be true @@ -625,7 +652,7 @@ int afp_delete(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U_, size rc = AFPERR_NOOBJ; } else { if ((rc = deletefile(vol, -1, upath, 1)) == AFP_OK) { - fce_register_delete_file( s_path ); + fce_register(obj, FCE_FILE_DELETE, fullpathname(upath), NULL); if (vol->v_tm_used < s_path->st.st_size) vol->v_tm_used = 0; else @@ -660,8 +687,10 @@ char *absupath(const struct vol *vol, struct dir *dir, char *u) return NULL; if (bcatcstr(path, u) != BSTR_OK) return NULL; - if (path->slen > MAXPATHLEN) + if (path->slen > MAXPATHLEN) { + bdestroy(path); return NULL; + } LOG(log_debug, logtype_afpd, "absupath: %s", cfrombstr(path)); @@ -675,7 +704,7 @@ char *ctoupath(const struct vol *vol, struct dir *dir, char *name) { if (vol == NULL || dir == NULL || name == NULL) return NULL; - return absupath(vol, dir, mtoupath(vol, name, dir->d_did, utf8_encoding())); + return absupath(vol, dir, mtoupath(vol, name, dir->d_did, utf8_encoding(vol->v_obj))); } /* ------------------------- */ @@ -689,11 +718,8 @@ int afp_moveandrename(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U int did; int pdid; int plen; - u_int16_t vid; + uint16_t vid; int rc; -#ifdef DROPKLUDGE - int retvalue; -#endif /* DROPKLUDGE */ int sdir_fd = -1; @@ -771,34 +797,22 @@ int afp_moveandrename(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf _U /* This does the work */ LOG(log_debug, logtype_afpd, "afp_move(oldname:'%s', newname:'%s', isdir:%u)", oldname, newname, isdir); - rc = moveandrename(vol, sdir, sdir_fd, oldname, newname, isdir); + rc = moveandrename(obj, vol, sdir, sdir_fd, oldname, newname, isdir); if ( rc == AFP_OK ) { - char *upath = mtoupath(vol, newname, pdid, utf8_encoding()); + char *upath = mtoupath(vol, newname, pdid, utf8_encoding(obj)); if (NULL == upath) { rc = AFPERR_PARAM; goto exit; } - curdir->d_offcnt++; - sdir->d_offcnt--; -#ifdef DROPKLUDGE - if (vol->v_flags & AFPVOL_DROPBOX) { - /* FIXME did is not always the source id */ - if ((retvalue=matchfile2dirperms (upath, vol, did)) != AFP_OK) { - rc = retvalue; - goto exit; - } - } - else -#endif /* DROPKLUDGE */ - /* if unix priv don't try to match perm with dest folder */ - if (!isdir && !vol_unix_priv(vol)) { - int admode = ad_mode("", 0777) | vol->v_fperm; + /* if unix priv don't try to match perm with dest folder */ + if (!isdir && !vol_unix_priv(vol)) { + int admode = ad_mode("", 0777) | vol->v_fperm; - setfilmode(upath, admode, NULL, vol->v_umask); - vol->vfs->vfs_setfilmode(vol, upath, admode, NULL); - } + setfilmode(vol, upath, admode, path->st_valid ? &path->st : NULL); + vol->vfs->vfs_setfilmode(vol, upath, admode, path->st_valid ? &path->st : NULL); + } setvoltime(obj, vol ); }