diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2018-02-18 16:22:52 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2018-02-18 16:22:52 +0000 |
| commit | e34f8ca2022e340d3c0e36260a0232fab306dfcc (patch) | |
| tree | 0be7025e466defdb94c87cb4edd30dd7efcb46ce /test | |
| parent | c674e7a4885de9bbd87b89cad1a55ec935005ee0 (diff) | |
Expansions: make ${authresults } usable in a named ACL
This will be more common than directly in the acl_smtp_data option,
and suffers one less expansion in operation.
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/3403 | 8 | ||||
| -rw-r--r-- | test/confs/4500 | 5 | ||||
| -rw-r--r-- | test/stderr/4507 | 7 |
3 files changed, 15 insertions, 5 deletions
diff --git a/test/confs/3403 b/test/confs/3403 index 79fb73fe1..b8c8086b6 100644 --- a/test/confs/3403 +++ b/test/confs/3403 @@ -7,7 +7,7 @@ primary_hostname = myhost.test.ex # ----- Main settings ----- acl_smtp_rcpt = accept -acl_smtp_data = accept add_header = :at_start:${authresults {$primary_hostname}} +acl_smtp_data = check_data # ----- Authentication ----- @@ -27,6 +27,12 @@ plain1: server_mail_auth_condition = ${if eq{$authenticated_id}{userx}{yes}} +# ----- ACL ----- +begin acl + +check_data: + accept add_header = :at_start:${authresults {$primary_hostname}} + # ----- Routers ----- begin routers diff --git a/test/confs/4500 b/test/confs/4500 index a952758ae..502de4a19 100644 --- a/test/confs/4500 +++ b/test/confs/4500 @@ -10,7 +10,7 @@ primary_hostname = myhost.test.ex acl_smtp_rcpt = accept acl_smtp_dkim = check_dkim -acl_smtp_data = accept logwrite = ${authresults {$primary_hostname}} +acl_smtp_data = check_data log_selector = +dkim_verbose @@ -37,4 +37,7 @@ check_dkim: accept .endif +check_data: + accept logwrite = ${authresults {$primary_hostname}} + # End diff --git a/test/stderr/4507 b/test/stderr/4507 index 42dd96980..e1961ceb3 100644 --- a/test/stderr/4507 +++ b/test/stderr/4507 @@ -23,11 +23,12 @@ LOG: 10HmaX-0005vi-00 signer: test.ex bits: 1024 >>> accept: condition test succeeded in ACL "check_dkim" >>> end of ACL "check_dkim": ACCEPT LOG: 10HmaX-0005vi-00 DKIM: d=test.ex s=sel c=simple/simple a=rsa-sha1 b=1024 [verification succeeded] +>>> using ACL "check_data" >>> processing "accept" ->>> check logwrite = Authentication-Results: myhost.test.ex;\n\tdkim=pass header.d=test.ex header.s=sel header.a=rsa-sha1 +>>> check logwrite = ${authresults {$primary_hostname}} >>> = Authentication-Results: myhost.test.ex; >>> dkim=pass header.d=test.ex header.s=sel header.a=rsa-sha1 LOG: 10HmaX-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=pass header.d=test.ex header.s=sel header.a=rsa-sha1 ->>> accept: condition test succeeded in inline ACL ->>> end of inline ACL: ACCEPT +>>> accept: condition test succeeded in ACL "check_data" +>>> end of ACL "check_data": ACCEPT LOG: 10HmaX-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss DKIM=test.ex id=qwerty1234@disco-zombie.net |