diff options
Diffstat (limited to 'test')
51 files changed, 750 insertions, 287 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index 26631f398..edcc4ab78 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -8,7 +8,6 @@ CFLAGS=@CFLAGS@ @BIND_8_COMPAT@ @DEFS@ LDFLAGS=@LDFLAGS@ CLIENT_SSL=@CLIENT_SSL@ CLIENT_GNUTLS=@CLIENT_GNUTLS@ -B64_GNUTLS=@B64_GNUTLS@ LOADED=@LOADED@ LOADED_OPT=@LOADED_OPT@ LIBS=@LIBS@ @@ -19,8 +18,7 @@ SRC = @srcdir@/src BINARIES = bin/cf bin/client $(CLIENT_SSL) $(CLIENT_GNUTLS) \ bin/checkaccess bin/fakens bin/fd bin/iefbr14 $(LOADED) \ - bin/mtpscript bin/server bin/showids bin/locate \ - $(B64_GNUTLS) + bin/mtpscript bin/server bin/showids bin/locate # List of targets @@ -87,10 +85,6 @@ bin/locate: $(SRC)/locate.sh Makefile cp $(SRC)/locate.pl bin/locate chmod 0755 bin/locate -bin/ed25519_privkey_pem_to_pubkey_raw_b64: $(SRC)/ed25519_privkey_pem_to_pubkey_raw_b64.c Makefile - $(CC) $(CFLAGS) -DHAVE_GNUTLS $(LDFLAGS) -o bin/ed25519_privkey_pem_to_pubkey_raw_b64 \ - $(SRC)/ed25519_privkey_pem_to_pubkey_raw_b64.c -lgnutls -lgcrypt $(LIBS) - clean:; rm -rf $(BINARIES) bin.sys FORCE: diff --git a/test/aux-fixed/4650.tldfile b/test/aux-fixed/4650.tldfile new file mode 100644 index 000000000..a9eb3bbf4 --- /dev/null +++ b/test/aux-fixed/4650.tldfile @@ -0,0 +1 @@ +ac diff --git a/test/configure b/test/configure index 78f734198..f01a14d74 100755 --- a/test/configure +++ b/test/configure @@ -623,7 +623,6 @@ ac_subst_vars='LTLIBOBJS LIBOBJS LOADED_OPT LOADED -B64_GNUTLS CLIENT_GNUTLS CLIENT_SSL BIND_8_COMPAT @@ -3243,17 +3242,6 @@ fi done -for ac_header in gnutls/gnutls.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default" -if test "x$ac_cv_header_gnutls_gnutls_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GNUTLS_GNUTLS_H 1 -_ACEOF - B64_GNUTLS=bin/ed25519_privkey_pem_to_pubkey_raw_b64 -fi - -done diff --git a/test/confs/0571 b/test/confs/0571 index cf4881a0a..a818257f5 100644 --- a/test/confs/0571 +++ b/test/confs/0571 @@ -27,8 +27,8 @@ acl_not_smtp = ${if def:sender_address \ begin acl acl_29_29_29: - deny dnslists = test.ex/$sender_address_domain - accept + deny dnslists = test.ex/$sender_address_domain + accept logwrite = authresults: ${authresults {$primary_hostname}} acl_29_29_0: deny dnslists = test.ex diff --git a/test/confs/4562 b/test/confs/4562 new file mode 100644 index 000000000..7adcd54f1 --- /dev/null +++ b/test/confs/4562 @@ -0,0 +1,75 @@ +# 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> + 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/4600 b/test/confs/4600 index 2934bf160..a566535cd 100644 --- a/test/confs/4600 +++ b/test/confs/4600 @@ -11,15 +11,15 @@ acl_smtp_rcpt = check_rcpt begin acl check_rcpt: - accept hosts = HOSTIPV4 + accept condition = ${if eq {$received_port}{PORT_D}} spf_guess = pass - logwrite = spf_result $spf_result + logwrite = spf_result $spf_result (guess <$spf_result_guessed>) logwrite = spf_header_comment $spf_header_comment logwrite = spf_smtp_comment $spf_smtp_comment logwrite = spf_received $spf_received logwrite = ${authresults {$primary_hostname}} - accept hosts = 127.0.0.1 + accept condition = ${if eq {$received_port}{PORT_S}} spf = pass : softfail : neutral logwrite = spf_result $spf_result logwrite = spf_header_comment $spf_header_comment @@ -28,7 +28,7 @@ check_rcpt: logwrite = ${authresults {$primary_hostname}} deny - logwrite = spf_result $spf_result + logwrite = spf_result $spf_result (guess <$spf_result_guessed>) logwrite = spf_header_comment $spf_header_comment logwrite = spf_smtp_comment $spf_smtp_comment logwrite = spf_received $spf_received diff --git a/test/confs/4650 b/test/confs/4650 new file mode 100644 index 000000000..e6c788436 --- /dev/null +++ b/test/confs/4650 @@ -0,0 +1,28 @@ +# Exim test configuration 4650 + +.include DIR/aux-var/std_conf_prefix + +primary_hostname = myhost.test.ex + +# ----- Main settings ----- + +dmarc_tld_file = DIR/aux-fixed/TESTNUM.tldfile + +acl_smtp_rcpt = accept +acl_smtp_data = check_data + +queue_only + +begin acl + +check_data: + accept hosts = HOSTIPV4 + spf = pass : !pass + dmarc_status = none : !none + logwrite = dmarc_status <$dmarc_status> + logwrite = dmarc_status_text <$dmarc_status_text> + logwrite = dmarc_used_domain <$dmarc_used_domain> + logwrite = dmarc_domain_policy <$dmarc_domain_policy> + logwrite = ${authresults {$primary_hostname}} + +# End diff --git a/test/confs/5901 b/test/confs/5901 index 5d57c1c73..abcdfc6dc 100644 --- a/test/confs/5901 +++ b/test/confs/5901 @@ -23,7 +23,7 @@ begin transports scan: driver = queuefile - directory = test-mail/subdir + directory = ${if = {0}{0} {test-mail/subdir}{}} # ----- Retry ----- diff --git a/test/dnszones-src/db.test.ex b/test/dnszones-src/db.test.ex index 08aadb963..492ee5df8 100644 --- a/test/dnszones-src/db.test.ex +++ b/test/dnszones-src/db.test.ex @@ -556,9 +556,15 @@ sel2._domainkey TXT "v=DKIM1; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXRFf+VhT+ ; EC signing, using Ed25519 ; - needs GnuTLS 3.6.0 (fedora rawhide has that) ; certtool --generate-privkey --key-type=ed25519 --outfile=dkim_ed25519.private -; bin/ed25519_privkey_pem_to_pubkey_raw_b64 dkim_ed25519.private +; certtool --load_privkey=dkim_ed25519.private --pubkey_info --outder | tail -c +13 | base64 sed._domainkey TXT "v=DKIM1; k=ed25519; p=sPs07Vu29FpHT/80UXUcYHFOHifD4o2ZlP2+XUh9g6E=" +; version of the above wrapped in SubjectPublicKeyInfo, in case the WG plumps in that direction +; certtool --load_privkey=aux-fixed/dkim/dkim_ed25519.private --pubkey_info +; (and grab the b64 content from between the pem headers) + +sedw._domainkey TXT "v=DKIM1; k=ed25519; p=MCowBQYDK2VwAyEAsPs07Vu29FpHT/80UXUcYHFOHifD4o2ZlP2+XUh9g6E=" + ; End diff --git a/test/log/0571 b/test/log/0571 index afae80f19..e402d75a0 100644 --- a/test/log/0571 +++ b/test/log/0571 @@ -1,4 +1,5 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 F=<ted@29.29.0.com> rejected by non-SMTP ACL: cannot test auto-keyed dnslists condition in non-SMTP ACL 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 no immediate delivery: queued by ACL +1999-03-02 09:44:33 10HmaZ-0005vi-00 authresults: Authentication-Results: myhost.test.ex;\n local=pass (non-smtp, myhost.test.ex) u=CALLER 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= bill@29.29.29.com U=CALLER P=local S=sss diff --git a/test/log/4007 b/test/log/4007 index bd0ec8720..960d6babd 100644 --- a/test/log/4007 +++ b/test/log/4007 @@ -1,7 +1,7 @@ -1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss T="message should be accepted" -1999-03-02 09:44:33 10HmbB-0005vi-00 => :blackhole: <userx@test.ex> R=r -1999-03-02 09:44:33 10HmbB-0005vi-00 Completed -1999-03-02 09:44:33 10HmaX-0005vi-00 malware acl condition: avast TESTSUITE/eximdir/avast_sock : invalid response from scanner: 'blah [E]' +1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss T="message should be accepted" +1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <userx@test.ex> R=r +1999-03-02 09:44:33 10HmbC-0005vi-00 Completed +1999-03-02 09:44:33 10HmaX-0005vi-00 malware acl condition: avast TESTSUITE/eximdir/avast_sock : 451 SCAN Engine error 13 Permission denied 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA 1999-03-02 09:44:33 10HmbA-0005vi-00 malware_name VNAME 1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA @@ -11,3 +11,5 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss T="message should be accepted despite timeout" 1999-03-02 09:44:33 10HmaZ-0005vi-00 => :blackhole: <userx@test.ex> R=r 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed +1999-03-02 09:44:33 10HmbB-0005vi-00 malware_name The file is a decompression bomb +1999-03-02 09:44:33 10HmbB-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA diff --git a/test/log/4017 b/test/log/4017 index cd53a5c39..9d07f31bf 100644 --- a/test/log/4017 +++ b/test/log/4017 @@ -1,7 +1,15 @@ -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss T="message should be accepted" -1999-03-02 09:44:33 10HmaZ-0005vi-00 => :blackhole: <userx@test.ex> R=r -1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed -1999-03-02 09:44:33 10HmaX-0005vi-00 malware acl condition: avast TESTSUITE/eximdir/avast_sock : invalid response from scanner: '/bin/error [E]0.0' +1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss T="message should be accepted" +1999-03-02 09:44:33 10HmbB-0005vi-00 => :blackhole: <userx@test.ex> R=r +1999-03-02 09:44:33 10HmbB-0005vi-00 Completed +1999-03-02 09:44:33 10HmaX-0005vi-00 malware acl condition: avast TESTSUITE/eximdir/avast_sock : 451 SCAN Engine error 13 Permission denied 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA -1999-03-02 09:44:33 10HmaY-0005vi-00 malware_name This ist not even an EICAR test virus. +1999-03-02 09:44:33 10HmaY-0005vi-00 malware_name This is not even an EICAR test virus. 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA +1999-03-02 09:44:33 10HmaZ-0005vi-00 malware_name The file is a decompression bomb +1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA +1999-03-02 09:44:33 10HmbA-0005vi-00 malware_name The file is a decompression bomb +1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA +1999-03-02 09:44:33 10HmbC-0005vi-00 internal scanner error (ignored): /bin/error [E]0.0 Error 42110 The\ file\ is\ a\ decompression\ bomb +1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss T="message should be accepted" +1999-03-02 09:44:33 10HmbC-0005vi-00 => :blackhole: <userx@test.ex> R=r +1999-03-02 09:44:33 10HmbC-0005vi-00 Completed diff --git a/test/log/4524 b/test/log/4524 index 9da344463..d86d43300 100644 --- a/test/log/4524 +++ b/test/log/4524 @@ -9,8 +9,7 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 DKIM: d=test.ex s=ses c=relaxed/relaxed a=rsa-sha256 b=512 [verification succeeded] 1999-03-02 09:44:33 10HmaY-0005vi-00 dkim_acl: signer: test.ex bits: 1024 h=From:To:Subject 1999-03-02 09:44:33 10HmaY-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] -1999-03-02 09:44:33 10HmaY-0005vi-00 dkim_acl: signer: test.dkim.dom.ain bits: 1024 h= -1999-03-02 09:44:33 10HmaY-0005vi-00 data acl: dkim status pass:pass:none +1999-03-02 09:44:33 10HmaY-0005vi-00 data acl: dkim status pass:pass 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmaY-0005vi-00 => c <c@test.ex> R=server_store T=file 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed diff --git a/test/log/4540 b/test/log/4540 index 58039465a..7d0c92bd7 100644 --- a/test/log/4540 +++ b/test/log/4540 @@ -5,9 +5,13 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 DKIM: d=test.ex s=sed c=relaxed/relaxed a=ed25519-sha256 b=512 [verification succeeded] 1999-03-02 09:44:33 10HmaX-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=pass header.d=test.ex header.s=sed header.a=ed25519-sha256 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss DKIM=test.ex id=E10HmaY-0005vi-00@myhost.test.ex -1999-03-02 09:44:33 10HmaZ-0005vi-00 signer: kitterman.org bits: 512 -1999-03-02 09:44:33 10HmaZ-0005vi-00 DKIM: d=kitterman.org s=ed25519 c=relaxed/simple a=ed25519-sha256 b=512 i=@kitterman.org t=1517847601 [verification succeeded] -1999-03-02 09:44:33 10HmaZ-0005vi-00 signer: @kitterman.org bits: 512 -1999-03-02 09:44:33 10HmaZ-0005vi-00 DKIM: d=kitterman.org s=ed25519 c=relaxed/simple a=ed25519-sha256 b=512 i=@kitterman.org t=1517847601 [verification succeeded] -1999-03-02 09:44:33 10HmaZ-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=pass header.d=kitterman.org header.i=@kitterman.org header.s=ed25519 header.a=ed25519-sha256 -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss DKIM=kitterman.org id=example@example.com +1999-03-02 09:44:33 10HmaZ-0005vi-00 signer: test.ex bits: 512 +1999-03-02 09:44:33 10HmaZ-0005vi-00 DKIM: d=test.ex s=sedw c=relaxed/relaxed a=ed25519-sha256 b=512 [verification succeeded] +1999-03-02 09:44:33 10HmaZ-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=pass header.d=test.ex header.s=sedw header.a=ed25519-sha256 +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss DKIM=test.ex id=E10HmaY-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 10HmbA-0005vi-00 signer: kitterman.org bits: 512 +1999-03-02 09:44:33 10HmbA-0005vi-00 DKIM: d=kitterman.org s=ed25519 c=relaxed/simple a=ed25519-sha256 b=512 i=@kitterman.org t=1517847601 [verification succeeded] +1999-03-02 09:44:33 10HmbA-0005vi-00 signer: @kitterman.org bits: 512 +1999-03-02 09:44:33 10HmbA-0005vi-00 DKIM: d=kitterman.org s=ed25519 c=relaxed/simple a=ed25519-sha256 b=512 i=@kitterman.org t=1517847601 [verification succeeded] +1999-03-02 09:44:33 10HmbA-0005vi-00 Authentication-Results: myhost.test.ex;\n dkim=pass header.d=kitterman.org header.i=@kitterman.org header.s=ed25519 header.a=ed25519-sha256 +1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss DKIM=kitterman.org id=example@example.com diff --git a/test/log/4562 b/test/log/4562 new file mode 100644 index 000000000..bfb1d9e46 --- /dev/null +++ b/test/log/4562 @@ -0,0 +1,18 @@ + +******** 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 10HmaX-0005vi-00 DKIM: d=example.com s=sel c=relaxed/relaxed a=rsa-sha256 b=2048 [verification failed - body hash mismatch (body probably modified in transit)] +1999-03-02 09:44:33 10HmaX-0005vi-00 arc_state: <none> +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@bloggs.com H=(xxx) [127.0.0.1] P=smtp S=sss id=qwerty1234@disco-zombie.net for za@test.ex +1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 10HmaY-0005vi-00 DKIM: d=test.ex s=sel c=relaxed/relaxed a=rsa-sha256 b=1024 [verification succeeded] +1999-03-02 09:44:33 10HmaY-0005vi-00 DKIM: d=example.com s=sel c=relaxed/relaxed a=rsa-sha256 b=2048 [verification failed - body hash mismatch (body probably modified in transit)] +1999-03-02 09:44:33 10HmaY-0005vi-00 arc_state: <pass> +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@bloggs.com H=localhost (test.ex) [127.0.0.1] P=esmtp S=sss DKIM=test.ex ARC id=qwerty1234@disco-zombie.net for a@test.ex +1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex <za@test.ex> R=fwd T=tsmtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp +1999-03-02 09:44:33 Start queue run: pid=pppp +1999-03-02 09:44:33 10HmaY-0005vi-00 => a <a@test.ex> R=d1 T=tfile +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed +1999-03-02 09:44:33 End queue run: pid=pppp diff --git a/test/log/4600 b/test/log/4600 index 4a5e6e3e3..d7fe4f9ec 100644 --- a/test/log/4600 +++ b/test/log/4600 @@ -1,14 +1,18 @@ ******** 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 spf_result fail -1999-03-02 09:44:33 spf_header_comment myhost.test.ex: domain of example.com does not designate ip4.ip4.ip4.ip4 as permitted sender -1999-03-02 09:44:33 spf_smtp_comment Please see http://www.openspf.org/Why?id=a%40example.com&ip=ip4.ip4.ip4.ip4&receiver=myhost.test.ex : Reason: mechanism -1999-03-02 09:44:33 spf_received Received-SPF: fail (myhost.test.ex: domain of example.com does not designate ip4.ip4.ip4.ip4 as permitted sender) client-ip=ip4.ip4.ip4.ip4; envelope-from=a@example.com; helo=testclient; -1999-03-02 09:44:33 Authentication-Results: myhost.test.ex;\n spf=fail smtp.mailfrom=example.com -1999-03-02 09:44:33 H=(testclient) [ip4.ip4.ip4.ip4] F=<a@example.com> rejected RCPT <fred@test.ex> +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 port 1224 +1999-03-02 09:44:33 spf_result pass (guess <no>) +1999-03-02 09:44:33 spf_header_comment myhost.test.ex: localhost is always allowed. +1999-03-02 09:44:33 spf_smtp_comment +1999-03-02 09:44:33 spf_received Received-SPF: pass (myhost.test.ex: localhost is always allowed.) client-ip=127.0.0.1; envelope-from=a@example.com; helo=testclient; +1999-03-02 09:44:33 Authentication-Results: myhost.test.ex;\n spf=pass smtp.mailfrom=example.com +1999-03-02 09:44:33 spf_result pass (guess <no>) +1999-03-02 09:44:33 spf_header_comment myhost.test.ex: localhost is always allowed. +1999-03-02 09:44:33 spf_smtp_comment +1999-03-02 09:44:33 spf_received Received-SPF: pass (myhost.test.ex: localhost is always allowed.) client-ip=127.0.0.1; envelope-from=b@test.example.com; helo=testclient; +1999-03-02 09:44:33 Authentication-Results: myhost.test.ex;\n spf=pass smtp.mailfrom=test.example.com 1999-03-02 09:44:33 spf_result pass 1999-03-02 09:44:33 spf_header_comment myhost.test.ex: localhost is always allowed. 1999-03-02 09:44:33 spf_smtp_comment -1999-03-02 09:44:33 spf_received Received-SPF: pass (myhost.test.ex: localhost is always allowed.) client-ip=127.0.0.1; envelope-from=b@example.com; helo=testclient; +1999-03-02 09:44:33 spf_received Received-SPF: pass (myhost.test.ex: localhost is always allowed.) client-ip=127.0.0.1; envelope-from=c@example.com; helo=testclient; 1999-03-02 09:44:33 Authentication-Results: myhost.test.ex;\n spf=pass smtp.mailfrom=example.com diff --git a/test/log/4601 b/test/log/4601 index e874ff17e..33334e895 100644 --- a/test/log/4601 +++ b/test/log/4601 @@ -1,5 +1,5 @@ ******** 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 a@example.com [ip4.ip4.ip4.ip4] lookup: 'fail' +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 port 1224 +1999-03-02 09:44:33 a@example.com [127.0.0.1] lookup: 'pass' 1999-03-02 09:44:33 b@example.com [127.0.0.1] lookup: 'pass' diff --git a/test/log/4650 b/test/log/4650 new file mode 100644 index 000000000..bc25849f4 --- /dev/null +++ b/test/log/4650 @@ -0,0 +1,9 @@ + +******** 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 10HmaX-0005vi-00 dmarc_status <norecord> +1999-03-02 09:44:33 10HmaX-0005vi-00 dmarc_status_text <No DMARC record> +1999-03-02 09:44:33 10HmaX-0005vi-00 dmarc_used_domain <example.com> +1999-03-02 09:44:33 10HmaX-0005vi-00 dmarc_domain_policy <> +1999-03-02 09:44:33 10HmaX-0005vi-00 Authentication-Results: myhost.test.ex;\n spf=fail smtp.mailfrom=example.com;\n dmarc=none header.from=example.com +1999-03-02 09:44:33 10HmaX-0005vi-00 <= a@example.com H=(testclient) [ip4.ip4.ip4.ip4] P=smtp S=sss diff --git a/test/log/5405 b/test/log/5405 index 901add1c3..feb4052f4 100644 --- a/test/log/5405 +++ b/test/log/5405 @@ -16,6 +16,7 @@ 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss for userf@domain.com 1999-03-02 09:44:33 rcpt for userg@domain.com 1999-03-02 09:44:33 10HmbC-0005vi-00 U=CALLER userg@domain.com F=<CALLER@myhost.test.ex> tmp-reject from cutthrough after DATA: R=all T=smtp H=127.0.0.1 [127.0.0.1] C="459 content reject" +1999-03-02 09:44:33 rcpt for userj@domain.com 1999-03-02 09:44:33 rcpt for userh@domain.com 1999-03-02 09:44:33 10HmbD-0005vi-00 >> userh@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" 1999-03-02 09:44:33 10HmbD-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss for userh@domain.com diff --git a/test/mail/3700.smtps b/test/mail/3700.smtps index ff57e01ed..eea14193f 100644 --- a/test/mail/3700.smtps +++ b/test/mail/3700.smtps @@ -3,7 +3,7 @@ Authentication-Results: myhost.test.ex; iprev=pass (localhost) smtp.client-ip=127.0.0.1; auth=pass (tls) x509.auth="Phil Pennock" Received: from localhost ([127.0.0.1] helo=myhost.test.ex) - by myhost.test.ex with esmtpsa (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtpsa (TLSv1:ke-RSA-AES256-SHA:xxx) (Exim x.yz) (envelope-from <ok@test.ex>) id 10HmbA-0005vi-00 diff --git a/test/mail/3700.x b/test/mail/3700.x index d1f269a37..9413a73e1 100644 --- a/test/mail/3700.x +++ b/test/mail/3700.x @@ -3,7 +3,7 @@ Authentication-Results: myhost.test.ex; iprev=pass (localhost) smtp.client-ip=127.0.0.1; auth=pass (tls) x509.auth="Phil Pennock" Received: from localhost ([127.0.0.1] helo=myhost.test.ex) - by myhost.test.ex with esmtpsa (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtpsa (TLSv1:ke-RSA-AES256-SHA:xxx) (Exim x.yz) (envelope-from <ok@test.ex>) id 10HmaZ-0005vi-00 diff --git a/test/mail/4560.a b/test/mail/4560.a index dd38aa6da..dcc30dffb 100644 --- a/test/mail/4560.a +++ b/test/mail/4560.a @@ -28,7 +28,7 @@ This is a simple test. From CALLER@bloggs.com Tue Mar 02 09:44:33 1999 Authentication-Results: test.ex; - iprev=pass (localhost); + iprev=pass (localhost) smtp.client-ip=127.0.0.1; arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.client-ip=127.0.0.1 Received: from localhost ([127.0.0.1] helo=test.ex) by test.ex with esmtp (Exim x.yz) @@ -60,7 +60,7 @@ This is a test body. From CALLER@bloggs.com Tue Mar 02 09:44:33 1999 Authentication-Results: test.ex; - iprev=pass (localhost); + iprev=pass (localhost) smtp.client-ip=127.0.0.1; arc=pass (i=2) header.s=sel arc.oldest-pass=2 smtp.client-ip=127.0.0.1 Received: from localhost ([127.0.0.1] helo=test.ex) by test.ex with esmtp (Exim x.yz) @@ -68,11 +68,11 @@ Received: from localhost ([127.0.0.1] helo=test.ex) id 10HmbC-0005vi-00 for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 ARC-Seal: i=2; cv=pass; a=rsa-sha256; d=test.ex; s=sel; - b=yjlE1/MuuhrLFWK1L1/4OyMyvK47vEmb9dlUF0JGxKTUgJRTqd725Qqzv5ArRQDbCGDah3Pttx - NfKYLDijgST4z5MSTQbiQAoXuGEIfwPSJjMm/cQ37FMcBA2l0gVLNoQIT6GlO8B0i4cigHGEZx - fhUOLvI8pYW8KY8ZiBLY4qE=; + b=MYYY1fE5A9EbBkaRpJD6OvFBUALCd7U3J/zro6xlQJXJLW+NaeDCRtStbk/ARCcTkOgnX7ZOzs + iLuOphCpepZTMAGWhZtit1d19HK33+s0nCIzvx31BNqpEn3xewb4/jtxBvkyVomuUudSrjbO+u + 8nNmcIB7siu2S8lrTSj1PPw=; ARC-Authentication-Results: i=2; test.ex; - iprev=pass (localhost); + iprev=pass (localhost) smtp.client-ip=127.0.0.1; arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.client-ip=127.0.0.1 ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed; d=test.ex; s=sel; bh=HUzfKKxIjPIa07lkj5uzDQ3q5YTRF/NwAUE7dhrrfvs=; @@ -81,7 +81,7 @@ ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed; d=test.ex; s=sel; P4RkRsmKXqHCoaOiSOqLvBvc8822Ap0l7F/cT2Gk3VRR5ITZI2piAsgLzFpLOEJsGwGVdYsNdx 5rxBKMPvXAWZip//tBngMRw=; Authentication-Results: test.ex; - iprev=pass (localhost); + iprev=pass (localhost) smtp.client-ip=127.0.0.1; arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.client-ip=127.0.0.1 Received: from localhost ([127.0.0.1] helo=test.ex) by test.ex with esmtp (Exim x.yz) @@ -113,7 +113,7 @@ This is a test body. From CALLER@bloggs.com Tue Mar 02 09:44:33 1999 Authentication-Results: test.ex; - iprev=pass (localhost); + iprev=pass (localhost) smtp.client-ip=127.0.0.1; arc=pass (i=3) header.s=sel arc.oldest-pass=0 smtp.client-ip=127.0.0.1 Received: from localhost ([127.0.0.1] helo=test.ex) by test.ex with esmtp (Exim x.yz) @@ -121,11 +121,11 @@ Received: from localhost ([127.0.0.1] helo=test.ex) id 10HmbG-0005vi-00 for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 ARC-Seal: i=3; cv=pass; a=rsa-sha256; d=test.ex; s=sel; - b=HfcLGHnX3KFIqq4Hj5/+WI4kkcNEpDCTHUbuLlB8PAdwgW2ZwwD2keARxqpkeFUz0KeedU/XZc - 54F5otXO+EkfzVP7l3nugFl4CAOGHqPOnXNU83o/tZmFb9OWDUpfB0AKN7pQZCcNbLaEdDjWuk - YkuDNVDM0PBQ2EXpLCIbTrE=; + b=toV+uStte4whonmLSQreJpbH4aVVPtd+7SRqSC37YAIQugpQMe3V3RL+ThxRfxQHvAeGn5K9sh + pRpkAdOrY38izcXtYx9aJw/kkSjsRHQURUFeIb5hk5RiqiKnQSPP17k5b+50IYVL1K7wGxWFza + 4a1dn6ILHMTRyax7sxgeCrs=; ARC-Authentication-Results: i=3; test.ex; - iprev=pass (localhost); + iprev=pass (localhost) smtp.client-ip=127.0.0.1; arc=pass (i=2) header.s=sel arc.oldest-pass=0 smtp.client-ip=127.0.0.1 ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed; d=test.ex; s=sel; bh=31zA4VNQZ2yhHUh+7vWASIL9kKqo6pSym1QghgPyUkM=; @@ -134,7 +134,7 @@ ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed; d=test.ex; s=sel; Ke1FhjdC7iXPv/Dj86J40D9yib5y7YC9Ce3px0xJSXDD+ml1eDi45rVo9GDkm1zVG3eZdESktT Iv0EvpWIFn7dpelS30IKk78=; Authentication-Results: test.ex; - iprev=pass (localhost); + iprev=pass (localhost) smtp.client-ip=127.0.0.1; arc=pass (i=2) header.s=sel arc.oldest-pass=0 smtp.client-ip=127.0.0.1 Received: from localhost ([127.0.0.1] helo=test.ex) by test.ex with esmtp (Exim x.yz) @@ -142,11 +142,11 @@ Received: from localhost ([127.0.0.1] helo=test.ex) id 10HmbF-0005vi-00 for za@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 ARC-Seal: i=2; cv=pass; a=rsa-sha256; d=test.ex; s=sel; - b=l/OY+REy6qXxE2df0mxzk2Fyv4C9dTuIr2GfnpylYmIr2m/9a8uJRahXa7Ygk9wR8ofnJS+7mr - PTM33+jhCQidq7ZgE28Q7XVMPGmqE4Frs+OmzIL4j7UpK1CYktEzYwOOCSAf8/Yu1XH5w2XNqA - rfIrGPWlAcSoxwfnbyYxVXQ=; + b=SN3ee5Elw4yqVxQjcNV978Nj4mHfyVpWxau+IX9cSo9oHfx8Cn7nbjjPK7gwwu+tu9i2//afhl + sc+7qNkz3TLDVlII0DU9obOKks4zQXboWKIs0/b4yGUf1m/KaJNU9ClMVzHHwvDkFYh1OMpqCn + oPvOntgmIYGBp2JYDaPubmc=; ARC-Authentication-Results: i=2; test.ex; - iprev=pass (localhost); + iprev=pass (localhost) smtp.client-ip=127.0.0.1; arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.client-ip=127.0.0.1 ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed; d=test.ex; s=sel; bh=31zA4VNQZ2yhHUh+7vWASIL9kKqo6pSym1QghgPyUkM=; @@ -155,7 +155,7 @@ ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed; d=test.ex; s=sel; Avoox5GkxPCBgYfO6wzh801k7F12Usgo7ryY8lOgQ/4OQ77TawNHFnlQ1WxhpaR/lUYkTXZXm2 LDzSoSVOQ0uFYg3cFzp54OA=; Authentication-Results: test.ex; - iprev=pass (localhost); + iprev=pass (localhost) smtp.client-ip=127.0.0.1; arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.client-ip=127.0.0.1 Received: from localhost ([127.0.0.1] helo=test.ex) by test.ex with esmtp (Exim x.yz) @@ -191,7 +191,7 @@ This is a generic mailinglist footer From CALLER@bloggs.com Tue Mar 02 09:44:33 1999 Authentication-Results: test.ex; - iprev=pass (localhost); + iprev=pass (localhost) smtp.client-ip=127.0.0.1; arc=fail (i=3 (cv, sequence or missing header)) Received: from localhost ([127.0.0.1] helo=test.ex) by test.ex with esmtp (Exim x.yz) @@ -199,11 +199,11 @@ Received: from localhost ([127.0.0.1] helo=test.ex) id 10HmbL-0005vi-00 for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 ARC-Seal: i=3; cv=fail; a=rsa-sha256; d=test.ex; s=sel; - b=kz0kMxmRu3kimu9tZvLx4HCAt6Scs+hbhEjjE30exA6FCQtaT9UjBekWGRtMLFSmR7CBlRRmOq - Rl6lWMahfAvmdnLVKyX2FrfQLiCGBadOFeZVv5uGX0sdZXDqgjGJLGlNfnk1dtP/y4durC28LL - 8PiM7An58gtCVWyiygt1Qk4=; + b=SWUvDQ1P3lgo13tJJeM68YmtvWI7gQqNWkCotGXdMN4wBcOpHPWI1oWcXb8uXu0VZOGi7tnznT + GokNUeB0MLtwsYMEr1JTlffMvwxqWaD37CmUsWg7JrTJ2NXPZ1qHKT21oFUvFEvkjd/RuoBiXJ + G7jbR5IG8oefz5Juq/ymDXU=; ARC-Authentication-Results: i=3; test.ex; - iprev=pass (localhost); + iprev=pass (localhost) smtp.client-ip=127.0.0.1; arc=fail (i=2)(AMS body hash miscompare) header.s=sel arc.oldest-pass=0 smtp.client-ip=127.0.0.1 ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed; d=test.ex; s=sel; bh=31zA4VNQZ2yhHUh+7vWASIL9kKqo6pSym1QghgPyUkM=; @@ -212,7 +212,7 @@ ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed; d=test.ex; s=sel; Ke1FhjdC7iXPv/Dj86J40D9yib5y7YC9Ce3px0xJSXDD+ml1eDi45rVo9GDkm1zVG3eZdESktT Iv0EvpWIFn7dpelS30IKk78=; Authentication-Results: test.ex; - iprev=pass (localhost); + iprev=pass (localhost) smtp.client-ip=127.0.0.1; arc=fail (i=2)(AMS body hash miscompare) header.s=sel arc.oldest-pass=0 smtp.client-ip=127.0.0.1 Received: from localhost ([127.0.0.1] helo=test.ex) by test.ex with esmtp (Exim x.yz) @@ -220,7 +220,7 @@ Received: from localhost ([127.0.0.1] helo=test.ex) id 10HmbK-0005vi-00 for za@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Authentication-Results: test.ex; - iprev=pass (localhost); + iprev=pass (localhost) smtp.client-ip=127.0.0.1; arc=pass (i=2) header.s=sel arc.oldest-pass=2 smtp.client-ip=127.0.0.1 Received: from localhost ([127.0.0.1] helo=test.ex) by test.ex with esmtp (Exim x.yz) @@ -228,11 +228,11 @@ Received: from localhost ([127.0.0.1] helo=test.ex) id 10HmbJ-0005vi-00 for mza@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 ARC-Seal: i=2; cv=pass; a=rsa-sha256; d=test.ex; s=sel; - b=yjlE1/MuuhrLFWK1L1/4OyMyvK47vEmb9dlUF0JGxKTUgJRTqd725Qqzv5ArRQDbCGDah3Pttx - NfKYLDijgST4z5MSTQbiQAoXuGEIfwPSJjMm/cQ37FMcBA2l0gVLNoQIT6GlO8B0i4cigHGEZx - fhUOLvI8pYW8KY8ZiBLY4qE=; + b=MYYY1fE5A9EbBkaRpJD6OvFBUALCd7U3J/zro6xlQJXJLW+NaeDCRtStbk/ARCcTkOgnX7ZOzs + iLuOphCpepZTMAGWhZtit1d19HK33+s0nCIzvx31BNqpEn3xewb4/jtxBvkyVomuUudSrjbO+u + 8nNmcIB7siu2S8lrTSj1PPw=; ARC-Authentication-Results: i=2; test.ex; - iprev=pass (localhost); + iprev=pass (localhost) smtp.client-ip=127.0.0.1; arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.client-ip=127.0.0.1 ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed; d=test.ex; s=sel; bh=HUzfKKxIjPIa07lkj5uzDQ3q5YTRF/NwAUE7dhrrfvs=; @@ -241,7 +241,7 @@ ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed; d=test.ex; s=sel; P4RkRsmKXqHCoaOiSOqLvBvc8822Ap0l7F/cT2Gk3VRR5ITZI2piAsgLzFpLOEJsGwGVdYsNdx 5rxBKMPvXAWZip//tBngMRw=; Authentication-Results: test.ex; - iprev=pass (localhost); + iprev=pass (localhost) smtp.client-ip=127.0.0.1; arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.client-ip=127.0.0.1 Received: from localhost ([127.0.0.1] helo=test.ex) by test.ex with esmtp (Exim x.yz) @@ -277,7 +277,7 @@ This is a generic mailinglist footer From CALLER@bloggs.com Tue Mar 02 09:44:33 1999 Authentication-Results: test.ex; - iprev=pass (localhost); + iprev=pass (localhost) smtp.client-ip=127.0.0.1; arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.client-ip=127.0.0.1 Received: from localhost ([127.0.0.1] helo=test.ex) by test.ex with esmtp (Exim x.yz) @@ -285,7 +285,7 @@ Received: from localhost ([127.0.0.1] helo=test.ex) id 10HmbO-0005vi-00 for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Authentication-Results: test.ex; - iprev=pass (localhost); + iprev=pass (localhost) smtp.client-ip=127.0.0.1; arc=pass (i=1) header.s=sel arc.oldest-pass=1 smtp.client-ip=127.0.0.1 Received: from localhost ([127.0.0.1] helo=test.ex) by test.ex with esmtp (Exim x.yz) @@ -317,7 +317,7 @@ This is a test body. From CALLER@bloggs.com Tue Mar 02 09:44:33 1999 Authentication-Results: test.ex; - iprev=pass (localhost); + iprev=pass (localhost) smtp.client-ip=127.0.0.1; dkim=pass header.d=dmarc.org header.s=clochette header.a=rsa-sha256; dkim=fail (body hash mismatch; body probably modified in transit) header.d=convivian.com header.s=default header.a=rsa-sha256; diff --git a/test/paniclog/4007 b/test/paniclog/4007 index 5236f07f2..9a02eadf4 100644 --- a/test/paniclog/4007 +++ b/test/paniclog/4007 @@ -1,3 +1,3 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 malware acl condition: avast TESTSUITE/eximdir/avast_sock : invalid response from scanner: 'blah [E]' +1999-03-02 09:44:33 10HmaX-0005vi-00 malware acl condition: avast TESTSUITE/eximdir/avast_sock : 451 SCAN Engine error 13 Permission denied 1999-03-02 09:44:33 10HmaY-0005vi-00 malware acl condition: avast TESTSUITE/eximdir/avast_sock : timeout from scanner 1999-03-02 09:44:33 10HmaZ-0005vi-00 malware acl condition: avast TESTSUITE/eximdir/avast_sock : timeout from scanner diff --git a/test/paniclog/4017 b/test/paniclog/4017 index b6fcc0527..de97faf37 100644 --- a/test/paniclog/4017 +++ b/test/paniclog/4017 @@ -1 +1 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 malware acl condition: avast TESTSUITE/eximdir/avast_sock : invalid response from scanner: '/bin/error [E]0.0' +1999-03-02 09:44:33 10HmaX-0005vi-00 malware acl condition: avast TESTSUITE/eximdir/avast_sock : 451 SCAN Engine error 13 Permission denied diff --git a/test/rejectlog/4007 b/test/rejectlog/4007 index 6ba3a2659..f46e9e71e 100644 --- a/test/rejectlog/4007 +++ b/test/rejectlog/4007 @@ -34,3 +34,15 @@ P Received: from CALLER (helo=test.ex) Subject: message should be tmp-rejected due to timeout I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> +1999-03-02 09:44:33 10HmbB-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA +Envelope-from: <CALLER@myhost.test.ex> +Envelope-to: <userx@test.ex> +P Received: from CALLER (helo=test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from <CALLER@myhost.test.ex>) + id 10HmbB-0005vi-00 + for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 + Date: Tue, 2 Mar 1999 09:44:33 +0000 + Subject: defer this one, the scanner had an error +I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex> +F From: CALLER_NAME <CALLER@myhost.test.ex> diff --git a/test/rejectlog/4017 b/test/rejectlog/4017 index f14a316b7..670b9057b 100644 --- a/test/rejectlog/4017 +++ b/test/rejectlog/4017 @@ -22,3 +22,27 @@ P Received: from CALLER (helo=test.ex) Subject: message should be rejected I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> +1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA +Envelope-from: <CALLER@myhost.test.ex> +Envelope-to: <userx@test.ex> +P Received: from CALLER (helo=test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from <CALLER@myhost.test.ex>) + id 10HmaZ-0005vi-00 + for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 + Date: Tue, 2 Mar 1999 09:44:33 +0000 + Subject: message should be rejected +I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> +F From: CALLER_NAME <CALLER@myhost.test.ex> +1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA +Envelope-from: <CALLER@myhost.test.ex> +Envelope-to: <userx@test.ex> +P Received: from CALLER (helo=test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from <CALLER@myhost.test.ex>) + id 10HmbA-0005vi-00 + for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 + Date: Tue, 2 Mar 1999 09:44:33 +0000 + Subject: message should be rejected +I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> +F From: CALLER_NAME <CALLER@myhost.test.ex> diff --git a/test/rejectlog/4600 b/test/rejectlog/4600 deleted file mode 100644 index 6eeab86c5..000000000 --- a/test/rejectlog/4600 +++ /dev/null @@ -1,3 +0,0 @@ - -******** SERVER ******** -1999-03-02 09:44:33 H=(testclient) [ip4.ip4.ip4.ip4] F=<a@example.com> rejected RCPT <fred@test.ex> diff --git a/test/runtest b/test/runtest index 38d519c2e..7893dcbd7 100755 --- a/test/runtest +++ b/test/runtest @@ -1138,6 +1138,9 @@ RESET_AFTER_EXTRA_LINE_READ: next if /^Waiting for MySQL server to answer/; next if /mysqladmin: CREATE DATABASE failed; .* database exists/; + # Not all builds include DMARC + next if /^DMARC: no (dmarc_tld_file|sender_host_address)$/ ; + # When Exim is checking the size of directories for maildir, it uses # the check_dir_size() function to scan directories. Of course, the order # of the files that are obtained using readdir() varies from system to diff --git a/test/scripts/0000-Basic/0571 b/test/scripts/0000-Basic/0571 index 3eab04cbf..f8422c8b9 100644 --- a/test/scripts/0000-Basic/0571 +++ b/test/scripts/0000-Basic/0571 @@ -6,7 +6,7 @@ should fail . **** # -exim -f bill@29.29.29.com -odq ok1@test.ex +exim -oMai CALLER -f bill@29.29.29.com -odq ok1@test.ex should pass . **** diff --git a/test/scripts/2610-MySQL/2610 b/test/scripts/2610-MySQL/2610 index 9a36f0763..c9e0d5977 100644 --- a/test/scripts/2610-MySQL/2610 +++ b/test/scripts/2610-MySQL/2610 @@ -83,4 +83,4 @@ perl system 'mysqladmin --protocol=TCP -P PORT_N -u root shutdown'; **** killdaemon -#sudo rm -fr DIR/mysql +sudo rm -fr DIR/mysql diff --git a/test/scripts/2701-redis-cluster/2701 b/test/scripts/2701-redis-cluster/2701 index 66a50051a..d1c9ffc35 100644 --- a/test/scripts/2701-redis-cluster/2701 +++ b/test/scripts/2701-redis-cluster/2701 @@ -43,7 +43,7 @@ ${lookup redis{get ${quote_redis:01t67it}}} # sleep 5 perl -my @pidfiles = ( "DIR/redis-cluster/node1/node1.pid", "DIR/redis-cluster/node2/" ); +my @pidfiles = ( "DIR/redis-cluster/node1/node1.pid", "DIR/redis-cluster/node2/node2.pid" ); foreach my $pidfile (@pidfiles) { if ( -f $pidfile ) { open (my $fh, "<", $pidfile); diff --git a/test/scripts/4007_scan_avast/4007 b/test/scripts/4007_scan_avast/4007 index 0611f2a96..fc6c627cf 100644 --- a/test/scripts/4007_scan_avast/4007 +++ b/test/scripts/4007_scan_avast/4007 @@ -28,13 +28,13 @@ quit **** # # -# +### (non-internal) scanner error -> paniclog server DIR/eximdir/avast_sock >LF>220 ready <SCAN >LF>210 SCAN DATA ->LF>blah [E] ->LF>200 SCAN OK +>LF>blah [E]0.0 Error 13 Permission\\ denied +>LF>451 SCAN Engine error 13 Permission denied <QUIT *eof **** @@ -59,7 +59,7 @@ server DIR/eximdir/avast_sock >LF>220 ready <SCAN >LF>210 SCAN DATA ->LF>b\\ l\\ a\\ h [L]9.9 9 VNAME +>LF>b\\ l\\ a\\ h [L]9.0 0 VNAME >LF>200 SCAN OK <QUIT *eof @@ -118,3 +118,29 @@ Subject: message should be accepted despite timeout . quit **** +# +# +### internal scanner error, no panic log +server DIR/eximdir/avast_sock +>LF>220 ready +<SCAN +>LF>210 SCAN DATA +>LF>blah [E]0.0 Error 42110 The\\ file\\ is\\ a\\ decompression\\ bomb +>LF>200 SCAN OK +<QUIT +*eof +**** +# +# +# +exim -odi -bs -DOPTION= -DINSERT= +ehlo test.ex +mail from:<> +rcpt to:<userx@test.ex> +data +Date: Fri, 17 Dec 2004 14:35:01 +0100 +Subject: defer this one, the scanner had an error + +. +quit +**** diff --git a/test/scripts/4017_scan_avast_multiline/4017 b/test/scripts/4017_scan_avast_multiline/4017 index d075825b8..3f888ea63 100644 --- a/test/scripts/4017_scan_avast_multiline/4017 +++ b/test/scripts/4017_scan_avast_multiline/4017 @@ -31,15 +31,13 @@ quit **** # # -### clean and error | multiline response +### scanner tmpfail -> defer server DIR/eximdir/avast_sock >LF>220 ready <SCAN >LF>210 SCAN DATA ->LF>/bin/ok [+] ->LF>/bin/error [E]0.0 ->LF>/bin/infected [L]0.0 0 This is not even EICAR! ->LF>200 SCAN OK +>LF>/bin/error [E]0.0 Error 13 Permission\\ denied +>LF>451 SCAN Engine error 13 Permission denied <QUIT *eof **** @@ -59,13 +57,41 @@ quit **** # # -# clean and infected | multiline response +# clean and infected -> reject +server DIR/eximdir/avast_sock +>LF>220 ready +<SCAN +>LF>210 SCAN DATA +>LF>/bin/clean [+] +>LF>v\\ i\\ a\\ r\\ u\\ s [L]9.0 0 This\\ is\\ not\\ even\\ an\\ EICAR\\ test\\ virus. +>LF>200 SCAN OK +<QUIT +*eof +**** +# +# +# +exim -odi -bs -DOPTION= -DINSERT="/defer_ok" +ehlo test.ex +mail from:<> +rcpt to:<userx@test.ex> +data +Date: Fri, 17 Dec 2004 14:35:01 +0100 +Subject: message should be rejected + +. +quit +**** +# +# +# clean, error, infected -> reject server DIR/eximdir/avast_sock >LF>220 ready <SCAN >LF>210 SCAN DATA >LF>/bin/clean [+] ->LF>v\\ i\\ a\\ r\\ u\\ s [L]9.9 9 This ist not even an EICAR test virus. +>LF>/bin/error [E]0.0 Error 42110 The\\ file\\ is\\ a\\ decompression\\ bomb +>LF>v\\ i\\ a\\ r\\ u\\ s [L]9.0 0 This\\ is\\ not\\ even\\ an\\ EICAR\\ test\\ virus. >LF>200 SCAN OK <QUIT *eof @@ -84,3 +110,57 @@ Subject: message should be rejected . quit **** +# +# +# clean, error -> reject +server DIR/eximdir/avast_sock +>LF>220 ready +<SCAN +>LF>210 SCAN DATA +>LF>/bin/clean [+] +>LF>/bin/error [E]0.0 Error 42110 The\\ file\\ is\\ a\\ decompression\\ bomb +>LF>200 SCAN OK +<QUIT +*eof +**** +# +# +# +exim -odi -bs -DOPTION= -DINSERT= +ehlo test.ex +mail from:<> +rcpt to:<userx@test.ex> +data +Date: Fri, 17 Dec 2004 14:35:01 +0100 +Subject: message should be rejected + +. +quit +**** +# +# +# clean, error (pass_unscanned) -> accept +server DIR/eximdir/avast_sock +>LF>220 ready +<SCAN +>LF>210 SCAN DATA +>LF>/bin/clean [+] +>LF>/bin/error [E]0.0 Error 42110 The\\ file\\ is\\ a\\ decompression\\ bomb +>LF>200 SCAN OK +<QUIT +*eof +**** +# +# +# +exim -odi -bs -DOPTION=pass_unscanned -DINSERT= +ehlo test.ex +mail from:<> +rcpt to:<userx@test.ex> +data +Date: Fri, 17 Dec 2004 14:35:01 +0100 +Subject: message should be accepted + +. +quit +**** diff --git a/test/scripts/4540-DKIM-Ed25519/4540 b/test/scripts/4540-DKIM-Ed25519/4540 index 0be08ea31..504676e7c 100644 --- a/test/scripts/4540-DKIM-Ed25519/4540 +++ b/test/scripts/4540-DKIM-Ed25519/4540 @@ -6,7 +6,7 @@ exim -DSERVER=server -bd -oX PORT_D # This should pass, only Mail::DKIM::Signer does not handle ed25519-sha256 yet # # Mail original (will be)in aux-fixed/4500.msg1.txt -# Sig generated by: perl aux-fixed/dkim/sign.pl --algorithm=ed255190sha256 \ +# Sig (would be) generated by: perl aux-fixed/dkim/sign.pl --algorithm=ed255190sha256 \ # --method=simple/simple < aux-fixed/4500.msg1.txt # # TODO - until we have that we can only test internal consistency, @@ -44,6 +44,40 @@ QUIT **** # # +# Duplicate of the above, but referencing a pubkey in "wrapped-in-SubjectPublicKeyInfo" +# format. Should pass also. +client 127.0.0.1 PORT_D +??? 220 +HELO xxx +??? 250 +MAIL FROM:<CALLER@bloggs.com> +??? 250 +RCPT TO:<a@test.ex> +??? 250 +DATA +??? 354 +DKIM-Signature: v=1; a=ed25519-sha256; q=dns/txt; c=relaxed/relaxed; d=test.ex + ; s=sedw; h=From:To:Subject; bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=; + b=g0aVl5sI4fFLWDwXj9SnLgENXg2u8H8kKgK5/bXBZ7DKAImkm2+4tRzz1UOveu/Navis53Bg/C + 9nPxsspzb/Dg==; +Received: from jgh by myhost.test.ex with local (Exim x.yz) + envelope-from <jgh@myhost.test.ex>) + 1dtXln-0000YP-Hb + a@test.ex; Sun, 17 Sep 2017 12:29:51 +0100 +From: nobody@example.com +Message-Id: <E1dtXln-0000YP-Hb@myhost.test.ex> +Sender: CALLER_NAME <jgh@myhost.test.ex> +Date: Sun, 17 Sep 2017 12:29:51 +0100 + +content +. +??? 250 +QUIT +??? 221 +**** +# +# + # This should pass, an independently-generated sample from Scott Kitterman. # I don't want to retain this longterm as it hits an external DNS record, # not under the testsuite. diff --git a/test/scripts/4560-ARC/4562 b/test/scripts/4560-ARC/4562 new file mode 100644 index 000000000..3f21e1ebd --- /dev/null +++ b/test/scripts/4560-ARC/4562 @@ -0,0 +1,48 @@ +# ARC sign, DKIM header interactions +# +exim -DSERVER=server -bd -oX PORT_D +**** +# +# Random-ish input message, having a DKIM header +client 127.0.0.1 PORT_D +??? 220 +HELO xxx +??? 250 +MAIL FROM:<CALLER@bloggs.com> +??? 250 +RCPT TO:<za@test.ex> +??? 250 +DATA +??? 354 +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; + d=example.com; s=sel; h=List-Archive; + bh=47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=; b=uslVEq1LzHDR2ACoSTiErsGhe + GcuqL5no/4XYjsEJOIXkKFp4FFTj7QTcblHqyqsjgd5Dgs7zuFV4U3lwU9jSZtqJNQI+BtYZ5dS48 + sjr9PbLiguw8rAv5eDXBQKi5XcNCnZlUnWEjl10OXEgJZ9UXdKToWHpSfWEw1nFvOlKAfPBfkznnA + EOQXSTJOTanLpr7EZ4Yw5LWE+9BWJfnl6snn6W0mmJl4tbfEXEV1ZzOxdQF1rwjJqmojoCG36Z+v5 + sWKswl7HgSlKo2GKgxh9zIIhoxg5+7zfmHdKUQ2/6zuR8nqjDAjl3bSdOMgZVM0L6G6EMxQP6Sj6f + oEr6ePt9A==; +From: mrgus@text.ex +To: bakawolf@yahoo.com +Date: Thu, 19 Nov 2015 17:00:07 -0700 +Message-ID: <qwerty1234@disco-zombie.net> +Subject: simple test + +This is a simple test. +. +??? 250 +QUIT +??? 221 +**** +exim -DSERVER=server -DNOTDAEMON -q +**** +exim -DSERVER=server -DNOTDAEMON -q +**** +# +# +# +# +# +killdaemon +no_stdout_check +no_msglog_check diff --git a/test/scripts/4600-SPF/4600 b/test/scripts/4600-SPF/4600 index 3907f6861..d24fa9d94 100644 --- a/test/scripts/4600-SPF/4600 +++ b/test/scripts/4600-SPF/4600 @@ -5,25 +5,35 @@ # to provide values for testcases. # # For now just check that what should be working syntax does not cause us to fall over. -# Be careful with envelope-domains used for testcases, as real DNS lookups will be done. +# Be careful with envelope-domains and IPs used for testcases, as real DNS lookups will be done. # -exim -bd -DSERVER=server -oX PORT_D +exim -bd -DSERVER=server -oX PORT_D:PORT_S **** -client HOSTIPV4 PORT_D +client 127.0.0.1 PORT_D ??? 220 helo testclient ??? 250 mail from:<a@example.com> ??? 250 rcpt to:<fred@test.ex> -??? 550 +??? 250 quit **** client 127.0.0.1 PORT_D ??? 220 helo testclient ??? 250 -mail from:<b@example.com> +mail from:<b@test.example.com> +??? 250 +rcpt to:<fred@test.ex> +??? 250 +quit +**** +client 127.0.0.1 PORT_S +??? 220 +helo testclient +??? 250 +mail from:<c@example.com> ??? 250 rcpt to:<fred@test.ex> ??? 250 diff --git a/test/scripts/4600-SPF/4601 b/test/scripts/4600-SPF/4601 index 096b64e24..ab434611c 100644 --- a/test/scripts/4600-SPF/4601 +++ b/test/scripts/4600-SPF/4601 @@ -7,9 +7,9 @@ # For now just check that what should be working syntax does not cause us to fall over. # Be careful with envelope-domains used for testcases, as real DNS lookups will be done. # -exim -bd -DSERVER=server -oX PORT_D +exim -bd -DSERVER=server -oX PORT_D:PORT_S **** -client HOSTIPV4 PORT_D +client 127.0.0.1 PORT_D ??? 220 helo testclient ??? 250 @@ -19,7 +19,7 @@ rcpt to:<fred@test.ex> ??? 250 quit **** -client 127.0.0.1 PORT_D +client 127.0.0.1 PORT_S ??? 220 helo testclient ??? 250 diff --git a/test/scripts/4650-DMARC/4650 b/test/scripts/4650-DMARC/4650 new file mode 100644 index 000000000..85d9e51cc --- /dev/null +++ b/test/scripts/4650-DMARC/4650 @@ -0,0 +1,32 @@ +# acl variables and authresults +# +# SPF is a problem. We use libspf2 to do the work, and it +# does the DNS lookups, so we cannot intercept them in the testsuite's usual fashion +# to provide values for testcases. +# +# For now just check that what should be working syntax does not cause us to fall over. +# Be careful with envelope-domains used for testcases, as real DNS lookups will be done. +# +exim -bd -DSERVER=server -oX PORT_D +**** +client HOSTIPV4 PORT_D +??? 220 +HELO testclient +??? 250 +MAIL FROM:<a@example.com> +??? 250 +RCPT TO:<fred@test.ex> +??? 250 +DATA +??? 3 +Subject: test +From: z@example.com + +body line +. +??? 250 +QUIT +**** +# +killdaemon +no_msglog_check diff --git a/test/scripts/4650-DMARC/REQUIRES b/test/scripts/4650-DMARC/REQUIRES new file mode 100644 index 000000000..bb17aff6c --- /dev/null +++ b/test/scripts/4650-DMARC/REQUIRES @@ -0,0 +1 @@ +support Experimental_DMARC diff --git a/test/scripts/5400-cutthrough/5405 b/test/scripts/5400-cutthrough/5405 index 2e7a33388..2de0f5c58 100644 --- a/test/scripts/5400-cutthrough/5405 +++ b/test/scripts/5400-cutthrough/5405 @@ -174,6 +174,30 @@ DATA QUIT **** # +# conn-drop (at DATA-dot), option "pass". Should tmp-rej source, at DATA. +server PORT_S +220 ESMTP +EHLO +250 OK +MAIL FROM: +250 Sender OK +RCPT TO: +250 good rcpt +DATA +354 Send data +. +>*eof +**** +exim -DCONTROL=/defer=pass -bs +EHLO myhost.test.ex +MAIL FROM:<CALLER@myhost.test.ex> +RCPT TO:<userj@domain.com> +DATA + +. +QUIT +**** +# ######################################################### #, Now using a conn opened by a recipient verify # diff --git a/test/src/ed25519_privkey_pem_to_pubkey_raw_b64.c b/test/src/ed25519_privkey_pem_to_pubkey_raw_b64.c deleted file mode 100644 index f6639b758..000000000 --- a/test/src/ed25519_privkey_pem_to_pubkey_raw_b64.c +++ /dev/null @@ -1,139 +0,0 @@ - -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> - -#include <stdarg.h> -#include <stddef.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - -/* Unix includes */ - -typedef unsigned char uschar; - -#define CS (char *) -#define US (unsigned char *) - -#define FALSE 0 -#define TRUE 1 - - - -#ifdef HAVE_GNUTLS - - -#include <gnutls/gnutls.h> -#include <gnutls/abstract.h> -#include <gnutls/x509.h> - -#if GNUTLS_VERSION_NUMBER >= 0x030600 -# define SIGN_HAVE_ED25519 -#endif - - - -static uschar *enc64table = - US"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - -uschar * -b64encode(uschar *clear, int len) -{ -uschar *code = malloc(4*((len+2)/3) + 2); -uschar *p = code; - -while (len-- >0) - { - int x, y; - - x = *clear++; - *p++ = enc64table[(x >> 2) & 63]; - - if (len-- <= 0) - { - *p++ = enc64table[(x << 4) & 63]; - *p++ = '='; - *p++ = '='; - break; - } - - y = *clear++; - *p++ = enc64table[((x << 4) | ((y >> 4) & 15)) & 63]; - - if (len-- <= 0) - { - *p++ = enc64table[(y << 2) & 63]; - *p++ = '='; - break; - } - - x = *clear++; - *p++ = enc64table[((y << 2) | ((x >> 6) & 3)) & 63]; - - *p++ = enc64table[x & 63]; - } - -*p = 0; - -return code; -} - -/************************************************* -* Main Program * -*************************************************/ - - -int -main(int argc, char **argv) -{ -uschar * pemfile = argv[1]; -int fd; -uschar buf[1024]; -int len, rc; -gnutls_privkey_t privkey; -gnutls_datum_t k; -gnutls_pubkey_t pubkey; -uschar * b64; - -#ifdef SIGN_HAVE_ED25519 -if ((fd = open(CS pemfile, O_RDONLY)) < 0) - exit(1); - -if ((len = read(fd, buf, sizeof(buf)-1)) < 0) - exit(2); - -k.data = buf; -k.size = len; - -if ( (rc = gnutls_privkey_init(&privkey)) - || (rc = gnutls_privkey_import_x509_raw(privkey, &k, GNUTLS_X509_FMT_PEM, NULL, GNUTLS_PKCS_PLAIN)) - || (rc = gnutls_pubkey_init(&pubkey)) - || (rc = gnutls_pubkey_import_privkey(pubkey, privkey, GNUTLS_KEY_DIGITAL_SIGNATURE, 0)) - || (rc = gnutls_pubkey_export_ecc_raw2(pubkey, NULL, &k, NULL, GNUTLS_EXPORT_FLAG_NO_LZ)) - ) - fprintf(stderr, "%s\n", gnutls_strerror(rc)); - -b64 = b64encode(k.data, k.size); - -printf("%s\n", b64); -exit(0); - -#else -fprintf(stderr, "No support for ed25519 signing in GnuTLS (version %s)\n", gnutls_check_version(NULL)); -exit(3); -#endif -} - -#endif - -#ifdef HAVE_OPENSSL -int -main(int argc, char **argv) -{ -fprintf(stderr, "No support for ed25519 signing in OpenSSL\n"); -exit(3); -} - -#endif diff --git a/test/stderr/0435 b/test/stderr/0435 index 1ec601657..ad55c7e8f 100644 --- a/test/stderr/0435 +++ b/test/stderr/0435 @@ -15,8 +15,8 @@ SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< HELO ? LOG: smtp_syntax_error MAIN - SMTP syntax error in "HELO ?" U=CALLER NULL character(s) present (shown as '?') -SMTP>> 501 NULL characters are not allowed in SMTP commands + SMTP syntax error in "HELO ?" U=CALLER NUL character(s) present (shown as '?') +SMTP>> 501 NUL characters are not allowed in SMTP commands SMTP<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN diff --git a/test/stderr/4007 b/test/stderr/4007 index 5236f07f2..2a5493e96 100644 --- a/test/stderr/4007 +++ b/test/stderr/4007 @@ -1,3 +1,9 @@ -1999-03-02 09:44:33 10HmaX-0005vi-00 malware acl condition: avast TESTSUITE/eximdir/avast_sock : invalid response from scanner: 'blah [E]' +### (non-internal) scanner error -> paniclog +1999-03-02 09:44:33 10HmaX-0005vi-00 malware acl condition: avast TESTSUITE/eximdir/avast_sock : 451 SCAN Engine error 13 Permission denied 1999-03-02 09:44:33 10HmaY-0005vi-00 malware acl condition: avast TESTSUITE/eximdir/avast_sock : timeout from scanner 1999-03-02 09:44:33 10HmaZ-0005vi-00 malware acl condition: avast TESTSUITE/eximdir/avast_sock : timeout from scanner +### internal scanner error, no panic log + +******** SERVER ******** +### (non-internal) scanner error -> paniclog +### internal scanner error, no panic log diff --git a/test/stderr/4017 b/test/stderr/4017 index 22157c3d1..287cd30ce 100644 --- a/test/stderr/4017 +++ b/test/stderr/4017 @@ -1,7 +1,7 @@ ### clean | multiline response -### clean and error | multiline response -1999-03-02 09:44:33 10HmaX-0005vi-00 malware acl condition: avast TESTSUITE/eximdir/avast_sock : invalid response from scanner: '/bin/error [E]0.0' +### scanner tmpfail -> defer +1999-03-02 09:44:33 10HmaX-0005vi-00 malware acl condition: avast TESTSUITE/eximdir/avast_sock : 451 SCAN Engine error 13 Permission denied ******** SERVER ******** ### clean | multiline response -### clean and error | multiline response +### scanner tmpfail -> defer diff --git a/test/stdout/0435 b/test/stdout/0435 index 2b974e2cf..c86a50837 100644 --- a/test/stdout/0435 +++ b/test/stdout/0435 @@ -1,3 +1,3 @@ 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-501 NULL characters are not allowed in SMTP commands
+501 NUL characters are not allowed in SMTP commands
221 myhost.test.ex closing connection
diff --git a/test/stdout/4007 b/test/stdout/4007 index 603de1521..32adb0910 100644 --- a/test/stdout/4007 +++ b/test/stdout/4007 @@ -7,8 +7,9 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmbB-0005vi-00
+250 OK id=10HmbC-0005vi-00
221 myhost.test.ex closing connection
+### (non-internal) scanner error -> paniclog 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
@@ -53,6 +54,18 @@ 354 Enter message, ending with "." on a line by itself
250 OK id=10HmaZ-0005vi-00
221 myhost.test.ex closing connection
+### internal scanner error, no panic log +220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.ex
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+550 Administrative prohibition
+221 myhost.test.ex closing connection
******** SERVER ******** Listening on TESTSUITE/eximdir/avast_sock ... @@ -61,27 +74,30 @@ Connection request <FLAGS -fullfiles >LF>210 FLAGS DATA >LF>200 FLAGS OK -<SCAN TESTSUITE/spool/scan/10HmbB-0005vi-00 +<SCAN TESTSUITE/spool/scan/10HmbC-0005vi-00 >LF>210 SCAN DATA >LF>blah\x09[+] >LF>200 SCAN OK <QUIT Expected EOF read from client End of script +### (non-internal) scanner error -> paniclog Listening on TESTSUITE/eximdir/avast_sock ... Connection request >LF>220 ready <SCAN TESTSUITE/spool/scan/10HmaX-0005vi-00 >LF>210 SCAN DATA ->LF>blah\x09[E] ->LF>200 SCAN OK -Unexpected EOF read from client +>LF>blah\x09[E]0.0\x09Error 13 Permission\\ denied +>LF>451 SCAN Engine error 13 Permission denied +<QUIT +Expected EOF read from client +End of script Listening on TESTSUITE/eximdir/avast_sock ... Connection request >LF>220 ready <SCAN TESTSUITE/spool/scan/10HmbA-0005vi-00 >LF>210 SCAN DATA ->LF>b\\ l\\ a\\ h\x09[L]9.9\x099 VNAME +>LF>b\\ l\\ a\\ h\x09[L]9.0\x090 VNAME >LF>200 SCAN OK <QUIT Expected EOF read from client @@ -94,3 +110,14 @@ Listening on TESTSUITE/eximdir/avast_sock ... Connection request *sleep 3 End of script +### internal scanner error, no panic log +Listening on TESTSUITE/eximdir/avast_sock ... +Connection request +>LF>220 ready +<SCAN TESTSUITE/spool/scan/10HmbB-0005vi-00 +>LF>210 SCAN DATA +>LF>blah\x09[E]0.0\x09Error 42110 The\\ file\\ is\\ a\\ decompression\\ bomb +>LF>200 SCAN OK +<QUIT +Expected EOF read from client +End of script diff --git a/test/stdout/4017 b/test/stdout/4017 index e46e8f3fd..7d731ae90 100644 --- a/test/stdout/4017 +++ b/test/stdout/4017 @@ -8,9 +8,9 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmbB-0005vi-00
221 myhost.test.ex closing connection
-### clean and error | multiline response +### scanner tmpfail -> defer 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello CALLER at test.ex
250-SIZE 52428800
@@ -33,6 +33,39 @@ 354 Enter message, ending with "." on a line by itself
550 Administrative prohibition
221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.ex
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+550 Administrative prohibition
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.ex
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+550 Administrative prohibition
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.ex
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmbC-0005vi-00
+221 myhost.test.ex closing connection
******** SERVER ******** ### clean | multiline response @@ -44,7 +77,7 @@ Connection request >LF>FLAGS -fullfiles >LF>FLAGS +extra >LF>200 FLAGS OK -<SCAN TESTSUITE/spool/scan/10HmaZ-0005vi-00 +<SCAN TESTSUITE/spool/scan/10HmbB-0005vi-00 >LF>210 SCAN DATA >LF>/bin/clean1\x09[+] >LF>/bin/clean2\x09[+] @@ -52,24 +85,58 @@ Connection request <QUIT Expected EOF read from client End of script -### clean and error | multiline response +### scanner tmpfail -> defer Listening on TESTSUITE/eximdir/avast_sock ... Connection request >LF>220 ready <SCAN TESTSUITE/spool/scan/10HmaX-0005vi-00 >LF>210 SCAN DATA ->LF>/bin/ok\x09[+] ->LF>/bin/error\x09[E]0.0 ->LF>/bin/infected\x09[L]0.0\x090 This is not even EICAR! ->LF>200 SCAN OK -Unexpected EOF read from client +>LF>/bin/error\x09[E]0.0\x09Error 13 Permission\\ denied +>LF>451 SCAN Engine error 13 Permission denied +<QUIT +Expected EOF read from client +End of script Listening on TESTSUITE/eximdir/avast_sock ... Connection request >LF>220 ready <SCAN TESTSUITE/spool/scan/10HmaY-0005vi-00 >LF>210 SCAN DATA >LF>/bin/clean\x09[+] ->LF>v\\ i\\ a\\ r\\ u\\ s\x09[L]9.9\x099 This ist not even an EICAR test virus. +>LF>v\\ i\\ a\\ r\\ u\\ s\x09[L]9.0\x090 This\\ is\\ not\\ even\\ an\\ EICAR\\ test\\ virus. +>LF>200 SCAN OK +<QUIT +Expected EOF read from client +End of script +Listening on TESTSUITE/eximdir/avast_sock ... +Connection request +>LF>220 ready +<SCAN TESTSUITE/spool/scan/10HmaZ-0005vi-00 +>LF>210 SCAN DATA +>LF>/bin/clean\x09[+] +>LF>/bin/error\x09[E]0.0\x09Error 42110 The\\ file\\ is\\ a\\ decompression\\ bomb +>LF>v\\ i\\ a\\ r\\ u\\ s\x09[L]9.0\x090 This\\ is\\ not\\ even\\ an\\ EICAR\\ test\\ virus. +>LF>200 SCAN OK +<QUIT +Expected EOF read from client +End of script +Listening on TESTSUITE/eximdir/avast_sock ... +Connection request +>LF>220 ready +<SCAN TESTSUITE/spool/scan/10HmbA-0005vi-00 +>LF>210 SCAN DATA +>LF>/bin/clean\x09[+] +>LF>/bin/error\x09[E]0.0\x09Error 42110 The\\ file\\ is\\ a\\ decompression\\ bomb +>LF>200 SCAN OK +<QUIT +Expected EOF read from client +End of script +Listening on TESTSUITE/eximdir/avast_sock ... +Connection request +>LF>220 ready +<SCAN TESTSUITE/spool/scan/10HmbC-0005vi-00 +>LF>210 SCAN DATA +>LF>/bin/clean\x09[+] +>LF>/bin/error\x09[E]0.0\x09Error 42110 The\\ file\\ is\\ a\\ decompression\\ bomb >LF>200 SCAN OK <QUIT Expected EOF read from client diff --git a/test/stdout/4600 b/test/stdout/4600 index c33a531c2..e1089a58b 100644 --- a/test/stdout/4600 +++ b/test/stdout/4600 @@ -1,15 +1,15 @@ -Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected +Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 >>> helo testclient ??? 250 -<<< 250 myhost.test.ex Hello testclient [ip4.ip4.ip4.ip4] +<<< 250 myhost.test.ex Hello testclient [127.0.0.1] >>> mail from:<a@example.com> ??? 250 <<< 250 OK >>> rcpt to:<fred@test.ex> -??? 550 -<<< 550 Administrative prohibition +??? 250 +<<< 250 Accepted >>> quit End of script Connecting to 127.0.0.1 port 1225 ... connected @@ -18,7 +18,21 @@ Connecting to 127.0.0.1 port 1225 ... connected >>> helo testclient ??? 250 <<< 250 myhost.test.ex Hello testclient [127.0.0.1] ->>> mail from:<b@example.com> +>>> mail from:<b@test.example.com> +??? 250 +<<< 250 OK +>>> rcpt to:<fred@test.ex> +??? 250 +<<< 250 Accepted +>>> quit +End of script +Connecting to 127.0.0.1 port 1224 ... connected +??? 220 +<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> helo testclient +??? 250 +<<< 250 myhost.test.ex Hello testclient [127.0.0.1] +>>> mail from:<c@example.com> ??? 250 <<< 250 OK >>> rcpt to:<fred@test.ex> diff --git a/test/stdout/4601 b/test/stdout/4601 index 9abbcf5a8..66746a470 100644 --- a/test/stdout/4601 +++ b/test/stdout/4601 @@ -1,9 +1,9 @@ -Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected +Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 >>> helo testclient ??? 250 -<<< 250 myhost.test.ex Hello testclient [ip4.ip4.ip4.ip4] +<<< 250 myhost.test.ex Hello testclient [127.0.0.1] >>> mail from:<a@example.com> ??? 250 <<< 250 OK @@ -12,7 +12,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected <<< 250 Accepted >>> quit End of script -Connecting to 127.0.0.1 port 1225 ... connected +Connecting to 127.0.0.1 port 1224 ... connected ??? 220 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 >>> helo testclient diff --git a/test/stdout/4650 b/test/stdout/4650 new file mode 100644 index 000000000..acd347256 --- /dev/null +++ b/test/stdout/4650 @@ -0,0 +1,24 @@ +Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected +??? 220 +<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> HELO testclient +??? 250 +<<< 250 myhost.test.ex Hello testclient [ip4.ip4.ip4.ip4] +>>> MAIL FROM:<a@example.com> +??? 250 +<<< 250 OK +>>> RCPT TO:<fred@test.ex> +??? 250 +<<< 250 Accepted +>>> DATA +??? 3 +<<< 354 Enter message, ending with "." on a line by itself +>>> Subject: test +>>> From: z@example.com +>>> +>>> body line +>>> . +??? 250 +<<< 250 OK id=10HmaX-0005vi-00 +>>> QUIT +End of script diff --git a/test/stdout/5405 b/test/stdout/5405 index 14bfdabdd..ef39477d5 100644 --- a/test/stdout/5405 +++ b/test/stdout/5405 @@ -82,6 +82,17 @@ 250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
+450 Onward transmission not accepted
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at myhost.test.ex
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
250 OK id=10HmbD-0005vi-00
221 myhost.test.ex closing connection
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
@@ -247,6 +258,30 @@ EHLO myhost.test.ex 250 OK MAIL FROM:<CALLER@myhost.test.ex> 250 Sender OK +RCPT TO:<userj@domain.com> +250 good rcpt +DATA +354 Send data +Received: from CALLER (helo=myhost.test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from <CALLER@myhost.test.ex>) + id 10HmbE-0005vi-00 + for userj@domain.com; Tue, 2 Mar 1999 09:44:33 +0000 +Message-Id: <E10HmbE-0005vi-00@myhost.test.ex> +From: CALLER_NAME <CALLER@myhost.test.ex> +Date: Tue, 2 Mar 1999 09:44:33 +0000 +X-hdr-rtr-new: +++ + +. +>*eof +End of script +Listening on port 1224 ... +Connection request from [ip4.ip4.ip4.ip4] +220 ESMTP +EHLO myhost.test.ex +250 OK +MAIL FROM:<CALLER@myhost.test.ex> +250 Sender OK RCPT TO:<userh@domain.com> 250 Recipient OK DATA |