removed upload script x-bit check at load time, thus allowing root-user to execute test cases

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) {
   } else if (-1 == access(ZSTR_VAL(cfg->script), F_OK)) {
     sp_log_err("config", "The `script` (%s) doesn't exist on line %zu", ZSTR_VAL(cfg->script), parsed_rule->lineno);
     return SP_PARSER_ERROR;
-  } else if (-1 == access(ZSTR_VAL(cfg->script), X_OK)) {
-    sp_log_err("config", "The `script` (%s) isn't executable on line %zu", ZSTR_VAL(cfg->script), parsed_rule->lineno);
-    return SP_PARSER_ERROR;
   }
 
   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
 file_uploads=1
 sp.configuration_file={PWD}/config/upload_validation_non_exec.ini
 output_buffering=off
+expose_php=0
 --POST_RAW--
 Content-Type: multipart/form-data; boundary=blabla
 --blabla
@@ -14,6 +15,6 @@ Content-Disposition: form-data; name="test"; filename="test.php"
 var_dump($_FILES);
 ?>
 --EXPECTF--
-Fatal error: [snuffleupagus][0.0.0.0][config][log] Invalid configuration file in Unknown on line 0
-
-Fatal 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
+Warning: [snuffleupagus][0.0.0.0][upload_validation][log] Could not call '%s' : Permission denied %s
+%a
+Fatal error: [snuffleupagus][0.0.0.0][upload_validation][drop] The upload %s was rejected. in Unknown on line 0