X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=blobdiff_plain;f=etc%2Fafpd%2Fafp_config.c;h=ba5b232b43c0df41ccdd4d569438c8d18f073d83;hp=f3adf7bf05406687fc7dcf5ede83e8cc2bdee394;hb=d3dff4ba4b8db3131a16641d35a6554be5fb5160;hpb=cdb7047fb6897c1ad8b4ac264001d44154bf144d

diff --git a/etc/afpd/afp_config.c b/etc/afpd/afp_config.c
index f3adf7bf..ba5b232b 100644
--- a/etc/afpd/afp_config.c
+++ b/etc/afpd/afp_config.c
@@ -17,10 +17,9 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-
-#ifdef USE_SRVLOC
-#include <slp.h>
-#endif /* USE_SRVLOC */
+#ifdef HAVE_GETIFADDRS
+#include <ifaddrs.h>
+#endif
 
 #include <atalk/logger.h>
 #include <atalk/util.h>
@@ -28,405 +27,220 @@
 #include <atalk/afp.h>
 #include <atalk/compat.h>
 #include <atalk/server_child.h>
+#include <atalk/globals.h>
+#include <atalk/errchk.h>
+#include <atalk/netatalk_conf.h>
+#include <atalk/fce_api.h>
 
 #ifdef HAVE_LDAP
 #include <atalk/ldapconfig.h>
 #endif
 
-#include "globals.h"
 #include "afp_config.h"
 #include "uam_auth.h"
 #include "status.h"
 #include "volume.h"
 #include "afp_zeroconf.h"
 
