X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libatalk%2Futil%2Fnetatalk_conf.c;h=fd7ebfd124777e99af77c2748f4f59ca7814e319;hb=107515dc545426fd81fee053243e02113f28cb8c;hp=67979236796a8b4a0f7b266400722148a22ee685;hpb=db568ec6e05d9b7a5274b7d9a2338eaa146eb867;p=netatalk.git diff --git a/libatalk/util/netatalk_conf.c b/libatalk/util/netatalk_conf.c index 67979236..fd7ebfd1 100644 --- a/libatalk/util/netatalk_conf.c +++ b/libatalk/util/netatalk_conf.c @@ -564,7 +564,7 @@ static struct vol *creatvol(AFPObj *obj, 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 */ @@ -572,10 +572,7 @@ static struct vol *creatvol(AFPObj *obj, const char *val; char *p, *q; - /* Ensure the path is '/' terminated */ strlcpy(path, path_in, MAXPATHLEN); - if (path[strlen(path) - 1] != '/') - strlcat(path, "/", MAXPATHLEN); LOG(log_debug, logtype_afpd, "createvol(volume: '%s', path: \"%s\", preset: '%s'): BEGIN", name, path, preset ? preset : "-"); @@ -590,7 +587,12 @@ static struct vol *creatvol(AFPObj *obj, /* 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 */ + /* + * 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) { another_pathlen = strlen(vol->v_path); @@ -601,7 +603,19 @@ static struct vol *creatvol(AFPObj *obj, volume = vol; goto EC_CLEANUP; } else { - LOG(log_note, logtype_afpd, "volume \"%s\" paths are nested: \"%s\" and \"%s\"", name, path, vol->v_path); + 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); } } } @@ -656,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] = ':'; @@ -965,10 +979,9 @@ static int readvolfile(AFPObj *obj, const struct passwd *pwent) EC_INIT; static int regexerr = -1; static regex_t reg; - char *realpw_dir; char *realvolpath; char volname[AFPVOL_U8MNAMELEN + 1]; - char tmp[MAXPATHLEN + 1], tmp2[MAXPATHLEN + 1]; + char path[MAXPATHLEN + 1], tmp[MAXPATHLEN + 1]; const char *preset, *default_preset, *p, *basedir; char *q, *u; int i; @@ -999,7 +1012,8 @@ static int readvolfile(AFPObj *obj, const struct passwd *pwent) if (pwent->pw_dir == NULL || STRCMP("", ==, pwent->pw_dir)) /* no user home */ continue; - if ((realpw_dir = realpath_safe(pwent->pw_dir)) == NULL) + + if ((realpath(pwent->pw_dir, tmp)) == NULL) continue; /* check if user home matches our "basedir regex" */ @@ -1013,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(®, realpw_dir, 1, match, 0) == REG_NOMATCH) { - LOG(log_debug, logtype_default, "readvolfile: user home \"%s\" doesn't match basedir regex \"%s\"", - realpw_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, realpw_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) @@ -1032,7 +1047,7 @@ static int readvolfile(AFPObj *obj, const struct passwd *pwent) strlcpy(tmp, p, MAXPATHLEN); } - if (volxlate(obj, tmp2, sizeof(tmp2) - 1, tmp, pwent, NULL, NULL) == NULL) + if (volxlate(obj, path, sizeof(path) - 1, tmp, pwent, NULL, NULL) == NULL) continue; /* do variable substitution for volume name */ @@ -1050,21 +1065,175 @@ static int readvolfile(AFPObj *obj, const struct passwd *pwent) } else { strlcpy(tmp, secname, AFPVOL_U8MNAMELEN); } - if (volxlate(obj, volname, sizeof(volname) - 1, tmp, pwent, tmp2, NULL) == NULL) + if (volxlate(obj, volname, sizeof(volname) - 1, tmp, pwent, path, NULL) == NULL) continue; preset = iniparser_getstring(obj->iniconfig, secname, "vol preset", NULL); - if ((realvolpath = realpath_safe(tmp2)) == 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; +} + /************************************************************** * API functions **************************************************************/ @@ -1281,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], *realvolpath; + char volpath[MAXPATHLEN + 1], *realvolpath = NULL; char tmpbuf[MAXPATHLEN + 1]; const char *secname, *basedir, *p = NULL, *subpath = NULL, *subpathconfig; char *user = NULL, *prw; @@ -1374,11 +1543,9 @@ struct vol *getvolbypath(AFPObj *obj, const char *path) /* (7) */ if (volxlate(obj, volpath, sizeof(volpath) - 1, tmpbuf, pw, NULL, NULL) == NULL) - return NULL; - - if ((realvolpath = realpath_safe(volpath)) == 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 => realvolpath: \"%s\"", @@ -1400,6 +1567,8 @@ struct vol *getvolbypath(AFPObj *obj, const char *path) EC_CLEANUP: if (user) free(user); + if (realvolpath) + free(realvolpath); if (ret != 0) vol = NULL; return vol; @@ -1479,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"); @@ -1610,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;