#include "notmuch-client.h"
#include "gmime-filter-reply.h"
+#include "gmime-filter-headers.h"
+
+static void
+reply_part (GMimeObject *part,
+ unused (int *part_count));
+
+static const notmuch_show_format_t format_reply = {
+ NULL,
+ NULL, NULL,
+ NULL, NULL, NULL,
+ NULL, reply_part, NULL, NULL, NULL,
+ NULL, NULL,
+ NULL
+};
static void
reply_part_content (GMimeObject *part)
}
static void
-reply_part (GMimeObject *part, int *part_count)
+show_reply_headers (GMimeMessage *message)
+{
+ GMimeStream *stream_stdout = NULL, *stream_filter = NULL;
+
+ 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 (stream_filter) {
+ g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter),
+ g_mime_filter_headers_new());
+ g_mime_object_write_to_stream(GMIME_OBJECT(message), stream_filter);
+ g_object_unref(stream_filter);
+ }
+ g_object_unref(stream_stdout);
+ }
+}
+
+static void
+reply_part (GMimeObject *part,
+ unused (int *part_count))
{
GMimeContentDisposition *disposition;
GMimeContentType *content_type;
- (void) part_count;
disposition = g_mime_object_get_content_disposition (part);
if (disposition &&
strcmp (disposition->disposition, GMIME_DISPOSITION_ATTACHMENT) == 0)
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);
{
InternetAddressList *list;
+ if (recipients == NULL)
+ return NULL;
+
list = internet_address_list_parse_string (recipients);
if (list == NULL)
return NULL;
return add_recipients_for_address_list (message, config, type, list);
}
-/* Some mailing lists munge the Reply-To header despite it being A Bad
- * Thing, see http://www.unicom.com/pw/reply-to-harmful.html
- *
- * This function detects such munging so that reasonable headers can be
- * generated anyway. Returns 1 if munged, else 0.
- *
- * The current logic is fairly naive, Reply-To is diagnosed as munged if
- * it contains exactly one address, and this address is also present in
- * the To or Cc fields.
+/* Does the address in the Reply-To header of 'message' already appear
+ * in either the 'To' or 'Cc' header of the message?
*/
static int
-mailing_list_munged_reply_to (notmuch_message_t *message)
+reply_to_header_is_redundant (notmuch_message_t *message)
{
- const char *header, *addr;
+ const char *reply_to, *to, *cc, *addr;
InternetAddressList *list;
InternetAddress *address;
InternetAddressMailbox *mailbox;
- header = notmuch_message_get_header (message, "reply-to");
- list = internet_address_list_parse_string (header);
+ reply_to = notmuch_message_get_header (message, "reply-to");
+ if (reply_to == NULL || *reply_to == '\0')
+ return 0;
+
+ list = internet_address_list_parse_string (reply_to);
+
if (internet_address_list_length (list) != 1)
return 0;
+
address = internet_address_list_get_address (list, 0);
if (INTERNET_ADDRESS_IS_GROUP (address))
return 0;
+
mailbox = INTERNET_ADDRESS_MAILBOX (address);
addr = internet_address_mailbox_get_addr (mailbox);
- /* Note that strcasestr() is a GNU extension, strstr() might be sufficient */
- if (strcasestr (notmuch_message_get_header (message, "to"), addr) == 0 ||
- strcasestr (notmuch_message_get_header (message, "cc"), addr) == 0)
+
+ to = notmuch_message_get_header (message, "to");
+ cc = notmuch_message_get_header (message, "cc");
+
+ if ((to && strstr (to, addr) != 0) ||
+ (cc && strstr (cc, addr) != 0))
+ {
return 1;
- return 0; }
+ }
+
+ return 0;
+}
/* Augments the recipients of reply from the headers of message.
*
const char *from_addr = NULL;
unsigned int i;
- /* When we have detected Reply-To munging, we ignore the Reply-To
- * field (because it appears in the To or Cc headers) and use the
- * From header so that person will get pinged and will actually
- * receive the response if not subscribed to the list. Note that
- * under no circumstances does this fail to reply to the address in
- * the Reply-To header.
+ /* Some mailing lists munge the Reply-To header despite it being A Bad
+ * Thing, see http://www.unicom.com/pw/reply-to-harmful.html
+ *
+ * The munging is easy to detect, because it results in a
+ * redundant reply-to header, (with an address that already exists
+ * in either To or Cc). So in this case, we ignore the Reply-To
+ * field and use the From header. Thie ensures the original sender
+ * will get the reply even if not subscribed to the list. Note
+ * that the address in the Reply-To header will always appear in
+ * the reply.
*/
- if (mailing_list_munged_reply_to (message)) {
+ if (reply_to_header_is_redundant (message)) {
reply_to_map[0].header = "from";
reply_to_map[0].fallback = NULL;
}
if (from_addr == NULL)
from_addr = addr;
}
+
return from_addr;
}
+static const char *
+guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message)
+{
+ 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,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;
+
+ /* 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
+ */
+ 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)
+ break;
+ /* Now extract the last two components of the MTA host name
+ * as domain and tld.
+ */
+ while ((ptr = strsep (&token, delim)) != NULL) {
+ if (*ptr == '\0')
+ continue;
+ domain = tld;
+ tld = ptr;
+ }
+
+ if (domain) {
+ /* 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) = '.';
+
+ 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];
+ }
+ }
+ free (mta);
+ }
+
+ return NULL;
+}
+
static int
notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_t *query)
{
notmuch_message_t *message;
const char *subject, *from_addr = NULL;
const char *in_reply_to, *orig_references, *references;
- char *reply_headers;
+ const notmuch_show_format_t *format = &format_reply;
+ notmuch_show_params_t params;
+ params.part = -1;
for (messages = notmuch_query_search_messages (query);
- notmuch_messages_has_more (messages);
- notmuch_messages_advance (messages))
+ notmuch_messages_valid (messages);
+ notmuch_messages_move_to_next (messages))
{
message = notmuch_messages_get (messages);
}
subject = notmuch_message_get_header (message, "subject");
-
- if (strncasecmp (subject, "Re:", 3))
- subject = talloc_asprintf (ctx, "Re: %s", subject);
- g_mime_message_set_subject (reply, subject);
+ if (subject) {
+ if (strncasecmp (subject, "Re:", 3))
+ subject = talloc_asprintf (ctx, "Re: %s", subject);
+ g_mime_message_set_subject (reply, subject);
+ }
from_addr = add_recipients_from_message (reply, config, message);
+ if (from_addr == NULL)
+ from_addr = guess_from_received_header (config, message);
+
if (from_addr == NULL)
from_addr = notmuch_config_get_user_primary_email (config);
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));
g_mime_object_set_header (GMIME_OBJECT (reply),
"References", references);
- reply_headers = g_mime_object_to_string (GMIME_OBJECT (reply));
- printf ("%s", reply_headers);
- free (reply_headers);
+ show_reply_headers (reply);
g_object_unref (G_OBJECT (reply));
reply = NULL;
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, ¶ms);
notmuch_message_destroy (message);
}
char *reply_headers;
for (messages = notmuch_query_search_messages (query);
- notmuch_messages_has_more (messages);
- notmuch_messages_advance (messages))
+ notmuch_messages_valid (messages);
+ notmuch_messages_move_to_next (messages))
{
message = notmuch_messages_get (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);