X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fvolume.c;h=3404048a520e0c1400bd6a8646ebb6f6f474f50a;hb=465246e257d9aff9855e3e35d8fd5983db932b45;hp=ff17a315fe92b71ccb8aedab46e025baee0381c9;hpb=2b85474fc98599d7edab57590636e8fcca90006e;p=netatalk.git diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c index ff17a315..3404048a 100644 --- a/etc/afpd/volume.c +++ b/etc/afpd/volume.c @@ -35,6 +35,9 @@ char *strchr (), *strrchr (); #include #include #include +#include +#include + #include #include #include @@ -43,12 +46,16 @@ char *strchr (), *strrchr (); #include #include #include -#include +#include +#include +#include +#include +#include + #ifdef CNID_DB #include #endif /* CNID_DB*/ -#include "globals.h" #include "directory.h" #include "file.h" #include "volume.h" @@ -56,6 +63,7 @@ char *strchr (), *strrchr (); #include "mangle.h" #include "fork.h" #include "hash.h" +#include "acls.h" extern int afprun(int root, char *cmd, int *outfd); @@ -74,6 +82,13 @@ extern int afprun(int root, char *cmd, int *outfd); #endif /* BYTE_ORDER == BIG_ENDIAN */ #endif /* ! NO_LARGE_VOL_SUPPORT */ +#ifndef UUID_PRINTABLE_STRING_LENGTH +#define UUID_PRINTABLE_STRING_LENGTH 37 +#endif + +/* Globals */ +struct vol *current_vol; /* last volume from getvolbyvid() */ + static struct vol *Volumes = NULL; static u_int16_t lastvid = 0; static char *Trash = "\02\024Network Trash Folder"; @@ -119,9 +134,8 @@ static void free_extmap(void); #define VOLOPT_EA_VFS 27 /* Extended Attributes vfs indirection */ #define VOLOPT_CNIDSERVER 28 /* CNID Server ip address*/ #define VOLOPT_CNIDPORT 30 /* CNID server tcp port */ -#define VOLOPT_UUID 31 /* CNID server tcp port */ -#define VOLOPT_MAX 32 /* <== IMPORTANT !!!!!! */ +#define VOLOPT_MAX 31 /* <== IMPORTANT !!!!!! */ #define VOLOPT_NUM (VOLOPT_MAX + 1) #define VOLPASSLEN 8 @@ -155,6 +169,8 @@ static void handle_special_folders (const struct vol *); static void deletevol(struct vol *vol); static void volume_free(struct vol *vol); static void check_ea_sys_support(struct vol *vol); +static char *get_vol_uuid(const AFPObj *obj, const char *volname); +static int readvolfile(AFPObj *obj, struct afp_volume_name *p1,char *p2, int user, struct passwd *pwent); static void volfree(struct vol_option *options, const struct vol_option *save) { @@ -174,7 +190,10 @@ static void volfree(struct vol_option *options, const struct vol_option *save) } -/* handle variable substitutions. here's what we understand: +#define is_var(a, b) (strncmp((a), (b), 2) == 0) + +/* + * Handle variable substitutions. here's what we understand: * $b -> basename of path * $c -> client ip/appletalk address * $d -> volume pathname on server @@ -188,17 +207,37 @@ static void volfree(struct vol_option *options, const struct vol_option *save) * $z -> zone (may not exist) * $$ -> $ * + * This get's called from readvolfile with + * path = NULL, volname = NULL for xlating the volumes path + * path = path, volname = NULL for xlating the volumes name + * ... and from volumes options parsing code when xlating eg dbpath with + * path = path, volname = volname * + * Using this information we can reject xlation of any variable depeninding on a login + * context which is not given in the afp master, where we must evaluate this whole stuff + * too for the Zeroconf announcements. */ -#define is_var(a, b) (strncmp((a), (b), 2) == 0) - -static char *volxlate(AFPObj *obj, char *dest, size_t destlen, - char *src, struct passwd *pwd, char *path, char *volname) +static char *volxlate(AFPObj *obj, + char *dest, + size_t destlen, + char *src, + struct passwd *pwd, + char *path, + char *volname) { char *p, *r; const char *q; int len; char *ret; + int afpmaster = 0; + int xlatevolname = 0; + + if (parent_or_child == 0) + afpmaster = 1; + + if (path && !volname) + /* cf above */ + xlatevolname = 1; if (!src) { return NULL; @@ -225,6 +264,8 @@ static char *volxlate(AFPObj *obj, char *dest, size_t destlen, /* now figure out what the variable is */ q = NULL; if (is_var(p, "$b")) { + if (afpmaster && xlatevolname) + return NULL; if (path) { if ((q = strrchr(path, '/')) == NULL) q = path; @@ -232,6 +273,8 @@ static char *volxlate(AFPObj *obj, char *dest, size_t destlen, q++; } } else if (is_var(p, "$c")) { + if (afpmaster && xlatevolname) + return NULL; if (obj->proto == AFPPROTO_ASP) { ASP asp = obj->handle; @@ -249,18 +292,26 @@ static char *volxlate(AFPObj *obj, char *dest, size_t destlen, destlen -= len; } } else if (is_var(p, "$d")) { + if (afpmaster && xlatevolname) + return NULL; q = path; } else if (pwd && is_var(p, "$f")) { + if (afpmaster && xlatevolname) + return NULL; if ((r = strchr(pwd->pw_gecos, ','))) *r = '\0'; q = pwd->pw_gecos; } else if (pwd && is_var(p, "$g")) { + if (afpmaster && xlatevolname) + return NULL; struct group *grp = getgrgid(pwd->pw_gid); if (grp) q = grp->gr_name; } else if (is_var(p, "$h")) { q = obj->options.hostname; } else if (is_var(p, "$i")) { + if (afpmaster && xlatevolname) + return NULL; if (obj->proto == AFPPROTO_ASP) { ASP asp = obj->handle; @@ -280,12 +331,16 @@ static char *volxlate(AFPObj *obj, char *dest, size_t destlen, } else q = obj->options.hostname; } else if (obj->username && is_var(p, "$u")) { + if (afpmaster && xlatevolname) + return NULL; char* sep = NULL; if ( obj->options.ntseparator && (sep = strchr(obj->username, obj->options.ntseparator[0])) != NULL) q = sep+1; else q = obj->username; } else if (is_var(p, "$v")) { + if (afpmaster && xlatevolname) + return NULL; if (volname) { q = volname; } @@ -446,8 +501,6 @@ static void volset(struct vol_option *options, struct vol_option *save, options[VOLOPT_ROOTPREEXEC].i_value = 1; else if (strcasecmp(p, "upriv") == 0) options[VOLOPT_FLAGS].i_value |= AFPVOL_UNIX_PRIV; - else if (strcasecmp(p, "acls") == 0) - options[VOLOPT_FLAGS].i_value |= AFPVOL_ACLS; else if (strcasecmp(p, "nodev") == 0) options[VOLOPT_FLAGS].i_value |= AFPVOL_NODEV; else if (strcasecmp(p, "caseinsensitive") == 0) @@ -458,11 +511,10 @@ static void volset(struct vol_option *options, struct vol_option *save, options[VOLOPT_FLAGS].i_value &= ~AFPVOL_CACHE; else if (strcasecmp(p, "tm") == 0) options[VOLOPT_FLAGS].i_value |= AFPVOL_TM; -/* Found this in branch dir-rewrite, maybe we want to use it sometimes */ -#if 0 - else if (strcasecmp(p, "cdrom") == 0) - options[VOLOPT_FLAGS].i_value |= AFPVOL_CDROM | AFPVOL_RO; -#endif + else if (strcasecmp(p, "searchdb") == 0) + options[VOLOPT_FLAGS].i_value |= AFPVOL_SEARCHDB; + else if (strcasecmp(p, "nonetids") == 0) + options[VOLOPT_FLAGS].i_value |= AFPVOL_NONETIDS; p = strtok(NULL, ","); } @@ -530,9 +582,6 @@ static void volset(struct vol_option *options, struct vol_option *save, } else if (optionok(tmp, "volsizelimit:", val)) { options[VOLOPT_LIMITSIZE].i_value = (uint32_t)strtoul(val + 1, NULL, 10); - } else if (optionok(tmp, "uuid:", val)) { - setoption(options, save, VOLOPT_UUID, val); - } else { /* ignore unknown options */ LOG(log_debug, logtype_afpd, "ignoring unknown volume option: %s", tmp); @@ -567,6 +616,8 @@ static int creatvol(AFPObj *obj, struct passwd *pwd, char suffix[6]; /* max is #FFFF */ u_int16_t flags; + LOG(log_debug, logtype_afpd, "createvol: Volume '%s'", name); + if ( name == NULL || *name == '\0' ) { if ((name = strrchr( path, '/' )) == NULL) { return -1; /* Obviously not a fully qualified path */ @@ -607,7 +658,7 @@ static int creatvol(AFPObj *obj, struct passwd *pwd, if ( 0 >= ( u8mvlen = convert_string(CH_UTF8_MAC, CH_UCS2, tmpname, tmpvlen, u8mtmpname, AFPVOL_U8MNAMELEN*2)) ) return -1; - LOG(log_debug, logtype_afpd, "createvol: Volume '%s' -> UTF8-MAC Name: '%s'", name, tmpname); + LOG(log_maxdebug, logtype_afpd, "createvol: Volume '%s' -> UTF8-MAC Name: '%s'", name, tmpname); /* Maccharset Volume Name */ /* Firsty convert name from unixcharset to maccharset */ @@ -622,7 +673,14 @@ static int creatvol(AFPObj *obj, struct passwd *pwd, if ( (flags & CONV_REQMANGLE) || (tmpvlen > AFPVOL_MACNAMELEN)) { if (tmpvlen + suffixlen > AFPVOL_MACNAMELEN) { flags = CONV_FORCE; - tmpvlen = convert_charset(obj->options.unixcharset, obj->options.maccharset, 0, name, vlen, tmpname, AFPVOL_MACNAMELEN - suffixlen, &flags); + tmpvlen = convert_charset(obj->options.unixcharset, + obj->options.maccharset, + 0, + name, + vlen, + tmpname, + AFPVOL_MACNAMELEN - suffixlen, + &flags); tmpname[tmpvlen >= 0 ? tmpvlen : 0] = 0; } strcat(tmpname, suffix); @@ -630,14 +688,24 @@ static int creatvol(AFPObj *obj, struct passwd *pwd, } /* Secondly convert name from maccharset to UCS2 */ - if ( 0 >= ( macvlen = convert_string(obj->options.maccharset, CH_UCS2, tmpname, tmpvlen, mactmpname, AFPVOL_U8MNAMELEN*2)) ) + if ( 0 >= ( macvlen = convert_string(obj->options.maccharset, + CH_UCS2, + tmpname, + tmpvlen, + mactmpname, + AFPVOL_U8MNAMELEN*2)) ) return -1; - LOG(log_debug, logtype_afpd, "createvol: Volume '%s' -> Longname: '%s'", name, tmpname); + LOG(log_maxdebug, logtype_afpd, "createvol: Volume '%s' -> Longname: '%s'", name, tmpname); /* check duplicate */ for ( volume = Volumes; volume; volume = volume->v_next ) { - if (( strcasecmp_w( volume->v_u8mname, u8mtmpname ) == 0 ) || ( strcasecmp_w( volume->v_macname, mactmpname ) == 0 )){ + if ((utf8_encoding() && (strcasecmp_w(volume->v_u8mname, u8mtmpname) == 0)) + || + (!utf8_encoding() && (strcasecmp_w(volume->v_macname, mactmpname) == 0))) { + LOG (log_error, logtype_afpd, + "Duplicate volume name, check AppleVolumes files: previous: \"%s\", new: \"%s\"", + volume->v_localname, name); if (volume->v_deleted) { volume->v_new = hide = 1; } @@ -686,14 +754,16 @@ static int creatvol(AFPObj *obj, struct passwd *pwd, /* os X start at 1 and use network order ie. 1 2 3 */ volume->v_vid = ++lastvid; volume->v_vid = htons(volume->v_vid); +#ifdef HAVE_ACLS + if (check_vol_acl_support(volume)) + volume->v_flags |= AFPVOL_ACLS +; +#endif /* handle options */ if (options) { - /* should we casefold? */ volume->v_casefold = options[VOLOPT_CASEFOLD].i_value; - - /* shift in some flags */ - volume->v_flags = options[VOLOPT_FLAGS].i_value; + volume->v_flags |= options[VOLOPT_FLAGS].i_value; if (options[VOLOPT_EA_VFS].i_value) volume->v_vfs_ea = options[VOLOPT_EA_VFS].i_value; @@ -754,9 +824,6 @@ static int creatvol(AFPObj *obj, struct passwd *pwd, if (options[VOLOPT_LIMITSIZE].i_value) volume->v_limitsize = options[VOLOPT_LIMITSIZE].i_value; - if (options[VOLOPT_UUID].c_value) - volume->v_uuid = strdup(options[VOLOPT_UUID].c_value); - /* Mac to Unix conversion flags*/ volume->v_mtou_flags = 0; if (!(volume->v_flags & AFPVOL_NOHEX)) @@ -818,6 +885,19 @@ static int creatvol(AFPObj *obj, struct passwd *pwd, check_ea_sys_support(volume); initvol_vfs(volume); + /* get/store uuid from file in afpd master*/ + if ((parent_or_child == 0) && (volume->v_flags & AFPVOL_TM)) { + char *uuid = get_vol_uuid(obj, volume->v_localname); + if (!uuid) { + LOG(log_error, logtype_afpd, "Volume '%s': couldn't get UUID", + volume->v_localname); + } else { + volume->v_uuid = uuid; + LOG(log_debug, logtype_afpd, "Volume '%s': UUID '%s'", + volume->v_localname, volume->v_uuid); + } + } + volume->v_next = Volumes; Volumes = volume; return 0; @@ -1098,7 +1178,7 @@ static int volfile_changed(struct afp_volume_name *p) * TYPE [CREATOR] * */ -int readvolfile(AFPObj *obj, struct afp_volume_name *p1, char *p2, int user, struct passwd *pwent) +static int readvolfile(AFPObj *obj, struct afp_volume_name *p1, char *p2, int user, struct passwd *pwent) { FILE *fp; char path[MAXPATHLEN + 1]; @@ -1108,16 +1188,12 @@ int readvolfile(AFPObj *obj, struct afp_volume_name *p1, char *p2, int user, str char type[5], creator[5]; char *u, *p; int fd; - int afpmaster = 0; int i; struct passwd *pw; struct vol_option save_options[VOLOPT_NUM]; struct vol_option options[VOLOPT_NUM]; struct stat st; - if (! ((DSI *)obj->handle)->child) - afpmaster = 1; - if (!p1->name) return -1; p1->mtime = 0; @@ -1139,6 +1215,24 @@ int readvolfile(AFPObj *obj, struct afp_volume_name *p1, char *p2, int user, str p1->mtime = st.st_mtime; } + /* try putting a read lock on the volume file twice, sleep 1 second if first attempt fails */ + int retries = 2; + while (1) { + if ((read_lock(fd, 0, SEEK_SET, 0)) != 0) { + retries--; + if (!retries) { + LOG(log_error, logtype_afpd, "readvolfile: can't lock volume file \"%s\"", path); + if ( fclose( fp ) != 0 ) { + LOG(log_error, logtype_afpd, "readvolfile: fclose: %s", strerror(errno) ); + } + return -1; + } + sleep(1); + continue; + } + break; + } + memset(save_options, 0, sizeof(save_options)); /* Enable some default options for all volumes */ @@ -1148,6 +1242,8 @@ int readvolfile(AFPObj *obj, struct afp_volume_name *p1, char *p2, int user, str obj->options.umask); save_options[VOLOPT_UMASK].i_value = obj->options.umask; + LOG(log_debug, logtype_afpd, "readvolfile: \"%s\"", path); + while ( myfgets( buf, sizeof( buf ), fp ) != NULL ) { initline( strlen( buf ), buf ); parseline( sizeof( path ) - 1, path ); @@ -1196,30 +1292,13 @@ int readvolfile(AFPObj *obj, struct afp_volume_name *p1, char *p2, int user, str if (!pwent && obj->username) pwent = getpwnam(obj->username); - if (! afpmaster) - strcpy(tmp, path); - else - volxlate(obj, path, sizeof(path) - 1, tmp, pwent, NULL, NULL); + if (volxlate(obj, path, sizeof(path) - 1, tmp, pwent, NULL, NULL) == NULL) + continue; /* this is sort of braindead. basically, i want to be * able to specify things in any order, but i don't want to - * re-write everything. - * - * currently we have options: - * volname - * codepage:x - * casefold:x - * allow:x,y,@z - * deny:x,y,@z - * rwlist:x,y,@z - * rolist:x,y,@z - * options:prodos,crlf,noadouble,ro... - * dbpath:x - * password:x - * preexec:x - * - * namemask:x,y,!z (not implemented yet) - */ + * re-write everything. */ + memcpy(options, save_options, sizeof(options)); *volname = '\0'; @@ -1231,30 +1310,31 @@ int readvolfile(AFPObj *obj, struct afp_volume_name *p1, char *p2, int user, str volset(options, save_options, volname, sizeof(volname) - 1, tmp); } - /* check allow/deny lists: + /* check allow/deny lists (if not afpd master loading volumes for Zeroconf reg.): allow -> either no list (-1), or in list (1) deny -> either no list (-1), or not in list (0) */ - if (accessvol(options[VOLOPT_ALLOW].c_value, obj->username) && - (accessvol(options[VOLOPT_DENY].c_value, obj->username) < 1) && - hostaccessvol(VOLOPT_ALLOWED_HOSTS, volname, options[VOLOPT_ALLOWED_HOSTS].c_value, obj) && - (hostaccessvol(VOLOPT_DENIED_HOSTS, volname, options[VOLOPT_DENIED_HOSTS].c_value, obj) < 1)) { + if (parent_or_child == 0 + || + (accessvol(options[VOLOPT_ALLOW].c_value, obj->username) && + (accessvol(options[VOLOPT_DENY].c_value, obj->username) < 1) && + hostaccessvol(VOLOPT_ALLOWED_HOSTS, volname, options[VOLOPT_ALLOWED_HOSTS].c_value, obj) && + (hostaccessvol(VOLOPT_DENIED_HOSTS, volname, options[VOLOPT_DENIED_HOSTS].c_value, obj) < 1))) { /* handle read-only behaviour. semantics: * 1) neither the rolist nor the rwlist exist -> rw * 2) rolist exists -> ro if user is in it. * 3) rwlist exists -> ro unless user is in it. */ - if (((options[VOLOPT_FLAGS].i_value & AFPVOL_RO) == 0) && - ((accessvol(options[VOLOPT_ROLIST].c_value, - obj->username) == 1) || - !accessvol(options[VOLOPT_RWLIST].c_value, - obj->username))) + if (parent_or_child == 1 + && + ((options[VOLOPT_FLAGS].i_value & AFPVOL_RO) == 0) + && + ((accessvol(options[VOLOPT_ROLIST].c_value, obj->username) == 1) || + !accessvol(options[VOLOPT_RWLIST].c_value, obj->username))) options[VOLOPT_FLAGS].i_value |= AFPVOL_RO; /* do variable substitution for volname */ - if (!afpmaster) - strcpy(volname, tmp); - else - volxlate(obj, tmp, sizeof(tmp) - 1, volname, pwent, path, NULL); + if (volxlate(obj, tmp, sizeof(tmp) - 1, volname, pwent, path, NULL) == NULL) + continue; creatvol(obj, pwent, path, tmp, options, p2 != NULL); } @@ -1301,6 +1381,8 @@ static void volume_free(struct vol *vol) free(vol->v_forceuid); free(vol->v_forcegid); #endif /* FORCE_UIDGID */ + if (vol->v_uuid) + free(vol->v_uuid); } /* ------------------------------- */ @@ -1358,12 +1440,69 @@ static void volume_unlink(struct vol *volume) } } +static off_t getused_size; /* result of getused() */ + +/*! + nftw callback for getused() + */ +static int getused_stat(const char *path, + const struct stat *statp, + int tflag, + struct FTW *ftw) +{ + off_t low, high; + + if (tflag == FTW_F || tflag == FTW_D) { + getused_size += statp->st_blocks * 512; + } + + return 0; +} + +#define GETUSED_CACHETIME 5 +/*! + * Calculate used size of a volume with nftw + * + * The result is cached, we're try to avoid frequently calling nftw() + * + * 1) Call nftw an refresh if: + * 1a) - we're called the first time + * 1b) - volume modification date is not yet set and the last time we've been called is + * longer then 30 sec ago + * 1c) - the last volume modification is less then 30 sec old + * + * @param vol (r) volume to calculate + */ +static int getused(const struct vol *vol) +{ + static time_t vol_mtime = 0; + int ret = 0; + time_t now = time(NULL); + + if (!vol_mtime + || (!vol->v_mtime && ((vol_mtime + GETUSED_CACHETIME) < now)) + || (vol->v_mtime && ((vol_mtime + GETUSED_CACHETIME) < vol->v_mtime)) + ) { + vol_mtime = now; + getused_size = 0; + ret = nftw(vol->v_path, getused_stat, NULL, 20, FTW_PHYS); /* 2 */ + LOG(log_debug, logtype_afpd, "volparams: from nftw: %" PRIu64 " bytes", + getused_size); + } else { + LOG(log_debug, logtype_afpd, "volparams: cached used: %" PRIu64 " bytes", + getused_size); + } + + return ret; +} + static int getvolspace(struct vol *vol, u_int32_t *bfree, u_int32_t *btotal, VolSpace *xbfree, VolSpace *xbtotal, u_int32_t *bsize) { int spaceflag, rc; u_int32_t maxsize; + VolSpace used; #ifndef NO_QUOTA_SUPPORT VolSpace qfree, qtotal; #endif @@ -1402,10 +1541,13 @@ static int getvolspace(struct vol *vol, getvolspace_done: if (vol->v_limitsize) { - /* FIXME: Free could be limit minus (total minus used), */ - /* which will confuse the client less ? */ - *xbfree = min(*xbfree, (vol->v_limitsize * 1024 * 1024)); + if (getused(vol) != 0) + return AFPERR_MISC; + LOG(log_debug, logtype_afpd, "volparams: used on volume: %" PRIu64 " bytes", + getused_size); + *xbtotal = min(*xbtotal, (vol->v_limitsize * 1024 * 1024)); + *xbfree = min(*xbfree, *xbtotal < getused_size ? 0 : *xbtotal - getused_size); } *bfree = min( *xbfree, maxsize); @@ -1523,7 +1665,8 @@ static int getvolparams( u_int16_t bitmap, struct vol *vol, struct stat *st, cha ashort |= VOLPBIT_ATTR_UNIXPRIV; if (vol->v_flags & AFPVOL_TM) ashort |= VOLPBIT_ATTR_TM; - + if (vol->v_flags & AFPVOL_NONETIDS) + ashort |= VOLPBIT_ATTR_NONETIDS; if (afp_version >= 32) { if (vol->v_vfs_ea) ashort |= VOLPBIT_ATTR_EXT_ATTRS; @@ -1696,7 +1839,7 @@ void load_volumes(AFPObj *obj) free_volumes(); } - if (! ((DSI *)obj->handle)->child) { + if (parent_or_child == 0) { LOG(log_debug, logtype_afpd, "load_volumes: AFP MASTER"); } else { LOG(log_debug, logtype_afpd, "load_volumes: user: %s", obj->username); @@ -1731,7 +1874,7 @@ void load_volumes(AFPObj *obj) if ( obj->options.flags & OPTION_USERVOLFIRST ) { readvolfile(obj, &obj->options.systemvol, NULL, 0, pwent ); } - + if ( obj->options.closevol ) { struct vol *vol; @@ -1873,7 +2016,7 @@ static int volume_openDB(struct vol *volume) LOG(log_info, logtype_afpd, "CNID server: %s:%s", volume->v_cnidserver ? volume->v_cnidserver : Cnid_srv, volume->v_cnidport ? volume->v_cnidport : Cnid_port); - + #if 0 /* Found this in branch dir-rewrite, maybe we want to use it sometimes */ @@ -1896,7 +2039,7 @@ static int volume_openDB(struct vol *volume) } #endif - volume->v_cdb = cnid_open(volume->v_dbpath ? volume->v_dbpath : volume->v_path, + volume->v_cdb = cnid_open(volume->v_path, volume->v_umask, volume->v_cnidscheme, flags, @@ -1926,11 +2069,11 @@ static int volume_openDB(struct vol *volume) return (!volume->v_cdb)?-1:0; } -/* - Check if the underlying filesystem supports EAs for ea:sys volumes. - If not, switch to ea:ad. - As we can't check (requires write access) on ro-volumes, we switch ea:auto - volumes that are options:ro to ea:none. +/* + Check if the underlying filesystem supports EAs for ea:sys volumes. + If not, switch to ea:ad. + As we can't check (requires write access) on ro-volumes, we switch ea:auto + volumes that are options:ro to ea:none. */ static void check_ea_sys_support(struct vol *vol) { @@ -1941,7 +2084,7 @@ static void check_ea_sys_support(struct vol *vol) if (vol->v_vfs_ea == AFPVOL_EA_AUTO) { if ((vol->v_flags & AFPVOL_RO) == AFPVOL_RO) { - LOG(log_info, logtype_logger, "read-only volume '%s', can't test for EA support, disabling EAs", vol->v_localname); + LOG(log_info, logtype_afpd, "read-only volume '%s', can't test for EA support, disabling EAs", vol->v_localname); vol->v_vfs_ea = AFPVOL_EA_NONE; return; } @@ -1951,7 +2094,7 @@ static void check_ea_sys_support(struct vol *vol) process_uid = geteuid(); if (process_uid) if (seteuid(0) == -1) { - LOG(log_error, logtype_logger, "check_ea_sys_support: can't seteuid(0): %s", strerror(errno)); + LOG(log_error, logtype_afpd, "check_ea_sys_support: can't seteuid(0): %s", strerror(errno)); exit(EXITERR_SYS); } @@ -1966,7 +2109,7 @@ static void check_ea_sys_support(struct vol *vol) if (process_uid) { if (seteuid(process_uid) == -1) { - LOG(log_error, logtype_logger, "can't seteuid back %s", strerror(errno)); + LOG(log_error, logtype_afpd, "can't seteuid back %s", strerror(errno)); exit(EXITERR_SYS); } } @@ -2095,7 +2238,7 @@ int afp_openvol(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t if ((tmp = strdup(volume->v_path)) == NULL) { free(volume->v_path); return AFPERR_MISC; - } + } free(volume->v_path); volume->v_path = tmp; #endif @@ -2109,7 +2252,7 @@ int afp_openvol(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t * FIXME file size */ if (utf8_encoding()) { - volume->max_filename = 255; + volume->max_filename = UTF8FILELEN_EARLY; } else { volume->max_filename = MACFILELEN; @@ -2138,7 +2281,8 @@ int afp_openvol(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t volume, DIRDID_ROOT_PARENT, DIRDID_ROOT, - bfromcstr(volume->v_path)) + bfromcstr(volume->v_path), + &st) ) == NULL) { free(vol_mname); LOG(log_error, logtype_afpd, "afp_openvol(%s): malloc: %s", volume->v_path, strerror(errno) ); @@ -2146,7 +2290,6 @@ int afp_openvol(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t goto openvol_err; } free(vol_mname); - volume->v_root = dir; curdir = dir; @@ -2283,6 +2426,7 @@ int afp_closevol(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf _U_ } deletevol(vol); + current_vol = NULL; return( AFP_OK ); } @@ -2305,6 +2449,8 @@ struct vol *getvolbyvid(const u_int16_t vid ) set_uidgid ( vol ); #endif /* FORCE_UIDGID */ + current_vol = vol; + return( vol ); } @@ -2384,12 +2530,6 @@ void setvoltime(AFPObj *obj, struct vol *vol) { struct timeval tv; - /* just looking at vol->v_mtime is broken seriously since updates - * from other users afpd processes never are seen. - * This is not the most elegant solution (a shared memory between - * the afpd processes would come closer) - * [RS] */ - if ( gettimeofday( &tv, NULL ) < 0 ) { LOG(log_error, logtype_afpd, "setvoltime(%s): gettimeofday: %s", vol->v_path, strerror(errno) ); return; @@ -2562,7 +2702,7 @@ static int create_special_folder (const struct vol *vol, const struct _special_f free(q); return (-1); } - + ad_setname(&ad, folder->name); ad_getattr(&ad, &attr); @@ -2607,3 +2747,100 @@ void unload_volumes_and_extmap(void) free_extmap(); free_volumes(); } + +/* + * Get a volumes UUID from the config file. + * If there is none, it is generated and stored there. + * + * Returns pointer to allocated storage on success, NULL on error. + */ +static char *get_vol_uuid(const AFPObj *obj, const char *volname) +{ + char *volname_conf; + char buf[1024], uuid[UUID_PRINTABLE_STRING_LENGTH], *p; + FILE *fp; + struct stat tmpstat; + int fd; + + if ((fp = fopen(obj->options.uuidconf, "r")) != NULL) { /* read open? */ + /* scan in the conf file */ + while (fgets(buf, sizeof(buf), fp) != NULL) { + p = buf; + while (p && isblank(*p)) + p++; + if (!p || (*p == '#') || (*p == '\n')) + continue; /* invalid line */ + if (*p == '"') { + p++; + if ((volname_conf = strtok( p, "\"" )) == NULL) + continue; /* syntax error */ + } else { + if ((volname_conf = strtok( p, " \t" )) == NULL) + continue; /* syntax error: invalid name */ + } + p = strchr(p, '\0'); + p++; + if (*p == '\0') + continue; /* syntax error */ + + if (strcmp(volname, volname_conf) != 0) + continue; /* another volume name */ + + while (p && isblank(*p)) + p++; + + if (sscanf(p, "%36s", uuid) == 1 ) { + for (int i=0; uuid[i]; i++) + uuid[i] = toupper(uuid[i]); + LOG(log_debug, logtype_afpd, "get_uuid('%s'): UUID: '%s'", volname, uuid); + fclose(fp); + return strdup(uuid); + } + } + } + + if (fp) + fclose(fp); + + /* not found or no file, reopen in append mode */ + + if (stat(obj->options.uuidconf, &tmpstat)) { /* no file */ + if (( fd = creat(obj->options.uuidconf, 0644 )) < 0 ) { + LOG(log_error, logtype_afpd, "ERROR: Cannot create %s (%s).", + obj->options.uuidconf, strerror(errno)); + return NULL; + } + if (( fp = fdopen( fd, "w" )) == NULL ) { + LOG(log_error, logtype_afpd, "ERROR: Cannot fdopen %s (%s).", + obj->options.uuidconf, strerror(errno)); + close(fd); + return NULL; + } + } else if ((fp = fopen(obj->options.uuidconf, "a+")) == NULL) { /* not found */ + LOG(log_error, logtype_afpd, "Cannot create or append to %s (%s).", + obj->options.uuidconf, strerror(errno)); + return NULL; + } + fseek(fp, 0L, SEEK_END); + if(ftell(fp) == 0) { /* size = 0 */ + fprintf(fp, "# DON'T TOUCH NOR COPY THOUGHTLESSLY!\n"); + fprintf(fp, "# This file is auto-generated by afpd\n"); + fprintf(fp, "# and stores UUIDs for TM volumes.\n\n"); + } else { + fseek(fp, -1L, SEEK_END); + if(fgetc(fp) != '\n') fputc('\n', fp); /* last char is \n? */ + } + + /* generate uuid and write to file */ + atalk_uuid_t id; + const char *cp; + randombytes((void *)id, 16); + cp = uuid_bin2string(id); + + LOG(log_debug, logtype_afpd, "get_uuid('%s'): generated UUID '%s'", volname, cp); + + fprintf(fp, "\"%s\"\t%36s\n", volname, cp); + fclose(fp); + + return strdup(cp); +}