Simpler checking of permissions on private RSA key and other fixes.
[tinc] / src / tincd.c
index 989eb76..cec0ee5 100644 (file)
@@ -1,7 +1,7 @@
 /*
     tincd.c -- the main file for tincd
-    Copyright (C) 1998-2002 Ivo Timmermans <ivo@o2w.nl>
-                  2000-2002 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1998-2003 Ivo Timmermans <ivo@o2w.nl>
+                  2000-2003 Guus Sliepen <guus@sliepen.eu.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
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: tincd.c,v 1.10.4.69 2003/07/06 17:15:25 guus Exp $
+    $Id: tincd.c,v 1.10.4.85 2003/08/08 22:11:54 guus Exp $
 */
 
-#include "config.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <getopt.h>
-#include <signal.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <syslog.h>
-#include <unistd.h>
-#include <signal.h>
-#include <string.h>
-#include <termios.h>
+#include "system.h"
 
 /* Darwin (MacOS/X) needs the following definition... */
 #ifndef _P1003_1B_VISIBLE
 #define _P1003_1B_VISIBLE
 #endif
 
+#ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
-
-#ifdef HAVE_SYS_IOCTL_H
-# include <sys/ioctl.h>
 #endif
 
 #include <openssl/rand.h>
 
 #include <lzo1x.h>
 
-#include <utils.h>
-#include <xalloc.h>
+#include <getopt.h>
 
 #include "conf.h"
+#include "device.h"
+#include "logger.h"
 #include "net.h"
 #include "netutl.h"
 #include "process.h"
 #include "protocol.h"
-#include "subnet.h"
-
-#include "system.h"
+#include "utils.h"
+#include "xalloc.h"
 
 /* The name this program was run with. */
 char *program_name = NULL;
 
 /* If nonzero, display usage information and exit. */
-int show_help = 0;
+bool show_help = false;
 
 /* If nonzero, print the version on standard output and exit.  */
-int show_version = 0;
+bool show_version = false;
 
 /* If nonzero, it will attempt to kill a running tincd and exit. */
 int kill_tincd = 0;
@@ -80,34 +66,44 @@ int kill_tincd = 0;
 int generate_keys = 0;
 
 /* If nonzero, use null ciphers and skip all key exchanges. */
-int bypass_security = 0;
+bool bypass_security = false;
 
 /* If nonzero, disable swapping for this process. */
-int do_mlock = 0;
+bool do_mlock = false;
+
+/* If nonzero, write log entries to a separate file. */
+bool use_logfile = false;
 
 char *identname = NULL;                                /* program name for syslog */
 char *pidfilename = NULL;                      /* pid file location */
+char *logfilename = NULL;                      /* log file location */
 char **g_argv;                                 /* a copy of the cmdline arguments */
-char **environment;                            /* A pointer to the environment on
-                                                                  startup */
+
+static int status;
 
 static struct option const long_options[] = {
        {"config", required_argument, NULL, 'c'},
        {"kill", optional_argument, NULL, 'k'},
        {"net", required_argument, NULL, 'n'},
-       {"help", no_argument, &show_help, 1},
-       {"version", no_argument, &show_version, 1},
-       {"no-detach", no_argument, &do_detach, 0},
+       {"help", no_argument, NULL, 1},
+       {"version", no_argument, NULL, 2},
+       {"no-detach", no_argument, NULL, 'D'},
        {"generate-keys", optional_argument, NULL, 'K'},
        {"debug", optional_argument, NULL, 'd'},
-       {"bypass-security", no_argument, &bypass_security, 1},
-       {"mlock", no_argument, &do_mlock, 1},
+       {"bypass-security", no_argument, NULL, 3},
+       {"mlock", no_argument, NULL, 'L'},
+       {"logfile", optional_argument, NULL, 4},
+       {"pidfile", required_argument, NULL, 5},
        {NULL, 0, NULL, 0}
 };
 
-static void usage(int status)
+#ifdef HAVE_MINGW
+static struct WSAData wsa_state;
+#endif
+
+static void usage(bool status)
 {
-       if(status != 0)
+       if(status)
                fprintf(stderr, _("Try `%s --help\' for more information.\n"),
                                program_name);
        else {
@@ -119,15 +115,15 @@ static void usage(int status)
                                "  -n, --net=NETNAME          Connect to net NETNAME.\n"
                                "  -K, --generate-keys[=BITS] Generate public/private RSA keypair.\n"
                                "  -L, --mlock                Lock tinc into main memory.\n"
+                               "      --logfile[=FILENAME]   Write log entries to a logfile.\n"
+                               "      --pidfile=FILENAME     Write PID to FILENAME.\n"
                                "      --help                 Display this help and exit.\n"
                                "      --version              Output version information and exit.\n\n"));
                printf(_("Report bugs to tinc@nl.linux.org.\n"));
        }
