X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_auth.c;h=fe87323bc8c8f9728cdd8965b654d3c45b9524f0;hb=158cbe99f972a1613b7d4d95abfe5fe48e019e67;hp=f030b86bd1a43fbc45da8c723411eb148e25d5de;hpb=3c163a3796c984deb874fb1cca1ed9a85fc1d087;p=meshlink

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index f030b86b..fe87323b 100644
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -1,7 +1,6 @@
 /*
     protocol_auth.c -- handle the meta-protocol, authentication
-    Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-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
@@ -22,11 +21,10 @@
 
 #include "conf.h"
 #include "connection.h"
-#include "control.h"
-#include "control_common.h"
 #include "cipher.h"
 #include "crypto.h"
 #include "digest.h"
+#include "ecdsa.h"
 #include "edge.h"
 #include "graph.h"
 #include "logger.h"
@@ -41,6 +39,8 @@
 #include "utils.h"
 #include "xalloc.h"
 
+ecdsa_t *invitation_key = NULL;
+
 static bool send_proxyrequest(connection_t *c) {
 	switch(proxytype) {
 		case PROXY_HTTP: {
@@ -146,6 +146,122 @@ bool send_id(connection_t *c) {
 	return send_request(c, "%d %s %d.%d", ID, myself->connection->name, myself->connection->protocol_major, minor);
 }
 
+static bool finalize_invitation(connection_t *c, const char *data, uint16_t len) {
+	if(strchr(data, '\n')) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Received invalid key from invited node %s (%s)!\n", c->name, c->hostname);
+		return false;
+	}
+
+	// Create a new host config file
+	char filename[PATH_MAX];
+	snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", confbase, c->name);
+	if(!access(filename, F_OK)) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Host config file for %s (%s) already exists!\n", c->name, c->hostname);
+		return false;
+	}
+
+	FILE *f = fopen(filename, "w");
+	if(!f) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Error trying to create %s: %s\n", filename, strerror(errno));
+		return false;
+	}
+
+	fprintf(f, "ECDSAPublicKey = %s\n", data);
+	fclose(f);
+
+	logger(DEBUG_CONNECTIONS, LOG_INFO, "Key succesfully received from %s (%s)", c->name, c->hostname);
+
+	//TODO: callback to application to inform of an accepted invitation
+
+	sptps_send_record(&c->sptps, 2, data, 0);
+	return true;
+}
+
+static bool receive_invitation_sptps(void *handle, uint8_t type, const char *data, uint16_t len) {
+	connection_t *c = handle;
+
+	if(type == 128)
+		return true;
+
+	if(type == 1 && c->status.invitation_used)
+		return finalize_invitation(c, data, len);
+
+	if(type != 0 || len != 18 || c->status.invitation_used)
+		return false;
+
+	// Recover the filename from the cookie and the key
+	digest_t *digest = digest_open_by_name("sha256", 18);
+	if(!digest)
+		abort();
+	char *fingerprint = ecdsa_get_base64_public_key(invitation_key);
+	char hashbuf[18 + strlen(fingerprint)];
+	char cookie[25];
+	memcpy(hashbuf, data, 18);
+	memcpy(hashbuf + 18, fingerprint, sizeof hashbuf - 18);
+	digest_create(digest, hashbuf, sizeof hashbuf, cookie);
+	b64encode_urlsafe(cookie, cookie, 18);
+	digest_close(digest);
+	free(fingerprint);
+
+	char filename[PATH_MAX], usedname[PATH_MAX];
+	snprintf(filename, sizeof filename, "%s" SLASH "invitations" SLASH "%s", confbase, cookie);
+	snprintf(usedname, sizeof usedname, "%s" SLASH "invitations" SLASH "%s.used", confbase, cookie);
+
+	// Atomically rename the invitation file
+	if(rename(filename, usedname)) {
+		if(errno == ENOENT)
+			logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s tried to use non-existing invitation %s\n", c->hostname, cookie);
+		else
+			logger(DEBUG_ALWAYS, LOG_ERR, "Error trying to rename invitation %s\n", cookie);
+		return false;
+	}
+
+	// Open the renamed file
+	FILE *f = fopen(usedname, "r");
+	if(!f) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Error trying to open invitation %s\n", cookie);
+		return false;
+	}
+
+	// Read the new node's Name from the file
+	char buf[1024];
+	fgets(buf, sizeof buf, f);
+	if(*buf)
+		buf[strlen(buf) - 1] = 0;
+
+	len = strcspn(buf, " \t=");
+	char *name = buf + len;
+	name += strspn(name, " \t");
+	if(*name == '=') {
+		name++;
+		name += strspn(name, " \t");
+	}
+	buf[len] = 0;
+
+	if(!*buf || !*name || strcasecmp(buf, "Name") || !check_id(name)) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Invalid invitation file %s\n", cookie);
+		fclose(f);
+		return false;
+	}
+
+	free(c->name);
+	c->name = xstrdup(name);
+
+	// Send the node the contents of the invitation file
+	rewind(f);
+	size_t result;
+	while((result = fread(buf, 1, sizeof buf, f)))
+		sptps_send_record(&c->sptps, 0, buf, result);
+	sptps_send_record(&c->sptps, 1, buf, 0);
+	fclose(f);
+	unlink(usedname);
+
+	c->status.invitation_used = true;
+
+	logger(DEBUG_CONNECTIONS, LOG_INFO, "Invitation %s succesfully sent to %s (%s)", cookie, c->name, c->hostname);
+	return true;
+}
+
 bool id_h(connection_t *c, const char *request) {
 	char name[MAX_STRING_SIZE];
 
@@ -155,17 +271,31 @@ bool id_h(connection_t *c, const char *request) {
 		return false;
 	}
 
-	/* Check if this is a control connection */
+	/* Check if this is an invitation  */
 
