X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=f519e78d37792b07b3182a767e970f84336ba243;hb=18237e1f2d9dd5eef4a4e0d746d016bf94a42ad4;hp=8a3309556c3ef32c6c137593b289b0f4170a1e2b;hpb=e72e6febfeddbd4354560388c8e0e125a8017909;p=tinc

diff --git a/src/tincctl.c b/src/tincctl.c
index 8a330955..f519e78d 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -25,11 +25,16 @@
 #include "protocol.h"
 #include "control_common.h"
 #include "ecdsagen.h"
+#include "info.h"
 #include "rsagen.h"
 #include "utils.h"
 #include "tincctl.h"
 #include "top.h"
 
+#ifdef HAVE_MINGW
+#define mkdir(a, b) mkdir(a)
+#endif
+
 /* The name this program was run with. */
 static char *program_name = NULL;
 
@@ -42,6 +47,7 @@ static bool show_version = false;
 static char *name = NULL;
 static char *identname = NULL;				/* program name for syslog */
 static char *pidfilename = NULL;			/* pid file location */
+static char *confdir = NULL;
 static char controlcookie[1024];
 char *netname = NULL;
 char *confbase = NULL;
@@ -55,6 +61,7 @@ static char line[4096];
 static int code;
 static int req;
 static int result;
+static bool force = false;
 
 #ifdef HAVE_MINGW
 static struct WSAData wsa_state;
@@ -74,6 +81,7 @@ static struct option const long_options[] = {
 	{"chroot", no_argument, NULL, 0},
 	{"user", required_argument, NULL, 0},
 	{"option", required_argument, NULL, 0},
+	{"force", no_argument, NULL, 6},
 	{NULL, 0, NULL, 0}
 };
 
@@ -120,6 +128,7 @@ static void usage(bool status) {
 				"    subnets                  - all known subnets in the VPN\n"
 				"    connections              - all meta connections with ourself\n"
 				"    graph                    - graph of the VPN in dotty format\n"
+				"  info NODE|SUBNET|ADDRESS   Give information about a particular NODE, SUBNET or ADDRESS.\n"
 				"  purge                      Purge unreachable nodes\n"
 				"  debug N                    Set debug level\n"
 				"  retry                      Retry all outgoing connections\n"
@@ -129,6 +138,9 @@ static void usage(bool status) {
 #endif
 				"  pcap [snaplen]             Dump traffic in pcap format [up to snaplen bytes per packet]\n"
 				"  log [level]                Dump log output [up to the specified level]\n"
+				"  export                     Export host configuration of local node to standard output\n"
+				"  export-all                 Export all host configuration files to standard output\n"
+				"  import [--force]           Import host configuration file(s) from standard input\n"
 				"\n");
 		printf("Report bugs to tinc@tinc-vpn.org.\n");
 	}
@@ -163,6 +175,10 @@ static bool parse_options(int argc, char **argv) {
 				pidfilename = xstrdup(optarg);
 				break;
 
+			case 6:
+				force = true;
+				break;
+
 			case '?':
 				usage(true);
 				return false;
@@ -172,11 +188,15 @@ static bool parse_options(int argc, char **argv) {
 		}
 	}
 
-	if(!netname) {
-		netname = getenv("NETNAME");
-		if(netname)
-			netname = xstrdup(netname);
-	}
+        if(!netname && (netname = getenv("NETNAME")))
+                netname = xstrdup(netname);
+
+        /* netname "." is special: a "top-level name" */
+
+        if(netname && !strcmp(netname, ".")) {
+                free(netname);
+                netname = NULL;
+        }
 
 	return true;
 }
@@ -215,7 +235,7 @@ static FILE *ask_and_open(const char *filename, const char *what, const char *mo
 #endif
 		/* The directory is a relative path or a filename. */
 		directory = get_current_dir_name();
-		snprintf(buf2, sizeof buf2, "%s/%s", directory, filename);
+		snprintf(buf2, sizeof buf2, "%s" SLASH "%s", directory, filename);
 		filename = buf2;
 	}
 
@@ -250,7 +270,7 @@ static bool ecdsa_keygen() {
 	} else
 		fprintf(stderr, "Done.\n");
 
-	xasprintf(&filename, "%s/ecdsa_key.priv", confbase);
+	xasprintf(&filename, "%s" SLASH "ecdsa_key.priv", confbase);
 	f = ask_and_open(filename, "private ECDSA key", "a");
 
 	if(!f)
