Merge branch 'master' into 4.next

[exim.git] / test / scripts / 0000-Basic / 0026

diff --git a/test/scripts/0000-Basic/0026 b/test/scripts/0000-Basic/0026
index e81e0d9d00d7a672b691a10078ff2920075a757a..cb1a3081ff567bfda9cb34fcf555bfcbfd84b964 100644 (file)
--- a/test/scripts/0000-Basic/0026
+++ b/test/scripts/0000-Basic/0026
@@ -2,6 +2,7 @@
 #
 # Syntax OK, non-null sender => should be accepted
 exim -odq -bs
 #
 # Syntax OK, non-null sender => should be accepted
 exim -odq -bs

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 data
 mail from:<x@y>
 rcpt to:<x@y>
 data


@@ -11,6 +12,7 @@ quit
 ****
 # Syntax error in header => should fail
 exim -odq -bs
 ****
 # Syntax error in header => should fail
 exim -odq -bs

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 data
 mail from:<x@y>
 rcpt to:<x@y>
 data


@@ -20,8 +22,23 @@ Message 2
 .
 quit
 ****
 .
 quit
 ****

+# Syntax error (version 2) in header => should fail
+exim -odq -bs
+helo test
+mail from:<x@y>
+rcpt to:<x@y>
+data
+To: <dummy@gmail.com
+Subject: incomprehensible
+From: <forged@sender.com
+
+Message 2a
+.
+quit
+****

 # Syntax error in header => should fail even with null sender
 exim -odq -bs
 # Syntax error in header => should fail even with null sender
 exim -odq -bs

+helo test

 mail from:<>
 rcpt to:<x@y>
 data
 mail from:<>
 rcpt to:<x@y>
 data


@@ -33,6 +50,7 @@ quit
 ****
 # Null sender, invalid sender in header => fail
 exim -odq -bs
 ****
 # Null sender, invalid sender in header => fail
 exim -odq -bs

+helo test

 mail from:<>
 rcpt to:<x@y>
 data
 mail from:<>
 rcpt to:<x@y>
 data


@@ -44,6 +62,7 @@ quit
 ****
 # Null sender, valid sender in header => accept
 exim -odq -bs
 ****
 # Null sender, valid sender in header => accept
 exim -odq -bs

+helo test

 mail from:<>
 rcpt to:<x@y>
 data
 mail from:<>
 rcpt to:<x@y>
 data


@@ -56,6 +75,7 @@ quit
 ****
 # Syntax OK, non-null sender, but bad data => reject
 exim -odq -bs
 ****
 # Syntax OK, non-null sender, but bad data => reject
 exim -odq -bs

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 data
 mail from:<x@y>
 rcpt to:<x@y>
 data


@@ -65,6 +85,7 @@ quit
 ****
 # Syntax OK, non-null sender, good data
 exim -odi -bs
 ****
 # Syntax OK, non-null sender, good data
 exim -odi -bs

+helo test

 mail from:<x@y>
 rcpt to:<userx@test.ex>
 data
 mail from:<x@y>
 rcpt to:<userx@test.ex>
 data


@@ -74,6 +95,7 @@ quit
 ****
 # -bh test: Syntax error in header => should fail
 exim -bh 10.0.0.0
 ****
 # -bh test: Syntax error in header => should fail
 exim -bh 10.0.0.0

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 data
 mail from:<x@y>
 rcpt to:<x@y>
 data


@@ -85,6 +107,7 @@ quit
 ****
 # -bh test: Syntax OK, non-null sender, but bad data => reject
 exim -bh 10.0.0.0
 ****
 # -bh test: Syntax OK, non-null sender, but bad data => reject
 exim -bh 10.0.0.0

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 data
 mail from:<x@y>
 rcpt to:<x@y>
 data


@@ -94,6 +117,7 @@ quit
 ****
 # Group syntax in reply-to header
 exim -odi -bs
 ****
 # Group syntax in reply-to header
 exim -odi -bs

+helo test

 mail from:<x@y>
 rcpt to:<userx@test.ex>
 data
 mail from:<x@y>
 rcpt to:<userx@test.ex>
 data


@@ -104,4 +128,33 @@ Message 10
 .
 quit
 ****
 .
 quit
 ****

+# Group syntax in reply-to header, but no address (falls back to From: for
+# header_sender check - From: is valid)
+exim -odi -bs
+helo test
+mail from:<>
+rcpt to:<userx@test.ex>
+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
+helo test
+mail from:<>
+rcpt to:<userx@test.ex>
+data
+to: group name: x@y, p@q;
+reply-to: group name:;
+
+Message 12
+.
+quit
+****

 no_msglog_check
 no_msglog_check