summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/sp_config_keywords.c3
-rw-r--r--src/tests/upload_validation/upload_validation_no_exec.phpt7
2 files changed, 4 insertions, 6 deletions
diff --git a/src/sp_config_keywords.c b/src/sp_config_keywords.c
index cbe4966..138da75 100644
--- a/src/sp_config_keywords.c
+++ b/src/sp_config_keywords.c
@@ -429,9 +429,6 @@ SP_PARSE_FN(parse_upload_validation) {
429 } else if (-1 == access(ZSTR_VAL(cfg->script), F_OK)) { 429 } else if (-1 == access(ZSTR_VAL(cfg->script), F_OK)) {
430 sp_log_err("config", "The `script` (%s) doesn't exist on line %zu", ZSTR_VAL(cfg->script), parsed_rule->lineno); 430 sp_log_err("config", "The `script` (%s) doesn't exist on line %zu", ZSTR_VAL(cfg->script), parsed_rule->lineno);
431 return SP_PARSER_ERROR; 431 return SP_PARSER_ERROR;
432 } else if (-1 == access(ZSTR_VAL(cfg->script), X_OK)) {
433 sp_log_err("config", "The `script` (%s) isn't executable on line %zu", ZSTR_VAL(cfg->script), parsed_rule->lineno);
434 return SP_PARSER_ERROR;
435 } 432 }
436 433
437 return SP_PARSER_STOP; 434 return SP_PARSER_STOP;
diff --git a/src/tests/upload_validation/upload_validation_no_exec.phpt b/src/tests/upload_validation/upload_validation_no_exec.phpt
index b198bda..ff3dc14 100644
--- a/src/tests/upload_validation/upload_validation_no_exec.phpt
+++ b/src/tests/upload_validation/upload_validation_no_exec.phpt
@@ -4,6 +4,7 @@ Upload a file, validation script not executable
4file_uploads=1 4file_uploads=1
5sp.configuration_file={PWD}/config/upload_validation_non_exec.ini 5sp.configuration_file={PWD}/config/upload_validation_non_exec.ini
6output_buffering=off 6output_buffering=off
7expose_php=0
7--POST_RAW-- 8--POST_RAW--
8Content-Type: multipart/form-data; boundary=blabla 9Content-Type: multipart/form-data; boundary=blabla
9--blabla 10--blabla
@@ -14,6 +15,6 @@ Content-Disposition: form-data; name="test"; filename="test.php"
14var_dump($_FILES); 15var_dump($_FILES);
15?> 16?>
16--EXPECTF-- 17--EXPECTF--
17Fatal error: [snuffleupagus][0.0.0.0][config][log] Invalid configuration file in Unknown on line 0 18Warning: [snuffleupagus][0.0.0.0][upload_validation][log] Could not call '%s' : Permission denied %s
18 19%a
19Fatal error: [snuffleupagus][0.0.0.0][config][log] The `script` (tests/data/upload_no_exec.sh) isn't executable on line 1 in Unknown on line 0 20Fatal error: [snuffleupagus][0.0.0.0][upload_validation][drop] The upload %s was rejected. in Unknown on line 0