X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/f652fa8083925080b92b02897f1ee872ff2d3bba..65766f1b723ea2e16d7ebebeeb6367147098bd18:/test/confs/5890

diff --git a/test/confs/5890 b/test/confs/5890
index bd0b77df2..f1aa9a2ae 100644
--- a/test/confs/5890
+++ b/test/confs/5890
@@ -1,10 +1,116 @@
 # Exim test configuration 5890
-# DANE common
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+SERVER =
+OPTION = NORMAL
+
+.include DIR/aux-var/tls_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
 
 # ----- Main settings -----
 
+domainlist local_domains = test.ex : *.test.ex
+
+acl_smtp_helo = check_helo
+acl_smtp_rcpt = check_recipient
+log_selector = +received_recipients +tls_resumption +tls_peerdn
+
+tls_advertise_hosts = *
+
+# Set certificate only if server
+
+CDIR=DIR/aux-fixed/exim-ca/example.com
+
+tls_certificate = CDIR/server1.example.com/server1.example.com.chain.pem
+tls_privatekey =  CDIR/server1.example.com/server1.example.com.unlocked.key
+tls_ocsp_file =   CDIR/server1.example.com/server1.example.com.ocsp.good.resp
+
+tls_require_ciphers = OPTION
+tls_resumption_hosts = 127.0.0.1
+
+
+# ------ ACL ------
+
+begin acl
+
+check_helo:
+  accept  condition =	${if def:tls_in_cipher}
+	  logwrite =	tls_in_resumption\t${listextract {$tls_in_resumption} {_RESUME_DECODE}}
+	  logwrite =	our cert subject\t${certextract {subject}{$tls_in_ourcert}}
+	  logwrite =	peer cert subject\t${certextract {subject}{$tls_in_peercert}}
+	  logwrite =	peer cert verified\t${tls_in_certificate_verified}
+	  logwrite =	peer dn\t${tls_in_peerdn}
+	  logwrite =	ocsp\t${tls_in_ocsp}
+	  logwrite =	cipher\t${tls_in_cipher}
+	  logwrite =	bits\t${tls_in_bits}
+  accept
+
+check_recipient:
+  accept  domains =	+local_domains
+  deny    message =	relay not permitted
+
+log_resumption:
+  accept condition =	${if def:tls_out_cipher}
+	 condition =	${if eq {$event_name}{tcp:close}}
+	 logwrite =	tls_out_resumption ${listextract {$tls_out_resumption} {_RESUME_DECODE}}
+	  logwrite =	our cert subject\t${certextract {subject}{$tls_out_ourcert}}
+	  logwrite =	peer cert subject\t${certextract {subject}{$tls_out_peercert}}
+	  logwrite =	peer cert verified\t${tls_out_certificate_verified}
+	  logwrite =	peer dn\t${tls_out_peerdn}
+	  logwrite =	ocsp\t${tls_out_ocsp}
+	  logwrite =	cipher\t${tls_out_cipher}
+	  logwrite =	bits\t${tls_out_bits}
+
+
+# ----- Routers -----
+
+begin routers
+
+client:
+  driver =	accept
+  condition =	${if eq {SERVER}{server}{no}{yes}}
+  transport =	send_to_server${if eq{$local_part}{abcd}{2}{1}}
+
+server:
+  driver = redirect
+  data = :blackhole:
+
+# ----- Transports -----
+
+begin transports
+
+send_to_server1:
+  driver =			smtp
+  allow_localhost
+  hosts =			127.0.0.1
+  port =			PORT_D
+  helo_data =			helo.data.changed
+.ifdef VALUE
+  tls_resumption_hosts =	*
+.else
+  tls_resumption_hosts =	:
+.endif
+  tls_verify_certificates =	CDIR/CA/CA.pem
+  tls_verify_cert_hostnames =	${if match {$local_part}{^noverify} {*}{:}}
+  tls_try_verify_hosts =	*
+  event_action =		${acl {log_resumption}}
+
+send_to_server2:
+  driver = smtp
+  allow_localhost
+  hosts = HOSTIPV4
+  port = PORT_D
+  tls_verify_certificates =	CDIR/CA/CA.pem
+  tls_verify_cert_hostnames =	:
+  event_action =		${acl {log_resumption}}
+
+
+# ----- Retry -----
+
+
+begin retry
+
+* * F,5d,10s
+
+
+# End