From 99bfcf2b678e7bd8125a7eb44409e46549bfc111 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Mon, 22 Jun 2020 17:27:18 +0100 Subject: Cutthrough: handle request when a callout-hold is active. Bug 2604 --- test/confs/5409 | 46 +++++++++++++++++++++++++++++++++++++++ test/log/5409 | 3 +++ test/scripts/5400-cutthrough/5409 | 29 ++++++++++++++++++++++++ test/stdout/5409 | 40 ++++++++++++++++++++++++++++++++++ 4 files changed, 118 insertions(+) create mode 100644 test/confs/5409 create mode 100644 test/log/5409 create mode 100644 test/scripts/5400-cutthrough/5409 create mode 100644 test/stdout/5409 (limited to 'test') diff --git a/test/confs/5409 b/test/confs/5409 new file mode 100644 index 000000000..be1415e0b --- /dev/null +++ b/test/confs/5409 @@ -0,0 +1,46 @@ +# Exim test configuration 5409 + +.include DIR/aux-var/std_conf_prefix + +primary_hostname = myhost.test.ex + +# ----- Main settings ----- + +domainlist local_domains = test.ex : *.test.ex + +acl_smtp_rcpt = acl_rcpt + +# ----- ACLs ------- + +begin acl + +acl_rcpt: + accept verify = recipient/callout=use_sender,hold,no_cache + control = cutthrough_delivery + + +# ----- Routers ----- + +begin routers + +all: + driver = manualroute + domains = ! +local_domains + route_list = * 127.0.0.1 + self = send + transport = smtp + no_more + + +# ----- Transports ----- + +begin transports + +smtp: + driver = smtp + interface = HOSTIPV4 + port = PORT_S + hosts_try_fastopen = : + + +# End diff --git a/test/log/5409 b/test/log/5409 new file mode 100644 index 000000000..37ad46794 --- /dev/null +++ b/test/log/5409 @@ -0,0 +1,3 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed diff --git a/test/scripts/5400-cutthrough/5409 b/test/scripts/5400-cutthrough/5409 new file mode 100644 index 000000000..c9d63d185 --- /dev/null +++ b/test/scripts/5400-cutthrough/5409 @@ -0,0 +1,29 @@ +# cutthrough_delivery preceded by recipient-verify/hold +need_ipv4 +# +server PORT_S +220 ESMTP +EHLO +250 OK +MAIL FROM: +250 Sender OK +RCPT TO: +250 Recipient OK +DATA +354 Send data +. +250 OK +QUIT +250 OK +**** +exim -bs -odf +EHLO myhost.test.ex +MAIL FROM: +RCPT TO: +DATA +Subject: test + +body +. +QUIT +**** diff --git a/test/stdout/5409 b/test/stdout/5409 new file mode 100644 index 000000000..a582bb8c3 --- /dev/null +++ b/test/stdout/5409 @@ -0,0 +1,40 @@ +220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +250-myhost.test.ex Hello CALLER at myhost.test.ex +250-SIZE 52428800 +250-8BITMIME +250-PIPELINING +250 HELP +250 OK +250 Accepted +354 Enter message, ending with "." on a line by itself +250 OK id=10HmaX-0005vi-00 +221 myhost.test.ex closing connection + +******** SERVER ******** +Listening on port 1224 ... +Connection request from [ip4.ip4.ip4.ip4] +220 ESMTP +EHLO myhost.test.ex +250 OK +MAIL FROM: +250 Sender OK +RCPT TO: +250 Recipient OK +DATA +354 Send data +Received: from CALLER (helo=myhost.test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from ) + id 10HmaX-0005vi-00 + for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 +Subject: test +Message-Id: +From: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +body +. +250 OK +QUIT +250 OK +End of script -- cgit v1.2.3