v0.4.7

Author: mdecimus

CHANGELOG.md

@@ -1,3 +1,10 @@
+mail-parser 0.4.7
+================================
+- Retrieving message headers in order (#19)
+- Added `get_raw_headers` and `get_header` methods.
+- Support for malformed Return-Path fields.
+- Support for ks_c_5601 charsets (#20)
+
 mail-parser 0.4.6
 ================================
 - DateTime is_valid() fix (#15)

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "mail-parser"
 description = "Fast and robust e-mail parsing library for Rust"
-version = "0.4.6"
+version = "0.4.7"
 edition = "2018"
 authors = [ "Stalwart Labs <hello@stalw.art>"]
 license = "Apache-2.0 OR MIT"

Cargo.toml

@@ -1048,8 +1048,13 @@ impl<'x> Message<'x> {
     }
 
     /// Returns all headers in raw format
-    pub fn get_raw_headers(&self) -> &[(HeaderName, HeaderOffset)] {
-        &self.headers_raw
+    pub fn get_raw_headers(&self) -> impl Iterator<Item = (&HeaderName, Cow<str>)> {
+        self.headers_raw.iter().map(move |(name, offset)| {
+            (
+                name,
+                String::from_utf8_lossy(&self.raw_message[offset.start..offset.end]),
+            )
+        })
     }
 
     pub fn _get_raw(&'x self, name: HeaderName) -> Option<Vec<Cow<'x, str>>> {

src/lib.rs

@@ -73,6 +73,7 @@ pub fn parse_and_ignore(stream: &mut MessageStream) {
 mod tests {
     use crate::parsers::fields::raw::parse_raw;
     use crate::parsers::message::MessageStream;
+    use crate::{HeaderName, Message, RfcHeader};
 
     #[test]
     fn parse_raw_text() {
@@ -103,4 +104,53 @@ mod tests {
             );
         }
     }
+
+    #[test]
+    fn ordered_raw_headers() {
+        let input = br#"From: Art Vandelay <art@vandelay.com>
+To: jane@example.com
+Date: Sat, 20 Nov 2021 14:22:01 -0800
+Subject: Why not both importing AND exporting? =?utf-8?b?4pi6?=
+Content-Type: multipart/mixed; boundary="festivus";
+
+Here's a message body.
+"#;
+        let message = Message::parse(input).unwrap();
+        let mut iter = message.get_raw_headers();
+        assert_eq!(
+            iter.next().unwrap(),
+            (
+                &HeaderName::Rfc(RfcHeader::From),
+                " Art Vandelay <art@vandelay.com>\n".into()
+            )
+        );
+        assert_eq!(
+            iter.next().unwrap(),
+            (
+                &HeaderName::Rfc(RfcHeader::To),
+                " jane@example.com\n".into()
+            )
+        );
+        assert_eq!(
+            iter.next().unwrap(),
+            (
+                &HeaderName::Rfc(RfcHeader::Date),
+                " Sat, 20 Nov 2021 14:22:01 -0800\n".into()
+            )
+        );
+        assert_eq!(
+            iter.next().unwrap(),
+            (
+                &HeaderName::Rfc(RfcHeader::Subject),
+                " Why not both importing AND exporting? =?utf-8?b?4pi6?=\n".into()
+            )
+        );
+        assert_eq!(
+            iter.next().unwrap(),
+            (
+                &HeaderName::Rfc(RfcHeader::ContentType),
+                " multipart/mixed; boundary=\"festivus\";\n".into()
+            )
+        );
+    }
 }