From: Jeremy Harris Date: Sat, 27 Dec 2014 20:35:08 +0000 (+0000) Subject: Testsuite: case for malware= cmdline X-Git-Tag: exim-4_85_RC4~1 X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/093632c96953bfc8fb96d607e0605534efa64252 Testsuite: case for malware= cmdline --- diff --git a/test/aux-fixed/4007.script b/test/aux-fixed/4007.script new file mode 100755 index 000000000..9cdd098ff --- /dev/null +++ b/test/aux-fixed/4007.script @@ -0,0 +1,22 @@ +#!/bin/sh + +if [ x$1 = "x-o" ] +then + shift + action=$1 + shift +fi + +if [ -r $1 ] +then + echo "scanning file $1" +else + echo "$1 not readable" + exit 1 +fi + +case $action in +accept) ;; +reject) echo "VNAME found in file $1";; +esac + diff --git a/test/confs/4007 b/test/confs/4007 new file mode 100644 index 000000000..576c0087f --- /dev/null +++ b/test/confs/4007 @@ -0,0 +1,33 @@ +# Exim test configuration 4007 +# Content-scan: cmsline interface + +exim_path = EXIM_PATH +host_lookup_order = bydns +primary_hostname = myhost.test.ex +spool_directory = DIR/spool +log_file_path = DIR/spool/log/%slog +gecos_pattern = "" +gecos_name = CALLER_NAME + +av_scanner = cmdline : DIR/aux-fixed/TESTNUM.script -o OPT %s : found in file : ^(\S*) + +# ----- Main settings ----- + +acl_smtp_rcpt = accept +acl_smtp_data = c_data + +begin acl + +c_data: + accept !malware = * + deny logwrite = malware_name $malware_name + +# ----- Routers ----- + +begin routers + +r: + driver = redirect + data = :blackhole: + +# End diff --git a/test/log/4007 b/test/log/4007 new file mode 100644 index 000000000..1425f521e --- /dev/null +++ b/test/log/4007 @@ -0,0 +1,5 @@ +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss +1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: R=r +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed +1999-03-02 09:44:33 10HmaX-0005vi-00 malware_name VNAME +1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F= rejected after DATA diff --git a/test/rejectlog/4007 b/test/rejectlog/4007 new file mode 100644 index 000000000..bd26ac2a4 --- /dev/null +++ b/test/rejectlog/4007 @@ -0,0 +1,12 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F= rejected after DATA +Envelope-from: +Envelope-to: +P Received: from CALLER (helo=test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from ) + id 10HmaX-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: +F From: CALLER_NAME diff --git a/test/scripts/4000-scanning/4007 b/test/scripts/4000-scanning/4007 new file mode 100644 index 000000000..7bf6aca34 --- /dev/null +++ b/test/scripts/4000-scanning/4007 @@ -0,0 +1,28 @@ +# content scan interface: cmdline +# +# +exim -DOPT=accept -odi -bs +ehlo test.ex +mail from:<> +rcpt to: +data +Date: Fri, 17 Dec 2004 14:35:01 +0100 +Subject: message should be accepted + +. +quit +**** +# +# +# +exim -DOPT=reject -odi -bs +ehlo test.ex +mail from:<> +rcpt to: +data +Date: Fri, 17 Dec 2004 14:35:01 +0100 +Subject: message should be rejected + +. +quit +**** diff --git a/test/stdout/4007 b/test/stdout/4007 new file mode 100644 index 000000000..35527951b --- /dev/null +++ b/test/stdout/4007 @@ -0,0 +1,22 @@ +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=10HmaY-0005vi-00 +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