-#define LINESIZE 1024  
-
-/* get rid of unneeded configurations. i use reference counts to deal
- * w/ multiple configs sharing the same afp_options. oh, to dream of
- * garbage collection ... */
-void configfree(AFPConfig *configs, const AFPConfig *config)
+/*!
+ * Free and cleanup config and DSI
+ *
+ * "dsi" can be NULL in which case all DSI objects and the config object is freed,
+ * otherwise its an afpd session child and only any unneeded DSI objects are freed
+ */
+void configfree(AFPObj *obj, DSI *dsi)
 {
-    AFPConfig *p, *q;
-
-    for (p = configs; p; p = q) {
-        q = p->next;
-        if (p == config)
-            continue;
-
-        /* do a little reference counting */
-        if (--(*p->optcount) < 1) {
-            afp_options_free(&p->obj.options, p->defoptions);
-            free(p->optcount);
-        }
+    DSI *p, *q;
 
-        switch (p->obj.proto) {
-        case AFPPROTO_DSI:
-            close(p->fd);
-            free(p->obj.handle);
-            break;
+    if (!dsi) {
+        /* Master afpd reloading config */
+        auth_unload();
+        if (! (obj->options.flags & OPTION_NOZEROCONF)) {
+            zeroconf_deregister();
         }
-        free(p);
     }
 
-    /* the master loaded the volumes for zeroconf, get rid of that */
-    unload_volumes_and_extmap();
-}
+    unload_volumes(obj);
 
-#ifdef USE_SRVLOC
-static void SRVLOC_callback(SLPHandle hslp _U_, SLPError errcode, void *cookie) {
-    *(SLPError*)cookie = errcode;
-}
-
-static char hex[17] = "0123456789abcdef";
+    /* Master and child releasing unneeded DSI handles */
+    for (p = obj->dsi; p; p = q) {
+        q = p->next;
+        if (p == dsi)
+            continue;
+        dsi_free(p);
+        free(p);
+    }
+    obj->dsi = NULL;
 
-static char * srvloc_encode(const struct afp_options *options, const char *name)
-{
-	static char buf[512];
-	char *conv_name;
-	unsigned char *p;
-	unsigned int i = 0;
-
-	/* Convert name to maccharset */
-        if ((size_t)-1 ==(convert_string_allocate( options->unixcharset, options->maccharset,
-			 name, -1, &conv_name)) )
-		return (char*)name;
-
-	/* Escape characters */
-	p = conv_name;
-	while (*p && i<(sizeof(buf)-4)) {
-	    if (*p == '@')
-		break;
-	    else if (isspace(*p)) {
-	        buf[i++] = '%';
-           	buf[i++] = '2';
-           	buf[i++] = '0';
-		p++;
-	    }	
-	    else if ((!isascii(*p)) || *p <= 0x2f || *p == 0x3f ) {
-	        buf[i++] = '%';
-           	buf[i++] = hex[*p >> 4];
-           	buf[i++] = hex[*p++ & 15];
-	    }
-	    else {
-		buf[i++] = *p++;
-	    }
-	}
-	buf[i] = '\0';
-
-	free (conv_name);
-
-	return buf;
+    /* afpd session child passes dsi handle to obj handle */
+    if (dsi) {
+        dsi->next = NULL;
+        obj->dsi = dsi;
+    }
 }
-#endif /* USE_SRVLOC */
 
-static void dsi_cleanup(const AFPConfig *config)
+/*!
+ * Get everything running
+ */
+int configinit(AFPObj *obj)
 {
-#ifdef USE_SRVLOC
-    SLPError err;
-    SLPError callbackerr;
-    SLPHandle hslp;
-    DSI *dsi = (DSI *)config->obj.handle;
-
-    /*  Do nothing if we didn't register.  */
-    if (!dsi || dsi->srvloc_url[0] == '\0')
-        return;
-
-    err = SLPOpen("en", SLP_FALSE, &hslp);
-    if (err != SLP_OK) {
-        LOG(log_error, logtype_afpd, "dsi_cleanup: Error opening SRVLOC handle");
-        goto srvloc_dereg_err;
-    }
+    EC_INIT;
+    DSI *dsi = NULL;
+    DSI **next = &obj->dsi;
+    char *p = NULL, *q = NULL, *savep;
+    const char *r;
+    struct ifaddrs *ifaddr, *ifa;
+    int family, s;
+    static char interfaddr[NI_MAXHOST];
+
+    auth_load(obj, obj->options.uampath, obj->options.uamlist);
+    set_signature(&obj->options);
+#ifdef HAVE_LDAP
+    acl_ldap_freeconfig();
+#endif /* HAVE_LDAP */
 
-    err = SLPDereg(hslp,
-                   dsi->srvloc_url,
-                   SRVLOC_callback,
-                   &callbackerr);
-    if (err != SLP_OK) {
-        LOG(log_error, logtype_afpd, "dsi_cleanup: Error unregistering %s from SRVLOC", dsi->srvloc_url);
-        goto srvloc_dereg_err;
-    }
+    LOG(log_debug, logtype_afpd, "DSIConfigInit: hostname: %s, listen: %s, interfaces: %s, port: %s",
+        obj->options.hostname,
+        obj->options.listen ? obj->options.listen : "-",
+        obj->options.interfaces ? obj->options.interfaces : "-",
+        obj->options.port);
 
-    if (callbackerr != SLP_OK) {
-        LOG(log_error, logtype_afpd, "dsi_cleanup: Error in callback while trying to unregister %s from SRVLOC (%d)", dsi->srvloc_url, callbackerr);
-        goto srvloc_dereg_err;
+    /*
+     * Setup addresses we listen on from hostname and/or "afp listen" option
+     */
+    if (obj->options.listen) {
+        EC_NULL( q = p = strdup(obj->options.listen) );
+        EC_NULL( p = strtok_r(p, ", ", &savep) );
+        while (p) {
+            if ((dsi = dsi_init(obj, obj->options.hostname, p, obj->options.port)) == NULL)
+                break;
+
+            status_init(obj, dsi);
+            *next = dsi;
+            next = &dsi->next;
+            dsi->AFPobj = obj;
+
+            LOG(log_note, logtype_afpd, "Netatalk AFP/TCP listening on %s:%d",
+                getip_string((struct sockaddr *)&dsi->server),
+                getip_port((struct sockaddr *)&dsi->server));
+
+            p = strtok_r(NULL, ", ", &savep);
+        }
+        if (q) {
+            free(q);
+            q = NULL;
+        }
     }
 
-srvloc_dereg_err:
-    dsi->srvloc_url[0] = '\0';
-    SLPClose(hslp);
-#endif /* USE_SRVLOC */
-}
+   /*
+    * Setup addresses we listen on from "afp interfaces".
+    * We use getifaddrs() instead of if_nameindex() because the latter appears still
+    * to be unable to return ipv4 addresses
+    */
+    if (obj->options.interfaces) {
+#ifndef HAVE_GETIFADDRS
+        LOG(log_error, logtype_afpd, "option \"afp interfaces\" not supported");
+#else
+        if (getifaddrs(&ifaddr) == -1) {
+            LOG(log_error, logtype_afpd, "getinterfaddr: getifaddrs() failed: %s", strerror(errno));
+            EC_FAIL;
+        }
 
-static afp_child_t *dsi_start(AFPConfig *config, AFPConfig *configs,
-                              server_child *server_children)
-{
-    DSI *dsi = config->obj.handle;
-    afp_child_t *child = NULL;
-
-    if (!(child = dsi_getsession(dsi,
-                                 server_children,
-                                 config->obj.options.tickleval))) {
-        LOG(log_error, logtype_afpd, "dsi_start: session error: %s", strerror(errno));
-        return NULL;
+        EC_NULL( q = p = strdup(obj->options.interfaces) );
+        EC_NULL( p = strtok_r(p, ", ", &savep) );
+        while (p) {
+            for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
+                if (ifa->ifa_addr == NULL)
+                    continue;
+                if (STRCMP(ifa->ifa_name, !=, p))
+                    continue;
+
+                family = ifa->ifa_addr->sa_family;
+                if (family == AF_INET || family == AF_INET6) {
+                    if (getnameinfo(ifa->ifa_addr,
+                                    (family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6),
+                                    interfaddr, NI_MAXHOST, NULL, 0, NI_NUMERICHOST) != 0) {
+                        LOG(log_error, logtype_afpd, "getinterfaddr: getnameinfo() failed %s", gai_strerror(errno));
+                        continue;
+                    }
+
+                    if ((dsi = dsi_init(obj, obj->options.hostname, interfaddr, obj->options.port)) == NULL)
+                        continue;
+
+                    status_init(obj, dsi);
+                    *next = dsi;
+                    next = &dsi->next;
+                    dsi->AFPobj = obj;
+
+                    LOG(log_note, logtype_afpd, "Netatalk AFP/TCP listening on interface %s with address %s:%d",
+                        p,
+                        getip_string((struct sockaddr *)&dsi->server),
+                        getip_port((struct sockaddr *)&dsi->server));
+                } /* if (family == AF_INET || family == AF_INET6) */
+            } /* for (ifa != NULL) */
+            p = strtok_r(NULL, ", ", &savep);
+        }
+        freeifaddrs(ifaddr);
+#endif
     }
 
-    /* we've forked. */
-    if (parent_or_child == 1) {
-        configfree(configs, config);
-        config->obj.ipc_fd = child->ipc_fds[1];
-        close(child->ipc_fds[0]); /* Close parent IPC fd */
-        free(child);
-        afp_over_dsi(&config->obj); /* start a session */
-        exit (0);
+    /*
+     * Check whether we got a valid DSI from options.listen or options.interfaces,
+     * if not add a DSI that accepts all connections and goes though the list of
+     * network interaces for determining an IP we can advertise in DSIStatus
+     */
+    if (dsi == NULL) {
+        if ((dsi = dsi_init(obj, obj->options.hostname, NULL, obj->options.port)) == NULL)
+            EC_FAIL_LOG("no suitable network address found, use \"afp listen\" or \"afp interfaces\"", 0);
+        status_init(obj, dsi);
+        *next = dsi;
+        next = &dsi->next;
+        dsi->AFPobj = obj;
+
+        LOG(log_note, logtype_afpd, "Netatalk AFP/TCP listening on %s:%d",
+            getip_string((struct sockaddr *)&dsi->server),
+            getip_port((struct sockaddr *)&dsi->server));
     }
 
-    return child;
-}
-
-static AFPConfig *DSIConfigInit(const struct afp_options *options,
-                                unsigned char *refcount,
-                                const dsi_proto protocol)
-{
-    AFPConfig *config;
-    DSI *dsi;
-    char *p, *q;
-
-    if ((config = (AFPConfig *) calloc(1, sizeof(AFPConfig))) == NULL) {
-        LOG(log_error, logtype_afpd, "DSIConfigInit: malloc(config): %s", strerror(errno) );
-        return NULL;
-    }
+#ifdef HAVE_LDAP
+    /* Parse afp.conf */
+    acl_ldap_readconfig(obj->iniconfig);
+#endif /* HAVE_LDAP */
 
-    LOG(log_debug, logtype_afpd, "DSIConfigInit: hostname: %s, ip/port: %s/%s, ",
-        options->hostname,
-        options->ipaddr ? options->ipaddr : "default",
-        options->port ? options->port : "548");
-
-    if ((dsi = dsi_init(protocol, "afpd", options->hostname,
-                        options->ipaddr, options->port,
-                        options->flags & OPTION_PROXY,
-                        options->server_quantum)) == NULL) {
-        LOG(log_error, logtype_afpd, "main: dsi_init: %s", strerror(errno) );
-        free(config);
-        return NULL;
+    /* Now register with zeroconf, we also need the volumes for that */
+    if (! (obj->options.flags & OPTION_NOZEROCONF)) {
+        load_volumes(obj, lv_all);
+        zeroconf_register(obj);
     }
 
-    if (options->flags & OPTION_PROXY) {
-        LOG(log_note, logtype_afpd, "AFP/TCP proxy initialized for %s:%d (%s)",
-            getip_string((struct sockaddr *)&dsi->server), getip_port((struct sockaddr *)&dsi->server), VERSION);
-    } else {
-        LOG(log_note, logtype_afpd, "AFP/TCP started, advertising %s:%d (%s)",
-            getip_string((struct sockaddr *)&dsi->server), getip_port((struct sockaddr *)&dsi->server), VERSION);
+    if ((r = atalk_iniparser_getstring(obj->iniconfig, INISEC_GLOBAL, "fce listener", NULL))) {
+		LOG(log_note, logtype_afpd, "Adding FCE listener: %s", r);
+		fce_add_udp_socket(r);
     }
-
-#ifdef USE_SRVLOC
-    dsi->srvloc_url[0] = '\0';	/*  Mark that we haven't registered.  */
-    if (!(options->flags & OPTION_NOSLP)) {
-        SLPError err;
-        SLPError callbackerr;
-        SLPHandle hslp;
-        unsigned int afp_port;
-        int   l;
-        char *srvloc_hostname;
-        const char *hostname;
-
-	err = SLPOpen("en", SLP_FALSE, &hslp);
-	if (err != SLP_OK) {
-	    LOG(log_error, logtype_afpd, "DSIConfigInit: Error opening SRVLOC handle");
-	    goto srvloc_reg_err;
-	}
-
-	/* XXX We don't want to tack on the port number if we don't have to.
-	 * Why?
-	 * Well, this seems to break MacOS < 10.  If the user _really_ wants to
-	 * use a non-default port, they can, but be aware, this server might
-	 * not show up int the Network Browser.
-	 */
-	afp_port = getip_port((struct sockaddr *)&dsi->server);
-	/* If specified use the FQDN to register with srvloc, otherwise use IP. */
-	p = NULL;
-	if (options->fqdn) {
-	    hostname = options->fqdn;
-	    p = strchr(hostname, ':');
-	}	
-	else 
-	    hostname = getip_string((struct sockaddr *)&dsi->server);
-
-	srvloc_hostname = srvloc_encode(options, (options->server ? options->server : options->hostname));
-
-	if ((p) || afp_port == 548) {
-	    l = snprintf(dsi->srvloc_url, sizeof(dsi->srvloc_url), "afp://%s/?NAME=%s", hostname, srvloc_hostname);
-	}
-	else {
-	    l = snprintf(dsi->srvloc_url, sizeof(dsi->srvloc_url), "afp://%s:%d/?NAME=%s", hostname, afp_port, srvloc_hostname);
-	}
-
-	if (l == -1 || l >= (int)sizeof(dsi->srvloc_url)) {
-	    LOG(log_error, logtype_afpd, "DSIConfigInit: Hostname is too long for SRVLOC");
-	    dsi->srvloc_url[0] = '\0';
-	    goto srvloc_reg_err;
-	}
-
-	err = SLPReg(hslp,
-		     dsi->srvloc_url,
-		     SLP_LIFETIME_MAXIMUM,
-		     "afp",
-		     "",
-		     SLP_TRUE,
-		     SRVLOC_callback,
-		     &callbackerr);
-	if (err != SLP_OK) {
-	    LOG(log_error, logtype_afpd, "DSIConfigInit: Error registering %s with SRVLOC", dsi->srvloc_url);
-	    dsi->srvloc_url[0] = '\0';
-	    goto srvloc_reg_err;
-	}
-
-	if (callbackerr != SLP_OK) {
-	    LOG(log_error, logtype_afpd, "DSIConfigInit: Error in callback trying to register %s with SRVLOC", dsi->srvloc_url);
-	    dsi->srvloc_url[0] = '\0';
-	    goto srvloc_reg_err;
-	}
-
-	LOG(log_info, logtype_afpd, "Sucessfully registered %s with SRVLOC", dsi->srvloc_url);
-	config->server_cleanup = dsi_cleanup;
-
-srvloc_reg_err:
-	SLPClose(hslp);
+    if ((r = atalk_iniparser_getstring(obj->iniconfig, INISEC_GLOBAL, "fce coalesce", NULL))) {
+		LOG(log_note, logtype_afpd, "Fce coalesce: %s", r);
+		fce_set_coalesce(r);
     }
-#endif /* USE_SRVLOC */
-
-    config->fd = dsi->serversock;
-    config->obj.handle = dsi;
-    config->obj.config = config;
-    config->obj.proto = AFPPROTO_DSI;
-
-    memcpy(&config->obj.options, options, sizeof(struct afp_options));
-    /* get rid of any appletalk info. we use the fact that the DSI
-     * stuff is done after the ASP stuff. */
-    p = config->obj.options.server;
-    if (p && (q = strchr(p, ':')))
-        *q = '\0';
-
-    config->optcount = refcount;
-    (*refcount)++;
-
-    config->server_start = dsi_start;
-    return config;
-}
-
-/* allocate server configurations. this should really store the last
- * entry in config->last or something like that. that would make
- * supporting multiple dsi transports easier. */
-static AFPConfig *AFPConfigInit(struct afp_options *options,
-                                const struct afp_options *defoptions)
-{
-    AFPConfig *next = NULL;
-    unsigned char *refcount;
-
-    if ((refcount = (unsigned char *)
-                    calloc(1, sizeof(unsigned char))) == NULL) {
-        LOG(log_error, logtype_afpd, "AFPConfigInit: calloc(refcount): %s", strerror(errno) );
-        return NULL;
+    if ((r = atalk_iniparser_getstring(obj->iniconfig, INISEC_GLOBAL, "fce events", NULL))) {
+		LOG(log_note, logtype_afpd, "Fce events: %s", r);
+		fce_set_events(r);
     }
+    r = atalk_iniparser_getstring(obj->iniconfig, INISEC_GLOBAL, "fce version", "1");
+    LOG(log_debug, logtype_afpd, "Fce version: %s", r);
+    obj->fce_version = atoi(r);
 
-    /* set signature */
-    set_signature(options);
-
-    /* handle dsi transports and dsi proxies. we only proxy
-     * for DSI connections. */
-
-    /* this should have something like the following:
-     * for (i=mindsi; i < maxdsi; i++)
-     *   if (options->transports & (1 << i) && 
-     *     (next = DSIConfigInit(options, refcount, i)))
-     *     next->defoptions = defoptions;
-     */
-    if ( (options->transports & AFPTRANS_TCP)
-         &&
-         ((options->flags & OPTION_PROXY) == 0)
-         &&
-         (next = DSIConfigInit(options, refcount, DSI_TCPIP)))
-        next->defoptions = defoptions;
-
-    /* load in all the authentication modules. we can load the same
-       things multiple times if necessary. however, loading different
-       things with the same names will cause complaints. by not loading
-       in any uams with proxies, we prevent ddp connections from succeeding.
-    */
-    auth_load(options->uampath, options->uamlist);
-
-    /* this should be able to accept multiple dsi transports. i think
-     * the only thing that gets affected is the net addresses. */
-    status_init(next, options);
-
-    return next;
-}
-
-/* fill in the appropriate bits for each interface */
-AFPConfig *configinit(struct afp_options *cmdline)
-{
-    FILE *fp;
-    char buf[LINESIZE + 1], *p, have_option = 0;
-    size_t len;
-    struct afp_options options;
-    AFPConfig *config=NULL, *first = NULL; 
-
-    /* if config file doesn't exist, load defaults */
-    if ((fp = fopen(cmdline->configfile, "r")) == NULL)
-    {
-        LOG(log_debug, logtype_afpd, "ConfigFile %s not found, assuming defaults",
-            cmdline->configfile);
-        return AFPConfigInit(cmdline, cmdline);
+    if ((r = atalk_iniparser_getstring(obj->iniconfig, INISEC_GLOBAL, "fce ignore names", ".DS_Store"))) {
+        obj->fce_ign_names = strdup(r);
     }
 
-    /* scan in the configuration file */
-    len = 0;
-    while (!feof(fp)) {
-	if (!fgets(&buf[len], LINESIZE - len, fp) || buf[len] == '#')
-            continue;
-	len = strlen(buf);
-	if ( len >= 2 && buf[len-2] == '\\' ) {
-	    len -= 2;
-	    continue;
-	} else
-	    len = 0;
-
-        /* a little pre-processing to get rid of spaces and end-of-lines */
-        p = buf;
-        while (p && isspace(*p))
-            p++;
-        if (!p || (*p == '\0'))
-            continue;
-
-        have_option = 1;
-
-        memcpy(&options, cmdline, sizeof(options));
-        if (!afp_options_parseline(p, &options))
-            continue;
-
-        /* AFPConfigInit can return two linked configs due to DSI and ASP */
-        if (!first) {
-            if ((first = AFPConfigInit(&options, cmdline)))
-                config = first->next ? first->next : first;
-        } else if ((config->next = AFPConfigInit(&options, cmdline))) {
-            config = config->next->next ? config->next->next : config->next;
-        }
+    if ((r = atalk_iniparser_getstring(obj->iniconfig, INISEC_GLOBAL, "fce notify script", NULL))) {
+        obj->fce_notify_script = strdup(r);
     }
 
-#ifdef HAVE_LDAP
-    /* Parse afp_ldap.conf */
-    acl_ldap_readconfig(_PATH_ACL_LDAPCONF);
-#endif /* HAVE_LDAP */
-
-    LOG(log_debug, logtype_afpd, "Finished parsing Config File");
-    fclose(fp);
 
-    if (!have_option)
-        first = AFPConfigInit(cmdline, cmdline);
-
-    /* Now register with zeroconf, we also need the volumes for that */
-    load_volumes(&first->obj);
-    zeroconf_register(first);
 
-    return first;
+EC_CLEANUP:
+    if (q)
+        free(q);
+    EC_EXIT;
 }