diff options
| author | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2021-06-25 10:02:47 +0200 |
|---|---|---|
| committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2021-06-25 10:02:47 +0200 |
| commit | 20395676aba7fa5eb9a2c5e0b9f582ec2b3e71e4 (patch) | |
| tree | 1eb151ea700b1a24dc3d6635efc10c098d58f444 /test | |
| parent | 1013a770f1be6eff05c4b835bb92b2c916fdd341 (diff) | |
| parent | 305c0579ab4286b464c2cd589843a7e60f59dfaf (diff) | |
Merge branch 'hs/taintwarn'
This is a "forward" port of the taintwarn patches that are applied to
4.94.2+fixes.
Diffstat (limited to 'test')
| -rw-r--r-- | test/aux-fixed/0990/example.com | 1 | ||||
| -rw-r--r-- | test/confs/0990 | 2 | ||||
| -rw-r--r-- | test/log/0608 | 2 | ||||
| -rw-r--r-- | test/paniclog/0608 | 2 | ||||
| -rw-r--r-- | test/scripts/0990-Allow-Tainted-Data/0990 | 7 | ||||
| -rw-r--r-- | test/scripts/0990-Allow-Tainted-Data/REQUIRES | 1 | ||||
| -rw-r--r-- | test/stderr/0608 | 2 | ||||
| -rw-r--r-- | test/stderr/0990 | 3 | ||||
| -rw-r--r-- | test/stdout/0990 | 4 |
9 files changed, 21 insertions, 3 deletions
diff --git a/test/aux-fixed/0990/example.com b/test/aux-fixed/0990/example.com new file mode 100644 index 000000000..b5860744c --- /dev/null +++ b/test/aux-fixed/0990/example.com @@ -0,0 +1 @@ +hans diff --git a/test/confs/0990 b/test/confs/0990 new file mode 100644 index 000000000..076a39914 --- /dev/null +++ b/test/confs/0990 @@ -0,0 +1,2 @@ +# this is the default +allow_insecure_tainted_data = ALLOW_TAINTED diff --git a/test/log/0608 b/test/log/0608 index 5331ae48f..d0130a6a9 100644 --- a/test/log/0608 +++ b/test/log/0608 @@ -35,7 +35,7 @@ 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Completed 2017-07-30 18:51:05.712 10HmbA-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for f@test.ex 2017-07-30 18:51:05.712 10HmbA-0005vi-00 ** f@test.ex: Unrouteable address -2017-07-30 18:51:05.712 10HmbA-0005vi-00 bounce_message_file is not untainted after expansion: 'TESTSUITE/aux-fixed/0608.CALLER@myhost.test.ex' +2017-07-30 18:51:05.712 10HmbA-0005vi-00 Tainted bounce_message_file after expansion: 'TESTSUITE/aux-fixed/0608.CALLER@myhost.test.ex' 2017-07-30 18:51:05.712 10HmbJ-0005vi-00 <= <> R=10HmbA-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@myhost.test.ex 2017-07-30 18:51:05.712 10HmbJ-0005vi-00 => CALLER <CALLER@myhost.test.ex> R=bounces T=savebounce diff --git a/test/paniclog/0608 b/test/paniclog/0608 index 0cf96cfdc..aa9fc2b48 100644 --- a/test/paniclog/0608 +++ b/test/paniclog/0608 @@ -3,6 +3,6 @@ 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Failed to expand bounce_message_file: '$acl_m_unset' -2017-07-30 18:51:05.712 10HmbA-0005vi-00 bounce_message_file is not untainted after expansion: 'TESTSUITE/aux-fixed/0608.CALLER@myhost.test.ex' +2017-07-30 18:51:05.712 10HmbA-0005vi-00 Tainted bounce_message_file after expansion: 'TESTSUITE/aux-fixed/0608.CALLER@myhost.test.ex' 2017-07-30 18:51:05.712 10HmbB-0005vi-00 Failed to open TESTSUITE/aux-fixed/0608.nonexist.tmpl for warning message texts: No such file or directory diff --git a/test/scripts/0990-Allow-Tainted-Data/0990 b/test/scripts/0990-Allow-Tainted-Data/0990 new file mode 100644 index 000000000..87cf4c009 --- /dev/null +++ b/test/scripts/0990-Allow-Tainted-Data/0990 @@ -0,0 +1,7 @@ +# Allow insecure tainted data +exim -DALLOW_TAINTED=no -f hans@example.com -be +${lookup{$sender_address_local_part}lsearch{DIR/aux-fixed/0990/$sender_address_domain}{yes}{no}} +**** +exim -DALLOW_TAINTED=yes -f hans@example.com -be +${lookup{$sender_address_local_part}lsearch{DIR/aux-fixed/0990/$sender_address_domain}{yes}{no}} +**** diff --git a/test/scripts/0990-Allow-Tainted-Data/REQUIRES b/test/scripts/0990-Allow-Tainted-Data/REQUIRES new file mode 100644 index 000000000..5fabbded0 --- /dev/null +++ b/test/scripts/0990-Allow-Tainted-Data/REQUIRES @@ -0,0 +1 @@ +feature _OPT_MAIN_ALLOW_INSECURE_TAINTED_DATA diff --git a/test/stderr/0608 b/test/stderr/0608 index 0cf96cfdc..aa9fc2b48 100644 --- a/test/stderr/0608 +++ b/test/stderr/0608 @@ -3,6 +3,6 @@ 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Failed to expand bounce_message_file: '$acl_m_unset' -2017-07-30 18:51:05.712 10HmbA-0005vi-00 bounce_message_file is not untainted after expansion: 'TESTSUITE/aux-fixed/0608.CALLER@myhost.test.ex' +2017-07-30 18:51:05.712 10HmbA-0005vi-00 Tainted bounce_message_file after expansion: 'TESTSUITE/aux-fixed/0608.CALLER@myhost.test.ex' 2017-07-30 18:51:05.712 10HmbB-0005vi-00 Failed to open TESTSUITE/aux-fixed/0608.nonexist.tmpl for warning message texts: No such file or directory diff --git a/test/stderr/0990 b/test/stderr/0990 new file mode 100644 index 000000000..3feb126f7 --- /dev/null +++ b/test/stderr/0990 @@ -0,0 +1,3 @@ +1999-03-02 09:44:33 Tainted filename for search: 'TESTSUITE/aux-fixed/0990/example.com' +1999-03-02 09:44:33 Warning: Tainted filename for search: 'TESTSUITE/aux-fixed/0990/example.com' +1999-03-02 09:44:33 Warning: Tainted filename 'TESTSUITE/aux-fixed/0990/example.com' diff --git a/test/stdout/0990 b/test/stdout/0990 new file mode 100644 index 000000000..5a4290afd --- /dev/null +++ b/test/stdout/0990 @@ -0,0 +1,4 @@ +> Failed: (null) +> +> yes +> |