diff options
| author | jvoisin | 2017-10-23 23:08:14 +0200 |
|---|---|---|
| committer | jvoisin | 2017-10-23 23:08:14 +0200 |
| commit | 2c4251457f519e02bda073cbeb88c6d9778fa9ba (patch) | |
| tree | e2e6fb764c45c5089889869826fa25cb5730e77b | |
| parent | 970d12baa847455ac96d734332b7dad9638c7146 (diff) | |
Add some tests for upload validation and fix a related typo
| -rw-r--r-- | src/sp_upload_validation.c | 2 | ||||
| -rw-r--r-- | src/tests/upload_validation_invalid.phpt | 2 | ||||
| -rw-r--r-- | src/tests/upload_validation_ko.phpt | 2 | ||||
| -rw-r--r-- | src/tests/upload_validation_ko_simulation.phpt | 15 |
4 files changed, 18 insertions, 3 deletions
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) { | |||
| 79 | if (WEXITSTATUS(waitstatus) != 0) { // Nope | 79 | if (WEXITSTATUS(waitstatus) != 0) { // Nope |
| 80 | char *uri = sp_getenv("REQUEST_URI"); | 80 | char *uri = sp_getenv("REQUEST_URI"); |
| 81 | int sim = SNUFFLEUPAGUS_G(config).config_upload_validation->simulation; | 81 | int sim = SNUFFLEUPAGUS_G(config).config_upload_validation->simulation; |
| 82 | sp_log_msg("upload_valiation", sim?SP_LOG_SIMULATION:SP_LOG_DROP, | 82 | sp_log_msg("upload_validation", sim?SP_LOG_SIMULATION:SP_LOG_DROP, |
| 83 | "The upload of %s on %s was rejected.", filename, uri?uri:"?"); | 83 | "The upload of %s on %s was rejected.", filename, uri?uri:"?"); |
| 84 | if (!SNUFFLEUPAGUS_G(config).config_upload_validation->simulation) { | 84 | if (!SNUFFLEUPAGUS_G(config).config_upload_validation->simulation) { |
| 85 | zend_bailout(); | 85 | 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; | |||
| 14 | ?> | 14 | ?> |
| 15 | --EXPECTF-- | 15 | --EXPECTF-- |
| 16 | [snuffleupagus][0.0.0.0][upload_validation][error] Could not call './tests/data/upload_invalid.sh' : Exec format error | 16 | [snuffleupagus][0.0.0.0][upload_validation][error] Could not call './tests/data/upload_invalid.sh' : Exec format error |
| 17 | [snuffleupagus][0.0.0.0][upload_valiation][drop] The upload of test.php on ? was rejected. | 17 | [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" | |||
| 11 | --blabla-- | 11 | --blabla-- |
| 12 | --FILE-- | 12 | --FILE-- |
| 13 | --EXPECTF-- | 13 | --EXPECTF-- |
| 14 | [snuffleupagus][0.0.0.0][upload_valiation][drop] The upload of test.php on ? was rejected. | 14 | [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 @@ | |||
| 1 | --TEST-- | ||
| 2 | Upload a file, validation ko, simulation | ||
| 3 | --INI-- | ||
| 4 | file_uploads=1 | ||
| 5 | sp.configuration_file={PWD}/config/upload_validation_ko_simulation.ini | ||
| 6 | output_buffering=off | ||
| 7 | --POST_RAW-- | ||
| 8 | Content-Type: multipart/form-data; boundary=blabla | ||
| 9 | --blabla | ||
| 10 | Content-Disposition: form-data; name="test"; filename="test.php" | ||
| 11 | --blabla-- | ||
| 12 | --FILE-- | ||
| 13 | <?php echo 1337; ?> | ||
| 14 | --EXPECTF-- | ||
| 15 | 1337 | ||
