From 054ce030a60f22a1acc26c419907d276406080f9 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Thu, 12 Dec 2019 19:17:47 +0000 Subject: Testsuite: testcase for misordered ARC headers. Bug 2493 --- test/confs/4562 | 77 --------------------------------------------------------- test/confs/4563 | 1 + test/confs/4565 | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 77 deletions(-) delete mode 100644 test/confs/4562 create mode 120000 test/confs/4563 create mode 100644 test/confs/4565 (limited to 'test/confs') diff --git a/test/confs/4562 b/test/confs/4562 deleted file mode 100644 index 4360554b8..000000000 --- a/test/confs/4562 +++ /dev/null @@ -1,77 +0,0 @@ -# Exim test configuration 4562 - -SERVER= -VALUE= -INSERT= - -.include DIR/aux-var/std_conf_prefix - -primary_hostname = test.ex - -# ----- Main settings ----- - -acl_smtp_rcpt = accept -acl_smtp_data = check_data - -log_selector = +received_recipients +dkim_verbose -queue_only - -# ----- ACL ----- -begin acl - -check_data: - warn !verify = arc VALUE - INSERT - - warn logwrite = arc_state: <$arc_state> - logwrite = arc_oldest_pass <$arc_oldest_pass> - logwrite = domains: <$arc_domains> - condition = ${if def:arc_state_reason} - logwrite = reason: <$arc_state_reason> - -.ifdef OPTION - accept -.else - accept add_header = :at_start:${authresults {$primary_hostname}} -.endif - -# ----- Routers ----- - -begin routers - -d1: - driver = accept - local_parts = ^a - transport = tfile - -redir: - driver = redirect - data = ${substr_1:$local_part}@$domain - redirect_router = fwd - -fwd: - driver = accept - transport = tsmtp - -# ----- Transports ----- - -begin transports - -tfile: - driver = appendfile - file = DIR/test-mail/$local_part - user = CALLER - -tsmtp: - driver = smtp - hosts = 127.0.0.1 - port = PORT_D - allow_localhost - dkim_domain = $primary_hostname - dkim_selector = sel - dkim_private_key = DIR/aux-fixed/dkim/dkim.private -.ifndef OPTION - arc_sign = $primary_hostname : sel : DIR/aux-fixed/dkim/dkim.private -.endif - -# End diff --git a/test/confs/4563 b/test/confs/4563 new file mode 120000 index 000000000..359a76cee --- /dev/null +++ b/test/confs/4563 @@ -0,0 +1 @@ +4560 \ No newline at end of file diff --git a/test/confs/4565 b/test/confs/4565 new file mode 100644 index 000000000..4e90606f2 --- /dev/null +++ b/test/confs/4565 @@ -0,0 +1,77 @@ +# Exim test configuration 4565 + +SERVER= +VALUE= +INSERT= + +.include DIR/aux-var/std_conf_prefix + +primary_hostname = test.ex + +# ----- Main settings ----- + +acl_smtp_rcpt = accept +acl_smtp_data = check_data + +log_selector = +received_recipients +dkim_verbose +queue_only + +# ----- ACL ----- +begin acl + +check_data: + warn !verify = arc VALUE + INSERT + + warn logwrite = arc_state: <$arc_state> + logwrite = arc_oldest_pass <$arc_oldest_pass> + logwrite = domains: <$arc_domains> + condition = ${if def:arc_state_reason} + logwrite = reason: <$arc_state_reason> + +.ifdef OPTION + accept +.else + accept add_header = :at_start:${authresults {$primary_hostname}} +.endif + +# ----- Routers ----- + +begin routers + +d1: + driver = accept + local_parts = ^a + transport = tfile + +redir: + driver = redirect + data = ${substr_1:$local_part}@$domain + redirect_router = fwd + +fwd: + driver = accept + transport = tsmtp + +# ----- Transports ----- + +begin transports + +tfile: + driver = appendfile + file = DIR/test-mail/$local_part + user = CALLER + +tsmtp: + driver = smtp + hosts = 127.0.0.1 + port = PORT_D + allow_localhost + dkim_domain = $primary_hostname + dkim_selector = sel + dkim_private_key = DIR/aux-fixed/dkim/dkim.private +.ifndef OPTION + arc_sign = $primary_hostname : sel : DIR/aux-fixed/dkim/dkim.private +.endif + +# End -- cgit v1.2.3