X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-reply.c;h=cb42de45b300acc0615080796c30c6e06fd08359;hp=0cda72dcf05488be170faca9bd9a6e63f6c3e054;hb=fddd3d831b6a34a47b1e68fcaa1bc63d54240df5;hpb=c8b50eee284ff880aed955018568a14eff03d129 diff --git a/notmuch-reply.c b/notmuch-reply.c index 0cda72dc..cb42de45 100644 --- a/notmuch-reply.c +++ b/notmuch-reply.c @@ -23,17 +23,6 @@ #include "notmuch-client.h" #include "gmime-filter-reply.h" -static const struct { - const char *header; - const char *fallback; - GMimeRecipientType recipient_type; -} reply_to_map[] = { - { "reply-to", "from", GMIME_RECIPIENT_TYPE_TO }, - { "to", NULL, GMIME_RECIPIENT_TYPE_TO }, - { "cc", NULL, GMIME_RECIPIENT_TYPE_CC }, - { "bcc", NULL, GMIME_RECIPIENT_TYPE_BCC } -}; - static void reply_part_content (GMimeObject *part) { @@ -199,16 +188,101 @@ 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. + */ +static int +mailing_list_munged_reply_to (notmuch_message_t *message) +{ + const char *header, *addr; + InternetAddressList *list; + InternetAddress *address; + InternetAddressMailbox *mailbox; + + header = notmuch_message_get_header (message, "reply-to"); + list = internet_address_list_parse_string (header); + 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) + return 1; + return 0; } + +/* Augments the recipients of reply from the headers of message. + * + * If any of the user's addresses were found in these headers, the first + * of these returned, otherwise NULL is returned. + */ +static const char * +add_recipients_from_message (GMimeMessage *reply, + notmuch_config_t *config, + notmuch_message_t *message) +{ + struct { + const char *header; + const char *fallback; + GMimeRecipientType recipient_type; + } reply_to_map[] = { + { "reply-to", "from", GMIME_RECIPIENT_TYPE_TO }, + { "to", NULL, GMIME_RECIPIENT_TYPE_TO }, + { "cc", NULL, GMIME_RECIPIENT_TYPE_CC }, + { "bcc", NULL, GMIME_RECIPIENT_TYPE_BCC } + }; + 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. + */ + if (mailing_list_munged_reply_to (message)) { + reply_to_map[0].header = "from"; + reply_to_map[0].fallback = NULL; + } + + for (i = 0; i < ARRAY_SIZE (reply_to_map); i++) { + const char *addr, *recipients; + + recipients = notmuch_message_get_header (message, + reply_to_map[i].header); + if ((recipients == NULL || recipients[0] == '\0') && reply_to_map[i].fallback) + recipients = notmuch_message_get_header (message, + reply_to_map[i].fallback); + + addr = add_recipients_for_string (reply, config, + reply_to_map[i].recipient_type, + recipients); + if (from_addr == NULL) + from_addr = addr; + } + return from_addr; +} + static int notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_t *query) { GMimeMessage *reply; notmuch_messages_t *messages; notmuch_message_t *message; - const char *subject, *recipients, *from_addr = NULL; + const char *subject, *from_addr = NULL; const char *in_reply_to, *orig_references, *references; char *reply_headers; - unsigned int i; for (messages = notmuch_query_search_messages (query); notmuch_messages_has_more (messages); @@ -229,21 +303,7 @@ notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_ subject = talloc_asprintf (ctx, "Re: %s", subject); g_mime_message_set_subject (reply, subject); - for (i = 0; i < ARRAY_SIZE (reply_to_map); i++) { - const char *addr; - - recipients = notmuch_message_get_header (message, - reply_to_map[i].header); - if ((recipients == NULL || recipients[0] == '\0') && reply_to_map[i].fallback) - recipients = notmuch_message_get_header (message, - reply_to_map[i].fallback); - - addr = add_recipients_for_string (reply, config, - reply_to_map[i].recipient_type, - recipients); - if (from_addr == NULL) - from_addr = addr; - } + from_addr = add_recipients_from_message (reply, config, message); if (from_addr == NULL) from_addr = notmuch_config_get_user_primary_email (config); @@ -296,9 +356,8 @@ notmuch_reply_format_headers_only(void *ctx, notmuch_config_t *config, notmuch_q GMimeMessage *reply; notmuch_messages_t *messages; notmuch_message_t *message; - const char *recipients, *in_reply_to, *orig_references, *references; + const char *in_reply_to, *orig_references, *references; char *reply_headers; - unsigned int i; for (messages = notmuch_query_search_messages (query); notmuch_messages_has_more (messages); @@ -332,19 +391,7 @@ notmuch_reply_format_headers_only(void *ctx, notmuch_config_t *config, notmuch_q g_mime_object_set_header (GMIME_OBJECT (reply), "References", references); - for (i = 0; i < ARRAY_SIZE (reply_to_map); i++) { - const char *addr; - - recipients = notmuch_message_get_header (message, - reply_to_map[i].header); - if ((recipients == NULL || recipients[0] == '\0') && reply_to_map[i].fallback) - recipients = notmuch_message_get_header (message, - reply_to_map[i].fallback); - - addr = add_recipients_for_string (reply, config, - reply_to_map[i].recipient_type, - recipients); - } + (void)add_recipients_from_message (reply, config, message); g_mime_object_set_header (GMIME_OBJECT (reply), "Bcc", notmuch_config_get_user_primary_email (config));