Use dsn_from for success-DSN messages. Bug 2404

[exim.git] / test / scripts / 5840-DANE-OpenSSL / 5840

diff --git a/test/scripts/5840-DANE-OpenSSL/5840 b/test/scripts/5840-DANE-OpenSSL/5840
index e031b5d8fadee8a4362f904ff8f087f578ccd27f..4d88131eac4eb0e593abf5ace1354e0e8cd5dce9 100644 (file)
--- a/test/scripts/5840-DANE-OpenSSL/5840
+++ b/test/scripts/5840-DANE-OpenSSL/5840
@@ -2,11 +2,11 @@
 #
 exim -DSERVER=server -DDETAILS=ee -bd -oX PORT_D
 ****
 #
 exim -DSERVER=server -DDETAILS=ee -bd -oX PORT_D
 ****

-# TLSA (3 1 1)
+### TLSA (3 1 1)

 exim -odq CALLER@dane256ee.test.ex
 Testing
 ****
 exim -odq CALLER@dane256ee.test.ex
 Testing
 ****

-# TLSA (3 1 2)
+### TLSA (3 1 2)

 exim -odq CALLER@mxdane512ee.test.ex
 Testing
 ****
 exim -odq CALLER@mxdane512ee.test.ex
 Testing
 ****


@@ -14,40 +14,45 @@ exim -qf
 ****
 #
 #
 ****
 #
 #

-# Recipient callout
+### Recipient callout

 exim -DOPT=callout -bhc 127.0.0.1
 MAIL FROM: <CALLER@myhost.test.ex>
 exim -DOPT=callout -bhc 127.0.0.1
 MAIL FROM: <CALLER@myhost.test.ex>

-RCPT TO: <CALLER@dane256ee.test.ex>
+RCPT TO: <rcptuser@dane256ee.test.ex>

 ****
 killdaemon
 #
 #
 exim -DSERVER=server -DDETAILS=ta -bd -oX PORT_D
 ****
 ****
 killdaemon
 #
 #
 exim -DSERVER=server -DDETAILS=ta -bd -oX PORT_D
 ****

-# TLSA (2 0 1)
-exim -odq CALLER@mxdane256ta.test.ex
+### TLSA (2 0 1)
+exim -odf CALLER@mxdane256ta.test.ex

 Testing
 ****
 Testing
 ****

-exim -qf
+killdaemon
+#
+# OpenSSL-specific regression testcase: certificate having Authority Key ID extension
+exim -DSERVER=server -DCERT=DIR/aux-fixed/exim-ca/example.com/server2.example.com/fullchain.pem -DALLOW=DIR/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key -bd -oX PORT_D
+****
+### TLSA (2 1 1)
+exim -odf CALLER@mxdane256tak.test.ex
+Testing

 ****
 killdaemon
 #
 ****
 killdaemon
 #

-# A server with a nonverifying cert and no TLSA
+### A server with a nonverifying cert and no TLSA

 # Check we get a non-CV but TLS connection, with try_dane but no require_dane
 exim -DSERVER=server -DDETAILS=no -bd -oX PORT_D
 ****
 # Check we get a non-CV but TLS connection, with try_dane but no require_dane
 exim -DSERVER=server -DDETAILS=no -bd -oX PORT_D
 ****

-exim -odq CALLER@thishost.test.ex
+exim -odf CALLER@thishost.test.ex

 Testing
 ****
 Testing
 ****

-exim -qf
-****

 killdaemon
 #
 killdaemon
 #

-# A server with a verifying cert and no TLSA
+### A server with a verifying cert and no TLSA

 # Check we get a CV and TLS connection, with try_dane but no require_dane
 exim -DSERVER=server -DDETAILS=ca -bd -oX PORT_D
 ****
 # Check we get a CV and TLS connection, with try_dane but no require_dane
 exim -DSERVER=server -DDETAILS=ca -bd -oX PORT_D
 ****

-exim -odq CALLER@thishost.test.ex
+exim -odf -DDETAILS=ca CALLER@thishost.test.ex

 Testing
 ****
 exim -DOPT=no_certname -qf
 Testing
 ****
 exim -DOPT=no_certname -qf


@@ -55,14 +60,70 @@ exim -DOPT=no_certname -qf
 killdaemon
 #
 #
 killdaemon
 #
 #

-# A server with two MXs for which both TLSA lookups return defer

 exim -DSERVER=server -DDETAILS=ee -bd -oX PORT_D
 ****
 exim -DSERVER=server -DDETAILS=ee -bd -oX PORT_D
 ****

-# TLSA (3 1 2)
+### A server with two MXs for which both TLSA lookups return defer (delivery should defer)

 exim -odq CALLER@mxdanelazy.test.ex
 Testing
 ****
 exim -odq CALLER@mxdanelazy.test.ex
 Testing
 ****

+### A server lacking a TLSA, dane required (should fail)
+exim -odq CALLER@dane.no.1.test.ex
+Testing
+****
+### A server lacking a TLSA, dane requested only (should deliver, non-DANE, as the NXDOMAIN is not DNSSEC)
+exim -odq CALLER@dane.no.2.test.ex
+Testing
+****
+### A server where the A is dnssec and the TLSA lookup _fails_ (delivery should defer)
+exim -odq CALLER@danebroken1.test.ex
+Testing
+****
+### A server securely saying "no TLSA records here", dane required (delivery should fail)
+exim -odq CALLER@dane.no.3.test.ex
+Testing
+****
+### A server securely saying "no TLSA records here", dane requested only (should deliver)
+exim -odq CALLER@dane.no.4.test.ex
+Testing
+****

 exim -qf
 ****
 exim -qf
 ****

+#
+### A server securely serving a wrong TLSA record, dane requested only (delivery should fail)
+exim -odf CALLER@danebroken2.test.ex
+Testing
+****
+### A server insecurely serving a good TLSA record, dane requested only (should deliver, non-DANE)
+exim -odf CALLER@danebroken3.test.ex
+Testing
+****
+### A server insecurely serving a good TLSA record, dane required (delivery should fail)
+exim -odf CALLER@danebroken4.test.ex
+Testing
+****
+### A server insecurely serving a good A record, dane requested only (should deliver, non-DANE)
+exim -odf CALLER@danebroken5.test.ex
+Testing
+****
+### A server insecurely serving a good A record, dane required (delivery should fail)
+exim -odf CALLER@danebroken6.test.ex
+Testing
+****
+#
+killdaemon
+
+
+### A server with a name not matching the cert.  TA-mode; should fail
+exim -DSERVER=server -DDETAILS=cert.net -bd -oX PORT_D
+****
+exim -odf CALLER@danebroken7.example.com
+Testing
+****
+#
+### A server with a name not matching the cert.  EE-mode; should deliver and claim DANE mode
+exim -odf CALLER@danebroken8.example.com
+Testing
+****
+#

 killdaemon
 no_msglog_check
 killdaemon
 no_msglog_check