diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2020-10-11 12:42:20 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2020-10-11 13:31:44 +0100 |
| commit | 6bacc7090a4d219a48899c5b5b08b33f4811dc7f (patch) | |
| tree | d52003a20c412ec92fe07468b318b8635fd6e55d /test/scripts | |
| parent | 2d432dfd22141f9933cac8ab3e26a8babaf87bef (diff) | |
Testsuite: case-number shuffling
Diffstat (limited to 'test/scripts')
31 files changed, 1521 insertions, 1521 deletions
diff --git a/test/scripts/0000-Basic/0583 b/test/scripts/0000-Basic/0583 index c4ae477c1..8cea367eb 100644 --- a/test/scripts/0000-Basic/0583 +++ b/test/scripts/0000-Basic/0583 @@ -1,65 +1,44 @@ -# verify = not_blind/case_insensitive +# verify quota at smtp time # -# Accept: the env rcpt matches a header To: -exim -odq -bs -mail from:<> -rcpt to:<userx@dom.com> -data -To: a@b.c, himself <UserX@dom.com> -. -quit +exim -bd -DSERVER=server -oX PORT_D **** -### Reject: no match -exim -odq -bs -mail from:<> -rcpt to:<userx@dom.com> -data -To: b@b.c, himself <usery@dom.com> -. -quit +client 127.0.0.1 PORT_D +??? 220 +EHLO test +??? 250- +??? 250-SIZE +??? 250-8BITMIME +??? 250-PIPELINING +??? 250 HELP +MAIL FROM:<a@test.ex>\r\nRCPT TO:<quota_good@test.ex> +??? 250 +??? 250 +RSET +??? 250 +MAIL FROM:<b@test.ex> SIZE=2048\r\nRCPT TO:<quota_fail@test.ex> +??? 250 +??? 550 +RSET +??? 250 +MAIL FROM:<c@test.ex>\r\nRCPT TO:<route_fail@test.ex> +??? 250 +??? 550 +RSET +??? 250 +MAIL FROM:<d@test.ex>\r\nRCPT TO:<quota_good@test.ex> +??? 250 +??? 250 +RSET +??? 250 +MAIL FROM:<e@test.ex> SIZE=512\r\nRCPT TO:<quota_fail@test.ex> +??? 250 +??? 550 +RSET +??? 250 +MAIL FROM:<f@test.ex>\r\nRCPT TO:<route_fail@test.ex> +??? 250 +??? 550 +QUIT **** -### Reject, with specific SMTP message -exim -DERROR_DETAILS=smtp_return_error_details -odq -bs -mail from:<> -rcpt to:<userx@dom.com> -data -To: c@b.c, himself <usery@dom.com> -. -quit -**** -### Accept, matches in header CC: -exim -odq -bs -mail from:<> -rcpt to:<userx@dom.com> -rcpt to:<usery@dom.com> -data -To: d@b.c, himself <UserY@dom.com> -Cc: unqualified, UserX@dom.com, x@y.z -. -quit -**** -### Reject: To: & CC: combo, an env rcpt missing -exim -odq -bs -mail from:<> -rcpt to:<userx@dom.com> -rcpt to:<usery@dom.com> -rcpt to:<userz@dom.com> -data -To: e@b.c, himself <UserY@dom.com> -Cc: unqualified, UserX@dom.com, x@y.z -. -quit -**** -### Accept: Resent-To: & Resent-CC: combo -exim -odq -bs -mail from:<> -rcpt to:<userx@dom.com> -rcpt to:<usery@dom.com> -data -Resent-To: f@b.c, himself <UserY@dom.com> -Resent-Cc: unqualified, UserX@dom.com, x@y.z -To: an@other -. -quit -**** -no_msglog_check +# +killdaemon diff --git a/test/scripts/0000-Basic/0584 b/test/scripts/0000-Basic/0584 index 54ca506cc..c7f543d36 100644 --- a/test/scripts/0000-Basic/0584 +++ b/test/scripts/0000-Basic/0584 @@ -1,8 +1,29 @@ -# tainted data for appendfile file option -exim -bs -odi -mail from:someone@some.domain -rcpt to:CALLER@HOSTNAME +# verify = sender=address +# +# pass +exim -DOPT=userx@test.ex -bh 127.0.0.1 +mail from:<userx@test.ex> +rcpt to:<userx@test.ex> data +From: userx@test.ex +Subject: testing . -quit +QUIT **** +# fail +exim -DOPT=fail@test.ex -bh 127.0.0.1 +mail from:<userx@test.ex> +rcpt to:<userx@test.ex> +QUIT +**** +# check can use tainted data +exim -DOPT='$sender_address/defer_ok' -bh 127.0.0.1 +mail from:<userx@test.ex> +rcpt to:<userx@test.ex> +data +From: userx@test.ex +Subject: testing +. +QUIT +**** +no_msglog_check diff --git a/test/scripts/0000-Basic/0585 b/test/scripts/0000-Basic/0585 index 5fbc9319c..c4ae477c1 100644 --- a/test/scripts/0000-Basic/0585 +++ b/test/scripts/0000-Basic/0585 @@ -1,4 +1,65 @@ -# tainted data for pipe transport command -exim -odi pipe-userx=DIR/bin/iefbr14@test.ex -A test message. +# verify = not_blind/case_insensitive +# +# Accept: the env rcpt matches a header To: +exim -odq -bs +mail from:<> +rcpt to:<userx@dom.com> +data +To: a@b.c, himself <UserX@dom.com> +. +quit **** +### Reject: no match +exim -odq -bs +mail from:<> +rcpt to:<userx@dom.com> +data +To: b@b.c, himself <usery@dom.com> +. +quit +**** +### Reject, with specific SMTP message +exim -DERROR_DETAILS=smtp_return_error_details -odq -bs +mail from:<> +rcpt to:<userx@dom.com> +data +To: c@b.c, himself <usery@dom.com> +. +quit +**** +### Accept, matches in header CC: +exim -odq -bs +mail from:<> +rcpt to:<userx@dom.com> +rcpt to:<usery@dom.com> +data +To: d@b.c, himself <UserY@dom.com> +Cc: unqualified, UserX@dom.com, x@y.z +. +quit +**** +### Reject: To: & CC: combo, an env rcpt missing +exim -odq -bs +mail from:<> +rcpt to:<userx@dom.com> +rcpt to:<usery@dom.com> +rcpt to:<userz@dom.com> +data +To: e@b.c, himself <UserY@dom.com> +Cc: unqualified, UserX@dom.com, x@y.z +. +quit +**** +### Accept: Resent-To: & Resent-CC: combo +exim -odq -bs +mail from:<> +rcpt to:<userx@dom.com> +rcpt to:<usery@dom.com> +data +Resent-To: f@b.c, himself <UserY@dom.com> +Resent-Cc: unqualified, UserX@dom.com, x@y.z +To: an@other +. +quit +**** +no_msglog_check diff --git a/test/scripts/0000-Basic/0586 b/test/scripts/0000-Basic/0586 index 0e48328ce..1715fd200 100644 --- a/test/scripts/0000-Basic/0586 +++ b/test/scripts/0000-Basic/0586 @@ -1,4 +1,20 @@ -# tainted data for filter filename -1 -exim -bv abcd@test.ex +# HELO verify dnssec +# Exim test configuration 0608 +# +exim -DSERVER=server -bd -oX PORT_D **** +# +client 127.0.0.1 PORT_D +??? 220 +HELO localhost +??? 250 +**** +# +client 127.0.0.1 PORT_D +??? 220 +HELO l-sec +??? 250 +**** +# +killdaemon +no_msglog_check diff --git a/test/scripts/0000-Basic/0587 b/test/scripts/0000-Basic/0587 index 038254eab..625013100 100644 --- a/test/scripts/0000-Basic/0587 +++ b/test/scripts/0000-Basic/0587 @@ -1,19 +1,11 @@ -# $local_part_data, multi-rcpt message +# dns retry in hostlist +# Exim test configuration 0605 # -exim -bs -odi -mail from:<someone@some.domain> -rcpt to:<CALLER@HOSTNAME> -rcpt to:<b@remote> -data -. -quit -**** -exim -bs -odi -mail from:<someone@some.domain> -rcpt to:<a@remote> -rcpt to:<CALLER@HOSTNAME> -data -. +need_ipv4 +# +exim -bh HOSTIPV4 +helo test +mail from:<ralph@dustyshoes.tld> +rcpt to:<bob@anotherone.tld> quit **** -no_message_check diff --git a/test/scripts/0000-Basic/0588 b/test/scripts/0000-Basic/0588 index 44328a70c..689978428 100644 --- a/test/scripts/0000-Basic/0588 +++ b/test/scripts/0000-Basic/0588 @@ -1,45 +1,19 @@ -# message_linelength_limit +# dns log long lookups +# Exim test configuration 0606 # -# The "write" script cmd subtracts 1 for the newline, -# and the linecount in exim doesn't count the line-ending. -write test-data-good 1x999 -++++ -**** -write test-data-bad 1x1000 -++++ -**** +munge delay_1500 # -exim -bd -DSERVER=server -oX PORT_D -**** -client 127.0.0.1 PORT_D -??? 220 -HELO test -??? 250 -MAIL FROM:<CALLER@test.ex> -??? 250 -RCPT TO:<good@test.ex> -??? 250 -DATA -??? 354 -Subject: should be good - -<<< test-data-good -. -??? 250 -MAIL FROM:<CALLER@test.ex> -??? 250 -RCPT TO:<bad@test.ex> -??? 250 -DATA -??? 354 -Subject: should be bad - -<<< test-data-bad -. -??? 250 -QUIT -??? 221 +exim -bh 127.0.0.1 +helo test +mail from:<ralph@dustyshoes.tld> +rcpt to:<should_log@delay1500.test.ex> +quit **** # -sleep 1 -killdaemon +# +exim -bh 127.0.0.1 +helo test +mail from:<ralph@dustyshoes.tld> +rcpt to:<should_not_log@delay500.test.ex> +quit +**** diff --git a/test/scripts/0000-Basic/0589 b/test/scripts/0000-Basic/0589 index 8cea367eb..44328a70c 100644 --- a/test/scripts/0000-Basic/0589 +++ b/test/scripts/0000-Basic/0589 @@ -1,44 +1,45 @@ -# verify quota at smtp time +# message_linelength_limit +# +# The "write" script cmd subtracts 1 for the newline, +# and the linecount in exim doesn't count the line-ending. +write test-data-good 1x999 +++++ +**** +write test-data-bad 1x1000 +++++ +**** # exim -bd -DSERVER=server -oX PORT_D **** client 127.0.0.1 PORT_D ??? 220 -EHLO test -??? 250- -??? 250-SIZE -??? 250-8BITMIME -??? 250-PIPELINING -??? 250 HELP -MAIL FROM:<a@test.ex>\r\nRCPT TO:<quota_good@test.ex> -??? 250 -??? 250 -RSET -??? 250 -MAIL FROM:<b@test.ex> SIZE=2048\r\nRCPT TO:<quota_fail@test.ex> -??? 250 -??? 550 -RSET -??? 250 -MAIL FROM:<c@test.ex>\r\nRCPT TO:<route_fail@test.ex> -??? 250 -??? 550 -RSET +HELO test ??? 250 -MAIL FROM:<d@test.ex>\r\nRCPT TO:<quota_good@test.ex> +MAIL FROM:<CALLER@test.ex> ??? 250 +RCPT TO:<good@test.ex> ??? 250 -RSET +DATA +??? 354 +Subject: should be good + +<<< test-data-good +. ??? 250 -MAIL FROM:<e@test.ex> SIZE=512\r\nRCPT TO:<quota_fail@test.ex> +MAIL FROM:<CALLER@test.ex> ??? 250 -??? 550 -RSET +RCPT TO:<bad@test.ex> ??? 250 -MAIL FROM:<f@test.ex>\r\nRCPT TO:<route_fail@test.ex> +DATA +??? 354 +Subject: should be bad + +<<< test-data-bad +. ??? 250 -??? 550 QUIT +??? 221 **** # +sleep 1 killdaemon diff --git a/test/scripts/0000-Basic/0591 b/test/scripts/0000-Basic/0591 deleted file mode 100644 index c7f543d36..000000000 --- a/test/scripts/0000-Basic/0591 +++ /dev/null @@ -1,29 +0,0 @@ -# verify = sender=address -# -# pass -exim -DOPT=userx@test.ex -bh 127.0.0.1 -mail from:<userx@test.ex> -rcpt to:<userx@test.ex> -data -From: userx@test.ex -Subject: testing -. -QUIT -**** -# fail -exim -DOPT=fail@test.ex -bh 127.0.0.1 -mail from:<userx@test.ex> -rcpt to:<userx@test.ex> -QUIT -**** -# check can use tainted data -exim -DOPT='$sender_address/defer_ok' -bh 127.0.0.1 -mail from:<userx@test.ex> -rcpt to:<userx@test.ex> -data -From: userx@test.ex -Subject: testing -. -QUIT -**** -no_msglog_check diff --git a/test/scripts/0000-Basic/0593 b/test/scripts/0000-Basic/0593 new file mode 100644 index 000000000..54ca506cc --- /dev/null +++ b/test/scripts/0000-Basic/0593 @@ -0,0 +1,8 @@ +# tainted data for appendfile file option +exim -bs -odi +mail from:someone@some.domain +rcpt to:CALLER@HOSTNAME +data +. +quit +**** diff --git a/test/scripts/0000-Basic/0594 b/test/scripts/0000-Basic/0594 new file mode 100644 index 000000000..5fbc9319c --- /dev/null +++ b/test/scripts/0000-Basic/0594 @@ -0,0 +1,4 @@ +# tainted data for pipe transport command +exim -odi pipe-userx=DIR/bin/iefbr14@test.ex +A test message. +**** diff --git a/test/scripts/0000-Basic/0595 b/test/scripts/0000-Basic/0595 new file mode 100644 index 000000000..0e48328ce --- /dev/null +++ b/test/scripts/0000-Basic/0595 @@ -0,0 +1,4 @@ +# tainted data for filter filename +1 +exim -bv abcd@test.ex +**** diff --git a/test/scripts/0000-Basic/0596 b/test/scripts/0000-Basic/0596 new file mode 100644 index 000000000..038254eab --- /dev/null +++ b/test/scripts/0000-Basic/0596 @@ -0,0 +1,19 @@ +# $local_part_data, multi-rcpt message +# +exim -bs -odi +mail from:<someone@some.domain> +rcpt to:<CALLER@HOSTNAME> +rcpt to:<b@remote> +data +. +quit +**** +exim -bs -odi +mail from:<someone@some.domain> +rcpt to:<a@remote> +rcpt to:<CALLER@HOSTNAME> +data +. +quit +**** +no_message_check diff --git a/test/scripts/0000-Basic/0597 b/test/scripts/0000-Basic/0597 new file mode 100644 index 000000000..aa712de2f --- /dev/null +++ b/test/scripts/0000-Basic/0597 @@ -0,0 +1,76 @@ +# control = queue/first_pass_route +# +exim -bd -DSERVER=server -oX PORT_D +**** +# +# First, control=queue_only - we expact the queue run to make separate connections +client 127.0.0.1 PORT_D +??? 220 +HELO me +??? 250 +MAIL FROM:<CALLER@test.ex> +??? 250 +RCPT TO:<queue_only_1@test.ex> +??? 250 +DATA +??? 354 +Subject: 1 +. +??? 250 +RSET +??? 250 +MAIL FROM:<CALLER@test.ex> +??? 250 +RCPT TO:<queue_only_2@test.ex> +??? 250 +DATA +??? 354 +Subject: 2 +. +??? 250 +QUIT +**** +exim -q +**** +exim -q +**** +# +# Second, control=queue/first_pass_route - we expect the queue run to make only one +# connection, and put both messages over it +client 127.0.0.1 PORT_D +??? 220 +HELO me +??? 250 +MAIL FROM:<CALLER@test.ex> +??? 250 +RCPT TO:<first_pass_route_1@test.ex> +??? 250 +DATA +??? 354 +Subject: 1 +. +??? 250 +RSET +??? 250 +MAIL FROM:<CALLER@test.ex> +??? 250 +RCPT TO:<first_pass_route_2@test.ex> +??? 250 +DATA +??? 354 +Subject: 2 +. +??? 250 +QUIT +**** +# give time for the background routing in the exim daemon to complete +sleep 1 +# then run the queue +exim -q +**** +exim -q +**** +# +# +killdaemon +no_msglog_check diff --git a/test/scripts/0000-Basic/0621 b/test/scripts/0000-Basic/0598 index 53512ade4..53512ade4 100644 --- a/test/scripts/0000-Basic/0621 +++ b/test/scripts/0000-Basic/0598 diff --git a/test/scripts/0000-Basic/0599 b/test/scripts/0000-Basic/0599 index aa712de2f..360d536c0 100644 --- a/test/scripts/0000-Basic/0599 +++ b/test/scripts/0000-Basic/0599 @@ -1,76 +1,17 @@ -# control = queue/first_pass_route +# udpsend +#need_ipv4 # -exim -bd -DSERVER=server -oX PORT_D -**** # -# First, control=queue_only - we expact the queue run to make separate connections -client 127.0.0.1 PORT_D -??? 220 -HELO me -??? 250 -MAIL FROM:<CALLER@test.ex> -??? 250 -RCPT TO:<queue_only_1@test.ex> -??? 250 -DATA -??? 354 -Subject: 1 -. -??? 250 -RSET -??? 250 -MAIL FROM:<CALLER@test.ex> -??? 250 -RCPT TO:<queue_only_2@test.ex> -??? 250 -DATA -??? 354 -Subject: 2 -. -??? 250 -QUIT -**** -exim -q -**** -exim -q +perl aux-fixed/0601.udpserver **** # -# Second, control=queue/first_pass_route - we expect the queue run to make only one -# connection, and put both messages over it -client 127.0.0.1 PORT_D -??? 220 -HELO me -??? 250 -MAIL FROM:<CALLER@test.ex> -??? 250 -RCPT TO:<first_pass_route_1@test.ex> -??? 250 -DATA -??? 354 -Subject: 1 +exim -bs -odi +mail from:someone@some.domain +rcpt to:CALLER@HOSTNAME +data +This is a test message. . -??? 250 -RSET -??? 250 -MAIL FROM:<CALLER@test.ex> -??? 250 -RCPT TO:<first_pass_route_2@test.ex> -??? 250 -DATA -??? 354 -Subject: 2 -. -??? 250 -QUIT -**** -# give time for the background routing in the exim daemon to complete -sleep 1 -# then run the queue -exim -q -**** -exim -q +quit **** -# -# -killdaemon +sleep 2 no_msglog_check diff --git a/test/scripts/0000-Basic/0601 b/test/scripts/0000-Basic/0601 index 360d536c0..5fcce7cac 100644 --- a/test/scripts/0000-Basic/0601 +++ b/test/scripts/0000-Basic/0601 @@ -1,17 +1,109 @@ -# udpsend -#need_ipv4 +# syslog logging +# +# basic +exim -DLOG_SELECTOR="" -DTIMES=no -DARG1=no -DARG2=no fred@test.ex +**** +# plus tz +exim -DLOG_SELECTOR="" -DTIMES=yes -DARG1=no -DARG2=no fred@test.ex +**** +# plus ms +exim -DLOG_SELECTOR="+millisec" -DTIMES=no -DARG1=no -DARG2=no fred@test.ex +**** +# plus tz + ms +exim -DLOG_SELECTOR="+millisec" -DTIMES=yes -DARG1=no -DARG2=no fred@test.ex +**** +# plus pid +exim -DLOG_SELECTOR="+pid" -DTIMES=no -DARG1=no -DARG2=no fred@test.ex +**** +# plus pid + tz +exim -DLOG_SELECTOR="+pid" -DTIMES=yes -DARG1=no -DARG2=no fred@test.ex +**** +# plus pid + ms +exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=no -DARG1=no -DARG2=no fred@test.ex +**** +# plus pid + tz + ms +exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=yes -DARG1=no -DARG2=no fred@test.ex +**** # # -perl aux-fixed/0601.udpserver +# syslog plus pid +# basic +exim -DLOG_SELECTOR="" -DTIMES=no -DARG1=no -DARG2=yes fred@test.ex +**** +# plus tz +exim -DLOG_SELECTOR="" -DTIMES=yes -DARG1=no -DARG2=yes fred@test.ex +**** +# plus ms +exim -DLOG_SELECTOR="+millisec" -DTIMES=no -DARG1=no -DARG2=yes fred@test.ex +**** +# plus tz + ms +exim -DLOG_SELECTOR="+millisec" -DTIMES=yes -DARG1=no -DARG2=yes fred@test.ex +**** +# plus pid +exim -DLOG_SELECTOR="+pid" -DTIMES=no -DARG1=no -DARG2=yes fred@test.ex +**** +# plus pid + tz +exim -DLOG_SELECTOR="+pid" -DTIMES=yes -DARG1=no -DARG2=yes fred@test.ex +**** +# plus pid + ms +exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=no -DARG1=no -DARG2=yes fred@test.ex +**** +# plus pid + tz + ms +exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=yes -DARG1=no -DARG2=yes fred@test.ex **** # -exim -bs -odi -mail from:someone@some.domain -rcpt to:CALLER@HOSTNAME -data -This is a test message. -. -quit +# +# syslog plus time +# basic +exim -DLOG_SELECTOR="" -DTIMES=no -DARG1=yes -DARG2=no fred@test.ex +**** +# plus tz +exim -DLOG_SELECTOR="" -DTIMES=yes -DARG1=yes -DARG2=no fred@test.ex **** -sleep 2 +# plus ms +exim -DLOG_SELECTOR="+millisec" -DTIMES=no -DARG1=yes -DARG2=no fred@test.ex +**** +# plus tz + ms +exim -DLOG_SELECTOR="+millisec" -DTIMES=yes -DARG1=yes -DARG2=no fred@test.ex +**** +# plus pid +exim -DLOG_SELECTOR="+pid" -DTIMES=no -DARG1=yes -DARG2=no fred@test.ex +**** +# plus pid + tz +exim -DLOG_SELECTOR="+pid" -DTIMES=yes -DARG1=yes -DARG2=no fred@test.ex +**** +# plus pid + ms +exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=no -DARG1=yes -DARG2=no fred@test.ex +**** +# plus pid + tz + ms +exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=yes -DARG1=yes -DARG2=no fred@test.ex +**** +# +# +# syslog plus pid + time +# basic +exim -DLOG_SELECTOR="" -DTIMES=no -DARG1=yes -DARG2=yes fred@test.ex +**** +# plus tz +exim -DLOG_SELECTOR="" -DTIMES=yes -DARG1=yes -DARG2=yes fred@test.ex +**** +# plus ms +exim -DLOG_SELECTOR="+millisec" -DTIMES=no -DARG1=yes -DARG2=yes fred@test.ex +**** +# plus tz + ms +exim -DLOG_SELECTOR="+millisec" -DTIMES=yes -DARG1=yes -DARG2=yes fred@test.ex +**** +# plus pid +exim -DLOG_SELECTOR="+pid" -DTIMES=no -DARG1=yes -DARG2=yes fred@test.ex +**** +# plus pid + tz +exim -DLOG_SELECTOR="+pid" -DTIMES=yes -DARG1=yes -DARG2=no fred@test.ex +**** +# plus pid + ms +exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=no -DARG1=yes -DARG2=yes fred@test.ex +**** +# plus pid + tz + ms +exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=yes -DARG1=yes -DARG2=yes fred@test.ex +**** +# no_msglog_check diff --git a/test/scripts/0000-Basic/0603 b/test/scripts/0000-Basic/0603 index 38e374a1f..dfe53ef8c 100644 --- a/test/scripts/0000-Basic/0603 +++ b/test/scripts/0000-Basic/0603 @@ -1,71 +1,10 @@ -# retry: transport identity depending on sender -# Exim test configuration 0603 +# log_defer_output on pipe transport # -# Add several messages going to the same location -# And change smtp output based on senders domain +#XXX maybe collapse into 0048? # -exim -DSERVER=server -bd -oX PORT_D -**** -# -exim -bs -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -This is a test message. -It has three lines. -This is the last line. -. -RSET -mail from:peter@dustybelt.tld -rcpt to:bob@anotherone.tld -data -Subject: second - -This is a second test message. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: third -Reply-to: some@body - -This is a third test message. -. -RSET -mail from:peter@dustybelt.tld -rcpt to:bob@anotherone.tld -data -Subject: secondA - -This is a secondA test message. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: third -Reply-to: some@body - -This is a fourth test message. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: third -Reply-to: some@body - -This is a fifth test message. -. -quit -**** +munge sys_bindir # -# -exim -qq +exim a **** -# -# -killdaemon +sleep 2 no_msglog_check - diff --git a/test/scripts/0000-Basic/0604 b/test/scripts/0000-Basic/0604 index a24d194fa..196b9dc0c 100644 --- a/test/scripts/0000-Basic/0604 +++ b/test/scripts/0000-Basic/0604 @@ -1,667 +1,45 @@ -# retry: database continuation record -# Exim test configuration 0604 +# log_selector msg_id and msg_id_created # -echo Note this takes 3 minutes to run -# -exim -DSERVER=server -bd -oX PORT_D +# msg_id is on by default; check baseline +exim -DLOG_SELECTOR=+received_recipients -t +From: CALLER@test.ex +To: a@test.ex +Message-ID: original1235@example.com + +body **** # -exim -bs -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -This is a test message. -It has three lines. -This is the last line. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 1 - -This is message number 1. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 2 - -This is message number 2. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 3 - -This is message number 3. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 4 - -This is message number 4. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 5 - -This is message number 5. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 6 - -This is message number 6. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 7 - -This is message number 7. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 8 - -This is message number 8. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 9 - -This is message number 9. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 10 - -This is message number 10. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 11 - -This is message number 11. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 12 - -This is message number 12. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 13 - -This is message number 13. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 14 - -This is message number 14. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 15 - -This is message number 15. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 16 - -This is message number 16. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 17 - -This is message number 17. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 18 - -This is message number 18. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 19 - -This is message number 19. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 20 - -This is message number 20. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 21 - -This is message number 21. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 22 - -This is message number 22. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 23 - -This is message number 23. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 24 - -This is message number 24. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 25 - -This is message number 25. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 26 - -This is message number 26. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 27 - -This is message number 27. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 28 - -This is message number 28. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 29 - -This is message number 29. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 30 - -This is message number 30. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 31 - -This is message number 31. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 32 - -This is message number 32. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 33 - -This is message number 33. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 34 - -This is message number 34. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 35 - -This is message number 35. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 36 - -This is message number 36. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 37 - -This is message number 37. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 38 - -This is message number 38. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 39 - -This is message number 39. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 40 - -This is message number 40. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 41 - -This is message number 41. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 42 - -This is message number 42. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 43 - -This is message number 43. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 44 - -This is message number 44. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 45 - -This is message number 45. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 46 - -This is message number 46. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 47 - -This is message number 47. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 48 - -This is message number 48. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 49 - -This is message number 49. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 50 - -This is message number 50. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 51 - -This is message number 51. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 52 - -This is message number 52. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 53 - -This is message number 53. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 54 - -This is message number 54. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 55 - -This is message number 55. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 56 - -This is message number 56. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 57 - -This is message number 57. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 58 - -This is message number 58. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 59 - -This is message number 59. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 60 - -This is message number 60. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 61 - -This is message number 61. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 62 - -This is message number 62. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 63 - -This is message number 63. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 64 - -This is message number 64. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 65 - -This is message number 65. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 66 - -This is message number 66. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 67 - -This is message number 67. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 68 - -This is message number 68. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 69 - -This is message number 69. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 70 - -This is message number 70. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 71 - -This is message number 71. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 72 - -This is message number 72. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 73 - -This is message number 73. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 74 - -This is message number 74. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 75 - -This is message number 75. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 76 - -This is message number 76. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 77 - -This is message number 77. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 78 - -This is message number 78. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 79 - -This is message number 79. -. -RSET -mail from:ralph@dustyshoes.tld -rcpt to:bob@anotherone.tld -data -Subject: message_id 80 - -This is message number 80. -. -quit +# msg_id is on by default; check it can be disabled +exim -DLOG_SELECTOR=+received_recipients-msg_id -t +From: CALLER@test.ex +To: b@test.ex +Message-ID: original1235@example.com + +body **** # +# check msg_id_created shows invented ones +exim -DLOG_SELECTOR=+received_recipients+msg_id_created -t +From: CALLER@test.ex +To: c@test.ex + +body +**** # -exim -qq +# check msg_id_created ignores non-invented ones +exim -DLOG_SELECTOR=+received_recipients+msg_id_created -t +From: CALLER@test.ex +To: d@test.ex +Message-ID: original1235@example.com + +body **** # +# check that bounces don't log created, by default +exim -DLOG_SELECTOR=+received_recipients -M $msg1 +**** +# and check they do with msg_id_created +exim -DLOG_SELECTOR=+received_recipients+msg_id_created -M $msg1 +**** # -killdaemon no_msglog_check - diff --git a/test/scripts/0000-Basic/0605 b/test/scripts/0000-Basic/0605 index 625013100..ff3931b16 100644 --- a/test/scripts/0000-Basic/0605 +++ b/test/scripts/0000-Basic/0605 @@ -1,11 +1,17 @@ -# dns retry in hostlist -# Exim test configuration 0605 +# hosts_connection_nolog versus sender_host lists caching +exim -bd -DSERVER=server -oX PORT_D +**** # -need_ipv4 +# Will not log connection due to hosts_connection_nolog +client 127.0.0.1 PORT_D +??? 220 +QUIT +**** # -exim -bh HOSTIPV4 -helo test -mail from:<ralph@dustyshoes.tld> -rcpt to:<bob@anotherone.tld> -quit +# Connection should be logged +client HOSTIPV4 PORT_D +??? 220 +QUIT **** +# +killdaemon diff --git a/test/scripts/0000-Basic/0606 b/test/scripts/0000-Basic/0606 index 689978428..96d598834 100644 --- a/test/scripts/0000-Basic/0606 +++ b/test/scripts/0000-Basic/0606 @@ -1,19 +1,6 @@ -# dns log long lookups -# Exim test configuration 0606 -# -munge delay_1500 -# -exim -bh 127.0.0.1 -helo test -mail from:<ralph@dustyshoes.tld> -rcpt to:<should_log@delay1500.test.ex> -quit -**** -# -# -exim -bh 127.0.0.1 -helo test -mail from:<ralph@dustyshoes.tld> -rcpt to:<should_not_log@delay500.test.ex> -quit +# router variables +exim -odi a +Subject: foo + +body **** diff --git a/test/scripts/0000-Basic/0608 b/test/scripts/0000-Basic/0608 index 1715fd200..f3016f2cf 100644 --- a/test/scripts/0000-Basic/0608 +++ b/test/scripts/0000-Basic/0608 @@ -1,20 +1,49 @@ -# HELO verify dnssec -# Exim test configuration 0608 +# bounce_message_file and warn_message_file # -exim -DSERVER=server -bd -oX PORT_D +exim -odf a@test.ex +Subject: test 1.1 - Default deny message **** -# -client 127.0.0.1 PORT_D -??? 220 -HELO localhost -??? 250 +exim -odf -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl b@test.ex +Subject: test 1.2 - Specified deny message file +**** +exim -odf -DOPT=DIR/aux-fixed/TESTNUM.nonexist.tmpl c@test.ex +Subject: test 1.3 - Specified, missing deny message file +**** +exim -odf -DOPT=relative_file_path d@test.ex +Subject: test 1.4 - Specified, non-absolute +**** +exim -odf -DOPT='$acl_m_unset' e@test.ex +Subject: test 1.5 - Specified, expansion empty +**** +exim -odf -DOPT='DIR/aux-fixed/TESTNUM.$sender_address' f@test.ex +Subject: test 1.6 - Specified, expansion tainted +**** +exim -odf -DOPT='${if ={0}{0} {DIR/aux-fixed/TESTNUM.bounce.tmpl}{bad}}' g@test.ex +Subject: test 1.7 - Specified, expansion good **** # -client 127.0.0.1 PORT_D -??? 220 -HELO l-sec -??? 250 +exim -odf delay_p@test.ex +Subject: test 2.1 - Default delay message +**** +exim -odf -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl delay_q@test.ex +Subject: test 2.2 - Specified delay message file **** +exim -odf -DOPT=DIR/aux-fixed/TESTNUM.nonexist.tmpl delay_r@test.ex +Subject: test 2.3 - Specified, missing delay message file +**** +exim -odf -DOPT='${if ={0}{0} {DIR/aux-fixed/TESTNUM.bounce.tmpl}{bad}}' delay_s@test.ex +Subject: test 2.7 - Specified, expansion good +**** +sleep 1 +exim -M $msg1 +**** +exim -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl -M $msg2 +**** +exim -DOPT=DIR/aux-fixed/TESTNUM.nonexist.tmpl -M $msg3 +**** +exim -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl -M $msg4 +**** +sleep 1 +# # -killdaemon no_msglog_check diff --git a/test/scripts/0000-Basic/0612 b/test/scripts/0000-Basic/0612 index dfe53ef8c..69a53c691 100644 --- a/test/scripts/0000-Basic/0612 +++ b/test/scripts/0000-Basic/0612 @@ -1,10 +1,180 @@ -# log_defer_output on pipe transport +# DSN ESMTP extension RCPT options # -#XXX maybe collapse into 0048? +# Server does not advertise by default +exim -DSERVER=server -bd -oX PORT_D +**** +client 127.0.0.1 PORT_D +??? 220 +EHLO testclient +??? 250- +??? 250-SIZE +??? 250 HELP +**** +killdaemon +# +# +# Server does advertise when told. Client requests no bounces, and this one gets a reject. +exim -DSERVER=server -DOPT=y -bd -oX PORT_D +**** +exim -z rej/never +**** +client HOSTIPV4 PORT_D +??? 220 +EHLO testclient +??? 250- +??? 250-SIZE +??? 250-DSN +??? 250 HELP +MAIL FROM:<a@dump.ex> +??? 250 +RCPT TO:<any@test.ex> NOTIFY=foo +??? 501 +RCPT TO:<rmt_reject@test.ex> NOTIFY=never +??? 250 +DATA +??? 354 +Subject: test +. +??? 250 +QUIT +??? 221 +**** +exim -q +**** +# +# Client requests delivery notification; the server supports DSN so takes responsibility +exim -z accept/success +**** +client HOSTIPV4 PORT_D +??? 220 +EHLO testclient +??? 250- +??? 250-SIZE +??? 250-DSN +??? 250 HELP +MAIL FROM:<b@dump.ex> +??? 250 +RCPT TO:<rmt_accept@test.ex> NOTIFY=success +??? 250 +DATA +??? 354 +Subject: test +. +??? 250 +QUIT +??? 221 +**** +# MSA send msg to MDA +exim -q +**** +# deliver msg at MDA +exim -q +**** +# deliver notification from MDA +exim -q +**** +# +# Client requests notification of deferral. First time of trying, we get +# a defer but queue-time probably has not hit the 1st retry time yet, so no DSN +# will be sent and the message remains queued. Then, claiming time has elapsed, +# we will look again (expecting a delay-DSN to be produced). We won't see a +# retry since the actual retry time has not passed. +exim -z defer/delay +**** +client HOSTIPV4 PORT_D +??? 220 +EHLO testclient +??? 250- +??? 250-SIZE +??? 250-DSN +??? 250 HELP +MAIL FROM:<c@dump.ex> +??? 250 +RCPT TO:<rmt_defer@test.ex> NOTIFY=delay +??? 250 +DATA +??? 354 +Subject: test +. +??? 250 +QUIT +??? 221 +**** +exim -q +**** # -munge sys_bindir +# Clients requests no DSNs, and this one gets deferred +exim -z defer/never +**** +client HOSTIPV4 PORT_D +??? 220 +EHLO testclient +??? 250- +??? 250-SIZE +??? 250-DSN +??? 250 HELP +MAIL FROM:<d@dump.ex> +??? 250 +RCPT TO:<rmt_defer@test.ex> NOTIFY=never +??? 250 +DATA +??? 354 +Subject: test +. +??? 250 +QUIT +??? 221 +**** +exim -q +**** +# +# +# +# Second time, for the queued deferrals. +# We should see the notify for c@dump.ex but not d@dump.ex +exim -z playout +**** +exim -Tqt 10s/ -q +**** +sleep 1 +exim -Mrm $msg1 $msg2 +**** # -exim a +# +# +# +# Client requests bounce+delay notification; bounce happens +exim -z rej/failure+delay +**** +client HOSTIPV4 PORT_D +??? 220 +EHLO testclient +??? 250- +??? 250-SIZE +??? 250-DSN +??? 250 HELP +MAIL FROM:<e@dump.ex> +??? 250 +RCPT TO:<rmt_reject@test.ex> NOTIFY=fAiLuRe,DELAY +??? 250 +DATA +??? 354 +Subject: test +. +??? 250 +QUIT +??? 221 +**** +# MSA send msg to MDA +exim -q **** -sleep 2 +# deliver notification from MDA +exim -z 'deliver DSN' +**** +exim -q +**** +sleep 1 +killdaemon +# +# no_msglog_check diff --git a/test/scripts/0000-Basic/0614 b/test/scripts/0000-Basic/0614 index ff3931b16..38e374a1f 100644 --- a/test/scripts/0000-Basic/0614 +++ b/test/scripts/0000-Basic/0614 @@ -1,17 +1,71 @@ -# hosts_connection_nolog versus sender_host lists caching -exim -bd -DSERVER=server -oX PORT_D +# retry: transport identity depending on sender +# Exim test configuration 0603 +# +# Add several messages going to the same location +# And change smtp output based on senders domain +# +exim -DSERVER=server -bd -oX PORT_D **** # -# Will not log connection due to hosts_connection_nolog -client 127.0.0.1 PORT_D -??? 220 -QUIT +exim -bs +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +This is a test message. +It has three lines. +This is the last line. +. +RSET +mail from:peter@dustybelt.tld +rcpt to:bob@anotherone.tld +data +Subject: second + +This is a second test message. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: third +Reply-to: some@body + +This is a third test message. +. +RSET +mail from:peter@dustybelt.tld +rcpt to:bob@anotherone.tld +data +Subject: secondA + +This is a secondA test message. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: third +Reply-to: some@body + +This is a fourth test message. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: third +Reply-to: some@body + +This is a fifth test message. +. +quit **** # -# Connection should be logged -client HOSTIPV4 PORT_D -??? 220 -QUIT +# +exim -qq **** # +# killdaemon +no_msglog_check + diff --git a/test/scripts/0000-Basic/0615 b/test/scripts/0000-Basic/0615 index 5fcce7cac..a24d194fa 100644 --- a/test/scripts/0000-Basic/0615 +++ b/test/scripts/0000-Basic/0615 @@ -1,109 +1,667 @@ -# syslog logging +# retry: database continuation record +# Exim test configuration 0604 # -# basic -exim -DLOG_SELECTOR="" -DTIMES=no -DARG1=no -DARG2=no fred@test.ex -**** -# plus tz -exim -DLOG_SELECTOR="" -DTIMES=yes -DARG1=no -DARG2=no fred@test.ex -**** -# plus ms -exim -DLOG_SELECTOR="+millisec" -DTIMES=no -DARG1=no -DARG2=no fred@test.ex -**** -# plus tz + ms -exim -DLOG_SELECTOR="+millisec" -DTIMES=yes -DARG1=no -DARG2=no fred@test.ex -**** -# plus pid -exim -DLOG_SELECTOR="+pid" -DTIMES=no -DARG1=no -DARG2=no fred@test.ex -**** -# plus pid + tz -exim -DLOG_SELECTOR="+pid" -DTIMES=yes -DARG1=no -DARG2=no fred@test.ex -**** -# plus pid + ms -exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=no -DARG1=no -DARG2=no fred@test.ex -**** -# plus pid + tz + ms -exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=yes -DARG1=no -DARG2=no fred@test.ex -**** +echo Note this takes 3 minutes to run # -# -# syslog plus pid -# basic -exim -DLOG_SELECTOR="" -DTIMES=no -DARG1=no -DARG2=yes fred@test.ex -**** -# plus tz -exim -DLOG_SELECTOR="" -DTIMES=yes -DARG1=no -DARG2=yes fred@test.ex -**** -# plus ms -exim -DLOG_SELECTOR="+millisec" -DTIMES=no -DARG1=no -DARG2=yes fred@test.ex -**** -# plus tz + ms -exim -DLOG_SELECTOR="+millisec" -DTIMES=yes -DARG1=no -DARG2=yes fred@test.ex -**** -# plus pid -exim -DLOG_SELECTOR="+pid" -DTIMES=no -DARG1=no -DARG2=yes fred@test.ex -**** -# plus pid + tz -exim -DLOG_SELECTOR="+pid" -DTIMES=yes -DARG1=no -DARG2=yes fred@test.ex -**** -# plus pid + ms -exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=no -DARG1=no -DARG2=yes fred@test.ex -**** -# plus pid + tz + ms -exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=yes -DARG1=no -DARG2=yes fred@test.ex +exim -DSERVER=server -bd -oX PORT_D **** # -# -# syslog plus time -# basic -exim -DLOG_SELECTOR="" -DTIMES=no -DARG1=yes -DARG2=no fred@test.ex -**** -# plus tz -exim -DLOG_SELECTOR="" -DTIMES=yes -DARG1=yes -DARG2=no fred@test.ex -**** -# plus ms -exim -DLOG_SELECTOR="+millisec" -DTIMES=no -DARG1=yes -DARG2=no fred@test.ex -**** -# plus tz + ms -exim -DLOG_SELECTOR="+millisec" -DTIMES=yes -DARG1=yes -DARG2=no fred@test.ex -**** -# plus pid -exim -DLOG_SELECTOR="+pid" -DTIMES=no -DARG1=yes -DARG2=no fred@test.ex -**** -# plus pid + tz -exim -DLOG_SELECTOR="+pid" -DTIMES=yes -DARG1=yes -DARG2=no fred@test.ex -**** -# plus pid + ms -exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=no -DARG1=yes -DARG2=no fred@test.ex -**** -# plus pid + tz + ms -exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=yes -DARG1=yes -DARG2=no fred@test.ex +exim -bs +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +This is a test message. +It has three lines. +This is the last line. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 1 + +This is message number 1. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 2 + +This is message number 2. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 3 + +This is message number 3. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 4 + +This is message number 4. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 5 + +This is message number 5. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 6 + +This is message number 6. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 7 + +This is message number 7. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 8 + +This is message number 8. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 9 + +This is message number 9. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 10 + +This is message number 10. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 11 + +This is message number 11. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 12 + +This is message number 12. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 13 + +This is message number 13. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 14 + +This is message number 14. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 15 + +This is message number 15. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 16 + +This is message number 16. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 17 + +This is message number 17. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 18 + +This is message number 18. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 19 + +This is message number 19. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 20 + +This is message number 20. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 21 + +This is message number 21. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 22 + +This is message number 22. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 23 + +This is message number 23. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 24 + +This is message number 24. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 25 + +This is message number 25. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 26 + +This is message number 26. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 27 + +This is message number 27. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 28 + +This is message number 28. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 29 + +This is message number 29. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 30 + +This is message number 30. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 31 + +This is message number 31. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 32 + +This is message number 32. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 33 + +This is message number 33. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 34 + +This is message number 34. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 35 + +This is message number 35. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 36 + +This is message number 36. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 37 + +This is message number 37. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 38 + +This is message number 38. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 39 + +This is message number 39. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 40 + +This is message number 40. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 41 + +This is message number 41. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 42 + +This is message number 42. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 43 + +This is message number 43. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 44 + +This is message number 44. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 45 + +This is message number 45. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 46 + +This is message number 46. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 47 + +This is message number 47. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 48 + +This is message number 48. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 49 + +This is message number 49. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 50 + +This is message number 50. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 51 + +This is message number 51. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 52 + +This is message number 52. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 53 + +This is message number 53. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 54 + +This is message number 54. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 55 + +This is message number 55. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 56 + +This is message number 56. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 57 + +This is message number 57. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 58 + +This is message number 58. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 59 + +This is message number 59. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 60 + +This is message number 60. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 61 + +This is message number 61. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 62 + +This is message number 62. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 63 + +This is message number 63. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 64 + +This is message number 64. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 65 + +This is message number 65. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 66 + +This is message number 66. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 67 + +This is message number 67. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 68 + +This is message number 68. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 69 + +This is message number 69. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 70 + +This is message number 70. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 71 + +This is message number 71. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 72 + +This is message number 72. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 73 + +This is message number 73. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 74 + +This is message number 74. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 75 + +This is message number 75. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 76 + +This is message number 76. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 77 + +This is message number 77. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 78 + +This is message number 78. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 79 + +This is message number 79. +. +RSET +mail from:ralph@dustyshoes.tld +rcpt to:bob@anotherone.tld +data +Subject: message_id 80 + +This is message number 80. +. +quit **** # # -# syslog plus pid + time -# basic -exim -DLOG_SELECTOR="" -DTIMES=no -DARG1=yes -DARG2=yes fred@test.ex -**** -# plus tz -exim -DLOG_SELECTOR="" -DTIMES=yes -DARG1=yes -DARG2=yes fred@test.ex -**** -# plus ms -exim -DLOG_SELECTOR="+millisec" -DTIMES=no -DARG1=yes -DARG2=yes fred@test.ex -**** -# plus tz + ms -exim -DLOG_SELECTOR="+millisec" -DTIMES=yes -DARG1=yes -DARG2=yes fred@test.ex -**** -# plus pid -exim -DLOG_SELECTOR="+pid" -DTIMES=no -DARG1=yes -DARG2=yes fred@test.ex -**** -# plus pid + tz -exim -DLOG_SELECTOR="+pid" -DTIMES=yes -DARG1=yes -DARG2=no fred@test.ex -**** -# plus pid + ms -exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=no -DARG1=yes -DARG2=yes fred@test.ex -**** -# plus pid + tz + ms -exim -DLOG_SELECTOR="+millisec +pid" -DTIMES=yes -DARG1=yes -DARG2=yes fred@test.ex +exim -qq **** # +# +killdaemon no_msglog_check + diff --git a/test/scripts/0000-Basic/0618 b/test/scripts/0000-Basic/0618 index 69a53c691..d43d13ca6 100644 --- a/test/scripts/0000-Basic/0618 +++ b/test/scripts/0000-Basic/0618 @@ -1,180 +1,57 @@ -# DSN ESMTP extension RCPT options +# free of local_part_data, domain_data, sender_data # -# Server does not advertise by default -exim -DSERVER=server -bd -oX PORT_D -**** -client 127.0.0.1 PORT_D -??? 220 -EHLO testclient -??? 250- -??? 250-SIZE -??? 250 HELP -**** -killdaemon -# -# -# Server does advertise when told. Client requests no bounces, and this one gets a reject. -exim -DSERVER=server -DOPT=y -bd -oX PORT_D -**** -exim -z rej/never -**** -client HOSTIPV4 PORT_D -??? 220 -EHLO testclient -??? 250- -??? 250-SIZE -??? 250-DSN -??? 250 HELP -MAIL FROM:<a@dump.ex> -??? 250 -RCPT TO:<any@test.ex> NOTIFY=foo -??? 501 -RCPT TO:<rmt_reject@test.ex> NOTIFY=never -??? 250 +exim -bh 99.99.99.99 +HELO tester +MAIL FROM:<a@test.ex> +RCPT TO:<fred@good1.ex> DATA -??? 354 -Subject: test . -??? 250 -QUIT -??? 221 -**** -exim -q -**** -# -# Client requests delivery notification; the server supports DSN so takes responsibility -exim -z accept/success -**** -client HOSTIPV4 PORT_D -??? 220 -EHLO testclient -??? 250- -??? 250-SIZE -??? 250-DSN -??? 250 HELP -MAIL FROM:<b@dump.ex> -??? 250 -RCPT TO:<rmt_accept@test.ex> NOTIFY=success -??? 250 +RSET +MAIL FROM:<b@test.ex> +RCPT TO:<jim@good2.ex> DATA -??? 354 -Subject: test . -??? 250 QUIT -??? 221 -**** -# MSA send msg to MDA -exim -q -**** -# deliver msg at MDA -exim -q -**** -# deliver notification from MDA -exim -q **** # -# Client requests notification of deferral. First time of trying, we get -# a defer but queue-time probably has not hit the 1st retry time yet, so no DSN -# will be sent and the message remains queued. Then, claiming time has elapsed, -# we will look again (expecting a delay-DSN to be produced). We won't see a -# retry since the actual retry time has not passed. -exim -z defer/delay +# +exim -bd -DSERVER=server -oX PORT_D **** -client HOSTIPV4 PORT_D +client 127.0.0.1 PORT_D ??? 220 -EHLO testclient -??? 250- -??? 250-SIZE -??? 250-DSN -??? 250 HELP -MAIL FROM:<c@dump.ex> +HELO tester ??? 250 -RCPT TO:<rmt_defer@test.ex> NOTIFY=delay +MAIL FROM:<a@test.ex> +??? 250 +RCPT TO:<fred@good1.ex> ??? 250 DATA ??? 354 -Subject: test . ??? 250 -QUIT -??? 221 -**** -exim -q -**** -# -# Clients requests no DSNs, and this one gets deferred -exim -z defer/never -**** -client HOSTIPV4 PORT_D -??? 220 -EHLO testclient -??? 250- -??? 250-SIZE -??? 250-DSN -??? 250 HELP -MAIL FROM:<d@dump.ex> +RSET ??? 250 -RCPT TO:<rmt_defer@test.ex> NOTIFY=never +MAIL FROM:<b@test.ex> +??? 250 +RCPT TO:<jim@good2.ex> ??? 250 DATA ??? 354 -Subject: test . ??? 250 QUIT -??? 221 -**** -exim -q -**** -# -# -# -# Second time, for the queued deferrals. -# We should see the notify for c@dump.ex but not d@dump.ex -exim -z playout -**** -exim -Tqt 10s/ -q **** -sleep 1 -exim -Mrm $msg1 $msg2 -**** -# -# +killdaemon # # -# Client requests bounce+delay notification; bounce happens -exim -z rej/failure+delay -**** -client HOSTIPV4 PORT_D -??? 220 -EHLO testclient -??? 250- -??? 250-SIZE -??? 250-DSN -??? 250 HELP -MAIL FROM:<e@dump.ex> -??? 250 -RCPT TO:<rmt_reject@test.ex> NOTIFY=fAiLuRe,DELAY -??? 250 +exim -bs +HELO tester +MAIL FROM:<a@test.ex> +RCPT TO:<fred@good1.ex> DATA -??? 354 -Subject: test . -??? 250 QUIT -??? 221 -**** -# MSA send msg to MDA -exim -q **** -# deliver notification from MDA -exim -z 'deliver DSN' -**** -exim -q -**** -sleep 1 -killdaemon # # no_msglog_check diff --git a/test/scripts/0000-Basic/0619 b/test/scripts/0000-Basic/0619 index 196b9dc0c..3715b125f 100644 --- a/test/scripts/0000-Basic/0619 +++ b/test/scripts/0000-Basic/0619 @@ -1,45 +1,69 @@ -# log_selector msg_id and msg_id_created +# domainlist match values # -# msg_id is on by default; check baseline -exim -DLOG_SELECTOR=+received_recipients -t -From: CALLER@test.ex -To: a@test.ex -Message-ID: original1235@example.com - -body +exim -bs -DOPT=: +HELO test +MAIL FROM:<testclient> +RCPT TO:<a@notmatched.ex> +QUIT **** # -# msg_id is on by default; check it can be disabled -exim -DLOG_SELECTOR=+received_recipients-msg_id -t -From: CALLER@test.ex -To: b@test.ex -Message-ID: original1235@example.com - -body +exim -bs '-DOPT=notthis : plainstring.ex : nothiseither' +HELO test +MAIL FROM:<testclient> +RCPT TO:<a@plainstring.ex> +QUIT **** # -# check msg_id_created shows invented ones -exim -DLOG_SELECTOR=+received_recipients+msg_id_created -t -From: CALLER@test.ex -To: c@test.ex - -body +exim -bs '-DOPT=notthis : *tail.ex : nothiseither' +HELO test +MAIL FROM:<testclient> +RCPT TO:<a@headtail.ex> +QUIT **** # -# check msg_id_created ignores non-invented ones -exim -DLOG_SELECTOR=+received_recipients+msg_id_created -t -From: CALLER@test.ex -To: d@test.ex -Message-ID: original1235@example.com - -body +exim -bs '-DOPT=notthis : ^.*r(e.)ex : nothiseither' +HELO test +MAIL FROM:<testclient> +RCPT TO:<a@headregextail.ex> +QUIT **** # -# check that bounces don't log created, by default -exim -DLOG_SELECTOR=+received_recipients -M $msg1 +exim -bs '-DOPT=notthis : @ : nothiseither' +HELO test +MAIL FROM:<testclient> +RCPT TO:<a@primaryhostname.ex> +QUIT **** -# and check they do with msg_id_created -exim -DLOG_SELECTOR=+received_recipients+msg_id_created -M $msg1 +# +# +exim -bs '-DOPT=notthis : @[] : nothiseither' +HELO test +MAIL FROM:<testclient> +RCPT TO:<a@[127.0.0.1]> +QUIT +**** +# +# malformed +exim -bs '-DOPT=notthis : @[] : nothiseither' +HELO test +MAIL FROM:<testclient> +RCPT TO:<a@127.0.0.1]> +QUIT +**** +# +# malformed +exim -bs '-DOPT=notthis : @[] : nothiseither' +HELO test +MAIL FROM:<testclient> +RCPT TO:<a@[127.0.0.1> +QUIT +**** +# +# +exim -bs '-DOPT=notthis : @mx_any/ignore=1.1.1.1 : nothiseither' +HELO test +MAIL FROM:<testclient> +RCPT TO:<a@mx46.test.ex> +QUIT **** # -no_msglog_check diff --git a/test/scripts/0000-Basic/0620 b/test/scripts/0000-Basic/0620 index 96d598834..09587750d 100644 --- a/test/scripts/0000-Basic/0620 +++ b/test/scripts/0000-Basic/0620 @@ -1,6 +1,18 @@ -# router variables -exim -odi a -Subject: foo - -body +# singlekey lookup ret-key +# +# baseline, get the data +exim -d-all+expand -bs '-DOPT=notthis : lsearch;DIR/aux-fixed/TESTNUM.lsearch : nothiseither' +HELO test +MAIL FROM:<testclient> +RCPT TO:<a@trythiskey.ex> +QUIT **** +# +# get the key +exim -d-all+expand -bs '-DOPT=notthis : lsearch,ret=key;DIR/aux-fixed/TESTNUM.lsearch : nothiseither' +HELO test +MAIL FROM:<testclient> +RCPT TO:<a@trythiskey.ex> +QUIT +**** +# diff --git a/test/scripts/0000-Basic/0622 b/test/scripts/0000-Basic/0622 deleted file mode 100644 index f3016f2cf..000000000 --- a/test/scripts/0000-Basic/0622 +++ /dev/null @@ -1,49 +0,0 @@ -# bounce_message_file and warn_message_file -# -exim -odf a@test.ex -Subject: test 1.1 - Default deny message -**** -exim -odf -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl b@test.ex -Subject: test 1.2 - Specified deny message file -**** -exim -odf -DOPT=DIR/aux-fixed/TESTNUM.nonexist.tmpl c@test.ex -Subject: test 1.3 - Specified, missing deny message file -**** -exim -odf -DOPT=relative_file_path d@test.ex -Subject: test 1.4 - Specified, non-absolute -**** -exim -odf -DOPT='$acl_m_unset' e@test.ex -Subject: test 1.5 - Specified, expansion empty -**** -exim -odf -DOPT='DIR/aux-fixed/TESTNUM.$sender_address' f@test.ex -Subject: test 1.6 - Specified, expansion tainted -**** -exim -odf -DOPT='${if ={0}{0} {DIR/aux-fixed/TESTNUM.bounce.tmpl}{bad}}' g@test.ex -Subject: test 1.7 - Specified, expansion good -**** -# -exim -odf delay_p@test.ex -Subject: test 2.1 - Default delay message -**** -exim -odf -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl delay_q@test.ex -Subject: test 2.2 - Specified delay message file -**** -exim -odf -DOPT=DIR/aux-fixed/TESTNUM.nonexist.tmpl delay_r@test.ex -Subject: test 2.3 - Specified, missing delay message file -**** -exim -odf -DOPT='${if ={0}{0} {DIR/aux-fixed/TESTNUM.bounce.tmpl}{bad}}' delay_s@test.ex -Subject: test 2.7 - Specified, expansion good -**** -sleep 1 -exim -M $msg1 -**** -exim -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl -M $msg2 -**** -exim -DOPT=DIR/aux-fixed/TESTNUM.nonexist.tmpl -M $msg3 -**** -exim -DOPT=DIR/aux-fixed/TESTNUM.bounce.tmpl -M $msg4 -**** -sleep 1 -# -# -no_msglog_check diff --git a/test/scripts/0000-Basic/0623 b/test/scripts/0000-Basic/0623 deleted file mode 100644 index d43d13ca6..000000000 --- a/test/scripts/0000-Basic/0623 +++ /dev/null @@ -1,57 +0,0 @@ -# free of local_part_data, domain_data, sender_data -# -exim -bh 99.99.99.99 -HELO tester -MAIL FROM:<a@test.ex> -RCPT TO:<fred@good1.ex> -DATA -. -RSET -MAIL FROM:<b@test.ex> -RCPT TO:<jim@good2.ex> -DATA -. -QUIT -**** -# -# -exim -bd -DSERVER=server -oX PORT_D -**** -client 127.0.0.1 PORT_D -??? 220 -HELO tester -??? 250 -MAIL FROM:<a@test.ex> -??? 250 -RCPT TO:<fred@good1.ex> -??? 250 -DATA -??? 354 -. -??? 250 -RSET -??? 250 -MAIL FROM:<b@test.ex> -??? 250 -RCPT TO:<jim@good2.ex> -??? 250 -DATA -??? 354 -. -??? 250 -QUIT -**** -killdaemon -# -# -exim -bs -HELO tester -MAIL FROM:<a@test.ex> -RCPT TO:<fred@good1.ex> -DATA -. -QUIT -**** -# -# -no_msglog_check diff --git a/test/scripts/0000-Basic/0624 b/test/scripts/0000-Basic/0624 deleted file mode 100644 index 3715b125f..000000000 --- a/test/scripts/0000-Basic/0624 +++ /dev/null @@ -1,69 +0,0 @@ -# domainlist match values -# -exim -bs -DOPT=: -HELO test -MAIL FROM:<testclient> -RCPT TO:<a@notmatched.ex> -QUIT -**** -# -exim -bs '-DOPT=notthis : plainstring.ex : nothiseither' -HELO test -MAIL FROM:<testclient> -RCPT TO:<a@plainstring.ex> -QUIT -**** -# -exim -bs '-DOPT=notthis : *tail.ex : nothiseither' -HELO test -MAIL FROM:<testclient> -RCPT TO:<a@headtail.ex> -QUIT -**** -# -exim -bs '-DOPT=notthis : ^.*r(e.)ex : nothiseither' -HELO test -MAIL FROM:<testclient> -RCPT TO:<a@headregextail.ex> -QUIT -**** -# -exim -bs '-DOPT=notthis : @ : nothiseither' -HELO test -MAIL FROM:<testclient> -RCPT TO:<a@primaryhostname.ex> -QUIT -**** -# -# -exim -bs '-DOPT=notthis : @[] : nothiseither' -HELO test -MAIL FROM:<testclient> -RCPT TO:<a@[127.0.0.1]> -QUIT -**** -# -# malformed -exim -bs '-DOPT=notthis : @[] : nothiseither' -HELO test -MAIL FROM:<testclient> -RCPT TO:<a@127.0.0.1]> -QUIT -**** -# -# malformed -exim -bs '-DOPT=notthis : @[] : nothiseither' -HELO test -MAIL FROM:<testclient> -RCPT TO:<a@[127.0.0.1> -QUIT -**** -# -# -exim -bs '-DOPT=notthis : @mx_any/ignore=1.1.1.1 : nothiseither' -HELO test -MAIL FROM:<testclient> -RCPT TO:<a@mx46.test.ex> -QUIT -**** -# diff --git a/test/scripts/0000-Basic/0625 b/test/scripts/0000-Basic/0625 deleted file mode 100644 index 09587750d..000000000 --- a/test/scripts/0000-Basic/0625 +++ /dev/null @@ -1,18 +0,0 @@ -# singlekey lookup ret-key -# -# baseline, get the data -exim -d-all+expand -bs '-DOPT=notthis : lsearch;DIR/aux-fixed/TESTNUM.lsearch : nothiseither' -HELO test -MAIL FROM:<testclient> -RCPT TO:<a@trythiskey.ex> -QUIT -**** -# -# get the key -exim -d-all+expand -bs '-DOPT=notthis : lsearch,ret=key;DIR/aux-fixed/TESTNUM.lsearch : nothiseither' -HELO test -MAIL FROM:<testclient> -RCPT TO:<a@trythiskey.ex> -QUIT -**** -# |