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

Interfaces: Other Types: VLAN - prevent self-assignments. closes https://github.com/opnsense/core/issues/6509

Browse Source
This commit is contained in:
Ad Schellevis 2023-04-20 09:38:18 +02:00
parent 71e28c519c
commit e9dc687553
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/opnsense/mvc/app/models/OPNsense/Interfaces/Vlan.php
View File

@ -30,6 +30,7 @@ namespace OPNsense\Interfaces;
use Phalcon\Messages\Message;
use OPNsense\Base\BaseModel;
use OPNsense\Core\Config;
class Vlan extends BaseModel
{
@ -38,6 +39,17 @@ class Vlan extends BaseModel
*/
public function performValidation($validateFullModel = false)
{
// current uuid / device name mapping
$cfg = Config::getInstance()->object();
$prev_names = [];
if (isset($cfg->vlans->vlan)) {
foreach ($cfg->vlans->children() as $vlan) {
if (isset($vlan->attributes()->uuid)) {
$tagUUID = (string)$vlan->attributes()['uuid'];
$prev_names[$tagUUID] = (string)$vlan->vlanif;
}
}
}
$messages = parent::performValidation($validateFullModel);
$all_nodes = $this->getFlatNodes();
foreach ($all_nodes as $key => $node) {
@ -69,6 +81,17 @@ class Vlan extends BaseModel
$key
));
}
/* FALLTHROUGH */
case 'if':
/*
* Detect attempt to assign the device to itself.
* The current name or the one before applying this model are equal to the interface in
* that case.
*/
$prev_name = $prev_names[$parent->getAttributes()['uuid']] ?? '';
if ((string)$parent->if == (string)$parent->vlanif || $prev_name == (string)$parent->if) {
$messages->appendMessage(new Message(gettext('VLAN can not be assigned to itself.'), $key));
}
break;
}
}