/*
- * $Id: filedir.c,v 1.73 2010/03/12 15:16:49 franklahm Exp $
- *
* Copyright (c) 1990,1993 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
*/
#include <stdio.h>
#include <stdlib.h>
-/* STDC check */
-#if STDC_HEADERS
#include <string.h>
-#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 <strings.h>
-#endif
#include <errno.h>
#include <sys/param.h>
#include <atalk/unix.h>
#include <atalk/bstrlib.h>
#include <atalk/bstradd.h>
+#include <atalk/acl.h>
#include "directory.h"
+#include "dircache.h"
#include "desktop.h"
#include "volume.h"
#include "fork.h"
#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;
LOG(log_debug, logtype_afpd, "getfildirparams(vid:%u, did:%u, f/d:%04x/%04x) {cwdid:%u, cwd: %s, name:'%s'}",
ntohs(vid), ntohl(dir->d_did), fbitmap, dbitmap,
- ntohl(curdir->d_did), cfrombstring(curdir->d_fullpath), s_path->u_name);
+ ntohl(curdir->d_did), cfrombstr(curdir->d_fullpath), s_path->u_name);
st = &s_path->st;
if (!s_path->st_valid) {
char *newname,
int isdir)
{
- char *p;
+ char *oldunixname = NULL;
char *upath;
int rc;
struct stat *st, nst;
struct ofork *opened = NULL;
struct path path;
cnid_t id;
- int cwd_fd;
+ 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);
adp = &ad;
adflags = 0;
if (!isdir) {
- if ((p = mtoupath(vol, oldname, sdir->d_did, utf8_encoding())) == NULL)
+ if ((oldunixname = strdup(mtoupath(vol, oldname, sdir->d_did, utf8_encoding()))) == NULL)
return AFPERR_PARAM; /* can't convert */
+ id = cnid_get(vol->v_cdb, sdir->d_did, oldunixname, strlen(oldunixname));
-#ifndef HAVE_RENAMEAT
+#ifndef HAVE_ATFUNCS
/* Need full path */
- id = cnid_get(vol->v_cdb, sdir->d_did, p, strlen(p));
- p = ctoupath( vol, sdir, oldname );
- if (!p)
+ free(oldunixname);
+ if ((oldunixname = strdup(ctoupath(vol, sdir, oldname))) == NULL)
return AFPERR_PARAM; /* pathname too long */
-#endif /* HAVE_RENAMEAT */
+#endif /* HAVE_ATFUNCS */
path.st_valid = 0;
- path.u_name = p;
-#ifdef HAVE_RENAMEAT
+ path.u_name = oldunixname;
+
+#ifdef HAVE_ATFUNCS
opened = of_findnameat(sdir_fd, &path);
#else
opened = of_findname(&path);
-#endif /* HAVE_RENAMEAT */
+#endif /* HAVE_ATFUNCS */
+
if (opened) {
/* reuse struct adouble so it won't break locks */
adp = opened->of_ad;
}
} else {
id = sdir->d_did; /* we already have the CNID */
- p = ctoupath( vol, dirlookup(vol, sdir->d_pdid), oldname );
- if (!p) {
+ if ((oldunixname = strdup(ctoupath( vol, dirlookup(vol, sdir->d_pdid), oldname))) == NULL)
return AFPERR_PARAM;
- }
adflags = ADFLAGS_DIR;
}
/*
- * p now points to either
+ * oldunixname now points to either
* a) full pathname of the source fs object (if renameat is not available)
* b) the oldname (renameat is available)
* we are in the dest folder so we need to use
- * a) p for ad_open
+ * a) oldunixname for ad_open
* b) fchdir sdir_fd before eg ad_open or use *at functions where appropiate
*/
if (sdir_fd != -1) {
if ((cwd_fd = open(".", O_RDONLY)) == -1)
return AFPERR_MISC;
- if (fchdir(sdir_fd) != 0)
- return AFPERR_MISC;
+ if (fchdir(sdir_fd) != 0) {
+ rc = AFPERR_MISC;
+ goto exit;
+ }
}
- if (!ad_metadata(p, adflags, adp)) {
+ if (!ad_metadata(oldunixname, adflags, adp)) {
u_int16_t bshort;
ad_getattr(adp, &bshort);
+
ad_close_metadata( adp);
- if ((bshort & htons(ATTRBIT_NORENAME)))
- return(AFPERR_OLOCK);
+ if ((bshort & htons(ATTRBIT_NORENAME))) {
+ rc = AFPERR_OLOCK;
+ goto exit;
+ }
}
if (sdir_fd != -1) {
if (fchdir(cwd_fd) != 0) {
LOG(log_error, logtype_afpd, "moveandrename: %s", strerror(errno) );
- return AFPERR_MISC;
+ rc = AFPERR_MISC;
+ goto exit;
}
}
- if (NULL == (upath = mtoupath(vol, newname, curdir->d_did, utf8_encoding()))){
- return AFPERR_PARAM;
+ if (NULL == (upath = mtoupath(vol, newname, curdir->d_did, utf8_encoding()))){
+ rc = AFPERR_PARAM;
+ goto exit;
}
path.u_name = upath;
st = &path.st;
if (0 != (rc = check_name(vol, upath))) {
- return rc;
+ goto exit;
}
/* source == destination. we just silently accept this. */
if ((!isdir && curdir == sdir) || (isdir && curdir->d_did == sdir->d_pdid)) {
- if (strcmp(oldname, newname) == 0)
- return AFP_OK;
+ if (strcmp(oldname, newname) == 0) {
+ rc = AFP_OK;
+ goto exit;
+ }
if (stat(upath, st) == 0 || caseenumerate(vol, &path, curdir) == 0) {
- if (!stat(p, &nst) && !(nst.st_dev == st->st_dev && nst.st_ino == st->st_ino) ) {
+ if (!stat(oldunixname, &nst) && !(nst.st_dev == st->st_dev && nst.st_ino == st->st_ino) ) {
/* not the same file */
- return AFPERR_EXIST;
+ rc = AFPERR_EXIST;
+ goto exit;
}
errno = 0;
}
- } else if (stat(upath, st ) == 0 || caseenumerate(vol, &path, curdir) == 0)
- return AFPERR_EXIST;
+ } else if (stat(upath, st ) == 0 || caseenumerate(vol, &path, curdir) == 0) {
+ rc = AFPERR_EXIST;
+ goto exit;
+ }
if ( !isdir ) {
path.st_valid = 1;
if (of_findname(&path)) {
rc = AFPERR_EXIST; /* was AFPERR_BUSY; */
} else {
- rc = renamefile(vol, sdir_fd, p, upath, newname, adp );
+ rc = renamefile(vol, sdir_fd, oldunixname, upath, newname, adp );
if (rc == AFP_OK)
of_rename(vol, opened, sdir, oldname, curdir, newname);
}
} else {
- rc = renamedir(vol, sdir_fd, p, upath, sdir, curdir, newname);
+ rc = renamedir(vol, sdir_fd, oldunixname, upath, sdir, curdir, newname);
}
if ( rc == AFP_OK && id ) {
/* renaming may have moved the file/dir across a filesystem */
- if (stat(upath, st) < 0)
- return AFPERR_MISC;
+ if (stat(upath, st) < 0) {
+ rc = AFPERR_MISC;
+ goto exit;
+ }
+
+ /* Remove it from the cache */
+ struct dir *cacheddir = dircache_search_by_did(vol, id);
+ if (cacheddir) {
+ LOG(log_warning, logtype_afpd,"Still cached: \"%s/%s\"", getcwdpath(), upath);
+ (void)dir_remove(vol, cacheddir);
+ }
+
+ /* Fixup adouble info */
+ 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);
+ }
/* fix up the catalog entry */
cnid_update(vol->v_cdb, id, st, curdir->d_did, upath, strlen(upath));
}
+exit:
+ if (cwd_fd != -1)
+ close(cwd_fd);
+ if (oldunixname)
+ free(oldunixname);
return rc;
}
if ( movecwd( vol, dirlookup(vol, sdir->d_pdid) ) < 0 ) {
return afp_errno;
}
- memcpy(oldname, cfrombstring(sdir->d_m_name), blength(sdir->d_m_name) +1);
+ memcpy(oldname, cfrombstr(sdir->d_m_name), blength(sdir->d_m_name) +1);
}
/* another place where we know about the path type */
}
else {
rc = deletefile(vol, -1, upath, 1);
+
+ struct dir *cachedfile;
+ if ((cachedfile = dircache_search_by_name(vol, dir, upath, strlen(upath), s_path->st.st_ctime))) {
+ dircache_remove(vol, cachedfile, DIRCACHE | DIDNAME_INDEX | QUEUE_INDEX);
+ dir_free(cachedfile);
+ }
}
}
if ( rc == AFP_OK ) {
if (path->slen > MAXPATHLEN)
return NULL;
- LOG(log_debug, logtype_afpd, "absupath: %s", cfrombstring(path));
+ LOG(log_debug, logtype_afpd, "absupath: %s", cfrombstr(path));
- strncpy(pathbuf, cfrombstring(path), blength(path) + 1);
+ strncpy(pathbuf, cfrombstr(path), blength(path) + 1);
bdestroy(path);
return(pathbuf);
int plen;
u_int16_t vid;
int rc;
-#ifdef DROPKLUDGE
- int retvalue;
-#endif /* DROPKLUDGE */
int sdir_fd = -1;
}
strcpy(oldname, path->m_name); /* an extra copy for of_rename */
} else {
- memcpy(oldname, cfrombstring(sdir->d_m_name), blength(sdir->d_m_name) + 1);
+ memcpy(oldname, cfrombstr(sdir->d_m_name), blength(sdir->d_m_name) + 1);
}
-#ifdef HAVE_RENAMEAT
+#ifdef HAVE_ATFUNCS
if ((sdir_fd = open(".", O_RDONLY)) == -1)
return AFPERR_MISC;
#endif
}
curdir->offcnt++;
sdir->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(upath, admode, NULL, vol->v_umask);
+ vol->vfs->vfs_setfilmode(vol, upath, admode, NULL);
+ }
setvoltime(obj, vol );
}
exit:
-#ifdef HAVE_RENAMEAT
+#ifdef HAVE_ATFUNCS
if (sdir_fd != -1)
close(sdir_fd);
#endif
projects / netatalk.git / blobdiff