[PATCH 11/20] cli/show: emit payload subject instead of outside subject

Daniel Kahn Gillmor dkg at fifthhorseman.net
Fri Jul 13 13:29:19 PDT 2018


On Thu 2018-06-28 21:40:04 -0300, David Bremner wrote:
> Daniel Kahn Gillmor <dkg at fifthhorseman.net> writes:
>
>>  
>>      sp->map_key (sp, "Subject");
>> -    sp->string (sp, g_mime_message_get_subject (message));
>> +    if (msg_crypto && msg_crypto->payload_subject) {
>> +	sp->string (sp, msg_crypto->payload_subject);
>> +    } else
>> +	sp->string (sp, g_mime_message_get_subject (message));
>
> This is not really an issue with your patch per se, but do we actually
> use this code for anything other than top level messages? I'm wondering
> because of my experiments with storing message-document level headers
> [1]. It seems difficult to look at the database when things are done at
> the GMime level like this.
>
> [1]      id:20180623014247.17834-1-david at tethera.net

hm, we might be also using this code (format_headers_sprinter() in
notmuch-show.c) for attached/forwarded messages.  what i wouldn't want
to happen is for an internal message to get its subject swapped out for
the top-level message's subject!

In the new draft of this series, i'm creating an
encrypted-message-with-forwarded-attachment to try to ensure that this
isn't a problem.  thanks for raising the issue.

      --dkg


More information about the notmuch mailing list