X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/0e42da1b15894b66e3726d8ce0e41e25bdc21149..6397b292615a5ffb9fdb5bd305736e2ef5f00e0d:/test/scripts/4000-scanning/4002?ds=sidebyside diff --git a/test/scripts/4000-scanning/4002 b/test/scripts/4000-scanning/4002 index 4754609c0..d9849c341 100644 --- a/test/scripts/4000-scanning/4002 +++ b/test/scripts/4000-scanning/4002 @@ -1,168 +1,242 @@ -# content scan interface: aveserver -# -server DIR/eximdir/aveserver_sock ->200 ready -200 done -200 ready +# content scan interface: spamassassin +# +# The spooled file for scanning includes the test-runner's user name +# hence size varies. Munge that. +munge scanfile_size +# +# +# A good-comms test, returning not-spam. +# (we could use a second one that returns is-spam...) +server 7833 +SPAMD/1.1 0 EX_OK +>Spam: False ; 4.5 / 5.0 +> +>Spam detection software, running on the system "demo", +>has NOT identified this incoming email as spam. The original +>message has been attached to this so you can view it or label +>similar future email. If you have any questions, see +>@@CONTACT_ADDRESS@@ for details. +> +>Content preview: test [...] +> +>Content analysis details: (4.5 points, 5.0 required) +> +> pts rule name description +>---- ---------------------- -------------------------------------------------- +>-1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP +> 1.2 MISSING_HEADERS Missing To: header +> 1.0 MISSING_FROM Missing From: header +> 1.8 MISSING_SUBJECT Missing Subject: header +> 1.4 MISSING_DATE Missing Date: header +> 0.1 MISSING_MID Missing Message-Id: header +> *eof **** -# -# -# -exim -odi -bs -DOPT= +exim -odi -oMt fromuser -bs ehlo test.ex -mail from:<> +mail from: rcpt to: data -Date: Fri, 17 Dec 2004 14:35:01 +0100 -Subject: message should be accepted +Content-type: text/plain +test . quit **** # # # -server DIR/eximdir/aveserver_sock ->2xx ready -5xx defer -2xx ready -*eof -**** -# -# -# -exim -odi -bs -DOPT= -ehlo test.ex -mail from:<> -rcpt to: -data -Date: Fri, 17 Dec 2004 14:35:01 +0100 -Subject: defer this one (daemon tmp-err) - -. -quit -**** -# -# # -server DIR/eximdir/aveserver_sock ->2xx ready -322 VNAME found ->2xx ready -2xx ready +# Server spec line with timeout option, not exercised +# (could we cut down the massive content?) +server 7833 +SPAMD/1.1 0 EX_OK +>Spam: False ; 4.5 / 5.0 +> +>Spam detection software, running on the system "demo", +>has NOT identified this incoming email as spam. The original +>message has been attached to this so you can view it or label +>similar future email. If you have any questions, see +>@@CONTACT_ADDRESS@@ for details. +> +>Content preview: test [...] +> +>Content analysis details: (4.5 points, 5.0 required) +> +> pts rule name description +>---- ---------------------- -------------------------------------------------- +>-1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP +> 1.2 MISSING_HEADERS Missing To: header +> 1.0 MISSING_FROM Missing From: header +> 1.8 MISSING_SUBJECT Missing Subject: header +> 1.4 MISSING_DATE Missing Date: header +> 0.1 MISSING_MID Missing Message-Id: header +> *eof **** -# -# -# -exim -odi -bs -DOPT= -ehlo test.ex -mail from:<> -rcpt to: -data -Date: Fri, 17 Dec 2004 14:35:01 +0100 -Subject: message should be rejected (virus found) - -. -quit -**** -# -# -# -server DIR/eximdir/aveserver_sock -*sleep 3 -**** -# -# -# -exim -odi -bs -DOPT="/tmo=2s" +exim -odi -oMt fromuser -bs -DOPT='127.0.0.1 7833 retry=10s' ehlo test.ex -mail from:<> +mail from: rcpt to: data -Date: Fri, 17 Dec 2004 14:35:01 +0100 -Subject: message should be deferred due to timeout +Content-type: text/plain +test . quit **** # # # -server DIR/eximdir/aveserver_sock -*sleep 3 +# Server spec line with timeout option, exercised +server -i 2 7833 +SPAMD/1.1 0 EX_OK +>Spam: False ; 4.5 / 5.0 +> +>Spam detection software, running on the system "demo", +>has NOT identified this incoming email as spam. The original +>message has been attached to this so you can view it or label +>similar future email. If you have any questions, see +>@@CONTACT_ADDRESS@@ for details. +> +>Content preview: test [...] +> +>Content analysis details: (4.5 points, 5.0 required) +> +> pts rule name description +>---- ---------------------- -------------------------------------------------- +>-1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP +> 1.2 MISSING_HEADERS Missing To: header +> 1.0 MISSING_FROM Missing From: header +> 1.8 MISSING_SUBJECT Missing Subject: header +> 1.4 MISSING_DATE Missing Date: header +> 0.1 MISSING_MID Missing Message-Id: header +> +*eof **** -# -# -# -exim -odi -bs -DOPT="/tmo=2s / defer_ok" +exim -odi -oMt fromuser -bs -DOPT='127.0.0.1 7833 retry=4s' ehlo test.ex -mail from:<> +mail from: rcpt to: data -Date: Fri, 17 Dec 2004 14:35:01 +0100 -Subject: message should be accepted despite timeout +Content-type: text/plain +test . quit **** # # # -server DIR/eximdir/aveserver_sock ->2xx ready -5xx defer -2xx ready +# Multiple servers, prioritised, with timeout spec; first one fails +# List separator changed +server 7833 +SPAMD/1.1 0 EX_OK +>Spam: False ; 4.5 / 5.0 +> +>Spam detection software, running on the system "demo", +>has NOT identified this incoming email as spam. The original +>message has been attached to this so you can view it or label +>similar future email. If you have any questions, see +>@@CONTACT_ADDRESS@@ for details. +> +>Content preview: test [...] +> +>Content analysis details: (4.5 points, 5.0 required) +> +> pts rule name description +>---- ---------------------- -------------------------------------------------- +>-1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP +> 1.2 MISSING_HEADERS Missing To: header +> 1.0 MISSING_FROM Missing From: header +> 1.8 MISSING_SUBJECT Missing Subject: header +> 1.4 MISSING_DATE Missing Date: header +> 0.1 MISSING_MID Missing Message-Id: header +> *eof **** -# -# -# -exim -odi -bs -DOPT=" / defer_ok" +exim -odi -oMt fromuser -bs -DOPT='<; 127.0.0.1 7833 ; HOSTIPV4 7834 pri=2 tmo=2s' ehlo test.ex -mail from:<> +mail from: rcpt to: data -Date: Fri, 17 Dec 2004 14:35:01 +0100 -Subject: accept this, overriding the scan daemon temp-error +Content-type: text/plain +test . quit **** # # -# -# Recheck that defer_ok option does not affect a malware detection -# -server DIR/eximdir/aveserver_sock ->2xx ready -322 VNAME found ->2xx ready -2xx ready -*eof -**** -# -# -# -exim -odi -bs -DOPT="/defer_ok" -ehlo test.ex -mail from:<> -rcpt to: -data -Date: Fri, 17 Dec 2004 14:35:01 +0100 -Subject: message should be rejected (virus found) - -. -quit -****