X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fvolume.c;h=a012dcd82eb38010d363ec5aee9a279ea8919c18;hb=745c25530d830676a2323835545b641a7ff9c59c;hp=c89d7e06e58c2ddd83b68b1b132dd39be2dd4649;hpb=a6b01b5eaa01a66269b613572b328b99cdb8eefe;p=netatalk.git diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c index c89d7e06..a012dcd8 100644 --- a/etc/afpd/volume.c +++ b/etc/afpd/volume.c @@ -36,8 +36,6 @@ char *strchr (), *strrchr (); #include #include -#include - #include #include #include @@ -46,7 +44,10 @@ char *strchr (), *strrchr (); #include #include #include -#include +#include +#include +#include + #ifdef CNID_DB #include #endif /* CNID_DB*/ @@ -59,6 +60,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); @@ -66,21 +68,13 @@ extern int afprun(int root, char *cmd, int *outfd); #define MIN(a, b) ((a) < (b) ? (a) : (b)) #endif /* ! MIN */ -#ifndef NO_LARGE_VOL_SUPPORT -#if BYTE_ORDER == BIG_ENDIAN -#define hton64(x) (x) -#define ntoh64(x) (x) -#else /* BYTE_ORDER == BIG_ENDIAN */ -#define hton64(x) ((u_int64_t) (htonl(((x) >> 32) & 0xffffffffLL)) | \ - (u_int64_t) ((htonl(x) & 0xffffffffLL) << 32)) -#define ntoh64(x) (hton64(x)) -#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"; @@ -161,6 +155,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) { @@ -222,7 +218,7 @@ static char *volxlate(AFPObj *obj, int afpmaster = 0; int xlatevolname = 0; - if (! ((DSI *)obj->handle)->child) + if (parent_or_child == 0) afpmaster = 1; if (path && !volname) @@ -491,8 +487,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) @@ -503,6 +497,8 @@ 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; + else if (strcasecmp(p, "searchdb") == 0) + options[VOLOPT_FLAGS].i_value |= AFPVOL_SEARCHDB; /* Found this in branch dir-rewrite, maybe we want to use it sometimes */ #if 0 else if (strcasecmp(p, "cdrom") == 0) @@ -609,6 +605,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 */ @@ -649,7 +647,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 */ @@ -675,11 +673,12 @@ static int creatvol(AFPObj *obj, struct passwd *pwd, 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 )){ + LOG (log_error, logtype_afpd, "ERROR: Volume name is duplicated. Check AppleVolumes files."); if (volume->v_deleted) { volume->v_new = hide = 1; } @@ -728,14 +727,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; @@ -859,11 +860,10 @@ static int creatvol(AFPObj *obj, struct passwd *pwd, /* get/store uuid from file */ if (volume->v_flags & AFPVOL_TM) { - char *uuid = get_uuid(obj, volume->v_localname); + char *uuid = get_vol_uuid(obj, volume->v_localname); if (!uuid) { - LOG(log_error, logtype_afpd, "Volume '%s': couldn't get UUID, disabling TM support", + LOG(log_error, logtype_afpd, "Volume '%s': couldn't get UUID", volume->v_localname); - volume->v_flags &= ~AFPVOL_TM; } else { volume->v_uuid = uuid; LOG(log_debug, logtype_afpd, "Volume '%s': UUID '%s'", @@ -1151,7 +1151,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]; @@ -1188,6 +1188,14 @@ int readvolfile(AFPObj *obj, struct afp_volume_name *p1, char *p2, int user, str p1->mtime = st.st_mtime; } + if ((read_lock(fd, 0, SEEK_SET, 0)) != 0) { + 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; + } + memset(save_options, 0, sizeof(save_options)); /* Enable some default options for all volumes */ @@ -1197,6 +1205,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 ); @@ -1263,23 +1273,26 @@ 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 */ @@ -1434,10 +1447,45 @@ 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)); + bstring cmdstr; + if ((cmdstr = bformat("du -sh \"%s\" 2> /dev/null | cut -f1", vol->v_path)) == NULL) + return AFPERR_MISC; + + FILE *cmd = popen(cfrombstr(cmdstr), "r"); + bdestroy(cmdstr); + if (cmd == NULL) + return AFPERR_MISC; + + char buf[100]; + fgets(buf, 100, cmd); + + if (pclose(cmd) == -1) + return AFPERR_MISC; + + size_t multi = 0; + if (buf[strlen(buf) - 2] == 'G' || buf[strlen(buf) - 2] == 'g') + /* GB */ + multi = 1024 * 1024 * 1024; + else if (buf[strlen(buf) - 2] == 'M' || buf[strlen(buf) - 2] == 'm') + /* MB */ + multi = 1024 * 1024; + else if (buf[strlen(buf) - 2] == 'K' || buf[strlen(buf) - 2] == 'k') + /* MB */ + multi = 1024; + + char *p; + if (p = strchr(buf, ',')) + /* ignore fraction */ + *p = 0; + else + /* remove G|M|K char */ + buf[strlen(buf) - 2] = 0; + /* now buf contains only digits */ + long long used = atoll(buf) * multi; + LOG(log_debug, logtype_afpd, "volparams: used on volume: %llu bytes", used); + *xbtotal = min(*xbtotal, (vol->v_limitsize * 1024 * 1024)); + *xbfree = min(*xbfree, *xbtotal < used ? 0 : *xbtotal - used); } *bfree = min( *xbfree, maxsize); @@ -1728,7 +1776,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); @@ -1928,7 +1976,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, @@ -1973,7 +2021,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; } @@ -1983,7 +2031,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); } @@ -1998,7 +2046,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); } } @@ -2141,7 +2189,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; @@ -2170,7 +2218,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.st_ctime) ) == NULL) { free(vol_mname); LOG(log_error, logtype_afpd, "afp_openvol(%s): malloc: %s", volume->v_path, strerror(errno) ); @@ -2178,7 +2227,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; @@ -2315,6 +2363,7 @@ int afp_closevol(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf _U_ } deletevol(vol); + current_vol = NULL; return( AFP_OK ); } @@ -2337,6 +2386,8 @@ struct vol *getvolbyvid(const u_int16_t vid ) set_uidgid ( vol ); #endif /* FORCE_UIDGID */ + current_vol = vol; + return( vol ); } @@ -2646,11 +2697,13 @@ void unload_volumes_and_extmap(void) * * Returns pointer to allocated storage on success, NULL on error. */ -char *get_uuid(const AFPObj *obj, const char *volname) +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 */ @@ -2680,6 +2733,8 @@ char *get_uuid(const AFPObj *obj, const char *volname) 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); @@ -2691,7 +2746,20 @@ char *get_uuid(const AFPObj *obj, const char *volname) fclose(fp); /* not found or no file, reopen in append mode */ - if ((fp = fopen(obj->options.uuidconf, "a+")) == NULL) { + + 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; @@ -2707,13 +2775,15 @@ char *get_uuid(const AFPObj *obj, const char *volname) } /* generate uuid and write to file */ - uuid_t id; - uuid_generate(id); - uuid_unparse(id, uuid); - LOG(log_debug, logtype_afpd, "get_uuid('%s'): generated UUID '%s'", volname, uuid); + 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, uuid); + fprintf(fp, "\"%s\"\t%36s\n", volname, cp); fclose(fp); - return strdup(uuid); + return strdup(cp); }