From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Mon, 26 Mar 2018 14:53:49 +0000 (+0100)
Subject: Cutthrough: enforce non-use in combination with DKIM signing or transport filter
X-Git-Tag: exim-4.92-RC1~216^2~11
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/cb387849bcd092eab3a7dbebb7580db044eff0bd

Cutthrough: enforce non-use in combination with DKIM signing or transport filter

Broken-by: 02b41d7106
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index af186d2e3..9a05c3471 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -160,6 +160,10 @@ JH/28 Ensure that variables possibly set during message acceptance are marked
 PP/02 DANE: add dane_require_tls_ciphers SMTP Transport option; if unset,
       tls_require_ciphers is used as before.
 
+JH/34 Re-introduce enforcement of no cutthrough delivery on transports having
+      transport-filters or DKIM-signing.  The restriction was lost in the
+      consolidation of verify-callout and delivery SMTP handling.
+
 
 Exim version 4.90
 -----------------
diff --git a/src/src/verify.c b/src/src/verify.c
index 9582fe5b7..1df856604 100644
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -1026,6 +1026,20 @@ no_conn:
     here is where we want to leave the conn open.  Ditto for a lazy-close
     verify. */
 
+    if (cutthrough.delivery)
+      {
+      if (addr->transport->filter_command)
+        {
+        cutthrough.delivery= FALSE;
+        HDEBUG(D_acl|D_v) debug_printf("Cutthrough cancelled by presence of transport filter\n");
+        }
+      if (ob->dkim.dkim_domain)
+        {
+        cutthrough.delivery= FALSE;
+        HDEBUG(D_acl|D_v) debug_printf("Cutthrough cancelled by presence of DKIM signing\n");
+        }
+      }
+
     if (  (cutthrough.delivery || options & vopt_callout_hold)
        && rcpt_count == 1
        && done