X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/f926e27276301de1e2fd011b7edcd1b85d8c4754..2acd1e740c9e2797adc10516fe95a177be38e741:/test/confs/2012?ds=sidebyside diff --git a/test/confs/2012 b/test/confs/2012 index 59265d407..8de185b64 100644 --- a/test/confs/2012 +++ b/test/confs/2012 @@ -3,13 +3,9 @@ SERVER= -exim_path = EXIM_PATH -host_lookup_order = bydns +.include DIR/aux-var/tls_conf_prefix + primary_hostname = myhost.test.ex -spool_directory = DIR/spool -log_file_path = DIR/spool/log/SERVER%slog -gecos_pattern = "" -gecos_name = CALLER_NAME FX = DIR/aux-fixed S1 = FX/exim-ca/example.com/server1.example.com @@ -37,9 +33,6 @@ tls_advertise_hosts = * tls_certificate = ${if eq {SERVER}{server}{CERT1}fail} tls_privatekey = ${if eq {SERVER}{server}{KEY1}fail} -tls_verify_hosts = * -tls_verify_certificates = ${if eq {SERVER}{server}{CERT2}fail} - # ----- Routers ----- @@ -87,6 +80,18 @@ client_s: retry_use_local_part transport = send_to_server_req_passname +client_t: + driver = accept + local_parts = usert + retry_use_local_part + transport = send_to_server_req_failchain + +client_u: + driver = accept + local_parts = useru + retry_use_local_part + transport = send_to_server_req_passchain + # ----- Transports ----- @@ -97,10 +102,9 @@ send_to_server_failcert: driver = smtp allow_localhost hosts = HOSTIPV4 - hosts_require_tls = HOSTIPV4 port = PORT_D - tls_certificate = CERT2 - tls_privatekey = CERT2 + hosts_try_fastopen = : + hosts_require_tls = HOSTIPV4 tls_verify_certificates = CA2 tls_try_verify_hosts = @@ -111,10 +115,9 @@ send_to_server_retry: driver = smtp allow_localhost hosts = HOSTIPV4 : 127.0.0.1 - hosts_require_tls = HOSTIPV4 port = PORT_D - tls_certificate = CERT2 - tls_privatekey = CERT2 + hosts_try_fastopen = : + hosts_require_tls = HOSTIPV4 tls_verify_certificates = \ ${if eq{$host_address}{127.0.0.1}{CA1}{CA2}} @@ -126,10 +129,9 @@ send_to_server_crypt: driver = smtp allow_localhost hosts = HOSTIPV4 - hosts_require_tls = HOSTIPV4 port = PORT_D - tls_certificate = CERT2 - tls_privatekey = CERT2 + hosts_try_fastopen = : + hosts_require_tls = HOSTIPV4 tls_verify_certificates = CA2 tls_try_verify_hosts = * @@ -141,8 +143,7 @@ send_to_server_req_fail: allow_localhost hosts = HOSTIPV4 port = PORT_D - tls_certificate = CERT2 - tls_privatekey = CERT2 + hosts_try_fastopen = : tls_verify_certificates = CA2 tls_verify_hosts = * @@ -150,28 +151,50 @@ send_to_server_req_fail: # this will fail to verify the cert name and fallback to unencrypted send_to_server_req_failname: - driver = smtp + driver = smtp allow_localhost - hosts = HOSTIPV4 - port = PORT_D - tls_certificate = CERT2 - tls_privatekey = CERT2 + hosts = serverbadname.example.com + port = PORT_D + hosts_try_fastopen = : - tls_verify_certificates = CA1 - tls_verify_cert_hostnames = server1.example.net : server1.example.org - tls_verify_hosts = * + tls_verify_certificates = CA1 + tls_verify_cert_hostnames = HOSTIPV4 + tls_verify_hosts = * # this will pass the cert verify including name check send_to_server_req_passname: - driver = smtp + driver = smtp + allow_localhost + hosts = server1.example.com + port = PORT_D + hosts_try_fastopen = : + + tls_verify_certificates = CA1 + tls_verify_cert_hostnames = HOSTIPV4 + tls_verify_hosts = * + + # this will fail the cert verify name check, because CNAME rules + send_to_server_req_failchain: + driver = smtp + allow_localhost + hosts = serverchain1.example.com + port = PORT_D + hosts_try_fastopen = : + + tls_verify_certificates = CA1 + tls_verify_cert_hostnames = HOSTIPV4 + tls_verify_hosts = * + + # this will pass the cert verify name check, because CNAME rules + send_to_server_req_passchain: + driver = smtp allow_localhost - hosts = HOSTIPV4 - port = PORT_D - tls_certificate = CERT2 - tls_privatekey = CERT2 + hosts = alternatename.server1.example.com + port = PORT_D + hosts_try_fastopen = : - tls_verify_certificates = CA1 - tls_verify_cert_hostnames = noway.example.com : server1.example.com - tls_verify_hosts = * + tls_verify_certificates = CA1 + tls_verify_cert_hostnames = HOSTIPV4 + tls_verify_hosts = * # End