tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-31 01:34:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Sync: compare keys in a case-insensitive way

Browse Source 
fixes #2598
This commit is contained in:
Thomas Gelf 2022-08-31 16:36:31 +02:00
parent 28c149efed
commit dd85c2ee35
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
library/Director/Import/Sync.php
View File

@ -48,6 +48,9 @@ class Sync
/** @var bool Whether we already prepared your sync */ /** @var bool Whether we already prepared your sync */
protected $isPrepared = false; protected $isPrepared = false;
/** @var bool Whether we applied strtolower() to existing object keys */
protected $usedLowerCasedKeys = false;
protected $modify = []; protected $modify = [];
protected $remove = []; protected $remove = [];
@ -313,6 +316,9 @@ class Sync
foreach ($rows as $row) { foreach ($rows as $row) {
if ($combinedKey) { if ($combinedKey) {
$key = SyncUtils::fillVariables($sourceKeyPattern, $row); $key = SyncUtils::fillVariables($sourceKeyPattern, $row);
if ($this->usedLowerCasedKeys) {
$key = strtolower($key);
}
if (array_key_exists($key, $this->imported[$sourceId])) { if (array_key_exists($key, $this->imported[$sourceId])) {
throw new InvalidArgumentException(sprintf( throw new InvalidArgumentException(sprintf(
@ -341,7 +347,11 @@ class Sync
if ($combinedKey) { if ($combinedKey) {
$this->imported[$sourceId][$key] = $row; $this->imported[$sourceId][$key] = $row;
} else { } else {
$this->imported[$sourceId][$row->$key] = $row; if ($this->usedLowerCasedKeys) {
$this->imported[$sourceId][strtolower($row->$key)] = $row;
} else {
$this->imported[$sourceId][$row->$key] = $row;
}
} }
} }
@ -391,6 +401,7 @@ class Sync
Benchmark::measure('Begin loading existing objects'); Benchmark::measure('Begin loading existing objects');
$ruleObjectType = $this->rule->get('object_type'); $ruleObjectType = $this->rule->get('object_type');
$useLowerCaseKeys = $ruleObjectType !== 'datalistEntry';
// TODO: Make object_type (template, object...) and object_name mandatory? // TODO: Make object_type (template, object...) and object_name mandatory?
if ($this->rule->hasCombinedKey()) { if ($this->rule->hasCombinedKey()) {
$this->objects = []; $this->objects = [];
@ -418,6 +429,9 @@ class Sync
$destinationKeyPattern, $destinationKeyPattern,
$object $object
); );
if ($useLowerCaseKeys) {
$key = strtolower($key);
}
if (array_key_exists($key, $this->objects)) { if (array_key_exists($key, $this->objects)) {
throw new InvalidArgumentException(sprintf( throw new InvalidArgumentException(sprintf(
@ -431,12 +445,22 @@ class Sync
} }
} else { } else {
if ($this->store) { if ($this->store) {
$this->objects = $this->store->loadAll(DbObjectTypeRegistry::tableNameByType($ruleObjectType), 'object_name'); $objects = $this->store->loadAll(DbObjectTypeRegistry::tableNameByType($ruleObjectType), 'object_name');
} else { } else {
$this->objects = IcingaObject::loadAllByType($ruleObjectType, $this->db); $objects = IcingaObject::loadAllByType($ruleObjectType, $this->db);
}
if ($useLowerCaseKeys) {
$this->objects = [];
foreach ($objects as $key => $object) {
$this->objects[strtolower($key)] = $object;
}
} else {
$this->objects = $objects;
} }
} }
$this->usedLowerCasedKeys = $useLowerCaseKeys;
// TODO: should be obsoleted by a better "loadFiltered" method // TODO: should be obsoleted by a better "loadFiltered" method
if ($ruleObjectType === 'datalistEntry') { if ($ruleObjectType === 'datalistEntry') {
$this->removeForeignListEntries(); $this->removeForeignListEntries();
@ -463,6 +487,9 @@ class Sync
foreach ($this->imported[$sourceId] as $key => $row) { foreach ($this->imported[$sourceId] as $key => $row) {
// Workaround: $a["10"] = "val"; -> array_keys($a) = [(int) 10] // Workaround: $a["10"] = "val"; -> array_keys($a) = [(int) 10]
$key = (string) $key; $key = (string) $key;
if ($this->usedLowerCasedKeys) {
$key = strtolower($key);
}
if (! array_key_exists($key, $objects)) { if (! array_key_exists($key, $objects)) {
// Safe default values for object_type and object_name // Safe default values for object_type and object_name
if ($ruleObjectType === 'datalistEntry') { if ($ruleObjectType === 'datalistEntry') {