Rework the priority of bl/wl in eval

3 files changed, 32 insertions, 7 deletions

diff --git a/src/tests/config/eval_whitelist_blacklist.ini b/src/tests/config/eval_whitelist_blacklist.ini
new file mode 100644
index 0000000..a916004
--- /dev/null
+++ b/src/tests/config/eval_whitelist_blacklist.ini
@@ -0,0 +1,2 @@
+sp.eval_blacklist.list("my_fun,cos");
+sp.eval_whitelist.list("my_fun");
diff --git a/src/tests/eval_backlist_whitelist.phpt b/src/tests/eval_backlist_whitelist.phpt
index 1611288..9b0bb55 100644
--- a/src/tests/eval_backlist_whitelist.phpt
+++ b/src/tests/eval_backlist_whitelist.phpt
@@ -3,25 +3,21 @@ Eval whitelist
 --SKIPIF--
 <?php if (!extension_loaded("snuffleupagus")) die "skip"; ?>
 --INI--
-sp.configuration_file={PWD}/config/eval_whitelist.ini
+sp.configuration_file={PWD}/config/eval_whitelist_blacklist.ini
 --FILE--
 <?php 
 function my_fun($p) {
         return "my_fun: $p";
 }
 
-function my_other_fun($p) {
-        return "my_other_fun: $p";
-}
-
 $a = my_fun("1337 1337 1337");
 echo "Outside of eval: $a\n";
 eval('$a = my_fun("1234");');
 echo "After allowed eval: $a\n";
-eval('$a = my_other_fun("1234");');
+eval('$a = cos(1234);');
 echo "After eval: $a\n";
 ?>
 --EXPECTF--
 Outside of eval: my_fun: 1337 1337 1337
 After allowed eval: my_fun: 1234
-[snuffleupagus][0.0.0.0][Eval_whitelist][drop] The function 'my_other_fun' isn't in the eval whitelist, dropping its call.
+[snuffleupagus][0.0.0.0][Eval_whitelist][drop] The function 'cos' isn't in the eval whitelist, dropping its call.
diff --git a/src/tests/eval_whitelist.phpt b/src/tests/eval_whitelist.phpt
new file mode 100644
index 0000000..1611288
--- /dev/null
+++ b/src/tests/eval_whitelist.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Eval whitelist
+--SKIPIF--
+<?php if (!extension_loaded("snuffleupagus")) die "skip"; ?>
+--INI--
+sp.configuration_file={PWD}/config/eval_whitelist.ini
+--FILE--
+<?php 
+function my_fun($p) {
+        return "my_fun: $p";
+}
+
+function my_other_fun($p) {
+        return "my_other_fun: $p";
+}
+
+$a = my_fun("1337 1337 1337");
+echo "Outside of eval: $a\n";
+eval('$a = my_fun("1234");');
+echo "After allowed eval: $a\n";
+eval('$a = my_other_fun("1234");');
+echo "After eval: $a\n";
+?>
+--EXPECTF--
+Outside of eval: my_fun: 1337 1337 1337
+After allowed eval: my_fun: 1234
+[snuffleupagus][0.0.0.0][Eval_whitelist][drop] The function 'my_other_fun' isn't in the eval whitelist, dropping its call.