From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Tue, 13 Oct 2015 16:04:03 +0000 (+0100)
Subject: Check maximum (folded) line length in default spec file data ACL and smtp transport... 
X-Git-Tag: exim-4_87_RC1~77
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8c952127a4d1827ea14da68d94eb5ea8d6174a35;p=exim.git

Check maximum (folded) line length in default spec file data ACL and smtp transport.  Bug 1684
---

diff --git a/src/src/configure.default b/src/src/configure.default
index 3223bffae..ec60700df 100644
--- a/src/src/configure.default
+++ b/src/src/configure.default
@@ -492,6 +492,11 @@ acl_check_rcpt:
 
 acl_check_data:
 
+  # Deny if the message contains an overlong line.  Per the standards
+  # we should never receive one such via SMTP.
+  #
+  deny    condition  = ${if > {$max_received_linelength}{998}}
+
   # Deny if the message contains a virus. Before enabling this check, you
   # must install a virus scanner and set the av_scanner option above.
   #
@@ -684,9 +689,13 @@ begin transports
 
 
 # This transport is used for delivering messages over SMTP connections.
+# Refuse to send any messsage with over-long lines, which could have
+# been receved other than via SMTP. The use of message_size_limit to
+# enforce this is a red herring.
 
 remote_smtp:
   driver = smtp
+  message_size_limit = ${if > {$max_received_linelength}{998} {1}{0}}
 
 
 # This transport is used for local delivery to user mailboxes in traditional