X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-reply.c;h=230cacc34fc539f1c1714ee83f0c86738a99ddbf;hp=31679a57225e1f2212797f05575c4aeef307a625;hb=8c8079a8b14fac5e8ca6b682e5c76e08a824f2e7;hpb=9953e9a5a85b3ffbf62b86a6aa9bd0322d425f81 diff --git a/notmuch-reply.c b/notmuch-reply.c index 31679a57..230cacc3 100644 --- a/notmuch-reply.c +++ b/notmuch-reply.c @@ -22,6 +22,7 @@ #include "notmuch-client.h" #include "gmime-filter-reply.h" +#include "gmime-filter-headers.h" static void reply_part_content (GMimeObject *part) @@ -51,6 +52,25 @@ reply_part_content (GMimeObject *part) g_object_unref(stream_stdout); } +static void +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, int *part_count) { @@ -188,18 +208,11 @@ add_recipients_for_string (GMimeMessage *message, 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; InternetAddressList *list; @@ -207,6 +220,9 @@ mailing_list_munged_reply_to (notmuch_message_t *message) InternetAddressMailbox *mailbox; header = notmuch_message_get_header (message, "reply-to"); + if (*header == '\0') + return 0; + list = internet_address_list_parse_string (header); if (internet_address_list_length (list) != 1) @@ -219,9 +235,8 @@ mailing_list_munged_reply_to (notmuch_message_t *message) 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) + if (strstr (notmuch_message_get_header (message, "to"), addr) != 0 || + strstr (notmuch_message_get_header (message, "cc"), addr) != 0) { return 1; } @@ -252,14 +267,18 @@ add_recipients_from_message (GMimeMessage *reply, 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; } @@ -283,6 +302,68 @@ add_recipients_from_message (GMimeMessage *reply, return from_addr; } +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; + char *domain=NULL; + char *tld=NULL; + const char *delim=". \t"; + size_t i,other_len; + + received = notmuch_message_get_header (message, "received"); + 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 + */ + mta = strdup (by+4); + if (mta == NULL) + return NULL; + token = strtok(mta," \t"); + if (token == NULL) + return NULL; + /* 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 + */ + *(tld-1) = '.'; + primary = notmuch_config_get_user_primary_email (config); + if (strcasestr (primary, domain)) { + free (mta); + return primary; + } + 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); + } + + return NULL; +} + static int notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_t *query) { @@ -291,11 +372,10 @@ notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_ notmuch_message_t *message; const char *subject, *from_addr = NULL; const char *in_reply_to, *orig_references, *references; - 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); @@ -307,13 +387,15 @@ notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_ } 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); 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); @@ -340,9 +422,7 @@ notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_ 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; @@ -369,8 +449,8 @@ notmuch_reply_format_headers_only(void *ctx, notmuch_config_t *config, notmuch_q 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);