-	if(name[0] == '^' && !strcmp(name + 1, controlcookie)) {
-		c->status.control = true;
-		c->allow_request = CONTROL;
-		c->last_ping_time = now.tv_sec + 3600;
+	if(name[0] == '?') {
+		if(!invitation_key) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Got invitation from %s but we don't have an invitation key", c->hostname);
+			return false;
+		}
 
-		free(c->name);
-		c->name = xstrdup("<control>");
+		c->ecdsa = ecdsa_set_base64_public_key(name + 1);
+		if(!c->ecdsa) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Got bad invitation from %s", c->hostname);
+			return false;
+		}
 
-		return send_request(c, "%d %d %d", ACK, TINC_CTL_VERSION_CURRENT, getpid());
+		c->status.invitation = true;
+		char *mykey = ecdsa_get_base64_public_key(invitation_key);
+		if(!mykey)
+			return false;
+		if(!send_request(c, "%d %s", ACK, mykey))
+			return false;
+		free(mykey);
+
+		c->protocol_minor = 2;
+
+		return sptps_start(&c->sptps, c, false, false, invitation_key, c->ecdsa, "tinc invitation", 15, send_meta_sptps, receive_invitation_sptps);
 	}
 
 	/* Check if identity is a valid name */
@@ -194,7 +324,7 @@ bool id_h(connection_t *c, const char *request) {
 
 	if(c->protocol_major != myself->connection->protocol_major) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s (%s) uses incompatible version %d.%d",
-			   c->name, c->hostname, c->protocol_major, c->protocol_minor);
+			c->name, c->hostname, c->protocol_major, c->protocol_minor);
 		return false;
 	}
 
@@ -216,15 +346,21 @@ bool id_h(connection_t *c, const char *request) {
 			return false;
 		}
 
-		if(experimental && c->protocol_minor >= 2) {
-			if(!read_ecdsa_public_key(c))
-				return false;
-		}
+		if(experimental)
+			read_ecdsa_public_key(c);
 	} else {
 		if(c->protocol_minor && !ecdsa_active(c->ecdsa))
 			c->protocol_minor = 1;
 	}
 
+	/* Forbid version rollback for nodes whose ECDSA key we know */
+
+	if(ecdsa_active(c->ecdsa) && c->protocol_minor < 2) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s (%s) tries to roll back protocol version to %d.%d",
+			c->name, c->hostname, c->protocol_major, c->protocol_minor);
+		return false;
+	}
+
 	c->allow_request = METAKEY;
 
 	if(c->protocol_minor >= 2) {
@@ -504,7 +640,8 @@ bool send_ack(connection_t *c) {
 	if(choice)
 		c->options |= OPTION_CLAMP_MSS;
 
-	get_config_int(lookup_config(c->config_tree, "Weight"), &c->estimated_weight);
+	if(!get_config_int(lookup_config(c->config_tree, "Weight"), &c->estimated_weight))
+		get_config_int(lookup_config(config_tree, "Weight"), &c->estimated_weight);
 
 	return send_request(c, "%d %s %d %x", ACK, myport, c->estimated_weight, (c->options & 0xffffff) | (experimental ? (PROT_MINOR << 24) : 0));
 }
@@ -512,6 +649,7 @@ bool send_ack(connection_t *c) {
 static void send_everything(connection_t *c) {
 	/* Send all known subnets and edges */
 
+	// TODO: remove this
 	if(disablebuggypeers) {
 		static struct {
 			vpn_packet_t pkt;
@@ -523,17 +661,7 @@ static void send_everything(connection_t *c) {
 		send_tcppacket(c, &zeropkt.pkt);
 	}
 
-	if(tunnelserver) {
-		for splay_each(subnet_t, s, myself->subnet_tree)
-			send_add_subnet(c, s);
-
-		return;
-	}
-
 	for splay_each(node_t, n, node_tree) {
-		for splay_each(subnet_t, s, n->subnet_tree)
-			send_add_subnet(c, s);
-
 		for splay_each(edge_t, e, n->edge_tree)
 			send_add_edge(c, e);
 	}
@@ -598,7 +726,7 @@ bool ack_h(connection_t *c, const char *request) {
 			}
 
 			terminate_connection(n->connection, false);
-			/* Run graph algorithm to purge key and make sure up/down scripts are rerun with new IP addresses and stuff */
+			/* Run graph algorithm to keep things in sync */
 			graph();
 		}
 	}
@@ -652,10 +780,7 @@ bool ack_h(connection_t *c, const char *request) {
 
 	/* Notify everyone of the new edge */
 
-	if(tunnelserver)
-		send_add_edge(c, c->edge);
-	else
-		send_add_edge(everyone, c->edge);
+	send_add_edge(everyone, c->edge);
 
 	/* Run MST and SSSP algorithms */