fix(host): Don't add unescaped meta headers to custom headers

src/model/messaging.rs

@@ -10,6 +10,7 @@ pub const MAX_BODY_LENGTH: usize = 768 * 1024;
 
 const HEADER_META: &str = "X-ExtEditorR";
 const HEADER_LOWER_META: &str = "x-exteditorr"; // cspell: disable-line
+const HEADER_LOWER_META_PREFIX: &str = "x-exteditorr-"; // cspell: disable-line
 const HEADER_NORMALISED_META: &str = "X-Exteditorr"; // normalised by Thunderbird, cspell: disable-line
 const HEADER_LOWER_ESCAPED_META: &str = "x-exteditorr-x-exteditorr"; // cspell: disable-line
 const HEADER_PRIORITY: &str = "X-ExtEditorR-Priority";
@@ -215,7 +216,7 @@ impl Compose {
                 break;
             }
             if let Some((header_name, header_value)) = line.split_once(':') {
-                self.process_header(header_name, header_value, &mut unknown_headers, false)?;
+                self.process_header(header_name, header_value, &mut unknown_headers)?;
             } else {
                 eprintln!("ExtEditorR failed to process header {line}");
             }
@@ -290,7 +291,6 @@ impl Compose {
         header_name: &str,
         header_value: &str,
         unknown_headers: &mut Vec<String>,
-        meta: bool,
     ) -> Result<()> {
         let header_name_lower = header_name.trim().to_lowercase();
         let header_value = header_value.trim();
@@ -359,7 +359,6 @@ impl Compose {
                             &format!("{HEADER_META}-{compact_header_name}"),
                             compact_header_value,
                             unknown_headers,
-                            true,
                         )?;
                     } else {
                         eprintln!("ExtEditorR failed to process header {compact_header}");
@@ -372,7 +371,9 @@ impl Compose {
                     header_value,
                 ));
             }
-            _ if !meta && header_name_lower.starts_with("x-") => {
+            _ if header_name_lower.starts_with("x-")
+                && !header_name_lower.starts_with(HEADER_LOWER_META_PREFIX) =>
+            {
                 // Thunderbird throws error if header name doesn't start with X-
                 self.compose_details
                     .custom_headers
@@ -1067,6 +1068,44 @@ pub mod tests {
         );
     }
 
+    #[test]
+    fn warn_unescaped_meta_headers_test() {
+        let eml = [
+            "X-ExtEditorR: Allow-X-Headers: true",
+            "X-ExtEditorR1: bar",
+            "X-ExtEditorR2-Foo: bar",
+            "X-ExtEditorR-Foo: bar",
+            "",
+            "This is a test.",
+            "",
+        ]
+        .join("\r\n");
+        let mut request = get_blank_compose();
+        let responses = request.merge_from_eml(&mut eml.as_bytes(), 512).unwrap();
+        assert_eq!(1, responses.len());
+        assert_eq!(1, responses[0].warnings.len());
+        assert_eq!("Unknown header(s) found", responses[0].warnings[0].title);
+        assert_eq!(
+            "ExtEditorR did not recognise the following headers:\n- X-ExtEditorR-Foo",
+            responses[0].warnings[0].message
+        );
+        assert_eq!(2, responses[0].compose_details.custom_headers.len());
+        assert_eq!(
+            CustomHeader {
+                name: "X-ExtEditorR1".to_string(),
+                value: "bar".to_string(),
+            },
+            responses[0].compose_details.custom_headers[0]
+        );
+        assert_eq!(
+            CustomHeader {
+                name: "X-ExtEditorR2-Foo".to_string(),
+                value: "bar".to_string(),
+            },
+            responses[0].compose_details.custom_headers[1]
+        );
+    }
+
     #[test]
     fn delete_send_on_exit_header_test() {
         let mut eml = "Subject: Hello\r\n\r\nThis is a test.\r\n".as_bytes();

src/model/thunderbird.rs

@@ -340,7 +340,7 @@ pub enum Newsgroups {
     Multiple(Vec<String>),
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
 pub struct CustomHeader {
     pub name: String,
     pub value: String,