X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Ffiledir.c;h=d2400262db06a3ce4ea8d83e913b9bfcef1b6036;hb=e8e3979f927d8e501a3f5226a5e86abcf0bb3261;hp=b4e616676553bdf2d50b259d59d101d3daeca2f6;hpb=3606b9e3a163b19c98d3c0c0dc40886d14bcc5ca;p=netatalk.git diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c index b4e61667..d2400262 100644 --- a/etc/afpd/filedir.c +++ b/etc/afpd/filedir.c @@ -1,5 +1,5 @@ /* - * $Id: filedir.c,v 1.27 2002-05-13 04:59:36 jmarcus Exp $ + * $Id: filedir.c,v 1.45 2003-04-20 06:53:40 didg Exp $ * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -54,7 +54,9 @@ char *strchr (), *strrchr (); #include "file.h" #include "globals.h" #include "filedir.h" +#include "unix.h" +#ifdef DROPKLUDGE int matchfile2dirperms(upath, vol, did) /* Since it's kinda' big; I decided against an inline function */ @@ -67,26 +69,29 @@ more information */ { struct stat st, sb; struct dir *dir; - char adpath[50]; - int uid; - + char *adpath; + uid_t uid; + int ret = AFP_OK; #ifdef DEBUG LOG(log_info, logtype_afpd, "begin matchfile2dirperms:"); #endif /* DEBUG */ - if (stat(upath, &st ) < 0) + if (stat(upath, &st ) < 0) { LOG(log_error, logtype_afpd, "Could not stat %s: %s", upath, strerror(errno)); - strcpy (adpath, "./.AppleDouble/"); - strcat (adpath, upath); - if (( dir = dirsearch( vol, did )) == NULL ) { + return AFPERR_NOOBJ ; + } + + adpath = 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."); - return( AFPERR_NOOBJ ); + ret = AFPERR_NOOBJ; } else if (stat(".", &sb) < 0) { LOG(log_error, logtype_afpd, "matchfile2dirperms: Error checking directory \"%s\": %s", - dir->d_name, strerror(errno)); - return(AFPERR_NOOBJ ); + dir->d_m_name, strerror(errno)); + ret = AFPERR_NOOBJ; } else { uid=geteuid(); @@ -98,70 +103,52 @@ more information */ LOG(log_error, logtype_afpd, "matchfile2dirperms: Error changing owner/gid of %s: %s", upath, strerror(errno)); - return (AFPERR_ACCESS); + ret = AFPERR_ACCESS; } - if (chmod(upath,(st.st_mode&~default_options.umask)| S_IRGRP| S_IROTH) < 0) + else if (chmod(upath,(st.st_mode&~default_options.umask)| S_IRGRP| S_IROTH) < 0) { LOG(log_error, logtype_afpd, "matchfile2dirperms: Error adding file read permissions: %s", strerror(errno)); - return (AFPERR_ACCESS); + ret = AFPERR_ACCESS; } -#ifdef DEBUG - else - LOG(log_info, logtype_afpd, - "matchfile2dirperms: Added S_IRGRP and S_IROTH: %s", - strerror(errno)); -#endif /* DEBUG */ - if (lchown(adpath, sb.st_uid, sb.st_gid) < 0) + else if (lchown(adpath, sb.st_uid, sb.st_gid) < 0) { LOG(log_error, logtype_afpd, "matchfile2dirperms: Error changing AppleDouble owner/gid %s: %s", adpath, strerror(errno)); - return (AFPERR_ACCESS); + ret = AFPERR_ACCESS; } - if (chmod(adpath, (st.st_mode&~default_options.umask)| S_IRGRP| S_IROTH) < 0) + else if (chmod(adpath, (st.st_mode&~default_options.umask)| S_IRGRP| S_IROTH) < 0) { LOG(log_error, logtype_afpd, "matchfile2dirperms: Error adding AD file read permissions: %s", strerror(errno)); - return (AFPERR_ACCESS); + ret = AFPERR_ACCESS; } -#ifdef DEBUG - else - LOG(log_info, logtype_afpd, - "matchfile2dirperms: Added S_IRGRP and S_IROTH to AD: %s", - strerror(errno)); -#endif /* DEBUG */ + seteuid(uid); } -#ifdef DEBUG - else - LOG(log_info, logtype_afpd, - "matchfile2dirperms: No ownership change necessary."); -#endif /* DEBUG */ } /* end else if stat success */ - seteuid(uid); /* Restore process ownership to normal */ + #ifdef DEBUG LOG(log_info, logtype_afpd, "end matchfile2dirperms:"); #endif /* DEBUG */ - - return (AFP_OK); - + return ret; } - +#endif int afp_getfildirparams(obj, ibuf, ibuflen, rbuf, rbuflen ) AFPObj *obj; char *ibuf, *rbuf; int ibuflen, *rbuflen; { - struct stat st; + struct stat *st; struct vol *vol; struct dir *dir; u_int32_t did; int buflen, ret; - char *path; u_int16_t fbitmap, dbitmap, vid; + struct path *s_path; #ifdef DEBUG LOG(log_info, logtype_afpd, "begin afp_getfildirparams:"); @@ -172,15 +159,15 @@ int ibuflen, *rbuflen; memcpy( &vid, ibuf, sizeof( vid )); ibuf += sizeof( vid ); - if (( vol = getvolbyvid( vid )) == NULL ) { + if (NULL == ( vol = getvolbyvid( vid )) ) { return( AFPERR_PARAM ); } memcpy( &did, ibuf, sizeof( did )); ibuf += sizeof( did ); - if (( dir = dirlookup( vol, did )) == NULL ) { - return( AFPERR_NOOBJ ); + if (NULL == ( dir = dirlookup( vol, did )) ) { + return afp_errno; } memcpy( &fbitmap, ibuf, sizeof( fbitmap )); @@ -190,27 +177,40 @@ int ibuflen, *rbuflen; dbitmap = ntohs( dbitmap ); ibuf += sizeof( dbitmap ); - if (( path = cname( vol, dir, &ibuf )) == NULL) { - return( AFPERR_NOOBJ ); + if (NULL == ( s_path = cname( vol, dir, &ibuf )) ) { + return get_afp_errno(AFPERR_NOOBJ); } - if ( stat( mtoupath(vol, path ), &st ) < 0 ) { + st = &s_path->st; + if (!s_path->st_valid) { + /* it's a dir and it should be there + * because we chdir in it in cname or + * it's curdir (maybe deleted, but then we can't know) + * + */ + of_stat(s_path); + } + if ( s_path->st_errno != 0 ) { return( AFPERR_NOOBJ ); } buflen = 0; - if (S_ISDIR(st.st_mode)) { + if (S_ISDIR(st->st_mode)) { if (dbitmap) { - ret = getdirparams(vol, dbitmap, ".", curdir, - &st, rbuf + 3 * sizeof( u_int16_t ), &buflen ); + dir = s_path->dir; + if (!dir) + return AFPERR_NOOBJ; + + ret = getdirparams(vol, dbitmap, s_path, dir, + rbuf + 3 * sizeof( u_int16_t ), &buflen ); if (ret != AFP_OK ) return( ret ); } /* this is a directory */ *(rbuf + 2 * sizeof( u_int16_t )) = (char) FILDIRBIT_ISDIR; } else { - if (fbitmap && ( ret = getfilparams(vol, fbitmap, path, curdir, &st, - rbuf + 3 * sizeof( u_int16_t ), &buflen )) != AFP_OK ) { + if (fbitmap && AFP_OK != (ret = getfilparams(vol, fbitmap, s_path, curdir, + rbuf + 3 * sizeof( u_int16_t ), &buflen )) ) { return( ret ); } /* this is a file */ @@ -237,10 +237,10 @@ AFPObj *obj; char *ibuf, *rbuf; int ibuflen, *rbuflen; { - struct stat st; + struct stat *st; struct vol *vol; struct dir *dir; - char *path; + struct path *path; u_int16_t vid, bitmap; int did, rc; @@ -253,7 +253,7 @@ int ibuflen, *rbuflen; memcpy( &vid, ibuf, sizeof(vid)); ibuf += sizeof( vid ); - if (( vol = getvolbyvid( vid )) == NULL ) { + if (NULL == ( vol = getvolbyvid( vid )) ) { return( AFPERR_PARAM ); } @@ -263,22 +263,29 @@ int ibuflen, *rbuflen; memcpy( &did, ibuf, sizeof( did)); ibuf += sizeof( did); - if (( dir = dirsearch( vol, did )) == NULL ) { - return( AFPERR_NOOBJ ); + if (NULL == ( dir = dirlookup( vol, did )) ) { + return afp_errno; } memcpy( &bitmap, ibuf, sizeof( bitmap )); bitmap = ntohs( bitmap ); ibuf += sizeof( bitmap ); - if (( path = cname( vol, dir, &ibuf )) == NULL ) { - return( AFPERR_NOOBJ ); + if (NULL == ( path = cname( vol, dir, &ibuf ))) { + return get_afp_errno(AFPERR_NOOBJ); } - if ( stat( mtoupath(vol, path ), &st ) < 0 ) { - return( AFPERR_NOOBJ ); + st = &path->st; + if (!path->st_valid) { + /* it's a dir and it should be there + * because we chdir in it in cname + */ + of_stat(path); } + if ( path->st_errno != 0 ) { + return( AFPERR_NOOBJ ); + } /* * If ibuf is odd, make it even. */ @@ -286,7 +293,7 @@ int ibuflen, *rbuflen; ibuf++; } - if (S_ISDIR(st.st_mode)) { + if (S_ISDIR(st->st_mode)) { rc = setdirparams(vol, path, bitmap, ibuf ); } else { rc = setfilparams(vol, path, bitmap, ibuf ); @@ -338,12 +345,12 @@ int isdir; char *p; char *upath; int rc; - struct stat st; + struct stat *st; int adflags; struct adouble ad; struct adouble *adp; - struct ofork *opened; - + struct ofork *opened = NULL; + struct path path; #ifdef CNID_DB cnid_t id; #endif /* CNID_DB */ @@ -354,11 +361,19 @@ int isdir; if (!isdir) { #ifdef CNID_DB - p = mtoupath(vol, oldname); + p = mtoupath(vol, oldname, utf8_encoding()); + if (!p) { + return AFPERR_PARAM; /* can't convert */ + } id = cnid_get(vol->v_db, sdir->d_did, p, strlen(p)); #endif /* CNID_DB */ p = ctoupath( vol, sdir, oldname ); - if ((opened = of_findname(vol, sdir, oldname))) { + if (!p) { + return AFPERR_PARAM; /* pathname too long */ + } + path.st_valid = 0; + path.u_name = p; + if ((opened = of_findname(&path))) { /* reuse struct adouble so it won't break locks */ adp = opened->of_ad; } @@ -368,6 +383,9 @@ int isdir; id = sdir->d_did; /* we already have the CNID */ #endif /* CNID_DB */ p = ctoupath( vol, sdir->d_parent, oldname ); + if (!p) { + return AFPERR_PARAM; + } adflags = ADFLAGS_DIR; } /* @@ -385,7 +403,11 @@ int isdir; return(AFPERR_OLOCK); } - upath = mtoupath(vol, newname); + if (NULL == (upath = mtoupath(vol, newname, utf8_encoding()))){ + return AFPERR_PARAM; + } + path.u_name = upath; + st = &path.st; if (0 != (rc = check_name(vol, upath))) { return rc; } @@ -396,19 +418,21 @@ int isdir; return AFP_OK; /* deal with case insensitive, case-preserving filesystems. */ - if ((stat(upath, &st) == 0) && strdiacasecmp(oldname, newname)) + if ((stat(upath, st) == 0) && strdiacasecmp(oldname, newname)) return AFPERR_EXIST; - } else if (stat(upath, &st ) == 0) + } else if (stat(upath, st ) == 0) return AFPERR_EXIST; if ( !isdir ) { - if (of_findname(vol, curdir, newname)) { + path.st_valid = 1; + path.st_errno = errno; + if (of_findname(&path)) { rc = AFPERR_EXIST; /* was AFPERR_BUSY; */ - } else if ((rc = renamefile( p, upath, newname, - vol_noadouble(vol), adp )) == AFP_OK) { - /* if it's still open, rename the ofork as well. */ - rc = of_rename(vol, sdir, oldname, curdir, newname); + } else { + rc = renamefile( p, upath, newname,vol_noadouble(vol), adp ); + if (rc == AFP_OK) + of_rename(vol, opened, sdir, oldname, curdir, newname); } } else { rc = renamedir(p, upath, sdir, curdir, newname, vol_noadouble(vol)); @@ -416,11 +440,11 @@ int isdir; if ( rc == AFP_OK ) { #ifdef CNID_DB /* renaming may have moved the file/dir across a filesystem */ - if (stat(upath, &st) < 0) + if (stat(upath, st) < 0) return AFPERR_MISC; /* fix up the catalog entry */ - cnid_update(vol->v_db, id, &st, curdir->d_did, upath, strlen(upath)); + cnid_update(vol->v_db, id, st, curdir->d_did, upath, strlen(upath)); #endif /* CNID_DB */ } @@ -435,9 +459,10 @@ int ibuflen, *rbuflen; { struct vol *vol; struct dir *sdir; - char *path, *oldname, *newname; + char *oldname, *newname; + struct path *path; u_int32_t did; - int plen; + int plen; u_int16_t vid; int isdir = 0; int rc; @@ -450,7 +475,7 @@ int ibuflen, *rbuflen; memcpy( &vid, ibuf, sizeof( vid )); ibuf += sizeof( vid ); - if (( vol = getvolbyvid( vid )) == NULL ) { + if (NULL == ( vol = getvolbyvid( vid )) ) { return( AFPERR_PARAM ); } @@ -459,20 +484,25 @@ int ibuflen, *rbuflen; memcpy( &did, ibuf, sizeof( did )); ibuf += sizeof( did ); - if (( sdir = dirsearch( vol, did )) == NULL ) { - return( AFPERR_NOOBJ ); + if (NULL == ( sdir = dirlookup( vol, did )) ) { + return afp_errno; } /* source pathname */ - if (( path = cname( vol, sdir, &ibuf )) == NULL ) { - return( AFPERR_NOOBJ ); + if (NULL == ( path = cname( vol, sdir, &ibuf )) ) { + return get_afp_errno(AFPERR_NOOBJ); } sdir = curdir; newname = obj->newtmp; oldname = obj->oldtmp; - if ( *path != '\0' ) { - strcpy(oldname, path); /* an extra copy for of_rename */ + isdir = path_isadir(path); + if ( *path->m_name != '\0' ) { + strcpy(oldname, path->m_name); /* an extra copy for of_rename */ + if (isdir) { + /* curdir parent dir, need to move sdir back */ + sdir = path->dir; + } } else { if ( sdir->d_parent == NULL ) { /* root directory */ @@ -480,22 +510,17 @@ int ibuflen, *rbuflen; } /* move to destination dir */ if ( movecwd( vol, sdir->d_parent ) < 0 ) { - return( AFPERR_NOOBJ ); + return afp_errno; } - isdir = 1; - strcpy(oldname, sdir->d_name); + strcpy(oldname, sdir->d_m_name); } /* another place where we know about the path type */ - if ( *ibuf++ != 2 ) { + if ((plen = copy_path_name(newname, ibuf)) < 0) { return( AFPERR_PARAM ); } - if (( plen = (unsigned char)*ibuf++ ) != 0 ) { - strncpy( newname, ibuf, plen ); - newname[ plen ] = '\0'; - } - else { + if (!plen) { return AFP_OK; /* newname == oldname same dir */ } @@ -520,7 +545,8 @@ int ibuflen, *rbuflen; { struct vol *vol; struct dir *dir; - char *path, *upath; + struct path *s_path; + char *upath; int did, rc; u_int16_t vid; @@ -533,7 +559,7 @@ int ibuflen, *rbuflen; memcpy( &vid, ibuf, sizeof( vid )); ibuf += sizeof( vid ); - if (( vol = getvolbyvid( vid )) == NULL ) { + if (NULL == ( vol = getvolbyvid( vid )) ) { return( AFPERR_PARAM ); } @@ -542,25 +568,29 @@ int ibuflen, *rbuflen; memcpy( &did, ibuf, sizeof( did )); ibuf += sizeof( int ); - if (( dir = dirsearch( vol, did )) == NULL ) { - return( AFPERR_NOOBJ ); + if (NULL == ( dir = dirlookup( vol, did )) ) { + return afp_errno; } - if (( path = cname( vol, dir, &ibuf )) == NULL ) { - return( AFPERR_NOOBJ ); + if (NULL == ( s_path = cname( vol, dir, &ibuf )) ) { + return get_afp_errno(AFPERR_NOOBJ); } - if ( *path == '\0' ) { - rc = deletecurdir( vol, obj->oldtmp, AFPOBJ_TMPSIZ); - } else if (of_findname(vol, curdir, path)) { + upath = s_path->u_name; + if ( path_isadir( s_path) ) { + if (*s_path->m_name != '\0') { + rc = AFPERR_ACCESS; + } + else { + rc = deletecurdir( vol, obj->oldtmp, AFPOBJ_TMPSIZ); + } + } else if (of_findname(s_path)) { rc = AFPERR_BUSY; - } else if ((rc = deletefile( upath = mtoupath(vol, path ), 1)) == AFP_OK) { -#ifdef CNID_DB /* get rid of entry */ - cnid_t id = cnid_get(vol->v_db, curdir->d_did, upath, strlen(upath)); - cnid_delete(vol->v_db, id); -#endif /* CNID_DB */ + } else { + rc = deletefile(vol, upath, 1); } if ( rc == AFP_OK ) { + curdir->offcnt--; setvoltime(obj, vol ); } @@ -570,38 +600,56 @@ int ibuflen, *rbuflen; return( rc ); } - -char *ctoupath( vol, dir, name ) +char *absupath( vol, dir, u ) const struct vol *vol; struct dir *dir; -char *name; +char *u; { struct dir *d; static char path[ MAXPATHLEN + 1]; - char *p, *u; + char *p; int len; + if (u == NULL) + return NULL; + p = path + sizeof( path ) - 1; *p = '\0'; - u = mtoupath(vol, name ); len = strlen( u ); p -= len; strncpy( p, u, len ); - for ( d = dir; d->d_parent; d = d->d_parent ) { - *--p = '/'; - u = mtoupath(vol, d->d_name ); + if (dir) for ( d = dir; d->d_parent; d = d->d_parent ) { + u = d->d_u_name; len = strlen( u ); + if (p -len -1 < path) { + /* FIXME + rather rare so LOG error and/or client message ? + */ + return NULL; + } + *--p = '/'; p -= len; strncpy( p, u, len ); } - *--p = '/'; len = strlen( vol->v_path ); + if (p -len -1 < path) { + return NULL; + } + *--p = '/'; p -= len; strncpy( p, vol->v_path, len ); return( p ); } +char *ctoupath( vol, dir, name ) +const struct vol *vol; +struct dir *dir; +char *name; +{ + return absupath(vol, dir, mtoupath(vol, name, utf8_encoding())); +} + /* ------------------------- */ int afp_moveandrename(obj, ibuf, ibuflen, rbuf, rbuflen ) AFPObj *obj; @@ -610,11 +658,11 @@ int ibuflen, *rbuflen; { struct vol *vol; struct dir *sdir, *ddir; - int isdir = 0; - char *oldname, *newname; - char *path; + int isdir; + char *oldname, *newname; + struct path *path; int did; - int plen; + int plen; u_int16_t vid; int rc; #ifdef DROPKLUDGE @@ -630,7 +678,7 @@ int ibuflen, *rbuflen; memcpy( &vid, ibuf, sizeof( vid )); ibuf += sizeof( vid ); - if (( vol = getvolbyvid( vid )) == NULL ) { + if (NULL == ( vol = getvolbyvid( vid )) ) { return( AFPERR_PARAM ); } @@ -640,63 +688,76 @@ int ibuflen, *rbuflen; /* source did followed by dest did */ memcpy( &did, ibuf, sizeof( did )); ibuf += sizeof( int ); - if (( sdir = dirsearch( vol, did )) == NULL ) { - return( AFPERR_PARAM ); + if (NULL == ( sdir = dirlookup( vol, did )) ) { + return afp_errno; /* was AFPERR_PARAM */ } memcpy( &did, ibuf, sizeof( did )); ibuf += sizeof( int ); /* source pathname */ - if (( path = cname( vol, sdir, &ibuf )) == NULL ) { - return( AFPERR_NOOBJ ); + if (NULL == ( path = cname( vol, sdir, &ibuf )) ) { + return get_afp_errno(AFPERR_NOOBJ); } sdir = curdir; newname = obj->newtmp; oldname = obj->oldtmp; - if ( *path != '\0' ) { - /* not a directory */ - strcpy(oldname, path); /* an extra copy for of_rename */ + + isdir = path_isadir(path); + if ( *path->m_name != '\0' ) { + if (isdir) { + sdir = path->dir; + } + strcpy(oldname, path->m_name); /* an extra copy for of_rename */ } else { - isdir = 1; - strcpy(oldname, sdir->d_name); + strcpy(oldname, sdir->d_m_name); } /* get the destination directory */ - if (( ddir = dirsearch( vol, did )) == NULL ) { - return( AFPERR_PARAM ); + if (NULL == ( ddir = dirlookup( vol, did )) ) { + return afp_errno; /* was AFPERR_PARAM */ } if (( path = cname( vol, ddir, &ibuf )) == NULL ) { return( AFPERR_NOOBJ ); } - if ( *path != '\0' ) { - return( AFPERR_BADTYPE ); + if ( *path->m_name != '\0' ) { + return path_error(path, AFPERR_NOOBJ); } /* one more place where we know about path type */ - if ( *ibuf++ != 2 ) { + if ((plen = copy_path_name(newname, ibuf)) < 0) { return( AFPERR_PARAM ); } - if (( plen = (unsigned char)*ibuf++ ) != 0 ) { - strncpy( newname, ibuf, plen ); - newname[ plen ] = '\0'; - } - else { + if (!plen) { strcpy(newname, oldname); } - + rc = moveandrename(vol, sdir, oldname, newname, isdir); if ( rc == AFP_OK ) { + char *upath = mtoupath(vol, newname, utf8_encoding()); + + if (NULL == upath) { + return AFPERR_PARAM; + } + curdir->offcnt++; + sdir->offcnt--; #ifdef DROPKLUDGE if (vol->v_flags & AFPVOL_DROPBOX) { - if (retvalue=matchfile2dirperms (newname, vol, did) != AFP_OK) { + if ((retvalue=matchfile2dirperms (upath, vol, did)) != AFP_OK) { return retvalue; } } + else #endif /* DROPKLUDGE */ + if (!isdir) { + int admode = ad_mode("", 0777); + + setfilmode(upath, admode, NULL); + setfilmode(ad_path( upath, ADFLAGS_HF ), ad_hf_mode(admode), NULL); + } setvoltime(obj, vol ); }