Fix validation of log actions with $macros in SPRE

Macro expansion allowed in log action specifications.
sonertari · Nov 16, 2021 · d62d1d1 · d62d1d1
1 parent 86c3f1c
commit d62d1d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Doxyfile b/Doxyfile
@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = "UTM Firewall"
-PROJECT_NUMBER         = 7.0
+PROJECT_NUMBER         = 7.0.1
 PROJECT_BRIEF          =
 PROJECT_LOGO           =
 OUTPUT_DIRECTORY       = ./src/View/docs

diff --git a/src/Model/validate.php b/src/Model/validate.php
@@ -148,7 +148,7 @@
 define('SPRE_IP', "^(${RE_IP}[*]{0,1}|$RE_MACRO_VAR|$SPRE_ALLNONE)$");
 define('SPRE_PORT', "^(\d{1,5}[*]{0,1}|$RE_MACRO_VAR|$SPRE_ALLNONE)$");
 define('SPRE_HOST', "^([\w.\/_*]{1,100}|${RE_IP}[*]{0,1}|$RE_MACRO_VAR|$SPRE_ALLNONE)$");
-define('SPRE_LOG', "^([!]{0,1}(connect|master|cert|content|pcap|mirror)|$SPRE_ALLNONE)$");
+define('SPRE_LOG', "^([!]{0,1}(connect|master|cert|content|pcap|mirror)|$RE_MACRO_VAR|$SPRE_ALLNONE)$");
 define('SPRE_PROTO', "^(tcp|ssl|http|https|pop3|pop3s|smtp|smtps|autossl)$");
 define('SPRE_NATENGINE', "^(pf|ipfw|netfilter|tproxy)$");
 ?>