From 1eccaa59eb366c180c36af219a142d8f934f73b0 Mon Sep 17 00:00:00 2001 From: Philip Hazel Date: Tue, 10 Oct 2006 15:36:50 +0000 Subject: Sort out group syntax problems, particularly with verify=header_sender. --- test/log/0026 | 14 +++++++++----- test/mail/0026.userx | 21 +++++++++++++++++---- test/rejectlog/0026 | 11 +++++++++++ test/scripts/0000-Basic/0026 | 27 +++++++++++++++++++++++++++ test/stderr/0026 | 4 ++-- test/stdout/0026 | 20 ++++++++++++++++---- 6 files changed, 82 insertions(+), 15 deletions(-) (limited to 'test') diff --git a/test/log/0026 b/test/log/0026 index be92f738a..cf9958438 100644 --- a/test/log/0026 +++ b/test/log/0026 @@ -1,12 +1,16 @@ -1999-03-02 09:44:33 10HmbB-0005vi-00 <= x@y U=CALLER P=local-smtp S=sss +1999-03-02 09:44:33 10HmbC-0005vi-00 <= x@y U=CALLER P=local-smtp S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F= rejected after DATA: domain missing or malformed: failing address in "From:" header is: @ 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @ 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line -1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> U=CALLER P=local-smtp S=sss +1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> U=CALLER P=local-smtp S=sss 1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F= rejected after DATA: body contains trigger -1999-03-02 09:44:33 10HmbD-0005vi-00 <= x@y U=CALLER P=local-smtp S=sss -1999-03-02 09:44:33 10HmbD-0005vi-00 => userx R=r2 T=local_delivery -1999-03-02 09:44:33 10HmbD-0005vi-00 Completed 1999-03-02 09:44:33 10HmbE-0005vi-00 <= x@y U=CALLER P=local-smtp S=sss 1999-03-02 09:44:33 10HmbE-0005vi-00 => userx R=r2 T=local_delivery 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed +1999-03-02 09:44:33 10HmbF-0005vi-00 <= x@y U=CALLER P=local-smtp S=sss +1999-03-02 09:44:33 10HmbF-0005vi-00 => userx R=r2 T=local_delivery +1999-03-02 09:44:33 10HmbF-0005vi-00 Completed +1999-03-02 09:44:33 10HmbG-0005vi-00 <= <> U=CALLER P=local-smtp S=sss +1999-03-02 09:44:33 10HmbG-0005vi-00 => userx R=r2 T=local_delivery +1999-03-02 09:44:33 10HmbG-0005vi-00 Completed +1999-03-02 09:44:33 10HmbB-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line diff --git a/test/mail/0026.userx b/test/mail/0026.userx index 74f68e2cb..4c7822197 100644 --- a/test/mail/0026.userx +++ b/test/mail/0026.userx @@ -1,9 +1,9 @@ From x@y Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) - id 10HmbD-0005vi-00 + id 10HmbE-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: +Message-Id: From: x@y Date: Tue, 2 Mar 1999 09:44:33 +0000 X-warning: this is a test warning @@ -13,14 +13,27 @@ Message 7 From x@y Tue Mar 02 09:44:33 1999 Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) - id 10HmbE-0005vi-00 + id 10HmbF-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 to: group name: x@y, p@q; reply-to: group name: a@b, c@d; -Message-Id: +Message-Id: From: x@y Date: Tue, 2 Mar 1999 09:44:33 +0000 X-warning: this is a test warning Message 10 +From MAILER-DAEMON Tue Mar 02 09:44:33 1999 +Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) + id 10HmbG-0005vi-00 + for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +to: group name: x@y, p@q; +reply-to: group name:; +from: userx@test.ex +Message-Id: +Date: Tue, 2 Mar 1999 09:44:33 +0000 +X-warning: this is a test warning + +Message 11 + diff --git a/test/rejectlog/0026 b/test/rejectlog/0026 index 384d6ef6e..716e35cf0 100644 --- a/test/rejectlog/0026 +++ b/test/rejectlog/0026 @@ -37,3 +37,14 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) I Message-Id: F From: x@y Date: Tue, 2 Mar 1999 09:44:33 +0000 +1999-03-02 09:44:33 10HmbB-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line +Envelope-from: <> +Envelope-to: +P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) + id 10HmbB-0005vi-00 + for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 +T to: group name: x@y, p@q; +R reply-to: group name:; +I Message-Id: + Date: Tue, 2 Mar 1999 09:44:33 +0000 + X-warning: this is a test warning diff --git a/test/scripts/0000-Basic/0026 b/test/scripts/0000-Basic/0026 index e81e0d9d0..7489cbd74 100644 --- a/test/scripts/0000-Basic/0026 +++ b/test/scripts/0000-Basic/0026 @@ -104,4 +104,31 @@ Message 10 . quit **** +# Group syntax in reply-to header, but no address (falls back to From: for +# header_sender check - From: is valid) +exim -odi -bs +mail from:<> +rcpt to: +data +to: group name: x@y, p@q; +reply-to: group name:; +from: userx@test.ex + +Message 11 +. +quit +**** +# Group syntax in reply-to header, but no address (falls back to From: for +# header_sender check - but there is no From:) +exim -odi -bs +mail from:<> +rcpt to: +data +to: group name: x@y, p@q; +reply-to: group name:; + +Message 12 +. +quit +**** no_msglog_check diff --git a/test/stderr/0026 b/test/stderr/0026 index 5020f18ac..7afb6b4d3 100644 --- a/test/stderr/0026 +++ b/test/stderr/0026 @@ -17,7 +17,7 @@ >>> processing "require" >>> check verify = header_syntax >>> require: condition test failed -LOG: 10HmbF-0005vi-00 H=[10.0.0.0] F= rejected after DATA: domain missing or malformed: failing address in "From:" header is: @ +LOG: 10HmbH-0005vi-00 H=[10.0.0.0] F= rejected after DATA: domain missing or malformed: failing address in "From:" header is: @ >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -34,4 +34,4 @@ LOG: 10HmbF-0005vi-00 H=[10.0.0.0] F= rejected after DATA: domain missing o >>> check condition = ${if match{$message_body}{trigger}{yes}{no}} >>> = yes >>> deny: condition test succeeded -LOG: 10HmbG-0005vi-00 H=[10.0.0.0] F= rejected after DATA: body contains trigger +LOG: 10HmbI-0005vi-00 H=[10.0.0.0] F= rejected after DATA: body contains trigger diff --git a/test/stdout/0026 b/test/stdout/0026 index e02e9c7d3..f95e2ffb2 100644 --- a/test/stdout/0026 +++ b/test/stdout/0026 @@ -2,7 +2,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 OK @@ -26,7 +26,7 @@ 250 OK 250 Accepted 354 Enter message, ending with "." on a line by itself -250 OK id=10HmbC-0005vi-00 +250 OK id=10HmbD-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 OK @@ -38,7 +38,7 @@ 250 OK 250 Accepted 354 Enter message, ending with "." on a line by itself -250 OK id=10HmbD-0005vi-00 +250 OK id=10HmbE-0005vi-00 221 myhost.test.ex closing connection **** SMTP testing session as if from host 10.0.0.0 @@ -66,5 +66,17 @@ 250 OK 250 Accepted 354 Enter message, ending with "." on a line by itself -250 OK id=10HmbE-0005vi-00 +250 OK id=10HmbF-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 OK +250 Accepted +354 Enter message, ending with "." on a line by itself +250 OK id=10HmbG-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 OK +250 Accepted +354 Enter message, ending with "." on a line by itself +550 Administrative prohibition 221 myhost.test.ex closing connection -- cgit v1.2.3