@@ -270,9 +290,9 @@ static bool ecdsa_keygen() {
 	free(filename);
 
 	if(name)
-		xasprintf(&filename, "%s/hosts/%s", confbase, name);
+		xasprintf(&filename, "%s" SLASH "hosts" SLASH "%s", confbase, name);
 	else
-		xasprintf(&filename, "%s/ecdsa_key.pub", confbase);
+		xasprintf(&filename, "%s" SLASH "ecdsa_key.pub", confbase);
 
 	f = ask_and_open(filename, "public ECDSA key", "a");
 
@@ -309,7 +329,7 @@ static bool rsa_keygen(int bits) {
 	} else
 		fprintf(stderr, "Done.\n");
 
-	xasprintf(&filename, "%s/rsa_key.priv", confbase);
+	xasprintf(&filename, "%s" SLASH "rsa_key.priv", confbase);
 	f = ask_and_open(filename, "private RSA key", "a");
 
 	if(!f)
@@ -329,9 +349,9 @@ static bool rsa_keygen(int bits) {
 	free(filename);
 
 	if(name)
-		xasprintf(&filename, "%s/hosts/%s", confbase, name);
+		xasprintf(&filename, "%s" SLASH "hosts" SLASH "%s", confbase, name);
 	else
-		xasprintf(&filename, "%s/rsa_key.pub", confbase);
+		xasprintf(&filename, "%s" SLASH "rsa_key.pub", confbase);
 
 	f = ask_and_open(filename, "public RSA key", "a");
 
@@ -369,38 +389,40 @@ static void make_names(void) {
 		if(!RegQueryValueEx(key, NULL, 0, 0, installdir, &len)) {
 			if(!confbase) {
 				if(netname)
-					xasprintf(&confbase, "%s/%s", installdir, netname);
+					xasprintf(&confbase, "%s" SLASH "%s", installdir, netname);
 				else
 					xasprintf(&confbase, "%s", installdir);
 			}
 		}
 		if(!pidfilename)
-			xasprintf(&pidfilename, "%s/pid", confbase);
+			xasprintf(&pidfilename, "%s" SLASH "pid", confbase);
 		RegCloseKey(key);
 	}
 
 	if(!*installdir) {
 #endif
+	confdir = xstrdup(CONFDIR);
 
 	if(!pidfilename)
-		xasprintf(&pidfilename, "%s/run/%s.pid", LOCALSTATEDIR, identname);
+		xasprintf(&pidfilename, "%s" SLASH "run" SLASH "%s.pid", LOCALSTATEDIR, identname);
 
 	if(netname) {
 		if(!confbase)
-			xasprintf(&confbase, CONFDIR "/tinc/%s", netname);
+			xasprintf(&confbase, CONFDIR SLASH "tinc" SLASH "%s", netname);
 		else
 			fprintf(stderr, "Both netname and configuration directory given, using the latter...\n");
 	} else {
 		if(!confbase)
-			xasprintf(&confbase, CONFDIR "/tinc");
+			xasprintf(&confbase, CONFDIR SLASH "tinc");
 	}
 
 #ifdef HAVE_MINGW
-	}
+	} else
+		confdir = xstrdup(installdir);
 #endif
 
-	xasprintf(&tinc_conf, "%s/tinc.conf", confbase);
-	xasprintf(&hosts_dir, "%s/hosts", confbase);
+	xasprintf(&tinc_conf, "%s" SLASH "tinc.conf", confbase);
+	xasprintf(&hosts_dir, "%s" SLASH "hosts", confbase);
 }
 
 static char buffer[4096];
