mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-28 13:44:12 +01:00
b10ce6bc23
We need a way to pass parameters to the indexing functionality on the first index, not just on reindexing. The obvious place is in notmuch_database_add_message. But since modifying the argument list would break both API and ABI, we needed a new name. I considered notmuch_database_add_message_with_params(), but the functionality we're talking about doesn't always add a message. It tries to index a specific file, possibly adding a message, but possibly doing other things, like adding terms to an existing message, or failing to deal with message objects entirely (e.g. because the file didn't contain a message). So i chose the function name notmuch_database_index_file. I confess i'm a little concerned about confusing future notmuch developers with the new name, since we already have a private _notmuch_message_index_file function, and the two do rather different things. But i think the added clarity for people linking against the future libnotmuch and the capacity for using index parameters makes this a worthwhile tradeoff. (that said, if anyone has another name that they strongly prefer, i'd be happy to go with it) This changeset also adjusts the tests so that we test whether the new, preferred function returns bad values (since the deprecated function just calls the new one). We can keep the deprecated n_d_add_message function around as long as we like, but at the next place where we're forced to break API or ABI we can probably choose to drop the name relatively safely. NOTE: there is probably more cleanup to do in the ruby and go bindings to complete the deprecation directly. I don't know those languages well enough to attempt a fix; i don't know how to test them; and i don't know the culture around those languages about API additions or deprecations.
584 lines
15 KiB
C
584 lines
15 KiB
C
/* notmuch - Not much of an email program, (just index and search)
|
|
*
|
|
* Copyright © 2013 Peter Wang
|
|
*
|
|
* Based in part on notmuch-deliver
|
|
* Copyright © 2010 Ali Polatel
|
|
*
|
|
* 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, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* 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, see https://www.gnu.org/licenses/ .
|
|
*
|
|
* Author: Peter Wang <novalazy@gmail.com>
|
|
*/
|
|
|
|
#include "notmuch-client.h"
|
|
#include "tag-util.h"
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <fcntl.h>
|
|
#include "string-util.h"
|
|
|
|
static volatile sig_atomic_t interrupted;
|
|
|
|
static void
|
|
handle_sigint (unused (int sig))
|
|
{
|
|
static char msg[] = "Stopping... \n";
|
|
|
|
/* This write is "opportunistic", so it's okay to ignore the
|
|
* result. It is not required for correctness, and if it does
|
|
* fail or produce a short write, we want to get out of the signal
|
|
* handler as quickly as possible, not retry it. */
|
|
IGNORE_RESULT (write (2, msg, sizeof (msg) - 1));
|
|
interrupted = 1;
|
|
}
|
|
|
|
/* Like gethostname but guarantees that a null-terminated hostname is
|
|
* returned, even if it has to make one up. Invalid characters are
|
|
* substituted such that the hostname can be used within a filename.
|
|
*/
|
|
static void
|
|
safe_gethostname (char *hostname, size_t len)
|
|
{
|
|
char *p;
|
|
|
|
if (gethostname (hostname, len) == -1) {
|
|
strncpy (hostname, "unknown", len);
|
|
}
|
|
hostname[len - 1] = '\0';
|
|
|
|
for (p = hostname; *p != '\0'; p++) {
|
|
if (*p == '/' || *p == ':')
|
|
*p = '_';
|
|
}
|
|
}
|
|
|
|
/* Call fsync() on a directory path. */
|
|
static notmuch_bool_t
|
|
sync_dir (const char *dir)
|
|
{
|
|
int fd, r;
|
|
|
|
fd = open (dir, O_RDONLY);
|
|
if (fd == -1) {
|
|
fprintf (stderr, "Error: open %s: %s\n", dir, strerror (errno));
|
|
return FALSE;
|
|
}
|
|
|
|
r = fsync (fd);
|
|
if (r)
|
|
fprintf (stderr, "Error: fsync %s: %s\n", dir, strerror (errno));
|
|
|
|
close (fd);
|
|
|
|
return r == 0;
|
|
}
|
|
|
|
/*
|
|
* Check the specified folder name does not contain a directory
|
|
* component ".." to prevent writes outside of the Maildir
|
|
* hierarchy. Return TRUE on valid folder name, FALSE otherwise.
|
|
*/
|
|
static notmuch_bool_t
|
|
is_valid_folder_name (const char *folder)
|
|
{
|
|
const char *p = folder;
|
|
|
|
for (;;) {
|
|
if ((p[0] == '.') && (p[1] == '.') && (p[2] == '\0' || p[2] == '/'))
|
|
return FALSE;
|
|
p = strchr (p, '/');
|
|
if (!p)
|
|
return TRUE;
|
|
p++;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Make the given directory and its parents as necessary, using the
|
|
* given mode. Return TRUE on success, FALSE otherwise. Partial
|
|
* results are not cleaned up on errors.
|
|
*/
|
|
static notmuch_bool_t
|
|
mkdir_recursive (const void *ctx, const char *path, int mode)
|
|
{
|
|
struct stat st;
|
|
int r;
|
|
char *parent = NULL, *slash;
|
|
|
|
/* First check the common case: directory already exists. */
|
|
r = stat (path, &st);
|
|
if (r == 0) {
|
|
if (! S_ISDIR (st.st_mode)) {
|
|
fprintf (stderr, "Error: '%s' is not a directory: %s\n",
|
|
path, strerror (EEXIST));
|
|
return FALSE;
|
|
}
|
|
|
|
return TRUE;
|
|
} else if (errno != ENOENT) {
|
|
fprintf (stderr, "Error: stat '%s': %s\n", path, strerror (errno));
|
|
return FALSE;
|
|
}
|
|
|
|
/* mkdir parents, if any */
|
|
slash = strrchr (path, '/');
|
|
if (slash && slash != path) {
|
|
parent = talloc_strndup (ctx, path, slash - path);
|
|
if (! parent) {
|
|
fprintf (stderr, "Error: %s\n", strerror (ENOMEM));
|
|
return FALSE;
|
|
}
|
|
|
|
if (! mkdir_recursive (ctx, parent, mode))
|
|
return FALSE;
|
|
}
|
|
|
|
if (mkdir (path, mode)) {
|
|
fprintf (stderr, "Error: mkdir '%s': %s\n", path, strerror (errno));
|
|
return FALSE;
|
|
}
|
|
|
|
return parent ? sync_dir (parent) : TRUE;
|
|
}
|
|
|
|
/*
|
|
* Create the given maildir folder, i.e. maildir and its
|
|
* subdirectories cur/new/tmp. Return TRUE on success, FALSE
|
|
* otherwise. Partial results are not cleaned up on errors.
|
|
*/
|
|
static notmuch_bool_t
|
|
maildir_create_folder (const void *ctx, const char *maildir)
|
|
{
|
|
const char *subdirs[] = { "cur", "new", "tmp" };
|
|
const int mode = 0700;
|
|
char *subdir;
|
|
unsigned int i;
|
|
|
|
for (i = 0; i < ARRAY_SIZE (subdirs); i++) {
|
|
subdir = talloc_asprintf (ctx, "%s/%s", maildir, subdirs[i]);
|
|
if (! subdir) {
|
|
fprintf (stderr, "Error: %s\n", strerror (ENOMEM));
|
|
return FALSE;
|
|
}
|
|
|
|
if (! mkdir_recursive (ctx, subdir, mode))
|
|
return FALSE;
|
|
}
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
/*
|
|
* Generate a temporary file basename, no path, do not create an
|
|
* actual file. Return the basename, or NULL on errors.
|
|
*/
|
|
static char *
|
|
tempfilename (const void *ctx)
|
|
{
|
|
char *filename;
|
|
char hostname[256];
|
|
struct timeval tv;
|
|
pid_t pid;
|
|
|
|
/* We follow the Dovecot file name generation algorithm. */
|
|
pid = getpid ();
|
|
safe_gethostname (hostname, sizeof (hostname));
|
|
gettimeofday (&tv, NULL);
|
|
|
|
filename = talloc_asprintf (ctx, "%ld.M%ldP%d.%s",
|
|
(long) tv.tv_sec, (long) tv.tv_usec, pid, hostname);
|
|
if (! filename)
|
|
fprintf (stderr, "Error: %s\n", strerror (ENOMEM));
|
|
|
|
return filename;
|
|
}
|
|
|
|
/*
|
|
* Create a unique temporary file in maildir/tmp, return fd and full
|
|
* path to file in *path_out, or -1 on errors (in which case *path_out
|
|
* is not touched).
|
|
*/
|
|
static int
|
|
maildir_mktemp (const void *ctx, const char *maildir, char **path_out)
|
|
{
|
|
char *filename, *path;
|
|
int fd;
|
|
|
|
do {
|
|
filename = tempfilename (ctx);
|
|
if (! filename)
|
|
return -1;
|
|
|
|
path = talloc_asprintf (ctx, "%s/tmp/%s", maildir, filename);
|
|
if (! path) {
|
|
fprintf (stderr, "Error: %s\n", strerror (ENOMEM));
|
|
return -1;
|
|
}
|
|
|
|
fd = open (path, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600);
|
|
} while (fd == -1 && errno == EEXIST);
|
|
|
|
if (fd == -1) {
|
|
fprintf (stderr, "Error: open '%s': %s\n", path, strerror (errno));
|
|
return -1;
|
|
}
|
|
|
|
*path_out = path;
|
|
|
|
return fd;
|
|
}
|
|
|
|
/*
|
|
* Copy fdin to fdout, return TRUE on success, and FALSE on errors and
|
|
* empty input.
|
|
*/
|
|
static notmuch_bool_t
|
|
copy_fd (int fdout, int fdin)
|
|
{
|
|
notmuch_bool_t empty = TRUE;
|
|
|
|
while (! interrupted) {
|
|
ssize_t remain;
|
|
char buf[4096];
|
|
char *p;
|
|
|
|
remain = read (fdin, buf, sizeof (buf));
|
|
if (remain == 0)
|
|
break;
|
|
if (remain < 0) {
|
|
if (errno == EINTR)
|
|
continue;
|
|
fprintf (stderr, "Error: reading from standard input: %s\n",
|
|
strerror (errno));
|
|
return FALSE;
|
|
}
|
|
|
|
p = buf;
|
|
do {
|
|
ssize_t written = write (fdout, p, remain);
|
|
if (written < 0 && errno == EINTR)
|
|
continue;
|
|
if (written <= 0) {
|
|
fprintf (stderr, "Error: writing to temporary file: %s",
|
|
strerror (errno));
|
|
return FALSE;
|
|
}
|
|
p += written;
|
|
remain -= written;
|
|
empty = FALSE;
|
|
} while (remain > 0);
|
|
}
|
|
|
|
return (!interrupted && !empty);
|
|
}
|
|
|
|
/*
|
|
* Write fdin to a new temp file in maildir/tmp, return full path to
|
|
* the file, or NULL on errors.
|
|
*/
|
|
static char *
|
|
maildir_write_tmp (const void *ctx, int fdin, const char *maildir)
|
|
{
|
|
char *path;
|
|
int fdout;
|
|
|
|
fdout = maildir_mktemp (ctx, maildir, &path);
|
|
if (fdout < 0)
|
|
return NULL;
|
|
|
|
if (! copy_fd (fdout, fdin))
|
|
goto FAIL;
|
|
|
|
if (fsync (fdout)) {
|
|
fprintf (stderr, "Error: fsync '%s': %s\n", path, strerror (errno));
|
|
goto FAIL;
|
|
}
|
|
|
|
close (fdout);
|
|
|
|
return path;
|
|
|
|
FAIL:
|
|
close (fdout);
|
|
unlink (path);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/*
|
|
* Write fdin to a new file in maildir/new, using an intermediate temp
|
|
* file in maildir/tmp, return full path to the new file, or NULL on
|
|
* errors.
|
|
*/
|
|
static char *
|
|
maildir_write_new (const void *ctx, int fdin, const char *maildir)
|
|
{
|
|
char *cleanpath, *tmppath, *newpath, *newdir;
|
|
|
|
tmppath = maildir_write_tmp (ctx, fdin, maildir);
|
|
if (! tmppath)
|
|
return NULL;
|
|
cleanpath = tmppath;
|
|
|
|
newpath = talloc_strdup (ctx, tmppath);
|
|
if (! newpath) {
|
|
fprintf (stderr, "Error: %s\n", strerror (ENOMEM));
|
|
goto FAIL;
|
|
}
|
|
|
|
/* sanity checks needed? */
|
|
memcpy (newpath + strlen (maildir) + 1, "new", 3);
|
|
|
|
if (rename (tmppath, newpath)) {
|
|
fprintf (stderr, "Error: rename '%s' '%s': %s\n",
|
|
tmppath, newpath, strerror (errno));
|
|
goto FAIL;
|
|
}
|
|
cleanpath = newpath;
|
|
|
|
newdir = talloc_asprintf (ctx, "%s/%s", maildir, "new");
|
|
if (! newdir) {
|
|
fprintf (stderr, "Error: %s\n", strerror (ENOMEM));
|
|
goto FAIL;
|
|
}
|
|
|
|
if (! sync_dir (newdir))
|
|
goto FAIL;
|
|
|
|
return newpath;
|
|
|
|
FAIL:
|
|
unlink (cleanpath);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
/*
|
|
* Add the specified message file to the notmuch database, applying
|
|
* tags in tag_ops. If synchronize_flags is TRUE, the tags are
|
|
* synchronized to maildir flags (which may result in message file
|
|
* rename).
|
|
*
|
|
* Return NOTMUCH_STATUS_SUCCESS on success, errors otherwise. If keep
|
|
* is TRUE, errors in tag changes and flag syncing are ignored and
|
|
* success status is returned; otherwise such errors cause the message
|
|
* to be removed from the database. Failure to add the message to the
|
|
* database results in error status regardless of keep.
|
|
*/
|
|
static notmuch_status_t
|
|
add_file (notmuch_database_t *notmuch, const char *path, tag_op_list_t *tag_ops,
|
|
notmuch_bool_t synchronize_flags, notmuch_bool_t keep)
|
|
{
|
|
notmuch_message_t *message;
|
|
notmuch_status_t status;
|
|
|
|
status = notmuch_database_index_file (notmuch, path, NULL, &message);
|
|
if (status == NOTMUCH_STATUS_SUCCESS) {
|
|
status = tag_op_list_apply (message, tag_ops, 0);
|
|
if (status) {
|
|
fprintf (stderr, "%s: failed to apply tags to file '%s': %s\n",
|
|
keep ? "Warning" : "Error",
|
|
path, notmuch_status_to_string (status));
|
|
goto DONE;
|
|
}
|
|
} else if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) {
|
|
status = NOTMUCH_STATUS_SUCCESS;
|
|
} else if (status == NOTMUCH_STATUS_FILE_NOT_EMAIL) {
|
|
fprintf (stderr, "Error: delivery of non-mail file: '%s'\n", path);
|
|
goto FAIL;
|
|
} else {
|
|
fprintf (stderr, "Error: failed to add '%s' to notmuch database: %s\n",
|
|
path, notmuch_status_to_string (status));
|
|
goto FAIL;
|
|
}
|
|
|
|
if (synchronize_flags) {
|
|
status = notmuch_message_tags_to_maildir_flags (message);
|
|
if (status != NOTMUCH_STATUS_SUCCESS)
|
|
fprintf (stderr, "%s: failed to sync tags to maildir flags for '%s': %s\n",
|
|
keep ? "Warning" : "Error",
|
|
path, notmuch_status_to_string (status));
|
|
|
|
/*
|
|
* Note: Unfortunately a failed maildir flag sync might
|
|
* already have renamed the file, in which case the cleanup
|
|
* path may fail.
|
|
*/
|
|
}
|
|
|
|
DONE:
|
|
notmuch_message_destroy (message);
|
|
|
|
if (status) {
|
|
if (keep) {
|
|
status = NOTMUCH_STATUS_SUCCESS;
|
|
} else {
|
|
notmuch_status_t cleanup_status;
|
|
|
|
cleanup_status = notmuch_database_remove_message (notmuch, path);
|
|
if (cleanup_status != NOTMUCH_STATUS_SUCCESS &&
|
|
cleanup_status != NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) {
|
|
fprintf (stderr, "Warning: failed to remove '%s' from database "
|
|
"after errors: %s. Please run 'notmuch new' to fix.\n",
|
|
path, notmuch_status_to_string (cleanup_status));
|
|
}
|
|
}
|
|
}
|
|
|
|
FAIL:
|
|
return status;
|
|
}
|
|
|
|
int
|
|
notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[])
|
|
{
|
|
notmuch_status_t status, close_status;
|
|
notmuch_database_t *notmuch;
|
|
struct sigaction action;
|
|
const char *db_path;
|
|
const char **new_tags;
|
|
size_t new_tags_length;
|
|
tag_op_list_t *tag_ops;
|
|
char *query_string = NULL;
|
|
char *folder = NULL;
|
|
notmuch_bool_t create_folder = FALSE;
|
|
notmuch_bool_t keep = FALSE;
|
|
notmuch_bool_t no_hooks = FALSE;
|
|
notmuch_bool_t synchronize_flags;
|
|
const char *maildir;
|
|
char *newpath;
|
|
int opt_index;
|
|
unsigned int i;
|
|
|
|
notmuch_opt_desc_t options[] = {
|
|
{ NOTMUCH_OPT_STRING, &folder, "folder", 0, 0 },
|
|
{ NOTMUCH_OPT_BOOLEAN, &create_folder, "create-folder", 0, 0 },
|
|
{ NOTMUCH_OPT_BOOLEAN, &keep, "keep", 0, 0 },
|
|
{ NOTMUCH_OPT_BOOLEAN, &no_hooks, "no-hooks", 'n', 0 },
|
|
{ NOTMUCH_OPT_INHERIT, (void *) ¬much_shared_options, NULL, 0, 0 },
|
|
{ NOTMUCH_OPT_END, 0, 0, 0, 0 }
|
|
};
|
|
|
|
opt_index = parse_arguments (argc, argv, options, 1);
|
|
if (opt_index < 0)
|
|
return EXIT_FAILURE;
|
|
|
|
notmuch_process_shared_options (argv[0]);
|
|
|
|
db_path = notmuch_config_get_database_path (config);
|
|
new_tags = notmuch_config_get_new_tags (config, &new_tags_length);
|
|
synchronize_flags = notmuch_config_get_maildir_synchronize_flags (config);
|
|
|
|
tag_ops = tag_op_list_create (config);
|
|
if (tag_ops == NULL) {
|
|
fprintf (stderr, "Out of memory.\n");
|
|
return EXIT_FAILURE;
|
|
}
|
|
for (i = 0; i < new_tags_length; i++) {
|
|
const char *error_msg;
|
|
|
|
error_msg = illegal_tag (new_tags[i], FALSE);
|
|
if (error_msg) {
|
|
fprintf (stderr, "Error: tag '%s' in new.tags: %s\n",
|
|
new_tags[i], error_msg);
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
if (tag_op_list_append (tag_ops, new_tags[i], FALSE))
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
if (parse_tag_command_line (config, argc - opt_index, argv + opt_index,
|
|
&query_string, tag_ops))
|
|
return EXIT_FAILURE;
|
|
|
|
if (*query_string != '\0') {
|
|
fprintf (stderr, "Error: unexpected query string: %s\n", query_string);
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
if (folder == NULL) {
|
|
maildir = db_path;
|
|
} else {
|
|
strip_trailing (folder, '/');
|
|
if (! is_valid_folder_name (folder)) {
|
|
fprintf (stderr, "Error: invalid folder name: '%s'\n", folder);
|
|
return EXIT_FAILURE;
|
|
}
|
|
maildir = talloc_asprintf (config, "%s/%s", db_path, folder);
|
|
if (! maildir) {
|
|
fprintf (stderr, "Out of memory\n");
|
|
return EXIT_FAILURE;
|
|
}
|
|
if (create_folder && ! maildir_create_folder (config, maildir))
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
/* Set up our handler for SIGINT. We do not set SA_RESTART so that copying
|
|
* from standard input may be interrupted. */
|
|
memset (&action, 0, sizeof (struct sigaction));
|
|
action.sa_handler = handle_sigint;
|
|
sigemptyset (&action.sa_mask);
|
|
action.sa_flags = 0;
|
|
sigaction (SIGINT, &action, NULL);
|
|
|
|
/* Write the message to the Maildir new directory. */
|
|
newpath = maildir_write_new (config, STDIN_FILENO, maildir);
|
|
if (! newpath) {
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
status = notmuch_database_open (notmuch_config_get_database_path (config),
|
|
NOTMUCH_DATABASE_MODE_READ_WRITE, ¬much);
|
|
if (status)
|
|
return keep ? NOTMUCH_STATUS_SUCCESS : status_to_exit (status);
|
|
|
|
notmuch_exit_if_unmatched_db_uuid (notmuch);
|
|
|
|
|
|
/* Index the message. */
|
|
status = add_file (notmuch, newpath, tag_ops, synchronize_flags, keep);
|
|
|
|
/* Commit changes. */
|
|
close_status = notmuch_database_destroy (notmuch);
|
|
if (close_status) {
|
|
/* Hold on to the first error, if any. */
|
|
if (! status)
|
|
status = close_status;
|
|
fprintf (stderr, "%s: failed to commit database changes: %s\n",
|
|
keep ? "Warning" : "Error",
|
|
notmuch_status_to_string (close_status));
|
|
}
|
|
|
|
if (status) {
|
|
if (keep) {
|
|
status = NOTMUCH_STATUS_SUCCESS;
|
|
} else {
|
|
/* If maildir flag sync failed, this might fail. */
|
|
if (unlink (newpath)) {
|
|
fprintf (stderr, "Warning: failed to remove '%s' from maildir "
|
|
"after errors: %s. Please run 'notmuch new' to fix.\n",
|
|
newpath, strerror (errno));
|
|
}
|
|
}
|
|
}
|
|
|
|
if (! no_hooks && status == NOTMUCH_STATUS_SUCCESS) {
|
|
/* Ignore hook failures. */
|
|
notmuch_run_hook (db_path, "post-insert");
|
|
}
|
|
|
|
return status_to_exit (status);
|
|
}
|