#include "protocol.h"
#include "control_common.h"
#include "ecdsagen.h"
+#include "info.h"
#include "rsagen.h"
#include "utils.h"
#include "tincctl.h"
static char controlcookie[1024];
char *netname = NULL;
char *confbase = NULL;
+static char *tinc_conf = NULL;
+static char *hosts_dir = NULL;
// Horrible global variables...
static int pid = 0;
static int code;
static int req;
static int result;
+static bool force = false;
#ifdef HAVE_MINGW
static struct WSAData wsa_state;
static struct option const long_options[] = {
{"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},
{NULL, 0, NULL, 0}
};
"\n"
"Valid commands are:\n"
" init [name] Create initial configuration files.\n"
- " start Start tincd.\n"
+ " config Change configuration:\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"
" reload Partially reload configuration of running tincd.\n"
" subnets - all known subnets in the VPN\n"
" connections - all meta connections with ourself\n"
" graph - graph of the VPN in dotty format\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"
" retry Retry all outgoing connections\n"
#endif
" pcap [snaplen] Dump traffic in pcap format [up to snaplen bytes per packet]\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"
"\n");
printf("Report bugs to tinc@tinc-vpn.org.\n");
}
int r;
int option_index = 0;
- while((r = getopt_long(argc, argv, "c:n:", long_options, &option_index)) != EOF) {
+ while((r = getopt_long(argc, argv, "c:n:Dd::Lo:RU:", long_options, &option_index)) != EOF) {
switch (r) {
case 0: /* long option */
break;
pidfilename = xstrdup(optarg);
break;
+ case 6:
+ force = true;
+ break;
+
case '?':
usage(true);
return false;
if(!pidfilename)
xasprintf(&pidfilename, "%s/pid", confbase);
RegCloseKey(key);
- if(*installdir)
- return;
}
+
+ if(!*installdir) {
#endif
if(!pidfilename)
if(!confbase)
xasprintf(&confbase, CONFDIR "/tinc");
}
+
+#ifdef HAVE_MINGW
+ }
+#endif
+
+ xasprintf(&tinc_conf, "%s/tinc.conf", confbase);
+ xasprintf(&hosts_dir, "%s/hosts", confbase);
}
static char buffer[4096];
static int cmd_start(int argc, char *argv[]) {
int i, j;
char *c;
+
+ argc += optind;
+ argv -= optind;
char *slash = strrchr(argv[0], '/');
#ifdef HAVE_MINGW
return 1;
}
+ if(!connect_tincd())
+ return 1;
+
bool do_graph = false;
if(!strcasecmp(argv[1], "nodes"))
return 1;
}
- if(!connect_tincd())
- return 1;
-
if(do_graph)
printf("digraph {\n");
return 1;
}
+ if(!check_id(argv[2])) {
+ fprintf(stderr, "Invalid name for node.\n");
+ return 1;
+ }
+
if(!connect_tincd())
return 1;
return 1;
}
+ if(!check_id(argv[2])) {
+ fprintf(stderr, "Invalid name for node.\n");
+ return 1;
+ }
+
if(!connect_tincd())
return 1;
return 0;
}
+static 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() {
+ FILE *f = fopen(tinc_conf, "r");
+ if(!f) {
+ fprintf(stderr, "Could not open %s: %s\n", tinc_conf, strerror(errno));
+ return NULL;
+ }
+
+ 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, "Name"))
+ continue;
+ if(*value) {
+ fclose(f);
+ return strdup(value);
+ }
+ }
+
+ fclose(f);
+ fprintf(stderr, "Could not find Name in %s.\n", tinc_conf);
+ return NULL;
+}
+
+static char *hostvariables[] = {
+ "Address",
+ "Port",
+ "PublicKey",
+ "Subnet",
+ NULL,
+};
+
+static int cmd_config(int argc, char *argv[]) {
+ if(argc < 2) {
+ fprintf(stderr, "Invalid number of arguments.\n");
+ return 1;
+ }
+
+ int action = 0;
+ if(!strcasecmp(argv[1], "add")) {
+ argv++, argc--, action = 1;
+ } else if(!strcasecmp(argv[1], "del")) {
+ argv++, argc--, action = -1;
+ } else if(!strcasecmp(argv[1], "replace") || !strcasecmp(argv[1], "set") || !strcasecmp(argv[1], "change")) {
+ argv++, argc--, action = 0;
+ }
+
+ if(argc < 2) {
+ fprintf(stderr, "Invalid number of arguments.\n");
+ return 1;
+ }
+
+ // Concatenate the rest of the command line
+ strncpy(line, argv[1], sizeof line - 1);
+ for(int i = 2; i < argc; i++) {
+ strncat(line, " ", sizeof line - 1 - strlen(line));
+ strncat(line, argv[i], sizeof line - 1 - strlen(line));
+ }
+
+ // Liberal parsing into node name, variable name and value.
+ char *node = NULL;
+ char *variable;
+ char *value;
+ int len;
+
+ len = strcspn(line, "\t =");
+ value = line + len;
+ value += strspn(value, "\t ");
+ if(*value == '=') {
+ value++;
+ value += strspn(value, "\t ");
+ }
+ line[len] = '\0';
+ variable = strchr(line, '.');
+ if(variable) {
+ node = line;
+ *variable++ = 0;
+ } else {
+ variable = line;
+ }
+
+ if(!*variable) {
+ fprintf(stderr, "No variable given.\n");
+ return 1;
+ }
+
+ if(action >= 0 && !*value) {
+ fprintf(stderr, "No value for variable given.\n");
+ return 1;
+ }
+
+ // Should this go into our own host config file?
+ if(!node) {
+ for(int i = 0; hostvariables[i]; i++) {
+ if(!strcasecmp(hostvariables[i], variable)) {
+ node = get_my_name();
+ if(!node)
+ return 1;
+ break;
+ }
+ }
+ }
+
+ if(node && !check_id(node)) {
+ fprintf(stderr, "Invalid name for node.\n");
+ return 1;
+ }
+
+ // Open the right configuration file.
+ char *filename;
+ if(node)
+ xasprintf(&filename, "%s/%s", hosts_dir, node);
+ else
+ filename = 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);
+ }
+ }
+
+ char *tmpfile;
+ xasprintf(&tmpfile, "%s.config.tmp", filename);
+ FILE *tf = fopen(tmpfile, "w");
+ if(!tf) {
+ fprintf(stderr, "Could not open temporary file %s: %s\n", tmpfile, strerror(errno));
+ return 1;
+ }
+
+ // Copy the file, making modifications on the fly.
+ char buf1[4096];
+ char buf2[4096];
+ bool set = false;
+ bool removed = false;
+
+ while(fgets(buf1, sizeof buf1, f)) {
+ buf1[sizeof buf1 - 1] = 0;
+ strcpy(buf2, buf1);
+
+ // Parse line in a simple way
+ char *bvalue;
+ int len;
+
+ len = strcspn(buf2, "\t =");
+ bvalue = buf2 + len;
+ bvalue += strspn(bvalue, "\t ");
+ if(*bvalue == '=') {
+ bvalue++;
+ bvalue += strspn(bvalue, "\t ");
+ }
+ rstrip(bvalue);
+ buf2[len] = '\0';
+
+ // Did it match?
+ if(!strcasecmp(buf2, variable)) {
+ // Del
+ if(action < 0) {
+ if(!*value || !strcasecmp(bvalue, value)) {
+ removed = true;
+ continue;
+ }
+ // Set
+ } else if(action == 0) {
+ // 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));
+ return 1;
+ }
+ set = true;
+ continue;
+ }
+ }
+
+ // Copy original line...
+ if(fputs(buf1, tf) < 0) {
+ fprintf(stderr, "Error writing to temporary file %s: %s\n", tmpfile, strerror(errno));
+ return 1;
+ }
+ }
+
+ // Make sure we read everything...
+ if(ferror(f) || !feof(f)) {
+ fprintf(stderr, "Error while reading from configuration file %s: %s\n", filename, strerror(errno));
+ return 1;
+ }
+
+ if(fclose(f)) {
+ fprintf(stderr, "Error closing configuration file %s: %s\n", filename, strerror(errno));
+ return 1;
+ }
+
+ // Add new variable if necessary.
+ if(action > 0 || (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;
+ }
+ }
+
+ // Make sure we wrote everything...
+ if(fclose(tf)) {
+ fprintf(stderr, "Error closing temporary file %s: %s\n", tmpfile, strerror(errno));
+ return 1;
+ }
+
+ // Could we find what we had to remove?
+ if(action < 0 && !removed) {
+ remove(tmpfile);
+ fprintf(stderr, "No configuration variables deleted.\n");
+ return *value;
+ }
+
+ // Replace the configuration file with the new one
+#ifdef HAVE_MINGW
+ if(remove(filename)) {
+ fprintf(stderr, "Error replacing file %s: %s\n", filename, strerror(errno));
+ return 1;
+ }
+#endif
+ if(rename(tmpfile, filename)) {
+ fprintf(stderr, "Error renaming temporary file %s to configuration file %s: %s\n", tmpfile, filename, strerror(errno));
+ return 1;
+ }
+
+ // Silently try notifying a running tincd of changes.
+ fclose(stderr);
+
+ if(connect_tincd())
+ sendline(fd, "%d %d", CONTROL, REQ_RELOAD);
+
+ return 0;
+}
+
+bool check_id(const char *name) {
+ for(int i = 0; i < strlen(name); i++) {
+ if(!isalnum(name[i]) && name[i] != '_')
+ return false;
+ }
+
+ return true;
+}
+
static int cmd_init(int argc, char *argv[]) {
- char *tinc_conf = NULL;
- xasprintf(&tinc_conf, "%s/tinc.conf", confbase);
- if(!access(confbase, F_OK)) {
+ if(!access(tinc_conf, F_OK)) {
fprintf(stderr, "Configuration file %s already exists!\n", tinc_conf);
return 1;
}
- if(optind >= argc - 1) {
+ if(argc < 2) {
if(isatty(0) && isatty(1)) {
char buf[1024];
fprintf(stdout, "Enter the Name you want your tinc node to have: ");
fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno));
return 1;
}
- int len = strlen(buf);
- if(len)
- buf[--len] = 0;
+ int len = rstrip(buf);
if(!len) {
fprintf(stderr, "No name given!\n");
return 1;
return 1;
}
} else {
- name = strdup(argv[optind + 1]);
+ name = strdup(argv[1]);
if(!*name) {
fprintf(stderr, "No Name given!\n");
return 1;
}
}
- for(int i = 0; i < strlen(name); i++) {
- if(!isalnum(name[i]) && name[i] != '_') {
- fprintf(stderr, "Invalid Name! Only a-z, A-Z, 0-9 and _ are allowed characters.\n");
- return 1;
- }
+ if(!check_id(name)) {
+ fprintf(stderr, "Invalid Name! Only a-z, A-Z, 0-9 and _ are allowed characters.\n");
+ return 1;
}
if(mkdir(CONFDIR, 0755) && errno != EEXIST) {
return 0;
}
+static int cmd_info(int argc, char *argv[]) {
+ if(argc != 2) {
+ fprintf(stderr, "Invalid number of arguments.\n");
+ return 1;
+ }
+
+ if(!connect_tincd())
+ return 1;
+
+ return info(fd, argv[1]);
+}
+
+static const char *conffiles[] = {
+ "tinc.conf",
+ "tinc-up",
+ "tinc-down",
+ "subnet-up",
+ "subnet-down",
+ "host-up",
+ "host-down",
+ NULL,
+};
+
+static int cmd_edit(int argc, char *argv[]) {
+ if(argc != 2) {
+ fprintf(stderr, "Invalid number of arguments.\n");
+ return 1;
+ }
+
+ char *filename = NULL;
+
+ if(strncmp(argv[1], "hosts/", 6)) {
+ for(int i = 0; conffiles[i]; i++) {
+ if(!strcmp(argv[1], conffiles[i])) {
+ xasprintf(&filename, "%s/%s", confbase, argv[1]);
+ break;
+ }
+ }
+ } else {
+ argv[1] += 6;
+ }
+
+ if(!filename) {
+ xasprintf(&filename, "%s/%s", hosts_dir, argv[1]);
+ char *dash = strchr(argv[1], '-');
+ if(dash) {
+ *dash++ = 0;
+ if((strcmp(dash, "up") && strcmp(dash, "down")) || !check_id(argv[1])) {
+ fprintf(stderr, "Invalid configuration filename.\n");
+ return 1;
+ }
+ }
+ }
+
+#ifndef HAVE_MINGW
+ char *editor = getenv("VISUAL") ?: getenv("EDITOR") ?: "vi";
+#else
+ char *editor = "edit"
+#endif
+
+ char *command;
+ xasprintf(&command, "\"%s\" \"%s\"", editor, filename);
+ int result = system(command);
+ if(result)
+ return result;
+
+ // Silently try notifying a running tincd of changes.
+ fclose(stderr);
+
+ if(connect_tincd())
+ sendline(fd, "%d %d", CONTROL, REQ_RELOAD);
+
+ return 0;
+}
+
+static int export(const char *name, FILE *out) {
+ char *filename;
+ xasprintf(&filename, "%s/%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;
+ }
+
+ fprintf(out, "Name = %s\n", name);
+ char buf[4096];
+ while(fgets(buf, sizeof buf, in))
+ fputs(buf, out);
+
+ if(ferror(in)) {
+ fprintf(stderr, "Error while reading configuration file %s: %s\n", filename, strerror(errno));
+ return 1;
+ }
+
+ fclose(in);
+ return 0;
+}
+
+static int cmd_export(int argc, char *argv[]) {
+ char *name = get_my_name();
+ if(!name)
+ return 1;
+
+ return export(name, stdout);
+}
+
+static int cmd_export_all(int argc, char *argv[]) {
+ DIR *dir = opendir(hosts_dir);
+ if(!dir) {
+ fprintf(stderr, "Could not open host configuration directory %s: %s\n", hosts_dir, strerror(errno));
+ return 1;
+ }
+
+ bool first = true;
+ int result = 0;
+ struct dirent *ent;
+
+ while((ent = readdir(dir))) {
+ if(!check_id(ent->d_name))
+ continue;
+
+ if(first)
+ first = false;
+ else
+ printf("#---------------------------------------------------------------#\n");
+
+ result |= export(ent->d_name, stdout);
+ }
+
+ closedir(dir);
+ return result;
+}
+
+static int cmd_import(int argc, char *argv[]) {
+ FILE *in = stdin;
+ FILE *out = NULL;
+
+ char buf[4096];
+ char name[4096];
+ char *filename;
+ int count = 0;
+ bool firstline = true;
+
+ while(fgets(buf, sizeof buf, in)) {
+ if(sscanf(buf, "Name = %s", name) == 1) {
+ if(!check_id(name)) {
+ fprintf(stderr, "Invalid Name in input!\n");
+ return 1;
+ }
+
+ if(out)
+ fclose(out);
+
+ free(filename);
+ xasprintf(&filename, "%s/%s", hosts_dir, name);
+
+ if(!force && !access(filename, F_OK)) {
+ fprintf(stderr, "Host configuration file %s already exists, skipping.\n", filename);
+ out = NULL;
+ continue;
+ }
+
+ out = fopen(filename, "w");
+ if(!out) {
+ fprintf(stderr, "Error creating configuration file %s: %s\n", filename, strerror(errno));
+ return 1;
+ }
+
+ count++;
+ firstline = false;
+ continue;
+ } else if(firstline) {
+ fprintf(stderr, "Junk at the beginning of the input, ignoring.\n");
+ firstline = false;
+ }
+
+
+ if(!strcmp(buf, "#---------------------------------------------------------------#\n"))
+ continue;
+
+ if(out) {
+ if(fputs(buf, out) < 0) {
+ fprintf(stderr, "Error writing to host configuration file %s: %s\n", filename, strerror(errno));
+ return 1;
+ }
+ }
+ }
+
+ if(out)
+ fclose(out);
+
+ if(count) {
+ fprintf(stderr, "Imported %d host configuration files.\n", count);
+ return 0;
+ } else {
+ fprintf(stderr, "No host configuration files imported.\n");
+ return 1;
+ }
+}
+
static const struct {
const char *command;
int (*function)(int argc, char *argv[]);
{"pcap", cmd_pcap},
{"log", cmd_log},
{"pid", cmd_pid},
+ {"config", cmd_config},
{"init", cmd_init},
{"generate-keys", cmd_generate_keys},
{"generate-rsa-keys", cmd_generate_rsa_keys},
{"generate-ecdsa-keys", cmd_generate_ecdsa_keys},
{"help", cmd_help},
{"version", cmd_version},
+ {"info", cmd_info},
+ {"edit", cmd_edit},
+ {"export", cmd_export},
+ {"export-all", cmd_export_all},
+ {"import", cmd_import},
{NULL, NULL},
};
projects / tinc / blobdiff