conf.c -- configuration code
Copyright (C) 1998 Robert van der Meulen
1998-2005 Ivo Timmermans
- 2000-2010 Guus Sliepen <guus@tinc-vpn.org>
+ 2000-2014 Guus Sliepen <guus@tinc-vpn.org>
2010-2011 Julien Muchembled <jm@jmuchemb.eu>
2000 Cris van Pelt
#include "avl_tree.h"
#include "connection.h"
#include "conf.h"
+#include "list.h"
#include "logger.h"
#include "netutl.h" /* for str2address */
#include "protocol.h"
}
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;
+ for(const list_node_t *node = cmdline_conf->tail; node; node = node->prev) {
+ const config_t *cfg = node->data;
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);
+
+ config_t *new = new_config();
+
+ if(prefix) {
+ new->variable = xstrdup(cfg->variable + prefix_len + 1);
+ } else {
+ new->variable = xstrdup(cfg->variable);
+ }
+
+ new->value = xstrdup(cfg->value);
+ new->file = NULL;
+ new->line = cfg->line;
+
+ config_add(config_tree, new);
}
}
bool read_server_config(void) {
- char *fname;
+ char fname[PATH_MAX];
bool x;
read_config_options(config_tree, NULL);
- xasprintf(&fname, "%s/tinc.conf", confbase);
+ snprintf(fname, sizeof fname, "%s/tinc.conf", confbase);
+ errno = 0;
x = read_config_file(config_tree, fname);
- if(!x) { /* System error: complain */
- logger(LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno));
+ // We will try to read the conf files in the "conf.d" dir
+ if (x) {
+ char dname[PATH_MAX];
+ snprintf(dname, sizeof dname, "%s/conf.d", confbase);
+ DIR *dir = opendir (dname);
+ // If we can find this dir
+ if (dir) {
+ struct dirent *ep;
+ // We list all the files in it
+ while (x && (ep = readdir (dir))) {
+ size_t l = strlen(ep->d_name);
+ // And we try to read the ones that end with ".conf"
+ if (l > 5 && !strcmp(".conf", & ep->d_name[ l - 5 ])) {
+ snprintf(fname, sizeof fname, "%s/%s", dname, ep->d_name);
+ x = read_config_file(config_tree, fname);
+ }
+ }
+ closedir (dir);
+ }
}
- free(fname);
+ if(!x && errno) {
+ logger(LOG_ERR, "Failed to read `%s': %s", fname, strerror(errno));
+ }
return x;
}
bool read_connection_config(connection_t *c) {
- char *fname;
+ char fname[PATH_MAX];
bool x;
read_config_options(c->config_tree, c->name);
- xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
+ snprintf(fname, sizeof fname, "%s/hosts/%s", confbase, c->name);
x = read_config_file(c->config_tree, fname);
- free(fname);
return x;
}
+static void disable_old_keys(const char *filename) {
+ char tmpfile[PATH_MAX] = "";
+ char buf[1024];
+ bool disabled = false;
+ FILE *r, *w;
+
+ r = fopen(filename, "r");
+ if(!r)
+ return;
+
+ snprintf(tmpfile, sizeof tmpfile, "%s.tmp", filename);
+
+ w = fopen(tmpfile, "w");
+
+ while(fgets(buf, sizeof buf, r)) {
+ if(!strncmp(buf, "-----BEGIN RSA", 14)) {
+ buf[11] = 'O';
+ buf[12] = 'L';
+ buf[13] = 'D';
+ disabled = true;
+ }
+ else if(!strncmp(buf, "-----END RSA", 12)) {
+ buf[ 9] = 'O';
+ buf[10] = 'L';
+ buf[11] = 'D';
+ disabled = true;
+ }
+ if(w && fputs(buf, w) < 0) {
+ disabled = false;
+ break;
+ }
+ }
+
+ if(w)
+ fclose(w);
+ fclose(r);
+
+ if(!w && disabled) {
+ fprintf(stderr, "Warning: old key(s) found, remove them by hand!\n");
+ return;
+ }
+
+ if(disabled) {
+#ifdef HAVE_MINGW
+ // We cannot atomically replace files on Windows.
+ char bakfile[PATH_MAX] = "";
+ snprintf(bakfile, sizeof bakfile, "%s.bak", filename);
+ if(rename(filename, bakfile) || rename(tmpfile, filename)) {
+ rename(bakfile, filename);
+#else
+ if(rename(tmpfile, filename)) {
+#endif
+ fprintf(stderr, "Warning: old key(s) found, remove them by hand!\n");
+ } else {
+#ifdef HAVE_MINGW
+ unlink(bakfile);
+#endif
+ fprintf(stderr, "Warning: old key(s) found and disabled.\n");
+ }
+ }
+
+ unlink(tmpfile);
+}
+
FILE *ask_and_open(const char *filename, const char *what) {
FILE *r;
- char *directory;
+ char directory[PATH_MAX];
char line[PATH_MAX];
+ char abspath[PATH_MAX];
const char *fn;
/* Check stdin and stdout */
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;
+ getcwd(directory, sizeof directory);
+ snprintf(abspath, sizeof abspath, "%s/%s", directory, fn);
+ fn = abspath;
}
umask(0077); /* Disallow everything for group and other */
+ disable_old_keys(fn);
+
/* Open it first to keep the inode busy */
- r = fopen(fn, "r+") ?: fopen(fn, "w+");
+ r = fopen(fn, "a");
if(!r) {
fprintf(stderr, "Error opening file `%s': %s\n",
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;
-}