/*
tincctl.c -- Controlling a running tincd
- Copyright (C) 2007-2013 Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2007-2015 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
#include "xalloc.h"
#include "protocol.h"
#include "control_common.h"
+#include "crypto.h"
#include "ecdsagen.h"
+#include "fsck.h"
#include "info.h"
+#include "invitation.h"
#include "names.h"
#include "rsagen.h"
#include "utils.h"
#include "tincctl.h"
#include "top.h"
+#include "version.h"
-#ifdef HAVE_MINGW
-#define mkdir(a, b) mkdir(a)
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
#endif
static char **orig_argv;
static char *name = NULL;
static char controlcookie[1025];
-static char *tinc_conf = NULL;
-static char *hosts_dir = NULL;
+char *tinc_conf = NULL;
+char *hosts_dir = NULL;
struct timeval now;
// Horrible global variables...
static int pid = 0;
-static int fd = -1;
-static char line[4096];
+int fd = -1;
+char line[4096];
static int code;
static int req;
static int result;
-static bool force = false;
-static bool tty = true;
-
-#ifdef HAVE_MINGW
-static struct WSAData wsa_state;
-#endif
+bool force = false;
+bool tty = true;
+bool confbasegiven = false;
+bool netnamegiven = false;
+char *scriptinterpreter = NULL;
+char *scriptextension = "";
+static char *prompt;
static struct option const long_options[] = {
+ {"batch", no_argument, NULL, 'b'},
{"config", required_argument, NULL, 'c'},
- {"debug", optional_argument, NULL, 0},
- {"no-detach", no_argument, NULL, 0},
- {"mlock", no_argument, NULL, 0},
{"net", required_argument, NULL, 'n'},
{"help", no_argument, NULL, 1},
{"version", no_argument, NULL, 2},
- {"pidfile", required_argument, NULL, 5},
- {"logfile", required_argument, NULL, 0},
- {"bypass-security", no_argument, NULL, 0},
- {"chroot", no_argument, NULL, 0},
- {"user", required_argument, NULL, 0},
- {"option", required_argument, NULL, 0},
- {"force", no_argument, NULL, 6},
+ {"pidfile", required_argument, NULL, 3},
+ {"force", no_argument, NULL, 4},
{NULL, 0, NULL, 0}
};
static void version(void) {
printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
- VERSION, __DATE__, __TIME__, PROT_MAJOR, PROT_MINOR);
- printf("Copyright (C) 1998-2012 Ivo Timmermans, Guus Sliepen and others.\n"
+ BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
+ printf("Copyright (C) 1998-2015 Ivo Timmermans, Guus Sliepen and others.\n"
"See the AUTHORS file for a complete list.\n\n"
"tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n"
"and you are welcome to redistribute it under certain conditions;\n"
} else {
printf("Usage: %s [options] command\n\n", program_name);
printf("Valid options are:\n"
+ " -b, --batch Don't ask for anything (non-interactive mode).\n"
" -c, --config=DIR Read configuration options from DIR.\n"
" -n, --net=NETNAME Connect to net NETNAME.\n"
" --pidfile=FILENAME Read control cookie from FILENAME.\n"
+ " --force Force some commands to work despite warnings.\n"
" --help Display this help and exit.\n"
" --version Output version information and exit.\n"
"\n"
"Valid commands are:\n"
" init [name] Create initial configuration files.\n"
- " config Change configuration:\n"
- " [get] VARIABLE - print current value of VARIABLE\n"
- " [set] VARIABLE VALUE - set VARIABLE to VALUE\n"
- " add VARIABLE VALUE - add VARIABLE with the given VALUE\n"
- " del VARIABLE [VALUE] - remove VARIABLE [only ones with watching VALUE]\n"
+ " get VARIABLE Print current value of VARIABLE\n"
+ " set VARIABLE VALUE Set VARIABLE to VALUE\n"
+ " add VARIABLE VALUE Add VARIABLE with the given VALUE\n"
+ " del VARIABLE [VALUE] Remove VARIABLE [only ones with watching VALUE]\n"
" start [tincd options] Start tincd.\n"
" stop Stop tincd.\n"
- " restart Restart tincd.\n"
+ " restart [tincd options] Restart tincd.\n"
" reload Partially reload configuration of running tincd.\n"
" pid Show PID of currently running tincd.\n"
- " generate-keys [bits] Generate new RSA and ECDSA public/private keypairs.\n"
+#ifdef DISABLE_LEGACY
+ " generate-keys Generate a new Ed25519 public/private keypair.\n"
+#else
+ " generate-keys [bits] Generate new RSA and Ed25519 public/private keypairs.\n"
" generate-rsa-keys [bits] Generate a new RSA public/private keypair.\n"
- " generate-ecdsa-keys Generate a new ECDSA public/private keypair.\n"
+#endif
+ " generate-ed25519-keys Generate a new Ed25519 public/private keypair.\n"
" dump Dump a list of one of the following things:\n"
" [reachable] nodes - all known nodes in the VPN\n"
" edges - all known connections in the VPN\n"
" subnets - all known subnets in the VPN\n"
" connections - all meta connections with ourself\n"
" [di]graph - graph of the VPN in dotty format\n"
+ " invitations - outstanding invitations\n"
" info NODE|SUBNET|ADDRESS Give information about a particular NODE, SUBNET or ADDRESS.\n"
" purge Purge unreachable nodes\n"
" debug N Set debug level\n"
" log [level] Dump log output [up to the specified level]\n"
" export Export host configuration of local node to standard output\n"
" export-all Export all host configuration files to standard output\n"
- " import [--force] Import host configuration file(s) from standard input\n"
- " exchange [--force] Same as export followed by import\n"
- " exchange-all [--force] Same as export-all followed by import\n"
+ " import Import host configuration file(s) from standard input\n"
+ " exchange Same as export followed by import\n"
+ " exchange-all Same as export-all followed by import\n"
+ " invite NODE [...] Generate an invitation for NODE\n"
+ " join INVITATION Join a VPN using an INVITATION\n"
+ " network [NETNAME] List all known networks, or switch to the one named NETNAME.\n"
+ " fsck Check the configuration files for problems.\n"
+ " sign [FILE] Generate a signed version of a file.\n"
+ " verify NODE [FILE] Verify that a file was signed by the given NODE.\n"
"\n");
printf("Report bugs to tinc@tinc-vpn.org.\n");
}
int r;
int option_index = 0;
- while((r = getopt_long(argc, argv, "c:n:Dd::Lo:RU:", long_options, &option_index)) != EOF) {
+ while((r = getopt_long(argc, argv, "+c:n:", long_options, &option_index)) != EOF) {
switch (r) {
case 0: /* long option */
break;
+ case 'b':
+ tty = false;
+ break;
+
case 'c': /* config file */
confbase = xstrdup(optarg);
+ confbasegiven = true;
break;
case 'n': /* net name given */
show_version = true;
break;
- case 5: /* open control socket here */
+ case 3: /* open control socket here */
pidfilename = xstrdup(optarg);
break;
- case 6: /* force */
+ case 4: /* force */
force = true;
break;
return true;
}
+/* Open a file with the desired permissions, minus the umask.
+ Also, if we want to create an executable file, we call fchmod()
+ to set the executable bits. */
+
+FILE *fopenmask(const char *filename, const char *mode, mode_t perms) {
+ mode_t mask = umask(0);
+ perms &= ~mask;
+ umask(~perms);
+ FILE *f = fopen(filename, mode);
+
+ if(!f) {
+ fprintf(stderr, "Could not open %s: %s\n", filename, strerror(errno));
+ return NULL;
+ }
+
+#ifdef HAVE_FCHMOD
+ if((perms & 0444) && f)
+ fchmod(fileno(f), perms);
+#endif
+ umask(mask);
+ return f;
+}
+
static void disable_old_keys(const char *filename, const char *what) {
char tmpfile[PATH_MAX] = "";
char buf[1024];
snprintf(tmpfile, sizeof tmpfile, "%s.tmp", filename);
- w = fopen(tmpfile, "w");
+ struct stat st = {.st_mode = 0600};
+ fstat(fileno(r), &st);
+ w = fopenmask(tmpfile, "w", st.st_mode);
while(fgets(buf, sizeof buf, r)) {
if(!block && !strncmp(buf, "-----BEGIN ", 11)) {
- if((strstr(buf, " EC ") && strstr(what, "ECDSA")) || (strstr(buf, " RSA ") && strstr(what, "RSA"))) {
+ if((strstr(buf, " ED25519 ") && strstr(what, "Ed25519")) || (strstr(buf, " RSA ") && strstr(what, "RSA"))) {
disabled = true;
block = true;
}
}
- bool ecdsapubkey = !strncasecmp(buf, "ECDSAPublicKey", 14) && strchr(" \t=", buf[14]) && strstr(what, "ECDSA");
+ bool ed25519pubkey = !strncasecmp(buf, "Ed25519PublicKey", 16) && strchr(" \t=", buf[16]) && strstr(what, "Ed25519");
- if(ecdsapubkey)
+ if(ed25519pubkey)
disabled = true;
if(w) {
- if(block || ecdsapubkey)
+ if(block || ed25519pubkey)
fputc('#', w);
if(fputs(buf, w) < 0) {
error = true;
unlink(tmpfile);
}
-static FILE *ask_and_open(const char *filename, const char *what, const char *mode, bool ask) {
+static FILE *ask_and_open(const char *filename, const char *what, const char *mode, bool ask, mode_t perms) {
FILE *r;
- char *directory;
+ char directory[PATH_MAX] = ".";
char buf[PATH_MAX];
char buf2[PATH_MAX];
/* Check stdin and stdout */
if(ask && tty) {
/* Ask for a file and/or directory name. */
- fprintf(stdout, "Please enter a file to save %s to [%s]: ",
- what, filename);
- fflush(stdout);
+ fprintf(stderr, "Please enter a file to save %s to [%s]: ", what, filename);
if(fgets(buf, sizeof buf, stdin) == NULL) {
- fprintf(stderr, "Error while reading stdin: %s\n",
- strerror(errno));
+ fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno));
return NULL;
}
if(filename[0] != '/') {
#endif
/* The directory is a relative path or a filename. */
- directory = get_current_dir_name();
+ getcwd(directory, sizeof directory);
snprintf(buf2, sizeof buf2, "%s" SLASH "%s", directory, filename);
filename = buf2;
}
- umask(0077); /* Disallow everything for group and other */
-
disable_old_keys(filename, what);
/* Open it first to keep the inode busy */
- r = fopen(filename, mode);
+ r = fopenmask(filename, mode, perms);
if(!r) {
fprintf(stderr, "Error opening file `%s': %s\n", filename, strerror(errno));
}
/*
- Generate a public/private ECDSA keypair, and ask for a file to store
+ Generate a public/private Ed25519 keypair, and ask for a file to store
them in.
*/
-static bool ecdsa_keygen(bool ask) {
- ecdsa_t key;
+static bool ed25519_keygen(bool ask) {
+ ecdsa_t *key;
FILE *f;
- char *pubname, *privname;
+ char fname[PATH_MAX];
- fprintf(stderr, "Generating ECDSA keypair:\n");
+ fprintf(stderr, "Generating Ed25519 keypair:\n");
- if(!ecdsa_generate(&key)) {
+ if(!(key = ecdsa_generate())) {
fprintf(stderr, "Error during key generation!\n");
return false;
} else
fprintf(stderr, "Done.\n");
- xasprintf(&privname, "%s" SLASH "ecdsa_key.priv", confbase);
- f = ask_and_open(privname, "private ECDSA key", "a", ask);
- free(privname);
+ snprintf(fname, sizeof fname, "%s" SLASH "ed25519_key.priv", confbase);
+ f = ask_and_open(fname, "private Ed25519 key", "a", ask, 0600);
if(!f)
- return false;
-
-#ifdef HAVE_FCHMOD
- /* Make it unreadable for others. */
- fchmod(fileno(f), 0600);
-#endif
+ goto error;
- ecdsa_write_pem_private_key(&key, f);
+ if(!ecdsa_write_pem_private_key(key, f)) {
+ fprintf(stderr, "Error writing private key!\n");
+ goto error;
+ }
fclose(f);
if(name)
- xasprintf(&pubname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+ snprintf(fname, sizeof fname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
else
- xasprintf(&pubname, "%s" SLASH "ecdsa_key.pub", confbase);
+ snprintf(fname, sizeof fname, "%s" SLASH "ed25519_key.pub", confbase);
- f = ask_and_open(pubname, "public ECDSA key", "a", ask);
- free(pubname);
+ f = ask_and_open(fname, "public Ed25519 key", "a", ask, 0666);
if(!f)
return false;
- char *pubkey = ecdsa_get_base64_public_key(&key);
- fprintf(f, "ECDSAPublicKey = %s\n", pubkey);
+ char *pubkey = ecdsa_get_base64_public_key(key);
+ fprintf(f, "Ed25519PublicKey = %s\n", pubkey);
free(pubkey);
fclose(f);
+ ecdsa_free(key);
return true;
+
+error:
+ if(f)
+ fclose(f);
+ ecdsa_free(key);
+ return false;
}
+#ifndef DISABLE_LEGACY
/*
Generate a public/private RSA keypair, and ask for a file to store
them in.
*/
static bool rsa_keygen(int bits, bool ask) {
- rsa_t key;
+ rsa_t *key;
FILE *f;
- char *pubname, *privname;
+ char fname[PATH_MAX];
+
+ // Make sure the key size is a multiple of 8 bits.
+ bits &= ~0x7;
+
+ // Force them to be between 1024 and 8192 bits long.
+ if(bits < 1024)
+ bits = 1024;
+ if(bits > 8192)
+ bits = 8192;
fprintf(stderr, "Generating %d bits keys:\n", bits);
- if(!rsa_generate(&key, bits, 0x10001)) {
+ if(!(key = rsa_generate(bits, 0x10001))) {
fprintf(stderr, "Error during key generation!\n");
return false;
} else
fprintf(stderr, "Done.\n");
- xasprintf(&privname, "%s" SLASH "rsa_key.priv", confbase);
- f = ask_and_open(privname, "private RSA key", "a", ask);
- free(privname);
+ snprintf(fname, sizeof fname, "%s" SLASH "rsa_key.priv", confbase);
+ f = ask_and_open(fname, "private RSA key", "a", ask, 0600);
if(!f)
- return false;
+ goto error;
-#ifdef HAVE_FCHMOD
- /* Make it unreadable for others. */
- fchmod(fileno(f), 0600);
-#endif
-
- rsa_write_pem_private_key(&key, f);
+ if(!rsa_write_pem_private_key(key, f)) {
+ fprintf(stderr, "Error writing private key!\n");
+ goto error;
+ }
fclose(f);
if(name)
- xasprintf(&pubname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+ snprintf(fname, sizeof fname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
else
- xasprintf(&pubname, "%s" SLASH "rsa_key.pub", confbase);
+ snprintf(fname, sizeof fname, "%s" SLASH "rsa_key.pub", confbase);
- f = ask_and_open(pubname, "public RSA key", "a", ask);
- free(pubname);
+ f = ask_and_open(fname, "public RSA key", "a", ask, 0666);
if(!f)
- return false;
+ goto error;
- rsa_write_pem_public_key(&key, f);
+ if(!rsa_write_pem_public_key(key, f)) {
+ fprintf(stderr, "Error writing public key!\n");
+ goto error;
+ }
fclose(f);
+ rsa_free(key);
return true;
+
+error:
+ if(f)
+ fclose(f);
+ rsa_free(key);
+ return false;
}
+#endif
-static char buffer[4096];
-static size_t blen = 0;
+char buffer[4096];
+size_t blen = 0;
bool recvline(int fd, char *line, size_t len) {
char *newline = NULL;
+ if(!fd)
+ abort();
+
while(!(newline = memchr(buffer, '\n', blen))) {
int result = recv(fd, buffer + blen, sizeof buffer - blen, 0);
- if(result == -1 && errno == EINTR)
+ if(result == -1 && sockerrno == EINTR)
continue;
else if(result <= 0)
return false;
return true;
}
-static bool recvdata(int fd, char *data, size_t len) {
+bool recvdata(int fd, char *data, size_t len) {
+ if(len == -1)
+ len = blen;
+
while(blen < len) {
int result = recv(fd, buffer + blen, sizeof buffer - blen, 0);
- if(result == -1 && errno == EINTR)
+ if(result == -1 && sockerrno == EINTR)
continue;
else if(result <= 0)
return false;
blen++;
while(blen) {
- int result = send(fd, p, blen, 0);
- if(result == -1 && errno == EINTR)
+ int result = send(fd, p, blen, MSG_NOSIGNAL);
+ if(result == -1 && sockerrno == EINTR)
continue;
else if(result <= 0)
return false;
}
#endif
-static bool connect_tincd(bool verbose) {
+bool connect_tincd(bool verbose) {
if(fd >= 0) {
fd_set r;
FD_ZERO(&r);
fclose(f);
-#ifdef HAVE_MINGW
- if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) {
- if(verbose)
- fprintf(stderr, "System call `%s' failed: %s", "WSAStartup", winerror(GetLastError()));
- return false;
- }
-#endif
-
#ifndef HAVE_MINGW
struct sockaddr_un sa;
sa.sun_family = AF_UNIX;
if(getaddrinfo(host, port, &hints, &res) || !res) {
if(verbose)
- fprintf(stderr, "Cannot resolve %s port %s: %s", host, port, strerror(errno));
+ fprintf(stderr, "Cannot resolve %s port %s: %s", host, port, sockstrerror(sockerrno));
return false;
}
freeaddrinfo(res);
#endif
+#ifdef SO_NOSIGPIPE
+ static const int one = 1;
+ setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, (void *)&one, sizeof one);
+#endif
+
char data[4096];
int version;
c = "tincd";
int nargc = 0;
- char **nargv = xmalloc_and_zero((optind + argc) * sizeof *nargv);
+ char **nargv = xzalloc((optind + argc) * sizeof *nargv);
- nargv[nargc++] = c;
+ char *arg0 = c;
+#ifdef HAVE_MINGW
+ /*
+ Windows has no real concept of an "argv array". A command line is just one string.
+ The CRT of the new process will decode the command line string to generate argv before calling main(), and (by convention)
+ it uses quotes to handle spaces in arguments.
+ Therefore we need to quote all arguments that might contain spaces. No, execvp() won't do that for us (see MSDN).
+ If we don't do that, then execvp() will run fine but any spaces in the filename contained in arg0 will bleed
+ into the next arguments when the spawned process' CRT parses its command line, resulting in chaos.
+ */
+ xasprintf(&arg0, "\"%s\"", arg0);
+#endif
+ nargv[nargc++] = arg0;
for(int i = 1; i < optind; i++)
nargv[nargc++] = orig_argv[i];
for(int i = 1; i < argc; i++)
nargv[nargc++] = argv[i];
#ifdef HAVE_MINGW
- execvp(c, nargv);
- fprintf(stderr, "Error starting %s: %s\n", c, strerror(errno));
- return 1;
+ int status = spawnvp(_P_WAIT, c, nargv);
+ if (status == -1) {
+ fprintf(stderr, "Error starting %s: %s\n", c, strerror(errno));
+ return 1;
+ }
+ return status;
#else
+ int pfd[2] = {-1, -1};
+ if(socketpair(AF_UNIX, SOCK_STREAM, 0, pfd)) {
+ fprintf(stderr, "Could not create umbilical socket: %s\n", strerror(errno));
+ free(nargv);
+ return 1;
+ }
+
pid_t pid = fork();
if(pid == -1) {
fprintf(stderr, "Could not fork: %s\n", strerror(errno));
return 1;
}
- if(!pid)
+ if(!pid) {
+ close(pfd[0]);
+ char buf[100] = "";
+ snprintf(buf, sizeof buf, "%d", pfd[1]);
+ setenv("TINC_UMBILICAL", buf, true);
exit(execvp(c, nargv));
+ } else {
+ close(pfd[1]);
+ }
free(nargv);
- int status = -1;
- if(waitpid(pid, &status, 0) != pid || !WIFEXITED(status) || WEXITSTATUS(status)) {
+ int status = -1, result;
+#ifdef SIGINT
+ signal(SIGINT, SIG_IGN);
+#endif
+
+ // Pass all log messages from the umbilical to stderr.
+ // A nul-byte right before closure means tincd started succesfully.
+ bool failure = true;
+ char buf[1024];
+ ssize_t len;
+
+ while((len = read(pfd[0], buf, sizeof buf)) > 0) {
+ failure = buf[len - 1];
+ if(!failure)
+ len--;
+ write(2, buf, len);
+ }
+
+ if(len)
+ failure = true;
+
+ close(pfd[0]);
+
+ // Make sure the child process is really gone.
+ result = waitpid(pid, &status, 0);
+
+#ifdef SIGINT
+ signal(SIGINT, SIG_DFL);
+#endif
+
+ if(failure || result != pid || !WIFEXITED(status) || WEXITSTATUS(status)) {
fprintf(stderr, "Error starting %s\n", c);
return 1;
}
}
static int cmd_restart(int argc, char *argv[]) {
- cmd_stop(argc, argv);
+ cmd_stop(1, argv);
return cmd_start(argc, argv);
}
}
+static int dump_invitations(void) {
+ char dname[PATH_MAX];
+ snprintf(dname, sizeof dname, "%s" SLASH "invitations", confbase);
+ DIR *dir = opendir(dname);
+ if(!dir) {
+ if(errno == ENOENT) {
+ fprintf(stderr, "No outstanding invitations.\n");
+ return 0;
+ }
+
+ fprintf(stderr, "Cannot not read directory %s: %s\n", dname, strerror(errno));
+ return 1;
+ }
+
+ struct dirent *ent;
+ bool found = false;
+
+ while((ent = readdir(dir))) {
+ char buf[MAX_STRING_SIZE];
+ if(b64decode(ent->d_name, buf, 24) != 18)
+ continue;
+
+ char fname[PATH_MAX];
+ snprintf(fname, sizeof fname, "%s" SLASH "%s", dname, ent->d_name);
+ FILE *f = fopen(fname, "r");
+ if(!f) {
+ fprintf(stderr, "Cannot open %s: %s\n", fname, strerror(errno));
+ fclose(f);
+ continue;
+ }
+
+ buf[0] = 0;
+ if(!fgets(buf, sizeof buf, f)) {
+ fprintf(stderr, "Invalid invitation file %s", fname);
+ fclose(f);
+ continue;
+ }
+ fclose(f);
+
+ char *eol = buf + strlen(buf);
+ while(strchr("\t \r\n", *--eol))
+ *eol = 0;
+ if(strncmp(buf, "Name = ", 7) || !check_id(buf + 7)) {
+ fprintf(stderr, "Invalid invitation file %s", fname);
+ continue;
+ }
+
+ found = true;
+ printf("%s %s\n", ent->d_name, buf + 7);
+ }
+
+ closedir(dir);
+
+ if(!found)
+ fprintf(stderr, "No outstanding invitations.\n");
+
+ return 0;
+}
+
static int cmd_dump(int argc, char *argv[]) {
bool only_reachable = false;
return 1;
}
+ if(!strcasecmp(argv[1], "invitations"))
+ return dump_invitations();
+
if(!connect_tincd(true))
return 1;
break;
char node[4096];
+ char id[4096];
char from[4096];
char to[4096];
char subnet[4096];
char host[4096];
char port[4096];
+ char local_host[4096];
+ char local_port[4096];
char via[4096];
char nexthop[4096];
int cipher, digest, maclength, compression, distance, socket, weight;
switch(req) {
case REQ_DUMP_NODES: {
- int n = sscanf(line, "%*d %*d %s %s port %s %d %d %d %d %x %x %s %s %d %hd %hd %hd %ld", node, host, port, &cipher, &digest, &maclength, &compression, &options, &status_int, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu, &last_state_change);
- if(n != 16) {
+ int n = sscanf(line, "%*d %*d %s %s %s port %s %d %d %d %d %x %x %s %s %d %hd %hd %hd %ld", node, id, host, port, &cipher, &digest, &maclength, &compression, &options, &status_int, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu, &last_state_change);
+ if(n != 17) {
fprintf(stderr, "Unable to parse node dump from tincd: %s\n", line);
return 1;
}
} else {
if(only_reachable && !status.reachable)
continue;
- printf("%s at %s port %s cipher %d digest %d maclength %d compression %d options %x status %04x nexthop %s via %s distance %d pmtu %hd (min %hd max %hd)\n",
- node, host, port, cipher, digest, maclength, compression, options, status_int, nexthop, via, distance, pmtu, minmtu, maxmtu);
+ printf("%s id %s at %s port %s cipher %d digest %d maclength %d compression %d options %x status %04x nexthop %s via %s distance %d pmtu %hd (min %hd max %hd)\n",
+ node, id, host, port, cipher, digest, maclength, compression, options, status_int, nexthop, via, distance, pmtu, minmtu, maxmtu);
}
} break;
case REQ_DUMP_EDGES: {
- int n = sscanf(line, "%*d %*d %s %s %s port %s %x %d", from, to, host, port, &options, &weight);
- if(n != 6) {
+ int n = sscanf(line, "%*d %*d %s %s %s port %s %s port %s %x %d", from, to, host, port, local_host, local_port, &options, &weight);
+ if(n != 8) {
fprintf(stderr, "Unable to parse edge dump from tincd.\n");
return 1;
}
else if(do_graph == 2)
printf(" %s -> %s [w = %f, weight = %f];\n", node1, node2, w, w);
} else {
- printf("%s to %s at %s port %s options %x weight %d\n", from, to, host, port, options, weight);
+ printf("%s to %s at %s port %s local %s port %s options %x weight %d\n", from, to, host, port, local_host, local_port, options, weight);
}
} break;
top(fd);
return 0;
#else
- fprintf(stderr, "This version of tincctl was compiled without support for the curses library.\n");
+ fprintf(stderr, "This version of tinc was compiled without support for the curses library.\n");
return 1;
#endif
}
return 0;
}
+#ifdef SIGINT
+static void sigint_handler(int sig) {
+ fprintf(stderr, "\n");
+ shutdown(fd, SHUT_RDWR);
+}
+#endif
+
static int cmd_log(int argc, char *argv[]) {
if(argc > 2) {
fprintf(stderr, "Too many arguments!\n");
if(!connect_tincd(true))
return 1;
+#ifdef SIGINT
+ signal(SIGINT, sigint_handler);
+#endif
+
logcontrol(fd, stdout, argc > 1 ? atoi(argv[1]) : -1);
+
+#ifdef SIGINT
+ signal(SIGINT, SIG_DFL);
+#endif
+
+ close(fd);
+ fd = -1;
return 0;
}
return 0;
}
-static int rstrip(char *value) {
+int rstrip(char *value) {
int len = strlen(value);
while(len && strchr("\t\r\n ", value[len - 1]))
value[--len] = 0;
return len;
}
-static char *get_my_name() {
+char *get_my_name(bool verbose) {
FILE *f = fopen(tinc_conf, "r");
if(!f) {
- fprintf(stderr, "Could not open %s: %s\n", tinc_conf, strerror(errno));
+ if(verbose)
+ fprintf(stderr, "Could not open %s: %s\n", tinc_conf, strerror(errno));
return NULL;
}
continue;
if(*value) {
fclose(f);
- return strdup(value);
+ return replace_name(value);
}
}
fclose(f);
- fprintf(stderr, "Could not find Name in %s.\n", tinc_conf);
+ if(verbose)
+ fprintf(stderr, "Could not find Name in %s.\n", tinc_conf);
return NULL;
}
-#define VAR_SERVER 1 /* Should be in tinc.conf */
-#define VAR_HOST 2 /* Can be in host config file */
-#define VAR_MULTIPLE 4 /* Multiple statements allowed */
-#define VAR_OBSOLETE 8 /* Should not be used anymore */
+static ecdsa_t *get_pubkey(FILE *f) {
+ char buf[4096];
+ char *value;
+ while(fgets(buf, sizeof buf, f)) {
+ int len = strcspn(buf, "\t =");
+ value = buf + len;
+ value += strspn(value, "\t ");
+ if(*value == '=') {
+ value++;
+ value += strspn(value, "\t ");
+ }
+ if(!rstrip(value))
+ continue;
+ buf[len] = 0;
+ if(strcasecmp(buf, "Ed25519PublicKey"))
+ continue;
+ if(*value)
+ return ecdsa_set_base64_public_key(value);
+ }
-static struct {
- const char *name;
- int type;
-} const variables[] = {
+ return NULL;
+}
+
+const var_t variables[] = {
/* Server configuration */
{"AddressFamily", VAR_SERVER},
- {"AutoConnect", VAR_SERVER},
+ {"AutoConnect", VAR_SERVER | VAR_SAFE},
{"BindToAddress", VAR_SERVER | VAR_MULTIPLE},
{"BindToInterface", VAR_SERVER},
- {"Broadcast", VAR_SERVER},
- {"ConnectTo", VAR_SERVER | VAR_MULTIPLE},
+ {"Broadcast", VAR_SERVER | VAR_SAFE},
+ {"BroadcastSubnet", VAR_SERVER | VAR_MULTIPLE | VAR_SAFE},
+ {"ConnectTo", VAR_SERVER | VAR_MULTIPLE | VAR_SAFE},
{"DecrementTTL", VAR_SERVER},
{"Device", VAR_SERVER},
+ {"DeviceStandby", VAR_SERVER},
{"DeviceType", VAR_SERVER},
{"DirectOnly", VAR_SERVER},
- {"ECDSAPrivateKeyFile", VAR_SERVER},
+ {"Ed25519PrivateKeyFile", VAR_SERVER},
{"ExperimentalProtocol", VAR_SERVER},
{"Forwarding", VAR_SERVER},
{"GraphDumpFile", VAR_SERVER | VAR_OBSOLETE},
{"IffOneQueue", VAR_SERVER},
{"Interface", VAR_SERVER},
{"KeyExpire", VAR_SERVER},
+ {"ListenAddress", VAR_SERVER | VAR_MULTIPLE},
{"LocalDiscovery", VAR_SERVER},
{"MACExpire", VAR_SERVER},
+ {"MaxConnectionBurst", VAR_SERVER},
{"MaxOutputBufferSize", VAR_SERVER},
{"MaxTimeout", VAR_SERVER},
- {"Mode", VAR_SERVER},
+ {"Mode", VAR_SERVER | VAR_SAFE},
{"Name", VAR_SERVER},
{"PingInterval", VAR_SERVER},
{"PingTimeout", VAR_SERVER},
{"ScriptsInterpreter", VAR_SERVER},
{"StrictSubnets", VAR_SERVER},
{"TunnelServer", VAR_SERVER},
+ {"UDPDiscovery", VAR_SERVER},
+ {"UDPDiscoveryKeepaliveInterval", VAR_SERVER},
+ {"UDPDiscoveryInterval", VAR_SERVER},
+ {"UDPDiscoveryTimeout", VAR_SERVER},
+ {"MTUInfoInterval", VAR_SERVER},
+ {"UDPInfoInterval", VAR_SERVER},
{"UDPRcvBuf", VAR_SERVER},
{"UDPSndBuf", VAR_SERVER},
+ {"UPnP", VAR_SERVER},
+ {"UPnPDiscoverWait", VAR_SERVER},
+ {"UPnPRefreshPeriod", VAR_SERVER},
{"VDEGroup", VAR_SERVER},
{"VDEPort", VAR_SERVER},
/* Host configuration */
{"ClampMSS", VAR_SERVER | VAR_HOST},
{"Compression", VAR_SERVER | VAR_HOST},
{"Digest", VAR_SERVER | VAR_HOST},
- {"ECDSAPublicKey", VAR_HOST},
- {"ECDSAPublicKeyFile", VAR_SERVER | VAR_HOST},
+ {"Ed25519PublicKey", VAR_HOST},
+ {"Ed25519PublicKeyFile", VAR_SERVER | VAR_HOST},
{"IndirectData", VAR_SERVER | VAR_HOST},
{"MACLength", VAR_SERVER | VAR_HOST},
{"PMTU", VAR_SERVER | VAR_HOST},
{"Port", VAR_HOST},
{"PublicKey", VAR_HOST | VAR_OBSOLETE},
{"PublicKeyFile", VAR_SERVER | VAR_HOST | VAR_OBSOLETE},
- {"Subnet", VAR_HOST | VAR_MULTIPLE},
+ {"Subnet", VAR_HOST | VAR_MULTIPLE | VAR_SAFE},
{"TCPOnly", VAR_SERVER | VAR_HOST},
- {"Weight", VAR_HOST},
+ {"Weight", VAR_HOST | VAR_SAFE},
{NULL, 0}
};
return 1;
}
+ if(strcasecmp(argv[0], "config"))
+ argv--, argc++;
+
int action = -2;
if(!strcasecmp(argv[1], "get")) {
argv++, argc--;
/* Some simple checks. */
bool found = false;
+ bool warnonremove = false;
for(int i = 0; variables[i].name; i++) {
if(strcasecmp(variables[i].name, variable))
/* Should this go into our own host config file? */
if(!node && !(variables[i].type & VAR_SERVER)) {
- node = get_my_name();
+ node = get_my_name(true);
if(!node)
return 1;
}
+ /* Change "add" into "set" for variables that do not allow multiple occurences.
+ Turn on warnings when it seems variables might be removed unintentionally. */
+
+ if(action == 1 && !(variables[i].type & VAR_MULTIPLE)) {
+ warnonremove = true;
+ action = 0;
+ } else if(action == 0 && (variables[i].type & VAR_MULTIPLE)) {
+ warnonremove = true;
+ }
+
break;
}
}
// Open the right configuration file.
- char *filename;
+ char filename[PATH_MAX];
if(node)
- xasprintf(&filename, "%s" SLASH "%s", hosts_dir, node);
+ snprintf(filename, sizeof filename, "%s" SLASH "%s", hosts_dir, node);
else
- filename = tinc_conf;
+ snprintf(filename, sizeof filename, "%s", tinc_conf);
FILE *f = fopen(filename, "r");
if(!f) {
- if(action < 0 || errno != ENOENT) {
- fprintf(stderr, "Could not open configuration file %s: %s\n", filename, strerror(errno));
- return 1;
- }
-
- // If it doesn't exist, create it.
- f = fopen(filename, "a+");
- if(!f) {
- fprintf(stderr, "Could not create configuration file %s: %s\n", filename, strerror(errno));
- return 1;
- } else {
- fprintf(stderr, "Created configuration file %s.\n", filename);
- }
+ fprintf(stderr, "Could not open configuration file %s: %s\n", filename, strerror(errno));
+ return 1;
}
- char *tmpfile = NULL;
+ char tmpfile[PATH_MAX];
FILE *tf = NULL;
if(action >= -1) {
- xasprintf(&tmpfile, "%s.config.tmp", filename);
+ snprintf(tmpfile, sizeof tmpfile, "%s.config.tmp", filename);
tf = fopen(tmpfile, "w");
if(!tf) {
fprintf(stderr, "Could not open temporary file %s: %s\n", tmpfile, strerror(errno));
}
// Set
} else if(action == 0) {
+ // Warn if "set" was used for variables that can occur multiple times
+ if(warnonremove && strcasecmp(bvalue, value))
+ fprintf(stderr, "Warning: removing %s = %s\n", variable, bvalue);
+
// Already set? Delete the rest...
if(set)
continue;
+
// Otherwise, replace.
if(fprintf(tf, "%s = %s\n", variable, value) < 0) {
fprintf(stderr, "Error writing to temporary file %s: %s\n", tmpfile, strerror(errno));
}
set = true;
continue;
+ // Add
+ } else if(action > 0) {
+ // Check if we've already seen this variable with the same value
+ if(!strcasecmp(bvalue, value))
+ found = true;
}
}
}
// Add new variable if necessary.
- if(action > 0 || (action == 0 && !set)) {
+ if((action > 0 && !found)|| (action == 0 && !set)) {
if(fprintf(tf, "%s = %s\n", variable, value) < 0) {
fprintf(stderr, "Error writing to temporary file %s: %s\n", tmpfile, strerror(errno));
return 1;
}
if(action < -1) {
- if(!found)
+ if(found) {
+ return 0;
+ } else {
fprintf(stderr, "No matching configuration variables found.\n");
- return 0;
+ return 1;
+ }
}
// Make sure we wrote everything...
if(action < 0 && !removed) {
remove(tmpfile);
fprintf(stderr, "No configuration variables deleted.\n");
- return *value;
+ return 1;
}
// Replace the configuration file with the new one
return 0;
}
-bool check_id(const char *name) {
- if(!name || !*name)
+static bool try_bind(int port) {
+ struct addrinfo *ai = NULL, *aip;
+ struct addrinfo hint = {
+ .ai_flags = AI_PASSIVE,
+ .ai_family = AF_UNSPEC,
+ .ai_socktype = SOCK_STREAM,
+ .ai_protocol = IPPROTO_TCP,
+ };
+
+ bool success = true;
+ char portstr[16];
+ snprintf(portstr, sizeof portstr, "%d", port);
+
+ if(getaddrinfo(NULL, portstr, &hint, &ai) || !ai)
return false;
- for(int i = 0; i < strlen(name); i++) {
- if(!isalnum(name[i]) && name[i] != '_')
- return false;
+ for(aip = ai; aip; aip = aip->ai_next) {
+ int fd = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
+ if(!fd) {
+ success = false;
+ break;
+ }
+
+ int result = bind(fd, ai->ai_addr, ai->ai_addrlen);
+ closesocket(fd);
+ if(result) {
+ success = false;
+ break;
+ }
}
- return true;
+ freeaddrinfo(ai);
+ return success;
+}
+
+int check_port(char *name) {
+ if(try_bind(655))
+ return 655;
+
+ fprintf(stderr, "Warning: could not bind to port 655. ");
+
+ for(int i = 0; i < 100; i++) {
+ int port = 0x1000 + (rand() & 0x7fff);
+ if(try_bind(port)) {
+ char filename[PATH_MAX];
+ snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+ FILE *f = fopen(filename, "a");
+ if(!f) {
+ fprintf(stderr, "Could not open %s: %s\n", filename, strerror(errno));
+ fprintf(stderr, "Please change tinc's Port manually.\n");
+ return 0;
+ }
+
+ fprintf(f, "Port = %d\n", port);
+ fclose(f);
+ fprintf(stderr, "Tinc will instead listen on port %d.\n", port);
+ return port;
+ }
+ }
+
+ fprintf(stderr, "Please change tinc's Port manually.\n");
+ return 0;
}
static int cmd_init(int argc, char *argv[]) {
} else if(argc < 2) {
if(tty) {
char buf[1024];
- fprintf(stdout, "Enter the Name you want your tinc node to have: ");
- fflush(stdout);
+ fprintf(stderr, "Enter the Name you want your tinc node to have: ");
if(!fgets(buf, sizeof buf, stdin)) {
fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno));
return 1;
return 1;
}
- if(mkdir(confdir, 0755) && errno != EEXIST) {
- fprintf(stderr, "Could not create directory %s: %s\n", CONFDIR, strerror(errno));
+ if(!confbase_given && mkdir(confdir, 0755) && errno != EEXIST) {
+ fprintf(stderr, "Could not create directory %s: %s\n", confdir, strerror(errno));
return 1;
}
- if(mkdir(confbase, 0755) && errno != EEXIST) {
+ if(mkdir(confbase, 0777) && errno != EEXIST) {
fprintf(stderr, "Could not create directory %s: %s\n", confbase, strerror(errno));
return 1;
}
- if(mkdir(hosts_dir, 0755) && errno != EEXIST) {
+ if(mkdir(hosts_dir, 0777) && errno != EEXIST) {
fprintf(stderr, "Could not create directory %s: %s\n", hosts_dir, strerror(errno));
return 1;
}
fprintf(f, "Name = %s\n", name);
fclose(f);
- if(!rsa_keygen(2048, false) || !ecdsa_keygen(false))
+#ifndef DISABLE_LEGACY
+ if(!rsa_keygen(2048, false))
+ return 1;
+#endif
+
+ if(!ed25519_keygen(false))
return 1;
+ check_port(name);
+
#ifndef HAVE_MINGW
- char *filename;
- xasprintf(&filename, "%s" SLASH "tinc-up", confbase);
+ char filename[PATH_MAX];
+ snprintf(filename, sizeof filename, "%s" SLASH "tinc-up", confbase);
if(access(filename, F_OK)) {
- FILE *f = fopen(filename, "w");
+ FILE *f = fopenmask(filename, "w", 0777);
if(!f) {
fprintf(stderr, "Could not create file %s: %s\n", filename, strerror(errno));
return 1;
}
- fchmod(fileno(f), 0755);
- fprintf(f, "#!/bin/sh\n\necho 'Unconfigured tinc-up script, please edit!'\n\n#ifconfig $INTERFACE <your vpn IP address> netmask <netmask of whole VPN>\n");
+ fprintf(f, "#!/bin/sh\n\necho 'Unconfigured tinc-up script, please edit '$0'!'\n\n#ifconfig $INTERFACE <your vpn IP address> netmask <netmask of whole VPN>\n");
fclose(f);
}
#endif
}
static int cmd_generate_keys(int argc, char *argv[]) {
+#ifdef DISABLE_LEGACY
+ if(argc > 1) {
+#else
if(argc > 2) {
+#endif
fprintf(stderr, "Too many arguments!\n");
return 1;
}
- return !(rsa_keygen(argc > 1 ? atoi(argv[1]) : 2048, true) && ecdsa_keygen(true));
+ if(!name)
+ name = get_my_name(false);
+
+#ifndef DISABLE_LEGACY
+ if(!rsa_keygen(argc > 1 ? atoi(argv[1]) : 2048, true))
+ return 1;
+#endif
+
+ if(!ed25519_keygen(true))
+ return 1;
+
+ return 0;
}
+#ifndef DISABLE_LEGACY
static int cmd_generate_rsa_keys(int argc, char *argv[]) {
if(argc > 2) {
fprintf(stderr, "Too many arguments!\n");
return 1;
}
+ if(!name)
+ name = get_my_name(false);
+
return !rsa_keygen(argc > 1 ? atoi(argv[1]) : 2048, true);
}
+#endif
-static int cmd_generate_ecdsa_keys(int argc, char *argv[]) {
+static int cmd_generate_ed25519_keys(int argc, char *argv[]) {
if(argc > 1) {
fprintf(stderr, "Too many arguments!\n");
return 1;
}
- return !ecdsa_keygen(true);
+ if(!name)
+ name = get_my_name(false);
+
+ return !ed25519_keygen(true);
}
static int cmd_help(int argc, char *argv[]) {
return 1;
}
- char *filename = NULL;
+ char filename[PATH_MAX] = "";
if(strncmp(argv[1], "hosts" SLASH, 6)) {
for(int i = 0; conffiles[i]; i++) {
if(!strcmp(argv[1], conffiles[i])) {
- xasprintf(&filename, "%s" SLASH "%s", confbase, argv[1]);
+ snprintf(filename, sizeof filename, "%s" SLASH "%s", confbase, argv[1]);
break;
}
}
argv[1] += 6;
}
- if(!filename) {
- xasprintf(&filename, "%s" SLASH "%s", hosts_dir, argv[1]);
+ if(!*filename) {
+ snprintf(filename, sizeof filename, "%s" SLASH "%s", hosts_dir, argv[1]);
char *dash = strchr(argv[1], '-');
if(dash) {
*dash++ = 0;
xasprintf(&command, "edit \"%s\"", filename);
#endif
int result = system(command);
+ free(command);
if(result)
return result;
}
static int export(const char *name, FILE *out) {
- char *filename;
- xasprintf(&filename, "%s" SLASH "%s", hosts_dir, name);
+ char filename[PATH_MAX];
+ snprintf(filename, sizeof filename, "%s" SLASH "%s", hosts_dir, name);
FILE *in = fopen(filename, "r");
if(!in) {
fprintf(stderr, "Could not open configuration file %s: %s\n", filename, strerror(errno));
return 1;
}
- char *name = get_my_name();
+ char *name = get_my_name(true);
if(!name)
return 1;
int result = export(name, stdout);
if(!tty)
fclose(stdout);
+
+ free(name);
return result;
}
char buf[4096];
char name[4096];
- char *filename = NULL;
+ char filename[PATH_MAX] = "";
int count = 0;
bool firstline = true;
if(out)
fclose(out);
- free(filename);
- xasprintf(&filename, "%s" SLASH "%s", hosts_dir, name);
+ snprintf(filename, sizeof filename, "%s" SLASH "%s", hosts_dir, name);
if(!force && !access(filename, F_OK)) {
fprintf(stderr, "Host configuration file %s already exists, skipping.\n", filename);
return cmd_export_all(argc, argv) ?: cmd_import(argc, argv);
}
+static int switch_network(char *name) {
+ if(fd >= 0) {
+ close(fd);
+ fd = -1;
+ }
+
+ free(confbase);
+ confbase = NULL;
+ free(pidfilename);
+ pidfilename = NULL;
+ free(logfilename);
+ logfilename = NULL;
+ free(unixsocketname);
+ unixsocketname = NULL;
+ free(tinc_conf);
+ free(hosts_dir);
+ free(prompt);
+
+ free(netname);
+ netname = strcmp(name, ".") ? xstrdup(name) : NULL;
+
+ xasprintf(&tinc_conf, "%s" SLASH "tinc.conf", confbase);
+ xasprintf(&hosts_dir, "%s" SLASH "hosts", confbase);
+ xasprintf(&prompt, "%s> ", identname);
+
+ return 0;
+}
+
+static int cmd_network(int argc, char *argv[]) {
+ if(argc > 2) {
+ fprintf(stderr, "Too many arguments!\n");
+ return 1;
+ }
+
+ if(argc == 2)
+ return switch_network(argv[1]);
+
+ DIR *dir = opendir(confdir);
+ if(!dir) {
+ fprintf(stderr, "Could not read directory %s: %s\n", confdir, strerror(errno));
+ return 1;
+ }
+
+ struct dirent *ent;
+ while((ent = readdir(dir))) {
+ if(*ent->d_name == '.')
+ continue;
+
+ if(!strcmp(ent->d_name, "tinc.conf")) {
+ printf(".\n");
+ continue;
+ }
+
+ char fname[PATH_MAX];
+ snprintf(fname, sizeof fname, "%s/%s/tinc.conf", confdir, ent->d_name);
+ if(!access(fname, R_OK))
+ printf("%s\n", ent->d_name);
+ }
+
+ closedir(dir);
+
+ return 0;
+}
+
+static int cmd_fsck(int argc, char *argv[]) {
+ if(argc > 1) {
+ fprintf(stderr, "Too many arguments!\n");
+ return 1;
+ }
+
+ return fsck(orig_argv[0]);
+}
+
+static void *readfile(FILE *in, size_t *len) {
+ size_t count = 0;
+ size_t alloced = 4096;
+ char *buf = xmalloc(alloced);
+
+ while(!feof(in)) {
+ size_t read = fread(buf + count, 1, alloced - count, in);
+ if(!read)
+ break;
+ count += read;
+ if(count >= alloced) {
+ alloced *= 2;
+ buf = xrealloc(buf, alloced);
+ }
+ }
+
+ if(len)
+ *len = count;
+
+ return buf;
+}
+
+static int cmd_sign(int argc, char *argv[]) {
+ if(argc > 2) {
+ fprintf(stderr, "Too many arguments!\n");
+ return 1;
+ }
+
+ if(!name) {
+ name = get_my_name(true);
+ if(!name)
+ return 1;
+ }
+
+ char fname[PATH_MAX];
+ snprintf(fname, sizeof fname, "%s" SLASH "ed25519_key.priv", confbase);
+ FILE *fp = fopen(fname, "r");
+ if(!fp) {
+ fprintf(stderr, "Could not open %s: %s\n", fname, strerror(errno));
+ return 1;
+ }
+
+ ecdsa_t *key = ecdsa_read_pem_private_key(fp);
+
+ if(!key) {
+ fprintf(stderr, "Could not read private key from %s\n", fname);
+ fclose(fp);
+ return 1;
+ }
+
+ fclose(fp);
+
+ FILE *in;
+
+ if(argc == 2) {
+ in = fopen(argv[1], "rb");
+ if(!in) {
+ fprintf(stderr, "Could not open %s: %s\n", argv[1], strerror(errno));
+ ecdsa_free(key);
+ return 1;
+ }
+ } else {
+ in = stdin;
+ }
+
+ size_t len;
+ char *data = readfile(in, &len);
+ if(in != stdin)
+ fclose(in);
+ if(!data) {
+ fprintf(stderr, "Error reading %s: %s\n", argv[1], strerror(errno));
+ ecdsa_free(key);
+ return 1;
+ }
+
+ // Ensure we sign our name and current time as well
+ long t = time(NULL);
+ char *trailer;
+ xasprintf(&trailer, " %s %ld", name, t);
+ int trailer_len = strlen(trailer);
+
+ data = xrealloc(data, len + trailer_len);
+ memcpy(data + len, trailer, trailer_len);
+ free(trailer);
+
+ char sig[87];
+ if(!ecdsa_sign(key, data, len + trailer_len, sig)) {
+ fprintf(stderr, "Error generating signature\n");
+ free(data);
+ ecdsa_free(key);
+ return 1;
+ }
+ b64encode(sig, sig, 64);
+ ecdsa_free(key);
+
+ fprintf(stdout, "Signature = %s %ld %s\n", name, t, sig);
+ fwrite(data, len, 1, stdout);
+
+ free(data);
+ return 0;
+}
+
+static int cmd_verify(int argc, char *argv[]) {
+ if(argc < 2) {
+ fprintf(stderr, "Not enough arguments!\n");
+ return 1;
+ }
+
+ if(argc > 3) {
+ fprintf(stderr, "Too many arguments!\n");
+ return 1;
+ }
+
+ char *node = argv[1];
+ if(!strcmp(node, ".")) {
+ if(!name) {
+ name = get_my_name(true);
+ if(!name)
+ return 1;
+ }
+ node = name;
+ } else if(!strcmp(node, "*")) {
+ node = NULL;
+ } else {
+ if(!check_id(node)) {
+ fprintf(stderr, "Invalid node name\n");
+ return 1;
+ }
+ }
+
+ FILE *in;
+
+ if(argc == 3) {
+ in = fopen(argv[2], "rb");
+ if(!in) {
+ fprintf(stderr, "Could not open %s: %s\n", argv[2], strerror(errno));
+ return 1;
+ }
+ } else {
+ in = stdin;
+ }
+
+ size_t len;
+ char *data = readfile(in, &len);
+ if(in != stdin)
+ fclose(in);
+ if(!data) {
+ fprintf(stderr, "Error reading %s: %s\n", argv[1], strerror(errno));
+ return 1;
+ }
+
+ char *newline = memchr(data, '\n', len);
+ if(!newline || (newline - data > MAX_STRING_SIZE - 1)) {
+ fprintf(stderr, "Invalid input\n");
+ return 1;
+ }
+
+ *newline++ = '\0';
+
+ char signer[MAX_STRING_SIZE] = "";
+ char sig[MAX_STRING_SIZE] = "";
+ long t = 0;
+
+ if(sscanf(data, "Signature = %s %ld %s", signer, &t, sig) != 3 || strlen(sig) != 86 || !t || !check_id(signer)) {
+ fprintf(stderr, "Invalid input\n");
+ return 1;
+ }
+
+ if(node && strcmp(node, signer)) {
+ fprintf(stderr, "Signature is not made by %s\n", node);
+ return 1;
+ }
+
+ if(!node)
+ node = signer;
+
+ char *trailer;
+ xasprintf(&trailer, " %s %ld", signer, t);
+ int trailer_len = strlen(trailer);
+
+ data = xrealloc(data, len + trailer_len);
+ memcpy(data + len, trailer, trailer_len);
+ free(trailer);
+
+ char fname[PATH_MAX];
+ snprintf(fname, sizeof fname, "%s" SLASH "hosts" SLASH "%s", confbase, node);
+ FILE *fp = fopen(fname, "r");
+ if(!fp) {
+ fprintf(stderr, "Could not open %s: %s\n", fname, strerror(errno));
+ free(data);
+ return 1;
+ }
+
+ ecdsa_t *key = get_pubkey(fp);
+ if(!key) {
+ rewind(fp);
+ key = ecdsa_read_pem_public_key(fp);
+ }
+ if(!key) {
+ fprintf(stderr, "Could not read public key from %s\n", fname);
+ fclose(fp);
+ free(data);
+ return 1;
+ }
+
+ fclose(fp);
+
+ if(b64decode(sig, sig, 86) != 64 || !ecdsa_verify(key, newline, len + trailer_len - (newline - data), sig)) {
+ fprintf(stderr, "Invalid signature\n");
+ free(data);
+ ecdsa_free(key);
+ return 1;
+ }
+
+ ecdsa_free(key);
+
+ fwrite(newline, len - (newline - data), 1, stdout);
+
+ free(data);
+ return 0;
+}
+
static const struct {
const char *command;
int (*function)(int argc, char *argv[]);
+ bool hidden;
} commands[] = {
{"start", cmd_start},
{"stop", cmd_stop},
{"restart", cmd_restart},
{"reload", cmd_reload},
{"dump", cmd_dump},
+ {"list", cmd_dump},
{"purge", cmd_purge},
{"debug", cmd_debug},
{"retry", cmd_retry},
{"pcap", cmd_pcap},
{"log", cmd_log},
{"pid", cmd_pid},
- {"config", cmd_config},
+ {"config", cmd_config, true},
+ {"add", cmd_config},
+ {"del", cmd_config},
+ {"get", cmd_config},
+ {"set", cmd_config},
{"init", cmd_init},
{"generate-keys", cmd_generate_keys},
+#ifndef DISABLE_LEGACY
{"generate-rsa-keys", cmd_generate_rsa_keys},
- {"generate-ecdsa-keys", cmd_generate_ecdsa_keys},
+#endif
+ {"generate-ed25519-keys", cmd_generate_ed25519_keys},
{"help", cmd_help},
{"version", cmd_version},
{"info", cmd_info},
{"import", cmd_import},
{"exchange", cmd_exchange},
{"exchange-all", cmd_exchange_all},
+ {"invite", cmd_invite},
+ {"join", cmd_join},
+ {"network", cmd_network},
+ {"fsck", cmd_fsck},
+ {"sign", cmd_sign},
+ {"verify", cmd_verify},
{NULL, NULL},
};
i++;
while(commands[i].command) {
- if(!strncasecmp(commands[i].command, text, strlen(text)))
+ if(!commands[i].hidden && !strncasecmp(commands[i].command, text, strlen(text)))
return xstrdup(commands[i].command);
i++;
}
}
static char *complete_config(const char *text, int state) {
- const char *sub[] = {"get", "set", "add", "del"};
static int i;
- if(!state) {
+
+ if(!state)
i = 0;
- if(!strchr(rl_line_buffer + 7, ' '))
- i = -4;
- else {
- bool found = false;
- for(int i = 0; i < 4; i++) {
- if(!strncasecmp(rl_line_buffer + 7, sub[i], strlen(sub[i])) && rl_line_buffer[7 + strlen(sub[i])] == ' ') {
- found = true;
- break;
- }
- }
- if(!found)
- return NULL;
- }
- } else {
+ else
i++;
- }
- while(i < 0 || variables[i].name) {
- if(i < 0 && !strncasecmp(sub[i + 4], text, strlen(text)))
- return xstrdup(sub[i + 4]);
- if(i >= 0) {
- char *dot = strchr(text, '.');
- if(dot) {
- if((variables[i].type & VAR_HOST) && !strncasecmp(variables[i].name, dot + 1, strlen(dot + 1))) {
- char *match;
- xasprintf(&match, "%.*s.%s", dot - text, text, variables[i].name);
- return match;
- }
- } else {
- if(!strncasecmp(variables[i].name, text, strlen(text)))
- return xstrdup(variables[i].name);
+ while(variables[i].name) {
+ char *dot = strchr(text, '.');
+ if(dot) {
+ if((variables[i].type & VAR_HOST) && !strncasecmp(variables[i].name, dot + 1, strlen(dot + 1))) {
+ char *match;
+ xasprintf(&match, "%.*s.%s", (int)(dot - text), text, variables[i].name);
+ return match;
}
+ } else {
+ if(!strncasecmp(variables[i].name, text, strlen(text)))
+ return xstrdup(variables[i].name);
}
i++;
}
matches = rl_completion_matches(text, complete_command);
else if(!strncasecmp(rl_line_buffer, "dump ", 5))
matches = rl_completion_matches(text, complete_dump);
- else if(!strncasecmp(rl_line_buffer, "config ", 7))
+ else if(!strncasecmp(rl_line_buffer, "add ", 4))
+ matches = rl_completion_matches(text, complete_config);
+ else if(!strncasecmp(rl_line_buffer, "del ", 4))
+ matches = rl_completion_matches(text, complete_config);
+ else if(!strncasecmp(rl_line_buffer, "get ", 4))
+ matches = rl_completion_matches(text, complete_config);
+ else if(!strncasecmp(rl_line_buffer, "set ", 4))
matches = rl_completion_matches(text, complete_config);
else if(!strncasecmp(rl_line_buffer, "info ", 5))
matches = rl_completion_matches(text, complete_info);
#endif
static int cmd_shell(int argc, char *argv[]) {
- char *prompt;
xasprintf(&prompt, "%s> ", identname);
int result = 0;
char buf[4096];
program_name = argv[0];
orig_argv = argv;
orig_argc = argc;
+ tty = isatty(0) && isatty(1);
if(!parse_options(argc, argv))
return 1;
- make_names();
+ make_names(false);
xasprintf(&tinc_conf, "%s" SLASH "tinc.conf", confbase);
xasprintf(&hosts_dir, "%s" SLASH "hosts", confbase);
return 0;
}
- tty = isatty(0) && isatty(1);
+#ifdef HAVE_MINGW
+ static struct WSAData wsa_state;
+
+ if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) {
+ fprintf(stderr, "System call `%s' failed: %s", "WSAStartup", winerror(GetLastError()));
+ return false;
+ }
+#endif
+
+ srand(time(NULL));
+ crypto_init();
if(optind >= argc)
return cmd_shell(argc, argv);
projects / tinc / blobdiff