@@ -673,10 +695,8 @@ static int cmd_start(int argc, char *argv[]) {
 		slash = c;
 #endif
 
-	if (slash++) {
-		c = xmalloc((slash - argv[0]) + sizeof("tincd"));
-		sprintf(c, "%.*stincd", (int)(slash - argv[0]), argv[0]);
-	}
+	if (slash++)
+		xasprintf(&c, "%.*stincd", (int)(slash - argv[0]), argv[0]);
 	else
 		c = "tincd";
 
@@ -960,12 +980,65 @@ static char *get_my_name() {
 	return NULL;
 }
 
-static char *hostvariables[] = {
-	"Address",
-	"Port",
-	"PublicKey",
-	"Subnet",
-	NULL,
+#define VAR_SERVER 1    /* Should be in tinc.conf */
+#define VAR_HOST 2      /* Can be in host config file */
+#define VAR_MULTIPLE 4  /* Multiple statements allowed */
+#define VAR_OBSOLETE 8  /* Should not be used anymore */
+
+static struct {
+	const char *name;
+	int type;
+} const variables[] = {
+	/* Server configuration */
+	{"AddressFamily", VAR_SERVER},
+	{"BindToAddress", VAR_SERVER | VAR_MULTIPLE},
+	{"BindToInterface", VAR_SERVER},
+	{"Broadcast", VAR_SERVER},
+	{"ConnectTo", VAR_SERVER | VAR_MULTIPLE},
+	{"DecrementTTL", VAR_SERVER},
+	{"Device", VAR_SERVER},
+	{"DeviceType", VAR_SERVER},
+	{"DirectOnly", VAR_SERVER},
+	{"ECDSAPrivateKeyFile", VAR_SERVER},
+	{"ExperimentalProtocol", VAR_SERVER},
+	{"Forwarding", VAR_SERVER},
+	{"GraphDumpFile", VAR_SERVER},
+	{"Hostnames", VAR_SERVER},
+	{"IffOneQueue", VAR_SERVER},
+	{"Interface", VAR_SERVER},
+	{"KeyExpire", VAR_SERVER},
+	{"LocalDiscovery", VAR_SERVER},
+	{"MACExpire", VAR_SERVER},
+	{"MaxTimeout", VAR_SERVER},
+	{"Mode", VAR_SERVER},
+	{"Name", VAR_SERVER},
+	{"PingInterval", VAR_SERVER},
+	{"PingTimeout", VAR_SERVER},
+	{"PriorityInheritance", VAR_SERVER},
+	{"PrivateKey", VAR_SERVER | VAR_OBSOLETE},
+	{"PrivateKeyFile", VAR_SERVER},
+	{"ProcessPriority", VAR_SERVER},
+	{"ReplayWindow", VAR_SERVER},
+	{"StrictSubnets", VAR_SERVER},
+	{"TunnelServer", VAR_SERVER},
+	{"UDPRcvBuf", VAR_SERVER},
+	{"UDPSndBuf", VAR_SERVER},
+	/* Host configuration */
+	{"Address", VAR_HOST | VAR_MULTIPLE},
+	{"Cipher", VAR_SERVER | VAR_HOST},
+	{"ClampMSS", VAR_SERVER | VAR_HOST},
+	{"Compression", VAR_SERVER | VAR_HOST},
+	{"Digest", VAR_SERVER | VAR_HOST},
+	{"IndirectData", VAR_SERVER | VAR_HOST},
+	{"MACLength", VAR_SERVER | VAR_HOST},
+	{"PMTU", VAR_SERVER | VAR_HOST},
+	{"PMTUDiscovery", VAR_SERVER | VAR_HOST},
+	{"Port", VAR_HOST},
+	{"PublicKey", VAR_SERVER | VAR_HOST | VAR_OBSOLETE},
+	{"PublicKeyFile", VAR_SERVER | VAR_HOST | VAR_OBSOLETE},
+	{"Subnet", VAR_HOST | VAR_MULTIPLE},
+	{"TCPOnly", VAR_SERVER | VAR_HOST},
+	{NULL, 0}
 };
 
 static int cmd_config(int argc, char *argv[]) {
@@ -1027,16 +1100,47 @@ static int cmd_config(int argc, char *argv[]) {
 		return 1;
 	}
 
-	// Should this go into our own host config file?
-	if(!node) {
-		for(int i = 0; hostvariables[i]; i++) {
-			if(!strcasecmp(hostvariables[i], variable)) {
-				node = get_my_name();
-				if(!node)
-					return 1;
-				break;
+	/* Some simple checks. */
+	bool found = false;
+
+	for(int i = 0; variables[i].name; i++) {
+		if(strcasecmp(variables[i].name, variable))
+			continue;
+
+		found = true;
+		variable = (char *)variables[i].name;
+
+		/* Discourage use of obsolete variables. */
+
+		if(variables[i].type & VAR_OBSOLETE && action >= 0) {
+			if(force) {
+				fprintf(stderr, "Warning: %s is an obsolete variable!\n", variable);
+			} else {
+				fprintf(stderr, "%s is an obsolete variable! Use --force to use it anyway.\n", variable);
+				return 1;
 			}
 		}
+
+		/* Don't put server variables in host config files */
+
+		if(node && !(variables[i].type & VAR_HOST) && action >= 0) {
+			if(force) {
+				fprintf(stderr, "Warning: %s is not a host configuration variable!\n", variable);
+			} else {
+				fprintf(stderr, "%s is not a host configuration variable! Use --force to use it anyway.\n", variable);
+				return 1;
+			}
+		}
+
+		/* Should this go into our own host config file? */
+
+		if(!node && !(variables[i].type & VAR_SERVER)) {
+			node = get_my_name();
+			if(!node)
+				return 1;
+		}
+
+		break;
 	}
 
 	if(node && !check_id(node)) {
@@ -1044,10 +1148,19 @@ static int cmd_config(int argc, char *argv[]) {
 		return 1;
 	}
 
+	if(!found && action >= 0) {
+		if(force) {
+			fprintf(stderr, "Warning: %s is not a known configuration variable!\n", variable);
+		} else {
+			fprintf(stderr, "%s: is not a known configuration variable! Use --force to use it anyway.\n", variable);
+			return 1;
+		}
+	}
+
 	// Open the right configuration file.
 	char *filename;
 	if(node)
-		xasprintf(&filename, "%s/%s", hosts_dir, node);
+		xasprintf(&filename, "%s" SLASH "%s", hosts_dir, node);
 	else
 		filename = tinc_conf;
 
@@ -1084,7 +1197,7 @@ static int cmd_config(int argc, char *argv[]) {
 
 	while(fgets(buf1, sizeof buf1, f)) {
 		buf1[sizeof buf1 - 1] = 0;
-		strcpy(buf2, buf1);
+		strncpy(buf2, buf1, sizeof buf2);
 
 		// Parse line in a simple way
 		char *bvalue;
@@ -1128,6 +1241,14 @@ static int cmd_config(int argc, char *argv[]) {
 			fprintf(stderr, "Error writing to temporary file %s: %s\n", tmpfile, strerror(errno));
 			return 1;
 		}
+
+		// Add newline if it is missing...
+		if(*buf1 && buf1[strlen(buf1) - 1] != '\n') {
+			if(fputc('\n', tf) < 0) {
+				fprintf(stderr, "Error writing to temporary file %s: %s\n", tmpfile, strerror(errno));
+				return 1;
+			}
+		}
 	}
 
 	// Make sure we read everything...
@@ -1230,7 +1351,7 @@ static int cmd_init(int argc, char *argv[]) {
 		return 1;
 	}
 
-	if(mkdir(CONFDIR, 0755) && errno != EEXIST) {
+	if(mkdir(confdir, 0755) && errno != EEXIST) {
 		fprintf(stderr, "Could not create directory %s: %s\n", CONFDIR, strerror(errno));
 		return 1;
 	}
@@ -1241,7 +1362,7 @@ static int cmd_init(int argc, char *argv[]) {
 	}
 
 	char *hosts_dir = NULL;
-	xasprintf(&hosts_dir, "%s/hosts", confbase);
+	xasprintf(&hosts_dir, "%s" SLASH "hosts", confbase);
 	if(mkdir(hosts_dir, 0755) && errno != EEXIST) {
 		fprintf(stderr, "Could not create directory %s: %s\n", hosts_dir, strerror(errno));
 		return 1;
@@ -1286,6 +1407,18 @@ static int cmd_version(int argc, char *argv[]) {
 	return 0;
 }
 
+static int cmd_info(int argc, char *argv[]) {
+	if(argc != 2) {
+		fprintf(stderr, "Invalid number of arguments.\n");
+		return 1;
+	}
+
+	if(!connect_tincd())
+		return 1;
+
+	return info(fd, argv[1]);
+}
+
 static const char *conffiles[] = {
 	"tinc.conf",
 	"tinc-up",
@@ -1305,10 +1438,10 @@ static int cmd_edit(int argc, char *argv[]) {
 
 	char *filename = NULL;
 
-	if(strncmp(argv[1], "hosts/", 6)) {
+	if(strncmp(argv[1], "hosts" SLASH, 6)) {
 		for(int i = 0; conffiles[i]; i++) {
 			if(!strcmp(argv[1], conffiles[i])) {
-				xasprintf(&filename, "%s/%s", confbase, argv[1]);
+				xasprintf(&filename, "%s" SLASH "%s", confbase, argv[1]);
 				break;
 			}
 		}
@@ -1317,7 +1450,7 @@ static int cmd_edit(int argc, char *argv[]) {
 	}
 
 	if(!filename) {
-		xasprintf(&filename, "%s/%s", hosts_dir, argv[1]);
+		xasprintf(&filename, "%s" SLASH "%s", hosts_dir, argv[1]);
 		char *dash = strchr(argv[1], '-');
 		if(dash) {
 			*dash++ = 0;
@@ -1331,7 +1464,7 @@ static int cmd_edit(int argc, char *argv[]) {
 #ifndef HAVE_MINGW
 	char *editor = getenv("VISUAL") ?: getenv("EDITOR") ?: "vi";
 #else
-	char *editor = "edit"
+	char *editor = "edit";
 #endif
 
 	char *command;
@@ -1349,6 +1482,133 @@ static int cmd_edit(int argc, char *argv[]) {
 	return 0;
 }
 
+static int export(const char *name, FILE *out) {
+	char *filename;
+	xasprintf(&filename, "%s" SLASH "%s", hosts_dir, name);
+	FILE *in = fopen(filename, "r");
+	if(!in) {
+		fprintf(stderr, "Could not open configuration file %s: %s\n", filename, strerror(errno));
+		return 1;
+	}
+
+	fprintf(out, "Name = %s\n", name);
+	char buf[4096];
+	while(fgets(buf, sizeof buf, in)) {
+		if(strcspn(buf, "\t =") != 4 || strncasecmp(buf, "Name", 4))
+			fputs(buf, out);
+	}
+
+	if(ferror(in)) {
+		fprintf(stderr, "Error while reading configuration file %s: %s\n", filename, strerror(errno));
+		return 1;
+	}
+
+	fclose(in);
+	return 0;
+}
+
+static int cmd_export(int argc, char *argv[]) {
+	char *name = get_my_name();
+	if(!name)
+		return 1;
+
+	return export(name, stdout);
+}
+
+static int cmd_export_all(int argc, char *argv[]) {
+	DIR *dir = opendir(hosts_dir);
+	if(!dir) {
+		fprintf(stderr, "Could not open host configuration directory %s: %s\n", hosts_dir, strerror(errno));
+		return 1;
+	}
+
+	bool first = true;
+	int result = 0;
+	struct dirent *ent;
+
+	while((ent = readdir(dir))) {
+		if(!check_id(ent->d_name))
+			continue;
+
+		if(first)
+			first = false;
+		else
+			printf("#---------------------------------------------------------------#\n");
+
+		result |= export(ent->d_name, stdout);
+	}
+
+	closedir(dir);
+	return result;
+}
+
+static int cmd_import(int argc, char *argv[]) {
+	FILE *in = stdin;
+	FILE *out = NULL;
+
+	char buf[4096];
+	char name[4096];
+	char *filename;
+	int count = 0;
+	bool firstline = true;
+
+	while(fgets(buf, sizeof buf, in)) {
+		if(sscanf(buf, "Name = %s", name) == 1) {
+			if(!check_id(name)) {
+				fprintf(stderr, "Invalid Name in input!\n");
+				return 1;
+			}
+
+			if(out)
+				fclose(out);
+
+			free(filename);
+			xasprintf(&filename, "%s" SLASH "%s", hosts_dir, name);
+
+			if(!force && !access(filename, F_OK)) {
+				fprintf(stderr, "Host configuration file %s already exists, skipping.\n", filename);
+				out = NULL;
+				continue;
+			}
+
+			out = fopen(filename, "w");
+			if(!out) {
+				fprintf(stderr, "Error creating configuration file %s: %s\n", filename, strerror(errno));
+				return 1;
+			}
+
+			count++;
+			firstline = false;
+			continue;
+		} else if(firstline) {
+			fprintf(stderr, "Junk at the beginning of the input, ignoring.\n");
+			firstline = false;
+		}
+
+
+		if(!strcmp(buf, "#---------------------------------------------------------------#\n"))
+			continue;
+
+		if(out) {
+			if(fputs(buf, out) < 0) {
+				fprintf(stderr, "Error writing to host configuration file %s: %s\n", filename, strerror(errno));
+				return 1;
+			}
+		}
+	}
+
+	if(out)
+		fclose(out);
+
+	if(count) {
+		fprintf(stderr, "Imported %d host configuration files.\n", count);
+		return 0;
+	} else {
+		fprintf(stderr, "No host configuration files imported.\n");
+		return 1;
+	}
+}
+
 static const struct {
 	const char *command;
 	int (*function)(int argc, char *argv[]);
@@ -1374,7 +1634,11 @@ static const struct {
 	{"generate-ecdsa-keys", cmd_generate_ecdsa_keys},
 	{"help", cmd_help},
 	{"version", cmd_version},
+	{"info", cmd_info},
 	{"edit", cmd_edit},
+	{"export", cmd_export},
+	{"export-all", cmd_export_all},
+	{"import", cmd_import},
 	{NULL, NULL},
 };