X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_key.c;h=f2f317de5e9888a6d603a95e148bbde371ec139b;hp=a3ef4d60a15c4896e9d6988f8e39a94f40444cb5;hb=b403f77dd84b7cae86bdaaf4961af515cf7a3fb9;hpb=de78d79db84c486afcc353884ec1770866beb653;ds=sidebyside

diff --git a/src/protocol_key.c b/src/protocol_key.c
index a3ef4d60..f2f317de 100644
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -1,7 +1,7 @@
 /*
     protocol_key.c -- handle the meta-protocol, key exchange
     Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -13,17 +13,16 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
+#include <openssl/rand.h>
 
 #include "avl_tree.h"
 #include "connection.h"
@@ -35,48 +34,51 @@
 #include "utils.h"
 #include "xalloc.h"
 
-bool mykeyused = false;
+static bool mykeyused = false;
 
-bool send_key_changed(connection_t *c, const node_t *n)
-{
-	cp();
+void send_key_changed(void) {
+	avl_node_t *node;
+	connection_t *c;
 
-	/* Only send this message if some other daemon requested our key previously.
-	   This reduces unnecessary key_changed broadcasts.
-	 */
+	send_request(everyone, "%d %x %s", KEY_CHANGED, rand(), myself->name);
 
-	if(n == myself && !mykeyused)
-		return true;
+	/* Immediately send new keys to directly connected nodes to keep UDP mappings alive */
 
-	return send_request(c, "%d %lx %s", KEY_CHANGED, random(), n->name);
+	for(node = connection_tree->head; node; node = node->next) {
+		c = node->data;
+		if(c->status.active && c->node && c->node->status.reachable)
+			send_ans_key(c->node);
+	}
 }
 
