X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Finvitation.c;h=2dccd8fb9a1994706f0c8dfa7ba2b1fd60e07136;hb=a38e0d621397d6d69c939ccc287d5a803b668195;hp=a5454bf449af45b14dd518a138c501fce8ac8c97;hpb=37cca72e6c973b77b5d11dcf721ae050edc23586;p=tinc

diff --git a/src/invitation.c b/src/invitation.c
index a5454bf4..2dccd8fb 100644
--- a/src/invitation.c
+++ b/src/invitation.c
@@ -490,6 +490,9 @@ static bool finalize_join(void) {
 	if(!netname)
 		netname = grep(data, "NetName");
 
+	bool ask_netname = false;
+	char temp_netname[32];
+
 make_names:
 	if(!confbasegiven) {
 		free(confbase);
@@ -508,26 +511,20 @@ make_names:
 		fprintf(stderr, "Configuration file %s already exists!\n", tinc_conf);
 		if(!tty || confbasegiven)
 			return false;
-ask_netname:
-		fprintf(stderr, "Enter a new netname: ");
-		if(!fgets(line, sizeof line, stdin)) {
-			fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno));
-			return false;
-		}
-		if(!*line || *line == '\n')
-			goto ask_netname;
 
-		line[strlen(line) - 1] = 0;
-		netname = line;
+		// Generate a random netname, ask for a better one later.
+		ask_netname = true;
+		snprintf(temp_netname, sizeof temp_netname, "join_%x", rand());
+		netname = temp_netname;
 		goto make_names;
 	}	
 
-	if(mkdir(confbase, 0755) && errno != EEXIST) {
+	if(mkdir(confbase, 0777) && errno != EEXIST) {
 		fprintf(stderr, "Could not create directory %s: %s\n", confbase, strerror(errno));
 		return false;
 	}
 
-	if(mkdir(hosts_dir, 0755) && errno != EEXIST) {
+	if(mkdir(hosts_dir, 0777) && errno != EEXIST) {
 		fprintf(stderr, "Could not create directory %s: %s\n", hosts_dir, strerror(errno));
 		return false;
 	}
@@ -655,12 +652,7 @@ ask_netname:
 		return false;
 
 	xasprintf(&filename, "%s" SLASH "ecdsa_key.priv", confbase);
-	f = fopen(filename, "w");
-
-#ifdef HAVE_FCHMOD
-	/* Make it unreadable for others. */
-	fchmod(fileno(f), 0600);
-#endif
+	f = fopenmask(filename, "w", 0600);
 
 	if(!ecdsa_write_pem_private_key(key, f)) {
 		fprintf(stderr, "Error writing private key!\n");
@@ -679,12 +671,7 @@ ask_netname:
 
 	rsa_t *rsa = rsa_generate(2048, 0x1001);
 	xasprintf(&filename, "%s" SLASH "rsa_key.priv", confbase);
-	f = fopen(filename, "w");
-
-#ifdef HAVE_FCHMOD
-	/* Make it unreadable for others. */
-	fchmod(fileno(f), 0600);
-#endif
+	f = fopenmask(filename, "w", 0600);
 
 	rsa_write_pem_private_key(rsa, f);
 	fclose(f);
@@ -701,6 +688,31 @@ ask_netname:
 	shutdown(sock, SHUT_RDWR);
 	success = true;
 
+ask_netname:
+	if(ask_netname) {
+		fprintf(stderr, "Enter a new netname: ");
+		if(!fgets(line, sizeof line, stdin)) {
+			fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno));
+			return false;
+		}
+		if(!*line || *line == '\n')
+			goto ask_netname;
+
+		line[strlen(line) - 1] = 0;
+
+		char *newbase;
+		xasprintf(&newbase, CONFDIR SLASH "tinc" SLASH "%s", line);
+		if(rename(confbase, newbase)) {
+			fprintf(stderr, "Error trying to rename %s to %s: %s\n", confbase, newbase, strerror(errno));
+			free(newbase);
+			goto ask_netname;
+		}
+
+		free(newbase);
+		netname = line;
+		make_names();
+	}
+
 	return true;
 }
 
@@ -749,9 +761,25 @@ int cmd_join(int argc, char *argv[]) {
 		return 1;
 	}
 
-	// Make sure confdir exists.
-	if(mkdir(confdir, 0755) && errno != EEXIST) {
-		fprintf(stderr, "Could not create directory %s: %s\n", CONFDIR, strerror(errno));
+	// Make sure confbase exists and is accessible.
+	if(strcmp(confdir, confbase) && mkdir(confdir, 0755) && errno != EEXIST) {
+		fprintf(stderr, "Could not create directory %s: %s\n", confdir, strerror(errno));
+		return 1;
+	}
+
+	if(mkdir(confbase, 0777) && errno != EEXIST) {
+		fprintf(stderr, "Could not create directory %s: %s\n", confbase, strerror(errno));
+		return 1;
+	}
+
+	if(access(confbase, R_OK | W_OK | X_OK)) {
+		fprintf(stderr, "No permission to write in directory %s: %s\n", confbase, strerror(errno));
+		return 1;
+	}
+
+	// If a netname or explicit configuration directory is specified, check for an existing tinc.conf.
+	if((netname || confbasegiven) && !access(tinc_conf, F_OK)) {
+		fprintf(stderr, "Configuration file %s already exists!\n", tinc_conf);
 		return 1;
 	}