X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=libatalk%2Futil%2Fnetatalk_conf.c;h=a3cd87e7a551b77919ade214054720473eb56df4;hp=507bd210e65f268c1d0f9761502f7f2daf693d2d;hb=c68133999a8dc7839efe0280366b2ab871210ef8;hpb=b14967f5bbdc7301617fe732174bb3deaee9512c diff --git a/libatalk/util/netatalk_conf.c b/libatalk/util/netatalk_conf.c index 507bd210..a3cd87e7 100644 --- a/libatalk/util/netatalk_conf.c +++ b/libatalk/util/netatalk_conf.c @@ -30,6 +30,13 @@ #include #include #include +#include +#if HAVE_LOCALE_H +#include +#endif +#if HAVE_LANGINFO_H +#include +#endif #include #include @@ -43,8 +50,12 @@ #include #include #include +#include #define VOLPASSLEN 8 +#ifndef UUID_PRINTABLE_STRING_LENGTH +#define UUID_PRINTABLE_STRING_LENGTH 37 +#endif #define IS_VAR(a, b) (strncmp((a), (b), 2) == 0) @@ -133,7 +144,7 @@ static char *get_vol_uuid(const AFPObj *obj, const char *volname) if(ftell(fp) == 0) { /* size = 0 */ fprintf(fp, "# DON'T TOUCH NOR COPY THOUGHTLESSLY!\n"); fprintf(fp, "# This file is auto-generated by afpd\n"); - fprintf(fp, "# and stores UUIDs for TM volumes.\n\n"); + fprintf(fp, "# and stores UUIDs for Time Machine volumes.\n\n"); } else { fseek(fp, -1L, SEEK_END); if(fgetc(fp) != '\n') fputc('\n', fp); /* last char is \n? */ @@ -178,7 +189,7 @@ static int do_check_ea_support(const struct vol *vol) sys_removexattr(vol->v_path, eaname); haseas = 1; } else { - LOG(log_warning, logtype_afpd, "volume \"%s\" does not support Extended Attributes", + LOG(log_warning, logtype_afpd, "volume \"%s\" does not support Extended Attributes or read-only volume root", vol->v_localname); haseas = 0; } @@ -328,12 +339,14 @@ static char *volxlate(const AFPObj *obj, q++; } } else if (IS_VAR(p, "$c")) { - DSI *dsi = obj->dsi; - len = sprintf(dest, "%s:%u", - getip_string((struct sockaddr *)&dsi->client), - getip_port((struct sockaddr *)&dsi->client)); - dest += len; - destlen -= len; + if (IS_AFP_SESSION(obj)) { + DSI *dsi = obj->dsi; + 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")) { q = path; } else if (pwd && IS_VAR(p, "$f")) { @@ -351,7 +364,7 @@ static char *volxlate(const AFPObj *obj, q = getip_string((struct sockaddr *)&dsi->client); } else if (IS_VAR(p, "$s")) { q = obj->options.hostname; - } else if (obj->username && IS_VAR(p, "$u")) { + } else if (obj->username[0] && IS_VAR(p, "$u")) { char* sep = NULL; if ( obj->options.ntseparator && (sep = strchr(obj->username, obj->options.ntseparator[0])) != NULL) q = sep+1; @@ -398,7 +411,7 @@ static char *volxlate(const AFPObj *obj, * check access list * * this function wants something of the following form: - * "@group,name,name2,@group2,name3" + * "@group,name,name2,@group2,name3" or "@group name name2 @group2 name3" * A NULL argument allows everybody to have access. * We return three things: * -1: no list @@ -414,7 +427,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) { @@ -423,7 +436,7 @@ static int accessvol(const AFPObj *obj, const char *args, const char *name) return 1; } else if (strcasecmp(p, name) == 0) /* it's a user name */ return 1; - p = strtok(NULL, ","); + p = strtok(NULL, ", "); } return 0; @@ -436,11 +449,11 @@ static int hostaccessvol(const AFPObj *obj, const char *volname, const char *arg struct sockaddr_storage client; const DSI *dsi = obj->dsi; - if (!args) + if (!args || !dsi) return -1; strlcpy(buf, args, sizeof(buf)); - if ((p = strtok_r(buf, ",", &b)) == NULL) /* nothing, return okay */ + if ((p = strtok_r(buf, ", ", &b)) == NULL) /* nothing, return okay */ return -1; while (p) { @@ -482,7 +495,7 @@ static int hostaccessvol(const AFPObj *obj, const char *volname, const char *arg /* next address */ freeaddrinfo(ai); - p = strtok_r(NULL, ",", &b); + p = strtok_r(NULL, ", ", &b); } return 0; @@ -494,19 +507,47 @@ static int hostaccessvol(const AFPObj *obj, const char *volname, const char *arg * @param conf (r) config handle * @param vol (r) volume name (must be section name ie wo vars expanded) * @param opt (r) option - * @param def (r) if "option" is not found in "name", try to find it in section "def" + * @param defsec (r) if "option" is not found in "vol", try to find it in section "defsec" + * @param defval (r) if neither "vol" nor "defsec" contain "opt" return "defval" + * + * @returns const option string from "vol" or "defsec", or "defval" if not found + */ +static const char *getoption(const dictionary *conf, const char *vol, const char *opt, const char *defsec, const char *defval) +{ + EC_INIT; + const char *result; + + if ((!(result = iniparser_getstring(conf, vol, opt, NULL))) && (defsec != NULL)) + result = iniparser_getstring(conf, defsec, opt, NULL); + +EC_CLEANUP: + if (result == NULL) + result = defval; + return result; +} + +/*! + * Get boolean option from config, use default value if not set + * + * @param conf (r) config handle + * @param vol (r) volume name (must be section name ie wo vars expanded) + * @param opt (r) option + * @param defsec (r) if "option" is not found in "vol", try to find it in section "defsec" + * @param defval (r) if neither "vol" nor "defsec" contain "opt" return "defval" * - * @returns const option string or NULL + * @returns const option string from "vol" or "defsec", or "defval" if not found */ -static const char *getoption(const dictionary *conf, const char *vol, const char *opt, const char *def) +static int getoption_bool(const dictionary *conf, const char *vol, const char *opt, const char *defsec, int defval) { EC_INIT; - const char *result = NULL; + int result; - if (!(result = iniparser_getstring(conf, vol, opt, NULL))) - result = iniparser_getstring(conf, def, opt, NULL); + if (((result = iniparser_getboolean(conf, vol, opt, -1)) == -1) && (defsec != NULL)) + result = iniparser_getboolean(conf, defsec, opt, -1); EC_CLEANUP: + if (result == -1) + result = defval; return result; } @@ -567,77 +608,85 @@ static struct vol *creatvol(AFPObj *obj, * deny -> either no list (-1), or not in list (0) */ if (pwd) { - if (accessvol(obj, getoption(obj->iniconfig, section, "deny", preset), pwd->pw_name) == 1) + if (accessvol(obj, getoption(obj->iniconfig, section, "invalid users", preset, NULL), pwd->pw_name) == 1) goto EC_CLEANUP; - if (accessvol(obj, getoption(obj->iniconfig, section, "allow", preset), pwd->pw_name) == 0) + if (accessvol(obj, getoption(obj->iniconfig, section, "valid users", preset, NULL), pwd->pw_name) == 0) goto EC_CLEANUP; - if (hostaccessvol(obj, section, getoption(obj->iniconfig, section, "denied_hosts", preset)) == 1) + if (hostaccessvol(obj, section, getoption(obj->iniconfig, section, "hosts deny", preset, NULL)) == 1) goto EC_CLEANUP; - if (hostaccessvol(obj, section, getoption(obj->iniconfig, section, "allowed_hosts", preset)) == 0) + if (hostaccessvol(obj, section, getoption(obj->iniconfig, section, "hosts allow", preset, NULL)) == 0) goto EC_CLEANUP; } EC_NULL( volume = calloc(1, sizeof(struct vol)) ); - volume->v_flags = AFPVOL_USEDOTS | AFPVOL_UNIX_PRIV; EC_NULL( volume->v_configname = strdup(section)); -#ifdef HAVE_ACLS - volume->v_flags |= AFPVOL_ACLS; -#endif volume->v_vfs_ea = AFPVOL_EA_AUTO; volume->v_umask = obj->options.umask; - if (val = getoption(obj->iniconfig, section, "password", preset)) + if (val = getoption(obj->iniconfig, section, "password", preset, NULL)) EC_NULL( volume->v_password = strdup(val) ); - if (val = getoption(obj->iniconfig, section, "veto", preset)) - EC_NULL( volume->v_password = strdup(val) ); + if (val = getoption(obj->iniconfig, section, "veto files", preset, NULL)) + EC_NULL( volume->v_veto = strdup(val) ); - if (val = getoption(obj->iniconfig, section, "volcharset", preset)) + /* vol charset is in [G] and [V] */ + if (val = getoption(obj->iniconfig, section, "vol charset", preset, NULL)) { + if (strcasecmp(val, "UTF-8") == 0) { + val = strdup("UTF8"); + } EC_NULL( volume->v_volcodepage = strdup(val) ); + } else - EC_NULL( volume->v_volcodepage = strdup("UTF8") ); + EC_NULL( volume->v_volcodepage = strdup(obj->options.volcodepage) ); - if (val = getoption(obj->iniconfig, section, "maccharset", preset)) + /* mac charset is in [G] and [V] */ + if (val = getoption(obj->iniconfig, section, "mac charset", preset, NULL)) { + if (strncasecmp(val, "MAC", 3) != 0) { + LOG(log_warning, logtype_afpd, "Is '%s' really mac charset? ", val); + } EC_NULL( volume->v_maccodepage = strdup(val) ); + } else - EC_NULL( volume->v_maccodepage = strdup(obj->options.maccodepage) ); + EC_NULL( volume->v_maccodepage = strdup(obj->options.maccodepage) ); - if (val = getoption(obj->iniconfig, section, "dbpath", preset)) - EC_NULL( volume->v_dbpath = volxlate(obj, NULL, MAXPATHLEN, val, pwd, path, name) ); + bstring dbpath; + EC_NULL_LOG( val = iniparser_getstring(obj->iniconfig, INISEC_GLOBAL, "vol dbpath", _PATH_STATEDIR "CNID/") ); + EC_NULL_LOG( dbpath = bformat("%s/%s/", val, name) ); + EC_NULL_LOG( volume->v_dbpath = strdup(bdata(dbpath)) ); + bdestroy(dbpath); - if (val = getoption(obj->iniconfig, section, "cnidscheme", preset)) + if (val = getoption(obj->iniconfig, section, "cnid scheme", preset, NULL)) EC_NULL( volume->v_cnidscheme = strdup(val) ); + else + volume->v_cnidscheme = strdup(DEFAULT_CNID_SCHEME); - if (val = getoption(obj->iniconfig, section, "umask", preset)) + if (val = getoption(obj->iniconfig, section, "umask", preset, NULL)) volume->v_umask = (int)strtol(val, NULL, 8); - if (val = getoption(obj->iniconfig, section, "dperm", preset)) + if (val = getoption(obj->iniconfig, section, "directory perm", preset, NULL)) volume->v_dperm = (int)strtol(val, NULL, 8); - if (val = getoption(obj->iniconfig, section, "fperm", preset)) + if (val = getoption(obj->iniconfig, section, "file perm", preset, NULL)) volume->v_fperm = (int)strtol(val, NULL, 8); - if (val = getoption(obj->iniconfig, section, "perm", preset)) - volume->v_perm = (int)strtol(val, NULL, 8); - - if (val = getoption(obj->iniconfig, section, "volsizelimit", preset)) + if (val = getoption(obj->iniconfig, section, "vol size limit", preset, NULL)) volume->v_limitsize = (uint32_t)strtoul(val, NULL, 10); - if (val = getoption(obj->iniconfig, section, "preexec", preset)) + if (val = getoption(obj->iniconfig, section, "preexec", preset, NULL)) EC_NULL( volume->v_preexec = volxlate(obj, NULL, MAXPATHLEN, val, pwd, path, name) ); - if (val = getoption(obj->iniconfig, section, "postexec", preset)) + if (val = getoption(obj->iniconfig, section, "postexec", preset, NULL)) EC_NULL( volume->v_postexec = volxlate(obj, NULL, MAXPATHLEN, val, pwd, path, name) ); - if (val = getoption(obj->iniconfig, section, "root_preexec", preset)) + if (val = getoption(obj->iniconfig, section, "root preexec", preset, NULL)) EC_NULL( volume->v_root_preexec = volxlate(obj, NULL, MAXPATHLEN, val, pwd, path, name) ); - if (val = getoption(obj->iniconfig, section, "root_postexec", preset)) + if (val = getoption(obj->iniconfig, section, "root postexec", preset, NULL)) EC_NULL( volume->v_root_postexec = volxlate(obj, NULL, MAXPATHLEN, val, pwd, path, name) ); - if (val = getoption(obj->iniconfig, section, "adouble", preset)) { + if (val = getoption(obj->iniconfig, section, "appledouble", preset, NULL)) { if (strcmp(val, "v2") == 0) volume->v_adouble = AD_VERSION2; else if (strcmp(val, "ea") == 0) @@ -646,19 +695,22 @@ static struct vol *creatvol(AFPObj *obj, volume->v_adouble = AD_VERSION; } - if (val = getoption(obj->iniconfig, section, "cnidserver", preset)) { + if (val = getoption(obj->iniconfig, section, "cnid server", preset, NULL)) { EC_NULL( p = strdup(val) ); volume->v_cnidserver = p; if (q = strrchr(val, ':')) { *q++ = 0; - volume->v_cnidport = q; + volume->v_cnidport = strdup(q); } else { - volume->v_cnidport = "4700"; + volume->v_cnidport = strdup("4700"); } + } else { + volume->v_cnidserver = strdup(obj->options.Cnid_srv); + volume->v_cnidport = strdup(obj->options.Cnid_port); } - if (val = getoption(obj->iniconfig, section, "ea", preset)) { + if (val = getoption(obj->iniconfig, section, "ea", preset, NULL)) { if (strcasecmp(val, "ad") == 0) volume->v_vfs_ea = AFPVOL_EA_AD; else if (strcasecmp(val, "sys") == 0) @@ -667,7 +719,7 @@ static struct vol *creatvol(AFPObj *obj, volume->v_vfs_ea = AFPVOL_EA_NONE; } - if (val = getoption(obj->iniconfig, section, "casefold", preset)) { + if (val = getoption(obj->iniconfig, section, "casefold", preset, NULL)) { if (strcasecmp(val, "tolower") == 0) volume->v_casefold = AFPVOL_UMLOWER; else if (strcasecmp(val, "toupper") == 0) @@ -678,47 +730,35 @@ static struct vol *creatvol(AFPObj *obj, volume->v_casefold = AFPVOL_ULOWERMUPPER; } - if (val = getoption(obj->iniconfig, section, "options", preset)) { - q = strdup(val); - if (p = strtok(q, ", ")) { - while (p) { - if (strcasecmp(p, "ro") == 0) - volume->v_flags |= AFPVOL_RO; - else if (strcasecmp(p, "nohex") == 0) - volume->v_flags |= AFPVOL_NOHEX; - else if (strcasecmp(p, "nousedots") == 0) - volume->v_flags &= ~AFPVOL_USEDOTS; - else if (strcasecmp(p, "invisibledots") == 0) - volume->v_flags |= volume->v_flags; - else if (strcasecmp(p, "nostat") == 0) - volume->v_flags |= AFPVOL_NOSTAT; - else if (strcasecmp(p, "noupriv") == 0) - volume->v_flags &= ~AFPVOL_UNIX_PRIV; - else if (strcasecmp(p, "nodev") == 0) - volume->v_flags |= AFPVOL_NODEV; - else if (strcasecmp(p, "caseinsensitive") == 0) - volume->v_flags |= AFPVOL_CASEINSEN; - else if (strcasecmp(p, "illegalseq") == 0) - volume->v_flags |= AFPVOL_EILSEQ; - else if (strcasecmp(p, "tm") == 0) - volume->v_flags |= AFPVOL_TM; - else if (strcasecmp(p, "searchdb") == 0) - volume->v_flags |= AFPVOL_SEARCHDB; - else if (strcasecmp(p, "nonetids") == 0) - volume->v_flags |= AFPVOL_NONETIDS; - else if (strcasecmp(p, "noacls") == 0) - volume->v_flags &= ~AFPVOL_ACLS; - else if (strcasecmp(p, "nov2toeaconv") == 0) - volume->v_flags |= AFPVOL_NOV2TOEACONV; - else if (strcasecmp(p, "preexec_close") == 0) - volume->v_preexec_close = 1; - else if (strcasecmp(p, "root_preexec_close") == 0) - volume->v_root_preexec_close = 1; - p = strtok(NULL, ", "); - } - } - free(q); - } + if (getoption_bool(obj->iniconfig, section, "read only", preset, 0)) + volume->v_flags |= AFPVOL_RO; + if (getoption_bool(obj->iniconfig, section, "invisible dots", preset, 0)) + volume->v_flags |= AFPVOL_INV_DOTS; + if (!getoption_bool(obj->iniconfig, section, "stat vol", preset, 1)) + volume->v_flags |= AFPVOL_NOSTAT; + if (getoption_bool(obj->iniconfig, section, "unix priv", preset, 1)) + volume->v_flags |= AFPVOL_UNIX_PRIV; + if (!getoption_bool(obj->iniconfig, section, "cnid dev", preset, 1)) + volume->v_flags |= AFPVOL_NODEV; + if (getoption_bool(obj->iniconfig, section, "illegal seq", preset, 0)) + volume->v_flags |= AFPVOL_EILSEQ; + if (getoption_bool(obj->iniconfig, section, "time machine", preset, 0)) + volume->v_flags |= AFPVOL_TM; + if (getoption_bool(obj->iniconfig, section, "search db", preset, 0)) + volume->v_flags |= AFPVOL_SEARCHDB; + if (!getoption_bool(obj->iniconfig, section, "network ids", preset, 1)) + volume->v_flags |= AFPVOL_NONETIDS; +#ifdef HAVE_ACLS + if (getoption_bool(obj->iniconfig, section, "acls", preset, 1)) + volume->v_flags |= AFPVOL_ACLS; +#endif + if (!getoption_bool(obj->iniconfig, section, "convert adouble", preset, 1)) + volume->v_flags |= AFPVOL_NOV2TOEACONV; + + if (getoption_bool(obj->iniconfig, section, "preexec close", preset, 0)) + volume->v_preexec_close = 1; + if (getoption_bool(obj->iniconfig, section, "root preexec close", preset, 0)) + volume->v_root_preexec_close = 1; /* * Handle read-only behaviour. semantics: @@ -727,8 +767,8 @@ static struct vol *creatvol(AFPObj *obj, * 3) rwlist exists -> ro unless user is in it. */ if (pwd) { - if (accessvol(obj, getoption(obj->iniconfig, section, "rolist", preset), pwd->pw_name) == 1 - || accessvol(obj, getoption(obj->iniconfig, section, "rwlist", preset), pwd->pw_name) == 0) + if (accessvol(obj, getoption(obj->iniconfig, section, "rolist", preset, NULL), pwd->pw_name) == 1 + || accessvol(obj, getoption(obj->iniconfig, section, "rwlist", preset, NULL), pwd->pw_name) == 0) volume->v_flags |= AFPVOL_RO; } @@ -740,10 +780,6 @@ static struct vol *creatvol(AFPObj *obj, volume->v_ad_options |= ADVOL_INVDOTS; /* Mac to Unix conversion flags*/ - if (!(volume->v_flags & AFPVOL_NOHEX)) - volume->v_mtou_flags |= CONV_ESCAPEHEX; - if (!(volume->v_flags & AFPVOL_USEDOTS)) - volume->v_mtou_flags |= CONV_ESCAPEDOTS; if ((volume->v_flags & AFPVOL_EILSEQ)) volume->v_mtou_flags |= CONV__EILSEQ; @@ -753,7 +789,7 @@ static struct vol *creatvol(AFPObj *obj, volume->v_mtou_flags |= CONV_TOLOWER; /* Unix to Mac conversion flags*/ - volume->v_utom_flags = CONV_IGNORE | CONV_UNESCAPEHEX; + volume->v_utom_flags = CONV_IGNORE; if ((volume->v_casefold & AFPVOL_UTOMUPPER)) volume->v_utom_flags |= CONV_TOUPPER; else if ((volume->v_casefold & AFPVOL_UTOMLOWER)) @@ -855,9 +891,6 @@ static struct vol *creatvol(AFPObj *obj, } #endif - volume->v_dperm |= volume->v_perm; - volume->v_fperm |= volume->v_perm; - /* Check EA support on volume */ if (volume->v_vfs_ea == AFPVOL_EA_AUTO || volume->v_adouble == AD_VERSION_EA) check_ea_support(volume); @@ -922,13 +955,16 @@ static int vol_section(const char *sec) static int readvolfile(AFPObj *obj, const struct passwd *pwent) { EC_INIT; + static int regexerr = -1; + static regex_t reg; char path[MAXPATHLEN + 1]; char volname[AFPVOL_U8MNAMELEN + 1]; char tmp[MAXPATHLEN + 1]; - const char *preset, *default_preset, *p; + const char *preset, *default_preset, *p, *basedir; char *q, *u; int i; struct passwd *pw; + regmatch_t match[1]; LOG(log_debug, logtype_afpd, "readvolfile: BEGIN"); @@ -947,14 +983,32 @@ static int readvolfile(AFPObj *obj, const struct passwd *pwent) continue; if (STRCMP(secname, ==, INISEC_HOMES)) { have_uservol = 1; - if (obj->username[0] == 0) - /* not an AFP session, but cnid daemon, dbd or ad util */ + if (!IS_AFP_SESSION(obj) + || strcmp(obj->username, obj->options.guest) == 0) + /* not an AFP session, but cnid daemon, dbd or ad util, or guest login */ continue; - if ((p = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "basedir", NULL)) == NULL) + if (pwent->pw_dir == NULL || STRCMP("", ==, pwent->pw_dir)) + /* no user home */ continue; - strlcpy(tmp, p, MAXPATHLEN); - strlcat(tmp, "/", MAXPATHLEN); - strlcat(tmp, obj->username, MAXPATHLEN); + + /* check if user home matches our "basedir regex" */ + if ((basedir = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "basedir regex", NULL)) == NULL) + continue; + LOG(log_debug, logtype_afpd, "readvolfile: basedir regex: '%s'", basedir); + + if (regexerr != 0 && (regexerr = regcomp(®, basedir, REG_EXTENDED)) != 0) { + char errbuf[1024]; + regerror(regexerr, ®, errbuf, sizeof(errbuf)); + LOG(log_debug, logtype_default, "readvolfile: bad basedir regex: %s", errbuf); + } + + 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); + continue; + } + + strlcpy(tmp, pwent->pw_dir, MAXPATHLEN); strlcat(tmp, "/", MAXPATHLEN); if (p = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "path", NULL)) strlcat(tmp, p, MAXPATHLEN); @@ -970,7 +1024,7 @@ static int readvolfile(AFPObj *obj, const struct passwd *pwent) /* do variable substitution for volume name */ if (STRCMP(secname, ==, INISEC_HOMES)) { - if (p = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "name", "$u's home")) + if (p = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "home name", "$u's home")) strlcpy(tmp, p, MAXPATHLEN); else strlcpy(tmp, p, MAXPATHLEN); @@ -1037,10 +1091,7 @@ void volume_free(struct vol *vol) free(vol->v_gvs); free(vol->v_uuid); free(vol->v_cnidserver); -#if 0 - /* NO! Just points to v_cnidserver + x */ free(vol->v_cnidport); -#endif free(vol->v_root_preexec); free(vol->v_postexec); @@ -1053,12 +1104,12 @@ void volume_free(struct vol *vol) int load_charset(struct vol *vol) { if ((vol->v_maccharset = add_charset(vol->v_maccodepage)) == (charset_t)-1) { - LOG(log_error, logtype_default, "Setting Mac codepage '%s' failed", vol->v_maccodepage); + LOG(log_error, logtype_default, "Setting mac charset '%s' failed", vol->v_maccodepage); return -1; } if ((vol->v_volcharset = add_charset(vol->v_volcodepage)) == (charset_t)-1) { - LOG(log_error, logtype_default, "Setting volume codepage '%s' failed", vol->v_volcodepage); + LOG(log_error, logtype_default, "Setting vol charset '%s' failed", vol->v_volcodepage); return -1; } @@ -1089,8 +1140,6 @@ int load_volumes(AFPObj *obj, void (*delvol_fn)(struct vol *)) goto EC_CLEANUP; have_uservol = 0; for (vol = Volumes; vol; vol = vol->v_next) { - if (vol->v_flags & AFPVOL_UNIX_CTXT) - continue; vol->v_deleted = 1; } } else { @@ -1179,30 +1228,63 @@ struct vol *getvolbyvid(const uint16_t vid ) return( vol ); } +/*! + * Search volume by path, creating user home vols as necessary + * + * Path may be absolute or relative. Ordinary volume structs are created when + * the ini config is initially parsed (load_volumes()), but user volumes are + * as load_volumes() only can create the user volume of the logged in user + * in an AFP session in afpd, but not when called from eg cnid_metad or dbd. + * Both cnid_metad and dbd thus need a way to lookup and create struct vols + * for user home by path. This is what this func does as well. + * + * (1) Search "normal" volume list + * (2) Check if theres a [Homes] section, load_volumes() remembers this for us + * (3) If there is, match "path" with "basedir regex" to get the user home parent dir + * (4) Built user home path by appending the basedir matched in (3) and appending the username + * (5) The next path element then is the username + * (6) Append [Homes]->path subdirectory if defined + * (7) Create volume + * + * @param obj (rw) handle + * @param path (r) path, may be relative or absolute + */ struct vol *getvolbypath(AFPObj *obj, const char *path) { EC_INIT; + static int regexerr = -1; + static regex_t reg; struct vol *vol; struct vol *tmp; const struct passwd *pw; char volname[AFPVOL_U8MNAMELEN + 1]; + char abspath[MAXPATHLEN + 1]; char volpath[MAXPATHLEN + 1]; char tmpbuf[MAXPATHLEN + 1]; const char *secname, *basedir, *p = NULL, *subpath = NULL, *subpathconfig; char *user = NULL, *prw; + regmatch_t match[1]; LOG(log_debug, logtype_afpd, "getvolbypath(\"%s\")", path); - for (tmp = Volumes; tmp; tmp = tmp->v_next) { + if (path[0] != '/') { + /* relative path, build absolute path */ + EC_NULL_LOG( getcwd(abspath, MAXPATHLEN) ); + strlcat(abspath, "/", MAXPATHLEN); + strlcat(abspath, path, MAXPATHLEN); + path = abspath; + } + + + for (tmp = Volumes; tmp; tmp = tmp->v_next) { /* (1) */ if (strncmp(path, tmp->v_path, strlen(tmp->v_path)) == 0) { vol = tmp; goto EC_CLEANUP; } } - /* might be a user home, check for that and create a volume if yes */ - if (!have_uservol) - EC_FAIL; + if (!have_uservol) /* (2) */ + EC_FAIL_LOG("getvolbypath(\"%s\"): no volume for path", path); int secnum = iniparser_getnsec(obj->iniconfig); @@ -1213,18 +1295,35 @@ struct vol *getvolbypath(AFPObj *obj, const char *path) } if (STRCMP(secname, !=, INISEC_HOMES)) - EC_FAIL; - - EC_NULL_LOG( basedir = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "basedir", NULL) ); + EC_FAIL_LOG("getvolbypath(\"%s\"): no volume for path", path); + /* (3) */ + EC_NULL_LOG( basedir = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "basedir regex", NULL) ); LOG(log_debug, logtype_afpd, "getvolbypath: user home section: '%s', basedir: '%s'", secname, basedir); - if (strncmp(path, basedir, strlen(basedir)) != 0) - EC_FAIL; + if (regexerr != 0 && (regexerr = regcomp(®, basedir, REG_EXTENDED)) != 0) { + char errbuf[1024]; + regerror(regexerr, ®, errbuf, sizeof(errbuf)); + printf("error: %s\n", errbuf); + EC_FAIL_LOG("getvolbypath(\"%s\"): bad basedir regex: %s", errbuf); + } + + if (regexec(®, path, 1, match, 0) == REG_NOMATCH) + EC_FAIL_LOG("getvolbypath(\"%s\"): no volume for path", path); + + if (match[0].rm_eo - match[0].rm_so > MAXPATHLEN) + EC_FAIL_LOG("getvolbypath(\"%s\"): path too long", path); + + /* (4) */ + strncpy(tmpbuf, path + match[0].rm_so, match[0].rm_eo - match[0].rm_so); + tmpbuf[match[0].rm_eo - match[0].rm_so] = 0; + + LOG(log_debug, logtype_afpd, "getvolbypath: basedir regex: '%s', basedir match: \"%s\"", + basedir, tmpbuf); - strlcpy(tmpbuf, basedir, MAXPATHLEN); strlcat(tmpbuf, "/", MAXPATHLEN); + /* (5) */ p = path + strlen(basedir); while (*p == '/') p++; @@ -1236,17 +1335,20 @@ struct vol *getvolbypath(AFPObj *obj, const char *path) subpath = prw; strlcat(tmpbuf, user, MAXPATHLEN); + strlcat(obj->username, user, MAXUSERLEN); strlcat(tmpbuf, "/", MAXPATHLEN); + /* (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); } - strlcat(tmpbuf, subpathconfig, MAXPATHLEN); - strlcat(tmpbuf, "/", MAXPATHLEN); + /* (7) */ if (volxlate(obj, volpath, sizeof(volpath) - 1, tmpbuf, pw, NULL, NULL) == NULL) return NULL; @@ -1256,7 +1358,7 @@ struct vol *getvolbypath(AFPObj *obj, const char *path) path, user, pw->pw_dir, volpath); /* do variable substitution for volume name */ - p = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "name", "$u's home"); + p = iniparser_getstring(obj->iniconfig, INISEC_HOMES, "home name", "$u's home"); strlcpy(tmpbuf, p, AFPVOL_U8MNAMELEN); EC_NULL_LOG( volxlate(obj, volname, sizeof(volname) - 1, tmpbuf, pw, volpath, NULL) ); @@ -1267,7 +1369,6 @@ struct vol *getvolbypath(AFPObj *obj, const char *path) vol = creatvol(obj, pw, INISEC_HOMES, volname, volpath, preset ? preset : default_preset ? default_preset : NULL); EC_CLEANUP: - endpwent(); if (user) free(user); if (ret != 0) @@ -1293,7 +1394,7 @@ struct vol *getvolbyname(const char *name) /*! * Initialize an AFPObj and options from ini config file */ -int afp_config_parse(AFPObj *AFPObj) +int afp_config_parse(AFPObj *AFPObj, char *processname) { EC_INIT; dictionary *config; @@ -1303,10 +1404,13 @@ int afp_config_parse(AFPObj *AFPObj) char *q, *r; char val[MAXVAL]; + if (processname != NULL) + set_processname(processname); + AFPObj->afp_version = 11; options->configfile = AFPObj->cmdlineconfigfile ? strdup(AFPObj->cmdlineconfigfile) : strdup(_PATH_CONFDIR "afp.conf"); - options->sigconffile = strdup(_PATH_CONFDIR "afp_signature.conf"); - options->uuidconf = strdup(_PATH_CONFDIR "afp_voluuid.conf"); + options->sigconffile = strdup(_PATH_STATEDIR "afp_signature.conf"); + options->uuidconf = strdup(_PATH_STATEDIR "afp_voluuid.conf"); options->flags = OPTION_ACL2MACCESS | OPTION_UUID | OPTION_SERVERNOTIF | AFPObj->cmdlineflags; if ((config = iniparser_load(AFPObj->options.configfile)) == NULL) @@ -1314,70 +1418,61 @@ int afp_config_parse(AFPObj *AFPObj) AFPObj->iniconfig = config; /* [Global] */ - options->logconfig = iniparser_getstrdup(config, INISEC_GLOBAL, "loglevel", "default:note"); - options->logfile = iniparser_getstrdup(config, INISEC_GLOBAL, "logfile", NULL); - - /* [AFP] "options" options wo values */ - if (p = iniparser_getstrdup(config, INISEC_GLOBAL, "options", NULL)) { - if (p = strtok(q, ", ")) { - while (p) { - if (strcasecmp(p, "nozeroconf")) - options->flags |= OPTION_NOZEROCONF; - if (strcasecmp(p, "icon")) - options->flags |= OPTION_CUSTOMICON; - if (strcasecmp(p, "noicon")) - options->flags &= ~OPTION_CUSTOMICON; - if (strcasecmp(p, "advertise_ssh")) - options->flags |= OPTION_ANNOUNCESSH; - if (strcasecmp(p, "noacl2maccess")) - options->flags &= ~OPTION_ACL2MACCESS; - if (strcasecmp(p, "keepsessions")) - options->flags |= OPTION_KEEPSESSIONS; - if (strcasecmp(p, "closevol")) - options->flags |= OPTION_CLOSEVOL; - if (strcasecmp(p, "client_polling")) - options->flags &= ~OPTION_SERVERNOTIF; - if (strcasecmp(p, "nosavepassword")) - options->passwdbits |= PASSWD_NOSAVE; - if (strcasecmp(p, "savepassword")) - options->passwdbits &= ~PASSWD_NOSAVE; - if (strcasecmp(p, "nosetpassword")) - options->passwdbits &= ~PASSWD_SET; - if (strcasecmp(p, "setpassword")) - options->passwdbits |= PASSWD_SET; - p = strtok(NULL, ", "); - } - } - } - /* figure out options w values */ + options->logconfig = iniparser_getstrdup(config, INISEC_GLOBAL, "log level", "default:note"); + options->logfile = iniparser_getstrdup(config, INISEC_GLOBAL, "log file", NULL); + + setuplog(options->logconfig, options->logfile); + + /* "server options" boolean options */ + if (!iniparser_getboolean(config, INISEC_GLOBAL, "zeroconf", 1)) + options->flags |= OPTION_NOZEROCONF; + if (iniparser_getboolean(config, INISEC_GLOBAL, "icon", 0)) + options->flags |= OPTION_CUSTOMICON; + if (iniparser_getboolean(config, INISEC_GLOBAL, "advertise ssh", 0)) + options->flags |= OPTION_ANNOUNCESSH; + if (iniparser_getboolean(config, INISEC_GLOBAL, "map acls", 1)) + options->flags |= OPTION_ACL2MACCESS; + if (iniparser_getboolean(config, INISEC_GLOBAL, "keep sessions", 0)) + options->flags |= OPTION_KEEPSESSIONS; + if (iniparser_getboolean(config, INISEC_GLOBAL, "close vol", 0)) + options->flags |= OPTION_CLOSEVOL; + if (!iniparser_getboolean(config, INISEC_GLOBAL, "client polling", 1)) + options->flags |= OPTION_SERVERNOTIF; + if (!iniparser_getboolean(config, INISEC_GLOBAL, "use sendfile", 1)) + options->flags |= OPTION_NOSENDFILE; + if (!iniparser_getboolean(config, INISEC_GLOBAL, "save password", 1)) + options->passwdbits |= PASSWD_NOSAVE; + if (iniparser_getboolean(config, INISEC_GLOBAL, "set password", 0)) + options->passwdbits |= PASSWD_SET; - options->loginmesg = iniparser_getstrdup(config, INISEC_GLOBAL, "loginmesg", ""); - options->guest = iniparser_getstrdup(config, INISEC_GLOBAL, "guestname", "nobody"); - options->passwdfile = iniparser_getstrdup(config, INISEC_GLOBAL, "passwdfile", _PATH_AFPDPWFILE); - options->uampath = iniparser_getstrdup(config, INISEC_GLOBAL, "uampath", _PATH_AFPDUAMPATH); - options->uamlist = iniparser_getstrdup(config, INISEC_GLOBAL, "uamlist", "uams_dhx.so,uams_dhx2.so"); + /* 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->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"); - options->signatureopt = iniparser_getstrdup(config, INISEC_GLOBAL, "signature", "auto"); - options->k5service = iniparser_getstrdup(config, INISEC_GLOBAL, "k5service", NULL); - options->k5realm = iniparser_getstrdup(config, INISEC_GLOBAL, "k5realm", NULL); + options->signatureopt = iniparser_getstrdup(config, INISEC_GLOBAL, "signature", ""); + options->k5service = iniparser_getstrdup(config, INISEC_GLOBAL, "k5 service", NULL); + options->k5realm = iniparser_getstrdup(config, INISEC_GLOBAL, "k5 realm", NULL); options->listen = iniparser_getstrdup(config, INISEC_GLOBAL, "afp listen", NULL); - options->ntdomain = iniparser_getstrdup(config, INISEC_GLOBAL, "ntdomain", NULL); - options->ntseparator = iniparser_getstrdup(config, INISEC_GLOBAL, "ntseparator", NULL); - options->mimicmodel = iniparser_getstrdup(config, INISEC_GLOBAL, "mimicmodel", NULL); - options->adminauthuser = iniparser_getstrdup(config, INISEC_GLOBAL, "adminauthuser", NULL); - options->connections = iniparser_getint (config, INISEC_GLOBAL, "maxcon", 200); - options->passwdminlen = iniparser_getint (config, INISEC_GLOBAL, "passwdminlen", 0); + options->ntdomain = iniparser_getstrdup(config, INISEC_GLOBAL, "nt domain", NULL); + options->ntseparator = iniparser_getstrdup(config, INISEC_GLOBAL, "nt separator", NULL); + options->mimicmodel = iniparser_getstrdup(config, INISEC_GLOBAL, "mimic model", NULL); + options->adminauthuser = iniparser_getstrdup(config, INISEC_GLOBAL, "admin auth user",NULL); + options->connections = iniparser_getint (config, INISEC_GLOBAL, "max connections",200); + options->passwdminlen = iniparser_getint (config, INISEC_GLOBAL, "passwd minlen", 0); options->tickleval = iniparser_getint (config, INISEC_GLOBAL, "tickleval", 30); options->timeout = iniparser_getint (config, INISEC_GLOBAL, "timeout", 4); options->dsireadbuf = iniparser_getint (config, INISEC_GLOBAL, "dsireadbuf", 12); - options->server_quantum = iniparser_getint (config, INISEC_GLOBAL, "server_quantum", DSI_SERVQUANT_DEF); + options->server_quantum = iniparser_getint (config, INISEC_GLOBAL, "server quantum", DSI_SERVQUANT_DEF); options->volnamelen = iniparser_getint (config, INISEC_GLOBAL, "volnamelen", 80); options->dircachesize = iniparser_getint (config, INISEC_GLOBAL, "dircachesize", DEFAULT_MAX_DIRCACHE_SIZE); options->tcp_sndbuf = iniparser_getint (config, INISEC_GLOBAL, "tcpsndbuf", 0); options->tcp_rcvbuf = iniparser_getint (config, INISEC_GLOBAL, "tcprcvbuf", 0); - options->fce_fmodwait = iniparser_getint (config, INISEC_GLOBAL, "fceholdfmod", 60); - options->sleep = iniparser_getint (config, INISEC_GLOBAL, "sleep", 10); - options->disconnected = iniparser_getint (config, INISEC_GLOBAL, "disconnect", 24); + options->fce_fmodwait = iniparser_getint (config, INISEC_GLOBAL, "fce holdfmod", 60); + options->sleep = iniparser_getint (config, INISEC_GLOBAL, "sleep time", 10); + options->disconnected = iniparser_getint (config, INISEC_GLOBAL, "disconnect time",24); if ((p = iniparser_getstring(config, INISEC_GLOBAL, "hostname", NULL))) { EC_NULL_LOG( options->hostname = strdup(p) ); @@ -1391,21 +1486,21 @@ int afp_config_parse(AFPObj *AFPObj) options->hostname = strdup(val); } - if ((p = iniparser_getstring(config, INISEC_GLOBAL, "k5keytab", NULL))) { + if ((p = iniparser_getstring(config, INISEC_GLOBAL, "k5 keytab", NULL))) { EC_NULL_LOG( options->k5keytab = malloc(strlen(p) + 14) ); snprintf(options->k5keytab, strlen(p) + 14, "KRB5_KTNAME=%s", p); putenv(options->k5keytab); } #ifdef ADMIN_GRP - if ((p = iniparser_getstring(config, INISEC_GLOBAL, "admingroup", NULL))) { + if ((p = iniparser_getstring(config, INISEC_GLOBAL, "admin group", NULL))) { struct group *gr = getgrnam(p); if (gr != NULL) options->admingid = gr->gr_gid; } #endif /* ADMIN_GRP */ - q = iniparser_getstrdup(config, INISEC_GLOBAL, "cnidserver", "localhost:4700"); + q = iniparser_getstrdup(config, INISEC_GLOBAL, "cnid server", "localhost:4700"); r = strrchr(q, ':'); if (r) *r = 0; @@ -1433,37 +1528,62 @@ int afp_config_parse(AFPObj *AFPObj) free(q); } - if (!(p = iniparser_getstring(config, INISEC_GLOBAL, "unixcodepage", NULL))) { - options->unixcharset = CH_UNIX; - options->unixcodepage = strdup("LOCALE"); + /* Charset Options */ + + /* unix charset is in [G] only */ + if (!(p = iniparser_getstring(config, INISEC_GLOBAL, "unix charset", NULL))) { + options->unixcodepage = strdup("UTF8"); + charset_names[CH_UNIX] = strdup("UTF8"); } else { - if ((options->unixcharset = add_charset(p)) == (charset_t)-1) { - options->unixcharset = CH_UNIX; - options->unixcodepage = strdup("LOCALE"); - LOG(log_warning, logtype_afpd, "Setting Unix codepage to '%s' failed", p); - } else { - options->unixcodepage = strdup(p); + if (strcasecmp(p, "LOCALE") == 0) { +#if defined(CODESET) + setlocale(LC_ALL, ""); + p = nl_langinfo(CODESET); + LOG(log_debug, logtype_afpd, "Locale charset is '%s'", p); +#else /* system doesn't have LOCALE support */ + LOG(log_warning, logtype_afpd, "system doesn't have LOCALE support"); + p = strdup("UTF8"); +#endif } + if (strcasecmp(p, "UTF-8") == 0) { + p = strdup("UTF8"); + } + options->unixcodepage = strdup(p); + charset_names[CH_UNIX] = strdup(p); } - - if (!(p = iniparser_getstring(config, INISEC_GLOBAL, "maccodepage", NULL))) { - options->maccharset = CH_MAC; + options->unixcharset = CH_UNIX; + LOG(log_debug, logtype_afpd, "Global unix charset is %s", options->unixcodepage); + + /* vol charset is in [G] and [V] */ + if (!(p = iniparser_getstring(config, INISEC_GLOBAL, "vol charset", NULL))) { + options->volcodepage = strdup(options->unixcodepage); + } else { + if (strcasecmp(p, "UTF-8") == 0) { + p = strdup("UTF8"); + } + options->volcodepage = strdup(p); + } + LOG(log_debug, logtype_afpd, "Global vol charset is %s", options->volcodepage); + + /* mac charset is in [G] and [V] */ + if (!(p = iniparser_getstring(config, INISEC_GLOBAL, "mac charset", NULL))) { options->maccodepage = strdup("MAC_ROMAN"); + charset_names[CH_MAC] = strdup("MAC_ROMAN"); } else { - if ((options->maccharset = add_charset(p)) == (charset_t)-1) { - options->maccharset = CH_MAC; - options->maccodepage = strdup("MAC_ROMAN"); - LOG(log_warning, logtype_afpd, "Setting Mac codepage to '%s' failed", p); - } else { - options->maccodepage = strdup(p); + if (strncasecmp(p, "MAC", 3) != 0) { + LOG(log_warning, logtype_afpd, "Is '%s' really mac charset? ", p); } + options->maccodepage = strdup(p); + charset_names[CH_MAC] = strdup(p); } + options->maccharset = CH_MAC; + LOG(log_debug, logtype_afpd, "Global mac charset is %s", options->maccodepage); /* Check for sane values */ if (options->tickleval <= 0) options->tickleval = 30; - options->disconnected *= 3600 / options->tickleval; - options->sleep *= 3600 / options->tickleval; + options->disconnected *= 3600 / options->tickleval; + options->sleep *= 3600 / options->tickleval; if (options->timeout <= 0) options->timeout = 4; if (options->sleep <= 4) @@ -1473,9 +1593,8 @@ int afp_config_parse(AFPObj *AFPObj) if (options->volnamelen < 8) options->volnamelen = 8; /* max mangled volname "???#FFFF" */ if (options->volnamelen > 255) - options->volnamelen = 255; /* AFP3 spec */ + options->volnamelen = 255; /* AFP3 spec */ EC_CLEANUP: EC_EXIT; } -