X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fvolume.c;h=2970bcc3b25e4ae343491f83951d7b0d4c302ec3;hb=be96d276348da0a7e66eeec844b306e8a5fa8fac;hp=bf90e9a6008997bde965d3dd053c6a8c945ffe71;hpb=e6a19801e7d0ad53350a396b4a7f3d5762d4fc1a;p=netatalk.git diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c index bf90e9a6..2970bcc3 100644 --- a/etc/afpd/volume.c +++ b/etc/afpd/volume.c @@ -14,31 +14,12 @@ #include #include #include -#ifdef HAVE_STRINGS_H -#include -#endif -/* STDC check */ -#if STDC_HEADERS #include -#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 */ #include #include #include #include -#include - -#include #include #include #include @@ -46,7 +27,9 @@ char *strchr (), *strrchr (); #include #include #include +#include #include + #ifdef CNID_DB #include #endif /* CNID_DB*/ @@ -59,6 +42,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); @@ -81,6 +65,9 @@ extern int afprun(int root, char *cmd, int *outfd); #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"; @@ -108,15 +95,7 @@ static void free_extmap(void); #define VOLOPT_MACCHARSET 16 #define VOLOPT_CNIDSCHEME 17 #define VOLOPT_ADOUBLE 18 /* adouble version */ - -#ifdef FORCE_UIDGID -#warning UIDGID -#include "uid.h" - -#define VOLOPT_FORCEUID 19 /* force uid for username x */ -#define VOLOPT_FORCEGID 20 /* force gid for group x */ -#endif /* FORCE_UIDGID */ - +/* Usable slot: 19/20 */ #define VOLOPT_UMASK 21 #define VOLOPT_ALLOWED_HOSTS 22 #define VOLOPT_DENIED_HOSTS 23 @@ -148,12 +127,7 @@ typedef struct _special_folder { static const _special_folder special_folders[] = { {"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 {NULL, 0, 0, 0}}; /* Forward declarations */ @@ -222,7 +196,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) @@ -265,22 +239,12 @@ static char *volxlate(AFPObj *obj, } else if (is_var(p, "$c")) { if (afpmaster && xlatevolname) return NULL; - if (obj->proto == AFPPROTO_ASP) { - ASP asp = obj->handle; - - len = sprintf(dest, "%u.%u", ntohs(asp->asp_sat.sat_addr.s_net), - asp->asp_sat.sat_addr.s_node); - dest += len; - destlen -= len; - - } else if (obj->proto == AFPPROTO_DSI) { - DSI *dsi = obj->handle; - len = sprintf(dest, "%s:%u", - getip_string((struct sockaddr *)&dsi->client), - getip_port((struct sockaddr *)&dsi->client)); - dest += len; - destlen -= len; - } + DSI *dsi = obj->handle; + len = sprintf(dest, "%s:%u", + getip_string((struct sockaddr *)&dsi->client), + getip_port((struct sockaddr *)&dsi->client)); + dest += len; + destlen -= len; } else if (is_var(p, "$d")) { if (afpmaster && xlatevolname) return NULL; @@ -302,17 +266,8 @@ static char *volxlate(AFPObj *obj, } else if (is_var(p, "$i")) { if (afpmaster && xlatevolname) return NULL; - 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) { - DSI *dsi = obj->handle; - q = getip_string((struct sockaddr *)&dsi->client); - } + DSI *dsi = obj->handle; + q = getip_string((struct sockaddr *)&dsi->client); } else if (is_var(p, "$s")) { if (obj->Obj) q = obj->Obj; @@ -441,16 +396,10 @@ static void volset(struct vol_option *options, struct vol_option *save, else if (strcasecmp(val + 1, "xlateupper") == 0) options[VOLOPT_CASEFOLD].i_value = AFPVOL_ULOWERMUPPER; } else if (optionok(tmp, "adouble:", val)) { - if (strcasecmp(val + 1, "v1") == 0) - options[VOLOPT_ADOUBLE].i_value = AD_VERSION1; -#if AD_VERSION == AD_VERSION2 - else if (strcasecmp(val + 1, "v2") == 0) + if (strcasecmp(val + 1, "v2") == 0) options[VOLOPT_ADOUBLE].i_value = AD_VERSION2; - else if (strcasecmp(val + 1, "osx") == 0) - options[VOLOPT_ADOUBLE].i_value = AD_VERSION2_OSX; - else if (strcasecmp(val + 1, "sfm") == 0) - options[VOLOPT_ADOUBLE].i_value = AD_VERSION1_SFM; -#endif + else if (strcasecmp(val + 1, "ea") == 0) + options[VOLOPT_ADOUBLE].i_value = AD_VERSION_EA; } else if (optionok(tmp, "options:", val)) { char *p; @@ -476,11 +425,6 @@ static void volset(struct vol_option *options, struct vol_option *save, options[VOLOPT_FLAGS].i_value |= AFPVOL_USEDOTS | AFPVOL_INV_DOTS; else if (strcasecmp(p, "limitsize") == 0) options[VOLOPT_FLAGS].i_value |= AFPVOL_LIMITSIZE; - /* support for either "dropbox" or "dropkludge" */ - else if (strcasecmp(p, "dropbox") == 0) - options[VOLOPT_FLAGS].i_value |= AFPVOL_DROPBOX; - else if (strcasecmp(p, "dropkludge") == 0) - options[VOLOPT_FLAGS].i_value |= AFPVOL_DROPBOX; else if (strcasecmp(p, "nofileid") == 0) options[VOLOPT_FLAGS].i_value |= AFPVOL_NOFILEID; else if (strcasecmp(p, "nostat") == 0) @@ -491,8 +435,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 +445,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) @@ -536,16 +480,6 @@ static void volset(struct vol_option *options, struct vol_option *save, options[VOLOPT_DFLTPERM].i_value = (int)strtol(val+1, NULL, 8); } else if (optionok(tmp, "password:", val)) { setoption(options, save, VOLOPT_PASSWORD, val); - -#ifdef FORCE_UIDGID - - /* this code allows forced uid/gid per volume settings */ - } else if (optionok(tmp, "forceuid:", val)) { - setoption(options, save, VOLOPT_FORCEUID, val); - } else if (optionok(tmp, "forcegid:", val)) { - setoption(options, save, VOLOPT_FORCEGID, val); - -#endif /* FORCE_UIDGID */ } else if (optionok(tmp, "root_preexec:", val)) { setoption(options, save, VOLOPT_ROOTPREEXEC, val); @@ -609,6 +543,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 +585,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,7 +611,7 @@ 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 ) { @@ -728,14 +664,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; @@ -820,19 +758,6 @@ static int creatvol(AFPObj *obj, struct passwd *pwd, if ((volume->v_flags & AFPVOL_EILSEQ)) volume->v_utom_flags |= CONV__EILSEQ; -#ifdef FORCE_UIDGID - if (options[VOLOPT_FORCEUID].c_value) { - volume->v_forceuid = strdup(options[VOLOPT_FORCEUID].c_value); - } else { - volume->v_forceuid = NULL; /* set as null so as to return 0 later on */ - } - - if (options[VOLOPT_FORCEGID].c_value) { - volume->v_forcegid = strdup(options[VOLOPT_FORCEGID].c_value); - } else { - volume->v_forcegid = NULL; /* set as null so as to return 0 later on */ - } -#endif if (!user) { if (options[VOLOPT_PREEXEC].c_value) volume->v_preexec = volxlate(obj, NULL, MAXPATHLEN, options[VOLOPT_PREEXEC].c_value, pwd, path, name); @@ -1196,6 +1121,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 ); @@ -1262,23 +1189,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 */ @@ -1326,10 +1256,6 @@ static void volume_free(struct vol *vol) free(vol->v_cnidscheme); free(vol->v_dbpath); free(vol->v_gvs); -#ifdef FORCE_UIDGID - free(vol->v_forceuid); - free(vol->v_forcegid); -#endif /* FORCE_UIDGID */ if (vol->v_uuid) free(vol->v_uuid); } @@ -1485,7 +1411,7 @@ static int getvolparams( u_int16_t bitmap, struct vol *vol, struct stat *st, cha * .Parent file here if it doesn't exist. */ ad_init(&ad, vol->v_adouble, vol->v_ad_options); - if ( ad_open_metadata( vol->v_path, ADFLAGS_DIR, O_CREAT, &ad) < 0 ) { + if (ad_open(&ad, vol->v_path, ADFLAGS_HF | ADFLAGS_DIR, O_RDWR | O_CREAT, 0666) != 0 ) { isad = 0; vol->v_ctime = AD_DATE_FROM_UNIX(st->st_mtime); @@ -1616,21 +1542,13 @@ static int getvolparams( u_int16_t bitmap, struct vol *vol, struct stat *st, cha #ifndef NO_LARGE_VOL_SUPPORT case VOLPBIT_XBFREE : xbfree = hton64( xbfree ); -#if defined(__GNUC__) && defined(HAVE_GCC_MEMCPY_BUG) - bcopy(&xbfree, data, sizeof(xbfree)); -#else /* __GNUC__ && HAVE_GCC_MEMCPY_BUG */ memcpy(data, &xbfree, sizeof( xbfree )); -#endif /* __GNUC__ && HAVE_GCC_MEMCPY_BUG */ data += sizeof( xbfree ); break; case VOLPBIT_XBTOTAL : xbtotal = hton64( xbtotal ); -#if defined(__GNUC__) && defined(HAVE_GCC_MEMCPY_BUG) - bcopy(&xbtotal, data, sizeof(xbtotal)); -#else /* __GNUC__ && HAVE_GCC_MEMCPY_BUG */ memcpy(data, &xbtotal, sizeof( xbtotal )); -#endif /* __GNUC__ && HAVE_GCC_MEMCPY_BUG */ data += sizeof( xbfree ); break; #endif /* ! NO_LARGE_VOL_SUPPORT */ @@ -1727,7 +1645,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); @@ -1927,7 +1845,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, @@ -2072,9 +1990,6 @@ int afp_openvol(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t if (( volume->v_flags & AFPVOL_OPEN ) ) { /* the volume is already open */ -#ifdef FORCE_UIDGID - set_uidgid ( volume ); -#endif return stat_vol(bitmap, volume, rbuf, rbuflen); } @@ -2085,10 +2000,6 @@ int afp_openvol(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t } } -#ifdef FORCE_UIDGID - set_uidgid ( volume ); -#endif - if (volume->v_preexec) { if ((ret = afprun(0, volume->v_preexec, NULL)) && volume->v_preexec_close) { LOG(log_error, logtype_afpd, "afp_openvol(%s): preexec : %d", volume->v_path, ret ); @@ -2169,7 +2080,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) ); @@ -2177,7 +2089,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; @@ -2314,6 +2225,7 @@ int afp_closevol(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf _U_ } deletevol(vol); + current_vol = NULL; return( AFP_OK ); } @@ -2332,9 +2244,7 @@ struct vol *getvolbyvid(const u_int16_t vid ) return( NULL ); } -#ifdef FORCE_UIDGID - set_uidgid ( vol ); -#endif /* FORCE_UIDGID */ + current_vol = vol; return( vol ); } @@ -2492,8 +2402,7 @@ int afp_setvolparams(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf return AFPERR_BITMAP; ad_init(&ad, vol->v_adouble, vol->v_ad_options); - if ( ad_open( vol->v_path, ADFLAGS_HF|ADFLAGS_DIR, O_RDWR, - 0666, &ad) < 0 ) { + if ( ad_open(&ad, vol->v_path, ADFLAGS_HF|ADFLAGS_DIR, O_RDWR) < 0 ) { if (errno == EROFS) return AFPERR_VLOCK; @@ -2588,8 +2497,8 @@ static int create_special_folder (const struct vol *vol, const struct _special_f if ( !ret && folder->hide) { /* Hide it */ ad_init(&ad, vol->v_adouble, vol->v_ad_options); - if (ad_open_metadata( p, ADFLAGS_DIR, O_CREAT, &ad) < 0) { - free (p); + if (ad_open(&ad, p, ADFLAGS_HF | ADFLAGS_DIR, O_RDWR | O_CREAT, 0666) != 0) { + free(p); free(q); return (-1); } @@ -2723,14 +2632,14 @@ 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); - for (int i=0; uuid[i]; i++) - uuid[i] = toupper(uuid[i]); - LOG(log_debug, logtype_afpd, "get_uuid('%s'): generated UUID '%s'", volname, uuid); - - fprintf(fp, "\"%s\"\t%36s\n", 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, cp); fclose(fp); return strdup(uuid);