summaryrefslogtreecommitdiff
path: root/test/confs
diff options
context:
space:
mode:
Diffstat (limited to 'test/confs')
-rw-r--r--test/confs/560813
-rw-r--r--test/confs/565813
-rw-r--r--test/confs/570063
-rw-r--r--test/confs/575021
-rw-r--r--test/confs/576021
5 files changed, 91 insertions, 40 deletions
diff --git a/test/confs/5608 b/test/confs/5608
index 55d9a2015..272d5f638 100644
--- a/test/confs/5608
+++ b/test/confs/5608
@@ -55,6 +55,7 @@ check_data:
accept
logger:
+ accept condition = ${if !eq {msg} {${listextract{1}{$tpda_event}}}}
warn logwrite = client ocsp status: $tls_out_ocsp \
(${listextract {${eval:$tls_out_ocsp+1}} \
{notreq:notresp:vfynotdone:failed:verified}})
@@ -100,8 +101,7 @@ send_to_server1:
hosts_require_tls = *
hosts_request_ocsp = :
headers_add = X-TLS-out: ocsp status $tls_out_ocsp
- tpda_delivery_action = ${acl {logger}}
- tpda_host_defer_action = ${acl {logger}}
+ tpda_event_action = ${acl {logger}}
# norequire: request stapling but do not verify
send_to_server2:
@@ -113,8 +113,7 @@ send_to_server2:
hosts_require_tls = *
# note no ocsp mention here
headers_add = X-TLS-out: ocsp status $tls_out_ocsp
- tpda_delivery_action = ${acl {logger}}
- tpda_host_defer_action = ${acl {logger}}
+ tpda_event_action = ${acl {logger}}
# (any other name): request and verify
send_to_server3:
@@ -127,8 +126,7 @@ send_to_server3:
hosts_require_tls = *
hosts_require_ocsp = *
headers_add = X-TLS-out: ocsp status $tls_out_ocsp
- tpda_delivery_action = ${acl {logger}}
- tpda_host_defer_action = ${acl {logger}}
+ tpda_event_action = ${acl {logger}}
# (any other name): request and verify, ssl-on-connect
send_to_server4:
@@ -142,8 +140,7 @@ send_to_server4:
hosts_require_tls = *
hosts_require_ocsp = *
headers_add = X-TLS-out: ocsp status $tls_out_ocsp
- tpda_delivery_action = ${acl {logger}}
- tpda_host_defer_action = ${acl {logger}}
+ tpda_event_action = ${acl {logger}}
# ----- Retry -----
diff --git a/test/confs/5658 b/test/confs/5658
index e8f2494f6..e4c346a96 100644
--- a/test/confs/5658
+++ b/test/confs/5658
@@ -52,6 +52,7 @@ check_data:
accept
logger:
+ accept condition = ${if !eq {msg} {${listextract{1}{$tpda_event}}}}
warn logwrite = client ocsp status: $tls_out_ocsp \
(${listextract {${eval:$tls_out_ocsp+1}} \
{notreq:notresp:vfynotdone:failed:verified}})
@@ -99,8 +100,7 @@ send_to_server1:
headers_add = X-TLS-out: OCSP status $tls_out_ocsp \
(${listextract {${eval:$tls_out_ocsp+1}} \
{notreq:notresp:vfynotdone:failed:verified}})
- tpda_delivery_action = ${acl {logger}}
- tpda_host_defer_action = ${acl {logger}}
+ tpda_event_action = ${acl {logger}}
send_to_server2:
driver = smtp
@@ -113,8 +113,7 @@ send_to_server2:
headers_add = X-TLS-out: OCSP status $tls_out_ocsp \
(${listextract {${eval:$tls_out_ocsp+1}} \
{notreq:notresp:vfynotdone:failed:verified}})
- tpda_delivery_action = ${acl {logger}}
- tpda_host_defer_action = ${acl {logger}}
+ tpda_event_action = ${acl {logger}}
send_to_server3:
driver = smtp
@@ -129,8 +128,7 @@ send_to_server3:
headers_add = X-TLS-out: OCSP status $tls_out_ocsp \
(${listextract {${eval:$tls_out_ocsp+1}} \
{notreq:notresp:vfynotdone:failed:verified}})
- tpda_delivery_action = ${acl {logger}}
- tpda_host_defer_action = ${acl {logger}}
+ tpda_event_action = ${acl {logger}}
send_to_server4:
driver = smtp
@@ -146,8 +144,7 @@ send_to_server4:
headers_add = X-TLS-out: OCSP status $tls_out_ocsp \
(${listextract {${eval:$tls_out_ocsp+1}} \
{notreq:notresp:vfynotdone:failed:verified}})
- tpda_delivery_action = ${acl {logger}}
- tpda_host_defer_action = ${acl {logger}}
+ tpda_event_action = ${acl {logger}}
# ----- Retry -----
diff --git a/test/confs/5700 b/test/confs/5700
index 52b28018a..0856bb056 100644
--- a/test/confs/5700
+++ b/test/confs/5700
@@ -18,22 +18,58 @@ acl_smtp_data = accept
begin acl
-logger:
- accept condition = ${if eq {$acl_arg2}{domain1}}
- logwrite = \
- $acl_arg1 \
- ip <$tpda_delivery_ip> \
- port <$tpda_delivery_port> \
- fqdn <$tpda_delivery_fqdn> \
- local_part <$tpda_delivery_local_part> \
- domain <$tpda_delivery_domain> \
- confirmation <$tpda_delivery_confirmation> \
+ev_tcp:
+ accept condition = ${if eq {$tpda_event}{tcp:connect}}
+ logwrite = . [$host_address]:$sending_port
+ accept condition = ${if eq {$tpda_event}{tcp:close}}
+ logwrite = . [$sending_ip_address] -> \
+ [$host_address]:$host_port
+ accept
+
+ev_smtp:
+ accept
+ logwrite = . [$sending_ip_address] -> \
+ [$host_address]:$host_port
+ logwrite = . banner <$tpda_data>
+
+ev_msg:
+ accept condition = ${if !eq {$acl_arg2}{domain1}}
+ logwrite = $this_expansion_will_fail
+
+ accept condition = ${if eq {$acl_arg1}{msg:delivery}}
+ logwrite = . \
+ delivery \
+ ip <$host_address> \
+ port <$host_port> \
+ fqdn <$host> \
+ local_part <$local_part> \
+ domain <$domain> \
+ confirmation <$tpda_data> \
+ router <$router_name> \
+ transport <$transport_name>
+
+ accept condition = ${if eq {$acl_arg1}{msg:host:defer}}
+ logwrite = . \
+ deferral \
+ ip <$host_address> \
+ port <$host_port> \
+ fqdn <$host> \
+ local_part <$local_part> \
+ domain <$domain> \
errno <$tpda_defer_errno> \
- errstr <$tpda_defer_errstr> \
+ errstr <$tpda_data> \
router <$router_name> \
transport <$transport_name>
- accept logwrite = $this_expansion_will_fail
+logger:
+ warn logwrite = event $tpda_event
+ accept condition = ${if eq {tcp} {${listextract{1}{$tpda_event}}}}
+ acl = ev_tcp
+ accept condition = ${if eq {smtp} {${listextract{1}{$tpda_event}}}}
+ acl = ev_smtp
+ accept condition = ${if eq {msg} {${listextract{1}{$tpda_event}}}}
+ acl = ev_msg $tpda_event $acl_arg2
+
# ----- Routers -----
@@ -61,7 +97,6 @@ smtp:
port = PORT_S
command_timeout = 1s
final_timeout = 1s
- tpda_delivery_action = ${acl {logger} {delivery} {$domain} }
- tpda_host_defer_action = ${acl {logger} {deferral} {$domain} }
+ tpda_event_action = ${acl {logger} {$tpda_event} {$domain} }
# End
diff --git a/test/confs/5750 b/test/confs/5750
index a8ff60350..bcb03ac5d 100644
--- a/test/confs/5750
+++ b/test/confs/5750
@@ -32,10 +32,16 @@ tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server2.example.com/
#
begin acl
-logger:
- warn logwrite = $acl_arg1 $tpda_delivery_local_part
+
+ev_tls:
+ accept logwrite = $tpda_event depth=$tpda_data \
+ <${certextract {subject} {$tls_out_peercert}}>
+# message = noooo
+
+ev_msg:
+ warn logwrite = $acl_arg1 $local_part
warn logwrite = ${if !def:tls_out_ourcert \
- {NO CLENT CERT presented} \
+ {NO CLIENT CERT presented} \
{Our cert SN: ${certextract{subject}{$tls_out_ourcert}}}}
accept condition = ${if !def:tls_out_peercert}
logwrite = No Peer cert
@@ -51,6 +57,12 @@ logger:
# logwrite = ${certextract {ocsp_uri} {$tls_out_peercert} {OCU <$value>}{(no OCU)}}
logwrite = ${certextract {crl_uri} {$tls_out_peercert} {CRU <$value>}{(no CRU)}}
+logger:
+ accept condition = ${if eq {msg} {${listextract{1}{$tpda_event}}}}
+ acl = ev_msg $tpda_event $acl_arg2
+ accept condition = ${if eq {tls} {${listextract{1}{$tpda_event}}}}
+ message = ${acl {ev_tls}}
+ accept
# ----- Routers -----
@@ -81,8 +93,7 @@ send_to_server:
{example.com/server1.example.com/ca_chain.pem}\
{example.net/server1.example.net/ca_chain.pem}}
- tpda_delivery_action = ${acl {logger} {delivery} {$domain} }
- tpda_host_defer_action = ${acl {logger} {deferral} {$domain} }
+ tpda_event_action = ${acl {logger} {$tpda_event} {$domain} }
# ----- Retry -----
diff --git a/test/confs/5760 b/test/confs/5760
index e9868d109..c3b49d1b7 100644
--- a/test/confs/5760
+++ b/test/confs/5760
@@ -32,10 +32,16 @@ tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server2.example.com/
#
begin acl
-logger:
- warn logwrite = $acl_arg1 $tpda_delivery_local_part
+
+ev_tls:
+ accept logwrite = $tpda_event depth=$tpda_data \
+ <${certextract {subject} {$tls_out_peercert}}>
+# message = nooooo
+
+ev_msg:
+ warn logwrite = $acl_arg1 $local_part
warn logwrite = ${if !def:tls_out_ourcert \
- {NO CLENT CERT presented} \
+ {NO CLIENT CERT presented} \
{Our cert SN: ${certextract{subject}{$tls_out_ourcert}}}}
accept condition = ${if !def:tls_out_peercert}
logwrite = No Peer cert
@@ -51,6 +57,12 @@ logger:
logwrite = ${certextract {ocsp_uri} {$tls_out_peercert} {OCU <$value>}{(no OCU)}}
logwrite = ${certextract {crl_uri} {$tls_out_peercert} {CRU <$value>}{(no CRU)}}
+logger:
+ accept condition = ${if eq {msg} {${listextract{1}{$tpda_event}}}}
+ acl = ev_msg $tpda_event $acl_arg2
+ accept condition = ${if eq {tls} {${listextract{1}{$tpda_event}}}}
+ message = ${acl {ev_tls}}
+ accept
# ----- Routers -----
@@ -81,8 +93,7 @@ send_to_server:
{example.com/server1.example.com/ca_chain.pem}\
{example.net/server1.example.net/ca_chain.pem}}
- tpda_delivery_action = ${acl {logger} {delivery} {$domain} }
- tpda_host_defer_action = ${acl {logger} {deferral} {$domain} }
+ tpda_event_action = ${acl {logger} {$tpda_event} {$domain} }
# ----- Retry -----
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-20 20:10:41 +0000