X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/2b4a568dfa3d79a9a968984cf5b23829c084a951..a797c8360e6786cf881736d5eab8a03eb0e74383:/test/confs/5651 diff --git a/test/confs/5651 b/test/confs/5651 index e38043f3e..5803c3ce9 100644 --- a/test/confs/5651 +++ b/test/confs/5651 @@ -3,21 +3,17 @@ SERVER = -exim_path = EXIM_PATH -host_lookup_order = bydns -primary_hostname = server1.example.com -rfc1413_query_timeout = 0s -spool_directory = DIR/spool -log_file_path = DIR/spool/log/SERVER%slog -gecos_pattern = "" -gecos_name = CALLER_NAME +.include DIR/aux-var/tls_conf_prefix +primary_hostname = server1.example.com # ----- Main settings ----- domainlist local_domains = test.ex : *.test.ex acl_smtp_rcpt = check_recipient +acl_smtp_data = check_data + log_selector = +tls_peerdn remote_max_parallel = 1 @@ -33,7 +29,7 @@ tls_privatekey = ${if eq {SERVER}{server}\ fail} # from cmdline define -tls_ocsp_file = OCSP +tls_ocsp_file = OPT # ------ ACL ------ @@ -44,6 +40,11 @@ check_recipient: accept domains = +local_domains deny message = relay not permitted +check_data: + warn condition = ${if def:h_X-TLS-out:} + logwrite = client claims: $h_X-TLS-out: + accept + # ----- Routers ----- @@ -54,8 +55,9 @@ client: condition = ${if eq {SERVER}{server}{no}{yes}} retry_use_local_part transport = send_to_server${if eq{$local_part}{nostaple}{1} \ - {${if eq{$local_part}{smtps} {3}{2}}} \ - } + {${if eq{$local_part}{norequire} {2} \ + {${if eq{$local_part}{smtps} {4}{3}}} \ + }}} server: driver = redirect @@ -80,10 +82,27 @@ send_to_server1: hosts = HOSTIPV4 port = PORT_D tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem + tls_verify_cert_hostnames = hosts_require_tls = * -# note no ocsp here + hosts_request_ocsp = : + headers_add = X-TLS-out: OCSP status $tls_out_ocsp \ + (${listextract {${eval:$tls_out_ocsp+1}} \ + {notreq:notresp:vfynotdone:failed:verified}}) send_to_server2: + driver = smtp + allow_localhost + hosts = HOSTIPV4 + port = PORT_D + tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem + tls_verify_cert_hostnames = + hosts_require_tls = * +# note no ocsp mention here + headers_add = X-TLS-out: OCSP status $tls_out_ocsp \ + (${listextract {${eval:$tls_out_ocsp+1}} \ + {notreq:notresp:vfynotdone:failed:verified}}) + +send_to_server3: driver = smtp allow_localhost hosts = 127.0.0.1 @@ -91,10 +110,15 @@ send_to_server2: helo_data = helo.data.changed #tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem + tls_try_verify_hosts = + tls_verify_cert_hostnames = hosts_require_tls = * hosts_require_ocsp = * + headers_add = X-TLS-out: OCSP status $tls_out_ocsp \ + (${listextract {${eval:$tls_out_ocsp+1}} \ + {notreq:notresp:vfynotdone:failed:verified}}) -send_to_server3: +send_to_server4: driver = smtp allow_localhost hosts = 127.0.0.1 @@ -102,9 +126,13 @@ send_to_server3: helo_data = helo.data.changed #tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem + tls_verify_cert_hostnames = protocol = smtps hosts_require_tls = * hosts_require_ocsp = * + headers_add = X-TLS-out: OCSP status $tls_out_ocsp \ + (${listextract {${eval:$tls_out_ocsp+1}} \ + {notreq:notresp:vfynotdone:failed:verified}}) # ----- Retry -----