diff options
Diffstat (limited to 'test/scripts')
| -rw-r--r-- | test/scripts/4000-scanning/4001 | 47 | ||||
| -rw-r--r-- | test/scripts/4000-scanning/4002 | 103 | ||||
| -rw-r--r-- | test/scripts/4000-scanning/4003 | 76 | ||||
| -rw-r--r-- | test/scripts/4000-scanning/4004 | 46 | ||||
| -rw-r--r-- | test/scripts/4000-scanning/4005 | 51 | ||||
| -rw-r--r-- | test/scripts/4000-scanning/4006 | 48 | ||||
| -rw-r--r-- | test/scripts/4000-scanning/4007 | 33 |
7 files changed, 382 insertions, 22 deletions
diff --git a/test/scripts/4000-scanning/4001 b/test/scripts/4000-scanning/4001 index 0234a3d5d..25a676e04 100644 --- a/test/scripts/4000-scanning/4001 +++ b/test/scripts/4000-scanning/4001 @@ -9,7 +9,7 @@ server PORT_S # # # -exim -odi -bs +exim -odi -bs -DOPT= ehlo test.ex mail from:<> rcpt to:<userx@test.ex> @@ -37,7 +37,7 @@ server PORT_S # # # -exim -odi -bs +exim -odi -bs -DOPT= ehlo test.ex mail from:<> rcpt to:<userx@test.ex> @@ -45,6 +45,49 @@ data Date: Fri, 17 Dec 2004 14:35:01 +0100 Subject: message should be rejected +due to the server response (above) +. +quit +**** +# +# +# +server PORT_S +<GET +*sleep 3 +**** +# +# +# +exim -odi -bs -DOPT="/tmo=2s" +ehlo test.ex +mail from:<> +rcpt to:<userx@test.ex> +data +Date: Fri, 17 Dec 2004 14:35:01 +0100 +Subject: message should be deferred due to timeout + +. +quit +**** +# +# +# +server PORT_S +<GET +*sleep 3 +**** +# +# +# +exim -odi -bs -DOPT="/tmo=2s/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 accepted despite timeout + . quit **** diff --git a/test/scripts/4000-scanning/4002 b/test/scripts/4000-scanning/4002 index 201fdf197..4754609c0 100644 --- a/test/scripts/4000-scanning/4002 +++ b/test/scripts/4000-scanning/4002 @@ -11,7 +11,7 @@ server DIR/eximdir/aveserver_sock # # # -exim -odi -bs +exim -odi -bs -DOPT= ehlo test.ex mail from:<> rcpt to:<userx@test.ex> @@ -36,13 +36,13 @@ server DIR/eximdir/aveserver_sock # # # -exim -odi -bs +exim -odi -bs -DOPT= ehlo test.ex mail from:<> rcpt to:<userx@test.ex> data Date: Fri, 17 Dec 2004 14:35:01 +0100 -Subject: defer this one +Subject: defer this one (daemon tmp-err) . quit @@ -62,13 +62,106 @@ server DIR/eximdir/aveserver_sock # # # -exim -odi -bs +exim -odi -bs -DOPT= 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 +Subject: message should be rejected (virus found) + +. +quit +**** +# +# +# +server DIR/eximdir/aveserver_sock +*sleep 3 +**** +# +# +# +exim -odi -bs -DOPT="/tmo=2s" +ehlo test.ex +mail from:<> +rcpt to:<userx@test.ex> +data +Date: Fri, 17 Dec 2004 14:35:01 +0100 +Subject: message should be deferred due to timeout + +. +quit +**** +# +# +# +server DIR/eximdir/aveserver_sock +*sleep 3 +**** +# +# +# +exim -odi -bs -DOPT="/tmo=2s / 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 accepted despite timeout + +. +quit +**** +# +# +# +server DIR/eximdir/aveserver_sock +>2xx ready +<SCAN +>5xx defer +<quit +>2xx ready +*eof +**** +# +# +# +exim -odi -bs -DOPT=" / defer_ok" +ehlo test.ex +mail from:<> +rcpt to:<userx@test.ex> +data +Date: Fri, 17 Dec 2004 14:35:01 +0100 +Subject: accept this, overriding the scan daemon temp-error + +. +quit +**** +# +# +# +# Recheck that defer_ok option does not affect a malware detection +# +server DIR/eximdir/aveserver_sock +>2xx ready +<SCAN +>322 VNAME found +>2xx ready +<quit +>2xx ready +*eof +**** +# +# +# +exim -odi -bs -DOPT="/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 (virus found) . quit diff --git a/test/scripts/4000-scanning/4003 b/test/scripts/4000-scanning/4003 index 0bfa14e9e..49d331bf1 100644 --- a/test/scripts/4000-scanning/4003 +++ b/test/scripts/4000-scanning/4003 @@ -1,4 +1,5 @@ # content scan interface: fsecure +# also testing alternate list separator for malware= args # server DIR/eximdir/fsec_sock <CONFIGURE @@ -18,7 +19,7 @@ server DIR/eximdir/fsec_sock # # # -exim -odi -bs +exim -odi -bs -DOPT= ehlo test.ex mail from:<> rcpt to:<userx@test.ex> @@ -49,7 +50,7 @@ server DIR/eximdir/fsec_sock # # # -exim -odi -bs +exim -odi -bs -DOPT= ehlo test.ex mail from:<> rcpt to:<userx@test.ex> @@ -60,3 +61,74 @@ Subject: message should be rejected . quit **** +# +# +# +server DIR/eximdir/fsec_sock +*sleep 3 +**** +# +# +# +exim -odi -bs -DOPT=";tmo=2s" +ehlo test.ex +mail from:<> +rcpt to:<userx@test.ex> +data +Date: Fri, 17 Dec 2004 14:35:01 +0100 +Subject: message should be tmp-rejected due to timeout + +. +quit +**** +# +# +# +server DIR/eximdir/fsec_sock +*sleep 3 +**** +# +# +# +exim -odi -bs -DOPT=";defer_ok;tmo=2s" +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 despite timeout + +. +quit +**** +# +# +# +server DIR/eximdir/fsec_sock +<CONFIGURE +>ignored_response +<CONFIGURE +>ignored_response +<CONFIGURE +>ignored_response +<CONFIGURE +>ignored_response +<SCAN +>LF>xxxINFECTED blah VNAME blah +>LF>OK Scan ok. +*eof +**** +# +# +# +exim -odi -bs -DOPT="; defer_ok ; tmo=5h" +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 as the options are not relevant + +. +quit +**** diff --git a/test/scripts/4000-scanning/4004 b/test/scripts/4000-scanning/4004 index e6a142930..956f04507 100644 --- a/test/scripts/4000-scanning/4004 +++ b/test/scripts/4000-scanning/4004 @@ -8,7 +8,7 @@ server DIR/eximdir/sophie_sock # # # -exim -odi -bs +exim -odi -bs -DOPT= ehlo test.ex mail from:<> rcpt to:<userx@test.ex> @@ -30,7 +30,7 @@ server DIR/eximdir/sophie_sock # # # -exim -odi -bs +exim -odi -bs -DOPT= ehlo test.ex mail from:<> rcpt to:<userx@test.ex> @@ -52,7 +52,7 @@ server DIR/eximdir/sophie_sock # # # -exim -odi -bs +exim -odi -bs -DOPT=/defer_ok ehlo test.ex mail from:<> rcpt to:<userx@test.ex> @@ -63,3 +63,43 @@ Subject: message should be rejected . quit **** +# +# +# +server DIR/eximdir/sophie_sock +*sleep 3 +**** +# +# +# +exim -odi -bs -DOPT=/tmo=2s +ehlo test.ex +mail from:<> +rcpt to:<userx@test.ex> +data +Date: Fri, 17 Dec 2004 14:35:01 +0100 +Subject: message should be tmp-rejected due to timeout + +. +quit +**** +# +# +# +server DIR/eximdir/sophie_sock +*sleep 3 +**** +# +# +# +exim -odi -bs -DOPT=/tmo=2s/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 accepted destpite timeout + +. +quit +**** diff --git a/test/scripts/4000-scanning/4005 b/test/scripts/4000-scanning/4005 index 32a281b03..0095157d1 100644 --- a/test/scripts/4000-scanning/4005 +++ b/test/scripts/4000-scanning/4005 @@ -10,7 +10,7 @@ server DIR/eximdir/clam_sock # # # -exim -odi -bs +exim -odi -bs -DOPT= ehlo test.ex mail from:<> rcpt to:<userx@test.ex> @@ -32,13 +32,13 @@ server DIR/eximdir/clam_sock # # # -exim -odi -bs +exim -odi -bs -DOPT= ehlo test.ex mail from:<> rcpt to:<userx@test.ex> data Date: Fri, 17 Dec 2004 14:35:01 +0100 -Subject: defer this one +Subject: defer this one due to scanner error . quit @@ -54,7 +54,7 @@ server DIR/eximdir/clam_sock # # # -exim -odi -bs +exim -odi -bs -DOPT=/defer_ok ehlo test.ex mail from:<> rcpt to:<userx@test.ex> @@ -65,3 +65,46 @@ Subject: message should be rejected . quit **** +# +# +# +server DIR/eximdir/clam_sock +*sleep 3 +**** +# +# +# +exim -odi -bs -DOPT="/ tmo=2s" +ehlo test.ex +mail from:<> +rcpt to:<userx@test.ex> +data +Date: Fri, 17 Dec 2004 14:35:01 +0100 +Subject: defer this one due to timeout + +. +quit +**** +# +# +# +server DIR/eximdir/clam_sock +*sleep 3 +**** +# +# +# +exim -odi -bs -DOPT="/ tmo=2s / defer_ok" +ehlo test.ex +mail from:<> +rcpt to:<userx@test.ex> +data +Date: Fri, 17 Dec 2004 14:35:01 +0100 +Subject: accept this one despite timeout + +. +quit +**** +# +# +# Need to additionally test the timeout / defer_ok case diff --git a/test/scripts/4000-scanning/4006 b/test/scripts/4000-scanning/4006 index af9af4964..1adf8b136 100644 --- a/test/scripts/4000-scanning/4006 +++ b/test/scripts/4000-scanning/4006 @@ -15,7 +15,7 @@ server DIR/eximdir/avast_sock # # # -exim -odi -bs -DOPTION="FLAGS -fullfiles" +exim -odi -bs -DOPTION="FLAGS -fullfiles" -DINSERT= ehlo test.ex mail from:<> rcpt to:<userx@test.ex> @@ -41,13 +41,13 @@ server DIR/eximdir/avast_sock # # # -exim -odi -bs -DOPTION= +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 +Subject: defer this one, the scanner had an error . quit @@ -67,7 +67,7 @@ server DIR/eximdir/avast_sock # # # -exim -odi -bs -DOPTION= +exim -odi -bs -DOPTION= -DINSERT="/defer_ok" ehlo test.ex mail from:<> rcpt to:<userx@test.ex> @@ -78,3 +78,43 @@ Subject: message should be rejected . quit **** +# +# +# +server DIR/eximdir/avast_sock +*sleep 3 +**** +# +# +# +exim -odi -bs -DOPTION= -DINSERT="/tmo=2s" +ehlo test.ex +mail from:<> +rcpt to:<userx@test.ex> +data +Date: Fri, 17 Dec 2004 14:35:01 +0100 +Subject: message should be tmp-rejected due to timeout + +. +quit +**** +# +# +# +server DIR/eximdir/avast_sock +*sleep 3 +**** +# +# +# +exim -odi -bs -DOPTION= -DINSERT="/tmo=2s/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 accepted despite timeout + +. +quit +**** diff --git a/test/scripts/4000-scanning/4007 b/test/scripts/4000-scanning/4007 index 7bf6aca34..9684056a0 100644 --- a/test/scripts/4000-scanning/4007 +++ b/test/scripts/4000-scanning/4007 @@ -1,7 +1,7 @@ # content scan interface: cmdline # # -exim -DOPT=accept -odi -bs +exim -DOPT=accept -odi -bs -DINSERT= ehlo test.ex mail from:<> rcpt to:<userx@test.ex> @@ -14,8 +14,9 @@ quit **** # # +# the defer_ok should not prevent rejection # -exim -DOPT=reject -odi -bs +exim -DOPT=reject -odi -bs -DINSERT="/defer_ok" ehlo test.ex mail from:<> rcpt to:<userx@test.ex> @@ -26,3 +27,31 @@ Subject: message should be rejected . quit **** +# +# +# +exim -DOPT=pause3 -odi -bs -DINSERT="/tmo=2s" +ehlo test.ex +mail from:<> +rcpt to:<userx@test.ex> +data +Date: Fri, 17 Dec 2004 14:35:01 +0100 +Subject: message should be tmp-rejected due to timeout + +. +quit +**** +# +# +# +exim -DOPT=pause3 -odi -bs -DINSERT="/tmo=2s/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 accepted despite a timeout + +. +quit +**** |