X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=5f8fdb1e6b5bef4c6bdfa21afe9dac8649a178aa;hp=740f4346b36f0f67202cf851831b42d7dd8e4d65;hb=67766d65f06854ee894d784f638c5c9cd2b50bca;hpb=e9635ae38e0e2e3eb92568a1e234f8348856dd69 diff --git a/src/conf.c b/src/conf.c index 740f4346..5f8fdb1e 100644 --- a/src/conf.c +++ b/src/conf.c @@ -1,9 +1,10 @@ /* conf.c -- configuration code - Copyright (C) 1998 Emphyrio, - Copyright (C) 1998,1999,2000 Ivo Timmermans - 2000 Guus Sliepen - 2000 Cris van Pelt + Copyright (C) 1998 Robert van der Meulen + 1998-2005 Ivo Timmermans + 2000-2010 Guus Sliepen + 2010-2011 Julien Muchembled + 2000 Cris van Pelt This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,259 +16,485 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - $Id: conf.c,v 1.9.4.13 2000/10/14 17:04:12 guus Exp $ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "system.h" -#include -#include -#include -#include -#include -#include -#include +#include "avl_tree.h" +#include "connection.h" +#include "conf.h" +#include "logger.h" +#include "netutl.h" /* for str2address */ +#include "protocol.h" +#include "utils.h" /* for cp */ +#include "xalloc.h" -#include +avl_tree_t *config_tree; -#include "conf.h" -#include "netutl.h" /* for strtoip */ -#include /* for cp */ +int pinginterval = 0; /* seconds between pings */ +int pingtimeout = 0; /* seconds to wait for response */ +char *confbase = NULL; /* directory in which all config files are */ +char *netname = NULL; /* name of the vpn network */ +list_t *cmdline_conf = NULL; /* global/host configuration values given at the command line */ -#include "config.h" -#include "connlist.h" -#include "system.h" -config_t *config; -int debug_lvl = 0; -int timeout = 0; /* seconds before timeout */ -char *confbase = NULL; /* directory in which all config files are */ +static int config_compare(const config_t *a, const config_t *b) { + int result; -/* Will be set if HUP signal is received. It will be processed when it is safe. */ -int sighup = 0; + result = strcasecmp(a->variable, b->variable); -/* - These are all the possible configurable values -*/ -static internal_config_t hazahaza[] = { -/* Main configuration file keywords */ - { "Name", tincname, TYPE_NAME }, - { "ConnectTo", connectto, TYPE_NAME }, - { "PingTimeout", pingtimeout, TYPE_INT }, - { "TapDevice", tapdevice, TYPE_NAME }, - { "PrivateKey", privatekey, TYPE_NAME }, - { "KeyExpire", keyexpire, TYPE_INT }, - { "Hostnames", resolve_dns, TYPE_BOOL }, - { "Interface", interface, TYPE_NAME }, - { "InterfaceIP", interfaceip, TYPE_IP }, -/* Host configuration file keywords */ - { "Address", address, TYPE_NAME }, - { "Port", port, TYPE_INT }, - { "PublicKey", publickey, TYPE_NAME }, - { "Subnet", subnet, TYPE_NAME }, - { "RestrictHosts", restricthosts, TYPE_BOOL }, - { "RestrictSubnets", restrictsubnets, TYPE_BOOL }, - { "RestrictAddress", restrictaddress, TYPE_BOOL }, - { "RestrictPort", restrictport, TYPE_BOOL }, - { "IndirectData", indirectdata, TYPE_BOOL }, - { "TCPonly", tcponly, TYPE_BOOL }, - { NULL, 0, 0 } -}; + if(result) + return result; + + /* give priority to command line options */ + result = !b->file - !a->file; + if (result) + return result; + + result = a->line - b->line; + + if(result) + return result; + else + return a->file ? strcmp(a->file, b->file) : 0; +} + +void init_configuration(avl_tree_t ** config_tree) { + *config_tree = avl_alloc_tree((avl_compare_t) config_compare, (avl_action_t) free_config); +} + +void exit_configuration(avl_tree_t ** config_tree) { + avl_delete_tree(*config_tree); + *config_tree = NULL; +} + +config_t *new_config(void) { + return xmalloc_and_zero(sizeof(config_t)); +} + +void free_config(config_t *cfg) { + if(cfg->variable) + free(cfg->variable); + + if(cfg->value) + free(cfg->value); + + if(cfg->file) + free(cfg->file); + + free(cfg); +} + +void config_add(avl_tree_t *config_tree, config_t *cfg) { + avl_insert(config_tree, cfg); +} + +config_t *lookup_config(avl_tree_t *config_tree, char *variable) { + config_t cfg, *found; + + cfg.variable = variable; + cfg.file = NULL; + cfg.line = 0; + + found = avl_search_closest_greater(config_tree, &cfg); + + if(!found) + return NULL; + + if(strcasecmp(found->variable, variable)) + return NULL; + + return found; +} + +config_t *lookup_config_next(avl_tree_t *config_tree, const config_t *cfg) { + avl_node_t *node; + config_t *found; + + node = avl_search_node(config_tree, cfg); + + if(node) { + if(node->next) { + found = node->next->data; + + if(!strcasecmp(found->variable, cfg->variable)) + return found; + } + } + + return NULL; +} + +bool get_config_bool(const config_t *cfg, bool *result) { + if(!cfg) + return false; + + if(!strcasecmp(cfg->value, "yes")) { + *result = true; + return true; + } else if(!strcasecmp(cfg->value, "no")) { + *result = false; + return true; + } + + logger(LOG_ERR, "\"yes\" or \"no\" expected for configuration variable %s in %s line %d", + cfg->variable, cfg->file, cfg->line); + + return false; +} + +bool get_config_int(const config_t *cfg, int *result) { + if(!cfg) + return false; + + if(sscanf(cfg->value, "%d", result) == 1) + return true; + + logger(LOG_ERR, "Integer expected for configuration variable %s in %s line %d", + cfg->variable, cfg->file, cfg->line); + + return false; +} + +bool get_config_string(const config_t *cfg, char **result) { + if(!cfg) + return false; + + *result = xstrdup(cfg->value); + + return true; +} + +bool get_config_address(const config_t *cfg, struct addrinfo **result) { + struct addrinfo *ai; + + if(!cfg) + return false; + + ai = str2addrinfo(cfg->value, NULL, 0); + + if(ai) { + *result = ai; + return true; + } + + logger(LOG_ERR, "Hostname or IP address expected for configuration variable %s in %s line %d", + cfg->variable, cfg->file, cfg->line); + + return false; +} + +bool get_config_subnet(const config_t *cfg, subnet_t ** result) { + subnet_t subnet = {0}; + + if(!cfg) + return false; + + if(!str2net(&subnet, cfg->value)) { + logger(LOG_ERR, "Subnet expected for configuration variable %s in %s line %d", + cfg->variable, cfg->file, cfg->line); + return false; + } + + /* Teach newbies what subnets are... */ + + if(((subnet.type == SUBNET_IPV4) + && !maskcheck(&subnet.net.ipv4.address, subnet.net.ipv4.prefixlength, sizeof(ipv4_t))) + || ((subnet.type == SUBNET_IPV6) + && !maskcheck(&subnet.net.ipv6.address, subnet.net.ipv6.prefixlength, sizeof(ipv6_t)))) { + logger(LOG_ERR, "Network address and prefix length do not match for configuration variable %s in %s line %d", + cfg->variable, cfg->file, cfg->line); + return false; + } + + *(*result = new_subnet()) = subnet; + + return true; +} /* - Add given value to the list of configs cfg + Read exactly one line and strip the trailing newline if any. */ -config_t * -add_config_val(config_t **cfg, int argtype, char *val) -{ - config_t *p, *r; - char *q; -cp - p = (config_t*)xmalloc(sizeof(*p)); - p->data.val = 0; - - switch(argtype) - { - case TYPE_INT: - p->data.val = strtol(val, &q, 0); - if(q && *q) - p->data.val = 0; - break; - case TYPE_NAME: - p->data.ptr = xmalloc(strlen(val) + 1); - strcpy(p->data.ptr, val); - break; - case TYPE_IP: - p->data.ip = strtoip(val); - break; - case TYPE_BOOL: - if(!strcasecmp("yes", val)) - p->data.val = stupid_true; - else if(!strcasecmp("no", val)) - p->data.val = stupid_false; - else - p->data.val = 0; - } - - p->argtype = argtype; - - if(p->data.val) - { - if(*cfg) - { - r = *cfg; - while(r->next) - r = r->next; - r->next = p; - } - else - *cfg = p; - p->next = NULL; - return p; - } - - free(p); -cp - return NULL; +static char *readline(FILE * fp, char *buf, size_t buflen) { + char *newline = NULL; + char *p; + + if(feof(fp)) + return NULL; + + p = fgets(buf, buflen, fp); + + if(!p) + return NULL; + + newline = strchr(p, '\n'); + + if(!newline) + return buf; + + *newline = '\0'; /* kill newline */ + if(newline > p && newline[-1] == '\r') /* and carriage return if necessary */ + newline[-1] = '\0'; + + return buf; +} + +config_t *parse_config_line(char *line, const char *fname, int lineno) { + config_t *cfg; + int len; + char *variable, *value, *eol; + variable = value = line; + + eol = line + strlen(line); + while(strchr("\t ", *--eol)) + *eol = '\0'; + + len = strcspn(value, "\t ="); + value += len; + value += strspn(value, "\t "); + if(*value == '=') { + value++; + value += strspn(value, "\t "); + } + variable[len] = '\0'; + + if(!*value) { + const char err[] = "No value for variable"; + if (fname) + logger(LOG_ERR, "%s `%s' on line %d while reading config file %s", + err, variable, lineno, fname); + else + logger(LOG_ERR, "%s `%s' in command line option %d", + err, variable, lineno); + return NULL; + } + + cfg = new_config(); + cfg->variable = xstrdup(variable); + cfg->value = xstrdup(value); + cfg->file = fname ? xstrdup(fname) : NULL; + cfg->line = lineno; + + return cfg; } /* Parse a configuration file and put the results in the configuration tree starting at *base. */ -int read_config_file(config_t **base, const char *fname) -{ - int err = -1; - FILE *fp; - char line[MAXBUFSIZE]; /* There really should not be any line longer than this... */ - char *p, *q; - int i, lineno = 0; - config_t *cfg; -cp - if((fp = fopen (fname, "r")) == NULL) - { - return -1; - } - - for(;;) - { - if(fgets(line, MAXBUFSIZE, fp) == NULL) - { - err = 0; - break; - } - - lineno++; - - if(!index(line, '\n')) - { - syslog(LOG_ERR, _("Line %d too long while reading config file %s"), lineno, fname); - break; - } - - if((p = strtok(line, "\t\n\r =")) == NULL) - continue; /* no tokens on this line */ - - if(p[0] == '#') - continue; /* comment: ignore */ - - for(i = 0; hazahaza[i].name != NULL; i++) - if(!strcasecmp(hazahaza[i].name, p)) - break; - - if(!hazahaza[i].name) - { - syslog(LOG_ERR, _("Invalid variable name on line %d while reading config file %s"), - lineno, fname); - break; - } +bool read_config_file(avl_tree_t *config_tree, const char *fname) { + FILE *fp; + char buffer[MAX_STRING_SIZE]; + char *line; + int lineno = 0; + bool ignore = false; + config_t *cfg; + bool result = false; - if(((q = strtok(NULL, "\t\n\r =")) == NULL) || q[0] == '#') - { - fprintf(stderr, _("No value for variable on line %d while reading config file %s"), - lineno, fname); - break; + fp = fopen(fname, "r"); + + if(!fp) { + logger(LOG_ERR, "Cannot open config file %s: %s", fname, strerror(errno)); + return false; } - cfg = add_config_val(base, hazahaza[i].argtype, q); - if(cfg == NULL) - { - fprintf(stderr, _("Invalid value for variable on line %d while reading config file %s"), - lineno, fname); - break; + for(;;) { + line = readline(fp, buffer, sizeof buffer); + + if(!line) { + if(feof(fp)) + result = true; + break; + } + + lineno++; + + if(!*line || *line == '#') + continue; + + if(ignore) { + if(!strncmp(line, "-----END", 8)) + ignore = false; + continue; + } + + if(!strncmp(line, "-----BEGIN", 10)) { + ignore = true; + continue; + } + + cfg = parse_config_line(line, fname, lineno); + if (!cfg) + break; + config_add(config_tree, cfg); } - cfg->which = hazahaza[i].which; - if(!config) - config = cfg; - } + fclose(fp); - fclose (fp); -cp - return err; + return result; } -int read_server_config() -{ - char *fname; - int x; -cp - asprintf(fname, "%s/tinc.conf", confbase); - x = read_config_file(&config, fname); - free(fname); -cp - return x; +void read_config_options(avl_tree_t *config_tree, const char *prefix) { + list_node_t *node, *next; + size_t prefix_len = prefix ? strlen(prefix) : 0; + + for(node = cmdline_conf->tail; node; node = next) { + config_t *orig_cfg, *cfg = (config_t *)node->data; + next = node->prev; + + if(!prefix) { + if(strchr(cfg->variable, '.')) + continue; + node->data = NULL; + list_unlink_node(cmdline_conf, node); + } else { + if(strncmp(prefix, cfg->variable, prefix_len) || + cfg->variable[prefix_len] != '.') + continue; + /* Because host configuration is parsed again when + reconnecting, nodes must not be freed when a prefix + is given. */ + orig_cfg = cfg; + cfg = new_config(); + cfg->variable = xstrdup(orig_cfg->variable + prefix_len + 1); + cfg->value = xstrdup(orig_cfg->value); + cfg->file = NULL; + cfg->line = orig_cfg->line; + } + config_add(config_tree, cfg); + } } -/* - Look up the value of the config option type -*/ -const config_t *get_config_val(config_t *p, which_t type) -{ -cp - for(p = config; p != NULL; p = p->next) - if(p->which == type) - return p; -cp - /* Not found */ - return NULL; +bool read_server_config() { + char *fname; + bool x; + + read_config_options(config_tree, NULL); + + xasprintf(&fname, "%s/tinc.conf", confbase); + x = read_config_file(config_tree, fname); + + if(!x) { /* System error: complain */ + logger(LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno)); + } + + free(fname); + + return x; } -/* - Support for multiple config lines. - Index is used to get a specific value, 0 being the first, 1 the second etc. -*/ -const config_t *get_next_config_val(config_t *p, which_t type, int index) -{ -cp - for(p = config; p != NULL; p = p->next) - if(p->which == type) - if(--index < 0) - return p; -cp - /* Not found */ - return NULL; +bool read_connection_config(connection_t *c) { + char *fname; + bool x; + + read_config_options(c->config_tree, c->name); + + xasprintf(&fname, "%s/hosts/%s", confbase, c->name); + x = read_config_file(c->config_tree, fname); + free(fname); + + return x; } -/* - Remove the complete configuration tree. -*/ -void clear_config(config_t **base) -{ - config_t *p, *next; -cp - for(p = *base; p != NULL; p = next) - { - next = p->next; - if(p->data.ptr && (p->argtype == TYPE_NAME)) - { - free(p->data.ptr); - } - free(p); - } - *base = NULL; -cp +FILE *ask_and_open(const char *filename, const char *what) { + FILE *r; + char *directory; + char line[PATH_MAX]; + const char *fn; + + /* Check stdin and stdout */ + if(!isatty(0) || !isatty(1)) { + /* Argh, they are running us from a script or something. Write + the files to the current directory and let them burn in hell + for ever. */ + fn = filename; + } else { + /* Ask for a file and/or directory name. */ + fprintf(stdout, "Please enter a file to save %s to [%s]: ", + what, filename); + fflush(stdout); + + fn = readline(stdin, line, sizeof line); + + if(!fn) { + fprintf(stderr, "Error while reading stdin: %s\n", + strerror(errno)); + return NULL; + } + + if(!strlen(fn)) + /* User just pressed enter. */ + fn = filename; + } + +#ifdef HAVE_MINGW + if(fn[0] != '\\' && fn[0] != '/' && !strchr(fn, ':')) { +#else + if(fn[0] != '/') { +#endif + /* The directory is a relative path or a filename. */ + char *p; + + directory = get_current_dir_name(); + xasprintf(&p, "%s/%s", directory, fn); + free(directory); + fn = p; + } + + umask(0077); /* Disallow everything for group and other */ + + /* Open it first to keep the inode busy */ + + r = fopen(fn, "r+") ?: fopen(fn, "w+"); + + if(!r) { + fprintf(stderr, "Error opening file `%s': %s\n", + fn, strerror(errno)); + return NULL; + } + + return r; +} + +bool disable_old_keys(FILE *f) { + char buf[100]; + long pos; + bool disabled = false; + + rewind(f); + pos = ftell(f); + + if(pos < 0) + return false; + + while(fgets(buf, sizeof buf, f)) { + if(!strncmp(buf, "-----BEGIN RSA", 14)) { + buf[11] = 'O'; + buf[12] = 'L'; + buf[13] = 'D'; + if(fseek(f, pos, SEEK_SET)) + break; + if(fputs(buf, f) <= 0) + break; + disabled = true; + } + else if(!strncmp(buf, "-----END RSA", 12)) { + buf[ 9] = 'O'; + buf[10] = 'L'; + buf[11] = 'D'; + if(fseek(f, pos, SEEK_SET)) + break; + if(fputs(buf, f) <= 0) + break; + disabled = true; + } + pos = ftell(f); + if(pos < 0) + break; + } + + return disabled; }