lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 16:14:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

IDS, code cleanup, use base methods for user defined rules. Thanks @fabianfrz

Browse Source
This commit is contained in:
AdSchellevis 2018-02-05 20:03:01 +00:00
parent b739c49892
commit fcdfdbf1bd
1 changed files with 17 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
src/opnsense/mvc/app/controllers/OPNsense/IDS/Api/SettingsController.php
View File

@ -548,72 +548,34 @@ class SettingsController extends ApiMutableModelControllerBase
/**
* search user defined rules
* @return array list of found user rules
* @throws \ReflectionException when not bound to model
*/
public function searchUserRuleAction()
{
$this->sessionClose();
$mdlIDS = $this->getModel();
$grid = new UIModelGrid($mdlIDS->userDefinedRules->rule);
return $grid->fetchBindRequest(
$this->request,
array("enabled", "action", "description"),
"description"
);
return $this->searchBase("userDefinedRules.rule", array("enabled", "action", "description"), "description");
}
/**
* update user defined rules
* @param string $uuid internal id
* @return array save result + validation output
* @throws \Phalcon\Validation\Exception
* @throws \Phalcon\Validation\Exception when field validations fail
* @throws \ReflectionException when not bound to model
*/
public function setUserRuleAction($uuid)
{
$result = array("result"=>"failed");
if ($this->request->isPost() && $this->request->hasPost("rule")) {
$mdlIDS = $this->getModel();
if ($uuid != null) {
$node = $mdlIDS->getNodeByReference('userDefinedRules.rule.'.$uuid);
if ($node != null) {
$node->setNodes($this->request->getPost("rule"));
$validations = $mdlIDS->validate($node->__reference, "rule");
if (count($validations)) {
$result['validations'] = $validations;
} else {
// serialize model to config and save
$mdlIDS->serializeToConfig();
Config::getInstance()->save();
$result["result"] = "saved";
}
}
}
}
return $result;
return $this->setBase("rule", "userDefinedRules.rule", $uuid);
}
/**
* add new user defined rule
* @return array save result + validation output
* @throws \Phalcon\Validation\Exception
* @throws \Phalcon\Validation\Exception when field validations fail
* @throws \ReflectionException when not bound to model
*/
public function addUserRuleAction()
{
$result = array("result"=>"failed");
if ($this->request->isPost() && $this->request->hasPost("rule")) {
$mdlIDS = $this->getModel();
$node = $mdlIDS->userDefinedRules->rule->Add();
$node->setNodes($this->request->getPost("rule"));
$validations = $mdlIDS->validate($node->__reference, "rule");
if (count($validations)) {
$result['validations'] = $validations;
} else {
// serialize model to config and save
$mdlIDS->serializeToConfig();
Config::getInstance()->save();
$result["result"] = "saved";
}
}
return $result;
return $this->addBase("rule", "userDefinedRules.rule");
}
/**
@ -623,70 +585,31 @@ class SettingsController extends ApiMutableModelControllerBase
*/
public function getUserRuleAction($uuid = null)
{
$mdlIDS = $this->getModel();
if ($uuid != null) {
$node = $mdlIDS->getNodeByReference('userDefinedRules.rule.'.$uuid);
if ($node != null) {
// return node
return array("rule" => $node->getNodes());
}
} else {
// generate new node, but don't save to disc
$node = $mdlIDS->userDefinedRules->rule->add();
return array("rule" => $node->getNodes());
}
return array();
return $this->getBase("rule", "userDefinedRules.rule", $uuid);
}
/**
* delete user rule item
* @param string $uuid user rule internal id
* @return array
* @throws \Phalcon\Validation\Exception
* @return array save status
* @throws \Phalcon\Validation\Exception when field validations fail
* @throws \ReflectionException when not bound to model
*/
public function delUserRuleAction($uuid)
{
$result = array("result"=>"failed");
if ($this->request->isPost() && $uuid != null) {
$mdlIDS = $this->getModel();
if ($mdlIDS->userDefinedRules->rule->del($uuid)) {
// if item is removed, serialize to config and save
$mdlIDS->serializeToConfig();
Config::getInstance()->save();
$result['result'] = 'deleted';
} else {
$result['result'] = 'not found';
}
}
return $result;
return $this->delBase("userDefinedRules.rule", $uuid);
}
/**
* toggle user defined rule by uuid (enable/disable)
* @param $uuid user defined rule internal id
* @param $enabled desired state enabled(1)/disabled(1), leave empty for toggle
* @return array status
* @return array save result
* @throws \Phalcon\Validation\Exception when field validations fail
* @throws \ReflectionException when not bound to model
*/
public function toggleUserRuleAction($uuid, $enabled = null)
{
$result = array("result" => "failed");
if ($this->request->isPost() && $uuid != null) {
$mdlIDS = $this->getModel();
$node = $mdlIDS->getNodeByReference('userDefinedRules.rule.' . $uuid);
if ($node != null) {
if ($enabled == "0" || $enabled == "1") {
$node->enabled = (string)$enabled;
} elseif ($node->enabled->__toString() == "1") {
$node->enabled = "0";
} else {
$node->enabled = "1";
}
$result['result'] = $node->enabled;
// if item has toggled, serialize to config and save
$mdlIDS->serializeToConfig();
Config::getInstance()->save();
}
}
return $result;
return $this->toggleBase("userDefinedRules.rule", $uuid);
}
}