From: Heiko Schlittermann (HS12-RIPE) Date: Wed, 18 Jan 2017 21:25:20 +0000 (+0100) Subject: Testsuite: Rename 4510-DKIM X-Git-Tag: exim-4_89_RC1~29^2~3 X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/2289604c0daa4c9f1206cd3c96bcd483f21bf3c9 Testsuite: Rename 4510-DKIM We need some additional tests in 4500 --- diff --git a/test/confs/4510 b/test/confs/4510 deleted file mode 100644 index 42c58aac5..000000000 --- a/test/confs/4510 +++ /dev/null @@ -1,57 +0,0 @@ -# Exim test configuration 4510 - -SERVER= -OPT= - -.include DIR/aux-var/std_conf_prefix - -primary_hostname = myhost.test.ex - -# ----- Main settings ----- - -acl_smtp_rcpt = accept -acl_smtp_dkim = accept logwrite = signer: $dkim_cur_signer bits: $dkim_key_length h=$dkim_headernames -acl_smtp_data_prdr = accept local_parts = okuser - -prdr_enable - -# ----- Routers - -begin routers - -client: - driver = accept - condition = ${if eq {SERVER}{server}{no}{yes}} - transport = send_to_server - -server_dump: - driver = redirect - senders = ! : - data = :blackhole: - -server_store: - driver = accept - transport = store - -# ----- Transports - -begin transports - -store: - driver = appendfile - file = DIR/test-mail/store - return_path_add - user = CALLER - -send_to_server: - driver = smtp - allow_localhost - hosts = HOSTIPV4 - port = PORT_D - - dkim_domain = ${if def:sender_address_local_part {test.ex}} - dkim_selector = sel - dkim_private_key = DIR/aux-fixed/dkim/dkim.private - dkim_sign_headers = From - -# End diff --git a/test/confs/4550 b/test/confs/4550 new file mode 100644 index 000000000..3693d89a6 --- /dev/null +++ b/test/confs/4550 @@ -0,0 +1,57 @@ +# Exim test configuration 4550 + +SERVER= +OPT= + +.include DIR/aux-var/std_conf_prefix + +primary_hostname = myhost.test.ex + +# ----- Main settings ----- + +acl_smtp_rcpt = accept +acl_smtp_dkim = accept logwrite = signer: $dkim_cur_signer bits: $dkim_key_length h=$dkim_headernames +acl_smtp_data_prdr = accept local_parts = okuser + +prdr_enable + +# ----- Routers + +begin routers + +client: + driver = accept + condition = ${if eq {SERVER}{server}{no}{yes}} + transport = send_to_server + +server_dump: + driver = redirect + senders = ! : + data = :blackhole: + +server_store: + driver = accept + transport = store + +# ----- Transports + +begin transports + +store: + driver = appendfile + file = DIR/test-mail/store + return_path_add + user = CALLER + +send_to_server: + driver = smtp + allow_localhost + hosts = HOSTIPV4 + port = PORT_D + + dkim_domain = ${if def:sender_address_local_part {test.ex}} + dkim_selector = sel + dkim_private_key = DIR/aux-fixed/dkim/dkim.private + dkim_sign_headers = From + +# End diff --git a/test/log/4510 b/test/log/4510 deleted file mode 100644 index 0d826ab32..000000000 --- a/test/log/4510 +++ /dev/null @@ -1,20 +0,0 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmaX-0005vi-00 ** baduser@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: PRDR error after DATA: 550 PRDR R= refusal -1999-03-02 09:44:33 10HmaX-0005vi-00 => okuser@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] PRDR C="250 PRDR R= acceptance" -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss -1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER@myhost.test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmaZ-0005vi-00" -1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 10HmaX-0005vi-00 Completed - -******** SERVER ******** -1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 -1999-03-02 09:44:33 10HmbA-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] -1999-03-02 09:44:33 10HmbA-0005vi-00 signer: test.ex bits: 1024 h=From -1999-03-02 09:44:33 10HmbA-0005vi-00 PRDR R= refusal -1999-03-02 09:44:33 10HmbA-0005vi-00 PRDR R= acceptance -1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp PRDR S=sss id=E10HmaX-0005vi-00@myhost.test.ex -1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: R=server_dump -1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaY-0005vi-00@myhost.test.ex -1999-03-02 09:44:33 10HmaZ-0005vi-00 => CALLER R=server_store T=store -1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed diff --git a/test/log/4550 b/test/log/4550 new file mode 100644 index 000000000..0d826ab32 --- /dev/null +++ b/test/log/4550 @@ -0,0 +1,20 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmaX-0005vi-00 ** baduser@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: PRDR error after DATA: 550 PRDR R= refusal +1999-03-02 09:44:33 10HmaX-0005vi-00 => okuser@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] PRDR C="250 PRDR R= acceptance" +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss +1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER@myhost.test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmaZ-0005vi-00" +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed + +******** SERVER ******** +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 +1999-03-02 09:44:33 10HmbA-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] +1999-03-02 09:44:33 10HmbA-0005vi-00 signer: test.ex bits: 1024 h=From +1999-03-02 09:44:33 10HmbA-0005vi-00 PRDR R= refusal +1999-03-02 09:44:33 10HmbA-0005vi-00 PRDR R= acceptance +1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp PRDR S=sss id=E10HmaX-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 10HmbA-0005vi-00 => :blackhole: R=server_dump +1999-03-02 09:44:33 10HmbA-0005vi-00 Completed +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaY-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 10HmaZ-0005vi-00 => CALLER R=server_store T=store +1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed diff --git a/test/mail/4510.store b/test/mail/4510.store deleted file mode 100644 index d117b34c6..000000000 --- a/test/mail/4510.store +++ /dev/null @@ -1,59 +0,0 @@ -From MAILER-DAEMON Tue Mar 02 09:44:33 1999 -Return-path: <> -Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex) - by myhost.test.ex with esmtp (Exim x.yz) - id 10HmaZ-0005vi-00 - for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) - id 10HmaY-0005vi-00 - for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -X-Failed-Recipients: baduser@test.ex -Auto-Submitted: auto-replied -From: Mail Delivery System -To: CALLER@myhost.test.ex -Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM -MIME-Version: 1.0 -Subject: Mail delivery failed: returning message to sender -Message-Id: -Date: Tue, 2 Mar 1999 09:44:33 +0000 - ---NNNNNNNNNN-eximdsn-MMMMMMMMMM -Content-type: text/plain; charset=us-ascii - -This message was created automatically by mail delivery software. - -A message that you sent could not be delivered to one or more of its -recipients. This is a permanent error. The following address(es) failed: - - baduser@test.ex - host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] - PRDR error after DATA: 550 PRDR R= refusal - ---NNNNNNNNNN-eximdsn-MMMMMMMMMM -Content-type: message/delivery-status - -Reporting-MTA: dns; myhost.test.ex - -Action: failed -Final-Recipient: rfc822;baduser@test.ex -Status: 5.0.0 -Remote-MTA: dns; ip4.ip4.ip4.ip4 -Diagnostic-Code: smtp; 550 PRDR R= refusal - ---NNNNNNNNNN-eximdsn-MMMMMMMMMM -Content-type: message/rfc822 - -Return-path: -Received: from CALLER by myhost.test.ex with local (Exim x.yz) - (envelope-from ) - id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -From: nobody@example.com -From: second@example.com -Message-Id: -Sender: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 - -content - ---NNNNNNNNNN-eximdsn-MMMMMMMMMM-- - diff --git a/test/mail/4550.store b/test/mail/4550.store new file mode 100644 index 000000000..d117b34c6 --- /dev/null +++ b/test/mail/4550.store @@ -0,0 +1,59 @@ +From MAILER-DAEMON Tue Mar 02 09:44:33 1999 +Return-path: <> +Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex) + by myhost.test.ex with esmtp (Exim x.yz) + id 10HmaZ-0005vi-00 + for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) + id 10HmaY-0005vi-00 + for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +X-Failed-Recipients: baduser@test.ex +Auto-Submitted: auto-replied +From: Mail Delivery System +To: CALLER@myhost.test.ex +Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM +MIME-Version: 1.0 +Subject: Mail delivery failed: returning message to sender +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +--NNNNNNNNNN-eximdsn-MMMMMMMMMM +Content-type: text/plain; charset=us-ascii + +This message was created automatically by mail delivery software. + +A message that you sent could not be delivered to one or more of its +recipients. This is a permanent error. The following address(es) failed: + + baduser@test.ex + host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] + PRDR error after DATA: 550 PRDR R= refusal + +--NNNNNNNNNN-eximdsn-MMMMMMMMMM +Content-type: message/delivery-status + +Reporting-MTA: dns; myhost.test.ex + +Action: failed +Final-Recipient: rfc822;baduser@test.ex +Status: 5.0.0 +Remote-MTA: dns; ip4.ip4.ip4.ip4 +Diagnostic-Code: smtp; 550 PRDR R= refusal + +--NNNNNNNNNN-eximdsn-MMMMMMMMMM +Content-type: message/rfc822 + +Return-path: +Received: from CALLER by myhost.test.ex with local (Exim x.yz) + (envelope-from ) + id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 +From: nobody@example.com +From: second@example.com +Message-Id: +Sender: CALLER_NAME +Date: Tue, 2 Mar 1999 09:44:33 +0000 + +content + +--NNNNNNNNNN-eximdsn-MMMMMMMMMM-- + diff --git a/test/scripts/4510-DKIM-Bounces/4510 b/test/scripts/4510-DKIM-Bounces/4510 deleted file mode 100644 index aa7f7ddc6..000000000 --- a/test/scripts/4510-DKIM-Bounces/4510 +++ /dev/null @@ -1,16 +0,0 @@ -# DKIM signing and bounces -munge optional_dsn_info -# -exim -bd -DSERVER=server -oX PORT_D -**** -# -# single header signed -# one rcpt accept, one reject - should get a DSN -exim -odf baduser@test.ex okuser@test.ex -From: nobody@example.com -From: second@example.com - -content -**** -millisleep 500 -killdaemon diff --git a/test/scripts/4510-DKIM-Bounces/REQUIRES b/test/scripts/4510-DKIM-Bounces/REQUIRES deleted file mode 100644 index a75b81c54..000000000 --- a/test/scripts/4510-DKIM-Bounces/REQUIRES +++ /dev/null @@ -1,2 +0,0 @@ -support DKIM -support PRDR diff --git a/test/scripts/4550-DKIM-Bounces/4550 b/test/scripts/4550-DKIM-Bounces/4550 new file mode 100644 index 000000000..aa7f7ddc6 --- /dev/null +++ b/test/scripts/4550-DKIM-Bounces/4550 @@ -0,0 +1,16 @@ +# DKIM signing and bounces +munge optional_dsn_info +# +exim -bd -DSERVER=server -oX PORT_D +**** +# +# single header signed +# one rcpt accept, one reject - should get a DSN +exim -odf baduser@test.ex okuser@test.ex +From: nobody@example.com +From: second@example.com + +content +**** +millisleep 500 +killdaemon diff --git a/test/scripts/4550-DKIM-Bounces/REQUIRES b/test/scripts/4550-DKIM-Bounces/REQUIRES new file mode 100644 index 000000000..a75b81c54 --- /dev/null +++ b/test/scripts/4550-DKIM-Bounces/REQUIRES @@ -0,0 +1,2 @@ +support DKIM +support PRDR