From cfe93a9508babb25875c25b5eb3060a83ddf278e Mon Sep 17 00:00:00 2001 From: "Heiko Schlittermann (HS12-RIPE)" Date: Sat, 12 Nov 2016 13:42:20 +0100 Subject: [PATCH] Testsuite: Add verbose comments to 5840 --- test/scripts/5840-DANE-OpenSSL/5840 | 20 ++++++++++---------- test/stderr/5840 | 26 ++++++++++++++++++++++---- test/stdout/5840 | 20 ++++++++++++++++++++ 3 files changed, 52 insertions(+), 14 deletions(-) diff --git a/test/scripts/5840-DANE-OpenSSL/5840 b/test/scripts/5840-DANE-OpenSSL/5840 index 143bf615b..d1da54913 100644 --- 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 **** -# TLSA (3 1 1) +### TLSA (3 1 1) exim -odq CALLER@dane256ee.test.ex Testing **** -# TLSA (3 1 2) +### TLSA (3 1 2) exim -odq CALLER@mxdane512ee.test.ex Testing **** @@ -14,17 +14,17 @@ exim -qf **** # # -# Recipient callout +### Recipient callout exim -DOPT=callout -bhc 127.0.0.1 MAIL FROM: -RCPT TO: +RCPT TO: **** killdaemon # # exim -DSERVER=server -DDETAILS=ta -bd -oX PORT_D **** -# TLSA (2 0 1) +### TLSA (2 0 1) exim -odq CALLER@mxdane256ta.test.ex Testing **** @@ -32,7 +32,7 @@ exim -qf **** 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 **** @@ -43,7 +43,7 @@ exim -qf **** 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 **** @@ -57,15 +57,15 @@ killdaemon # exim -DSERVER=server -DDETAILS=ee -bd -oX PORT_D **** -# A server with two MXs for which both TLSA lookups return defer +### A server with two MXs for which both TLSA lookups return defer exim -odq CALLER@mxdanelazy.test.ex Testing **** -# A server lacking a TLSA, required +### A server lacking a TLSA, required exim -odq CALLER@dane.no.1.test.ex Testing **** -# A server lacking a TLSA, requested only +### A server lacking a TLSA, requested only exim -odq CALLER@dane.no.2.test.ex Testing **** diff --git a/test/stderr/5840 b/test/stderr/5840 index b4b035a29..d9d4e7a1c 100644 --- a/test/stderr/5840 +++ b/test/stderr/5840 @@ -1,3 +1,6 @@ +### TLSA (3 1 1) +### TLSA (3 1 2) +### Recipient callout >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -9,14 +12,14 @@ >>> processing "accept" >>> check verify = recipient/callout >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> ->>> routing CALLER@dane256ee.test.ex +>>> routing rcptuser@dane256ee.test.ex >>> calling client router >>> dane256ee.test.ex in "*"? yes (matched "*") >>> local host found for non-MX address >>> routed by client router >>> Attempting full verification using callout >>> callout cache: no domain record found for dane256ee.test.ex ->>> callout cache: no address record found for CALLER@dane256ee.test.ex +>>> callout cache: no address record found for rcptuser@dane256ee.test.ex >>> interface=NULL port=1225 >>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:1225 ... connected MUNGED: ::1 will be omitted in what follows @@ -52,7 +55,7 @@ MUNGED: ::1 will be omitted in what follows >>> SMTP>> MAIL FROM:<> >>> cmd buf flush 14 bytes >>> SMTP<< 250 OK ->>> SMTP>> RCPT TO: +>>> SMTP>> RCPT TO: >>> cmd buf flush 38 bytes >>> SMTP<< 250 Accepted >>> SMTP>> QUIT @@ -60,10 +63,25 @@ MUNGED: ::1 will be omitted in what follows >>> SMTP(close)>> >>> wrote callout cache domain record for dane256ee.test.ex: >>> result=1 postmaster=0 random=0 ->>> wrote positive callout cache address record for CALLER@dane256ee.test.ex +>>> wrote positive callout cache address record for rcptuser@dane256ee.test.ex >>> ----------- end verify ------------ >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT LOG: unexpected disconnection while reading SMTP command from [127.0.0.1] +### TLSA (2 0 1) +### A server with a nonverifying cert and no TLSA +### A server with a verifying cert and no TLSA +### A server with two MXs for which both TLSA lookups return defer +### A server lacking a TLSA, required +### A server lacking a TLSA, requested only ******** SERVER ******** +### TLSA (3 1 1) +### TLSA (3 1 2) +### Recipient callout +### TLSA (2 0 1) +### A server with a nonverifying cert and no TLSA +### A server with a verifying cert and no TLSA +### A server with two MXs for which both TLSA lookups return defer +### A server lacking a TLSA, required +### A server lacking a TLSA, requested only diff --git a/test/stdout/5840 b/test/stdout/5840 index 0829c56fc..1d94564ad 100644 --- a/test/stdout/5840 +++ b/test/stdout/5840 @@ -1,3 +1,6 @@ +### TLSA (3 1 1) +### TLSA (3 1 2) +### Recipient callout **** SMTP testing session as if from host 127.0.0.1 **** but without any ident (RFC 1413) callback. @@ -7,3 +10,20 @@ 250 OK 250 Accepted 421 myhost.test.ex lost input connection +### TLSA (2 0 1) +### A server with a nonverifying cert and no TLSA +### A server with a verifying cert and no TLSA +### A server with two MXs for which both TLSA lookups return defer +### A server lacking a TLSA, required +### A server lacking a TLSA, requested only + +******** SERVER ******** +### TLSA (3 1 1) +### TLSA (3 1 2) +### Recipient callout +### TLSA (2 0 1) +### A server with a nonverifying cert and no TLSA +### A server with a verifying cert and no TLSA +### A server with two MXs for which both TLSA lookups return defer +### A server lacking a TLSA, required +### A server lacking a TLSA, requested only -- 2.30.2