X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_auth.c;h=a99e1d617e7fe675b7cf57819a063fec4719f279;hb=af81c436d6e11a53803747af7cc8ecfd449ccd4c;hp=31906bab49ed22d8ec6795a698383ca04c7f3c94;hpb=5cbef906209eb5005f821af8f55a6f5d7e7d060c;p=tinc

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 31906bab..a99e1d61 100644
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -47,6 +47,7 @@
 
 #include "ed25519/sha512.h"
 
+int invitation_lifetime;
 ecdsa_t *invitation_key = NULL;
 
 static bool send_proxyrequest(connection_t *c) {
@@ -232,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) {
@@ -281,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;