debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 10:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: consider all instances of Delivered-To header

Browse source 
When using notmuch-reply and guessing the From: address from
Delivered-To headers, I had the wrong address chosen today. This was
because the messages from the notmuch list contain these headers in this
order:

Delivered-To: hannu.hartikainen@gmail.com
...
Delivered-To: hannu@hrtk.in

In my .notmuch-config I have the following configuration:

primary_email=hannu@hrtk.in
other_email=hannu.hartikainen@gmail.com;...

Before this change, notmuch-reply would guess From: @gmail.com because
that is the first Delivered-To header present. After the change, the
primary address is chosen as I would expect.
This commit is contained in:
Hannu Hartikainen 2021-07-02 12:13:09 +03:00 committed by David Bremner
parent 8c0bebedc5
commit 717e3dcdc3
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/message-file.c
View file

@ -291,11 +291,16 @@ _notmuch_message_file_get_header (notmuch_message_file_t *message,
if (value)
return value;
if (strcasecmp (header, "received") == 0) {
if (strcasecmp (header, "received") == 0 ||
strcasecmp (header, "delivered-to") == 0) {
/*
* The Received: header is special. We concatenate all
* instances of the header as we use this when analyzing the
* path the mail has taken from sender to recipient.
* The Received: header is special. We concatenate all instances of the
* header as we use this when analyzing the path the mail has taken
* from sender to recipient.
*
* Similarly, multiple instances of Delivered-To may be present. We
* concatenate them so the one with highest priority may be picked (eg.
* primary_email before other_email).
*/
decoded = _notmuch_message_file_get_combined_header (message, header);
} else {

7
notmuch-reply.c
View file

@ -464,8 +464,8 @@ guess_from_in_received_by (notmuch_database_t *notmuch, const char *received)
* (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 concatenated.
* The Received: header is among special ones in our get_header function
* and is always concatenated.
*
* Return the address that was found, if any, and NULL otherwise.
*/
@ -499,6 +499,9 @@ guess_from_in_received_headers (notmuch_message_t *message)
* headers: Envelope-To, X-Original-To, and Delivered-To (searched in
* that order).
*
* The Delivered-To: header is among special ones in our get_header
* function and is always concatenated.
*
* Return the address that was found, if any, and NULL otherwise.
*/
static const char *

1
test/T220-reply.sh
View file

@ -246,7 +246,6 @@ On Tue, 05 Jan 2010 15:43:56 -0000, Sender <sender@example.com> wrote:
OK"
test_begin_subtest "From guessing: multiple Delivered-To"
test_subtest_known_broken
add_message '[from]="Sender <sender@example.com>"' \
'[to]="Recipient <recipient@example.com>"' \
'[subject]="From guessing"' \