From e79f7e3bd992c7f0915ef9afe7afb6d79740527a Mon Sep 17 00:00:00 2001 From: jvoisin Date: Mon, 14 Jan 2019 19:29:25 +0000 Subject: Reorganize the testsuite Splitting the testsuite in several components makes it easier to manage and comprehend. This was also needed some some tests aren't passing on Alpine Linux, but we still want to run as many of them as we can on this platform.--- .../upload_validation/config/upload_validation.ini | 2 + .../config/upload_validation_invalid.ini | 1 + .../config/upload_validation_ko.ini | 1 + .../config/upload_validation_ko_simulation.ini | 1 + .../config/upload_validation_no_exist.ini | 1 + .../config/upload_validation_non_exec.ini | 1 + .../config/upload_validation_ok.ini | 1 + .../config/upload_validation_real.ini | 1 + src/tests/upload_validation/upload_validation.phpt | 18 +++++++++ .../upload_validation_invalid.phpt | 21 +++++++++++ .../upload_validation/upload_validation_ko.phpt | 14 +++++++ .../upload_validation_ko_simulation.phpt | 16 ++++++++ .../upload_validation_no_exec.phpt | 19 ++++++++++ .../upload_validation_nocrash.phpt | 12 ++++++ .../upload_validation/upload_validation_ok.phpt | 17 +++++++++ .../upload_validation/upload_validation_real.phpt | 44 ++++++++++++++++++++++ 16 files changed, 170 insertions(+) create mode 100644 src/tests/upload_validation/config/upload_validation.ini create mode 100644 src/tests/upload_validation/config/upload_validation_invalid.ini create mode 100644 src/tests/upload_validation/config/upload_validation_ko.ini create mode 100644 src/tests/upload_validation/config/upload_validation_ko_simulation.ini create mode 100644 src/tests/upload_validation/config/upload_validation_no_exist.ini create mode 100644 src/tests/upload_validation/config/upload_validation_non_exec.ini create mode 100644 src/tests/upload_validation/config/upload_validation_ok.ini create mode 100644 src/tests/upload_validation/config/upload_validation_real.ini create mode 100644 src/tests/upload_validation/upload_validation.phpt create mode 100644 src/tests/upload_validation/upload_validation_invalid.phpt create mode 100644 src/tests/upload_validation/upload_validation_ko.phpt create mode 100644 src/tests/upload_validation/upload_validation_ko_simulation.phpt create mode 100644 src/tests/upload_validation/upload_validation_no_exec.phpt create mode 100644 src/tests/upload_validation/upload_validation_nocrash.phpt create mode 100644 src/tests/upload_validation/upload_validation_ok.phpt create mode 100644 src/tests/upload_validation/upload_validation_real.phpt (limited to 'src/tests/upload_validation') diff --git a/src/tests/upload_validation/config/upload_validation.ini b/src/tests/upload_validation/config/upload_validation.ini new file mode 100644 index 0000000..0646134 --- /dev/null +++ b/src/tests/upload_validation/config/upload_validation.ini @@ -0,0 +1,2 @@ +sp.upload_validation.script("tests/upload_ko.sh"); +sp.upload_validation.enable(); diff --git a/src/tests/upload_validation/config/upload_validation_invalid.ini b/src/tests/upload_validation/config/upload_validation_invalid.ini new file mode 100644 index 0000000..7a638a1 --- /dev/null +++ b/src/tests/upload_validation/config/upload_validation_invalid.ini @@ -0,0 +1 @@ +sp.upload_validation.script("./tests/data/upload_invalid.sh").enable(); diff --git a/src/tests/upload_validation/config/upload_validation_ko.ini b/src/tests/upload_validation/config/upload_validation_ko.ini new file mode 100644 index 0000000..b15977f --- /dev/null +++ b/src/tests/upload_validation/config/upload_validation_ko.ini @@ -0,0 +1 @@ +sp.upload_validation.script("./tests/data/upload_ko.sh").enable(); diff --git a/src/tests/upload_validation/config/upload_validation_ko_simulation.ini b/src/tests/upload_validation/config/upload_validation_ko_simulation.ini new file mode 100644 index 0000000..da56439 --- /dev/null +++ b/src/tests/upload_validation/config/upload_validation_ko_simulation.ini @@ -0,0 +1 @@ +sp.upload_validation.script("./tests/data/upload_ko.sh").enable().simulation(); diff --git a/src/tests/upload_validation/config/upload_validation_no_exist.ini b/src/tests/upload_validation/config/upload_validation_no_exist.ini new file mode 100644 index 0000000..24f81a5 --- /dev/null +++ b/src/tests/upload_validation/config/upload_validation_no_exist.ini @@ -0,0 +1 @@ +sp.upload_validation.script("fufufufufu").enable(); diff --git a/src/tests/upload_validation/config/upload_validation_non_exec.ini b/src/tests/upload_validation/config/upload_validation_non_exec.ini new file mode 100644 index 0000000..bdf0a57 --- /dev/null +++ b/src/tests/upload_validation/config/upload_validation_non_exec.ini @@ -0,0 +1 @@ +sp.upload_validation.script("tests/data/upload_no_exec.sh").enable(); diff --git a/src/tests/upload_validation/config/upload_validation_ok.ini b/src/tests/upload_validation/config/upload_validation_ok.ini new file mode 100644 index 0000000..5df8db8 --- /dev/null +++ b/src/tests/upload_validation/config/upload_validation_ok.ini @@ -0,0 +1 @@ +sp.upload_validation.script("./tests/data/upload_ok.sh").enable(); diff --git a/src/tests/upload_validation/config/upload_validation_real.ini b/src/tests/upload_validation/config/upload_validation_real.ini new file mode 100644 index 0000000..690e9bf --- /dev/null +++ b/src/tests/upload_validation/config/upload_validation_real.ini @@ -0,0 +1 @@ +sp.upload_validation.script("../scripts/upload_validation.php").enable(); diff --git a/src/tests/upload_validation/upload_validation.phpt b/src/tests/upload_validation/upload_validation.phpt new file mode 100644 index 0000000..1daebb6 --- /dev/null +++ b/src/tests/upload_validation/upload_validation.phpt @@ -0,0 +1,18 @@ +--TEST-- +Upload a file, validation ok, no simulation +--INI-- +file_uploads=1 +sp.configuration_file={PWD}/config/upload_validation.ini +--POST_RAW-- +Content-Type: multipart/form-data; boundary=blabla +--blabla +Content-Disposition: form-data; name="test"; filename="test.php" +--blabla-- +--FILE-- + +--EXPECTF-- +Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 + +Fatal error: [snuffleupagus][config] A rule can't be enabled and disabled on line 1 in Unknown on line 0 diff --git a/src/tests/upload_validation/upload_validation_invalid.phpt b/src/tests/upload_validation/upload_validation_invalid.phpt new file mode 100644 index 0000000..0dbdbbb --- /dev/null +++ b/src/tests/upload_validation/upload_validation_invalid.phpt @@ -0,0 +1,21 @@ +--TEST-- +Upload a file, invalid validation script +--INI-- +file_uploads=1 +sp.configuration_file={PWD}/config/upload_validation_invalid.ini +--POST_RAW-- +Content-Type: multipart/form-data; boundary=blabla +--blabla +Content-Disposition: form-data; name="test"; filename="test.php" +--blabla-- +--FILE-- + +--EXPECTF-- +Warning: [snuffleupagus][upload_validation] Could not call './tests/data/upload_invalid.sh' : Exec format error in Unknown on line 0 +X-Powered-By: PHP/%a +Content-type: text/html; charset=UTF-8%a +%a + +Fatal error: [snuffleupagus][upload_validation] The upload of test.php on ? was rejected. in Unknown on line 0 diff --git a/src/tests/upload_validation/upload_validation_ko.phpt b/src/tests/upload_validation/upload_validation_ko.phpt new file mode 100644 index 0000000..d632e60 --- /dev/null +++ b/src/tests/upload_validation/upload_validation_ko.phpt @@ -0,0 +1,14 @@ +--TEST-- +Upload a file, validation ko, no simulation +--INI-- +file_uploads=1 +sp.configuration_file={PWD}/config/upload_validation_ko.ini +output_buffering=off +--POST_RAW-- +Content-Type: multipart/form-data; boundary=blabla +--blabla +Content-Disposition: form-data; name="test"; filename="test.php" +--blabla-- +--FILE-- +--EXPECTF-- +Fatal error: [snuffleupagus][upload_validation] The upload of test.php on ? was rejected. in Unknown on line 0 \ No newline at end of file diff --git a/src/tests/upload_validation/upload_validation_ko_simulation.phpt b/src/tests/upload_validation/upload_validation_ko_simulation.phpt new file mode 100644 index 0000000..b47c405 --- /dev/null +++ b/src/tests/upload_validation/upload_validation_ko_simulation.phpt @@ -0,0 +1,16 @@ +--TEST-- +Upload a file, validation ko, simulation +--INI-- +file_uploads=1 +sp.configuration_file={PWD}/config/upload_validation_ko_simulation.ini +output_buffering=off +--POST_RAW-- +Content-Type: multipart/form-data; boundary=blabla +--blabla +Content-Disposition: form-data; name="test"; filename="test.php" +--blabla-- +--FILE-- + +--EXPECTF-- +Warning: [snuffleupagus][upload_validation] The upload of test.php on ? was rejected. in Unknown on line 0 +1337 \ No newline at end of file diff --git a/src/tests/upload_validation/upload_validation_no_exec.phpt b/src/tests/upload_validation/upload_validation_no_exec.phpt new file mode 100644 index 0000000..a6cde10 --- /dev/null +++ b/src/tests/upload_validation/upload_validation_no_exec.phpt @@ -0,0 +1,19 @@ +--TEST-- +Upload a file, validation script not executable +--INI-- +file_uploads=1 +sp.configuration_file={PWD}/config/upload_validation_non_exec.ini +output_buffering=off +--POST_RAW-- +Content-Type: multipart/form-data; boundary=blabla +--blabla +Content-Disposition: form-data; name="test"; filename="test.php" +--blabla-- +--FILE-- + +--EXPECTF-- +Fatal error: [snuffleupagus][config] Invalid configuration file in Unknown on line 0 + +Fatal error: [snuffleupagus][config] The `script` (tests/data/upload_no_exec.sh) isn't executable on line 1 in Unknown on line 0 diff --git a/src/tests/upload_validation/upload_validation_nocrash.phpt b/src/tests/upload_validation/upload_validation_nocrash.phpt new file mode 100644 index 0000000..6fa50d0 --- /dev/null +++ b/src/tests/upload_validation/upload_validation_nocrash.phpt @@ -0,0 +1,12 @@ +--TEST-- +Upload validation isn't crashing +--INI-- +file_uploads=1 +sp.configuration_file={PWD}/config/upload_validation_ok.ini +output_buffering=off +--FILE-- + +--EXPECTF-- +1 diff --git a/src/tests/upload_validation/upload_validation_ok.phpt b/src/tests/upload_validation/upload_validation_ok.phpt new file mode 100644 index 0000000..f9b5015 --- /dev/null +++ b/src/tests/upload_validation/upload_validation_ok.phpt @@ -0,0 +1,17 @@ +--TEST-- +Upload a file, validation ok, no simulation +--INI-- +file_uploads=1 +sp.configuration_file={PWD}/config/upload_validation_ok.ini +output_buffering=off +--POST_RAW-- +Content-Type: multipart/form-data; boundary=blabla +--blabla +Content-Disposition: form-data; name="test"; filename="test.php" +--blabla-- +--FILE-- + +--EXPECTF-- +1 diff --git a/src/tests/upload_validation/upload_validation_real.phpt b/src/tests/upload_validation/upload_validation_real.phpt new file mode 100644 index 0000000..a945c5f --- /dev/null +++ b/src/tests/upload_validation/upload_validation_real.phpt @@ -0,0 +1,44 @@ +--TEST-- +Upload a file, validation ok, with our real script, using vld +--SKIPIF-- += 70300) { + die("skip BROKEN with 7.3"); +} + +if (strpos(system(PHP_BINARY . " -d error_log=/dev/null -d extension=vld.so -m 2>/dev/null"), "vld") === FALSE) { + print "skip"; +} + +if (strpos(system(PHP_BINARY . " -d extension=vld.so -m 2>&1 | grep 'Unable to load'"), "Unable to load dynamic library 'vld.so'") !== FALSE) { + print "skip"; +} + +if (strpos(phpversion(), '-dev') !== FALSE) { + print 'skip'; +} +?> +--INI-- +file_uploads=1 +sp.configuration_file={PWD}/config/upload_validation_real.ini +output_buffering=off +--POST_RAW-- +Content-Type: multipart/form-data; boundary=blabla +--blabla +Content-Disposition: form-data; name="test"; filename="test.php" +Content-Type: text/plain + +Some random text that is not PHP + +Some random text again +--blabla-- +--FILE-- + +--EXPECTF-- +Fatal error: [snuffleupagus][upload_validation] The upload of test.php on ? was rejected. in Unknown on line 0 -- cgit v1.3