From d525573d235fbbba664d69e90450c7b82eb05835 Mon Sep 17 00:00:00 2001 From: Frank Lahm Date: Mon, 20 Feb 2012 17:48:08 +0100 Subject: [PATCH] First try for a volume defaults config --- etc/afpd/afp_config.c | 5 +- etc/afpd/afp_dsi.c | 2 +- etc/afpd/main.c | 32 +- etc/afpd/volume.c | 78 ++- etc/afpd/volume.h | 4 +- include/atalk/netatalk_conf.h | 4 +- include/atalk/server_child.h | 2 - include/atalk/volume.h | 2 + libatalk/dsi/dsi_getsess.c | 4 +- libatalk/dsi/dsi_tcp.c | 3 - libatalk/util/netatalk_conf.c | 935 ++++++++++++++-------------------- libatalk/util/server_child.c | 2 - 12 files changed, 452 insertions(+), 621 deletions(-) diff --git a/etc/afpd/afp_config.c b/etc/afpd/afp_config.c index 121c2124..d78c2742 100644 --- a/etc/afpd/afp_config.c +++ b/etc/afpd/afp_config.c @@ -50,6 +50,9 @@ void configfree(AFPObj *obj, DSI *dsi) { DSI *p, *q; + /* the master loaded the volumes for zeroconf, get rid of that */ + unload_volumes(obj); + for (p = obj->dsi; p; p = q) { q = p->next; if (p == dsi) @@ -64,8 +67,6 @@ void configfree(AFPObj *obj, DSI *dsi) afp_options_free(&obj->options); } - /* the master loaded the volumes for zeroconf, get rid of that */ - unload_volumes(); } /*! diff --git a/etc/afpd/afp_dsi.c b/etc/afpd/afp_dsi.c index fd38fa85..3c42a679 100644 --- a/etc/afpd/afp_dsi.c +++ b/etc/afpd/afp_dsi.c @@ -529,7 +529,7 @@ void afp_over_dsi(AFPObj *obj) if (reload_request) { reload_request = 0; - load_volumes(AFPobj, of_closevol); + load_volumes(AFPobj, closevol); } /* The first SIGINT enables debugging, the next restores the config */ diff --git a/etc/afpd/main.c b/etc/afpd/main.c index ca35cc8d..ac95bb8c 100644 --- a/etc/afpd/main.c +++ b/etc/afpd/main.c @@ -58,12 +58,10 @@ static int disasociated_ipc_fd; /* disasociated sessions uses this fd for IPC */ static afp_child_t *dsi_start(AFPObj *obj, DSI *dsi, server_child *server_children); -/* This is registered with atexit() */ -static void afp_exit(void) +static void afp_exit(int ret) { - if (parent_or_child == 0) - /* Only do this in the parent */ - server_unlock(_PATH_AFPDLOCK); + server_unlock(_PATH_AFPDLOCK); + exit(ret); } @@ -234,10 +232,9 @@ int main(int ac, char **av) /* Log SIGBUS/SIGSEGV SBT */ fault_setup(NULL); - atexit(afp_exit); if (afp_config_parse(&obj) != 0) - exit(EXITERR_CONF); + afp_exit(EXITERR_CONF); set_processname("afpd"); setuplog(obj.options.logconfig, obj.options.logfile); @@ -250,7 +247,7 @@ int main(int ac, char **av) * XXX: this should really be setup after the initial connections. */ if (!(server_children = server_child_alloc(obj.options.connections, CHILD_NFORKS))) { LOG(log_error, logtype_afpd, "main: server_child alloc: %s", strerror(errno) ); - exit(EXITERR_SYS); + afp_exit(EXITERR_SYS); } memset(&sv, 0, sizeof(sv)); @@ -261,7 +258,7 @@ int main(int ac, char **av) sigemptyset( &sv.sa_mask ); if (sigaction(SIGXFSZ, &sv, NULL ) < 0 ) { LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) ); - exit(EXITERR_SYS); + afp_exit(EXITERR_SYS); } #endif @@ -276,7 +273,7 @@ int main(int ac, char **av) sv.sa_flags = SA_RESTART; if ( sigaction( SIGCHLD, &sv, NULL ) < 0 ) { LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) ); - exit(EXITERR_SYS); + afp_exit(EXITERR_SYS); } sigemptyset( &sv.sa_mask ); @@ -288,7 +285,7 @@ int main(int ac, char **av) sv.sa_flags = SA_RESTART; if ( sigaction( SIGUSR1, &sv, NULL ) < 0 ) { LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) ); - exit(EXITERR_SYS); + afp_exit(EXITERR_SYS); } sigemptyset( &sv.sa_mask ); @@ -300,7 +297,7 @@ int main(int ac, char **av) sv.sa_flags = SA_RESTART; if ( sigaction( SIGHUP, &sv, NULL ) < 0 ) { LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) ); - exit(EXITERR_SYS); + afp_exit(EXITERR_SYS); } sigemptyset( &sv.sa_mask ); @@ -312,7 +309,7 @@ int main(int ac, char **av) sv.sa_flags = SA_RESTART; if ( sigaction( SIGTERM, &sv, NULL ) < 0 ) { LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) ); - exit(EXITERR_SYS); + afp_exit(EXITERR_SYS); } sigemptyset( &sv.sa_mask ); @@ -324,7 +321,7 @@ int main(int ac, char **av) sv.sa_flags = SA_RESTART; if (sigaction(SIGQUIT, &sv, NULL ) < 0 ) { LOG(log_error, logtype_afpd, "main: sigaction: %s", strerror(errno) ); - exit(EXITERR_SYS); + afp_exit(EXITERR_SYS); } /* afpd.conf: not in config file: lockfile, connections, configfile @@ -348,7 +345,7 @@ int main(int ac, char **av) pthread_sigmask(SIG_BLOCK, &sigs, NULL); if (configinit(&obj) != 0) { LOG(log_error, logtype_afpd, "main: no servers configured"); - exit(EXITERR_CONF); + afp_exit(EXITERR_CONF); } pthread_sigmask(SIG_UNBLOCK, &sigs, NULL); @@ -401,7 +398,7 @@ int main(int ac, char **av) configfree(&obj, NULL); if (configinit(&obj) != 0) { LOG(log_error, logtype_afpd, "config re-read: no servers configured"); - exit(EXITERR_CONF); + afp_exit(EXITERR_CONF); } fd_set_listening_sockets(&obj); @@ -506,10 +503,9 @@ static afp_child_t *dsi_start(AFPObj *obj, DSI *dsi, server_child *server_childr } /* we've forked. */ - if (parent_or_child == 1) { + if (child->ipc_fds[0] == -1) { configfree(obj, dsi); obj->ipc_fd = child->ipc_fds[1]; - close(child->ipc_fds[0]); /* Close parent IPC fd */ free(child); afp_over_dsi(obj); /* start a session */ exit (0); diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c index af492528..4cd5fb7c 100644 --- a/etc/afpd/volume.c +++ b/etc/afpd/volume.c @@ -57,49 +57,6 @@ extern int afprun(int root, char *cmd, int *outfd); -static void showvol(const ucs2_t *name) -{ - struct vol *volume = getvolumes(); - - for ( ; volume; volume = volume->v_next ) { - if (volume->v_hide && !strcasecmp_w( volume->v_name, name ) ) { - volume->v_hide = 0; - return; - } - } -} - -static void closevol(struct vol *vol) -{ - if (!vol) - return; - - vol->v_flags &= ~AFPVOL_OPEN; - - of_closevol(vol); - - dir_free( vol->v_root ); - vol->v_root = NULL; - if (vol->v_cdb != NULL) { - cnid_close(vol->v_cdb); - vol->v_cdb = NULL; - } - - if (vol->v_postexec) { - afprun(0, vol->v_postexec, NULL); - } - if (vol->v_root_postexec) { - afprun(1, vol->v_root_postexec, NULL); - } - - if (vol->v_deleted) { - showvol(vol->v_name); - volume_free(vol); - volume_unlink(vol); - free(vol); - } -} - /*! * Read band-size info from Info.plist XML file of an TM sparsebundle * @@ -586,7 +543,7 @@ int afp_getsrvrparms(AFPObj *obj, char *ibuf _U_, size_t ibuflen _U_, char *rbuf int vcnt; size_t len; - load_volumes(obj, of_closevol); + load_volumes(obj, closevol); data = rbuf + 5; for ( vcnt = 0, volume = getvolumes(); volume; volume = volume->v_next ) { @@ -606,9 +563,6 @@ int afp_getsrvrparms(AFPObj *obj, char *ibuf _U_, size_t ibuflen _U_, char *rbuf continue; /* no r-x access */ } } - if (volume->v_hide) { - continue; /* config file changed but the volume was mounted */ - } if (utf8_encoding(obj)) { len = ucs2_to_charset_allocate(CH_UTF8_MAC, &namebuf, volume->v_u8mname); @@ -775,7 +729,7 @@ int afp_openvol(AFPObj *obj, char *ibuf, size_t ibuflen _U_, char *rbuf, size_t if ((len + 1) & 1) /* pad to an even boundary */ ibuf++; - load_volumes(obj, of_closevol); + load_volumes(obj, closevol); for ( volume = getvolumes(); volume; volume = volume->v_next ) { if ( strcasecmp_w( (ucs2_t*) volname, volume->v_name ) == 0 ) { @@ -943,6 +897,34 @@ openvol_err: return ret; } +void closevol(struct vol *vol) +{ + if (!vol) + return; + + vol->v_flags &= ~AFPVOL_OPEN; + + of_closevol(vol); + + dir_free( vol->v_root ); + vol->v_root = NULL; + if (vol->v_cdb != NULL) { + cnid_close(vol->v_cdb); + vol->v_cdb = NULL; + } + + if (vol->v_postexec) { + afprun(0, vol->v_postexec, NULL); + } + if (vol->v_root_postexec) { + afprun(1, vol->v_root_postexec, NULL); + } + + volume_free(vol); + volume_unlink(vol); + free(vol); +} + /* ------------------------- */ void close_all_vol(void) { diff --git a/etc/afpd/volume.h b/etc/afpd/volume.h index ed59b244..b1c750a5 100644 --- a/etc/afpd/volume.h +++ b/etc/afpd/volume.h @@ -29,6 +29,6 @@ int afp_getsrvrparms (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size int afp_closevol (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen); /* netatalk functions */ -extern void close_all_vol (void); - +extern void close_all_vol(void); +extern void closevol(struct vol *vol); #endif diff --git a/include/atalk/netatalk_conf.h b/include/atalk/netatalk_conf.h index 3384f3d5..a8d525f5 100644 --- a/include/atalk/netatalk_conf.h +++ b/include/atalk/netatalk_conf.h @@ -22,8 +22,8 @@ extern int afp_config_parse(AFPObj *obj); -extern int load_volumes(AFPObj *obj, void (*delvol_fn)(const struct vol *)); -extern void unload_volumes(void); +extern int load_volumes(AFPObj *obj, void (*delvol_fn)(struct vol *)); +extern void unload_volumes(AFPObj *obj); extern struct vol *getvolumes(void); extern struct vol *getvolbyvid(const uint16_t); extern struct vol *getvolbypath(const char *path); diff --git a/include/atalk/server_child.h b/include/atalk/server_child.h index a86a7568..262ee201 100644 --- a/include/atalk/server_child.h +++ b/include/atalk/server_child.h @@ -35,8 +35,6 @@ typedef struct server_child_data { struct server_child_data **prevp, *next; } afp_child_t; -extern int parent_or_child; - /* server_child.c */ extern server_child *server_child_alloc (const int, const int); extern afp_child_t *server_child_add (server_child *, int, pid_t, uint ipc_fds[2]); diff --git a/include/atalk/volume.h b/include/atalk/volume.h index e495fe54..18a841a8 100644 --- a/include/atalk/volume.h +++ b/include/atalk/volume.h @@ -78,8 +78,10 @@ struct vol { char *v_dbpath; char *v_cnidserver; char *v_cnidport; +#if 0 int v_hide; /* new volume wait until old volume is closed */ int v_new; /* volume deleted but there's a new one with the same name */ +#endif int v_deleted; /* volume open but deleted in new config file */ char *v_root_preexec; char *v_preexec; diff --git a/libatalk/dsi/dsi_getsess.c b/libatalk/dsi/dsi_getsess.c index a50136db..5debd037 100644 --- a/libatalk/dsi/dsi_getsess.c +++ b/libatalk/dsi/dsi_getsess.c @@ -114,9 +114,11 @@ afp_child_t *dsi_getsession(DSI *dsi, server_child *serv_children, int tickleval dsi_opensession(dsi); if ((child = calloc(1, sizeof(afp_child_t))) == NULL) exit(EXITERR_SYS); + + child->ipc_fds[0] = -1; child->ipc_fds[1] = ipc_fds[1]; + close(ipc_fds[0]); return child; - break; default: /* just close */ LOG(log_info, logtype_dsi, "DSIUnknown %d", dsi->header.dsi_command); diff --git a/libatalk/dsi/dsi_tcp.c b/libatalk/dsi/dsi_tcp.c index 54325253..37a00bf4 100644 --- a/libatalk/dsi/dsi_tcp.c +++ b/libatalk/dsi/dsi_tcp.c @@ -119,9 +119,6 @@ static int dsi_tcp_open(DSI *dsi) uint8_t block[DSI_BLOCKSIZ]; size_t stored; - /* Immediateyl mark globally that we're a child now */ - parent_or_child = 1; - /* reset signals */ server_reset_signal(); diff --git a/libatalk/util/netatalk_conf.c b/libatalk/util/netatalk_conf.c index 2324e682..fe3b956a 100644 --- a/libatalk/util/netatalk_conf.c +++ b/libatalk/util/netatalk_conf.c @@ -44,48 +44,10 @@ #include #include -#define VOLOPT_ALLOW 0 /* user allow list */ -#define VOLOPT_DENY 1 /* user deny list */ -#define VOLOPT_RWLIST 2 /* user rw list */ -#define VOLOPT_ROLIST 3 /* user ro list */ -#define VOLOPT_PASSWORD 4 /* volume password */ -#define VOLOPT_CASEFOLD 5 /* character case mangling */ -#define VOLOPT_FLAGS 6 /* various flags */ -#define VOLOPT_DBPATH 7 /* path to database */ -#define VOLOPT_LIMITSIZE 8 /* Limit the size of the volume */ -/* Usable slot: 9 */ -#define VOLOPT_VETO 10 /* list of veto filespec */ -#define VOLOPT_PREEXEC 11 /* preexec command */ -#define VOLOPT_ROOTPREEXEC 12 /* root preexec command */ -#define VOLOPT_POSTEXEC 13 /* postexec command */ -#define VOLOPT_ROOTPOSTEXEC 14 /* root postexec command */ -#define VOLOPT_ENCODING 15 /* mac encoding (pre OSX)*/ -#define VOLOPT_MACCHARSET 16 -#define VOLOPT_CNIDSCHEME 17 -#define VOLOPT_ADOUBLE 18 /* adouble version */ -/* Usable slot: 19/20 */ -#define VOLOPT_UMASK 21 -#define VOLOPT_ALLOWED_HOSTS 22 -#define VOLOPT_DENIED_HOSTS 23 -#define VOLOPT_DPERM 24 /* dperm default directories perms */ -#define VOLOPT_FPERM 25 /* fperm default files perms */ -#define VOLOPT_DFLTPERM 26 /* perm */ -#define VOLOPT_EA_VFS 27 /* Extended Attributes vfs indirection */ -#define VOLOPT_CNIDSERVER 28 /* CNID Server ip address*/ -#define VOLOPT_CNIDPORT 30 /* CNID server tcp port */ - -#define VOLOPT_MAX 31 /* <== IMPORTANT !!!!!! */ -#define VOLOPT_NUM (VOLOPT_MAX + 1) - #define VOLPASSLEN 8 #define IS_VAR(a, b) (strncmp((a), (b), 2) == 0) -struct vol_option { - char *c_value; - int i_value; -}; - /************************************************************** * Locals **************************************************************/ @@ -291,23 +253,6 @@ static int check_vol_acl_support(const struct vol *vol) return ret; } -static void volfree(struct vol_option *options, const struct vol_option *save) -{ - int i; - - if (save) { - for (i = 0; i < VOLOPT_MAX; i++) { - if (options[i].c_value && (options[i].c_value != save[i].c_value)) - free(options[i].c_value); - } - } else { - for (i = 0; i < VOLOPT_MAX; i++) { - if (options[i].c_value) - free(options[i].c_value); - } - } -} - /* * Handle variable substitutions. here's what we understand: * $b -> basename of path @@ -335,10 +280,10 @@ static void volfree(struct vol_option *options, const struct vol_option *save) static char *volxlate(const AFPObj *obj, char *dest, size_t destlen, - char *src, + const char *src, const struct passwd *pwd, - char *path, - char *volname) + const char *path, + const char *volname) { char *p, *r; const char *q; @@ -464,188 +409,363 @@ static char *volxlate(const AFPObj *obj, return ret; } -/* -------------------- */ -static void setoption(struct vol_option *options, const struct vol_option *save, int opt, const char *val) +/*! + * check access list + * + * this function wants something of the following form: + * "@group,name,name2,@group2,name3" + * A NULL argument allows everybody to have access. + * We return three things: + * -1: no list + * 0: list exists, but name isn't in it + * 1: in list + */ +static int accessvol(const AFPObj *obj, const char *args, const char *name) { - if (options[opt].c_value && (!save || options[opt].c_value != save[opt].c_value)) - free(options[opt].c_value); - options[opt].c_value = strdup(val); + char buf[MAXPATHLEN + 1], *p; + struct group *gr; + + if (!args) + return -1; + + strlcpy(buf, args, sizeof(buf)); + if ((p = strtok(buf, ",")) == NULL) /* nothing, return okay */ + return -1; + + while (p) { + if (*p == '@') { /* it's a group */ + if ((gr = getgrnam(p + 1)) && gmem(gr->gr_gid, obj->ngroups, obj->groups)) + return 1; + } else if (strcasecmp(p, name) == 0) /* it's a user name */ + return 1; + p = strtok(NULL, ","); + } + + return 0; } -/* Parse iniconfig and initalize volume options */ -static void volset(const dictionary *conf, const char *vol, struct vol_option *options, const struct vol_option *save) +static int hostaccessvol(const AFPObj *obj, const char *volname, const char *args) { - const char *val; - char *p, *q; + int mask_int; + char buf[MAXPATHLEN + 1], *p, *b; + struct sockaddr_storage client; + const DSI *dsi = obj->dsi; - if (val = iniparser_getstring(conf, vol, "allow", NULL)) - setoption(options, save, VOLOPT_ALLOW, val); + if (!args) + return -1; - if (val = iniparser_getstring(conf, vol, "deny", NULL)) - setoption(options, save, VOLOPT_DENY, val); + strlcpy(buf, args, sizeof(buf)); + if ((p = strtok_r(buf, ",", &b)) == NULL) /* nothing, return okay */ + return -1; - if (val = iniparser_getstring(conf, vol, "rwlist", NULL)) - setoption(options, save, VOLOPT_RWLIST, val); + while (p) { + int ret; + char *ipaddr, *mask_char; + struct addrinfo hints, *ai; - if (val = iniparser_getstring(conf, vol, "rolist", NULL)) - setoption(options, save, VOLOPT_ROLIST, val); + ipaddr = strtok(p, "/"); + mask_char = strtok(NULL,"/"); - if (val = iniparser_getstring(conf, vol, "volcharset", NULL)) - setoption(options, save, VOLOPT_ENCODING, val); + /* Get address from string with getaddrinfo */ + memset(&hints, 0, sizeof hints); + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + if ((ret = getaddrinfo(ipaddr, NULL, &hints, &ai)) != 0) { + LOG(log_error, logtype_afpd, "hostaccessvol: getaddrinfo: %s\n", gai_strerror(ret)); + continue; + } - if (val = iniparser_getstring(conf, vol, "maccharset", NULL)) - setoption(options, save, VOLOPT_MACCHARSET, val); + /* netmask */ + if (mask_char != NULL) + mask_int = atoi(mask_char); /* apply_ip_mask does range checking on it */ + else { + if (ai->ai_family == AF_INET) /* IPv4 */ + mask_int = 32; + else /* IPv6 */ + mask_int = 128; + } - if (val = iniparser_getstring(conf, vol, "veto", NULL)) - setoption(options, save, VOLOPT_VETO, val); + /* Apply mask to addresses */ + client = dsi->client; + apply_ip_mask((struct sockaddr *)&client, mask_int); + apply_ip_mask(ai->ai_addr, mask_int); - if (val = iniparser_getstring(conf, vol, "cnidscheme", NULL)) - setoption(options, save, VOLOPT_CNIDSCHEME, val); + if (compare_ip((struct sockaddr *)&client, ai->ai_addr) == 0) { + freeaddrinfo(ai); + return 1; + } - if (val = iniparser_getstring(conf, vol, "dbpath", NULL)) - setoption(options, save, VOLOPT_DBPATH, val); + /* next address */ + freeaddrinfo(ai); + p = strtok_r(NULL, ",", &b); + } - if (val = iniparser_getstring(conf, vol, "password", NULL)) - setoption(options, save, VOLOPT_PASSWORD, val); + return 0; +} - if (val = iniparser_getstring(conf, vol, "root_preexec", NULL)) - setoption(options, save, VOLOPT_ROOTPREEXEC, val); +/*! + * Get option string from config, use default value if not set + * + * @param conf (r) config handle + * @param vol (r) volume name + * @param opt (r) option + * @param def (r) if "option" is not found in "name", try to find it in section "def" + * + * @returns const option string or NULL + */ +static const char *getoption(const dictionary *conf, const char *vol, const char *opt, const char *def) +{ + EC_INIT; + const char *result = NULL; - if (val = iniparser_getstring(conf, vol, "preexec", NULL)) - setoption(options, save, VOLOPT_PREEXEC, val); + if (!(result = iniparser_getstring(conf, vol, opt, NULL))) + result = iniparser_getstring(conf, vol, def, NULL); + +EC_CLEANUP: + return result; +} - if (val = iniparser_getstring(conf, vol, "root_postexec", NULL)) - setoption(options, save, VOLOPT_ROOTPOSTEXEC, val); +/*! + * Create volume struct + * + * @param obj (r) handle + * @param pwd (r) struct passwd of logged in user, may be NULL in master afpd + * @param path (r) volume path + * @param name (r) volume name + * @param preset (r) default preset, may be NULL + * @returns 0 on success, -1 on error + */ +static int creatvol(AFPObj *obj, + const struct passwd *pwd, + const char *path, + const char *name, + const char *preset) +{ + EC_INIT; + struct vol *volume = NULL; + int suffixlen, vlen, tmpvlen, u8mvlen, macvlen; + char tmpname[AFPVOL_U8MNAMELEN+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; - if (val = iniparser_getstring(conf, vol, "postexec", NULL)) - setoption(options, save, VOLOPT_POSTEXEC, val); + LOG(log_debug, logtype_afpd, "createvol: Volume '%s'", name); - if (val = iniparser_getstring(conf, vol, "allowed_hosts", NULL)) - setoption(options, save, VOLOPT_ALLOWED_HOSTS, val); + if ( name == NULL || *name == '\0' ) { + if ((name = strrchr( path, '/' )) == NULL) { + EC_FAIL; + } - if (val = iniparser_getstring(conf, vol, "denied_hosts", NULL)) - setoption(options, save, VOLOPT_DENIED_HOSTS, val); + /* if you wish to share /, you need to specify a name. */ + if (*++name == '\0') + EC_FAIL; + } - if (val = iniparser_getstring(conf, vol, "umask", NULL)) - options[VOLOPT_UMASK].i_value = (int)strtol(val, NULL, 8); + /* Once volumes are loaded, we never change options again, we just delete em when they're removed from afp.conf */ + for (struct vol *vol = Volumes; vol; vol = vol->v_next) { + if (STRCMP(name, ==, vol->v_localname)) { + LOG(log_debug, logtype_afpd, "createvol('%s'): already loaded", name); + vol->v_deleted = 0; + goto EC_CLEANUP; + } + } - if (val = iniparser_getstring(conf, vol, "dperm", NULL)) - options[VOLOPT_DPERM].i_value = (int)strtol(val, NULL, 8); + /* + * Check allow/deny lists: + * allow -> either no list (-1), or in list (1) + * deny -> either no list (-1), or not in list (0) + */ + if (pwd) { + if (accessvol(obj, getoption(obj->iniconfig, name, "deny", preset), pwd->pw_name) == 1) + goto EC_CLEANUP; + if (accessvol(obj, getoption(obj->iniconfig, name, "allow", preset), pwd->pw_name) == 0) + goto EC_CLEANUP; + if (hostaccessvol(obj, name, getoption(obj->iniconfig, name, "denied_hosts", preset)) == 1) + goto EC_CLEANUP; + if (hostaccessvol(obj, name, getoption(obj->iniconfig, name, "allowed_hosts", preset)) == 0) + goto EC_CLEANUP; + } - if (val = iniparser_getstring(conf, vol, "fperm", NULL)) - options[VOLOPT_FPERM].i_value = (int)strtol(val, NULL, 8); + EC_NULL( volume = calloc(1, sizeof(struct vol)) ); - if (val = iniparser_getstring(conf, vol, "perm", NULL)) - options[VOLOPT_DFLTPERM].i_value = (int)strtol(val, NULL, 8); + volume->v_flags = AFPVOL_USEDOTS | AFPVOL_UNIX_PRIV; +#ifdef HAVE_ACLS + volume->v_flags |= AFPVOL_ACLS; +#endif + volume->v_vfs_ea = AFPVOL_EA_AUTO; + volume->v_umask = obj->options.umask; - if (val = iniparser_getstring(conf, vol, "volsizelimit", NULL)) - options[VOLOPT_LIMITSIZE].i_value = (uint32_t)strtoul(val, NULL, 10); + if (val = getoption(obj->iniconfig, name, "password", preset)) + EC_NULL( volume->v_password = strdup(val) ); - if (val = iniparser_getstring(conf, vol, "casefold", NULL)) { - if (strcasecmp(val, "tolower") == 0) - options[VOLOPT_CASEFOLD].i_value = AFPVOL_UMLOWER; - else if (strcasecmp(val, "toupper") == 0) - options[VOLOPT_CASEFOLD].i_value = AFPVOL_UMUPPER; - else if (strcasecmp(val, "xlatelower") == 0) - options[VOLOPT_CASEFOLD].i_value = AFPVOL_UUPPERMLOWER; - else if (strcasecmp(val, "xlateupper") == 0) - options[VOLOPT_CASEFOLD].i_value = AFPVOL_ULOWERMUPPER; + if (val = getoption(obj->iniconfig, name, "veto", preset)) + EC_NULL( volume->v_password = strdup(val) ); + + if (val = getoption(obj->iniconfig, name, "volcharset", preset)) + EC_NULL( volume->v_volcodepage = strdup(val) ); + + if (val = getoption(obj->iniconfig, name, "maccharset", preset)) + EC_NULL( volume->v_maccodepage = strdup(val) ); + + if (val = getoption(obj->iniconfig, name, "dbpath", preset)) + EC_NULL( volume->v_dbpath = volxlate(obj, NULL, MAXPATHLEN, val, pwd, path, name) ); + + if (val = getoption(obj->iniconfig, name, "cnidscheme", preset)) + EC_NULL( volume->v_cnidscheme = strdup(val) ); + + if (val = getoption(obj->iniconfig, name, "umask", preset)) + volume->v_umask = (int)strtol(val, NULL, 8); + + if (val = getoption(obj->iniconfig, name, "dperm", preset)) + volume->v_dperm = (int)strtol(val, NULL, 8); + + if (val = getoption(obj->iniconfig, name, "fperm", preset)) + volume->v_fperm = (int)strtol(val, NULL, 8); + + if (val = getoption(obj->iniconfig, name, "perm", preset)) + volume->v_perm = (int)strtol(val, NULL, 8); + + if (val = getoption(obj->iniconfig, name, "volsizelimit", preset)) + volume->v_limitsize = (uint32_t)strtoul(val, NULL, 10); + + if (val = getoption(obj->iniconfig, name, "preexec", preset)) + EC_NULL( volume->v_preexec = volxlate(obj, NULL, MAXPATHLEN, val, pwd, path, name) ); + + if (val = getoption(obj->iniconfig, name, "postexec", preset)) + EC_NULL( volume->v_postexec = volxlate(obj, NULL, MAXPATHLEN, val, pwd, path, name) ); + + if (val = getoption(obj->iniconfig, name, "root_preexec", preset)) + EC_NULL( volume->v_root_preexec = volxlate(obj, NULL, MAXPATHLEN, val, pwd, path, name) ); + + if (val = getoption(obj->iniconfig, name, "root_postexec", preset)) + EC_NULL( volume->v_root_postexec = volxlate(obj, NULL, MAXPATHLEN, val, pwd, path, name) ); + + if (val = getoption(obj->iniconfig, name, "adouble", preset)) { + if (strcmp(val, "v2") == 0) + volume->v_adouble = AD_VERSION2; + else if (strcmp(val, "ea") == 0) + volume->v_adouble = AD_VERSION_EA; + } else { + volume->v_adouble = AD_VERSION; } - if (val = iniparser_getstring(conf, vol, "adouble", NULL)) { - if (strcasecmp(val, "v2") == 0) - options[VOLOPT_ADOUBLE].i_value = AD_VERSION2; - else if (strcasecmp(val, "ea") == 0) - options[VOLOPT_ADOUBLE].i_value = AD_VERSION_EA; + if (val = getoption(obj->iniconfig, name, "cnidserver", preset)) { + EC_NULL( p = strdup(val) ); + volume->v_cnidserver = p; + if (q = strrchr(val, ':')) { + *q++ = 0; + volume->v_cnidport = q; + } else { + volume->v_cnidport = "4700"; + } + } - if (val = iniparser_getstring(conf, vol, "ea", NULL)) { + if (val = getoption(obj->iniconfig, name, "ea", preset)) { if (strcasecmp(val, "ad") == 0) - options[VOLOPT_EA_VFS].i_value = AFPVOL_EA_AD; + volume->v_vfs_ea = AFPVOL_EA_AD; else if (strcasecmp(val, "sys") == 0) - options[VOLOPT_EA_VFS].i_value = AFPVOL_EA_SYS; + volume->v_vfs_ea = AFPVOL_EA_SYS; else if (strcasecmp(val, "none") == 0) - options[VOLOPT_EA_VFS].i_value = AFPVOL_EA_NONE; + volume->v_vfs_ea = AFPVOL_EA_NONE; } - if (p = iniparser_getstrdup(conf, vol, "cnidserver", NULL)) { - if (q = strrchr(val, ':')) { - *q = 0; - setoption(options, save, VOLOPT_CNIDPORT, q + 1); - } - setoption(options, save, VOLOPT_CNIDSERVER, p); - LOG(log_debug, logtype_afpd, "CNID Server for volume '%s': %s:%s", - vol, p, q ? q + 1 : "4700"); - free(p); + if (val = getoption(obj->iniconfig, name, "casefold", preset)) { + if (strcasecmp(val, "tolower") == 0) + volume->v_casefold = AFPVOL_UMLOWER; + else if (strcasecmp(val, "toupper") == 0) + volume->v_casefold = AFPVOL_UMUPPER; + else if (strcasecmp(val, "xlatelower") == 0) + volume->v_casefold = AFPVOL_UUPPERMLOWER; + else if (strcasecmp(val, "xlateupper") == 0) + volume->v_casefold = AFPVOL_ULOWERMUPPER; } - if (q = iniparser_getstrdup(conf, vol, "options", NULL)) { + if (val = getoption(obj->iniconfig, name, "options", preset)) { + q = strdup(val); if (p = strtok(q, ", ")) { while (p) { if (strcasecmp(p, "ro") == 0) - options[VOLOPT_FLAGS].i_value |= AFPVOL_RO; + volume->v_flags |= AFPVOL_RO; else if (strcasecmp(p, "nohex") == 0) - options[VOLOPT_FLAGS].i_value |= AFPVOL_NOHEX; + volume->v_flags |= AFPVOL_NOHEX; else if (strcasecmp(p, "nousedots") == 0) - options[VOLOPT_FLAGS].i_value &= ~AFPVOL_USEDOTS; + volume->v_flags &= ~AFPVOL_USEDOTS; else if (strcasecmp(p, "invisibledots") == 0) - options[VOLOPT_FLAGS].i_value |= AFPVOL_USEDOTS; + volume->v_flags |= volume->v_flags; else if (strcasecmp(p, "nostat") == 0) - options[VOLOPT_FLAGS].i_value |= AFPVOL_NOSTAT; - else if (strcasecmp(p, "preexec_close") == 0) - options[VOLOPT_PREEXEC].i_value = 1; - else if (strcasecmp(p, "root_preexec_close") == 0) - options[VOLOPT_ROOTPREEXEC].i_value = 1; + volume->v_flags |= AFPVOL_NOSTAT; else if (strcasecmp(p, "noupriv") == 0) - options[VOLOPT_FLAGS].i_value &= ~AFPVOL_UNIX_PRIV; + volume->v_flags &= ~AFPVOL_UNIX_PRIV; else if (strcasecmp(p, "nodev") == 0) - options[VOLOPT_FLAGS].i_value |= AFPVOL_NODEV; + volume->v_flags |= AFPVOL_NODEV; else if (strcasecmp(p, "caseinsensitive") == 0) - options[VOLOPT_FLAGS].i_value |= AFPVOL_CASEINSEN; + volume->v_flags |= AFPVOL_CASEINSEN; else if (strcasecmp(p, "illegalseq") == 0) - options[VOLOPT_FLAGS].i_value |= AFPVOL_EILSEQ; + volume->v_flags |= AFPVOL_EILSEQ; else if (strcasecmp(p, "tm") == 0) - options[VOLOPT_FLAGS].i_value |= AFPVOL_TM; + volume->v_flags |= AFPVOL_TM; else if (strcasecmp(p, "searchdb") == 0) - options[VOLOPT_FLAGS].i_value |= AFPVOL_SEARCHDB; + volume->v_flags |= AFPVOL_SEARCHDB; else if (strcasecmp(p, "nonetids") == 0) - options[VOLOPT_FLAGS].i_value |= AFPVOL_NONETIDS; + volume->v_flags |= AFPVOL_NONETIDS; else if (strcasecmp(p, "noacls") == 0) - options[VOLOPT_FLAGS].i_value &= ~AFPVOL_ACLS; + volume->v_flags &= ~AFPVOL_ACLS; else if (strcasecmp(p, "nov2toeaconv") == 0) - options[VOLOPT_FLAGS].i_value |= AFPVOL_NOV2TOEACONV; + 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); } -} - -/* ------------------------------- */ -static int creatvol(const AFPObj *obj, const struct passwd *pwd, - char *path, char *name, - struct vol_option *options) -{ - struct vol *volume; - int suffixlen, vlen, tmpvlen, u8mvlen, macvlen; - int hide = 0; - char tmpname[AFPVOL_U8MNAMELEN+1]; - ucs2_t u8mtmpname[(AFPVOL_U8MNAMELEN+1)*2], mactmpname[(AFPVOL_MACNAMELEN+1)*2]; - char suffix[6]; /* max is #FFFF */ - uint16_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 */ - } - - /* if you wish to share /, you need to specify a name. */ - if (*++name == '\0') - return -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 (pwd) { + if (accessvol(obj, getoption(obj->iniconfig, name, "rolist", preset), pwd->pw_name) == 1 + || accessvol(obj, getoption(obj->iniconfig, name, "rwlist", preset), pwd->pw_name) == 0) + volume->v_flags |= AFPVOL_RO; } + if ((volume->v_flags & AFPVOL_NODEV)) + volume->v_ad_options |= ADVOL_NODEV; + if ((volume->v_flags & AFPVOL_UNIX_PRIV)) + volume->v_ad_options |= ADVOL_UNIXPRIV; + if ((volume->v_flags & AFPVOL_INV_DOTS)) + 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; + + if ((volume->v_casefold & AFPVOL_MTOUUPPER)) + volume->v_mtou_flags |= CONV_TOUPPER; + else if ((volume->v_casefold & AFPVOL_MTOULOWER)) + volume->v_mtou_flags |= CONV_TOLOWER; + + /* Unix to Mac conversion flags*/ + volume->v_utom_flags = CONV_IGNORE | CONV_UNESCAPEHEX; + if ((volume->v_casefold & AFPVOL_UTOMUPPER)) + volume->v_utom_flags |= CONV_TOUPPER; + else if ((volume->v_casefold & AFPVOL_UTOMLOWER)) + volume->v_utom_flags |= CONV_TOLOWER; + if ((volume->v_flags & AFPVOL_EILSEQ)) + volume->v_utom_flags |= CONV__EILSEQ; + /* suffix for mangling use (lastvid + 1) */ /* because v_vid has not been decided yet. */ suffixlen = sprintf(suffix, "#%X", lastvid + 1 ); @@ -674,7 +794,7 @@ static int creatvol(const AFPObj *obj, const struct passwd *pwd, /* Secondly convert name from UTF8-MAC to UCS2 */ if ( 0 >= ( u8mvlen = convert_string(CH_UTF8_MAC, CH_UCS2, tmpname, tmpvlen, u8mtmpname, AFPVOL_U8MNAMELEN*2)) ) - return -1; + EC_FAIL; LOG(log_maxdebug, logtype_afpd, "createvol: Volume '%s' -> UTF8-MAC Name: '%s'", name, tmpname); @@ -712,171 +832,33 @@ static int creatvol(const AFPObj *obj, const struct passwd *pwd, tmpvlen, mactmpname, AFPVOL_U8MNAMELEN*2)) ) - return -1; + EC_FAIL; LOG(log_maxdebug, logtype_afpd, "createvol: Volume '%s' -> Longname: '%s'", name, tmpname); - /* check duplicate */ - for ( volume = Volumes; volume; volume = volume->v_next ) { - if ((utf8_encoding(obj) && (strcasecmp_w(volume->v_u8mname, u8mtmpname) == 0)) - || - (!utf8_encoding(obj) && (strcasecmp_w(volume->v_macname, mactmpname) == 0))) { - LOG (log_error, logtype_afpd, - "Duplicate volume name, check AppleVolumes files: previous: \"%s\", new: \"%s\"", - volume->v_localname, name); - if (volume->v_deleted) { - volume->v_new = hide = 1; - } - else { - return -1; /* Won't be able to access it, anyway... */ - } - } - } - - if (!( volume = (struct vol *)calloc(1, sizeof( struct vol ))) ) { - LOG(log_error, logtype_afpd, "creatvol: malloc: %s", strerror(errno) ); - return -1; - } - if ( NULL == ( volume->v_localname = strdup(name))) { - LOG(log_error, logtype_afpd, "creatvol: malloc: %s", strerror(errno) ); - free(volume); - return -1; - } - - if ( NULL == ( volume->v_u8mname = strdup_w(u8mtmpname))) { - LOG(log_error, logtype_afpd, "creatvol: malloc: %s", strerror(errno) ); - volume_free(volume); - free(volume); - return -1; - } - if ( NULL == ( volume->v_macname = strdup_w(mactmpname))) { - LOG(log_error, logtype_afpd, "creatvol: malloc: %s", strerror(errno) ); - volume_free(volume); - free(volume); - return -1; - } - if (!( volume->v_path = (char *)malloc( strlen( path ) + 1 )) ) { - LOG(log_error, logtype_afpd, "creatvol: malloc: %s", strerror(errno) ); - volume_free(volume); - free(volume); - return -1; - } + 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) ); - volume->v_name = utf8_encoding(obj)?volume->v_u8mname:volume->v_macname; - volume->v_hide = hide; - strcpy( volume->v_path, path ); + volume->v_name = utf8_encoding(obj) ? volume->v_u8mname : volume->v_macname; + strcpy(volume->v_path, path); #ifdef __svr4__ volume->v_qfd = -1; #endif /* __svr4__ */ + /* 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)) { LOG(log_debug, logtype_afpd, "creatvol(\"%s\"): disabling ACL support", volume->v_path); - options[VOLOPT_FLAGS].i_value &= ~AFPVOL_ACLS; + volume->v_flags &= ~AFPVOL_ACLS; } #endif - /* handle options */ - if (options) { - volume->v_casefold = options[VOLOPT_CASEFOLD].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; - - volume->v_ad_options = 0; - if ((volume->v_flags & AFPVOL_NODEV)) - volume->v_ad_options |= ADVOL_NODEV; - if ((volume->v_flags & AFPVOL_UNIX_PRIV)) - volume->v_ad_options |= ADVOL_UNIXPRIV; - if ((volume->v_flags & AFPVOL_INV_DOTS)) - volume->v_ad_options |= ADVOL_INVDOTS; - - if (options[VOLOPT_PASSWORD].c_value) - volume->v_password = strdup(options[VOLOPT_PASSWORD].c_value); - - if (options[VOLOPT_VETO].c_value) - volume->v_veto = strdup(options[VOLOPT_VETO].c_value); - - if (options[VOLOPT_ENCODING].c_value) - volume->v_volcodepage = strdup(options[VOLOPT_ENCODING].c_value); - - if (options[VOLOPT_MACCHARSET].c_value) - volume->v_maccodepage = strdup(options[VOLOPT_MACCHARSET].c_value); - - if (options[VOLOPT_DBPATH].c_value) - volume->v_dbpath = volxlate(obj, NULL, MAXPATHLEN, options[VOLOPT_DBPATH].c_value, pwd, path, name); - - if (options[VOLOPT_CNIDSCHEME].c_value) - volume->v_cnidscheme = strdup(options[VOLOPT_CNIDSCHEME].c_value); - - if (options[VOLOPT_CNIDSERVER].c_value) - volume->v_cnidserver = strdup(options[VOLOPT_CNIDSERVER].c_value); - - if (options[VOLOPT_CNIDPORT].c_value) - volume->v_cnidport = strdup(options[VOLOPT_CNIDPORT].c_value); - - if (options[VOLOPT_UMASK].i_value) - volume->v_umask = (mode_t)options[VOLOPT_UMASK].i_value; - - if (options[VOLOPT_DPERM].i_value) - volume->v_dperm = (mode_t)options[VOLOPT_DPERM].i_value; - - if (options[VOLOPT_FPERM].i_value) - volume->v_fperm = (mode_t)options[VOLOPT_FPERM].i_value; - - if (options[VOLOPT_DFLTPERM].i_value) - volume->v_perm = (mode_t)options[VOLOPT_DFLTPERM].i_value; - - if (options[VOLOPT_ADOUBLE].i_value) - volume->v_adouble = options[VOLOPT_ADOUBLE].i_value; - else - volume->v_adouble = AD_VERSION; - - if (options[VOLOPT_LIMITSIZE].i_value) - volume->v_limitsize = options[VOLOPT_LIMITSIZE].i_value; - - /* Mac to Unix conversion flags*/ - volume->v_mtou_flags = 0; - 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; - - if ((volume->v_casefold & AFPVOL_MTOUUPPER)) - volume->v_mtou_flags |= CONV_TOUPPER; - else if ((volume->v_casefold & AFPVOL_MTOULOWER)) - volume->v_mtou_flags |= CONV_TOLOWER; - - /* Unix to Mac conversion flags*/ - volume->v_utom_flags = CONV_IGNORE | CONV_UNESCAPEHEX; - if ((volume->v_casefold & AFPVOL_UTOMUPPER)) - volume->v_utom_flags |= CONV_TOUPPER; - else if ((volume->v_casefold & AFPVOL_UTOMLOWER)) - volume->v_utom_flags |= CONV_TOLOWER; - - if ((volume->v_flags & AFPVOL_EILSEQ)) - volume->v_utom_flags |= CONV__EILSEQ; - - if (options[VOLOPT_PREEXEC].c_value) - volume->v_preexec = volxlate(obj, NULL, MAXPATHLEN, options[VOLOPT_PREEXEC].c_value, pwd, path, name); - volume->v_preexec_close = options[VOLOPT_PREEXEC].i_value; - - if (options[VOLOPT_POSTEXEC].c_value) - volume->v_postexec = volxlate(obj, NULL, MAXPATHLEN, options[VOLOPT_POSTEXEC].c_value, pwd, path, name); - - if (options[VOLOPT_ROOTPREEXEC].c_value) - volume->v_root_preexec = volxlate(obj, NULL, MAXPATHLEN, options[VOLOPT_ROOTPREEXEC].c_value, pwd, path, name); - volume->v_root_preexec_close = options[VOLOPT_ROOTPREEXEC].i_value; - - if (options[VOLOPT_ROOTPOSTEXEC].c_value) - volume->v_root_postexec = volxlate(obj, NULL, MAXPATHLEN, options[VOLOPT_ROOTPOSTEXEC].c_value, pwd, path, name); - } volume->v_dperm |= volume->v_perm; volume->v_fperm |= volume->v_perm; @@ -886,7 +868,7 @@ static int creatvol(const AFPObj *obj, const struct passwd *pwd, initvol_vfs(volume); /* get/store uuid from file in afpd master*/ - if ((parent_or_child == 0) && (volume->v_flags & AFPVOL_TM)) { + if (!(pwd) && (volume->v_flags & AFPVOL_TM)) { char *uuid = get_vol_uuid(obj, volume->v_localname); if (!uuid) { LOG(log_error, logtype_afpd, "Volume '%s': couldn't get UUID", @@ -898,128 +880,26 @@ static int creatvol(const AFPObj *obj, const struct passwd *pwd, } } + /* no errors shall happen beyond this point because the cleanup would mess the volume chain up */ volume->v_next = Volumes; Volumes = volume; volume->v_obj = obj; - return 0; -} -/* check access list. this function wants something of the following - * form: - * @group,name,name2,@group2,name3 - * - * a NULL argument allows everybody to have access. - * we return three things: - * -1: no list - * 0: list exists, but name isn't in it - * 1: in list - */ - -#ifndef NO_REAL_USER_NAME -/* authentication is case insensitive - * FIXME should we do the same with group name? - */ -#define access_strcmp strcasecmp - -#else -#define access_strcmp strcmp - -#endif - -static int accessvol(const AFPObj *obj, const char *args, const char *name) -{ - char buf[MAXPATHLEN + 1], *p; - struct group *gr; - - if (!args) - return -1; - - strlcpy(buf, args, sizeof(buf)); - if ((p = strtok(buf, ",")) == NULL) /* nothing, return okay */ - return -1; - - while (p) { - if (*p == '@') { /* it's a group */ - if ((gr = getgrnam(p + 1)) && gmem(gr->gr_gid, obj->ngroups, obj->groups)) - return 1; - } else if (access_strcmp(p, name) == 0) /* it's a user name */ - return 1; - p = strtok(NULL, ","); - } - - return 0; -} - -static int hostaccessvol(const AFPObj *obj, int type, const char *volname, const char *args) -{ - int mask_int; - char buf[MAXPATHLEN + 1], *p, *b; - struct sockaddr_storage client; - const DSI *dsi = obj->dsi; - - if (!args) - return -1; - - strlcpy(buf, args, sizeof(buf)); - if ((p = strtok_r(buf, ",", &b)) == NULL) /* nothing, return okay */ - return -1; - - while (p) { - int ret; - char *ipaddr, *mask_char; - struct addrinfo hints, *ai; - - ipaddr = strtok(p, "/"); - mask_char = strtok(NULL,"/"); - - /* Get address from string with getaddrinfo */ - memset(&hints, 0, sizeof hints); - hints.ai_family = AF_UNSPEC; - hints.ai_socktype = SOCK_STREAM; - if ((ret = getaddrinfo(ipaddr, NULL, &hints, &ai)) != 0) { - LOG(log_error, logtype_afpd, "hostaccessvol: getaddrinfo: %s\n", gai_strerror(ret)); - continue; - } - - /* netmask */ - if (mask_char != NULL) - mask_int = atoi(mask_char); /* apply_ip_mask does range checking on it */ - else { - if (ai->ai_family == AF_INET) /* IPv4 */ - mask_int = 32; - else /* IPv6 */ - mask_int = 128; - } - - /* Apply mask to addresses */ - client = dsi->client; - apply_ip_mask((struct sockaddr *)&client, mask_int); - apply_ip_mask(ai->ai_addr, mask_int); - - if (compare_ip((struct sockaddr *)&client, ai->ai_addr) == 0) { - if (type == VOLOPT_DENIED_HOSTS) - LOG(log_info, logtype_afpd, "AFP access denied for client IP '%s' to volume '%s' by denied list", - getip_string((struct sockaddr *)&client), volname); - freeaddrinfo(ai); - return 1; +EC_CLEANUP: + if (ret != 0) { + if (volume) { + volume_free(volume); + free(volume); } - - /* next address */ - freeaddrinfo(ai); - p = strtok_r(NULL, ",", &b); } - - if (type == VOLOPT_ALLOWED_HOSTS) - LOG(log_info, logtype_afpd, "AFP access denied for client IP '%s' to volume '%s', not in allowed list", - getip_string((struct sockaddr *)&dsi->client), volname); - return 0; + EC_EXIT; } /* ---------------------- */ static int volfile_changed(struct afp_options *p) { - struct stat st; + struct stat st; if (!stat(p->configfile, &st) && st.st_mtime > p->volfile.mtime) { p->volfile.mtime = st.st_mtime; @@ -1039,38 +919,28 @@ static int vol_section(const char *sec) return 1; } -/* ---------------------- +#define MAXPRESETLEN 100 +/*! * Read volumes from iniconfig and add the volumes contained within to * the global volume list. This gets called from the forked afpd childs. * The master now reads this too for Zeroconf announcements. */ -static int readvolfile(const AFPObj *obj, const struct passwd *pwent) +static int readvolfile(AFPObj *obj, const struct passwd *pwent) { + EC_INIT; char path[MAXPATHLEN + 1]; char volname[AFPVOL_U8MNAMELEN + 1]; char tmp[MAXPATHLEN + 1]; - char *u; + char preset[MAXPRESETLEN + 1]; + char *presettype; const char *p; + char *default_preset = NULL; int fd; - int i; + int i, havepreset; struct passwd *pw; - struct vol_option save_options[VOLOPT_NUM]; - struct vol_option default_options[VOLOPT_NUM]; - struct vol_option options[VOLOPT_NUM]; LOG(log_debug, logtype_afpd, "readvolfile: BEGIN"); - memset(default_options, 0, sizeof(default_options)); - - /* Enable some default options for all volumes */ - default_options[VOLOPT_FLAGS].i_value |= AFPVOL_USEDOTS | AFPVOL_UNIX_PRIV; -#ifdef HAVE_ACLS - default_options[VOLOPT_FLAGS].i_value |= AFPVOL_ACLS; -#endif - default_options[VOLOPT_EA_VFS].i_value = AFPVOL_EA_AUTO; - default_options[VOLOPT_UMASK].i_value = obj->options.umask; - memcpy(save_options, default_options, sizeof(options)); - int secnum = iniparser_getnsec(obj->iniconfig); LOG(log_debug, logtype_afpd, "readvolfile: sections: %d", secnum); const char *secname; @@ -1080,10 +950,35 @@ static int readvolfile(const AFPObj *obj, const struct passwd *pwent) if (!vol_section(secname)) continue; + havepreset = 0; + if ((p = iniparser_getstring(obj->iniconfig, secname, "preset", NULL))) { + if (strcmp(p, "yes") == 0) + /* it's a preset, we needn't do anything more with it here */ + continue; + + /* check for "preset = XXX", "preset = XXX:once", "preset = XXX:sub" and "preset = none"*/ + if (STRCMP(p, ==, "none")) { + default_preset = NULL; + } else { + /* in case no ":" is found or the part after ":" != "sub" we just copy the value to preset[]*/ + strlcpy(preset, p, MAXPRESETLEN); + + if ((presettype = strchr(preset, ':'))) + *presettype++ = 0; + + if (presettype && STRCMP(presettype, ==, "sub")) { + if (default_preset) + free(default_preset); + default_preset = strdup(preset); + } + havepreset = 1; + } + } + strlcpy(volname, secname, AFPVOL_U8MNAMELEN); LOG(log_debug, logtype_afpd, "readvolfile: volume: %s", volname); - if ((p = iniparser_getstrdup(obj->iniconfig, secname, "path", NULL)) == NULL) + if ((p = iniparser_getstring(obj->iniconfig, secname, "path", NULL)) == NULL) continue; strlcpy(path, p, MAXPATHLEN); strcpy(tmp, path); @@ -1091,78 +986,16 @@ static int readvolfile(const AFPObj *obj, const struct passwd *pwent) if (volxlate(obj, path, sizeof(path) - 1, tmp, pwent, NULL, NULL) == NULL) continue; - memcpy(options, default_options, sizeof(options)); - volset(obj->iniconfig, secname, options, default_options); - - /* 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 (pwent) { - if (accessvol(obj, options[VOLOPT_DENY].c_value, pwent->pw_name) == 1) - continue; - if (accessvol(obj, options[VOLOPT_ALLOW].c_value, pwent->pw_name) == 0) - continue; - if (hostaccessvol(obj, VOLOPT_DENIED_HOSTS, volname, options[VOLOPT_DENIED_HOSTS].c_value) == 1) - continue; - if (hostaccessvol(obj, VOLOPT_ALLOWED_HOSTS, volname, options[VOLOPT_ALLOWED_HOSTS].c_value) == 0) - continue; - } - - /* 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 (pwent && !(options[VOLOPT_FLAGS].i_value & AFPVOL_RO)) { - if (accessvol(obj, options[VOLOPT_ROLIST].c_value, pwent->pw_name) == 1 - || accessvol(obj, options[VOLOPT_RWLIST].c_value, pwent->pw_name) == 0) - options[VOLOPT_FLAGS].i_value |= AFPVOL_RO; - } - /* do variable substitution for volname */ if (volxlate(obj, tmp, sizeof(tmp) - 1, volname, pwent, path, NULL) == NULL) { - volfree(options, default_options); continue; } - creatvol(obj, pwent, path, tmp, options); - volfree(options, default_options); + creatvol(obj, pwent, path, tmp, havepreset ? preset : default_preset ? default_preset : NULL); } - volfree(save_options, NULL); - return( 0 ); -} -/* ------------------------------- */ -static void free_volumes(void) -{ - struct vol *vol; - struct vol *nvol, *ovol; - - for ( vol = Volumes; vol; vol = vol->v_next ) { - if (( vol->v_flags & AFPVOL_OPEN ) ) { - vol->v_deleted = 1; - continue; - } - volume_free(vol); - } - - for ( vol = Volumes, ovol = NULL; vol; vol = nvol) { - nvol = vol->v_next; - - if (vol->v_localname == NULL) { - if (Volumes == vol) { - Volumes = nvol; - ovol = Volumes; - } - else { - ovol->v_next = nvol; - } - free(vol); - } - else { - ovol = vol; - } - } +EC_CLEANUP: + EC_EXIT; } /************************************************************** @@ -1177,7 +1010,7 @@ void volume_unlink(struct vol *volume) struct vol *vol, *ovol, *nvol; if (volume == Volumes) { - Volumes = Volumes->v_next; + Volumes = NULL; return; } for ( vol = Volumes->v_next, ovol = Volumes; vol; vol = nvol) { @@ -1194,16 +1027,15 @@ void volume_unlink(struct vol *volume) } /*! - * Free all resources allocated in a struct vol + * Free all resources allocated in a struct vol, only struct dir *v_root can't be freed */ void volume_free(struct vol *vol) { + LOG(log_debug, logtype_afpd, "volume_free('%s'): BEGIN", vol->v_localname); + free(vol->v_localname); - vol->v_localname = NULL; free(vol->v_u8mname); - vol->v_u8mname = NULL; free(vol->v_macname); - vol->v_macname = NULL; free(vol->v_path); free(vol->v_password); free(vol->v_veto); @@ -1212,8 +1044,16 @@ void volume_free(struct vol *vol) free(vol->v_cnidscheme); free(vol->v_dbpath); free(vol->v_gvs); - if (vol->v_uuid) - free(vol->v_uuid); + 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); + + LOG(log_debug, logtype_afpd, "volume_free: END"); } /*! @@ -1224,7 +1064,7 @@ void volume_free(struct vol *vol) * @param obj (r) handle * @param delvol_fn (r) callback called for deleted volumes */ -int load_volumes(AFPObj *obj, void (*delvol_fn)(const struct vol *)) +int load_volumes(AFPObj *obj, void (*delvol_fn)(struct vol *)) { EC_INIT; int fd = -1; @@ -1238,9 +1078,12 @@ int load_volumes(AFPObj *obj, void (*delvol_fn)(const struct vol *)) if (Volumes) { if (!volfile_changed(&obj->options)) goto EC_CLEANUP; - /* TODO: volume reloading */ -// free_volumes(); - goto EC_CLEANUP; + for (vol = Volumes; vol; vol = vol->v_next) + vol->v_deleted = 1; + } else { + LOG(log_debug, logtype_afpd, "load_volumes: no volumes yet"); + EC_ZERO_LOG( lstat(obj->options.configfile, &st) ); + obj->options.volfile.mtime = st.st_mtime; } /* try putting a read lock on the volume file twice, sleep 1 second if first attempt fails */ @@ -1266,14 +1109,16 @@ int load_volumes(AFPObj *obj, void (*delvol_fn)(const struct vol *)) if (obj->iniconfig) iniparser_freedict(obj->iniconfig); - LOG(log_debug, logtype_afpd, "load_volumes: reloading: %s", obj->options.configfile); + LOG(log_debug, logtype_afpd, "load_volumes: loading: %s", obj->options.configfile); obj->iniconfig = iniparser_load(obj->options.configfile); EC_ZERO_LOG( readvolfile(obj, pwent) ); for ( vol = Volumes; vol; vol = vol->v_next ) { - if (vol->v_deleted && !vol->v_new ) { - delvol_fn(vol); + if (vol->v_deleted) { + LOG(log_debug, logtype_afpd, "load_volumes: deleted: %s", vol->v_localname); + if (delvol_fn) + delvol_fn(vol); vol = Volumes; } } @@ -1281,13 +1126,23 @@ int load_volumes(AFPObj *obj, void (*delvol_fn)(const struct vol *)) EC_CLEANUP: if (fd != -1) (void)close(fd); + + LOG(log_debug, logtype_afpd, "load_volumes: END"); EC_EXIT; } -void unload_volumes(void) +void unload_volumes(AFPObj *obj) { - LOG(log_debug, logtype_afpd, "unload_volumes"); - free_volumes(); + struct vol *vol; + + LOG(log_debug, logtype_afpd, "unload_volumes: BEGIN"); + + for (vol = Volumes; vol; vol = vol->v_next) + volume_free(vol); + Volumes = NULL; + obj->options.volfile.mtime = 0; + + LOG(log_debug, logtype_afpd, "unload_volumes: END"); } struct vol *getvolumes(void) diff --git a/libatalk/util/server_child.c b/libatalk/util/server_child.c index 8b27f6f3..59c8c7e5 100644 --- a/libatalk/util/server_child.c +++ b/libatalk/util/server_child.c @@ -55,8 +55,6 @@ typedef struct server_child_fork { void (*cleanup)(const pid_t); } server_child_fork; -int parent_or_child; /* 0: parent, 1: child */ - static inline void hash_child(struct server_child_data **htable, struct server_child_data *child) { -- 2.39.2