Support parentheses and negation in pf.conf macro values

sonertari · May 8, 2022 · a8a8af4 · a8a8af4
1 parent 84c04c6
commit a8a8af4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/Model/lib/Macro.php b/src/Model/lib/Macro.php
@@ -69,8 +69,6 @@ function sanitize()
 	{
 		$this->str= preg_replace('/{/', ' { ', $this->str);
 		$this->str= preg_replace('/}/', ' } ', $this->str);
-		$this->str= preg_replace('/\(/', ' ( ', $this->str);
-		$this->str= preg_replace('/\)/', ' ) ', $this->str);
 		$this->str= preg_replace('/,/', ' , ', $this->str);
 		$this->str= preg_replace('/=/', ' = ', $this->str);
 		$this->str= preg_replace('/"/', '', $this->str);

diff --git a/src/Model/validate.php b/src/Model/validate.php
@@ -35,7 +35,7 @@
 $RE_MACRO_VAR= '\$' . $RE_ID;
 
 /// @todo What are possible macro values?
-define('RE_MACRO_VALUE', '^((\w|\$)[\w_.\/\-*]{0,49}|)$');
+define('RE_MACRO_VALUE', '^((\w|\$|\(|!)[\w_.\/\-*\(\)]{0,49}|)$');
 
 $RE_IF_NAME= '\w{1,20}';
 $RE_IF_MODIF= '(|:(0|broadcast|network|peer))';