X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_auth.c;h=107280c153898cd7c12520ac00256b631d76e7d9;hb=cf3f161b0cbe847a484ea2c4fb215b963acbb805;hp=2d5990e32c32e053093e590e38d9e0dfe2ca1280;hpb=528a8616e36ff08ddf1f9f16f748a272e48846be;p=meshlink

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 2d5990e3..107280c1 100644
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -21,9 +21,6 @@
 
 #include "conf.h"
 #include "connection.h"
-#include "cipher.h"
-#include "crypto.h"
-#include "digest.h"
 #include "ecdsa.h"
 #include "edge.h"
 #include "graph.h"
@@ -40,10 +37,8 @@
 #include "xalloc.h"
 #include "ed25519/sha512.h"
 
-ecdsa_t *invitation_key = NULL;
-
 static bool send_proxyrequest(connection_t *c) {
-	switch(proxytype) {
+	switch(mesh->proxytype) {
 		case PROXY_HTTP: {
 			char *host;
 			char *port;
@@ -59,13 +54,13 @@ static bool send_proxyrequest(connection_t *c) {
 				logger(DEBUG_ALWAYS, LOG_ERR, "Cannot connect to an IPv6 host through a SOCKS 4 proxy!");
 				return false;
 			}
-			char s4req[9 + (proxyuser ? strlen(proxyuser) : 0)];
+			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(proxyuser)
-				memcpy(s4req + 8, proxyuser, strlen(proxyuser));
+			if(mesh->proxyuser)
+				memcpy(s4req + 8, mesh->proxyuser, strlen(mesh->proxyuser));
 			s4req[sizeof s4req - 1] = 0;
 			c->tcplen = 8;
 			return send_meta(c, s4req, sizeof s4req);
@@ -73,21 +68,21 @@ static bool send_proxyrequest(connection_t *c) {
 		case PROXY_SOCKS5: {
 			int len = 3 + 6 + (c->address.sa.sa_family == AF_INET ? 4 : 16);
 			c->tcplen = 2;
-			if(proxypass)
-				len += 3 + strlen(proxyuser) + strlen(proxypass);
+			if(mesh->proxypass)
+				len += 3 + strlen(mesh->proxyuser) + strlen(mesh->proxypass);
 			char s5req[len];
 			int i = 0;
 			s5req[i++] = 5;
 			s5req[i++] = 1;
-			if(proxypass) {
+			if(mesh->proxypass) {
 				s5req[i++] = 2;
 				s5req[i++] = 1;
-				s5req[i++] = strlen(proxyuser);
-				memcpy(s5req + i, proxyuser, strlen(proxyuser));
-				i += strlen(proxyuser);
-				s5req[i++] = strlen(proxypass);
-				memcpy(s5req + i, proxypass, strlen(proxypass));
-				i += strlen(proxypass);
+				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;
@@ -133,7 +128,7 @@ bool send_id(connection_t *c) {
 
 	int minor = mesh->self->connection->protocol_minor;
 
-	if(proxytype && c->outgoing)
+	if(mesh->proxytype && c->outgoing)
 		if(!send_proxyrequest(c))
 			return false;
 
@@ -148,7 +143,7 @@ static bool finalize_invitation(connection_t *c, const char *data, uint16_t len)
 
 	// Create a new host config file
 	char filename[PATH_MAX];
-	snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", confbase, c->name);
+	snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->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;
@@ -184,7 +179,7 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const char *dat
 		return false;
 
 	// Recover the filename from the cookie and the key
-	char *fingerprint = ecdsa_get_base64_public_key(invitation_key);
+	char *fingerprint = ecdsa_get_base64_public_key(mesh->invitation_key);
 	char hash[64];
 	char hashbuf[18 + strlen(fingerprint)];
 	char cookie[25];
@@ -195,8 +190,8 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const char *dat
 	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);
+	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)) {
@@ -265,7 +260,7 @@ bool id_h(connection_t *c, const char *request) {
 	/* Check if this is an invitation  */
 
 	if(name[0] == '?') {
-		if(!invitation_key) {
+		if(!mesh->invitation_key) {
 			logger(DEBUG_ALWAYS, LOG_ERR, "Got invitation from %s but we don't have an invitation key", c->hostname);
 			return false;
 		}
@@ -277,7 +272,7 @@ bool id_h(connection_t *c, const char *request) {
 		}
 
 		c->status.invitation = true;
-		char *mykey = ecdsa_get_base64_public_key(invitation_key);
+		char *mykey = ecdsa_get_base64_public_key(mesh->invitation_key);
 		if(!mykey)
 			return false;
 		if(!send_request(c, "%d %s", ACK, mykey))
@@ -286,7 +281,7 @@ bool id_h(connection_t *c, const char *request) {
 
 		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);
+		return sptps_start(&c->sptps, c, false, false, mesh->invitation_key, c->ecdsa, "tinc invitation", 15, send_meta_sptps, receive_invitation_sptps);
 	}
 
 	/* Check if identity is a valid name */
@@ -319,22 +314,15 @@ bool id_h(connection_t *c, const char *request) {
 		return false;
 	}
 
-	if(bypass_security) {
-		if(!c->config_tree)
-			init_configuration(&c->config_tree);
-		c->allow_request = ACK;
-		return send_ack(c);
-	}
-
 	if(!c->config_tree) {
 		init_configuration(&c->config_tree);
 
-		if(!read_host_config(c->config_tree, c->name)) {
+		if(!read_host_config(mesh, c->config_tree, c->name)) {
 			logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s had unknown identity (%s)", c->hostname, c->name);
 			return false;
 		}
 
-		read_ecdsa_public_key(c);
+		read_ecdsa_public_key(mesh, c);
 	} else {
 		if(c->protocol_minor && !ecdsa_active(c->ecdsa))
 			c->protocol_minor = 1;
@@ -376,24 +364,12 @@ bool send_ack(connection_t *c) {
 	if(mesh->self->options & OPTION_PMTU_DISCOVERY)
 		c->options |= OPTION_PMTU_DISCOVERY;
 
-	return send_request(c, "%d %s %d %x", ACK, myport, c->estimated_weight, (c->options & 0xffffff) | (PROT_MINOR << 24));
+	return send_request(c, "%d %s %d %x", ACK, mesh->myport, c->estimated_weight, (c->options & 0xffffff) | (PROT_MINOR << 24));
 }
 
 static void send_everything(connection_t *c) {
 	/* Send all known subnets and edges */
 
-	// TODO: remove this
-	if(disablebuggypeers) {
-		static struct {
-			vpn_packet_t pkt;
-			char pad[MAXBUFSIZE - MAXSIZE];
-		} zeropkt;
-
-		memset(&zeropkt, 0, sizeof zeropkt);
-		zeropkt.pkt.len = MAXBUFSIZE;
-		send_tcppacket(c, &zeropkt.pkt);
-	}
-
 	for splay_each(node_t, n, mesh->nodes) {
 		for splay_each(edge_t, e, n->edge_tree)
 			send_add_edge(c, e);
@@ -478,7 +454,7 @@ bool ack_h(connection_t *c, const char *request) {
 
 	/* Notify everyone of the new edge */
 
-	send_add_edge(everyone, c->edge);
+	send_add_edge(mesh->everyone, c->edge);
 
 	/* Run MST and SSSP algorithms */