X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Finvitation.c;h=a59045090f75cc237331a85c89b7093b2dbc61bd;hb=8f8424445810aa7d5e9d4d537494e64811a8e29f;hp=95478a7f431822afb2ebd5fd86e3b271d4d18763;hpb=d47c79533f831a2714aff277aff31c46da1ec684;p=tinc

diff --git a/src/invitation.c b/src/invitation.c
index 95478a7f..a5904509 100644
--- a/src/invitation.c
+++ b/src/invitation.c
@@ -32,12 +32,6 @@
 #include "utils.h"
 #include "xalloc.h"
 
-#ifdef HAVE_MINGW
-#define SCRIPTEXTENSION ".bat"
-#else
-#define SCRIPTEXTENSION ""
-#endif
-
 int addressfamily = AF_UNSPEC;
 
 char *get_my_hostname() {
@@ -490,6 +484,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 +505,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 +646,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 +665,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 +682,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;
 }
 
@@ -750,7 +756,12 @@ int cmd_join(int argc, char *argv[]) {
 	}
 
 	// Make sure confbase exists and is accessible.
-	if(mkdir(confbase, 0755) && errno != EEXIST) {
+	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;
 	}
@@ -864,7 +875,7 @@ int cmd_join(int argc, char *argv[]) {
 		return 1;
 	}
 
-	// Check if the hash of the key he have us matches the hash in the URL.
+	// Check if the hash of the key he gave us matches the hash in the URL.
 	char *fingerprint = line + 2;
 	digest_t *digest = digest_open_by_name("sha256", 18);
 	if(!digest)