X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fprotocol_auth.c;h=4026c41f54738e14623769513f61c9a25a032caa;hp=487f34c96ebef3f640ea2339540dc7607100fe62;hb=a5a8005b2d89712e124ab7295165a3e229abdad5;hpb=ae73e19ce57b80c561b81170ab48f3cf6f1a41eb

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 487f34c9..4026c41f 100644
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -30,6 +30,7 @@
 #include "net.h"
 #include "netutl.h"
 #include "node.h"
+#include "packmsg.h"
 #include "prf.h"
 #include "protocol.h"
 #include "sptps.h"
@@ -48,7 +49,7 @@ static bool send_proxyrequest(meshlink_handle_t *mesh, connection_t *c) {
 		char *port;
 
 		sockaddr2str(&c->address, &host, &port);
-		send_request(mesh, c, "CONNECT %s:%s HTTP/1.1\r\n\r", host, port);
+		send_request(mesh, c, NULL, "CONNECT %s:%s HTTP/1.1\r\n\r", host, port);
 		free(host);
 		free(port);
 		return true;
@@ -143,51 +144,41 @@ static bool send_proxyrequest(meshlink_handle_t *mesh, connection_t *c) {
 }
 
 bool send_id(meshlink_handle_t *mesh, connection_t *c) {
-
-	int minor = mesh->self->connection->protocol_minor;
-
 	if(mesh->proxytype && c->outgoing)
 		if(!send_proxyrequest(mesh, c)) {
 			return false;
 		}
 
-	return send_request(mesh, c, "%d %s %d.%d %s", ID, mesh->self->connection->name, mesh->self->connection->protocol_major, minor, mesh->appname);
+	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) {
-	(void)len;
-
-	if(strchr(data, '\n')) {
+	if(len != 32) {
 		logger(mesh, MESHLINK_ERROR, "Received invalid key from invited node %s!\n", c->name);
 		return false;
 	}
 
-	// Create a new host config file
-	char filename[PATH_MAX];
-	snprintf(filename, sizeof(filename), "%s" SLASH "hosts" SLASH "%s", mesh->confbase, c->name);
+	// 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;
 
-	if(!access(filename, F_OK)) {
-		logger(mesh, MESHLINK_ERROR, "Host config file for %s already exists!\n", c->name);
+	if(!node_write_config(mesh, n)) {
+		logger(mesh, MESHLINK_ERROR, "Error writing configuration file for invited node %s!\n", c->name);
+		free_node(n);
 		return false;
-	}
 
-	FILE *f = fopen(filename, "w");
-
-	if(!f) {
-		logger(mesh, MESHLINK_ERROR, "Error trying to create %s: %s\n", filename, strerror(errno));
-		return false;
 	}
 
-	fprintf(f, "ECDSAPublicKey = %s\n", (const char *)data);
-	fclose(f);
+	node_add(mesh, n);
 
-	logger(mesh, MESHLINK_INFO, "Key succesfully received from %s", c->name);
+	logger(mesh, MESHLINK_INFO, "Key successfully received from %s", c->name);
 
 	//TODO: callback to application to inform of an accepted invitation
 
-	sptps_send_record(&c->sptps, 2, data, 0);
-
-	load_all_nodes(mesh);
+	sptps_send_record(&c->sptps, 1, "", 0);
 
 	return true;
 }
@@ -219,94 +210,54 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const void *dat
 	b64encode_urlsafe(hash, cookie, 18);
 	free(fingerprint);
 
-	char filename[PATH_MAX], usedname[PATH_MAX];
-	snprintf(filename, sizeof(filename), "%s" SLASH "invitations" SLASH "%s", mesh->confbase, cookie);
-	snprintf(usedname, sizeof(usedname), "%s" SLASH "invitations" SLASH "%s.used", mesh->confbase, cookie);
-
-	// Atomically rename the invitation file
-	if(rename(filename, usedname)) {
-		if(errno == ENOENT) {
-			logger(mesh, MESHLINK_ERROR, "Peer %s tried to use non-existing invitation %s\n", c->name, cookie);
-		} else {
-			logger(mesh, MESHLINK_ERROR, "Error trying to rename invitation %s\n", cookie);
-		}
-
-		return false;
-	}
-
-	// Open the renamed file
-	FILE *f = fopen(usedname, "r");
+	config_t config;
 
-	if(!f) {
-		logger(mesh, MESHLINK_ERROR, "Error trying to open invitation %s\n", cookie);
-		unlink(usedname);
-		return false;
-	}
-
-	// Check the timestamp
-	struct stat st;
-
-	if(fstat(fileno(f), &st)) {
-		logger(mesh, MESHLINK_ERROR, "Could not stat invitation file %s\n", usedname);
-		fclose(f);
-		unlink(usedname);
-		return false;
-	}
-
-	if(time(NULL) > st.st_mtime + mesh->invitation_timeout) {
-		logger(mesh, MESHLINK_ERROR, "Peer %s tried to use an outdated invitation file %s\n", c->name, usedname);
-		fclose(f);
-		unlink(usedname);
+	if(!invitation_read(mesh, "current", cookie, &config, mesh->config_key)) {
+		logger(mesh, MESHLINK_ERROR, "Error while trying to read invitation file\n");
 		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;
-	}
+	packmsg_input_t in = {config.buf, config.len};
+	packmsg_get_uint32(&in); // skip version
+	free(c->name);
+	c->name = packmsg_get_str_dup(&in);
 
-	len = strcspn(buf, " \t=");
-	char *name = buf + len;
-	name += strspn(name, " \t");
+	// Check if the file contains Sub-Mesh information
+	char *submesh_name = packmsg_get_str_dup(&in);
 
-	if(*name == '=') {
-		name++;
-		name += strspn(name, " \t");
-	}
+	if(!strcmp(submesh_name, CORE_MESH)) {
+		c->submesh = NULL;
+	} else {
+		if(!check_id(submesh_name)) {
+			logger(mesh, MESHLINK_ERROR, "Invalid invitation file %s\n", cookie);
+			abort();
+			return false;
+		}
 
-	buf[len] = 0;
+		c->submesh = lookup_or_create_submesh(mesh, submesh_name);
 
-	if(!*buf || !*name || strcasecmp(buf, "Name") || !check_id(name)) {
-		logger(mesh, MESHLINK_ERROR, "Invalid invitation file %s\n", cookie);
-		fclose(f);
-		return false;
+		if(!c->submesh) {
+			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, 0, config.buf, config.len);
 
-	sptps_send_record(&c->sptps, 1, buf, 0);
-	fclose(f);
-	unlink(usedname);
+	config_free(&config);
+	free(submesh_name);
 
 	c->status.invitation_used = true;
 
-	logger(mesh, MESHLINK_INFO, "Invitation %s succesfully sent to %s", cookie, c->name);
+	logger(mesh, MESHLINK_INFO, "Invitation %s successfully sent to %s", cookie, c->name);
 	return true;
 }
 
 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) {
@@ -336,7 +287,7 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 			return false;
 		}
 
-		if(!send_request(mesh, c, "%d %s", ACK, mykey)) {
+		if(!send_request(mesh, c, NULL, "%d %s", ACK, mykey)) {
 			return false;
 		}
 
@@ -372,37 +323,32 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 
 	/* Check if version matches */
 
-	if(c->protocol_major != mesh->self->connection->protocol_major) {
+	if(c->protocol_major != PROT_MAJOR) {
 		logger(mesh, MESHLINK_ERROR, "Peer %s uses incompatible version %d.%d",
 		       c->name, c->protocol_major, c->protocol_minor);
 		return false;
 	}
 
-	if(!c->config_tree) {
-		init_configuration(&c->config_tree);
+	/* Check if we know this node */
 
-		if(!read_host_config(mesh, c->config_tree, c->name)) {
-			logger(mesh, MESHLINK_ERROR, "Peer %s has unknown identity", c->name);
-			return false;
-		}
-	}
+	node_t *n = lookup_node(mesh, c->name);
 
-	bool blacklisted = false;
-	get_config_bool(lookup_config(c->config_tree, "blacklisted"), &blacklisted);
+	if(!n) {
+		logger(mesh, MESHLINK_ERROR, "Peer %s has unknown identity", c->name);
+		return false;
+	}
 
-	if(blacklisted) {
-		logger(mesh, MESHLINK_EPEER, "Peer %s is blacklisted", c->name);
+	if(n->status.blacklisted) {
+		logger(mesh, MESHLINK_WARNING, "Peer %s is blacklisted", c->name);
 		return false;
 	}
 
-	read_ecdsa_public_key(mesh, c);
+	node_read_public_key(mesh, n);
 
-	if(!ecdsa_active(c->ecdsa)) {
+	if(!ecdsa_active(n->ecdsa)) {
 		logger(mesh, MESHLINK_ERROR, "No key known for peer %s", c->name);
 
-		node_t *n = lookup_node(mesh, c->name);
-
-		if(n && n->status.reachable && !n->status.waitingforkey) {
+		if(n->status.reachable && !n->status.waitingforkey) {
 			logger(mesh, MESHLINK_INFO, "Requesting key from peer %s", c->name);
 			send_req_key(mesh, n);
 		}
@@ -427,18 +373,15 @@ bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 		snprintf(label, sizeof(label), "%s %s %s", meshlink_tcp_label, c->name, mesh->self->name);
 	}
 
-	return sptps_start(&c->sptps, c, c->outgoing, false, mesh->self->connection->ecdsa, c->ecdsa, label, sizeof(label) - 1, send_meta_sptps, receive_meta_sptps);
+	char buf1[1024], buf2[1024];
+	bin2hex((uint8_t *)mesh->private_key + 64, buf1, 32);
+	bin2hex((uint8_t *)n->ecdsa + 64, buf2, 32);
+	logger(mesh, MESHLINK_DEBUG, "Connection to %s mykey %s hiskey %s", c->name, buf1, buf2);
+	return sptps_start(&c->sptps, c, c->outgoing, false, mesh->private_key, n->ecdsa, label, sizeof(label) - 1, send_meta_sptps, receive_meta_sptps);
 }
 
 bool send_ack(meshlink_handle_t *mesh, connection_t *c) {
-
-	/* Check some options */
-
-	if(mesh->self->options & OPTION_PMTU_DISCOVERY) {
-		c->options |= OPTION_PMTU_DISCOVERY;
-	}
-
-	return send_request(mesh, c, "%d %s %d %x", ACK, mesh->myport, mesh->devclass, (c->options & 0xffffff) | (PROT_MINOR << 24));
+	return send_request(mesh, c, NULL, "%d %s %d %x", ACK, mesh->myport, mesh->devclass, OPTION_PMTU_DISCOVERY | (PROT_MINOR << 24));
 }
 
 static void send_everything(meshlink_handle_t *mesh, connection_t *c) {
@@ -452,8 +395,10 @@ 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];
-	char *hisaddress;
 	int devclass;
 	uint32_t options;
 	node_t *n;
@@ -463,7 +408,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;
 	}
@@ -498,20 +443,13 @@ bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	}
 
 	n->devclass = devclass;
-	node_write_devclass(mesh, n);
+	n->status.dirty = true;
 
-	n->last_successfull_connection = time(NULL);
+	n->last_successfull_connection = mesh->loop.now.tv_sec;
 
 	n->connection = c;
 	c->node = n;
 
-	if(!(c->options & options & OPTION_PMTU_DISCOVERY)) {
-		c->options &= ~OPTION_PMTU_DISCOVERY;
-		options &= ~OPTION_PMTU_DISCOVERY;
-	}
-
-	c->options |= options;
-
 	/* Activate this connection */
 
 	c->allow_request = ALL;
@@ -525,17 +463,14 @@ 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;
-	sockaddr2str(&c->address, &hisaddress, NULL);
-	c->edge->address = str2sockaddr(hisaddress, hisport);
-	free(hisaddress);
-	c->edge->weight = dev_class_traits[devclass].edge_weight;
+	sockaddrcpy_setport(&c->edge->address, &c->address, atoi(hisport));
+	c->edge->weight = mesh->dev_class_traits[devclass].edge_weight;
 	c->edge->connection = c;
-	c->edge->options = c->options;
 
 	edge_add(mesh, c->edge);