X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincctl.c;h=6ed96fcde334e32ef084feeb8741f51b34f81bbf;hp=bff122b0efc5518f0403272a9226f153b73bceb3;hb=07a560eab66b575f382428a956550817697e25e2;hpb=a62a6825a8a69e279ee0688a4cd9e51fbc52054b

diff --git a/src/tincctl.c b/src/tincctl.c
index bff122b0..6ed96fcd 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -1,6 +1,6 @@
 /*
     tincctl.c -- Controlling a running tincd
-    Copyright (C) 2007 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2007-2009 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -22,17 +22,12 @@
 #include "system.h"
 
 #include <sys/un.h>
-#include <openssl/rand.h>
-#include <openssl/rsa.h>
-#include <openssl/pem.h>
-#include <openssl/evp.h>
-#include <openssl/engine.h>
-
 #include <getopt.h>
 
 #include "xalloc.h"
 #include "protocol.h"
 #include "control_common.h"
+#include "rsagen.h"
 
 /* The name this program was run with. */
 char *program_name = NULL;
@@ -65,11 +60,11 @@ static struct option const long_options[] = {
 
 static void usage(bool status) {
 	if(status)
-		fprintf(stderr, _("Try `%s --help\' for more information.\n"),
+		fprintf(stderr, "Try `%s --help\' for more information.\n",
 				program_name);
 	else {
-		printf(_("Usage: %s [options] command\n\n"), program_name);
-		printf(_("Valid options are:\n"
+		printf("Usage: %s [options] command\n\n", program_name);
+		printf("Valid options are:\n"
 				"  -c, --config=DIR              Read configuration options from DIR.\n"
 				"  -n, --net=NETNAME             Connect to net NETNAME.\n"
 				"      --controlsocket=FILENAME  Open control socket at FILENAME.\n"
@@ -91,8 +86,10 @@ static void usage(bool status) {
 				"    graph                    - graph of the VPN in dotty format\n"
 				"  purge                      Purge unreachable nodes\n"
 				"  debug N                    Set debug level\n"
-				"\n"));
-		printf(_("Report bugs to tinc@tinc-vpn.org.\n"));
+				"  retry                      Retry all outgoing connections\n"
+				"  reload                     Partial reload of configuration\n"
+				"\n");
+		printf("Report bugs to tinc@tinc-vpn.org.\n");
 	}
 }
 
@@ -147,12 +144,12 @@ FILE *ask_and_open(const char *filename, const char *what, const char *mode) {
 	/* Check stdin and stdout */
 	if(isatty(0) && isatty(1)) {
 		/* Ask for a file and/or directory name. */
-		fprintf(stdout, _("Please enter a file to save %s to [%s]: "),
+		fprintf(stdout, "Please enter a file to save %s to [%s]: ",
 				what, filename);
 		fflush(stdout);
 
 		if(fgets(buf, sizeof buf, stdin) < 0) {
-			fprintf(stderr, _("Error while reading stdin: %s\n"),
+			fprintf(stderr, "Error while reading stdin: %s\n",
 					strerror(errno));
 			return NULL;
 		}
@@ -183,70 +180,33 @@ FILE *ask_and_open(const char *filename, const char *what, const char *mode) {
 	r = fopen(filename, mode);
 
 	if(!r) {
-		fprintf(stderr, _("Error opening file `%s': %s\n"), filename, strerror(errno));
+		fprintf(stderr, "Error opening file `%s': %s\n", filename, strerror(errno));
 		return NULL;
 	}
 
 	return r;
 }
 
-/* This function prettyprints the key generation process */
-
-static void indicator(int a, int b, void *p) {
-	switch (a) {
-		case 0:
-			fprintf(stderr, ".");
-			break;
-
-		case 1:
-			fprintf(stderr, "+");
-			break;
-
-		case 2:
-			fprintf(stderr, "-");
-			break;
-
-		case 3:
-			switch (b) {
-				case 0:
-					fprintf(stderr, " p\n");
-					break;
-
-				case 1:
-					fprintf(stderr, " q\n");
-					break;
-
-				default:
-					fprintf(stderr, "?");
-			}
-			break;
-
-		default:
-			fprintf(stderr, "?");
-	}
-}
-
 /*
   Generate a public/private RSA keypair, and ask for a file to store
   them in.
 */
 static bool keygen(int bits) {
-	RSA *rsa_key;
+	rsa_t key;
 	FILE *f;
 	char *name = NULL;
 	char *filename;
 
-	fprintf(stderr, _("Generating %d bits keys:\n"), bits);
-	rsa_key = RSA_generate_key(bits, 0x10001, indicator, NULL);
+	fprintf(stderr, "Generating %d bits keys:\n", bits);
 
-	if(!rsa_key) {
-		fprintf(stderr, _("Error during key generation!\n"));
+	if(!rsa_generate(&key, bits, 0x10001)) {
+		fprintf(stderr, "Error during key generation!\n");
 		return false;
 	} else
-		fprintf(stderr, _("Done.\n"));
+		fprintf(stderr, "Done.\n");
 
-	asprintf(&filename, "%s/rsa_key.priv", confbase);
-	f = ask_and_open(filename, _("private RSA key"), "a");
+	xasprintf(&filename, "%s/rsa_key.priv", confbase);
+	f = ask_and_open(filename, "private RSA key", "a");
 
 	if(!f)
 		return false;
@@ -257,26 +217,28 @@ static bool keygen(int bits) {
 #endif
 		
 	if(ftell(f))
-		fprintf(stderr, _("Appending key to existing contents.\nMake sure only one key is stored in the file.\n"));
+		fprintf(stderr, "Appending key to existing contents.\nMake sure only one key is stored in the file.\n");
+
+	rsa_write_pem_private_key(&key, f);
 
-	PEM_write_RSAPrivateKey(f, rsa_key, NULL, NULL, 0, NULL, NULL);
 	fclose(f);
 	free(filename);
 
 	if(name)
-		asprintf(&filename, "%s/hosts/%s", confbase, name);
+		xasprintf(&filename, "%s/hosts/%s", confbase, name);
 	else
-		asprintf(&filename, "%s/rsa_key.pub", confbase);
+		xasprintf(&filename, "%s/rsa_key.pub", confbase);
 
-	f = ask_and_open(filename, _("public RSA key"), "a");
+	f = ask_and_open(filename, "public RSA key", "a");
 
 	if(!f)
 		return false;
 
 	if(ftell(f))
-		fprintf(stderr, _("Appending key to existing contents.\nMake sure only one key is stored in the file.\n"));
+		fprintf(stderr, "Appending key to existing contents.\nMake sure only one key is stored in the file.\n");
+
+	rsa_write_pem_public_key(&key, f);
 
-	PEM_write_RSAPublicKey(f, rsa_key);
 	fclose(f);
 	free(filename);
 
@@ -290,11 +252,11 @@ static void make_names(void) {
 #ifdef HAVE_MINGW
 	HKEY key;
 	char installdir[1024] = "";
-	long len = sizeof(installdir);
+	long len = sizeof installdir;
 #endif
 
 	if(netname)
-		asprintf(&identname, "tinc.%s", netname);
+		xasprintf(&identname, "tinc.%s", netname);
 	else
 		identname = xstrdup("tinc");
 
@@ -302,12 +264,12 @@ static void make_names(void) {
 	if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\tinc", 0, KEY_READ, &key)) {
 		if(!RegQueryValueEx(key, NULL, 0, 0, installdir, &len)) {
 			if(!logfilename)
-				asprintf(&logfilename, "%s/log/%s.log", identname);
+				xasprintf(&logfilename, "%s/log/%s.log", identname);
 			if(!confbase) {
 				if(netname)
-					asprintf(&confbase, "%s/%s", installdir, netname);
+					xasprintf(&confbase, "%s/%s", installdir, netname);
 				else
-					asprintf(&confbase, "%s", installdir);
+					xasprintf(&confbase, "%s", installdir);
 			}
 		}
 		RegCloseKey(key);
@@ -317,29 +279,29 @@ static void make_names(void) {
 #endif
 
 	if(!controlsocketname)
-		asprintf(&controlsocketname, LOCALSTATEDIR "/run/%s.control", identname);
+		xasprintf(&controlsocketname, "%s/run/%s.control/socket", LOCALSTATEDIR, identname);
 
 	if(netname) {
 		if(!confbase)
-			asprintf(&confbase, CONFDIR "/tinc/%s", netname);
+			xasprintf(&confbase, CONFDIR "/tinc/%s", netname);
 		else
-			fprintf(stderr, _("Both netname and configuration directory given, using the latter...\n"));
+			fprintf(stderr, "Both netname and configuration directory given, using the latter...\n");
 	} else {
 		if(!confbase)
-			asprintf(&confbase, CONFDIR "/tinc");
+			xasprintf(&confbase, CONFDIR "/tinc");
 	}
 }
 
 static int fullread(int fd, void *data, size_t datalen) {
 	int rv, len = 0;
 
-	while (len < datalen) {
+	while(len < datalen) {
 		rv = read(fd, data + len, datalen - len);
 		if(rv == -1 && errno == EINTR)
 			continue;
-		else if (rv == -1)
+		else if(rv == -1)
 			return rv;
-		else if (rv == 0) {
+		else if(rv == 0) {
 			errno = ENODATA;
 			return -1;
 		}
@@ -358,7 +320,7 @@ static int send_ctl_request(int fd, enum request_type type,
 	tinc_ctl_request_t req;
 	int rv;
 	struct iovec vector[2] = {
-		{&req, sizeof(req)},
+		{&req, sizeof req},
 		{(void*) outdata, outdatalen}
 	};
 	void *indata;
@@ -384,7 +346,7 @@ static int send_ctl_request(int fd, enum request_type type,
 	}
 
 	if(req.length > sizeof req) {
-		if (indata_p == NULL) {
+		if(indata_p == NULL) {
 			errno = EINVAL;
 			return -1;
 		}
@@ -409,26 +371,24 @@ static int send_ctl_request(int fd, enum request_type type,
 /*
    Send a request (with printfs)
 */
-static int send_ctl_request_cooked(int fd, enum request_type type,
-								   void const *outdata, size_t outdatalen)
-{
+static int send_ctl_request_cooked(int fd, enum request_type type, void const *outdata, size_t outdatalen) {
 	int res_errno = -1;
 	char *buf = NULL;
 	size_t buflen = 0;
 
 	if(send_ctl_request(fd, type, outdata, outdatalen, &res_errno,
 						(void**) &buf, &buflen)) {
-		fprintf(stderr, _("Error sending request: %s\n"), strerror(errno));
+		fprintf(stderr, "Error sending request: %s\n", strerror(errno));
 		return -1;
 	}
 
 	if(buf != NULL) {
-		printf("%*s", buflen, buf);
+		printf("%*s", (int)buflen, buf);
 		free(buf);
 	}
 
 	if(res_errno != 0) {
-		fprintf(stderr, _("Server reported error: %s\n"), strerror(res_errno));
+		fprintf(stderr, "Server reported error: %s\n", strerror(res_errno));
 		return -1;
 	}
 
@@ -437,30 +397,25 @@ static int send_ctl_request_cooked(int fd, enum request_type type,
 
 int main(int argc, char *argv[], char *envp[]) {
 	struct sockaddr_un addr;
-	int fd;
-	int len;
 	tinc_ctl_greeting_t greeting;
-	tinc_ctl_request_t req;
+	int fd;
+	int result;
 
 	program_name = argv[0];
 
-	setlocale(LC_ALL, "");
-	bindtextdomain(PACKAGE, LOCALEDIR);
-	textdomain(PACKAGE);
-
 	if(!parse_options(argc, argv))
 		return 1;
 	
 	make_names();
 
 	if(show_version) {
-		printf(_("%s version %s (built %s %s, protocol %d)\n"), PACKAGE,
+		printf("%s version %s (built %s %s, protocol %d)\n", PACKAGE,
 			   VERSION, __DATE__, __TIME__, PROT_CURRENT);
-		printf(_("Copyright (C) 1998-2007 Ivo Timmermans, Guus Sliepen and others.\n"
+		printf("Copyright (C) 1998-2009 Ivo Timmermans, Guus Sliepen and others.\n"
 				"See the AUTHORS file for a complete list.\n\n"
 				"tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
 				"and you are welcome to redistribute it under certain conditions;\n"
-				"see the file COPYING for details.\n"));
+				"see the file COPYING for details.\n");
 
 		return 0;
 	}
@@ -471,7 +426,7 @@ int main(int argc, char *argv[], char *envp[]) {
 	}
 
 	if(optind >= argc) {
-		fprintf(stderr, _("Not enough arguments.\n"));
+		fprintf(stderr, "Not enough arguments.\n");
 		usage(true);
 		return 1;
 	}
@@ -479,26 +434,51 @@ int main(int argc, char *argv[], char *envp[]) {
 	// First handle commands that don't involve connecting to a running tinc daemon.
 
 	if(!strcasecmp(argv[optind], "generate-keys")) {
-		return !keygen(optind > argc ? atoi(argv[optind + 1]) : 1024);
+		return !keygen(optind > argc ? atoi(argv[optind + 1]) : 2048);
 	}
 
 	if(!strcasecmp(argv[optind], "start")) {
 		argv[optind] = NULL;
-		execve("tincd", argv, envp);
-		fprintf(stderr, _("Could not start tincd: %s"), strerror(errno));
+		execve(SBINDIR "/tincd", argv, envp);
+		fprintf(stderr, "Could not start tincd: %s", strerror(errno));
 		return 1;
 	}
 
-	// Now handle commands that do involve connecting to a running tinc daemon.
+	/*
+	 * Now handle commands that do involve connecting to a running tinc daemon.
+	 * Authenticate the server by ensuring the parent directory can be
+	 * traversed only by root. Note this is not totally race-free unless all
+	 * ancestors are writable only by trusted users, which we don't verify.
+	 */
+
+	struct stat statbuf;
+	char *lastslash = strrchr(controlsocketname, '/');
+	if(lastslash != NULL) {
+		/* control socket is not in cwd; stat its parent */
+		*lastslash = 0;
+		result = stat(controlsocketname, &statbuf);
+		*lastslash = '/';
+	} else
+		result = stat(".", &statbuf);
+
+	if(result < 0) {
+		fprintf(stderr, "Unable to check control socket directory permissions: %s\n", strerror(errno));
+		return 1;
+	}
+
+	if(statbuf.st_uid != 0 || (statbuf.st_mode & S_IXOTH) != 0 || (statbuf.st_gid != 0 && (statbuf.st_mode & S_IXGRP)) != 0) {
+		fprintf(stderr, "Insecure permissions on control socket directory\n");
+		return 1;
+	}
 
 	if(strlen(controlsocketname) >= sizeof addr.sun_path) {
-		fprintf(stderr, _("Control socket filename too long!\n"));
+		fprintf(stderr, "Control socket filename too long!\n");
 		return 1;
 	}
 
 	fd = socket(PF_UNIX, SOCK_STREAM, 0);
 	if(fd < 0) {
-		fprintf(stderr, _("Cannot create UNIX socket: %s\n"), strerror(errno));
+		fprintf(stderr, "Cannot create UNIX socket: %s\n", strerror(errno));
 		return 1;
 	}
 
@@ -507,32 +487,24 @@ int main(int argc, char *argv[], char *envp[]) {
 	strncpy(addr.sun_path, controlsocketname, sizeof addr.sun_path - 1);
 
 	if(connect(fd, (struct sockaddr *)&addr, sizeof addr) < 0) {
-		fprintf(stderr, _("Cannot connect to %s: %s\n"), controlsocketname, strerror(errno));
+		fprintf(stderr, "Cannot connect to %s: %s\n", controlsocketname, strerror(errno));
 		return 1;
 	}
 
 	if(fullread(fd, &greeting, sizeof greeting) == -1) {
-		fprintf(stderr, _("Cannot read greeting from control socket: %s\n"),
+		fprintf(stderr, "Cannot read greeting from control socket: %s\n",
 				strerror(errno));
 		return 1;
 	}
 
 	if(greeting.version != TINC_CTL_VERSION_CURRENT) {
-		fprintf(stderr, _("Version mismatch: server %d, client %d\n"),
+		fprintf(stderr, "Version mismatch: server %d, client %d\n",
 				greeting.version, TINC_CTL_VERSION_CURRENT);
 		return 1;
 	}
 
-	struct ucred cred;
-	socklen_t credlen = sizeof cred;
-
-	if(getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &cred, &credlen) < 0) {
-		fprintf(stderr, _("Could not obtain PID: %s\n"), strerror(errno));
-		return 1;
-	}
-
 	if(!strcasecmp(argv[optind], "pid")) {
-		printf("%d\n", cred.pid);
+		printf("%d\n", greeting.pid);
 		return 0;
 	}
 
@@ -549,8 +521,8 @@ int main(int argc, char *argv[], char *envp[]) {
 	}
 
 	if(!strcasecmp(argv[optind], "dump")) {
-		if (argc < optind + 2) {
-			fprintf(stderr, _("Not enough arguments.\n"));
+		if(argc < optind + 2) {
+			fprintf(stderr, "Not enough arguments.\n");
 			usage(true);
 			return 1;
 		}
@@ -575,7 +547,7 @@ int main(int argc, char *argv[], char *envp[]) {
 			return send_ctl_request_cooked(fd, REQ_DUMP_GRAPH, NULL, 0) != -1;
 		}
 
-		fprintf(stderr, _("Unknown dump type '%s'.\n"), argv[optind+1]);
+		fprintf(stderr, "Unknown dump type '%s'.\n", argv[optind+1]);
 		usage(true);
 		return 1;
 	}
@@ -593,10 +565,18 @@ int main(int argc, char *argv[], char *envp[]) {
 		}
 		debuglevel = atoi(argv[optind+1]);
 		return send_ctl_request_cooked(fd, REQ_SET_DEBUG, &debuglevel,
-									   sizeof(debuglevel)) != -1;
+									   sizeof debuglevel) != -1;
+	}
+
+	if(!strcasecmp(argv[optind], "retry")) {
+		return send_ctl_request_cooked(fd, REQ_RETRY, NULL, 0) != -1;
+	}
+
+	if(!strcasecmp(argv[optind], "reload")) {
+		return send_ctl_request_cooked(fd, REQ_RELOAD, NULL, 0) != -1;
 	}
 
-	fprintf(stderr, _("Unknown command `%s'.\n"), argv[optind]);
+	fprintf(stderr, "Unknown command `%s'.\n", argv[optind]);
 	usage(true);
 	
 	close(fd);