X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libatalk%2Futil%2Fnetatalk_conf.c;h=067ed45436781e08d38b23bd24518d1b96c12f55;hb=c7683d5aae3d154250df531a5d34e4a464b5ced2;hp=0c0a9416f0f60bb4c4948ee64f589d9ca5744ffc;hpb=18918d12c8d3f7936ef44d13e3113a7afc3ea943;p=netatalk.git diff --git a/libatalk/util/netatalk_conf.c b/libatalk/util/netatalk_conf.c index 0c0a9416..067ed454 100644 --- a/libatalk/util/netatalk_conf.c +++ b/libatalk/util/netatalk_conf.c @@ -402,7 +402,7 @@ static char *volxlate(const AFPObj *obj, * check access list * * this function wants something of the following form: - * "@group,name,name2,@group2,name3" or "@group name name2 @group2 name3" + * "@group,name,name2,@group2,name3". * A NULL argument allows everybody to have access. * We return three things: * -1: no list @@ -418,7 +418,7 @@ static int accessvol(const AFPObj *obj, const char *args, const char *name) return -1; strlcpy(buf, args, sizeof(buf)); - if ((p = strtok(buf, ", ")) == NULL) /* nothing, return okay */ + if ((p = strtok(buf, ",")) == NULL) /* nothing, return okay */ return -1; while (p) { @@ -549,7 +549,7 @@ EC_CLEANUP: * @param pwd (r) struct passwd of logged in user, may be NULL in master afpd * @param section (r) volume name wo variables expanded (exactly as in iniconfig) * @param name (r) volume name - * @param path (r) volume path + * @param path_in (r) volume path * @param preset (r) default preset, may be NULL * @returns vol on success, NULL on error */ @@ -557,39 +557,66 @@ static struct vol *creatvol(AFPObj *obj, const struct passwd *pwd, const char *section, const char *name, - const char *path, + const char *path_in, const char *preset) { EC_INIT; struct vol *volume = NULL; + size_t current_pathlen, another_pathlen; int i, suffixlen, vlen, tmpvlen, u8mvlen, macvlen; - char *tmpname; + char tmpname[AFPVOL_U8MNAMELEN+1]; + char path[MAXPATHLEN + 1]; ucs2_t u8mtmpname[(AFPVOL_U8MNAMELEN+1)*2], mactmpname[(AFPVOL_MACNAMELEN+1)*2]; char suffix[6]; /* max is #FFFF */ uint16_t flags; const char *val; char *p, *q; + strlcpy(path, path_in, MAXPATHLEN); + LOG(log_debug, logtype_afpd, "createvol(volume: '%s', path: \"%s\", preset: '%s'): BEGIN", name, path, preset ? preset : "-"); if ( name == NULL || *name == '\0' ) { - if ((name = strrchr( path, '/' )) == NULL) { + if ((name = strrchr( path, '/' )) == NULL) EC_FAIL; - } - /* if you wish to share /, you need to specify a name. */ if (*++name == '\0') EC_FAIL; } /* Once volumes are loaded, we never change options again, we just delete em when they're removed from afp.conf */ + + /* + * Check for duplicated or nested volumes, eg: + * /Volumes/name /Volumes/name [duplicate], and + * /Volumes/name /Volumes/name/dir [nested], but beware of simple strncmp test: + * /Volumes/name /Volumes/name1 [strncmp match if n=strlen("Volumes/name") -> false positive] + */ + current_pathlen = strlen(path); for (struct vol *vol = Volumes; vol; vol = vol->v_next) { - if (STRCMP(path, ==, vol->v_path)) { - LOG(log_debug, logtype_afpd, "createvol('%s'): already loaded", name); - vol->v_deleted = 0; - volume = vol; - goto EC_CLEANUP; + another_pathlen = strlen(vol->v_path); + if (strncmp(path, vol->v_path, MIN(current_pathlen, another_pathlen)) == 0) { + if (current_pathlen == another_pathlen) { + LOG(log_error, logtype_afpd, "volume \"%s\" paths is duplicated: \"%s\"", name, path); + vol->v_deleted = 0; + volume = vol; + goto EC_CLEANUP; + } else { + const char *shorter_path, *longer_path; + int shorter_len; + if (another_pathlen > current_pathlen) { + shorter_len = current_pathlen; + shorter_path = path; + longer_path = vol->v_path; + } else { + shorter_len = another_pathlen; + shorter_path = vol->v_path; + longer_path = path; + } + if (longer_path[shorter_len] == '/') + LOG(log_info, logtype_afpd, "volume \"%s\" paths are nested: \"%s\" and \"%s\"", name, path, vol->v_path); + } } } @@ -643,7 +670,7 @@ static struct vol *creatvol(AFPObj *obj, EC_NULL( volume->v_maccodepage = strdup(obj->options.maccodepage) ); vlen = strlen(name); - tmpname = strdup(name); + strlcpy(tmpname, name, sizeof(tmpname)); for(i = 0; i < vlen; i++) if(tmpname[i] == '/') tmpname[i] = ':'; @@ -867,10 +894,9 @@ static struct vol *creatvol(AFPObj *obj, EC_NULL( volume->v_localname = strdup(name) ); EC_NULL( volume->v_u8mname = strdup_w(u8mtmpname) ); EC_NULL( volume->v_macname = strdup_w(mactmpname) ); - EC_NULL( volume->v_path = malloc(strlen(path) + 1) ); - + EC_NULL( volume->v_path = strdup(path) ); + volume->v_name = utf8_encoding(obj) ? volume->v_u8mname : volume->v_macname; - strcpy(volume->v_path, path); #ifdef __svr4__ volume->v_qfd = -1; @@ -953,9 +979,9 @@ static int readvolfile(AFPObj *obj, const struct passwd *pwent) EC_INIT; static int regexerr = -1; static regex_t reg; - char path[MAXPATHLEN + 1]; + char *realvolpath; char volname[AFPVOL_U8MNAMELEN + 1]; - char tmp[MAXPATHLEN + 1]; + char path[MAXPATHLEN + 1], tmp[MAXPATHLEN + 1]; const char *preset, *default_preset, *p, *basedir; char *q, *u; int i; @@ -987,6 +1013,9 @@ static int readvolfile(AFPObj *obj, const struct passwd *pwent) /* no user home */ continue; + if ((realpath(pwent->pw_dir, tmp)) == NULL) + continue; + /* check if user home matches our "basedir regex" */ if ((basedir = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "basedir regex", NULL)) == NULL) { LOG(log_error, logtype_afpd, "\"basedir regex =\" must be defined in [Homes] section"); @@ -998,18 +1027,19 @@ static int readvolfile(AFPObj *obj, const struct passwd *pwent) char errbuf[1024]; regerror(regexerr, ®, errbuf, sizeof(errbuf)); LOG(log_debug, logtype_default, "readvolfile: bad basedir regex: %s", errbuf); + continue; } - if (regexec(®, pwent->pw_dir, 1, match, 0) == REG_NOMATCH) { - LOG(log_debug, logtype_default, "readvolfile: user home \"%s\" doesn't match basedir regex \"%s\"", - pwent->pw_dir, basedir); + if (regexec(®, tmp, 1, match, 0) == REG_NOMATCH) { + LOG(log_error, logtype_default, "readvolfile: user home \"%s\" doesn't match basedir regex \"%s\"", + tmp, basedir); continue; } - strlcpy(tmp, pwent->pw_dir, MAXPATHLEN); - strlcat(tmp, "/", MAXPATHLEN); - if (p = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "path", NULL)) + if (p = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "path", NULL)) { + strlcat(tmp, "/", MAXPATHLEN); strlcat(tmp, p, MAXPATHLEN); + } } else { /* Get path */ if ((p = iniparser_getstring(obj->iniconfig, secname, "path", NULL)) == NULL) @@ -1040,8 +1070,165 @@ static int readvolfile(AFPObj *obj, const struct passwd *pwent) preset = iniparser_getstring(obj->iniconfig, secname, "vol preset", NULL); - creatvol(obj, pwent, secname, volname, path, preset ? preset : default_preset ? default_preset : NULL); + if ((realvolpath = realpath_safe(path)) == NULL) + continue; + + creatvol(obj, pwent, secname, volname, realvolpath, preset ? preset : default_preset ? default_preset : NULL); + free(realvolpath); + } + +EC_CLEANUP: + EC_EXIT; +} + +static struct extmap *Extmap = NULL, *Defextmap = NULL; +static int Extmap_cnt; + +static int setextmap(char *ext, char *type, char *creator) +{ + EC_INIT; + struct extmap *em; + int cnt; + + if (Extmap == NULL) { + EC_NULL_LOG( Extmap = calloc(1, sizeof( struct extmap )) ); + } + + ext++; + + for (em = Extmap, cnt = 0; em->em_ext; em++, cnt++) + if ((strdiacasecmp(em->em_ext, ext)) == 0) + goto EC_CLEANUP; + + EC_NULL_LOG( Extmap = realloc(Extmap, sizeof(struct extmap) * (cnt + 2)) ); + (Extmap + cnt + 1)->em_ext = NULL; + em = Extmap + cnt; + + EC_NULL( em->em_ext = strdup(ext) ); + + if ( *type == '\0' ) { + memcpy(em->em_type, "\0\0\0\0", sizeof( em->em_type )); + } else { + memcpy(em->em_type, type, sizeof( em->em_type )); + } + if ( *creator == '\0' ) { + memcpy(em->em_creator, "\0\0\0\0", sizeof( em->em_creator )); + } else { + memcpy(em->em_creator, creator, sizeof( em->em_creator )); + } + +EC_CLEANUP: + EC_EXIT; +} + +/* -------------------------- */ +static int extmap_cmp(const void *map1, const void *map2) +{ + const struct extmap *em1 = map1; + const struct extmap *em2 = map2; + return strdiacasecmp(em1->em_ext, em2->em_ext); +} + +static void sortextmap( void) +{ + struct extmap *em; + + Extmap_cnt = 0; + if ((em = Extmap) == NULL) { + return; + } + while (em->em_ext) { + em++; + Extmap_cnt++; } + if (Extmap_cnt) { + qsort(Extmap, Extmap_cnt, sizeof(struct extmap), extmap_cmp); + if (*Extmap->em_ext == 0) { + /* the first line is really "." the default entry, + * we remove the leading '.' in setextmap + */ + Defextmap = Extmap; + } + } +} + +static void free_extmap( void) +{ + struct extmap *em; + + if (Extmap) { + for ( em = Extmap; em->em_ext; em++) { + free (em->em_ext); + } + free(Extmap); + Extmap = NULL; + Defextmap = Extmap; + Extmap_cnt = 0; + } +} + +static int ext_cmp_key(const void *key, const void *obj) +{ + const char *p = key; + const struct extmap *em = obj; + return strdiacasecmp(p, em->em_ext); +} + +struct extmap *getextmap(const char *path) +{ + char *p; + struct extmap *em; + + if (!Extmap_cnt || NULL == ( p = strrchr( path, '.' )) ) { + return( Defextmap ); + } + p++; + if (!*p) { + return( Defextmap ); + } + em = bsearch(p, Extmap, Extmap_cnt, sizeof(struct extmap), ext_cmp_key); + if (em) { + return( em ); + } else { + return( Defextmap ); + } +} + +struct extmap *getdefextmap(void) +{ + return( Defextmap ); +} + +static int readextmap(const char *file) +{ + EC_INIT; + FILE *fp; + char ext[256]; + char buf[256]; + char type[5], creator[5]; + + LOG(log_debug, logtype_afpd, "readextmap: loading \"%s\"", file); + + EC_NULL_LOGSTR( fp = fopen(file, "r"), "Couldn't open extension maping file %s", file); + + while (fgets(buf, sizeof(buf), fp) != NULL) { + initline(strlen(buf), buf); + parseline(sizeof(ext) - 1, ext); + + switch (ext[0]) { + case '.' : + parseline(sizeof(type) - 1, type); + parseline(sizeof(creator) - 1, creator); + setextmap(ext, type, creator); + LOG(log_debug, logtype_afpd, "readextmap: mapping: '%s' -> %s/%s", ext, type, creator); + break; + } + } + + sortextmap(); + EC_ZERO( fclose(fp) ); + + LOG(log_debug, logtype_afpd, "readextmap: done", file); EC_CLEANUP: EC_EXIT; @@ -1263,7 +1450,7 @@ struct vol *getvolbypath(AFPObj *obj, const char *path) const struct passwd *pw; char volname[AFPVOL_U8MNAMELEN + 1]; char abspath[MAXPATHLEN + 1]; - char volpath[MAXPATHLEN + 1]; + char volpath[MAXPATHLEN + 1], *realvolpath = NULL; char tmpbuf[MAXPATHLEN + 1]; const char *secname, *basedir, *p = NULL, *subpath = NULL, *subpathconfig; char *user = NULL, *prw; @@ -1344,9 +1531,11 @@ struct vol *getvolbypath(AFPObj *obj, const char *path) /* (6) */ if (subpathconfig = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "path", NULL)) { + /* if (!subpath || strncmp(subpathconfig, subpath, strlen(subpathconfig)) != 0) { EC_FAIL; } + */ strlcat(tmpbuf, subpathconfig, MAXPATHLEN); strlcat(tmpbuf, "/", MAXPATHLEN); } @@ -1354,29 +1543,32 @@ struct vol *getvolbypath(AFPObj *obj, const char *path) /* (7) */ if (volxlate(obj, volpath, sizeof(volpath) - 1, tmpbuf, pw, NULL, NULL) == NULL) - return NULL; + EC_FAIL; + EC_NULL( realvolpath = realpath_safe(volpath) ); EC_NULL( pw = getpwnam(user) ); - LOG(log_debug, logtype_afpd, "getvolbypath(\"%s\"): user: %s, homedir: %s => volpath: \"%s\"", - path, user, pw->pw_dir, volpath); + LOG(log_debug, logtype_afpd, "getvolbypath(\"%s\"): user: %s, homedir: %s => realvolpath: \"%s\"", + path, user, pw->pw_dir, realvolpath); /* do variable substitution for volume name */ p = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "home name", "$u's home"); if (strstr(p, "$u") == NULL) p = "$u's home"; strlcpy(tmpbuf, p, AFPVOL_U8MNAMELEN); - EC_NULL_LOG( volxlate(obj, volname, sizeof(volname) - 1, tmpbuf, pw, volpath, NULL) ); + EC_NULL_LOG( volxlate(obj, volname, sizeof(volname) - 1, tmpbuf, pw, realvolpath, NULL) ); const char *preset, *default_preset; default_preset = iniparser_getstring(obj->iniconfig, INISEC_GLOBAL, "vol preset", NULL); preset = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "vol preset", NULL); - vol = creatvol(obj, pw, INISEC_HOMES, volname, volpath, preset ? preset : default_preset ? default_preset : NULL); + vol = creatvol(obj, pw, INISEC_HOMES, volname, realvolpath, preset ? preset : default_preset ? default_preset : NULL); EC_CLEANUP: if (user) free(user); + if (realvolpath) + free(realvolpath); if (ret != 0) vol = NULL; return vol; @@ -1456,7 +1648,8 @@ int afp_config_parse(AFPObj *AFPObj, char *processname) /* figure out options w values */ options->loginmesg = iniparser_getstrdup(config, INISEC_GLOBAL, "login message", NULL); options->guest = iniparser_getstrdup(config, INISEC_GLOBAL, "guest account", "nobody"); - options->passwdfile = iniparser_getstrdup(config, INISEC_GLOBAL, "passwd file",_PATH_AFPDPWFILE); + options->extmapfile = iniparser_getstrdup(config, INISEC_GLOBAL, "extmap file", _PATH_CONFDIR "extmap.conf"); + options->passwdfile = iniparser_getstrdup(config, INISEC_GLOBAL, "passwd file", _PATH_AFPDPWFILE); options->uampath = iniparser_getstrdup(config, INISEC_GLOBAL, "uam path", _PATH_AFPDUAMPATH); options->uamlist = iniparser_getstrdup(config, INISEC_GLOBAL, "uam list", "uams_dhx.so uams_dhx2.so"); options->port = iniparser_getstrdup(config, INISEC_GLOBAL, "afp port", "548"); @@ -1587,6 +1780,11 @@ int afp_config_parse(AFPObj *AFPObj, char *processname) options->maccharset = CH_MAC; LOG(log_debug, logtype_afpd, "Global mac charset is %s", options->maccodepage); + if (readextmap(options->extmapfile) != 0) { + LOG(log_error, logtype_afpd, "Couldn't load extension -> type/creator mappings file \"%s\"", + options->extmapfile); + } + /* Check for sane values */ if (options->tickleval <= 0) options->tickleval = 30;