lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-19 19:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Firewall/alias, prefer mvc aliases in isAlias(), at the moment we need to keep scanning both (legacy,mvc) to make sure the migration can actually run. for https://github.com/opnsense/core/issues/1858

Browse Source
This commit is contained in:
Ad Schellevis 2018-07-10 20:27:45 +02:00
parent 409b8aac38
commit 3c0746d90b
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/opnsense/mvc/app/library/OPNsense/Firewall/Util.php
View File

@ -29,6 +29,7 @@
namespace OPNsense\Firewall;
use \OPNsense\Core\Config;
use \OPNsense\Firewall\Alias;
/**
* Class Util, common static firewall support functions
@ -72,15 +73,27 @@ class Util
* check if name exists in alias config section
* @param string $name name
* @return boolean
* @throws \OPNsense\Base\ModelException
*/
public static function isAlias($name)
{
if (!empty($name) && !empty(Config::getInstance()->object()->aliases)) {
foreach (Config::getInstance()->object()->aliases->children() as $node) {
if ($node->name == $name) {
if (!empty($name) ){
$aliasMdl = new Alias();
// MVC defined aliases
foreach ($aliasMdl->aliases->alias->__items as $alias) {
if ((string)$alias->name == $name) {
return true;
}
}
// legacy style aliases
$cnf = Config::getInstance()->object();
if (!empty($cnf->aliases)) {
foreach ($cnf->aliases->children() as $node) {
if ($node->name == $name) {
return true;
}
}
}
}
return false;
}