From 92a4b93c4d420fefe590bd88521ec76d8bebd3fe Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Tue, 24 Oct 2017 00:16:30 +0200
Subject: Remove the `enable` member from the disable function structure

Also add some more tests
---
 src/tests/config/config_disabled_functions_param_r.ini | 1 +
 src/tests/config/disabled_functions_pos.ini            | 1 +
 src/tests/config/disabled_functions_ret.ini            | 1 +
 src/tests/disabled_functions_param_pos.phpt            | 3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/tests')

diff --git a/src/tests/config/config_disabled_functions_param_r.ini b/src/tests/config/config_disabled_functions_param_r.ini
index 8e9ac63..09a59fe 100644
--- a/src/tests/config/config_disabled_functions_param_r.ini
+++ b/src/tests/config/config_disabled_functions_param_r.ini
@@ -1 +1,2 @@
+sp.disable_function.function("system").param_r("^not_command$").value("id").drop();
 sp.disable_function.function("system").param_r("^command$").value("id").drop();
diff --git a/src/tests/config/disabled_functions_pos.ini b/src/tests/config/disabled_functions_pos.ini
index f96cf3d..e7d12a9 100644
--- a/src/tests/config/disabled_functions_pos.ini
+++ b/src/tests/config/disabled_functions_pos.ini
@@ -1 +1,2 @@
+sp.disable_function.function("system").pos("1337").value("id").drop();
 sp.disable_function.function("system").pos("0").value("id").drop();
diff --git a/src/tests/config/disabled_functions_ret.ini b/src/tests/config/disabled_functions_ret.ini
index 4afcd34..288177a 100644
--- a/src/tests/config/disabled_functions_ret.ini
+++ b/src/tests/config/disabled_functions_ret.ini
@@ -1,4 +1,5 @@
 sp.disable_function.function("testFunction").ret("0").drop().disable();
+sp.disable_function.function("strpos").ret("0").drop().filename_r(".*\\.not_matching");
 sp.disable_function.function("strpos").ret("0").drop().filename_r(".*\\.php");
 sp.disable_function.function_r("str[ia]pos").ret_r("^[^a-z]+$").drop();
 sp.disable_function.function_r("stripos").ret_r("^[^a-z]+").drop();
diff --git a/src/tests/disabled_functions_param_pos.phpt b/src/tests/disabled_functions_param_pos.phpt
index de578b2..a1f8895 100644
--- a/src/tests/disabled_functions_param_pos.phpt
+++ b/src/tests/disabled_functions_param_pos.phpt
@@ -9,4 +9,5 @@ sp.configuration_file={PWD}/config/disabled_functions_pos.ini
 system("id");
 ?>
 --EXPECTF--
-[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'system' in %a/disabled_functions_param_pos.php:%d has been disabled, because its argument 'command' content (id) matched a rule.
+[snuffleupagus][0.0.0.0][config][error] It seems that you wrote a rule filtering on the 0th argument of the function 'system', but it takes only 2 arguments. Matching on _all_ arguments instead.
+[snuffleupagus][0.0.0.0][disabled_function][drop] The call to the function 'system' in %a/disabled_functions_param_pos.php:2 has been disabled, because its argument 'command' content (id) matched a rule.
-- 
cgit v1.3