X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=onak-conf.c;h=f97f2610053b5bbb8753f1fd8648eec78de44278;hb=469a7046cd4b3087184beec190c372edb929fe55;hp=0958502b4d57923119fa0f75d337f58bbe8e301f;hpb=ec6d9d2d119c9b215103c13bcc5b9b44bd24b997;p=onak.git diff --git a/onak-conf.c b/onak-conf.c index 0958502..f97f261 100644 --- a/onak-conf.c +++ b/onak-conf.c @@ -1,9 +1,20 @@ /* * onak-conf.c - Routines related to runtime config. * - * Jonathan McDowell + * Copyright 2002,2012 Jonathan McDowell * - * 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,6 +28,8 @@ #include "log.h" #include "onak-conf.h" +extern struct onak_dbctx *DBINIT(struct onak_db_config *dbcfg, bool readonly); + /* * config - Runtime configuration for onak. * @@ -24,46 +37,84 @@ * config file. */ struct onak_config config = { - 128, /* maxkeys */ - NULL, /* thissite */ - NULL, /* adminemail */ - NULL, /* mta */ - NULL, /* syncsites */ - NULL, /* logfile */ - - /* - * Options for directory backends. - */ - NULL, /* db_dir */ - - /* - * Options for the Postgres backend. - */ - NULL, /* pg_dbhost */ - NULL, /* pg_dbname */ - NULL, /* pg_dbuser */ - NULL, /* pg_dbpass */ - - /* - * Options for dynamic backends. - */ - NULL, /* db_backend */ - NULL, /* backends_dir */ + .maxkeys = 128, + .thissite = NULL, + .adminemail = NULL, + .mta = NULL, + .syncsites = NULL, + .logfile = NULL, + + .use_keyd = false, + .sock_dir = ".", + + .backends = NULL, + .backends_dir = NULL, + + .dbinit = DBINIT, + + .check_sighash = true, }; +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; + struct onak_db_config *backend; 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; + } + + /* Add a single DB configuration */ + backend = calloc(1, sizeof(*backend)); + config.backend = backend; + config.backends = lladd(NULL, backend); while (!feof(conffile)) { for (i = strlen(curline) - 1; @@ -77,7 +128,7 @@ void readconfig(const char *configfile) { * Comment line, ignore. */ } else if (!strncmp("db_dir ", curline, 7)) { - config.db_dir = strdup(&curline[7]); + backend->location = strdup(&curline[7]); } else if (!strncmp("debug ", curline, 6)) { /* * Not supported yet; ignore for compatibility with @@ -110,13 +161,13 @@ void readconfig(const char *configfile) { } else if (!strncmp("max_reply_keys ", curline, 15)) { config.maxkeys = atoi(&curline[15]); } else if (!strncmp("pg_dbhost ", curline, 10)) { - config.pg_dbhost = strdup(&curline[10]); + backend->hostname = strdup(&curline[10]); } else if (!strncmp("pg_dbname ", curline, 10)) { - config.pg_dbname = strdup(&curline[10]); + backend->location = strdup(&curline[10]); } else if (!strncmp("pg_dbuser ", curline, 10)) { - config.pg_dbuser = strdup(&curline[10]); + backend->username = strdup(&curline[10]); } else if (!strncmp("pg_dbpass ", curline, 10)) { - config.pg_dbpass = strdup(&curline[10]); + backend->password = strdup(&curline[10]); } else if (!strncmp("syncsite ", curline, 9)) { config.syncsites = lladd(config.syncsites, strdup(&curline[9])); @@ -134,15 +185,30 @@ void readconfig(const char *configfile) { * Not applicable; ignored for compatibility with pksd. */ } else if (!strncmp("db_backend ", curline, 11)) { + backend->type = strdup(&curline[11]); + backend->name = strdup(&curline[11]); 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("sock_dir ", curline, 9)) { + config.sock_dir = strdup(&curline[9]); + } 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 { @@ -151,7 +217,41 @@ void readconfig(const char *configfile) { } } +void cleanupdbconfig(void *object) +{ + struct onak_db_config *dbconfig = (struct onak_db_config *) object; + + if (dbconfig->name != NULL) { + free(dbconfig->name); + dbconfig->name = NULL; + } + if (dbconfig->type != NULL) { + free(dbconfig->type); + dbconfig->type = NULL; + } + if (dbconfig->location != NULL) { + free(dbconfig->location); + dbconfig->location = NULL; + } + if (dbconfig->hostname != NULL) { + free(dbconfig->hostname); + dbconfig->hostname = NULL; + } + if (dbconfig->username != NULL) { + free(dbconfig->username); + dbconfig->username = NULL; + } + if (dbconfig->password != NULL) { + free(dbconfig->password); + dbconfig->password = NULL; + } +} + void cleanupconfig(void) { + /* Free any defined DB backend configuration first */ + llfree(config.backends, cleanupdbconfig); + config.backends = NULL; + if (config.thissite != NULL) { free(config.thissite); config.thissite = NULL; @@ -164,26 +264,6 @@ void cleanupconfig(void) { free(config.mta); config.mta = NULL; } - if (config.db_dir != NULL) { - free(config.db_dir); - config.db_dir = NULL; - } - if (config.pg_dbhost != NULL) { - free(config.pg_dbhost); - config.pg_dbhost = NULL; - } - if (config.pg_dbname != NULL) { - free(config.pg_dbname); - config.pg_dbname = NULL; - } - if (config.pg_dbuser != NULL) { - free(config.pg_dbuser); - config.pg_dbuser = NULL; - } - if (config.pg_dbpass != NULL) { - free(config.pg_dbpass); - config.pg_dbpass = NULL; - } if (config.syncsites != NULL) { llfree(config.syncsites, free); config.syncsites = NULL;