From 2c4251457f519e02bda073cbeb88c6d9778fa9ba Mon Sep 17 00:00:00 2001 From: jvoisin Date: Mon, 23 Oct 2017 23:08:14 +0200 Subject: Add some tests for upload validation and fix a related typo --- src/sp_upload_validation.c | 2 +- src/tests/upload_validation_invalid.phpt | 2 +- src/tests/upload_validation_ko.phpt | 2 +- src/tests/upload_validation_ko_simulation.phpt | 15 +++++++++++++++ 4 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 src/tests/upload_validation_ko_simulation.phpt (limited to 'src') diff --git a/src/sp_upload_validation.c b/src/sp_upload_validation.c index f3f8af4..731a737 100644 --- a/src/sp_upload_validation.c +++ b/src/sp_upload_validation.c @@ -79,7 +79,7 @@ int sp_rfc1867_callback(unsigned int event, void *event_data, void **extra) { if (WEXITSTATUS(waitstatus) != 0) { // Nope char *uri = sp_getenv("REQUEST_URI"); int sim = SNUFFLEUPAGUS_G(config).config_upload_validation->simulation; - sp_log_msg("upload_valiation", sim?SP_LOG_SIMULATION:SP_LOG_DROP, + sp_log_msg("upload_validation", sim?SP_LOG_SIMULATION:SP_LOG_DROP, "The upload of %s on %s was rejected.", filename, uri?uri:"?"); if (!SNUFFLEUPAGUS_G(config).config_upload_validation->simulation) { zend_bailout(); diff --git a/src/tests/upload_validation_invalid.phpt b/src/tests/upload_validation_invalid.phpt index f8c993b..25a6750 100644 --- a/src/tests/upload_validation_invalid.phpt +++ b/src/tests/upload_validation_invalid.phpt @@ -14,4 +14,4 @@ echo 1; ?> --EXPECTF-- [snuffleupagus][0.0.0.0][upload_validation][error] Could not call './tests/data/upload_invalid.sh' : Exec format error -[snuffleupagus][0.0.0.0][upload_valiation][drop] The upload of test.php on ? was rejected. +[snuffleupagus][0.0.0.0][upload_validation][drop] The upload of test.php on ? was rejected. diff --git a/src/tests/upload_validation_ko.phpt b/src/tests/upload_validation_ko.phpt index cf4057a..8579a17 100644 --- a/src/tests/upload_validation_ko.phpt +++ b/src/tests/upload_validation_ko.phpt @@ -11,4 +11,4 @@ Content-Disposition: form-data; name="test"; filename="test.php" --blabla-- --FILE-- --EXPECTF-- -[snuffleupagus][0.0.0.0][upload_valiation][drop] The upload of test.php on ? was rejected. +[snuffleupagus][0.0.0.0][upload_validation][drop] The upload of test.php on ? was rejected. diff --git a/src/tests/upload_validation_ko_simulation.phpt b/src/tests/upload_validation_ko_simulation.phpt new file mode 100644 index 0000000..d281411 --- /dev/null +++ b/src/tests/upload_validation_ko_simulation.phpt @@ -0,0 +1,15 @@ +--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-- +1337 -- cgit v1.3