X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fvolume.c;h=d998124fe92924c79455c14244810e3f58d7d6c4;hb=5ecacc30626d9f4bfac435a7df79a0b54ae7742d;hp=faf142c402bbe21c99029b135cfc3f23f8ed8a14;hpb=bea0c55cc833ccc859c8a9413d52af5c61cf3593;p=netatalk.git diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c index faf142c4..d998124f 100644 --- a/etc/afpd/volume.c +++ b/etc/afpd/volume.c @@ -52,6 +52,7 @@ char *strchr (), *strrchr (); #include #include #include +#include #ifdef CNID_DB #include @@ -145,10 +146,10 @@ typedef struct _special_folder { } _special_folder; static const _special_folder special_folders[] = { +#if 0 {"Network Trash Folder", 1, 0777, 1}, {"Temporary Items", 1, 0777, 1}, {".AppleDesktop", 1, 0777, 0}, -#if 0 {"TheFindByContentFolder", 0, 0, 1}, {"TheVolumeSettingsFolder", 0, 0, 1}, #endif @@ -265,6 +266,7 @@ static char *volxlate(AFPObj *obj, } else if (is_var(p, "$c")) { if (afpmaster && xlatevolname) return NULL; +#ifndef NO_DDP if (obj->proto == AFPPROTO_ASP) { ASP asp = obj->handle; @@ -273,7 +275,9 @@ static char *volxlate(AFPObj *obj, dest += len; destlen -= len; - } else if (obj->proto == AFPPROTO_DSI) { + } +#endif + if (obj->proto == AFPPROTO_DSI) { DSI *dsi = obj->handle; len = sprintf(dest, "%s:%u", getip_string((struct sockaddr *)&dsi->client), @@ -302,14 +306,16 @@ static char *volxlate(AFPObj *obj, } else if (is_var(p, "$i")) { if (afpmaster && xlatevolname) return NULL; +#ifndef NO_DDP if (obj->proto == AFPPROTO_ASP) { ASP asp = obj->handle; - len = sprintf(dest, "%u", ntohs(asp->asp_sat.sat_addr.s_net)); dest += len; destlen -= len; - } else if (obj->proto == AFPPROTO_DSI) { + } +#endif + if (obj->proto == AFPPROTO_DSI) { DSI *dsi = obj->handle; q = getip_string((struct sockaddr *)&dsi->client); } @@ -420,7 +426,7 @@ static void volset(struct vol_option *options, struct vol_option *save, setoption(options, save, VOLOPT_ROLIST, val); } else if (optionok(tmp, "codepage:", val)) { - LOG (log_error, logtype_afpd, "The old codepage system has been removed. Please make sure to read the documentation !!!!"); + LOG (log_error, logtype_afpd, "The old codepage system has been removed. Please make sure to read the documentation!"); /* Make sure we don't screw anything */ exit (EXITERR_CONF); } else if (optionok(tmp, "volcharset:", val)) { @@ -505,6 +511,8 @@ static void volset(struct vol_option *options, struct vol_option *save, options[VOLOPT_FLAGS].i_value |= AFPVOL_SEARCHDB; else if (strcasecmp(p, "nonetids") == 0) options[VOLOPT_FLAGS].i_value |= AFPVOL_NONETIDS; + else if (strcasecmp(p, "noacls") == 0) + options[VOLOPT_FLAGS].i_value &= ~AFPVOL_ACLS; p = strtok(NULL, ","); } @@ -745,9 +753,10 @@ static int creatvol(AFPObj *obj, struct passwd *pwd, 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 -; + if (!check_vol_acl_support(volume)) { + LOG(log_debug, logtype_afpd, "creatvol(\"%s\"): disabling ACL support", volume->v_path); + options[VOLOPT_FLAGS].i_value &= ~AFPVOL_ACLS; + } #endif /* handle options */ @@ -1181,6 +1190,7 @@ static int readvolfile(AFPObj *obj, struct afp_volume_name *p1, char *p2, int us int i; struct passwd *pw; struct vol_option save_options[VOLOPT_NUM]; + struct vol_option default_options[VOLOPT_NUM]; struct vol_option options[VOLOPT_NUM]; struct stat st; @@ -1223,14 +1233,18 @@ static int readvolfile(AFPObj *obj, struct afp_volume_name *p1, char *p2, int us break; } - memset(save_options, 0, sizeof(save_options)); + memset(default_options, 0, sizeof(default_options)); /* Enable some default options for all volumes */ - save_options[VOLOPT_FLAGS].i_value |= AFPVOL_CACHE; - save_options[VOLOPT_EA_VFS].i_value = AFPVOL_EA_AUTO; + default_options[VOLOPT_FLAGS].i_value |= AFPVOL_CACHE; +#ifdef HAVE_ACLS + default_options[VOLOPT_FLAGS].i_value |= AFPVOL_ACLS; +#endif + default_options[VOLOPT_EA_VFS].i_value = AFPVOL_EA_AUTO; LOG(log_maxdebug, logtype_afpd, "readvolfile: seeding default umask: %04o", obj->options.umask); - save_options[VOLOPT_UMASK].i_value = obj->options.umask; + default_options[VOLOPT_UMASK].i_value = obj->options.umask; + memcpy(save_options, default_options, sizeof(options)); LOG(log_debug, logtype_afpd, "readvolfile: \"%s\"", path); @@ -1245,12 +1259,14 @@ static int readvolfile(AFPObj *obj, struct afp_volume_name *p1, char *p2, int us case ':': /* change the default options for this file */ if (strncmp(path, VOLOPT_DEFAULT, VOLOPT_DEFAULT_LEN) == 0) { + volfree(default_options, save_options); + memcpy(default_options, save_options, sizeof(options)); *tmp = '\0'; for (i = 0; i < VOLOPT_NUM; i++) { if (parseline( sizeof( path ) - VOLOPT_DEFAULT_LEN - 1, path + VOLOPT_DEFAULT_LEN) < 0) break; - volset(save_options, NULL, tmp, sizeof(tmp) - 1, + volset(default_options, NULL, tmp, sizeof(tmp) - 1, path + VOLOPT_DEFAULT_LEN); } } @@ -1289,7 +1305,7 @@ static int readvolfile(AFPObj *obj, struct afp_volume_name *p1, char *p2, int us * able to specify things in any order, but i don't want to * re-write everything. */ - memcpy(options, save_options, sizeof(options)); + memcpy(options, default_options, sizeof(options)); *volname = '\0'; /* read in up to VOLOP_NUM possible options */ @@ -1297,7 +1313,7 @@ static int readvolfile(AFPObj *obj, struct afp_volume_name *p1, char *p2, int us if (parseline( sizeof( tmp ) - 1, tmp ) < 0) break; - volset(options, save_options, volname, sizeof(volname) - 1, tmp); + volset(options, default_options, volname, sizeof(volname) - 1, tmp); } /* check allow/deny lists (if not afpd master loading volumes for Zeroconf reg.): @@ -1328,7 +1344,7 @@ static int readvolfile(AFPObj *obj, struct afp_volume_name *p1, char *p2, int us creatvol(obj, pwent, path, tmp, options, p2 != NULL); } - volfree(options, save_options); + volfree(options, default_options); break; case '.' : @@ -1429,64 +1445,153 @@ static void volume_unlink(struct vol *volume) } } } - -static off_t getused_size; /* result of getused() */ - /*! - nftw callback for getused() + * Read band-size info from Info.plist XML file of an TM sparsebundle + * + * @param path (r) path to Info.plist file + * @return band-size in bytes, -1 on error */ -static int getused_stat(const char *path, - const struct stat *statp, - int tflag, - struct FTW *ftw) +static long long int get_tm_bandsize(const char *path) { - off_t low, high; + EC_INIT; + FILE *file = NULL; + char buf[512]; + long long int bandsize = -1; + + EC_NULL_LOGSTR( file = fopen(path, "r"), + "get_tm_bandsize(\"%s\"): %s", + path, strerror(errno) ); - if (tflag == FTW_F || tflag == FTW_D) { - getused_size += statp->st_blocks * 512; + while (fgets(buf, sizeof(buf), file) != NULL) { + if (strstr(buf, "band-size") == NULL) + continue; + + if (fscanf(file, " %lld", &bandsize) != 1) { + LOG(log_error, logtype_afpd, "get_tm_bandsize(\"%s\"): can't parse band-size", path); + EC_FAIL; + } + break; } - return 0; +EC_CLEANUP: + if (file) + fclose(file); + LOG(log_debug, logtype_afpd, "get_tm_bandsize(\"%s\"): bandsize: %lld", path, bandsize); + return bandsize; +} + +/*! + * Return number on entries in a directory + * + * @param path (r) path to dir + * @return number of entries, -1 on error + */ +static long long int get_tm_bands(const char *path) +{ + EC_INIT; + long long int count = 0; + DIR *dir = NULL; + const struct dirent *entry; + + EC_NULL( dir = opendir(path) ); + + while ((entry = readdir(dir)) != NULL) + count++; + count -= 2; /* All OSens I'm aware of return "." and "..", so just substract them, avoiding string comparison in loop */ + +EC_CLEANUP: + if (dir) + closedir(dir); + if (ret != 0) + return -1; + return count; } -#define GETUSED_CACHETIME 5 /*! - * Calculate used size of a volume with nftw + * Calculate used size of a TimeMachine volume * - * The result is cached, we're try to avoid frequently calling nftw() + * This assumes that the volume is used only for TimeMachine. * - * 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 + * 1) readdir(path of volume) + * 2) for every element that matches regex "\(.*\)\.sparsebundle$" : + * 3) parse "\1.sparsebundle/Info.plist" and read the band-size XML key integer value + * 4) readdir "\1.sparsebundle/bands/" counting files + * 5) calculate used size as: (file_count - 1) * band-size + * + * The result of the calculation is returned in "volume->v_tm_used". + * "volume->v_appended" gets reset to 0. + * "volume->v_tm_cachetime" is updated with the current time from time(NULL). + * + * "volume->v_tm_used" is cached for TM_USED_CACHETIME seconds and updated by + * "volume->v_appended". The latter is increased by X every time the client + * appends X bytes to a file (in fork.c). * * @param vol (rw) volume to calculate + * @return 0 on success, -1 on error */ -static int getused(struct vol *vol) +#define TM_USED_CACHETIME 60 /* cache for 60 seconds */ +static int get_tm_used(struct vol * restrict vol) { - static time_t vol_mtime = 0; - int ret = 0; + EC_INIT; + long long int bandsize; + VolSpace used = 0; + bstring infoplist = NULL; + bstring bandsdir = NULL; + DIR *dir = NULL; + const struct dirent *entry; + const char *p; + struct stat st; + long int links; 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; - vol->v_written = 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 { - getused_size += vol->v_written; - vol->v_written = 0; - LOG(log_debug, logtype_afpd, "volparams: cached used: %" PRIu64 " bytes", - getused_size); + if (vol->v_tm_cachetime + && ((vol->v_tm_cachetime + TM_USED_CACHETIME) >= now)) { + if (vol->v_tm_used == -1) + EC_FAIL; + vol->v_tm_used += vol->v_appended; + vol->v_appended = 0; + LOG(log_debug, logtype_afpd, "getused(\"%s\"): cached: %" PRIu64 " bytes", + vol->v_path, vol->v_tm_used); + return 0; } - return ret; + vol->v_tm_cachetime = now; + + EC_NULL( dir = opendir(vol->v_path) ); + + while ((entry = readdir(dir)) != NULL) { + if (((p = strstr(entry->d_name, "sparsebundle")) != NULL) + && (strlen(entry->d_name) == (p + strlen("sparsebundle") - entry->d_name))) { + + EC_NULL_LOG( infoplist = bformat("%s/%s/%s", vol->v_path, entry->d_name, "Info.plist") ); + + if ((bandsize = get_tm_bandsize(cfrombstr(infoplist))) == -1) + continue; + + EC_NULL_LOG( bandsdir = bformat("%s/%s/%s/", vol->v_path, entry->d_name, "bands") ); + + if ((links = get_tm_bands(cfrombstr(bandsdir))) == -1) + continue; + + used += (links - 1) * bandsize; + LOG(log_debug, logtype_afpd, "getused(\"%s\"): bands: %" PRIu64 " bytes", + cfrombstr(bandsdir), used); + } + } + + vol->v_tm_used = used; + +EC_CLEANUP: + if (infoplist) + bdestroy(infoplist); + if (bandsdir) + bdestroy(bandsdir); + if (dir) + closedir(dir); + + LOG(log_debug, logtype_afpd, "getused(\"%s\"): %" PRIu64 " bytes", vol->v_path, vol->v_tm_used); + + EC_EXIT; } static int getvolspace(struct vol *vol, @@ -1519,13 +1624,12 @@ static int getvolspace(struct vol *vol, return( rc ); } -#define min(a,b) ((a)<(b)?(a):(b)) #ifndef NO_QUOTA_SUPPORT if ( spaceflag == AFPVOL_NONE || spaceflag == AFPVOL_UQUOTA ) { if ( uquota_getvolspace( vol, &qfree, &qtotal, *bsize ) == AFP_OK ) { vol->v_flags = ( ~AFPVOL_GVSMASK & vol->v_flags ) | AFPVOL_UQUOTA; - *xbfree = min(*xbfree, qfree); - *xbtotal = min( *xbtotal, qtotal); + *xbfree = MIN(*xbfree, qfree); + *xbtotal = MIN(*xbtotal, qtotal); goto getvolspace_done; } } @@ -1534,18 +1638,19 @@ static int getvolspace(struct vol *vol, getvolspace_done: if (vol->v_limitsize) { - if (getused(vol) != 0) + if (get_tm_used(vol) != 0) return AFPERR_MISC; - LOG(log_debug, logtype_afpd, "volparams: used on volume: %" PRIu64 " bytes", - getused_size); - vol->v_tm_used = getused_size; - *xbtotal = min(*xbtotal, (vol->v_limitsize * 1024 * 1024)); - *xbfree = min(*xbfree, *xbtotal < getused_size ? 0 : *xbtotal - getused_size); + *xbtotal = MIN(*xbtotal, (vol->v_limitsize * 1024 * 1024)); + *xbfree = MIN(*xbfree, *xbtotal < vol->v_tm_used ? 0 : *xbtotal - vol->v_tm_used); + + LOG(log_debug, logtype_afpd, + "volparams: total: %" PRIu64 ", used: %" PRIu64 ", free: %" PRIu64 " bytes", + *xbtotal, vol->v_tm_used, *xbfree); } - *bfree = min( *xbfree, maxsize); - *btotal = min( *xbtotal, maxsize); + *bfree = MIN(*xbfree, maxsize); + *btotal = MIN(*xbtotal, maxsize); return( AFP_OK ); } @@ -1560,7 +1665,7 @@ void vol_fce_tm_event(void) last = now; for ( ; vol; vol = vol->v_next ) { if (vol->v_flags & AFPVOL_TM) - (void)fce_register_tm_size(vol->v_path, vol->v_tm_used + vol->v_written); + (void)fce_register_tm_size(vol->v_path, vol->v_tm_used + vol->v_appended); } } } @@ -1924,7 +2029,7 @@ int afp_getsrvrparms(AFPObj *obj, char *ibuf _U_, size_t ibuflen _U_, char *rbuf if (!S_ISDIR(st.st_mode)) { continue; /* not a dir */ } - accessmode(volume->v_path, &ma, NULL, &st); + accessmode(volume, volume->v_path, &ma, NULL, &st); if ((ma.ma_user & (AR_UREAD | AR_USEARCH)) != (AR_UREAD | AR_USEARCH)) { continue; /* no r-x access */ } @@ -2311,14 +2416,13 @@ int afp_openvol(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t } ret = stat_vol(bitmap, volume, rbuf, rbuflen); + if (ret == AFP_OK) { + handle_special_folders(volume); + savevolinfo(volume, + volume->v_cnidserver ? volume->v_cnidserver : Cnid_srv, + volume->v_cnidport ? volume->v_cnidport : Cnid_port); - if (!(volume->v_flags & AFPVOL_RO)) { - handle_special_folders( volume ); - savevolinfo(volume, - volume->v_cnidserver ? volume->v_cnidserver : Cnid_srv, - volume->v_cnidport ? volume->v_cnidport : Cnid_port); - } /* * If you mount a volume twice, the second time the trash appears on @@ -2737,13 +2841,25 @@ static int create_special_folder (const struct vol *vol, const struct _special_f static void handle_special_folders (const struct vol * vol) { const _special_folder *p = &special_folders[0]; + uid_t process_uid; - if ((vol->v_flags & AFPVOL_RO)) - return; + process_uid = geteuid(); + if (process_uid) { + if (seteuid(0) == -1) { + process_uid = 0; + } + } for (; p->name != NULL; p++) { create_special_folder (vol, p); } + + if (process_uid) { + if (seteuid(process_uid) == -1) { + LOG(log_error, logtype_logger, "can't seteuid back %s", strerror(errno)); + exit(EXITERR_SYS); + } + } } const struct vol *getvolumes(void)