From 634c66e987f4ab7e25c31fb4ef6bfe98308d368c Mon Sep 17 00:00:00 2001
From: mdecimus <mauro@stalw.art>
Date: Wed, 30 Aug 2023 17:49:12 +0200
Subject: [PATCH] Milter DATA command sent before headers

---
 crates/smtp/src/inbound/milter/message.rs | 6 +++---
 tests/src/smtp/inbound/milter.rs          | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/crates/smtp/src/inbound/milter/message.rs b/crates/smtp/src/inbound/milter/message.rs
index 29f58217..2de5a43b 100644
--- a/crates/smtp/src/inbound/milter/message.rs
+++ b/crates/smtp/src/inbound/milter/message.rs
@@ -217,6 +217,9 @@ impl<T: AsyncWrite + AsyncRead + IsTls + Unpin> Session<T> {
                 .assert_continue()?;
         }
 
+        // Data
+        client.data().await?.assert_continue()?;
+
         // Headers
         client
             .headers(message.raw_parsed_headers().iter().map(|(k, v)| {
@@ -228,9 +231,6 @@ impl<T: AsyncWrite + AsyncRead + IsTls + Unpin> Session<T> {
             .await?
             .assert_continue()?;
 
-        // Data
-        client.data().await?.assert_continue()?;
-
         // Message body
         let (action, modifications) = client.body(message.raw_message()).await?;
         action.assert_continue()?;
diff --git a/tests/src/smtp/inbound/milter.rs b/tests/src/smtp/inbound/milter.rs
index ed772c59..20ae7bf9 100644
--- a/tests/src/smtp/inbound/milter.rs
+++ b/tests/src/smtp/inbound/milter.rs
@@ -74,6 +74,7 @@ async fn milter_session() {
     hostname = "127.0.0.1"
     port = 9332
     #port = 11332
+    #port = 7357
     enable = true
     options.version = 6
     tls = false