-
-       exit(status);
 }
 
-void parse_options(int argc, char **argv, char **envp)
+static bool parse_options(int argc, char **argv)
 {
        int r;
        int option_index = 0;
@@ -138,26 +134,26 @@ void parse_options(int argc, char **argv, char **envp)
                                break;
 
                        case 'c':                               /* config file */
-                               confbase = xmalloc(strlen(optarg) + 1);
-                               strcpy(confbase, optarg);
+                               confbase = xstrdup(optarg);
                                break;
 
                        case 'D':                               /* no detach */
-                               do_detach = 0;
+                               do_detach = false;
                                break;
 
                        case 'L':                               /* no detach */
-                               do_mlock = 1;
+                               do_mlock = true;
                                break;
 
                        case 'd':                               /* inc debug level */
                                if(optarg)
-                                       debug_lvl = atoi(optarg);
+                                       debug_level = atoi(optarg);
                                else
-                                       debug_lvl++;
+                                       debug_level++;
                                break;
 
                        case 'k':                               /* kill old tincds */
+#ifndef HAVE_MINGW
                                if(optarg) {
                                        if(!strcasecmp(optarg, "HUP"))
                                                kill_tincd = SIGHUP;
@@ -181,16 +177,19 @@ void parse_options(int argc, char **argv, char **envp)
                                                if(!kill_tincd) {
                                                        fprintf(stderr, _("Invalid argument `%s'; SIGNAL must be a number or one of HUP, TERM, KILL, USR1, USR2, WINCH, INT or ALRM.\n"),
                                                                        optarg);
-                                                       usage(1);
+                                                       usage(true);
+                                                       return false;
                                                }
                                        }
                                } else
                                        kill_tincd = SIGTERM;
+#else
+                                       kill_tincd = 1;
+#endif
                                break;
 
                        case 'n':                               /* net name given */
-                               netname = xmalloc(strlen(optarg) + 1);
-                               strcpy(netname, optarg);
+                               netname = xstrdup(optarg);
                                break;
 
                        case 'K':                               /* generate public/private keypair */
@@ -200,7 +199,8 @@ void parse_options(int argc, char **argv, char **envp)
                                        if(generate_keys < 512) {
                                                fprintf(stderr, _("Invalid argument `%s'; BITS must be a number equal to or greater than 512.\n"),
                                                                optarg);
-                                               usage(1);
+                                               usage(true);
+                                               return false;
                                        }
 
                                        generate_keys &= ~7;    /* Round it to bytes */
@@ -208,18 +208,43 @@ void parse_options(int argc, char **argv, char **envp)
                                        generate_keys = 1024;
                                break;
 
+                       case 1:                                 /* show help */
+                               show_help = true;
+                               break;
+
+                       case 2:                                 /* show version */
+                               show_version = true;
+                               break;
+
+                       case 3:                                 /* bypass security */
+                               bypass_security = true;
+                               break;
+
+                       case 4:                                 /* write log entries to a file */
+                               use_logfile = true;
+                               if(optarg)
+                                       logfilename = xstrdup(optarg);
+                               break;
+
+                       case 5:                                 /* write PID to a file */
+                               pidfilename = xstrdup(optarg);
+                               break;
+
                        case '?':
-                               usage(1);
+                               usage(true);
+                               return false;
 
                        default:
                                break;
                }
        }
+
+       return true;
 }
 
 /* This function prettyprints the key generation process */
 
