git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
redis lookup returns false for things that should be true
[users/jgh/exim.git]
/
test
/
confs
/
5750
diff --git
a/test/confs/5750
b/test/confs/5750
index daff91bb3560472b4668246220baeec55d43cca0..bcb03ac5daae4c52e495afef7c84f863fe5f3f4e 100644
(file)
--- 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
#
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 \
warn logwrite = ${if !def:tls_out_ourcert \
- {NO CLENT CERT presented} \
+ {NO CL
I
ENT CERT presented} \
{Our cert SN: ${certextract{subject}{$tls_out_ourcert}}}}
accept condition = ${if !def:tls_out_peercert}
logwrite = No Peer cert
{Our cert SN: ${certextract{subject}{$tls_out_ourcert}}}}
accept condition = ${if !def:tls_out_peercert}
logwrite = No Peer cert
@@
-45,12
+51,18
@@
logger:
logwrite = IN <${certextract {issuer} {$tls_out_peercert}}>
logwrite = NB <${certextract {notbefore} {$tls_out_peercert}}>
logwrite = NA <${certextract {notafter} {$tls_out_peercert}}>
logwrite = IN <${certextract {issuer} {$tls_out_peercert}}>
logwrite = NB <${certextract {notbefore} {$tls_out_peercert}}>
logwrite = NA <${certextract {notafter} {$tls_out_peercert}}>
- logwrite = SA <${certextract {sig
nature_algorithm}
{$tls_out_peercert}}>
+ logwrite = SA <${certextract {sig
_algorithm}
{$tls_out_peercert}}>
logwrite = SG <${certextract {signature} {$tls_out_peercert}}>
logwrite = SG <${certextract {signature} {$tls_out_peercert}}>
- logwrite = ${certextract {subj
ect_altname}
{$tls_out_peercert}{SAN <$value>}{(no SAN)}}
+ logwrite = ${certextract {subj
_altname}
{$tls_out_peercert}{SAN <$value>}{(no SAN)}}
# logwrite = ${certextract {ocsp_uri} {$tls_out_peercert} {OCU <$value>}{(no OCU)}}
logwrite = ${certextract {crl_uri} {$tls_out_peercert} {CRU <$value>}{(no CRU)}}
# 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 -----
# ----- Routers -----
@@
-81,8
+93,7
@@
send_to_server:
{example.com/server1.example.com/ca_chain.pem}\
{example.net/server1.example.net/ca_chain.pem}}
{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 -----
# ----- Retry -----