X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=7cfc62e5f382bac67cdcfba5d93090dbf61e471c;hb=911c05f873ad967c40d04aa7347b1067fe62c055;hp=bff122b0efc5518f0403272a9226f153b73bceb3;hpb=a62a6825a8a69e279ee0688a4cd9e51fbc52054b;p=tinc

diff --git a/src/tincctl.c b/src/tincctl.c
index bff122b0..7cfc62e5 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -91,6 +91,8 @@ 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"
+				"  retry                      Retry all outgoing connections\n"
+				"  reload                     Partial reload of configuration\n"
 				"\n"));
 		printf(_("Report bugs to tinc@tinc-vpn.org.\n"));
 	}
@@ -290,7 +292,7 @@ static void make_names(void) {
 #ifdef HAVE_MINGW
 	HKEY key;
 	char installdir[1024] = "";
-	long len = sizeof(installdir);
+	long len = sizeof installdir;
 #endif
 
 	if(netname)
@@ -317,7 +319,7 @@ static void make_names(void) {
 #endif
 
 	if(!controlsocketname)
-		asprintf(&controlsocketname, LOCALSTATEDIR "/run/%s.control", identname);
+		asprintf(&controlsocketname, "%s/run/%s.control/socket", LOCALSTATEDIR, identname);
 
 	if(netname) {
 		if(!confbase)
@@ -333,13 +335,13 @@ static void make_names(void) {
 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 +360,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 +386,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;
 		}
@@ -437,10 +439,9 @@ 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];
 
@@ -484,12 +485,37 @@ int main(int argc, char *argv[], char *envp[]) {
 
 	if(!strcasecmp(argv[optind], "start")) {
 		argv[optind] = NULL;
-		execve("tincd", argv, envp);
+		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"));
@@ -523,16 +549,8 @@ int main(int argc, char *argv[], char *envp[]) {
 		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,7 +567,7 @@ int main(int argc, char *argv[], char *envp[]) {
 	}
 
 	if(!strcasecmp(argv[optind], "dump")) {
-		if (argc < optind + 2) {
+		if(argc < optind + 2) {
 			fprintf(stderr, _("Not enough arguments.\n"));
 			usage(true);
 			return 1;
@@ -593,7 +611,15 @@ 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]);