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

Config: prevent config crashes when an attribute already exists, while here also make sure we report the error as it will now silently fail. SimpleXMLElement's addAttribute() is only valida when the it doesn't already exist.

Browse Source 
Strangly enough, this doesn't seem to happen very often, but during ha sync we are able to crash without notice.
This commit is contained in:
Ad Schellevis 2022-05-02 16:38:30 +02:00
parent 00bd62fbdd
commit a4c482f66c
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/opnsense/mvc/app/library/OPNsense/Core/Config.php
View File

@ -193,7 +193,10 @@ class Config extends Singleton
$node = $this->simplexml;
// invalidate object on warnings/errors (prevent save from happening)
set_error_handler(
function () {
function ($errno, $errstr, $errfile, $errline) {
syslog(LOG_ERR, sprintf(
"Config serialize error [%d] %s @ %s : %s", $errno, $errstr, $errfile, $errline
));
$this->statusIsValid = false;
}
);
@ -209,7 +212,11 @@ class Config extends Singleton
if ($itemKey === '@attributes') {
// copy xml attributes
foreach ($itemValue as $attrKey => $attrValue) {
$node->addAttribute($attrKey, $attrValue);
if (isset($node->attributes()[$attrKey])) {
$node->attributes()->$attrKey = $attrValue;
} else {
$node->addAttribute($attrKey, $attrValue);
}
}
continue;
} elseif (strstr($itemKey, '@attributes') !== false) {
@ -217,7 +224,11 @@ class Config extends Singleton
if (count($node->$origname)) {
// copy xml attributes
foreach ($itemValue as $attrKey => $attrValue) {
$node->$origname->addAttribute($attrKey, $attrValue);
if (isset($node->$origname->attributes()[$attrKey])) {
$node->$origname->attributes()->$attrKey = $attrValue;
} else {
$node->$origname->addAttribute($attrKey, $attrValue);
}
}
}
continue;