X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_auth.c;h=416066ff0ed0a6eb6654bab6a0e70bc2b709e8e6;hb=4c57e6902219ecca1872e18e34365d8e54a0f407;hp=a6144c5fa043319655d937f58324edb458d388b7;hpb=8538d6c661a083774e5b54163eaf5cdbcadcda6d;p=meshlink

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index a6144c5f..416066ff 100644
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -21,6 +21,7 @@
 
 #include "conf.h"
 #include "connection.h"
+#include "devtools.h"
 #include "ecdsa.h"
 #include "edge.h"
 #include "graph.h"
@@ -152,20 +153,25 @@ bool send_id(meshlink_handle_t *mesh, connection_t *c) {
 	return send_request(mesh, c, NULL, "%d %s %d.%d %s", ID, mesh->self->name, PROT_MAJOR, PROT_MINOR, mesh->appname);
 }
 
-static bool finalize_invitation(meshlink_handle_t *mesh, connection_t *c, const void *data, uint16_t len) {
-	if(len != 32) {
-		logger(mesh, MESHLINK_ERROR, "Received invalid key from invited node %s!\n", c->name);
-		return false;
-	}
-
+static bool commit_invitation(meshlink_handle_t *mesh, connection_t *c, const void *data) {
 	// Create a new node
 	node_t *n = new_node();
 	n->name = xstrdup(c->name);
 	n->devclass = DEV_CLASS_UNKNOWN;
 	n->ecdsa = ecdsa_set_public_key(data);
 	n->submesh = c->submesh;
+
+	// Remember its current address
+	node_add_recent_address(mesh, n, &c->address);
+
+	if(!node_write_config(mesh, n) || !config_sync(mesh, "current")) {
+		logger(mesh, MESHLINK_ERROR, "Error writing configuration file for invited node %s!\n", c->name);
+		free_node(n);
+		return false;
+
+	}
+
 	node_add(mesh, n);
-	node_write_config(mesh, n);
 
 	logger(mesh, MESHLINK_INFO, "Key successfully received from %s", c->name);
 
@@ -176,22 +182,7 @@ static bool finalize_invitation(meshlink_handle_t *mesh, connection_t *c, const
 	return true;
 }
 
-static bool receive_invitation_sptps(void *handle, uint8_t type, const void *data, uint16_t len) {
-	connection_t *c = handle;
-	meshlink_handle_t *mesh = c->mesh;
-
-	if(type == 128) {
-		return true;
-	}
-
-	if(type == 1 && c->status.invitation_used) {
-		return finalize_invitation(mesh, c, data, len);
-	}
-
-	if(type != 0 || len != 18 || c->status.invitation_used) {
-		return false;
-	}
-
+static bool process_invitation(meshlink_handle_t *mesh, connection_t *c, const void *data) {
 	// Recover the filename from the cookie and the key
 	char *fingerprint = ecdsa_get_base64_public_key(mesh->invitation_key);
 	char hash[64];
@@ -220,26 +211,36 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const void *dat
 	char *submesh_name = packmsg_get_str_dup(&in);
 
 	if(!strcmp(submesh_name, CORE_MESH)) {
+		free(submesh_name);
 		c->submesh = NULL;
 	} else {
 		if(!check_id(submesh_name)) {
 			logger(mesh, MESHLINK_ERROR, "Invalid invitation file %s\n", cookie);
-			abort();
+			free(submesh_name);
 			return false;
 		}
 
 		c->submesh = lookup_or_create_submesh(mesh, submesh_name);
+		free(submesh_name);
 
 		if(!c->submesh) {
+			logger(mesh, MESHLINK_ERROR, "Unknown submesh in invitation file %s\n", cookie);
 			return false;
 		}
 	}
 
+	if(mesh->inviter_commits_first && !commit_invitation(mesh, c, (const char *)data + 18)) {
+		return false;
+	}
+
+	if(mesh->inviter_commits_first) {
+		devtool_set_inviter_commits_first(true);
+	}
+
 	// Send the node the contents of the invitation file
 	sptps_send_record(&c->sptps, 0, config.buf, config.len);
 
 	config_free(&config);
-	free(submesh_name);
 
 	c->status.invitation_used = true;
 
@@ -247,7 +248,34 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const void *dat
 	return true;
 }
 
+static bool receive_invitation_sptps(void *handle, uint8_t type, const void *data, uint16_t len) {
+	connection_t *c = handle;
+	meshlink_handle_t *mesh = c->mesh;
+
+	if(type == SPTPS_HANDSHAKE) {
+		// The peer should send its cookie first.
+		return true;
+	}
+
+	if(mesh->inviter_commits_first) {
+		if(type == 2 && len == 18 + 32 && !c->status.invitation_used) {
+			return process_invitation(mesh, c, data);
+		}
+	} else {
+		if(type == 0 && len == 18 && !c->status.invitation_used) {
+			return process_invitation(mesh, c, data);
+		} else if(type == 1 && len == 32 && c->status.invitation_used) {
+			return commit_invitation(mesh, c, data);
+		}
+	}
+
+	return false;
+}
+
 bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+	assert(request);
+	assert(*request);
+
 	char name[MAX_STRING_SIZE];
 
 	if(sscanf(request, "%*d " MAX_STRING " %d.%d", name, &c->protocol_major, &c->protocol_minor) < 2) {
@@ -329,13 +357,11 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	}
 
 	if(n->status.blacklisted) {
-		logger(mesh, MESHLINK_EPEER, "Peer %s is blacklisted", c->name);
+		logger(mesh, MESHLINK_WARNING, "Peer %s is blacklisted", c->name);
 		return false;
 	}
 
-	node_read_public_key(mesh, n);
-
-	if(!ecdsa_active(n->ecdsa)) {
+	if(!node_read_public_key(mesh, n)) {
 		logger(mesh, MESHLINK_ERROR, "No key known for peer %s", c->name);
 
 		if(n->status.reachable && !n->status.waitingforkey) {
@@ -385,6 +411,9 @@ static void send_everything(meshlink_handle_t *mesh, connection_t *c) {
 }
 
 bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
+	assert(request);
+	assert(*request);
+
 	char hisport[MAX_STRING_SIZE];
 	int devclass;
 	uint32_t options;
@@ -423,9 +452,11 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 				n->connection->outgoing = NULL;
 			}
 
+			/* Remove the edge before terminating the connection, to prevent a graph update. */
+			edge_del(mesh, n->connection->edge);
+			n->connection->edge = NULL;
+
 			terminate_connection(mesh, n->connection, false);
-			/* Run graph algorithm to keep things in sync */
-			graph(mesh);
 		}
 	}
 
@@ -456,7 +487,7 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	c->edge->from = mesh->self;
 	c->edge->to = n;
 	sockaddrcpy_setport(&c->edge->address, &c->address, atoi(hisport));
-	c->edge->weight = dev_class_traits[devclass].edge_weight;
+	c->edge->weight = mesh->dev_class_traits[devclass].edge_weight;
 	c->edge->connection = c;
 
 	edge_add(mesh, c->edge);