Fix keyd memory leak on error reading client provided search text

[onak.git] / onak-conf.c

diff --git a/onak-conf.c b/onak-conf.c
index 70990f87b174ab5565be42d9cf54088265bae512..ccad3c5a78f800dde720e8562456fab44d119a19 100644 (file)
--- a/onak-conf.c
+++ b/onak-conf.c
@@ -1,9 +1,20 @@
 /*
  * onak-conf.c - Routines related to runtime config.
  *
- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002,2012 Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2002 Project Purple
+ * 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 the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
@@ -17,7 +28,7 @@
 #include "log.h"
 #include "onak-conf.h"
 
-extern struct dbfuncs DBFUNCS;
+extern struct onak_dbctx *DBINIT(bool readonly);
 
 /*
  *     config - Runtime configuration for onak.
@@ -33,6 +44,8 @@ struct onak_config config = {
        NULL,                   /* syncsites */
        NULL,                   /* logfile */
 
+       false,                  /* use_keyd */
+
        /*
         * Options for directory backends.
         */
@@ -52,22 +65,65 @@ struct onak_config config = {
        NULL,                   /* db_backend */
        NULL,                   /* backends_dir */
 
-       &DBFUNCS,               /* Default dbfuncs struct */
+       DBINIT,                 /* Default db initialisation function */
+
+       true,                   /* Check packet sig hashes */
 };
 
+bool parsebool(char *str, bool fallback)
+{
+       if (!strcasecmp(str, "false") || !strcasecmp(str, "no") ||
+                       !strcasecmp(str, "0")) {
+               return false;
+       } else if (!strcasecmp(str, "true") || !strcasecmp(str, "yes") ||
+                       !strcasecmp(str, "1")) {
+               return true;
+       } else {
+               logthing(LOGTHING_CRITICAL,
+                       "Couldn't parse %s as a boolean config variable, "
+                       "returning fallback of '%s'.",
+                       str,
+                       fallback ? "true" : "false");
+               return fallback;
+       }
+}
+
 void readconfig(const char *configfile) {
        FILE *conffile;
        char  curline[1024];
        int   i;
+       char *dir, *conf;
+       size_t len;
 
        curline[1023] = 0;
        if (configfile == NULL) {
-               conffile = fopen(CONFIGFILE, "r");
+               conffile = NULL;
+               if ((dir = getenv("XDG_CONFIG_HOME")) != NULL) {
+                       len = strlen(dir) + 1 + 9 + 1; /* dir + / + onak.conf + NUL */
+                       conf = malloc(len);
+                       snprintf(conf, len, "%s/onak.conf", dir);
+                       conffile = fopen(conf, "r");
+                       free(conf);
+               } else if ((dir = getenv("HOME")) != NULL) {
+                       len = strlen(dir) + 18 + 1; /* dir + /.config/onak.conf + NUL */
+                       conf = malloc(len);
+                       snprintf(conf, len, "%s/.config/onak.conf", dir);
+                       conffile = fopen(conf, "r");
+                       free(conf);
+               }
+               if (conffile == NULL) {
+                       conffile = fopen(CONFIGFILE, "r");
+               }
        } else {
                conffile = fopen(configfile, "r");
        }
        if (conffile != NULL) {
-               fgets(curline, 1023, conffile);
+               if (!fgets(curline, 1023, conffile)) {
+                       logthing(LOGTHING_CRITICAL,
+                               "Problem reading configuration file.");
+                       fclose(conffile);
+                       return;
+               }
 
                while (!feof(conffile)) {
                        for (i = strlen(curline) - 1;
@@ -141,12 +197,23 @@ void readconfig(const char *configfile) {
                        config.db_backend = strdup(&curline[11]);
                } else if (!strncmp("backends_dir ", curline, 13)) {
                        config.backends_dir = strdup(&curline[13]);
+               } else if (!strncmp("use_keyd ", curline, 9)) {
+                       config.use_keyd = parsebool(&curline[9],
+                                               config.use_keyd);
+               } else if (!strncmp("check_sighash ", curline, 9)) {
+                       config.check_sighash = parsebool(&curline[9],
+                                               config.check_sighash);
                } else {
                        logthing(LOGTHING_ERROR,
                                "Unknown config line: %s", curline);
                }
 
-                       fgets(curline, 1023, conffile);
+                       if (!fgets(curline, 1023, conffile) &&
+                                       !feof(conffile)) {
+                               logthing(LOGTHING_CRITICAL,
+                                       "Problem reading configuration file.");
+                               break;
+                       }
                }
                fclose(conffile);
        } else {