Remove CRLF from Milter headers

crates/smtp/src/inbound/milter/client.rs

@@ -227,14 +227,14 @@ impl<T: AsyncRead + AsyncWrite + Unpin> MilterClient<T> {
     pub async fn headers<I, H, V>(&mut self, headers: I) -> super::Result<Action>
     where
         I: Iterator<Item = (H, V)>,
-        H: AsRef<[u8]>,
-        V: AsRef<[u8]>,
+        H: AsRef<str>,
+        V: AsRef<str>,
     {
         if !self.has_option(SMFIP_NOHDRS) {
             for (name, value) in headers {
                 self.write(Command::Header {
-                    name: name.as_ref(),
-                    value: value.as_ref(),
+                    name: name.as_ref().trim().as_bytes(),
+                    value: value.as_ref().trim().as_bytes(),
                 })
                 .await?;
                 if !self.has_option(SMFIP_NR_HDR) {

crates/smtp/src/inbound/milter/message.rs

@@ -219,7 +219,12 @@ impl<T: AsyncWrite + AsyncRead + IsTls + Unpin> Session<T> {
 
         // Headers
         client
-            .headers(message.raw_parsed_headers().iter().cloned())
+            .headers(message.raw_parsed_headers().iter().map(|(k, v)| {
+                (
+                    std::str::from_utf8(k).unwrap_or_default(),
+                    std::str::from_utf8(v).unwrap_or_default(),
+                )
+            }))
             .await?
             .assert_continue()?;