jmap_mail.c: NFC-normalize asText header values before encoding

cyrusimap · Jun 3, 2024 · c680294 · c680294
1 parent 30086f9
commit c680294
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/cassandane/tiny-tests/JMAPEmail/email_set_header_nfc b/cassandane/tiny-tests/JMAPEmail/email_set_header_nfc
@@ -31,7 +31,8 @@ sub test_email_set_header_nfc
                     to => [{
                         email => $nonNfcEmailAddress,
                     }],
-                    'header:x-my-header' => "$nonNfcXHeaderValue",
+                    'header:x-my-header' => $nonNfcXHeaderValue,
+                    'header:x-my-header2:asText' => $nonNfcXHeaderValue,
                     mailboxIds => {
                         '$inbox' => JSON::true,
                     },
@@ -55,6 +56,8 @@ sub test_email_set_header_nfc
                 'header:to',
                 'header:x-my-header:asText',
                 'header:x-my-header',
+                'header:x-my-header2:asText',
+                'header:x-my-header2',
             ],
         }, 'R2'],
     ]);
@@ -67,4 +70,8 @@ sub test_email_set_header_nfc
         $res->[1][1]{list}[0]{'header:x-my-header:asText'});
     $self->assert_str_equals(" $nonNfcXHeaderValue",
         $res->[1][1]{list}[0]{'header:x-my-header'});
+    $self->assert_str_equals($normalizedXHeaderValue,
+        $res->[1][1]{list}[0]{'header:x-my-header2:asText'});
+    $self->assert_str_equals(" =?UTF-8?Q?0.5=C3=85?=",
+        $res->[1][1]{list}[0]{'header:x-my-header2'});
 }
diff --git a/imap/jmap_mail.c b/imap/jmap_mail.c
@@ -9200,6 +9200,8 @@ static json_t *_header_from_text(json_t *jtext,
     /* Parse a Text header into raw form */
     if (json_is_string(jtext)) {
         const char *s = json_string_value(jtext);
+        char *nfc_s = charset_utf8_normalize(s);
+        s = nfc_s ? nfc_s : s;
         char *tmp = charset_encode_mimeheader(s, strlen(s), 0);
         struct buf val = BUF_INITIALIZER;
         /* If text got folded, then the first line of the encoded
@@ -9208,6 +9210,7 @@ static json_t *_header_from_text(json_t *jtext,
          * clients are doing this, this seems not to be an issue and
          * allows us to not start the header value with a line fold. */
         buf_setcstr(&val, tmp);
+        free(nfc_s);
         free(tmp);
         return _header_make(header_name, prop_name, &val, parser);
     }