debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-01-03 15:21:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

notmuch-config: replace config reading function

Browse source 
Config files are currently read using glib's g_key_file_load_from_file
function which is very inconvenient because it's limited by design to read
only from "regular data files" in a filesystem. Because of this limitation
notmuch can't read configs from pipes, fifos, sockets, stdin, etc. Not even
"notmuch --config=/dev/stdin" works:

Error reading configuration file /dev/stdin: Not a regular file

So replace g_key_file_load_from_file with g_key_file_load_from_data which
gives us much more freedom to read configs from multiple sources.

This also helps the more security sensitive users: If someone has private
information in the config file, it can be encrypted on disk, then decrypted
in RAM and passed through a pipe directly to notmuch without the use of
intermediate plain text files.

Signed-off-by: Ioan-Adrian Ratiu <adi@adirat.com>
This commit is contained in:
Ioan-Adrian Ratiu 2016-12-10 21:54:07 +02:00 committed by David Bremner
parent 59ec796024
commit f2a038825b
1 changed files with 56 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
notmuch-config.c
View file

@ -205,32 +205,79 @@ get_username_from_passwd_file (void *ctx)
static notmuch_bool_t static notmuch_bool_t
get_config_from_file (notmuch_config_t *config, notmuch_bool_t create_new) get_config_from_file (notmuch_config_t *config, notmuch_bool_t create_new)
{ {
#define BUF_SIZE 4096
char *config_str = NULL;
int config_len = 0;
int config_bufsize = BUF_SIZE;
size_t len;
GError *error = NULL; GError *error = NULL;
notmuch_bool_t ret = FALSE; notmuch_bool_t ret = FALSE;
if (g_key_file_load_from_file (config->key_file, config->filename, FILE *fp = fopen(config->filename, "r");
G_KEY_FILE_KEEP_COMMENTS, &error)) if (fp == NULL) {
return TRUE;
if (error->domain == G_FILE_ERROR && error->code == G_FILE_ERROR_NOENT) {
/* If create_new is true, then the caller is prepared for a /* If create_new is true, then the caller is prepared for a
* default configuration file in the case of FILE NOT FOUND. * default configuration file in the case of FILE NOT FOUND.
*/ */
if (create_new) { if (create_new) {
config->is_new = TRUE; config->is_new = TRUE;
ret = TRUE; ret = TRUE;
} else { goto out;
} else if (errno == ENOENT) {
fprintf (stderr, "Configuration file %s not found.\n" fprintf (stderr, "Configuration file %s not found.\n"
"Try running 'notmuch setup' to create a configuration.\n", "Try running 'notmuch setup' to create a configuration.\n",
config->filename); config->filename);
} goto out;
} else { } else {
fprintf (stderr, "Error reading configuration file %s: %s\n", fprintf (stderr, "Error opening config file '%s': %s\n"
config->filename, error->message); "Try running 'notmuch setup' to create a configuration.\n",
config->filename, strerror(errno));
goto out;
}
} }
config_str = talloc_zero_array (config, char, config_bufsize);
if (config_str == NULL) {
fprintf (stderr, "Error reading '%s': Out of memory\n", config->filename);
goto out;
}
while ((len = fread (config_str + config_len, 1,
config_bufsize - config_len, fp)) > 0) {
config_len += len;
if (config_len == config_bufsize) {
config_bufsize += BUF_SIZE;
config_str = talloc_realloc (config, config_str, char, config_bufsize);
if (config_str == NULL) {
fprintf (stderr, "Error reading '%s': Failed to reallocate memory\n",
config->filename);
goto out;
}
}
}
if (ferror (fp)) {
fprintf (stderr, "Error reading '%s': I/O error\n", config->filename);
goto out;
}
if (g_key_file_load_from_data (config->key_file, config_str, config_len,
G_KEY_FILE_KEEP_COMMENTS, &error)) {
ret = TRUE;
goto out;
}
fprintf (stderr, "Error parsing config file '%s': %s\n",
config->filename, error->message);
g_error_free (error); g_error_free (error);
out:
if (fp)
fclose(fp);
if (config_str)
talloc_free(config_str);
return ret; return ret;
} }