Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Vladishev <aleksander.vladishev@zabbix.com>2021-05-26 19:25:39 +0300
committerAlexander Vladishev <aleksander.vladishev@zabbix.com>2021-05-26 19:25:39 +0300
commit6531fa6cff888cc8d571e107b5d275b9ae969359 (patch)
treeb93f058ef79ccf92809e40159a705c03b3bdafa7 /ui/app/controllers
parent4ce2dd023bbf11c14529288690c7950b96bd6493 (diff)
A......... [ZBX-19461] more strict validation of the lld and user macros in the quoted history function parameters
Diffstat (limited to 'ui/app/controllers')
-rw-r--r--ui/app/controllers/CControllerPopupTriggerExpr.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/ui/app/controllers/CControllerPopupTriggerExpr.php b/ui/app/controllers/CControllerPopupTriggerExpr.php
index bf1cccd6d45..8d23c349775 100644
--- a/ui/app/controllers/CControllerPopupTriggerExpr.php
+++ b/ui/app/controllers/CControllerPopupTriggerExpr.php
@@ -1085,7 +1085,10 @@ class CControllerPopupTriggerExpr extends CController {
protected function doAction() {
$expression_parser = new CExpressionParser(['lldmacros' => true]);
- $expression_validator = new CExpressionValidator(['partial' => true]);
+ $expression_validator = new CExpressionValidator([
+ 'lldmacros' => true,
+ 'partial' => true
+ ]);
$itemid = $this->getInput('itemid', 0);
$function = $this->getInput('function', 'last');