X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_auth.c;h=a99e1d617e7fe675b7cf57819a063fec4719f279;hb=cd854fa86a9dc177dcaa56fa774afb127b29651a;hp=aee5736af6db5e5ecbceedaf64c2469e29677023;hpb=edc1efed3c0cf5aebb1c765066c0413757229a31;p=tinc

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index aee5736a..a99e1d61 100644
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -1,7 +1,7 @@
 /*
     protocol_auth.c -- handle the meta-protocol, authentication
     Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2016 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2017 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
@@ -47,6 +47,7 @@
 
 #include "ed25519/sha512.h"
 
+int invitation_lifetime;
 ecdsa_t *invitation_key = NULL;
 
 static bool send_proxyrequest(connection_t *c) {
@@ -180,21 +181,18 @@ static bool finalize_invitation(connection_t *c, const char *data, uint16_t len)
 	logger(DEBUG_CONNECTIONS, LOG_INFO, "Key succesfully received from %s (%s)", c->name, c->hostname);
 
 	// Call invitation-accepted script
-	char *envp[7] = {NULL};
+	environment_t env;
 	char *address, *port;
 
-	xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
-        xasprintf(&envp[1], "DEVICE=%s", device ? : "");
-        xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
-        xasprintf(&envp[3], "NODE=%s", c->name);
+	environment_init(&env);
+        environment_add(&env, "NODE=%s", c->name);
 	sockaddr2str(&c->address, &address, &port);
-	xasprintf(&envp[4], "REMOTEADDRESS=%s", address);
-	xasprintf(&envp[5], "NAME=%s", myself->name);
+	environment_add(&env, "REMOTEADDRESS=%s", address);
+	environment_add(&env, "NAME=%s", myself->name);
 
-	execute_script("invitation-accepted", envp);
+	execute_script("invitation-accepted", &env);
 
-	for(int i = 0; envp[i] && i < 7; i++)
-		free(envp[i]);
+	environment_exit(&env);
 
 	sptps_send_record(&c->sptps, 2, data, 0);
 	return true;
@@ -235,6 +233,18 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const void *dat
 		return false;
 	}
 
+	// Check the timestamp of the invitation
+	struct stat st;
+	if(stat(usedname, &st)) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Could not stat %s", usedname);
+		return false;
+	}
+
+	if(st.st_mtime + invitation_lifetime < now.tv_sec) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s tried to use expired invitation %s", c->hostname, cookie);
+		return false;
+	}
+
 	// Open the renamed file
 	FILE *f = fopen(usedname, "r");
 	if(!f) {
@@ -284,7 +294,7 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const void *dat
 bool id_h(connection_t *c, const char *request) {
 	char name[MAX_STRING_SIZE];
 
-	if(sscanf(request, "%*d " MAX_STRING " %d.%d", name, &c->protocol_major, &c->protocol_minor) < 2) {
+	if(sscanf(request, "%*d " MAX_STRING " %2d.%3d", name, &c->protocol_major, &c->protocol_minor) < 2) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ID", c->name,
 			   c->hostname);
 		return false;
@@ -436,6 +446,8 @@ bool send_metakey(connection_t *c) {
 	if(!c)
 		return false;
 
+	c->outbudget = cipher_budget(c->outcipher);
+
 	if(!(c->outdigest = digest_open_by_name("sha256", -1)))
 		return false;
 
@@ -548,6 +560,8 @@ bool metakey_h(connection_t *c, const char *request) {
 		c->incipher = NULL;
 	}
 
+	c->inbudget = cipher_budget(c->incipher);
+
 	if(digest) {
 		if(!(c->indigest = digest_open_by_nid(digest, -1))) {
 			logger(DEBUG_ALWAYS, LOG_ERR, "Error during initialisation of digest from %s (%s)", c->name, c->hostname);
@@ -884,8 +898,10 @@ bool ack_h(connection_t *c, const char *request) {
 	socklen_t local_salen = sizeof local_sa;
 	if (getsockname(c->socket, &local_sa.sa, &local_salen) < 0)
 		logger(DEBUG_ALWAYS, LOG_WARNING, "Could not get local socket address for connection with %s", c->name);
-	else
+	else {
 		sockaddr_setport(&local_sa, myport);
+		c->edge->local_address = local_sa;
+	}
 	c->edge->weight = (weight + c->estimated_weight) / 2;
 	c->edge->connection = c;
 	c->edge->options = c->options;