X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Finvitation.c;h=d027e0d980f16c2f9a885cf3b1ba813cca98a34f;hb=068746e6cb8df6c197f415e09d3ade8426c2db5f;hp=59bcf456ec63075e1f45595af86761cf4a05d7d4;hpb=e11daa264615f6eb5782f1f349b23f47518577dd;p=meshlink

diff --git a/src/invitation.c b/src/invitation.c
index 59bcf456..d027e0d9 100644
--- a/src/invitation.c
+++ b/src/invitation.c
@@ -1,6 +1,6 @@
 /*
     invitation.c -- Create and accept invitations
-    Copyright (C) 2013 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     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
@@ -24,10 +24,7 @@
 #include "ecdsa.h"
 #include "ecdsagen.h"
 #include "invitation.h"
-#include "names.h"
 #include "netutl.h"
-#include "rsagen.h"
-#include "script.h"
 #include "sptps.h"
 #include "tincctl.h"
 #include "utils.h"
@@ -142,12 +139,19 @@ char *get_my_hostname() {
 		}
 	}
 
+	if(!tty) {
+		if(!hostname) {
+			fprintf(stderr, "Could not determine the external address or hostname. Please set Address manually.\n");
+			return NULL;
+		}
+		goto save;
+	}
+
 again:
-	printf("Please enter your host's external address or hostname");
+	fprintf(stderr, "Please enter your host's external address or hostname");
 	if(hostname)
-		printf(" [%s]", hostname);
-	printf(": ");
-	fflush(stdout);
+		fprintf(stderr, " [%s]", hostname);
+	fprintf(stderr, ": ");
 
 	if(!fgets(line, sizeof line, stdin)) {
 		fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno));
@@ -261,7 +265,7 @@ int cmd_invite(int argc, char *argv[]) {
 		}
 	}
 
-	char hash[25];
+	char hash[64];
 
 	xasprintf(&filename, "%s" SLASH "invitations", confbase);
 	if(mkdir(filename, 0700) && errno != EEXIST) {
@@ -357,10 +361,7 @@ int cmd_invite(int argc, char *argv[]) {
 
 	// Create a hash of the key.
 	char *fingerprint = ecdsa_get_base64_public_key(key);
-	digest_t *digest = digest_open_by_name("sha256", 18);
-	if(!digest)
-		abort();
-	digest_create(digest, fingerprint, strlen(fingerprint), hash);
+	sha512(fingerprint, strlen(fingerprint), hash);
 	b64encode_urlsafe(hash, hash, 18);
 
 	// Create a random cookie for this invitation.
@@ -369,10 +370,10 @@ int cmd_invite(int argc, char *argv[]) {
 
 	// Create a filename that doesn't reveal the cookie itself
 	char buf[18 + strlen(fingerprint)];
-	char cookiehash[25];
+	char cookiehash[64];
 	memcpy(buf, cookie, 18);
 	memcpy(buf + 18, fingerprint, sizeof buf - 18);
-	digest_create(digest, buf, sizeof buf, cookiehash);
+	sha512(buf, sizeof buf, cookiehash);
 	b64encode_urlsafe(cookiehash, cookiehash, 18);
 
 	b64encode_urlsafe(cookie, cookie, 18);
@@ -404,8 +405,12 @@ int cmd_invite(int argc, char *argv[]) {
 		char buf[1024];
 		while(fgets(buf, sizeof buf, tc)) {
 			if((!strncasecmp(buf, "Mode", 4) && strchr(" \t=", buf[4]))
-					|| (!strncasecmp(buf, "Broadcast", 9) && strchr(" \t=", buf[9])))
+					|| (!strncasecmp(buf, "Broadcast", 9) && strchr(" \t=", buf[9]))) {
 				fputs(buf, f);
+				// Make sure there is a newline character.
+				if(!strchr(buf, '\n'))
+					fputc('\n', f);
+			}
 		}
 		fclose(tc);
 	}
@@ -423,22 +428,6 @@ int cmd_invite(int argc, char *argv[]) {
 	char *url;
 	xasprintf(&url, "%s/%s%s", address, hash, cookie);
 
-	// Call the inviation-created script
-	char *envp[6] = {};
-	xasprintf(&envp[0], "NAME=%s", myname);
-	xasprintf(&envp[1], "NETNAME=%s", netname);
-	xasprintf(&envp[2], "NODE=%s", argv[1]);
-	xasprintf(&envp[3], "INVITATION_FILE=%s", filename);
-	xasprintf(&envp[4], "INVITATION_URL=%s", url);
-	execute_script("invitation-created", envp);
-	for(int i = 0; i < 6 && envp[i]; i++)
-		free(envp[i]);
-
-	puts(url);
-	free(url);
-	free(filename);
-	free(address);
-
 	return 0;
 }
 
@@ -552,13 +541,6 @@ static bool finalize_join(void) {
 	char temp_netname[32];
 
 make_names:
-	if(!confbasegiven) {
-		free(confbase);
-		confbase = NULL;
-	}
-
-	make_names();
-
 	free(tinc_conf);
 	free(hosts_dir);
 
@@ -567,7 +549,7 @@ make_names:
 
 	if(!access(tinc_conf, F_OK)) {
 		fprintf(stderr, "Configuration file %s already exists!\n", tinc_conf);
-		if(!tty || confbasegiven)
+		if(confbasegiven)
 			return false;
 
 		// Generate a random netname, ask for a better one later.
@@ -726,24 +708,12 @@ make_names:
 	sptps_send_record(&sptps, 1, b64key, strlen(b64key));
 	free(b64key);
 
-
-	rsa_t *rsa = rsa_generate(2048, 0x1001);
-	xasprintf(&filename, "%s" SLASH "rsa_key.priv", confbase);
-	f = fopenmask(filename, "w", 0600);
-
-	rsa_write_pem_private_key(rsa, f);
-	fclose(f);
-
-	rsa_write_pem_public_key(rsa, fh);
-	fclose(fh);
-
 	ecdsa_free(key);
-	rsa_free(rsa);
 
 	check_port(name);
 
 ask_netname:
-	if(ask_netname) {
+	if(ask_netname && tty) {
 		fprintf(stderr, "Enter a new netname: ");
 		if(!fgets(line, sizeof line, stdin)) {
 			fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno));
@@ -764,9 +734,10 @@ ask_netname:
 
 		free(newbase);
 		netname = line;
-		make_names();
 	}
 
+	fprintf(stderr, "Configuration stored in: %s\n", confbase);
+
 	return true;
 }
 
@@ -823,11 +794,6 @@ int cmd_join(int argc, char *argv[]) {
 	}
 
 	// Make sure confbase exists and is accessible.
-	if(!confbase_given && 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;
@@ -850,10 +816,8 @@ int cmd_join(int argc, char *argv[]) {
 	if(argc > 1) {
 		invitation = argv[1];
 	} else {
-		if(tty) {
-			printf("Enter invitation URL: ");
-			fflush(stdout);
-		}
+		if(tty)
+			fprintf(stderr, "Enter invitation URL: ");
 		errno = EPIPE;
 		if(!fgets(line, sizeof line, stdin)) {
 			fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno));
@@ -944,12 +908,9 @@ int cmd_join(int argc, char *argv[]) {
 
 	// 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)
-		abort();
-	char hishash[18];
-	if(!digest_create(digest, fingerprint, strlen(fingerprint), hishash)) {
-		fprintf(stderr, "Could not create digest\n%s\n", line + 2);
+	char hishash[64];
+	if(!sha512(fingerprint, strlen(fingerprint), hishash)) {
+		fprintf(stderr, "Could not create hash\n%s\n", line + 2);
 		return 1;
 	}
 	if(memcmp(hishash, hash, 18)) {