X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fprotocol_auth.c;h=c17d9e8214b9b196c30b4725c2a456e204142a1e;hp=c7d6882984e8239f7f30345fa54bb04aae2a7ebd;hb=8c8b506da9ce578fe6e6e406a91bbd21af13f7a3;hpb=f91651414adcac1c05e1b923bee4cb3caf559c3b

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index c7d68829..c17d9e82 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"
@@ -42,130 +43,29 @@
 
 extern bool node_write_devclass(meshlink_handle_t *mesh, node_t *n);
 
-static bool send_proxyrequest(meshlink_handle_t *mesh, connection_t *c) {
-	switch(mesh->proxytype) {
-	case PROXY_HTTP: {
-		char *host;
-		char *port;
-
-		sockaddr2str(&c->address, &host, &port);
-		send_request(mesh, c, NULL, "CONNECT %s:%s HTTP/1.1\r\n\r", host, port);
-		free(host);
-		free(port);
-		return true;
-	}
-
-	case PROXY_SOCKS4: {
-		if(c->address.sa.sa_family != AF_INET) {
-			logger(mesh, MESHLINK_ERROR, "Cannot connect to an IPv6 host through a SOCKS 4 proxy!");
-			return false;
-		}
-
-		char s4req[9 + (mesh->proxyuser ? strlen(mesh->proxyuser) : 0)];
-		s4req[0] = 4;
-		s4req[1] = 1;
-		memcpy(s4req + 2, &c->address.in.sin_port, 2);
-		memcpy(s4req + 4, &c->address.in.sin_addr, 4);
-
-		if(mesh->proxyuser) {
-			memcpy(s4req + 8, mesh->proxyuser, strlen(mesh->proxyuser));
-		}
-
-		s4req[sizeof(s4req) - 1] = 0;
-		c->tcplen = 8;
-		return send_meta(mesh, c, s4req, sizeof(s4req));
-	}
-
-	case PROXY_SOCKS5: {
-		int len = 3 + 6 + (c->address.sa.sa_family == AF_INET ? 4 : 16);
-		c->tcplen = 2;
-
-		if(mesh->proxypass) {
-			len += 3 + strlen(mesh->proxyuser) + strlen(mesh->proxypass);
-		}
-
-		char s5req[len];
-		int i = 0;
-		s5req[i++] = 5;
-		s5req[i++] = 1;
-
-		if(mesh->proxypass) {
-			s5req[i++] = 2;
-			s5req[i++] = 1;
-			s5req[i++] = strlen(mesh->proxyuser);
-			memcpy(s5req + i, mesh->proxyuser, strlen(mesh->proxyuser));
-			i += strlen(mesh->proxyuser);
-			s5req[i++] = strlen(mesh->proxypass);
-			memcpy(s5req + i, mesh->proxypass, strlen(mesh->proxypass));
-			i += strlen(mesh->proxypass);
-			c->tcplen += 2;
-		} else {
-			s5req[i++] = 0;
-		}
-
-		s5req[i++] = 5;
-		s5req[i++] = 1;
-		s5req[i++] = 0;
-
-		if(c->address.sa.sa_family == AF_INET) {
-			s5req[i++] = 1;
-			memcpy(s5req + i, &c->address.in.sin_addr, 4);
-			i += 4;
-			memcpy(s5req + i, &c->address.in.sin_port, 2);
-			i += 2;
-			c->tcplen += 10;
-		} else if(c->address.sa.sa_family == AF_INET6) {
-			s5req[i++] = 3;
-			memcpy(s5req + i, &c->address.in6.sin6_addr, 16);
-			i += 16;
-			memcpy(s5req + i, &c->address.in6.sin6_port, 2);
-			i += 2;
-			c->tcplen += 22;
-		} else {
-			logger(mesh, MESHLINK_ERROR, "Address family %hx not supported for SOCKS 5 proxies!", c->address.sa.sa_family);
-			return false;
-		}
-
-		if(i > len) {
-			abort();
-		}
-
-		return send_meta(mesh, c, s5req, sizeof(s5req));
-	}
-
-	case PROXY_SOCKS4A:
-		logger(mesh, MESHLINK_ERROR, "Proxy type not implemented yet");
-		return false;
-
-	default:
-		logger(mesh, MESHLINK_ERROR, "Unknown proxy type");
-		return false;
-	}
-}
-
 bool send_id(meshlink_handle_t *mesh, connection_t *c) {
-	if(mesh->proxytype && c->outgoing)
-		if(!send_proxyrequest(mesh, c)) {
-			return false;
-		}
-
 	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 +76,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 +105,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 +142,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 +251,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 +305,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;
@@ -395,7 +318,7 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 		return false;
 	}
 
-	if(devclass < 0 || devclass > _DEV_CLASS_MAX) {
+	if(devclass < 0 || devclass >= DEV_CLASS_COUNT) {
 		logger(mesh, MESHLINK_ERROR, "Got bad %s from %s: %s", "ACK", c->name, "devclass invalid");
 		return false;
 	}
@@ -423,9 +346,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);
 		}
 	}
 
@@ -440,6 +365,7 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	/* Activate this connection */
 
 	c->allow_request = ALL;
+	c->last_key_renewal = mesh->loop.now.tv_sec;
 	c->status.active = true;
 
 	logger(mesh, MESHLINK_INFO, "Connection with %s activated", c->name);
@@ -450,13 +376,13 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 
 	/* Create an edge_t for this connection */
 
-	assert(devclass >= 0 && devclass <= _DEV_CLASS_MAX);
+	assert(devclass >= 0 && devclass < DEV_CLASS_COUNT);
 
 	c->edge = new_edge();
 	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);