X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/d203e649775fb5543a3871f3c0f7df6dd4ac8577..d752cc0e0534f868011de63873ccbc32ae74a2dc:/test/scripts/4000-scanning/4000 diff --git a/test/scripts/4000-scanning/4000 b/test/scripts/4000-scanning/4000 index 6f66b27ae..cd53007b2 100644 --- a/test/scripts/4000-scanning/4000 +++ b/test/scripts/4000-scanning/4000 @@ -1,61 +1,7 @@ -# Basic exiscan feature tests -echo ==> This test may take a bit of time, depending on exactly -echo ==> how your SpamAssassin is configured. -exim -odi -bs -ehlo test.ex -mail from:<> -rcpt to: -data -A message without any headers. -. -quit -**** -exim -odi -bs -ehlo test.ex -mail from:<> -rcpt to: -data -From: Test person -To: Me -Subject: A real test message -Date: Fri, 17 Dec 2004 16:13:04 +0100 -Message-ID: <41C2F849.3060203@projectile.test.ex> - -OK, this should look like a genuine message. -. -quit -**** -exim -odi -bs -ehlo test.ex -mail from:<> -rcpt to: -data -From: 99Junk99@somewhere.com -To: -Subject: MAKE MONEY FAST!!!! -Message-id: abcde - -This should be enough to trip the threshold. -. -quit -**** -exim -odi -bs -ehlo test.ex -mail from:<> -rcpt to: -data -From: Test person -To: Me -Subject: A real test message -Date: Fri, 17 Dec 2004 16:13:04 +0100 -Message-ID: <41C2F849.3060203@projectile.test.ex> -FakeReject: test fakereject - -OK, this should look like a genuine message, but -it will trip on THIS REGEX. -. -quit -**** +# mime boundaries +# +# This mail should be fine, if complex +# exim -odi -bs ehlo test.ex mail from:<> @@ -124,13 +70,15 @@ Content-Disposition: inline . quit **** -# Non-smtp message -exim -odi userx@test.ex -A message without any headers. -. -**** -# Non-smtp MIME message -exim -odi userx@test.ex +# +# +# This one has a rotten parameter, but should not induce a crash +# +exim -odi -bs +ehlo test.ex +mail from:<> +rcpt to: +data Date: Fri, 17 Dec 2004 14:35:01 +0100 From: J Caesar To: a-list00@exim.org @@ -138,75 +86,102 @@ Message-ID: <20041217133501.GA3058@test.ex> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="T4sUOijqQbZv57TR" Content-Disposition: inline -Subject: [exim] Re: Bug#286074: eximstats: uses message count as data for - the "volume" charts -X-BeenThere: a-list00@exim.org -X-Mailman-Version: 2.1.5 -Precedence: list +Subject: Nasty --T4sUOijqQbZv57TR -Content-Type: text/plain; charset=us-ascii -Content-Disposition: inline - -There was a part of the patch missing, complete one is attached. - sorry for wasting your time +Content-Type: text/plain; charset= ---T4sUOijqQbZv57TR -Content-Type: text/plain; charset=us-ascii -Content-Disposition: attachment; filename=working-patch +foobar ---- /usr/sbin/eximstats 2004-12-17 13:36:44.381983753 +0100 -+++ eximstats 2004-12-17 13:47:37.763185260 +0100 -@@ -1107,11 +1107,11 @@ - if (scalar @chartdatanames < $ntopchart) - { - push(@chartdatanames, $key); -- push(@chartdatavals, $$m_count{$key}); -+ push(@chartdatavals, $$m_data{$key}); - } - else - { -- $chartotherval += $$m_count{$key}; -+ $chartotherval += $$m_data{$key}; - } - } - push(@chartdatanames, "Other"); +--T4sUOijqQbZv57TR-- +. +quit +**** +# +# +# This one has a different rotten parameter, but should not induce a crash +# +exim -odi -bs +ehlo test.ex +mail from:<> +rcpt to: +data +Date: Fri, 17 Dec 2004 14:35:01 +0100 +From: J Caesar +To: a-list00@exim.org +Message-ID: <20041217133501.GA3059@test.ex> +Mime-Version: 1.0 +Content-Type: text/html; + charset=UTF-8; + name="" +Content-Disposition: inline +Subject: Nasty --T4sUOijqQbZv57TR -Content-Type: text/plain; charset="us-ascii" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Content-Disposition: inline +Content-Type: text/plain; --- +foobar --T4sUOijqQbZv57TR-- +. +quit **** +# +# +# This one has a 3rd rotten parameter style +# exim -odi -bs ehlo test.ex mail from:<> rcpt to: data -From: Test person -To: Me -Subject: A real test message -Date: Fri, 17 Dec 2004 16:13:04 +0100 -Message-ID: <41C2F849.3060203@projectile.test.ex> -FakeDefer: test fakedefer - -OK, this should look like a genuine message, but -it will trip on THIS REGEX. +Date: Fri, 17 Dec 2004 14:35:01 +0100 +From: J Caesar +To: a-list00@exim.org +Message-ID: <20041217133501.GA3059@test.ex> +Mime-Version: 1.0 +Content-Type: text/plain; charset="utf-8"" +Content-Disposition: inline +Subject: Nasty3 + +--T4sUOijqQbZv57TR +Content-Type: text/plain; + +foobar + +--T4sUOijqQbZv57TR-- . quit **** -# Very simple virus test +# +# +# This one has a some unrecognised params +# exim -odi -bs +ehlo test.ex mail from:<> rcpt to: data -Subject: a virus test +Date: Fri, 17 Dec 2004 14:35:01 +0100 +From: J Caesar +To: a-list00@exim.org +Message-ID: <20041217133501.GA3059@test.ex> +Mime-Version: 1.0 +Content-Type: text/plain; + garbage1; + garbage2=foo; + garbage3="bar"foo; + charset=UTF-8; + garbage4="; +Content-Disposition: inline +Subject: Nasty4 + +--T4sUOijqQbZv57TR +Content-Type: text/plain; + +foobar -X5O!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H* +--T4sUOijqQbZv57TR-- . quit ****