-bool key_changed_h(connection_t *c)
-{
+bool key_changed_h(connection_t *c) {
 	char name[MAX_STRING_SIZE];
 	node_t *n;
 
-	cp();
-
 	if(sscanf(c->buffer, "%*d %*x " MAX_STRING, name) != 1) {
-		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "KEY_CHANGED",
+		logger(LOG_ERR, "Got bad %s from %s (%s)", "KEY_CHANGED",
 			   c->name, c->hostname);
 		return false;
 	}
 
+	if(!check_id(name)) {
+		logger(LOG_ERR, "Got bad %s from %s (%s): %s", "KEY_CHANGED", c->name, c->hostname, "invalid name");
+		return false;
+	}
+
 	if(seen_request(c->buffer))
 		return true;
 
 	n = lookup_node(name);
 
 	if(!n) {
-		logger(LOG_ERR, _("Got %s from %s (%s) origin %s which does not exist"),
+		logger(LOG_ERR, "Got %s from %s (%s) origin %s which does not exist",
 			   "KEY_CHANGED", c->name, c->hostname, name);
-		return false;
+		return true;
 	}
 
 	n->status.validkey = false;
-	n->status.waitingforkey = false;
+	n->last_req_key = 0;
 
 	/* Tell the others */
 
@@ -86,192 +88,234 @@ bool key_changed_h(connection_t *c)
 	return true;
 }
 
-bool send_req_key(connection_t *c, const node_t *from, const node_t *to)
-{
-	cp();
-
-	return send_request(c, "%d %s %s", REQ_KEY, from->name, to->name);
+bool send_req_key(node_t *to) {
+	return send_request(to->nexthop->connection, "%d %s %s", REQ_KEY, myself->name, to->name);
 }
 
-bool req_key_h(connection_t *c)
-{
+bool req_key_h(connection_t *c) {
 	char from_name[MAX_STRING_SIZE];
 	char to_name[MAX_STRING_SIZE];
 	node_t *from, *to;
 
-	cp();
-
 	if(sscanf(c->buffer, "%*d " MAX_STRING " " MAX_STRING, from_name, to_name) != 2) {
-		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "REQ_KEY", c->name,
+		logger(LOG_ERR, "Got bad %s from %s (%s)", "REQ_KEY", c->name,
 			   c->hostname);
 		return false;
 	}
 
+	if(!check_id(from_name) || !check_id(to_name)) {
+		logger(LOG_ERR, "Got bad %s from %s (%s): %s", "REQ_KEY", c->name, c->hostname, "invalid name");
+		return false;
+	}
+
 	from = lookup_node(from_name);
 
 	if(!from) {
-		logger(LOG_ERR, _("Got %s from %s (%s) origin %s which does not exist in our connection list"),
+		logger(LOG_ERR, "Got %s from %s (%s) origin %s which does not exist in our connection list",
 			   "REQ_KEY", c->name, c->hostname, from_name);
-		return false;
+		return true;
 	}
 
 	to = lookup_node(to_name);
 
 	if(!to) {
-		logger(LOG_ERR, _("Got %s from %s (%s) destination %s which does not exist in our connection list"),
+		logger(LOG_ERR, "Got %s from %s (%s) destination %s which does not exist in our connection list",
 			   "REQ_KEY", c->name, c->hostname, to_name);
-		return false;
+		return true;
 	}
 
 	/* Check if this key request is for us */
 
 	if(to == myself) {			/* Yes, send our own key back */
-		mykeyused = true;
-		from->received_seqno = 0;
-		memset(from->late, 0, sizeof(from->late));
-		send_ans_key(c, myself, from);
+		send_ans_key(from);
 	} else {
 		if(tunnelserver)
-			return false;
+			return true;
+
+		if(!to->status.reachable) {
+			logger(LOG_WARNING, "Got %s from %s (%s) destination %s which is not reachable",
+				"REQ_KEY", c->name, c->hostname, to_name);
+			return true;
+		}
 
-		send_req_key(to->nexthop->connection, from, to);
+		send_request(to->nexthop->connection, "%s", c->buffer);
 	}
 
 	return true;
 }
 
-bool send_ans_key(connection_t *c, const node_t *from, const node_t *to)
-{
-	char *key;
-
-	cp();
-
-	key = alloca(2 * from->keylength + 1);
-	bin2hex(from->key, key, from->keylength);
-	key[from->keylength * 2] = '\0';
-
-	return send_request(c, "%d %s %s %s %d %d %d %d", ANS_KEY,
-						from->name, to->name, key,
-						from->cipher ? from->cipher->nid : 0,
-						from->digest ? from->digest->type : 0, from->maclength,
-						from->compression);
+bool send_ans_key(node_t *to) {
+	// Set key parameters
+	to->incipher = myself->incipher;
+	to->inkeylength = myself->inkeylength;
+	to->indigest = myself->indigest;
+	to->inmaclength = myself->inmaclength;
+	to->incompression = myself->incompression;
+
+	// Allocate memory for key
+	to->inkey = xrealloc(to->inkey, to->inkeylength);
+
+	// Create a new key
+	RAND_pseudo_bytes((unsigned char *)to->inkey, to->inkeylength);
+	if(to->incipher)
+		EVP_DecryptInit_ex(&to->inctx, to->incipher, NULL, (unsigned char *)to->inkey, (unsigned char *)to->inkey + to->incipher->key_len);
+
+	// Reset sequence number and late packet window
+	mykeyused = true;
+	to->received_seqno = 0;
+	if(replaywin) memset(to->late, 0, replaywin);
+
+	// Convert to hexadecimal and send
+	char key[2 * to->inkeylength + 1];
+	bin2hex(to->inkey, key, to->inkeylength);
+	key[to->inkeylength * 2] = '\0';
+
+	return send_request(to->nexthop->connection, "%d %s %s %s %d %d %d %d", ANS_KEY,
+			myself->name, to->name, key,
+			to->incipher ? to->incipher->nid : 0,
+			to->indigest ? to->indigest->type : 0, to->inmaclength,
+			to->incompression);
 }
 
-bool ans_key_h(connection_t *c)
-{
+bool ans_key_h(connection_t *c) {
 	char from_name[MAX_STRING_SIZE];
 	char to_name[MAX_STRING_SIZE];
 	char key[MAX_STRING_SIZE];
+	char address[MAX_STRING_SIZE] = "";
+	char port[MAX_STRING_SIZE] = "";
 	int cipher, digest, maclength, compression;
 	node_t *from, *to;
 
-	cp();
-
-	if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %d %d %d",
+	if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %d %d %d "MAX_STRING" "MAX_STRING,
 		from_name, to_name, key, &cipher, &digest, &maclength,
-		&compression) != 7) {
-		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "ANS_KEY", c->name,
+		&compression, address, port) < 7) {
+		logger(LOG_ERR, "Got bad %s from %s (%s)", "ANS_KEY", c->name,
 			   c->hostname);
 		return false;
 	}
 
+	if(!check_id(from_name) || !check_id(to_name)) {
+		logger(LOG_ERR, "Got bad %s from %s (%s): %s", "ANS_KEY", c->name, c->hostname, "invalid name");
+		return false;
+	}
+
 	from = lookup_node(from_name);
 
 	if(!from) {
-		logger(LOG_ERR, _("Got %s from %s (%s) origin %s which does not exist in our connection list"),
+		logger(LOG_ERR, "Got %s from %s (%s) origin %s which does not exist in our connection list",
 			   "ANS_KEY", c->name, c->hostname, from_name);
-		return false;
+		return true;
 	}
 
 	to = lookup_node(to_name);
 
 	if(!to) {
-		logger(LOG_ERR, _("Got %s from %s (%s) destination %s which does not exist in our connection list"),
+		logger(LOG_ERR, "Got %s from %s (%s) destination %s which does not exist in our connection list",
 			   "ANS_KEY", c->name, c->hostname, to_name);
-		return false;
+		return true;
 	}
 
 	/* Forward it if necessary */
 
 	if(to != myself) {
 		if(tunnelserver)
-			return false;
+			return true;
 
-		return send_request(to->nexthop->connection, "%s", c->buffer);
-	}
+		if(!to->status.reachable) {
+			logger(LOG_WARNING, "Got %s from %s (%s) destination %s which is not reachable",
+				"ANS_KEY", c->name, c->hostname, to_name);
+			return true;
+		}
 
-	/* Update our copy of the origin's packet key */
+		if(!*address && from->address.sa.sa_family != AF_UNSPEC) {
+			char *address, *port;
+			ifdebug(PROTOCOL) logger(LOG_DEBUG, "Appending reflexive UDP address to ANS_KEY from %s to %s", from->name, to->name);
+			sockaddr2str(&from->address, &address, &port);
+			send_request(to->nexthop->connection, "%s %s %s", c->buffer, address, port);
+			free(address);
+			free(port);
+			return true;
+		}
 
-	if(from->key)
-		free(from->key);
+		return send_request(to->nexthop->connection, "%s", c->buffer);
+	}
 
-	from->key = xstrdup(key);
-	from->keylength = strlen(key) / 2;
-	hex2bin(from->key, from->key, from->keylength);
-	from->key[from->keylength] = '\0';
+	/* Don't use key material until every check has passed. */
+	from->status.validkey = false;
 
-	from->status.validkey = true;
-	from->status.waitingforkey = false;
-	from->sent_seqno = 0;
+	/* Update our copy of the origin's packet key */
+	from->outkey = xrealloc(from->outkey, strlen(key) / 2);
+	from->outkeylength = strlen(key) / 2;
+	if(!hex2bin(key, from->outkey, from->outkeylength)) {
+		logger(LOG_ERR, "Got bad %s from %s(%s): %s", "ANS_KEY", from->name, from->hostname, "invalid key");
+		return true;
+	}
 
 	/* Check and lookup cipher and digest algorithms */
 
 	if(cipher) {
-		from->cipher = EVP_get_cipherbynid(cipher);
+		from->outcipher = EVP_get_cipherbynid(cipher);
 
-		if(!from->cipher) {
-			logger(LOG_ERR, _("Node %s (%s) uses unknown cipher!"), from->name,
+		if(!from->outcipher) {
+			logger(LOG_ERR, "Node %s (%s) uses unknown cipher!", from->name,
 				   from->hostname);
-			return false;
+			return true;
 		}
 
-		if(from->keylength != from->cipher->key_len + from->cipher->iv_len) {
-			logger(LOG_ERR, _("Node %s (%s) uses wrong keylength!"), from->name,
+		if(from->outkeylength != from->outcipher->key_len + from->outcipher->iv_len) {
+			logger(LOG_ERR, "Node %s (%s) uses wrong keylength!", from->name,
 				   from->hostname);
-			return false;
+			return true;
 		}
 	} else {
-		from->cipher = NULL;
+		from->outcipher = NULL;
 	}
 
-	from->maclength = maclength;
+	from->outmaclength = maclength;
 
 	if(digest) {
-		from->digest = EVP_get_digestbynid(digest);
+		from->outdigest = EVP_get_digestbynid(digest);
 
-		if(!from->digest) {
-			logger(LOG_ERR, _("Node %s (%s) uses unknown digest!"), from->name,
+		if(!from->outdigest) {
+			logger(LOG_ERR, "Node %s (%s) uses unknown digest!", from->name,
 				   from->hostname);
-			return false;
+			return true;
 		}
 
-		if(from->maclength > from->digest->md_size || from->maclength < 0) {
-			logger(LOG_ERR, _("Node %s (%s) uses bogus MAC length!"),
+		if(from->outmaclength > from->outdigest->md_size || from->outmaclength < 0) {
+			logger(LOG_ERR, "Node %s (%s) uses bogus MAC length!",
 				   from->name, from->hostname);
-			return false;
+			return true;
 		}
 	} else {
-		from->digest = NULL;
+		from->outdigest = NULL;
 	}
 
 	if(compression < 0 || compression > 11) {
-		logger(LOG_ERR, _("Node %s (%s) uses bogus compression level!"), from->name, from->hostname);
-		return false;
+		logger(LOG_ERR, "Node %s (%s) uses bogus compression level!", from->name, from->hostname);
+		return true;
 	}
 	
-	from->compression = compression;
+	from->outcompression = compression;
 
-	if(from->cipher)
-		if(!EVP_EncryptInit_ex(&from->packet_ctx, from->cipher, NULL, (unsigned char *)from->key, (unsigned char *)from->key + from->cipher->key_len)) {
-			logger(LOG_ERR, _("Error during initialisation of key from %s (%s): %s"),
+	if(from->outcipher)
+		if(!EVP_EncryptInit_ex(&from->outctx, from->outcipher, NULL, (unsigned char *)from->outkey, (unsigned char *)from->outkey + from->outcipher->key_len)) {
+			logger(LOG_ERR, "Error during initialisation of key from %s (%s): %s",
 					from->name, from->hostname, ERR_error_string(ERR_get_error(), NULL));
-			return false;
+			return true;
 		}
 
-	if(from->options & OPTION_PMTU_DISCOVERY && !from->mtuprobes)
-		send_mtu_probe(from);
+	from->status.validkey = true;
+	from->sent_seqno = 0;
 
-	flush_queue(from);
+	if(*address && *port) {
+		ifdebug(PROTOCOL) logger(LOG_DEBUG, "Using reflexive UDP address from %s: %s port %s", from->name, address, port);
+		sockaddr_t sa = str2sockaddr(address, port);
+		update_node_udp(from, &sa);
+	}
+
+	if(from->options & OPTION_PMTU_DISCOVERY && !from->mtuevent)
+		send_mtu_probe(from);
 
 	return true;
 }