diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2018-01-07 15:03:25 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2018-01-07 15:51:43 +0000 |
| commit | 0b8f4f1a0c68bd48a98fb033039bac7d88182b6f (patch) | |
| tree | 1168866e692bd1176bf91109a6bbd38928c481a4 /test | |
| parent | 2c47372fad0f829ddfa29d04095f57a70206469c (diff) | |
DKIM: permit dkim_private_key to override dkim_strict on signing. Bug 2220
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/4520 | 3 | ||||
| -rw-r--r-- | test/log/4520 | 8 | ||||
| -rw-r--r-- | test/scripts/4500-DKIM/4520 | 7 | ||||
| -rw-r--r-- | test/stderr/4507 | 4 |
4 files changed, 21 insertions, 1 deletions
diff --git a/test/confs/4520 b/test/confs/4520 index 8515d050d..9092c74dc 100644 --- a/test/confs/4520 +++ b/test/confs/4520 @@ -62,5 +62,8 @@ send_to_server: .ifdef VALUE dkim_hash = VALUE .endif +.ifdef STRICT + dkim_strict = STRICT +.endif # End diff --git a/test/log/4520 b/test/log/4520 index 4a6502bb6..593cd6692 100644 --- a/test/log/4520 +++ b/test/log/4520 @@ -22,6 +22,9 @@ 1999-03-02 09:44:33 10HmbL-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbL-0005vi-00 => d@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbM-0005vi-00" 1999-03-02 09:44:33 10HmbL-0005vi-00 Completed +1999-03-02 09:44:33 10HmbN-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss +1999-03-02 09:44:33 10HmbN-0005vi-00 => a@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbO-0005vi-00" +1999-03-02 09:44:33 10HmbN-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 @@ -83,3 +86,8 @@ 1999-03-02 09:44:33 10HmbM-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbL-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbM-0005vi-00 => :blackhole: <d@test.ex> R=server_dump 1999-03-02 09:44:33 10HmbM-0005vi-00 Completed +1999-03-02 09:44:33 rcpt acl: macro: From:Sender:Reply-To:Subject:Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive +1999-03-02 09:44:33 10HmbO-0005vi-00 data acl: dkim status +1999-03-02 09:44:33 10HmbO-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbN-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 10HmbO-0005vi-00 => :blackhole: <a@test.ex> R=server_dump +1999-03-02 09:44:33 10HmbO-0005vi-00 Completed diff --git a/test/scripts/4500-DKIM/4520 b/test/scripts/4500-DKIM/4520 index 1bc4c6030..406db39a5 100644 --- a/test/scripts/4500-DKIM/4520 +++ b/test/scripts/4500-DKIM/4520 @@ -65,6 +65,13 @@ From: nobody@example.com content **** # +# check that an empty dkim_privatekey overrides dkim_strict +exim -DOPT=From -DSTRICT=true -DSELECTOR=none -odf a@test.ex +From: nobody@example.com + +content +**** +# millisleep 500 killdaemon no_msglog_check diff --git a/test/stderr/4507 b/test/stderr/4507 index 56fe4e977..8a4dd6bff 100644 --- a/test/stderr/4507 +++ b/test/stderr/4507 @@ -14,10 +14,12 @@ >>> end of inline ACL: ACCEPT >>> host in ignore_fromline_hosts? no (option unset) >>> using ACL "check_dkim" ->>> processing "accept" +>>> processing "warn" >>> check logwrite = signer: $dkim_cur_signer bits: $dkim_key_length >>> = signer: test.ex bits: 1024 LOG: 10HmaX-0005vi-00 signer: test.ex bits: 1024 +>>> warn: condition test succeeded in ACL "check_dkim" +>>> processing "accept" >>> 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] |