X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libatalk%2Fvfs%2Funix.c;h=79e4fd33c29b151a08cd4afb4b157c638ea444b4;hb=bcb41b85b62fcc24337c9a7748dd64c10044fe46;hp=b8df2292bb3915ef34525f353d2746d365594bae;hpb=42c8cb19e0091eee8cc3cfa2c97205d7a412fb1b;p=netatalk.git diff --git a/libatalk/vfs/unix.c b/libatalk/vfs/unix.c index b8df2292..79e4fd33 100644 --- a/libatalk/vfs/unix.c +++ b/libatalk/vfs/unix.c @@ -1,9 +1,6 @@ /* - * $Id: unix.c,v 1.7 2010-01-20 13:22:13 franklahm Exp $ - * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. - * */ #ifdef HAVE_CONFIG_H @@ -12,6 +9,7 @@ #include #include +#include #include #include #include @@ -23,52 +21,10 @@ #include #include #include - -/* ----------------------------- - a dropbox is a folder where w is set but not r eg: - rwx-wx-wx or rwx-wx-- - rwx----wx (is not asked by a Mac with OS >= 8.0 ?) -*/ -int stickydirmode(const char *name, const mode_t mode, const int dropbox, const mode_t v_umask) -{ - int retval = 0; - -#ifdef DROPKLUDGE - /* Turn on the sticky bit if this is a drop box, also turn off the setgid bit */ - if ((dropbox & AFPVOL_DROPBOX)) { - int uid; - - if ( ( (mode & S_IWOTH) && !(mode & S_IROTH)) || - ( (mode & S_IWGRP) && !(mode & S_IRGRP)) ) - { - 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) & ~v_umask) )) < 0) { - LOG(log_error, logtype_afpd, "stickydirmode: chmod \"%s\": %s", fullpathname(name), strerror(errno) ); - } else { - LOG(log_debug, logtype_afpd, "stickydirmode: chmod \"%s\": %s", fullpathname(name), strerror(retval) ); - } - seteuid(uid); - return retval; - } - } -#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) & ~v_umask ) < 0) && errno != EPERM && - !(errno == ENOENT && (dropbox & AFPVOL_NOADOUBLE)) ) - { - LOG(log_error, logtype_afpd, "stickydirmode: chmod \"%s\": %s", fullpathname(name), strerror(errno) ); - retval = -1; - } - - return retval; -} +#include +#include +#include +#include /* ------------------------- */ int dir_rx_set(mode_t mode) @@ -77,40 +33,48 @@ int dir_rx_set(mode_t mode) } /* --------------------- */ -int setfilmode(const char * name, mode_t mode, struct stat *st, mode_t v_umask) +int setfilmode(const struct vol *vol, const char *name, mode_t mode, struct stat *st) { struct stat sb; - mode_t result = mode; mode_t mask = S_IRWXU | S_IRWXG | S_IRWXO; /* rwx for owner group and other, by default */ if (!st) { - if (stat(name, &sb) != 0) + if (lstat(name, &sb) != 0) return -1; st = &sb; } - result |= st->st_mode & ~mask; /* keep other bits from previous mode */ + mode |= st->st_mode & ~mask; /* keep other bits from previous mode */ - LOG(log_debug, logtype_afpd, "setfilmode('%s', mode:%04o, vmask:%04o) {st_mode:%04o, chmod:%04o}", - fullpathname(name), mode, v_umask, st->st_mode, result); - - if ( chmod( name, mode & ~v_umask ) < 0 && errno != EPERM ) { + if (ochmod((char *)name, mode & ~vol->v_umask, st, vol_syml_opt(vol) | O_NETATALK_ACL) < 0 && errno != EPERM ) { return -1; } return 0; } -/* ------------------- - system rmdir with afp error code. - ENOENT is not an error. -*/ -int netatalk_rmdir(const char *name) +/* + * @brief system rmdir with afp error code. + * + * Supports *at semantics (cf openat) if HAVE_ATFUNCS. Pass dirfd=-1 to ignore this. + */ +int netatalk_rmdir_all_errors(int dirfd, const char *name) { - if (rmdir(name) < 0) { + int err; + +#ifdef HAVE_ATFUNCS + if (dirfd == -1) + dirfd = AT_FDCWD; + err = unlinkat(dirfd, name, AT_REMOVEDIR); +#else + err = rmdir(name); +#endif + + if (err < 0) { switch ( errno ) { case ENOENT : - break; + return AFPERR_NOOBJ; case ENOTEMPTY : + case EEXIST: return AFPERR_DIRNEMPT; case EPERM: case EACCES : @@ -124,6 +88,19 @@ int netatalk_rmdir(const char *name) return AFP_OK; } +/* + * @brief System rmdir with afp error code, but ENOENT is not an error. + * + * Supports *at semantics (cf openat) if HAVE_ATFUNCS. Pass dirfd=-1 to ignore this. + */ +int netatalk_rmdir(int dirfd, const char *name) +{ + int ret = netatalk_rmdir_all_errors(dirfd, name); + if (ret == AFPERR_NOOBJ) + return AFP_OK; + return ret; +} + /* ------------------- system unlink with afp error code. ENOENT is not an error. @@ -146,50 +123,24 @@ int netatalk_unlink(const char *name) return AFP_OK; } -char *fullpathname(const char *name) -{ - static char wd[ MAXPATHLEN + 1]; - - if ( getcwd( wd , MAXPATHLEN) ) { - strlcat(wd, "/", MAXPATHLEN); - strlcat(wd, name, MAXPATHLEN); - } - else { - strlcpy(wd, name, MAXPATHLEN); - } - return wd; -} +/************************************************************************** + * *at semnatics support functions (like openat, renameat standard funcs) + **************************************************************************/ -int copy_file(const char *src, const char *dst, mode_t mode) +/* Copy all file data from one file fd to another */ +int copy_file_fd(int sfd, int dfd) { - int ret = 0; - int sfd = -1; - int dfd = -1; + EC_INIT; ssize_t cc; size_t buflen; - char filebuf[8192]; - - if ((sfd = open(src, O_RDONLY)) < 0) { - LOG(log_error, logtype_afpd, "copy_file('%s'/'%s'): open '%s' error: %s", - src, dst, src, strerror(errno)); - return -1; - } - - if ((dfd = open(dst, O_WRONLY | O_CREAT | O_EXCL, mode)) < 0) { - LOG(log_error, logtype_afpd, "copy_file('%s'/'%s'): open '%s' error: %s", - src, dst, dst, strerror(errno)); - ret = -1; - goto exit; - } + char filebuf[NETATALK_DIOSZ_STACK]; while ((cc = read(sfd, filebuf, sizeof(filebuf)))) { if (cc < 0) { if (errno == EINTR) continue; - LOG(log_error, logtype_afpd, "copy_file('%s'/'%s'): read '%s' error: %s", - src, dst, src, strerror(errno)); - ret = -1; - goto exit; + LOG(log_error, logtype_afpd, "copy_file_fd: %s", strerror(errno)); + EC_FAIL; } buflen = cc; @@ -197,15 +148,48 @@ int copy_file(const char *src, const char *dst, mode_t mode) if ((cc = write(dfd, filebuf, buflen)) < 0) { if (errno == EINTR) continue; - LOG(log_error, logtype_afpd, "copy_file('%s'/'%s'): read '%s' error: %s", - src, dst, dst, strerror(errno)); - ret = -1; - goto exit; + LOG(log_error, logtype_afpd, "copy_file_fd: %s", strerror(errno)); + EC_FAIL; } buflen -= cc; } } +EC_CLEANUP: + EC_EXIT; +} + +/* + * Supports *at semantics if HAVE_ATFUNCS, pass dirfd=-1 to ignore this + */ +int copy_file(int dirfd, const char *src, const char *dst, mode_t mode) +{ + int ret = 0; + int sfd = -1; + int dfd = -1; + +#ifdef HAVE_ATFUNCS + if (dirfd == -1) + dirfd = AT_FDCWD; + sfd = openat(dirfd, src, O_RDONLY); +#else + sfd = open(src, O_RDONLY); +#endif + if (sfd < 0) { + LOG(log_info, logtype_afpd, "copy_file('%s'/'%s'): open '%s' error: %s", + src, dst, src, strerror(errno)); + return -1; + } + + if ((dfd = open(dst, O_WRONLY | O_CREAT | O_TRUNC, mode)) < 0) { + LOG(log_info, logtype_afpd, "copy_file('%s'/'%s'): open '%s' error: %s", + src, dst, dst, strerror(errno)); + ret = -1; + goto exit; + } + + ret = copy_file_fd(sfd, dfd); + exit: if (sfd != -1) close(sfd); @@ -225,44 +209,156 @@ exit: return ret; } -/* This is equivalent of unix rename(). */ -int unix_rename(const char *oldpath, const char *newpath) +/*! + * Copy an EA from one file to another + * + * Supports *at semantics if HAVE_ATFUNCS, pass dirfd=-1 to ignore this + */ +int copy_ea(const char *ea, int dirfd, const char *src, const char *dst, mode_t mode) { -#if 0 - char pd_name[PATH_MAX+1]; - int i; - struct stat pd_stat; - uid_t uid; + EC_INIT; + int sfd = -1; + int dfd = -1; + size_t easize; + char *eabuf = NULL; + +#ifdef HAVE_ATFUNCS + if (dirfd == -1) + dirfd = AT_FDCWD; + EC_NEG1_LOG( sfd = openat(dirfd, src, O_RDONLY) ); +#else + EC_NEG1_LOG( sfd = open(src, O_RDONLY) ); +#endif + EC_NEG1_LOG( dfd = open(dst, O_WRONLY, mode) ); + + if ((easize = sys_fgetxattr(sfd, ea, NULL, 0)) > 0) { + EC_NULL_LOG( eabuf = malloc(easize)); + EC_NEG1_LOG( easize = sys_fgetxattr(sfd, ea, eabuf, easize) ); + EC_NEG1_LOG( easize = sys_fsetxattr(dfd, ea, eabuf, easize, 0) ); + } + +EC_CLEANUP: + if (sfd != -1) + close(sfd); + if (dfd != -1) + close(dfd); + free(eabuf); + EC_EXIT; +} + +/* + * at wrapper for netatalk_unlink + */ +int netatalk_unlinkat(int dirfd, const char *name) +{ +#ifdef HAVE_ATFUNCS + if (dirfd == -1) + dirfd = AT_FDCWD; + + if (unlinkat(dirfd, name, 0) < 0) { + switch (errno) { + case ENOENT : + break; + case EROFS: + return AFPERR_VLOCK; + case EPERM: + case EACCES : + return AFPERR_ACCESS; + default : + return AFPERR_PARAM; + } + } + return AFP_OK; +#else + return netatalk_unlink(name); #endif + /* DEADC0DE */ + return 0; +} + +/* + * @brief This is equivalent of unix rename() + * + * unix_rename mulitplexes rename and renameat. If we dont HAVE_ATFUNCS, sfd and dfd + * are ignored. + * + * @param sfd (r) if we HAVE_ATFUNCS, -1 gives AT_FDCWD + * @param oldpath (r) guess what + * @param dfd (r) same as sfd + * @param newpath (r) guess what + */ +int unix_rename(int sfd, const char *oldpath, int dfd, const char *newpath) +{ +#ifdef HAVE_ATFUNCS + if (sfd == -1) + sfd = AT_FDCWD; + if (dfd == -1) + dfd = AT_FDCWD; + + if (renameat(sfd, oldpath, dfd, newpath) < 0) + return -1; +#else 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'; +#endif /* HAVE_ATFUNCS */ - while (i > 0 && pd_name[i] != '/') i--; - if (pd_name[i] == '/') i++; + return 0; +} - pd_name[i++] = '.'; pd_name[i++] = '\0'; +/* + * @brief stat/fsstatat multiplexer + * + * statat mulitplexes stat and fstatat. If we dont HAVE_ATFUNCS, dirfd is ignored. + * + * @param dirfd (r) Only used if HAVE_ATFUNCS, ignored else, -1 gives AT_FDCWD + * @param path (r) pathname + * @param st (rw) pointer to struct stat + */ +int statat(int dirfd, const char *path, struct stat *st) +{ +#ifdef HAVE_ATFUNCS + if (dirfd == -1) + dirfd = AT_FDCWD; + return (fstatat(dirfd, path, st, 0)); +#else + return (stat(path, st)); +#endif + + /* DEADC0DE */ + return -1; +} + +/* + * @brief opendir wrapper for *at semantics support + * + * opendirat chdirs to dirfd if dirfd != -1 before calling opendir on path. + * + * @param dirfd (r) if != -1, chdir(dirfd) before opendir(path) + * @param path (r) pathname + */ +DIR *opendirat(int dirfd, const char *path) +{ + DIR *ret; + int cwd = -1; - 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; + if (dirfd != -1) { + if (((cwd = open(".", O_RDONLY)) == -1) || (fchdir(dirfd) != 0)) { + ret = NULL; + goto exit; + } } - /* 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); + ret = opendir(path); + + if (dirfd != -1 && fchdir(cwd) != 0) { + LOG(log_error, logtype_afpd, "opendirat: cant chdir back. exit!"); + exit(EXITERR_SYS); } -#endif - return 0; + +exit: + if (cwd != -1) + close(cwd); + + return ret; }