/*
invitation.c -- Create and accept invitations
- Copyright (C) 2013-2017 Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2013-2022 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
fclose(f);
}
-char *get_my_hostname() {
+static char *get_my_hostname(void) {
char *hostname = NULL;
char *port = NULL;
char *hostport = NULL;
if(!f) {
fprintf(stderr, "Could not write %s: %s\n", filename, strerror(errno));
- free(key);
+ ecdsa_free(key);
return 1;
}
if(!ecdsa_write_pem_private_key(key, f)) {
fprintf(stderr, "Could not write ECDSA private key\n");
fclose(f);
- free(key);
+ ecdsa_free(key);
return 1;
}
char hash[64];
char *fingerprint = ecdsa_get_base64_public_key(key);
sha512(fingerprint, strlen(fingerprint), hash);
- b64encode_urlsafe(hash, hash, 18);
+ b64encode_tinc_urlsafe(hash, hash, 18);
- free(key);
+ ecdsa_free(key);
// Create a random cookie for this invitation.
char cookie[25];
randomize(cookie, 18);
// Create a filename that doesn't reveal the cookie itself
- uint8_t buf[18 + strlen(fingerprint)];
+ const size_t buflen = 18 + strlen(fingerprint);
+ uint8_t *buf = alloca(buflen);
+
char cookiehash[64];
memcpy(buf, cookie, 18);
- memcpy(buf + 18, fingerprint, sizeof(buf) - 18);
- sha512(buf, sizeof(buf), cookiehash);
- b64encode_urlsafe(cookiehash, cookiehash, 18);
+ memcpy(buf + 18, fingerprint, buflen - 18);
+ sha512(buf, buflen, cookiehash);
+ b64encode_tinc_urlsafe(cookiehash, cookiehash, 18);
free(fingerprint);
- b64encode_urlsafe(cookie, cookie, 18);
+ b64encode_tinc_urlsafe(cookie, cookie, 18);
// Create a file containing the details of the invitation.
snprintf(filename, sizeof(filename), "%s" SLASH "invitations" SLASH "%s", confbase, cookiehash);
}
static int sock;
-static char cookie[18];
+static char cookie[18], hash[18];
static sptps_t sptps;
static char *data;
static size_t datalen;
static bool success = false;
-static char cookie[18], hash[18];
-
-static char *get_line(const char **data) {
+static char *get_line(char *line, size_t linelen, const char **data) {
if(!data || !*data) {
return NULL;
}
return NULL;
}
- static char line[1024];
const char *end = strchr(*data, '\n');
size_t len = end ? (size_t)(end - *data) : strlen(*data);
- if(len >= sizeof(line)) {
+ if(len >= linelen) {
fprintf(stderr, "Maximum line length exceeded!\n");
return NULL;
}
}
static char *get_value(const char *data, const char *var) {
- char *line = get_line(&data);
+ static char buf[1024];
+
+ char *line = get_line(buf, sizeof(buf), &data);
if(!line) {
return NULL;
}
static bool finalize_join(void) {
- const char *temp_name = get_value(data, "Name");
+ const char *name = get_value(data, "Name");
- if(!temp_name) {
+ if(!name) {
fprintf(stderr, "No Name found in invitation!\n");
return false;
}
- size_t len = strlen(temp_name);
- char name[len + 1];
- memcpy(name, temp_name, len);
- name[len] = 0;
-
if(!check_id(name)) {
fprintf(stderr, "Invalid Name found in invitation!\n");
return false;
}
if(!netname) {
- netname = grep(data, "NetName");
+ netname = xstrdup(grep(data, "NetName"));
if(netname && !check_netname(netname, true)) {
fprintf(stderr, "Unsafe NetName found in invitation!\n");
// Generate a random netname, ask for a better one later.
ask_netname = true;
- snprintf(temp_netname, sizeof(temp_netname), "join_%x", rand());
+ snprintf(temp_netname, sizeof(temp_netname), "join_%x", prng(UINT32_MAX));
netname = temp_netname;
goto make_names;
}
const char *p = data;
char *l, *value;
- while((l = get_line(&p))) {
+ static char line[1024];
+
+ while((l = get_line(line, sizeof(line), &p))) {
// Ignore comments
if(*l == '#') {
continue;
return false;
}
- while((l = get_line(&p))) {
+ while((l = get_line(line, sizeof(line), &p))) {
if(!strcmp(l, "#---------------------------------------------------------------#")) {
continue;
}
char filename2[PATH_MAX];
snprintf(filename, sizeof(filename), "%s" SLASH "tinc-up.invitation", confbase);
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
snprintf(filename2, sizeof(filename2), "%s" SLASH "tinc-up.bat", confbase);
#else
snprintf(filename2, sizeof(filename2), "%s" SLASH "tinc-up", confbase);
if(response == 'e') {
char *command;
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
const char *editor = getenv("VISUAL");
if(!editor) {
static bool invitation_send(void *handle, uint8_t type, const void *vdata, size_t len) {
(void)handle;
(void)type;
- const uint8_t *data = vdata;
+ const char *data = vdata;
while(len) {
ssize_t result = send(sock, data, len, 0);
}
if(!port || !*port) {
- port = "655";
+ static char default_port[] = "655";
+ port = default_port;
}
- if(!b64decode(slash, hash, 24) || !b64decode(slash + 24, cookie, 24)) {
+ if(!b64decode_tinc(slash, hash, 24) || !b64decode_tinc(slash + 24, cookie, 24)) {
goto invalid;
}
if(!ai) {
free(b64key);
+ ecdsa_free(key);
return 1;
}
if(!aip) {
freeaddrinfo(ai);
free(b64key);
+ ecdsa_free(key);
return 1;
}
}
if(sha512(fingerprint, strlen(fingerprint), hishash)) {
fprintf(stderr, "Could not create digest\n%s\n", line + 2);
+ ecdsa_free(key);
return 1;
}
if(memcmp(hishash, hash, 18)) {
fprintf(stderr, "Peer has an invalid key!\n%s\n", line + 2);
+ ecdsa_free(key);
return 1;
}
ecdsa_t *hiskey = ecdsa_set_base64_public_key(fingerprint);
if(!hiskey) {
+ ecdsa_free(key);
return 1;
}
// Start an SPTPS session
if(!sptps_start(&sptps, NULL, true, false, key, hiskey, "tinc invitation", 15, invitation_send, invitation_receive)) {
+ ecdsa_free(hiskey);
+ ecdsa_free(key);
return 1;
}
// Feed rest of input buffer to SPTPS
if(!sptps_receive_data(&sptps, buffer, blen)) {
- return 1;
+ success = false;
+ goto exit;
}
while((len = recv(sock, line, sizeof(line), 0))) {
continue;
}
-#if HAVE_MINGW
+#if HAVE_WINDOWS
// If socket has been shut down, recv() on Windows returns -1 and sets sockerrno
// to WSAESHUTDOWN, while on UNIX-like operating systems recv() returns 0, so we
#endif
fprintf(stderr, "Error reading data from %s port %s: %s\n", address, port, sockstrerror(sockerrno));
- return 1;
+ success = false;
+ goto exit;
}
char *p = line;
size_t done = sptps_receive_data(&sptps, p, len);
if(!done) {
- return 1;
+ success = false;
+ goto exit;
}
len -= (ssize_t) done;
}
}
+exit:
sptps_stop(&sptps);
ecdsa_free(hiskey);
ecdsa_free(key);
closesocket(sock);
if(!success) {
- fprintf(stderr, "Connection closed by peer, invitation cancelled.\n");
+ fprintf(stderr, "Invitation cancelled.\n");
return 1;
}