From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sun, 15 Jul 2012 12:49:36 +0000 (+0200)
Subject: "tincctl init" creates initial directory structure, tinc.conf and keypairs.
X-Git-Tag: release-1.1pre3~116
X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=a444ec396456a25546a4ab3d185c7fb5e4bb7ae3;p=tinc

"tincctl init" creates initial directory structure, tinc.conf and keypairs.
---

diff --git a/doc/tinc.texi b/doc/tinc.texi
index 90d3c281..3b312a31 100644
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -2040,6 +2040,10 @@ the value of this environment variable is used.
 @c from the manpage
 @table @code
 
+@item init [@var{name}]
+Create initial configuration files and RSA and ECDSA keypairs with default length.
+If no @var{name} for this node is given, it will be asked for.
+
 @item start
 Start @samp{tincd}.
 
diff --git a/doc/tincctl.8.in b/doc/tincctl.8.in
index 0c86e3d5..751e16fb 100644
--- a/doc/tincctl.8.in
+++ b/doc/tincctl.8.in
@@ -47,6 +47,11 @@ option, the value of this environment variable is used.
 .Sh COMMANDS
 .zZ
 .Bl -tag -width indent
+.It init Op Ar name
+Create initial configuration files and RSA and ECDSA keypairs with default length.
+If no
+.Ar name
+for this node is given, it will be asked for.
 .It start
 Start
 .Xr tincd 8 .
diff --git a/src/tincctl.c b/src/tincctl.c
index 63b75895..0337129f 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -73,6 +73,7 @@ static void usage(bool status) {
 				"      --version           Output version information and exit.\n"
 				"\n"
 				"Valid commands are:\n"
+				"  init [name]                Create initial configuration files.\n"
 				"  start                      Start tincd.\n"
 				"  stop                       Stop tincd.\n"
 				"  restart                    Restart tincd.\n"
@@ -616,6 +617,83 @@ int main(int argc, char *argv[]) {
 		return 1;
 	}
 
+	if(!strcasecmp(argv[optind], "init")) {
+		char *filename = NULL;
+		xasprintf(&filename, "%s/tinc.conf", confbase);
+		if(!access(confbase, F_OK)) {
+			fprintf(stderr, "Configuration file %s already exists!\n", filename);
+			return 1;
+		}
+
+		if(optind >= argc - 1) {
+			if(isatty(0) && isatty(1)) {
+				char buf[1024];
+				fprintf(stdout, "Enter the Name you want your tinc node to have: ");
+				fflush(stdout);
+				if(!fgets(buf, sizeof buf, stdin)) {
+					fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno));
+					return 1;
+				}
+				int len = strlen(buf);
+				if(len)
+					buf[--len] = 0;
+				if(!len) {
+					fprintf(stderr, "No name given!\n");
+					return 1;
+				}
+				name = strdup(buf);
+			} else {
+				fprintf(stderr, "No Name given!\n");
+				return 1;
+			}
+		} else {
+			name = strdup(argv[optind + 1]);
+			if(!*name) {
+				fprintf(stderr, "No Name given!\n");
+				return 1;
+			}
+		}
+
+		for(int i = 0; i < strlen(name); i++) {
+			if(!isalnum(name[i]) && name[i] != '_') {
+				fprintf(stderr, "Invalid Name! Only a-z, A-Z, 0-9 and _ are allowed characters.\n");
+				return 1;
+			}
+		}
+
+		if(mkdir(CONFDIR, 0755) && errno != EEXIST) {
+			fprintf(stderr, "Could not create directory %s: %s\n", CONFDIR, strerror(errno));
+			return 1;
+		}
+
+		if(mkdir(confbase, 0755) && errno != EEXIST) {
+			fprintf(stderr, "Could not create directory %s: %s\n", confbase, strerror(errno));
+			return 1;
+		}
+
+		char *filename2 = NULL;
+		xasprintf(&filename2, "%s/hosts", confbase);
+		if(mkdir(filename2, 0755) && errno != EEXIST) {
+			fprintf(stderr, "Could not create directory %s: %s\n", filename, strerror(errno));
+			return 1;
+		}
+
+		FILE *f = fopen(filename, "w");
+		if(!f) {
+			fprintf(stderr, "Could not create file %s: %s\n", filename, strerror(errno));
+			return 1;
+		}
+
+		fprintf(f, "Name = %s\n", name);
+		fclose(f);
+
+		fclose(stdin);
+		if(!rsa_keygen(2048) || !ecdsa_keygen())
+			return false;
+
+		return true;
+	}
+
 	/*
 	 * Now handle commands that do involve connecting to a running tinc daemon.
 	 * Authenticate the server by ensuring the parent directory can be