X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconf.c;h=7399c823a7dbe537e23b2dfeed4e0840092db23d;hp=4431ccf6a6efefc3224a01da0e2369a745df5f2e;hb=54ef13bf75a7a1e787716ce395ffe847fa74673f;hpb=85963f4c857abc2d9a4c5a3245cc11257140b9a6 diff --git a/src/conf.c b/src/conf.c index 4431ccf6..7399c823 100644 --- a/src/conf.c +++ b/src/conf.c @@ -1,7 +1,9 @@ /* conf.c -- configuration code - Copyright (C) 1998 Emphyrio, - Copyright (C) 1998,1999,2000 Ivo Timmermans + Copyright (C) 1998 Robert van der Meulen + Copyright (C) 1998,1999,2000 Ivo Timmermans + 2000 Guus Sliepen + 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 @@ -16,10 +18,9 @@ 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. -*/ -/* Created more dynamic storage for lines read from the config file. -- - Cris van Pelt */ + $Id: conf.c,v 1.9.4.24 2000/11/29 14:24:40 zarq Exp $ +*/ #include "config.h" @@ -29,37 +30,50 @@ #include #include #include +#include #include +#include /* for cp */ #include "conf.h" #include "netutl.h" /* for strtoip */ -config_t *config; +#include "system.h" + +config_t *config = NULL; int debug_lvl = 0; int timeout = 0; /* seconds before timeout */ +char *confbase = NULL; /* directory in which all config files are */ +char *netname = NULL; /* name of the vpn network */ -typedef struct internal_config_t { - char *name; - enum which_t which; - int argtype; -} internal_config_t; +/* Will be set if HUP signal is received. It will be processed when it is safe. */ +int sighup = 0; /* These are all the possible configurable values */ static internal_config_t hazahaza[] = { - { "AllowConnect", allowconnect, TYPE_BOOL }, /* Is not used anywhere. Remove? */ - { "ConnectTo", upstreamip, TYPE_IP }, - { "ConnectPort", upstreamport, TYPE_INT }, - { "ListenPort", listenport, TYPE_INT }, - { "MyOwnVPNIP", myvpnip, TYPE_IP }, - { "MyVirtualIP", myvpnip, TYPE_IP }, /* an alias */ - { "Passphrases", passphrasesdir, TYPE_NAME }, - { "PingTimeout", pingtimeout, TYPE_INT }, - { "TapDevice", tapdevice, TYPE_NAME }, - { "KeyExpire", keyexpire, TYPE_INT }, - { "VpnMask", vpnmask, TYPE_IP }, +/* Main configuration file keywords */ + { "Name", config_name, TYPE_NAME }, + { "ConnectTo", config_connectto, TYPE_NAME }, + { "PingTimeout", config_pingtimeout, TYPE_INT }, + { "TapDevice", config_tapdevice, TYPE_NAME }, + { "PrivateKey", config_privatekey, TYPE_NAME }, + { "KeyExpire", config_keyexpire, TYPE_INT }, + { "Hostnames", config_hostnames, TYPE_BOOL }, + { "Interface", config_interface, TYPE_NAME }, + { "InterfaceIP", config_interfaceip, TYPE_IP }, +/* Host configuration file keywords */ + { "Address", config_address, TYPE_NAME }, + { "Port", config_port, TYPE_INT }, + { "PublicKey", config_publickey, TYPE_NAME }, + { "Subnet", config_subnet, TYPE_IP }, /* Use IPv4 subnets only for now */ + { "RestrictHosts", config_restricthosts, TYPE_BOOL }, + { "RestrictSubnets", config_restrictsubnets, TYPE_BOOL }, + { "RestrictAddress", config_restrictaddress, TYPE_BOOL }, + { "RestrictPort", config_restrictport, TYPE_BOOL }, + { "IndirectData", config_indirectdata, TYPE_BOOL }, + { "TCPonly", config_tcponly, TYPE_BOOL }, { NULL, 0, 0 } }; @@ -71,10 +85,10 @@ add_config_val(config_t **cfg, int argtype, char *val) { config_t *p; char *q; - +cp p = (config_t*)xmalloc(sizeof(*p)); p->data.val = 0; - + switch(argtype) { case TYPE_INT: @@ -98,45 +112,116 @@ add_config_val(config_t **cfg, int argtype, char *val) p->data.val = 0; } + p->argtype = argtype; + if(p->data.val) { p->next = *cfg; *cfg = p; +cp return p; } + else + { + free(p); +cp + return NULL; + } +} + +/* + Read exactly one line and strip the trailing newline if any. If the + file was on EOF, return NULL. Otherwise, return all the data in a + dynamically allocated buffer. +*/ +char *readline(FILE *fp) +{ + char *newline = NULL; + char *p; + char *line; /* The array that contains everything that has been read + so far */ + char *idx; /* Read into this pointer, which points to an offset + within line */ + size_t size, newsize; /* The size of the current array pointed to by + line */ + size_t maxlen; /* Maximum number of characters that may be read with + fgets. This is newsize - oldsize. */ + + if(feof(fp)) + return NULL; + + size = 100; + maxlen = size; + line = xmalloc(size); + idx = line; + for(;;) + { + errno = 0; + p = fgets(idx, maxlen, fp); + if(p == NULL) /* EOF or error */ + { + if(feof(fp)) + break; + + /* otherwise: error; let the calling function print an error + message if applicable */ + free(line); + return NULL; + } + + newline = strchr(p, '\n'); + if(newline == NULL) + /* We haven't yet read everything to the end of the line */ + { + newsize = size << 1; + line = xrealloc(line, newsize); + idx = &line[size - 1]; + maxlen = newsize - size + 1; + size = newsize; + } + else + { + *newline = '\0'; /* kill newline */ + break; /* yay */ + } + } - free(p); - return NULL; + return line; } /* - Get variable from a section in a configfile. returns -1 on failure. + Parse a configuration file and put the results in the configuration tree + starting at *base. */ -int -readconfig(const char *fname, FILE *fp) +int read_config_file(config_t **base, const char *fname) { - char *line, *temp_buf; + 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; + } - line = (char *)xmalloc(80 * sizeof(char)); - temp_buf = (char *)xmalloc(80 * sizeof(char)); - for(;;) { - if(fgets(line, 80, fp) == NULL) - return 0; + if(fgets(line, MAXBUFSIZE, fp) == NULL) + { + err = 0; + break; + } + + lineno++; - while(!index(line, '\n')) + if(!index(line, '\n')) { - fgets(temp_buf, (strlen(line)+1) * 80, fp); - if(!temp_buf) - break; - strcat(line, temp_buf); - line = (char *)xrealloc(line, (strlen(line)+1) * sizeof(char)); + syslog(LOG_ERR, _("Line %d too long while reading config file %s"), lineno, fname); + break; } - lineno++; if((p = strtok(line, "\t\n\r =")) == NULL) continue; /* no tokens on this line */ @@ -150,66 +235,148 @@ readconfig(const char *fname, FILE *fp) if(!hazahaza[i].name) { - fprintf(stderr, "%s: %d: Invalid variable name `%s'.\n", - fname, lineno, p); - return -1; + syslog(LOG_ERR, _("Invalid variable name on line %d while reading config file %s"), + lineno, fname); + break; } if(((q = strtok(NULL, "\t\n\r =")) == NULL) || q[0] == '#') { - fprintf(stderr, "%s: %d: No value given for `%s'.\n", - fname, lineno, hazahaza[i].name); - return -1; + fprintf(stderr, _("No value for variable on line %d while reading config file %s"), + lineno, fname); + break; } - cfg = add_config_val(&config, hazahaza[i].argtype, q); + cfg = add_config_val(base, hazahaza[i].argtype, q); if(cfg == NULL) { - fprintf(stderr, "%s: %d: Invalid value `%s' for variable `%s'.\n", - fname, lineno, q, hazahaza[i].name); - return -1; + fprintf(stderr, _("Invalid value for variable on line %d while reading config file %s"), + lineno, fname); + break; } cfg->which = hazahaza[i].which; if(!config) config = cfg; } + + fclose (fp); +cp + return err; +} + +int read_server_config() +{ + char *fname; + int x; +cp + asprintf(&fname, "%s/tinc.conf", confbase); + x = read_config_file(&config, fname); + if(x != 0) + { + fprintf(stderr, _("Failed to read `%s': %m\n"), + fname); + } + free(fname); +cp + return x; } /* - wrapper function for readconfig + Look up the value of the config option type */ -int -read_config_file(const char *fname) +const config_t *get_config_val(config_t *p, which_t type) { - FILE *fp; +cp + for(; p != NULL; p = p->next) + if(p->which == type) + break; +cp + return p; +} - if((fp = fopen (fname, "r")) == NULL) +/* + Remove the complete configuration tree. +*/ +void clear_config(config_t **base) +{ + config_t *p, *next; +cp + for(p = *base; p != NULL; p = next) { - fprintf(stderr, "Could not open %s: %s\n", fname, sys_errlist[errno]); - return 1; + next = p->next; + if(p->data.ptr && (p->argtype == TYPE_NAME)) + { + free(p->data.ptr); + } + free(p); } + *base = NULL; +cp +} - if(readconfig(fname, fp)) - return -1; +#define is_safe_file(p) 1 - fclose (fp); +FILE *ask_and_safe_open(const char* filename, const char* what) +{ + FILE *r; + char *directory; + char *fn; + int len; - return 0; -} + /* 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 = xstrdup(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); /* Don't wait for a newline */ + if((fn = readline(stdin)) == NULL) + { + fprintf(stderr, _("Error while reading stdin: %m\n")); + return NULL; + } + if(strlen(fn) == 0) + /* User just pressed enter. */ + fn = xstrdup(filename); + } -/* - Look up the value of the config option type -*/ -const config_t * -get_config_val(which_t type) -{ - config_t *p; + if((strchr(fn, '/') == NULL) || (fn[0] != '/')) + { + /* The directory is a relative path or a filename. */ + char *p; + + directory = get_current_dir_name(); + len = strlen(fn) + strlen(directory) + 2; /* 1 for the / */ + p = xmalloc(len); + snprintf(p, len, "%s/%s", directory, fn); + free(fn); + fn = p; + } - for(p = config; p != NULL; p = p->next) - if(p->which == type) - return p; + if(!is_safe_file(fn)) + { + fprintf(stderr, _("The file `%s' (or any of the leading directories) has unsafe permissions.\n" + "I will not create or overwrite this file.\n"), + fn); + return NULL; + } - /* Not found */ - return NULL; + if((r = fopen(fn, "w")) == NULL) + { + fprintf(stderr, _("Error opening file `%s': %m\n"), + fn); + } + + free(fn); + free(directory); + + return r; }