-void indicator(int a, int b, void *p)
+static void indicator(int a, int b, void *p)
 {
        switch (a) {
                case 0:
@@ -258,7 +283,7 @@ void indicator(int a, int b, void *p)
   Generate a public/private RSA keypair, and ask for a file to store
   them in.
 */
-int keygen(int bits)
+static bool keygen(int bits)
 {
        RSA *rsa_key;
        FILE *f;
@@ -270,74 +295,102 @@ int keygen(int bits)
 
        if(!rsa_key) {
                fprintf(stderr, _("Error during key generation!\n"));
-               return -1;
+               return false;
        } else
                fprintf(stderr, _("Done.\n"));
 
-       get_config_string(lookup_config(config_tree, "Name"), &name);
-
-       if(name)
-               asprintf(&filename, "%s/hosts/%s", confbase, name);
-       else
-               asprintf(&filename, "%s/rsa_key.pub", confbase);
-
-       f = ask_and_safe_open(filename, _("public RSA key"), "a");
+       asprintf(&filename, "%s/rsa_key.priv", confbase);
+       f = ask_and_open(filename, _("private RSA key"), "a");
 
        if(!f)
-               return -1;
-
+               return false;
+  
+#ifdef HAVE_FCHMOD
+       /* Make it unreadable for others. */
+       fchmod(fileno(f), 0600);
+#endif
+               
        if(ftell(f))
                fprintf(stderr, _("Appending key to existing contents.\nMake sure only one key is stored in the file.\n"));
 
-       PEM_write_RSAPublicKey(f, rsa_key);
+       PEM_write_RSAPrivateKey(f, rsa_key, NULL, NULL, 0, NULL, NULL);
        fclose(f);
        free(filename);
 
-       asprintf(&filename, "%s/rsa_key.priv", confbase);
-       f = ask_and_safe_open(filename, _("private RSA key"), "a");
+       get_config_string(lookup_config(config_tree, "Name"), &name);
+
+       if(name)
+               asprintf(&filename, "%s/hosts/%s", confbase, name);
+       else
+               asprintf(&filename, "%s/rsa_key.pub", confbase);
+
+       f = ask_and_open(filename, _("public RSA key"), "a");
 
        if(!f)
-               return -1;
+               return false;
 
        if(ftell(f))
                fprintf(stderr, _("Appending key to existing contents.\nMake sure only one key is stored in the file.\n"));
 
-       PEM_write_RSAPrivateKey(f, rsa_key, NULL, NULL, 0, NULL, NULL);
+       PEM_write_RSAPublicKey(f, rsa_key);
        fclose(f);
        free(filename);
 
-       return 0;
+       return true;
 }
 
 /*
   Set all files and paths according to netname
 */
-void make_names(void)
+static void make_names(void)
 {
-       if(netname) {
-               if(!pidfilename)
-                       asprintf(&pidfilename, LOCALSTATEDIR "/run/tinc.%s.pid", netname);
+#ifdef HAVE_MINGW
+       HKEY key;
+       char installdir[1024] = "";
+       long len = sizeof(installdir);
+#endif
 
+       if(netname)
+               asprintf(&identname, "tinc.%s", netname);
+       else
+               identname = xstrdup("tinc");
+
+#ifdef HAVE_MINGW
+       if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\tinc", 0, KEY_READ, &key)) {
+               if(!RegQueryValueEx(key, NULL, 0, 0, installdir, &len)) {
+                       if(!pidfilename)
+                               asprintf(&logfilename, "%s/log/%s.log", identname);
+                       if(!confbase) {
+                               if(netname)
+                                       asprintf(&confbase, "%s/%s", installdir, netname);
+                               else
+                                       asprintf(&confbase, "%s", installdir);
+                       }
+               }
+               RegCloseKey(key);
+               if(*installdir)
+                       return;
+       }
+#endif
+
+       if(!pidfilename)
+               asprintf(&pidfilename, LOCALSTATEDIR "/run/%s.pid", identname);
+
+       if(!logfilename)
+               asprintf(&logfilename, LOCALSTATEDIR "/log/%s.log", identname);
+
+       if(netname) {
                if(!confbase)
-                       asprintf(&confbase, "%s/tinc/%s", CONFDIR, netname);
+                       asprintf(&confbase, CONFDIR "/tinc/%s", netname);
                else
-                       syslog(LOG_INFO, _("Both netname and configuration directory given, using the latter..."));
-
-               if(!identname)
-                       asprintf(&identname, "tinc.%s", netname);
+                       logger(LOG_INFO, _("Both netname and configuration directory given, using the latter..."));
        } else {
-               if(!pidfilename)
-                       pidfilename = LOCALSTATEDIR "/run/tinc.pid";
-
                if(!confbase)
-                       asprintf(&confbase, "%s/tinc", CONFDIR);
-
-               if(!identname)
-                       identname = "tinc";
+                       asprintf(&confbase, CONFDIR "/tinc");
        }
 }
 
-int main(int argc, char **argv, char **envp)
+int main(int argc, char **argv)
 {
        program_name = argv[0];
 
@@ -345,14 +398,15 @@ int main(int argc, char **argv, char **envp)
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
 
-       environment = envp;
-       parse_options(argc, argv, envp);
+       if(!parse_options(argc, argv))
+               return 1;
+       
        make_names();
 
        if(show_version) {
                printf(_("%s version %s (built %s %s, protocol %d)\n"), PACKAGE,
                           VERSION, __DATE__, __TIME__, PROT_CURRENT);
-               printf(_("Copyright (C) 1998-2002 Ivo Timmermans, Guus Sliepen and others.\n"
+               printf(_("Copyright (C) 1998-2003 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"
@@ -361,28 +415,26 @@ int main(int argc, char **argv, char **envp)
                return 0;
        }
 
-       if(show_help)
-               usage(0);
+       if(show_help) {
+               usage(false);
+               return 0;
+       }
 
        if(kill_tincd)
-               exit(kill_other(kill_tincd));
+               return !kill_other(kill_tincd);
 
-#ifndef LOG_PERROR
-       openlog("tinc", LOG_CONS, LOG_DAEMON);  /* Catch all syslog() calls issued before detaching */
-#else
-       openlog("tinc", LOG_PERROR, LOG_DAEMON);        /* Catch all syslog() calls issued before detaching */
-#endif
+       openlogger("tinc", use_logfile?LOGMODE_FILE:LOGMODE_STDERR);
 
        /* Lock all pages into memory if requested */
 
        if(do_mlock)
 #ifdef HAVE_MLOCKALL
                if(mlockall(MCL_CURRENT | MCL_FUTURE)) {
-                       syslog(LOG_ERR, _("System call `%s' failed: %s"), "mlockall",
+                       logger(LOG_ERR, _("System call `%s' failed: %s"), "mlockall",
                                   strerror(errno));
 #else
        {
-               syslog(LOG_ERR, _("mlockall() not supported on this platform!"));
+               logger(LOG_ERR, _("mlockall() not supported on this platform!"));
 #endif
                return -1;
        }
@@ -399,35 +451,60 @@ int main(int argc, char **argv, char **envp)
 
        if(generate_keys) {
                read_server_config();
-               exit(keygen(generate_keys));
+               return !keygen(generate_keys);
        }
 
-       if(read_server_config())
-               exit(1);
+       if(!read_server_config())
+               return 1;
 
        if(lzo_init() != LZO_E_OK) {
-               syslog(LOG_ERR, _("Error initializing LZO compressor!"));
-               exit(1);
+               logger(LOG_ERR, _("Error initializing LZO compressor!"));
+               return 1;
        }
 
-       if(detach())
-               exit(0);
+#ifdef HAVE_MINGW
+       if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) {
+               logger(LOG_ERR, _("System call `%s' failed: %s"), "WSAStartup", winerror(GetLastError()));
+               return 1;
+       }
+
+       if(!do_detach || !init_service())
+               return main2(argc, argv);
+       else
+               return 1;
+}
+
+int main2(int argc, char **argv)
+{
+#endif
+
+       if(!detach())
+               return 1;
                
-       for(;;) {
-               if(!setup_network_connections()) {
-                       main_loop();
-                       cleanup_and_exit(1);
-               }
 
-               syslog(LOG_ERR, _("Unrecoverable error"));
-               cp_trace();
+       /* Setup sockets and open device. If it doesn't work, don't give up but try again. */
 
+       while(!setup_network_connections()) {
                if(do_detach) {
-                       syslog(LOG_NOTICE, _("Restarting in %d seconds!"), maxtimeout);
+                       logger(LOG_NOTICE, _("Restarting in %d seconds!"), maxtimeout);
                        sleep(maxtimeout);
                } else {
-                       syslog(LOG_ERR, _("Not restarting."));
-                       exit(1);
+                       logger(LOG_ERR, _("Not restarting."));
+                       return 1;
                }
        }
+
+       /* Start main loop. It only exits when tinc is killed. */
+
+       status = main_loop();
+
+       /* Shutdown properly. */
+
+       close_network_connections();
+
+       ifdebug(CONNECTIONS)
+               dump_device_stats();
+
+       logger(LOG_NOTICE, _("Terminating"));
+       return status;
 }