ph10 2005/05/31 15:08:45 BST
Modified files:
exim-test-orig/AutoTest/confs 598
exim-test-orig/AutoTest/log 598
exim-test-orig/AutoTest/mail 598.ph10
exim-test-orig/AutoTest/scripts 598
exim-test-orig/AutoTest/stdout 598
Added files:
exim-test-orig/AutoTest/rejectlog 598
Log:
Update content scan test to include clamav.
Revision Changes Path
1.5 +5 -0 exim/exim-test-orig/AutoTest/confs/598
1.9 +11 -10 exim/exim-test-orig/AutoTest/log/598
1.9 +18 -18 exim/exim-test-orig/AutoTest/mail/598.ph10
1.1 +10 -0 exim/exim-test-orig/AutoTest/rejectlog/598 (new)
1.5 +12 -0 exim/exim-test-orig/AutoTest/scripts/598
1.4 +10 -4 exim/exim-test-orig/AutoTest/stdout/598
Index: 598
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/598,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 598 24 May 2005 10:34:11 -0000 1.4
+++ 598 31 May 2005 14:08:45 -0000 1.5
@@ -17,6 +17,8 @@
acl_smtp_mime = check_mime
acl_not_smtp_mime = check_mime
+av_scanner = clamd:/var/run/clamav/clamd.sock
+
# ----- ACL -----
@@ -26,6 +28,9 @@
accept
check_data:
+ deny message = Found $malware_name
+ malware = *
+
warn spam = nobody
message = X-is-spam: classified as spam
Index: 598
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/598,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- 598 24 May 2005 10:34:11 -0000 1.8
+++ 598 31 May 2005 14:08:45 -0000 1.9
@@ -1,24 +1,25 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=1080
-1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10 <ph10@???> R=r1 T=t1
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=1198 id=41C2F849.3060203@???
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=1080
1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=r1 T=t1
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=1501 id=abcde
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=1198 id=41C2F849.3060203@???
1999-03-02 09:44:33 10HmaZ-0005vi-00 => ph10 <ph10@???> R=r1 T=t1
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=1314 id=41C2F849.3060203@???
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=1501 id=abcde
1999-03-02 09:44:33 10HmbA-0005vi-00 => ph10 <ph10@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=4384 id=20041217133501.GA3058@???
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=1314 id=41C2F849.3060203@???
1999-03-02 09:44:33 10HmbB-0005vi-00 => ph10 <ph10@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbC-0005vi-00 <= ph10@??? U=ph10 P=local S=1058
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=4384 id=20041217133501.GA3058@???
1999-03-02 09:44:33 10HmbC-0005vi-00 => ph10 <ph10@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbD-0005vi-00 <= ph10@??? U=ph10 P=local S=4362 id=20041217133501.GA3058@???
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= ph10@??? U=ph10 P=local S=1058
1999-03-02 09:44:33 10HmbD-0005vi-00 => ph10 <ph10@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbE-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=1312 id=41C2F849.3060203@???
+1999-03-02 09:44:33 10HmbE-0005vi-00 <= ph10@??? U=ph10 P=local S=4362 id=20041217133501.GA3058@???
1999-03-02 09:44:33 10HmbE-0005vi-00 => ph10 <ph10@???> R=r1 T=t1
1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbF-0005vi-00 <= ph10@??? U=ph10 P=local-esmtp S=1312 id=41C2F849.3060203@???
+1999-03-02 09:44:33 10HmbF-0005vi-00 => ph10 <ph10@???> R=r1 T=t1
+1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaX-0005vi-00 U=ph10 F=<ph10@???> rejected after DATA: Found Eicar-Test-Signature
Index: 598.ph10
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/598.ph10,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- 598.ph10 24 May 2005 10:34:11 -0000 1.8
+++ 598.ph10 31 May 2005 14:08:45 -0000 1.9
@@ -1,9 +1,9 @@
From ph10@??? Tue Mar 02 09:44:33 1999
Received: from ph10 (helo=test.ex)
by myhost.test.ex with local-esmtp (Exim x.yz)
- id 10HmaX-0005vi-00
+ id 10HmaY-0005vi-00
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@???>
+Message-Id: <E10HmaY-0005vi-00@???>
From: Philip Hazel <ph10@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
X-Spam_score: -0.7
@@ -28,7 +28,7 @@
From ph10@??? Tue Mar 02 09:44:33 1999
Received: from ph10 (helo=test.ex)
by myhost.test.ex with local-esmtp (Exim x.yz)
- id 10HmaY-0005vi-00
+ id 10HmaZ-0005vi-00
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
From: Test person <tp@???>
To: Me <ph10@???>
@@ -57,7 +57,7 @@
From ph10@??? Tue Mar 02 09:44:33 1999
Received: from ph10 (helo=test.ex)
by myhost.test.ex with local-esmtp (Exim x.yz)
- id 10HmaZ-0005vi-00
+ id 10HmbA-0005vi-00
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
From: 99Junk99@???
To:
@@ -92,7 +92,7 @@
From ph10@??? Tue Mar 02 09:44:33 1999
Received: from ph10 (helo=test.ex)
by myhost.test.ex with local-esmtp (Exim x.yz)
- id 10HmbA-0005vi-00
+ id 10HmbB-0005vi-00
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
From: Test person <tp@???>
To: Me <ph10@???>
@@ -125,7 +125,7 @@
From ph10@??? Tue Mar 02 09:44:33 1999
Received: from ph10 (helo=test.ex)
by myhost.test.ex with local-esmtp (Exim x.yz)
- id 10HmbB-0005vi-00
+ id 10HmbC-0005vi-00
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
Date: Tue, 2 Mar 1999 09:44:33 +0000
From: J Caesar <eximusers@???>
@@ -151,7 +151,7 @@
X-0-is-multipart: 1
X-0-is-coverletter: 1
X-0-is-rfc822: 0
-X-0-decode-filename: /source/exim4/AutoTest/spool/scan/10HmbB-0005vi-00/10HmbB-0005vi-00-00000
+X-0-decode-filename: /source/exim4/AutoTest/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00-00000
X-0-content-size: 2
X-1-content-type: text/plain
X-1-filename:
@@ -164,7 +164,7 @@
X-1-is-multipart: 0
X-1-is-coverletter: 1
X-1-is-rfc822: 0
-X-1-decode-filename: /source/exim4/AutoTest/spool/scan/10HmbB-0005vi-00/10HmbB-0005vi-00-00001
+X-1-decode-filename: /source/exim4/AutoTest/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00-00001
X-1-content-size: 1
X-2-content-type: text/plain
X-2-filename: working-patch
@@ -177,7 +177,7 @@
X-2-is-multipart: 0
X-2-is-coverletter: 0
X-2-is-rfc822: 0
-X-2-decode-filename: /source/exim4/AutoTest/spool/scan/10HmbB-0005vi-00/10HmbB-0005vi-00-00002
+X-2-decode-filename: /source/exim4/AutoTest/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00-00002
X-2-content-size: 1
X-3-content-type: text/plain
X-3-filename:
@@ -190,7 +190,7 @@
X-3-is-multipart: 0
X-3-is-coverletter: 0
X-3-is-rfc822: 0
-X-3-decode-filename: /source/exim4/AutoTest/spool/scan/10HmbB-0005vi-00/10HmbB-0005vi-00-00003
+X-3-decode-filename: /source/exim4/AutoTest/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00-00003
X-3-content-size: 1
X-Spam_score: -1.7
X-Spam_score_int: -16
@@ -257,9 +257,9 @@
From ph10@??? Tue Mar 02 09:44:33 1999
Received: from ph10 by myhost.test.ex with local (Exim x.yz)
- id 10HmbC-0005vi-00
+ id 10HmbD-0005vi-00
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbC-0005vi-00@???>
+Message-Id: <E10HmbD-0005vi-00@???>
From: Philip Hazel <ph10@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
X-Spam_score: -0.7
@@ -283,7 +283,7 @@
From ph10@??? Tue Mar 02 09:44:33 1999
Received: from ph10 by myhost.test.ex with local (Exim x.yz)
- id 10HmbD-0005vi-00
+ id 10HmbE-0005vi-00
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
Date: Tue, 2 Mar 1999 09:44:33 +0000
From: J Caesar <eximusers@???>
@@ -309,7 +309,7 @@
X-0-is-multipart: 1
X-0-is-coverletter: 1
X-0-is-rfc822: 0
-X-0-decode-filename: /source/exim4/AutoTest/spool/scan/10HmbD-0005vi-00/10HmbD-0005vi-00-00000
+X-0-decode-filename: /source/exim4/AutoTest/spool/scan/10HmbE-0005vi-00/10HmbE-0005vi-00-00000
X-0-content-size: 2
X-1-content-type: text/plain
X-1-filename:
@@ -322,7 +322,7 @@
X-1-is-multipart: 0
X-1-is-coverletter: 1
X-1-is-rfc822: 0
-X-1-decode-filename: /source/exim4/AutoTest/spool/scan/10HmbD-0005vi-00/10HmbD-0005vi-00-00001
+X-1-decode-filename: /source/exim4/AutoTest/spool/scan/10HmbE-0005vi-00/10HmbE-0005vi-00-00001
X-1-content-size: 1
X-2-content-type: text/plain
X-2-filename: working-patch
@@ -335,7 +335,7 @@
X-2-is-multipart: 0
X-2-is-coverletter: 0
X-2-is-rfc822: 0
-X-2-decode-filename: /source/exim4/AutoTest/spool/scan/10HmbD-0005vi-00/10HmbD-0005vi-00-00002
+X-2-decode-filename: /source/exim4/AutoTest/spool/scan/10HmbE-0005vi-00/10HmbE-0005vi-00-00002
X-2-content-size: 1
X-3-content-type: text/plain
X-3-filename:
@@ -348,7 +348,7 @@
X-3-is-multipart: 0
X-3-is-coverletter: 0
X-3-is-rfc822: 0
-X-3-decode-filename: /source/exim4/AutoTest/spool/scan/10HmbD-0005vi-00/10HmbD-0005vi-00-00003
+X-3-decode-filename: /source/exim4/AutoTest/spool/scan/10HmbE-0005vi-00/10HmbE-0005vi-00-00003
X-3-content-size: 1
X-Spam_score: -1.7
X-Spam_score_int: -16
@@ -416,7 +416,7 @@
From ph10@??? Tue Mar 02 09:44:33 1999
Received: from ph10 (helo=test.ex)
by myhost.test.ex with local-esmtp (Exim x.yz)
- id 10HmbE-0005vi-00
+ id 10HmbF-0005vi-00
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
From: Test person <tp@???>
To: Me <ph10@???>
Index: 598
====================================================================
1999-03-02 09:44:33 10HmaX-0005vi-00 U=ph10 F=<ph10@???> rejected after DATA: Found Eicar-Test-Signature
Envelope-from: <ph10@???>
Envelope-to: <ph10@???>
P Received: from ph10 by myhost.test.ex with local-smtp (Exim x.yz)
id 10HmaX-0005vi-00
for ph10@???; Tue, 2 Mar 1999 09:44:33 +0000
Subject: a virus test
I Message-Id: <E10HmaX-0005vi-00@???>
F From: Philip Hazel <ph10@???>
Date: Tue, 2 Mar 1999 09:44:33 +0000
Index: 598
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/598,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 598 24 May 2005 10:34:12 -0000 1.4
+++ 598 31 May 2005 14:08:45 -0000 1.5
@@ -196,3 +196,15 @@
.
quit
****
+# Very simple virus test
+0
+exim -odi -bs
+mail from:<>
+rcpt to:<ph10@???>
+data
+Subject: a virus test
+
+X5O!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*
+.
+quit
+****
Index: 598
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/598,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 598 24 May 2005 10:34:12 -0000 1.3
+++ 598 31 May 2005 14:08:45 -0000 1.4
@@ -6,7 +6,7 @@
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaX-0005vi-00
+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 ph10 at test.ex
@@ -16,7 +16,7 @@
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaY-0005vi-00
+250 OK id=10HmaZ-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 ph10 at test.ex
@@ -26,7 +26,7 @@
250 OK
250 Accepted
354 Enter message, ending with "." on a line by itself
-250 OK id=10HmaZ-0005vi-00
+250 OK id=10HmbA-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 ph10 at test.ex
@@ -47,7 +47,7 @@
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
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
250-myhost.test.ex Hello ph10 at test.ex
@@ -59,4 +59,10 @@
354 Enter message, ending with "." on a line by itself
450-Your message has been rejected but is being kept for evaluation.
450 If it was a legitimate message, it may still be delivered to the target recipient(s).
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+550 Found Eicar-Test-Signature
221 myhost.test.ex closing connection
