#include "gmime-filter-headers.h"
static void
-reply_part_content (GMimeObject *part)
-{
- GMimeStream *stream_stdout = NULL, *stream_filter = NULL;
- GMimeDataWrapper *wrapper;
- const char *charset;
-
- charset = g_mime_object_get_content_type_parameter (part, "charset");
- stream_stdout = g_mime_stream_file_new (stdout);
- if (stream_stdout) {
- g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
- stream_filter = g_mime_stream_filter_new(stream_stdout);
- if (charset) {
- g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter),
- g_mime_filter_charset_new(charset, "UTF-8"));
- }
- }
- g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter),
- g_mime_filter_reply_new(TRUE));
- wrapper = g_mime_part_get_content_object (GMIME_PART (part));
- if (wrapper && stream_filter)
- g_mime_data_wrapper_write_to_stream (wrapper, stream_filter);
- if (stream_filter)
- g_object_unref(stream_filter);
- if (stream_stdout)
- g_object_unref(stream_stdout);
-}
+reply_part_content (GMimeObject *part);
+
+static const notmuch_show_format_t format_reply = {
+ "",
+ "", NULL,
+ "", NULL, "",
+ "",
+ NULL,
+ NULL,
+ NULL,
+ reply_part_content,
+ NULL,
+ "",
+ "",
+ "", "",
+ ""
+};
static void
show_reply_headers (GMimeMessage *message)
}
static void
-reply_part (GMimeObject *part, int *part_count)
+reply_part_content (GMimeObject *part)
{
- GMimeContentDisposition *disposition;
- GMimeContentType *content_type;
+ GMimeContentType *content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
+ GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (part);
- (void) part_count;
- disposition = g_mime_object_get_content_disposition (part);
- if (disposition &&
- strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
+ if (g_mime_content_type_is_type (content_type, "text", "*") &&
+ !g_mime_content_type_is_type (content_type, "text", "html"))
{
- const char *filename = g_mime_part_get_filename (GMIME_PART (part));
- content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
-
- if (g_mime_content_type_is_type (content_type, "text", "*") &&
- !g_mime_content_type_is_type (content_type, "text", "html"))
+ GMimeStream *stream_stdout = NULL, *stream_filter = NULL;
+ GMimeDataWrapper *wrapper;
+ const char *charset;
+
+ charset = g_mime_object_get_content_type_parameter (part, "charset");
+ stream_stdout = g_mime_stream_file_new (stdout);
+ if (stream_stdout) {
+ g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
+ stream_filter = g_mime_stream_filter_new(stream_stdout);
+ if (charset) {
+ g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter),
+ g_mime_filter_charset_new(charset, "UTF-8"));
+ }
+ }
+ g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter),
+ g_mime_filter_reply_new(TRUE));
+ wrapper = g_mime_part_get_content_object (GMIME_PART (part));
+ if (wrapper && stream_filter)
+ g_mime_data_wrapper_write_to_stream (wrapper, stream_filter);
+ if (stream_filter)
+ g_object_unref(stream_filter);
+ if (stream_stdout)
+ g_object_unref(stream_stdout);
+ }
+ else
+ {
+ if (disposition &&
+ strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
{
- reply_part_content (part);
+ const char *filename = g_mime_part_get_filename (GMIME_PART (part));
+ printf ("Attachment: %s (%s)\n", filename,
+ g_mime_content_type_to_string (content_type));
}
else
{
- printf ("Attachment: %s (%s)\n", filename,
+ printf ("Non-text part: %s\n",
g_mime_content_type_to_string (content_type));
}
-
- return;
- }
-
- content_type = g_mime_object_get_content_type (GMIME_OBJECT (part));
-
- if (g_mime_content_type_is_type (content_type, "text", "*") &&
- !g_mime_content_type_is_type (content_type, "text", "html"))
- {
- reply_part_content (part);
- }
- else
- {
- printf ("Non-text part: %s\n",
- g_mime_content_type_to_string (content_type));
}
}
address_is_users (const char *address, notmuch_config_t *config)
{
const char *primary;
- char **other;
+ const char **other;
size_t i, other_len;
primary = notmuch_config_get_user_primary_email (config);
static const char *
guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message)
{
- const char *received,*primary;
- char **other;
- char *by,*mta,*ptr,*token;
+ const char *received,*primary,*by;
+ const char **other;
+ char *tohdr;
+ char *mta,*ptr,*token;
char *domain=NULL;
char *tld=NULL;
const char *delim=". \t";
- size_t i,other_len;
+ size_t i,j,other_len;
+
+ const char *to_headers[] = {"Envelope-to", "X-Original-To"};
+
+ primary = notmuch_config_get_user_primary_email (config);
+ other = notmuch_config_get_user_other_email (config, &other_len);
+
+ /* sadly, there is no standard way to find out to which email
+ * address a mail was delivered - what is in the headers depends
+ * on the MTAs used along the way. So we are trying a number of
+ * heuristics which hopefully will answer this question.
+
+ * We only got here if none of the users email addresses are in
+ * the To: or Cc: header. From here we try the following in order:
+ * 1) check for an Envelope-to: header
+ * 2) check for an X-Original-To: header
+ * 3) check for a (for <email@add.res>) clause in Received: headers
+ * 4) check for the domain part of known email addresses in the
+ * 'by' part of Received headers
+ * If none of these work, we give up and return NULL
+ */
+ for (i = 0; i < sizeof(to_headers)/sizeof(*to_headers); i++) {
+ tohdr = xstrdup(notmuch_message_get_header (message, to_headers[i]));
+ if (tohdr && *tohdr) {
+ /* tohdr is potentialy a list of email addresses, so here we
+ * check if one of the email addresses is a substring of tohdr
+ */
+ if (strcasestr(tohdr, primary)) {
+ free(tohdr);
+ return primary;
+ }
+ for (j = 0; j < other_len; j++)
+ if (strcasestr (tohdr, other[j])) {
+ free(tohdr);
+ return other[j];
+ }
+ free(tohdr);
+ }
+ }
+ /* We get the concatenated Received: headers and search from the
+ * front (last Received: header added) and try to extract from
+ * them indications to which email address this message was
+ * delivered.
+ * The Received: header is special in our get_header function
+ * and is always concated.
+ */
received = notmuch_message_get_header (message, "received");
if (received == NULL)
return NULL;
- by = strstr (received, " by ");
- if (by && *(by+4)) {
- /* sadly, the format of Received: headers is a bit inconsistent,
- * depending on the MTA used. So we try to extract just the MTA
- * here by removing leading whitespace and assuming that the MTA
- * name ends at the next whitespace
- * we test for *(by+4) to be non-'\0' to make sure there's something
- * there at all - and then assume that the first whitespace delimited
- * token that follows is the last receiving server
+ /* First we look for a " for <email@add.res>" in the received
+ * header
+ */
+ ptr = strstr (received, " for ");
+ if (ptr) {
+ /* the text following is potentialy a list of email addresses,
+ * so again we check if one of the email addresses is a
+ * substring of ptr
*/
- mta = strdup (by+4);
- if (mta == NULL)
- return NULL;
+ if (strcasestr(ptr, primary)) {
+ return primary;
+ }
+ for (i = 0; i < other_len; i++)
+ if (strcasestr (ptr, other[i])) {
+ return other[i];
+ }
+ }
+ /* Finally, we parse all the " by MTA ..." headers to guess the
+ * email address that this was originally delivered to.
+ * We extract just the MTA here by removing leading whitespace and
+ * assuming that the MTA name ends at the next whitespace.
+ * We test for *(by+4) to be non-'\0' to make sure there's
+ * something there at all - and then assume that the first
+ * whitespace delimited token that follows is the receiving
+ * system in this step of the receive chain
+ */
+ by = received;
+ while((by = strstr (by, " by ")) != NULL) {
+ by += 4;
+ if (*by == '\0')
+ break;
+ mta = xstrdup (by);
token = strtok(mta," \t");
if (token == NULL)
- return NULL;
+ break;
/* Now extract the last two components of the MTA host name
- * as domain and tld
+ * as domain and tld.
*/
while ((ptr = strsep (&token, delim)) != NULL) {
if (*ptr == '\0')
}
if (domain) {
- /* recombine domain and tld and look for it among the configured
- * email addresses
+ /* Recombine domain and tld and look for it among the configured
+ * email addresses.
+ * This time we have a known domain name and nothing else - so
+ * the test is the other way around: we check if this is a
+ * substring of one of the email addresses.
*/
*(tld-1) = '.';
- primary = notmuch_config_get_user_primary_email (config);
- if (strcasestr (primary, domain)) {
- free (mta);
- return primary;
+
+ if (strcasestr(primary, domain)) {
+ free(mta);
+ return primary;
+ }
+ for (i = 0; i < other_len; i++)
+ if (strcasestr (other[i],domain)) {
+ free(mta);
+ return other[i];
}
- other = notmuch_config_get_user_other_email (config, &other_len);
- for (i = 0; i < other_len; i++)
- if (strcasestr (other[i], domain)) {
- free (mta);
- return other[i];
- }
}
-
free (mta);
}
}
static int
-notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_t *query)
+notmuch_reply_format_default(void *ctx,
+ notmuch_config_t *config,
+ notmuch_query_t *query,
+ notmuch_show_params_t *params)
{
GMimeMessage *reply;
notmuch_messages_t *messages;
notmuch_message_t *message;
const char *subject, *from_addr = NULL;
const char *in_reply_to, *orig_references, *references;
+ const notmuch_show_format_t *format = &format_reply;
for (messages = notmuch_query_search_messages (query);
notmuch_messages_valid (messages);
g_mime_object_set_header (GMIME_OBJECT (reply),
"From", from_addr);
- g_mime_object_set_header (GMIME_OBJECT (reply), "Bcc",
- notmuch_config_get_user_primary_email (config));
-
in_reply_to = talloc_asprintf (ctx, "<%s>",
notmuch_message_get_message_id (message));
notmuch_message_get_header (message, "date"),
notmuch_message_get_header (message, "from"));
- show_message_body (notmuch_message_get_filename (message), reply_part);
+ show_message_body (notmuch_message_get_filename (message),
+ format, params);
notmuch_message_destroy (message);
}
/* This format is currently tuned for a git send-email --notmuch hook */
static int
-notmuch_reply_format_headers_only(void *ctx, notmuch_config_t *config, notmuch_query_t *query)
+notmuch_reply_format_headers_only(void *ctx,
+ notmuch_config_t *config,
+ notmuch_query_t *query,
+ unused (notmuch_show_params_t *params))
{
GMimeMessage *reply;
notmuch_messages_t *messages;
(void)add_recipients_from_message (reply, config, message);
- g_mime_object_set_header (GMIME_OBJECT (reply), "Bcc",
- notmuch_config_get_user_primary_email (config));
-
reply_headers = g_mime_object_to_string (GMIME_OBJECT (reply));
printf ("%s", reply_headers);
free (reply_headers);
notmuch_query_t *query;
char *opt, *query_string;
int i, ret = 0;
- int (*reply_format_func)(void *ctx, notmuch_config_t *config, notmuch_query_t *query);
+ int (*reply_format_func)(void *ctx, notmuch_config_t *config, notmuch_query_t *query, notmuch_show_params_t *params);
+ notmuch_show_params_t params;
reply_format_func = notmuch_reply_format_default;
+ params.part = -1;
+ params.cryptoctx = NULL;
for (i = 0; i < argc && argv[i][0] == '-'; i++) {
if (strcmp (argv[i], "--") == 0) {
fprintf (stderr, "Invalid value for --format: %s\n", opt);
return 1;
}
+ } else if ((STRNCMP_LITERAL (argv[i], "--decrypt") == 0)) {
+ if (params.cryptoctx == NULL) {
+ GMimeSession* session = g_object_new(notmuch_gmime_session_get_type(), NULL);
+ if (NULL == (params.cryptoctx = g_mime_gpg_context_new(session, "gpg")))
+ fprintf (stderr, "Failed to construct gpg context.\n");
+ else
+ g_mime_gpg_context_set_always_trust((GMimeGpgContext*)params.cryptoctx, FALSE);
+ g_object_unref (session);
+ session = NULL;
+ }
} else {
fprintf (stderr, "Unrecognized option: %s\n", argv[i]);
return 1;
return 1;
}
- if (reply_format_func (ctx, config, query) != 0)
+ if (reply_format_func (ctx, config, query, ¶ms) != 0)
return 1;
notmuch_query_destroy (query);
notmuch_database_close (notmuch);
+ if (params.cryptoctx)
+ g_object_unref(params.cryptoctx);
+
return ret;
}
projects / notmuch / blobdiff