X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Funix.c;h=ffe594a01caefea42f9c8869225eec712d17d9a9;hb=6dcaba1d633e3cfa96243c62ad8399f7e5558c48;hp=7f948bc907a8492f53fc956fca1e2fd1dd999e9a;hpb=85b1a6bd6e3d8cbc7eff992f763a1d57b3a0f459;p=netatalk.git diff --git a/etc/afpd/unix.c b/etc/afpd/unix.c index 7f948bc9..ffe594a0 100644 --- a/etc/afpd/unix.c +++ b/etc/afpd/unix.c @@ -1,5 +1,5 @@ /* - * $Id: unix.c,v 1.36 2002-08-29 18:57:26 didg Exp $ + * $Id: unix.c,v 1.53 2009-10-02 09:32:40 franklahm Exp $ * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. @@ -11,40 +11,45 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include /* STDC check */ -#if STDC_HEADERS +#ifdef 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_FCNTL_H -#include -#endif /* HAVE_FCNTL_H */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "auth.h" #include "directory.h" #include "volume.h" #include "unix.h" +#include "fork.h" + +#ifdef HAVE_NFSv4_ACLS +extern void acltoownermode(char *path, struct stat *st,uid_t uid, struct maccess *ma); +#endif + /* * Get the free space on a partition. @@ -100,17 +105,17 @@ u_int32_t *bsize; return( AFP_OK ); } -static __inline__ int utombits( bits ) +static int utombits( bits ) mode_t bits; { int mbits; mbits = 0; - mbits |= ( bits & ( S_IREAD >> 6 )) ? (AR_UREAD | AR_USEARCH) : 0; + mbits |= ( bits & ( S_IREAD >> 6 )) ? AR_UREAD : 0; mbits |= ( bits & ( S_IWRITE >> 6 )) ? AR_UWRITE : 0; - /* Do we really need this? - mbits |= ( bits & ( S_IEXEC >> 6) ) ? AR_USEARCH : 0; */ + /* Do we really need this? */ + mbits |= ( bits & ( S_IEXEC >> 6) ) ? AR_USEARCH : 0; return( mbits ); } @@ -133,42 +138,50 @@ mode_t mode; ma->ma_owner = utombits( mode ); - /* ma_user is a union of all permissions */ - ma->ma_user = 0; + /* ma_user is a union of all permissions but we must follow + * unix perm + */ if ( (uuid == stat->st_uid) || (uuid == 0)) { ma->ma_user = ma->ma_owner | AR_UOWN; } - if ( gmem( stat->st_gid )) { - ma->ma_user |= ma->ma_group; - } - ma->ma_user |= ma->ma_world; + else if ( gmem( stat->st_gid )) { + ma->ma_user = ma->ma_group; + } + else { + ma->ma_user = ma->ma_world; + } /* * There are certain things the mac won't try if you don't have * the "owner" bit set, even tho you can do these things on unix wiht * only write permission. What were the things? * - * FIXME and so what ? + * FIXME + * ditto seems to care if st_uid is 0 ? + * was ma->ma_user & AR_UWRITE + * but 0 as owner is a can of worms. */ -#if 0 - if ( ma->ma_user & AR_UWRITE ) { + if ( !stat->st_uid ) { ma->ma_user |= AR_UOWN; } -#endif } - +#ifdef accessmode +#undef accessmode +#endif /* * Calculate the mode for a directory using a stat() call to * estimate permission. * * Note: the previous method, using access(), does not work correctly * over NFS. + * + * dir parameter is used by AFS */ void accessmode( path, ma, dir, st ) char *path; struct maccess *ma; -struct dir *dir; +struct dir *dir _U_; struct stat *st; { @@ -181,7 +194,10 @@ struct stat sb; st = &sb; } utommode( st, ma ); - return; +#ifdef HAVE_NFSv4_ACLS + /* 10.5 Finder looks at OS 9 mode, so we must do some mapping */ + acltoownermode( path, st, uuid, ma); +#endif } int gmem( gid ) @@ -197,7 +213,7 @@ const gid_t gid; return( 0 ); } -static __inline__ mode_t mtoubits( bits ) +static mode_t mtoubits( bits ) u_char bits; { mode_t mode; @@ -234,55 +250,7 @@ struct maccess *ma; return( mode ); } -int stickydirmode(name, mode, dropbox) -char * name; -const mode_t mode; -const int dropbox; -{ - int retval; -#ifdef DROPKLUDGE - int uid; -#endif /* DROPKLUDGE */ - - /* Turn on the sticky bit if this is a drop box, also turn off the setgid bit */ - retval=0; -#ifdef DROPKLUDGE - if (dropbox) { - if (mode & S_IWOTH) { - if (mode & S_IROTH); - else { /* if S_IWOTH and not S_IROTH */ - uid=geteuid(); - if ( seteuid(0) < 0) { - LOG(log_error, logtype_afpd, "stickydirmode: unable to seteuid root: %s", strerror(errno)); - } - if ( retval=chmod( name, ( (DIRBITS | mode | S_ISVTX) & ~default_options.umask) ) < 0) { - LOG(log_error, logtype_afpd, "stickydirmode: chmod \"%s\": %s", name, strerror(errno) ); - return(AFPERR_ACCESS); - } else { -#ifdef DEBUG - LOG(log_info, logtype_afpd, "stickydirmode: (debug) chmod \"%s\": %s", name, strerror(retval) ); -#endif /* DEBUG */ - seteuid(uid); - } /* end getting retval */ - } /* end if not & S_IROTH */ - } else { /* end if S_IWOTH and not S_IROTH */ -#endif /* DROPKLUDGE */ - - /* - * Ignore EPERM errors: We may be dealing with a directory that is - * group writable, in which case chmod will fail. - */ - if ( (chmod( name, (DIRBITS | mode) & ~default_options.umask ) < 0) && errno != EPERM) { - LOG(log_error, logtype_afpd, "stickydirmode: chmod \"%s\": %s", - name, strerror(errno) ); - retval = -1; - } -#ifdef DROPKLUDGE - } /* end if not mode */ - } /* end checking for "dropbox" */ -#endif /* DROPKLUDGE */ - return retval; -} +#define EXEC_MODE (S_IXGRP | S_IXUSR | S_IXOTH) int setdeskmode( mode ) const mode_t mode; @@ -293,6 +261,10 @@ const mode_t mode; struct dirent *deskp, *subp; DIR *desk, *sub; + if (!dir_rx_set(mode)) { + /* want to remove read and search access to owner it will screw the volume */ + return -1 ; + } if ( getcwd( wd , MAXPATHLEN) == NULL ) { return( -1 ); } @@ -325,27 +297,23 @@ const mode_t mode; strcat( modbuf, subp->d_name ); /* XXX: need to preserve special modes */ if (stat(modbuf, &st) < 0) { - LOG(log_error, logtype_afpd, "setdeskmode: stat %s: %s", - modbuf, strerror(errno) ); + LOG(log_error, logtype_afpd, "setdeskmode: stat %s: %s",fullpathname(modbuf), strerror(errno) ); continue; } if (S_ISDIR(st.st_mode)) { if ( chmod( modbuf, (DIRBITS | mode) & ~default_options.umask ) < 0 && errno != EPERM ) { - LOG(log_error, logtype_afpd, "setdeskmode: chmod %s: %s", - modbuf, strerror(errno) ); + LOG(log_error, logtype_afpd, "setdeskmode: chmod %s: %s",fullpathname(modbuf), strerror(errno) ); } - } else if ( chmod( modbuf, mode & ~default_options.umask ) < 0 && errno != EPERM ) { - LOG(log_error, logtype_afpd, "setdeskmode: chmod %s: %s", - modbuf, strerror(errno) ); + } else if ( chmod( modbuf, mode & ~(default_options.umask | EXEC_MODE) ) < 0 && errno != EPERM ) { + LOG(log_error, logtype_afpd, "setdeskmode: chmod %s: %s",fullpathname(modbuf), strerror(errno) ); } } closedir( sub ); /* XXX: need to preserve special modes */ if ( chmod( deskp->d_name, (DIRBITS | mode) & ~default_options.umask ) < 0 && errno != EPERM ) { - LOG(log_error, logtype_afpd, "setdeskmode: chmod %s: %s", - deskp->d_name, strerror(errno) ); + LOG(log_error, logtype_afpd, "setdeskmode: chmod %s: %s",fullpathname(deskp->d_name), strerror(errno) ); } } closedir( desk ); @@ -355,121 +323,119 @@ const mode_t mode; } /* XXX: need to preserve special modes */ if ( chmod( ".AppleDesktop", (DIRBITS | mode) & ~default_options.umask ) < 0 && errno != EPERM ) { - LOG(log_error, logtype_afpd, "setdeskmode: chmod .AppleDesktop: %s", strerror(errno) ); + LOG(log_error, logtype_afpd, "setdeskmode: chmod %s: %s", fullpathname(".AppleDesktop"),strerror(errno) ); } return( 0 ); } -int setfilmode(name, mode, st) -char * name; +/* --------------------- */ +int setfilunixmode (vol, path, mode) +const struct vol *vol; +struct path* path; mode_t mode; -struct stat *st; { -struct stat sb; -mode_t mask = S_IRUSR |S_IWUSR | S_IRGRP | S_IWGRP |S_IROTH | S_IWOTH; + if (!path->st_valid) { + of_stat(path); + } - if (!st) { - if (stat(name, &sb) != 0) - return; - st = &sb; + if (path->st_errno) { + return -1; + } + + mode |= vol->v_fperm; + + if (setfilmode( path->u_name, mode, &path->st, vol->v_umask) < 0) + return -1; + /* we need to set write perm if read set for resource fork */ + return vol->vfs->rf_setfilmode(vol, path->u_name, mode, &path->st); +} + + +/* --------------------- */ +int setdirunixmode( vol, name, mode ) +const struct vol *vol; +const char *name; +mode_t mode; +{ + + int dropbox = (vol->v_flags & AFPVOL_DROPBOX); + mode |= vol->v_dperm; + + if (dir_rx_set(mode)) { + /* extending right? dir first then .AppleDouble in rf_setdirmode */ + if ( stickydirmode(name, DIRBITS | mode, dropbox, vol->v_umask) < 0 ) + return -1; + } + if (vol->vfs->rf_setdirunixmode(vol, name, mode, NULL) < 0 && !vol_noadouble(vol)) { + return -1 ; + } + if (!dir_rx_set(mode)) { + if ( stickydirmode(name, DIRBITS | mode, dropbox, vol->v_umask) < 0 ) + return -1; } - mode &= mask; /* keep only rw-rw-rw in mode */ - mode |= st->st_mode & ~mask; /* keep other bits from previous mode */ - if ( chmod( name, mode & ~default_options.umask ) < 0 && errno != EPERM ) { - return -1; - } - return 0; + return 0; } -int setdirmode( mode, noadouble, dropbox ) -const mode_t mode; -const int noadouble; -const int dropbox; +/* --------------------- */ +int setdirmode( vol, name, mode ) +const struct vol *vol; +const char *name; +mode_t mode; { - char buf[ MAXPATHLEN + 1]; struct stat st; - char *m; struct dirent *dirp; DIR *dir; + mode_t hf_mode; + int osx = vol->v_adouble == AD_VERSION2_OSX; + int dropbox = (vol->v_flags & AFPVOL_DROPBOX); - if (( dir = opendir( "." )) == NULL ) { - LOG(log_error, logtype_afpd, "setdirmode: opendir .: %s", strerror(errno) ); + mode |= vol->v_dperm; + hf_mode = ad_hf_mode(mode); + + if (dir_rx_set(mode)) { + /* extending right? dir first */ + if ( stickydirmode(name, DIRBITS | mode, dropbox, vol->v_umask) < 0 ) + return -1; + } + + if (( dir = opendir( name )) == NULL ) { + LOG(log_error, logtype_afpd, "setdirmode: opendir: %s", fullpathname(name), strerror(errno) ); return( -1 ); } for ( dirp = readdir( dir ); dirp != NULL; dirp = readdir( dir )) { - if ( *dirp->d_name == '.' ) { + /* FIXME */ + if ( *dirp->d_name == '.' && (!osx || dirp->d_name[1] != '_')) { continue; } if ( stat( dirp->d_name, &st ) < 0 ) { - LOG(log_error, logtype_afpd, "setdirmode: stat %s: %s", - dirp->d_name, strerror(errno) ); + LOG(log_error, logtype_afpd, "setdirmode: stat %s: %s",dirp->d_name, strerror(errno) ); continue; } - if (S_ISREG(st.st_mode)) { - if (setfilmode(dirp->d_name, mode, &st) < 0) { - LOG(log_error, logtype_afpd, "setdirmode: chmod %s: %s", - dirp->d_name, strerror(errno) ); + if (!S_ISDIR(st.st_mode)) { + int setmode = (osx && *dirp->d_name == '.')?hf_mode:mode; + + if (setfilmode(dirp->d_name, setmode, &st, vol->v_umask) < 0) { + LOG(log_error, logtype_afpd, "setdirmode: chmod %s: %s",dirp->d_name, strerror(errno) ); return -1; } } -#if 0 - /* XXX: need to preserve special modes */ - else if (S_ISDIR(st.st_mode)) { - if (stickydirmode(dirp->d_name, DIRBITS | mode, dropbox) < 0) - return (-1); - } else if (stickydirmode(dirp->d_name, mode, dropbox) < 0) - return (-1); - } -#endif } closedir( dir ); - - /* change perm of .AppleDouble's files - */ - if (( dir = opendir( ".AppleDouble" )) == NULL ) { - if (noadouble) - goto setdirmode_noadouble; - LOG(log_error, logtype_afpd, "setdirmode: opendir .AppleDouble: %s", strerror(errno) ); - return( -1 ); + + if (vol->vfs->rf_setdirmode(vol, name, mode, NULL) < 0 && !vol_noadouble(vol)) { + return -1 ; } - strcpy( buf, ".AppleDouble" ); - strcat( buf, "/" ); - m = strchr( buf, '\0' ); - for ( dirp = readdir( dir ); dirp != NULL; dirp = readdir( dir )) { - if ( strcmp( dirp->d_name, "." ) == 0 || - strcmp( dirp->d_name, ".." ) == 0 ) { - continue; - } - *m = '\0'; - strcat( buf, dirp->d_name ); - - if ( stat( buf, &st ) < 0 ) { - LOG(log_error, logtype_afpd, "setdirmode: stat %s: %s", buf, strerror(errno) ); - continue; - } - if (S_ISREG(st.st_mode)) { - if (setfilmode(dirp->d_name, ad_hf_mode(mode), &st) < 0) { - /* FIXME what do we do then? */ - } - } - } /* end for */ - closedir( dir ); - - /* XXX: use special bits to tag directory permissions */ - - /* XXX: need to preserve special modes */ - if ( stickydirmode(".AppleDouble", DIRBITS | mode, dropbox) < 0 ) - return( -1 ); -setdirmode_noadouble: - /* XXX: need to preserve special modes */ - if ( stickydirmode(".", DIRBITS | mode, dropbox) < 0 ) - return( -1 ); + if (!dir_rx_set(mode)) { + if ( stickydirmode(name, DIRBITS | mode, dropbox, vol->v_umask) < 0 ) + return -1; + } return( 0 ); } +/* ----------------------------- */ int setdeskowner( uid, gid ) const uid_t uid; const gid_t gid; @@ -512,8 +478,7 @@ const gid_t gid; strcat( modbuf, subp->d_name ); /* XXX: add special any uid, ignore group bits */ if ( chown( modbuf, uid, gid ) < 0 && errno != EPERM ) { - LOG(log_error, logtype_afpd, "setdeskown: chown %s: %s", - modbuf, strerror(errno) ); + LOG(log_error, logtype_afpd, "setdeskown: chown %s: %s", fullpathname(modbuf), strerror(errno) ); } } closedir( sub ); @@ -529,95 +494,181 @@ const gid_t gid; return -1; } if ( chown( ".AppleDesktop", uid, gid ) < 0 && errno != EPERM ) { - LOG(log_error, logtype_afpd, "setdeskowner: chown .AppleDesktop: %s", - strerror(errno) ); + LOG(log_error, logtype_afpd, "setdeskowner: chown %s: %s", fullpathname(".AppleDouble"), strerror(errno) ); } return( 0 ); } +/* ----------------------------- */ +int setfilowner(vol, uid, gid, path) +const struct vol *vol; +const uid_t uid; +const gid_t gid; +struct path* path; +{ + + if (!path->st_valid) { + of_stat(path); + } + + if (path->st_errno) { + return -1; + } -/* uid/gid == 0 need to be handled as special cases. they really mean + if ( chown( path->u_name, uid, gid ) < 0 && errno != EPERM ) { + LOG(log_debug, logtype_afpd, "setfilowner: chown %d/%d %s: %s", + uid, gid, path->u_name, strerror(errno) ); + return -1; + } + + if (vol->vfs->rf_chown(vol, path->u_name, uid, gid ) < 0 && errno != EPERM) { + LOG(log_debug, logtype_afpd, "setfilowner: rf_chown %d/%d %s: %s", + uid, gid, path->u_name, strerror(errno) ); + return -1; + } + + return 0; +} + +/* --------------------------------- + * uid/gid == 0 need to be handled as special cases. they really mean * that user/group should inherit from other, but that doesn't fit * into the unix permission scheme. we can get around this by * co-opting some bits. */ -int setdirowner( uid, gid, noadouble ) +int setdirowner(vol, name, uid, gid ) +const struct vol *vol; +const char *name; const uid_t uid; const gid_t gid; -const int noadouble; { - char buf[ MAXPATHLEN + 1]; struct stat st; - char *m; struct dirent *dirp; DIR *dir; + int osx = vol->v_adouble == AD_VERSION2_OSX; - if (( dir = opendir( "." )) == NULL ) { + if (( dir = opendir( name )) == NULL ) { return( -1 ); } for ( dirp = readdir( dir ); dirp != NULL; dirp = readdir( dir )) { - if ( *dirp->d_name == '.' ) { + if ( *dirp->d_name == '.' && (!osx || dirp->d_name[1] != '_')) { continue; - }; + } if ( stat( dirp->d_name, &st ) < 0 ) { LOG(log_error, logtype_afpd, "setdirowner: stat %s: %s", - dirp->d_name, strerror(errno) ); + fullpathname(dirp->d_name), strerror(errno) ); continue; } if (( st.st_mode & S_IFMT ) == S_IFREG ) { if ( chown( dirp->d_name, uid, gid ) < 0 && errno != EPERM ) { LOG(log_debug, logtype_afpd, "setdirowner: chown %s: %s", - dirp->d_name, strerror(errno) ); + fullpathname(dirp->d_name), strerror(errno) ); /* return ( -1 ); Sometimes this is okay */ } } } closedir( dir ); - if (( dir = opendir( ".AppleDouble" )) == NULL ) { - if (noadouble) - goto setdirowner_noadouble; + + if (vol->vfs->rf_setdirowner(vol, name, uid, gid) < 0) { + return -1; + } + + if ( stat( ".", &st ) < 0 ) { return( -1 ); } - strcpy( buf, ".AppleDouble" ); - strcat( buf, "/" ); - m = strchr( buf, '\0' ); - for ( dirp = readdir( dir ); dirp != NULL; dirp = readdir( dir )) { - if ( strcmp( dirp->d_name, "." ) == 0 || - strcmp( dirp->d_name, ".." ) == 0 ) { - continue; - } - *m = '\0'; - strcat( buf, dirp->d_name ); - if ( chown( buf, uid, gid ) < 0 && errno != EPERM ) { - LOG(log_debug, logtype_afpd, "setdirowner: chown %d/%d %s: %s", - uid, gid, buf, strerror(errno) ); - /* return ( -1 ); Sometimes this is okay */ - } + if ( gid && gid != st.st_gid && chown( ".", uid, gid ) < 0 && errno != EPERM ) { + LOG(log_debug, logtype_afpd, "setdirowner: chown %d/%d %s: %s", + uid, gid, fullpathname("."), strerror(errno) ); } - closedir( dir ); - /* - * We cheat: we know that chown doesn't do anything. - */ - if ( stat( ".AppleDouble", &st ) < 0 ) { - LOG(log_error, logtype_afpd, "setdirowner: stat .AppleDouble: %s", strerror(errno) ); - return( -1 ); - } - if ( gid && gid != st.st_gid && chown( ".AppleDouble", uid, gid ) < 0 && - errno != EPERM ) { - LOG(log_debug, logtype_afpd, "setdirowner: chown %d/%d .AppleDouble: %s", - uid, gid, strerror(errno) ); - /* return ( -1 ); Sometimes this is okay */ + return( 0 ); +} + +#if 0 +/* recursive chown()ing of a directory */ +static int recursive_chown(const char *path, uid_t uid, gid_t gid) { + struct stat sbuf; + DIR *odir = NULL; + struct dirent *entry; + char *name; + int ret = 0; + char newpath[PATH_MAX+1]; + newpath[PATH_MAX] = '\0'; + + if (chown(path, uid, gid) < 0) { + LOG(log_error, logtype_afpd, "cannot chown() file [%s] (uid = %d): %s", path, uid, strerror(errno)); + return -1; } -setdirowner_noadouble: - if ( stat( ".", &st ) < 0 ) { - return( -1 ); + if (stat(path, &sbuf) < 0) { + LOG(log_error, logtype_afpd, "cannot chown() file [%s] (uid = %d): %s", path, uid, strerror(errno)); + return -1; } - if ( gid && gid != st.st_gid && chown( ".", uid, gid ) < 0 && - errno != EPERM ) { - LOG(log_debug, logtype_afpd, "setdirowner: chown %d/%d .: %s", - uid, gid, strerror(errno) ); + + if (S_ISDIR(sbuf.st_mode)) { + odir = opendir(path); + if (odir == NULL) { + LOG(log_error, logtype_afpd, "cannot opendir() [%s] (uid = %d): %s", path, uid, strerror(errno)); + goto recursive_chown_end; + } + while (NULL != (entry=readdir(odir)) ) { + name = entry->d_name; + if (name[0] == '.' && name[1] == '\0') + continue; + if (name[0] == '.' && name[1] == '.' && name[2] == '\0') + continue; + sprintf(newpath, "%s/%s", path, name); + if (recursive_chown(newpath, uid, gid) < 0) + ret = -1; + } /* while */ + } /* if */ + +recursive_chown_end: + if (odir != NULL) { + closedir(odir); } + return ret; +} +#endif - return( 0 ); +/* This is equivalent of unix rename(). */ +int unix_rename(const char *oldpath, const char *newpath) +{ +#if 0 + char pd_name[PATH_MAX+1]; + int i; + struct stat pd_stat; + uid_t uid; +#endif + + if (rename(oldpath, newpath) < 0) + return -1; +#if 0 + for (i = 0; i <= PATH_MAX && newpath[i] != '\0'; i++) + pd_name[i] = newpath[i]; + pd_name[i] = '\0'; + + while (i > 0 && pd_name[i] != '/') i--; + if (pd_name[i] == '/') i++; + + pd_name[i++] = '.'; pd_name[i++] = '\0'; + + if (stat(pd_name, &pd_stat) < 0) { + LOG(log_error, logtype_afpd, "stat() of parent dir failed: pd_name = %s, uid = %d: %s", + pd_name, geteuid(), strerror(errno)); + return 0; + } + + /* So we have SGID bit set... */ + if ((S_ISGID & pd_stat.st_mode) != 0) { + uid = geteuid(); + if (seteuid(0) < 0) + LOG(log_error, logtype_afpd, "seteuid() failed: %s", strerror(errno)); + if (recursive_chown(newpath, uid, pd_stat.st_gid) < 0) + LOG(log_error, logtype_afpd, "chown() of parent dir failed: newpath=%s, uid=%d: %s", + pd_name, geteuid(), strerror(errno)); + seteuid(uid); + } +#endif + return 0; } +