MonitoredObject: Keep structure of nested cvs during protection

fixes #4439 (cherry picked from commit d123b39)
Icinga · Jul 21, 2021 · 78e947a · 78e947a
1 parent 479f990
commit 78e947a
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php
@@ -466,19 +466,22 @@ public static function protectCustomVars($customvars)
             return $customvars;
         }
 
-        $obfuscatedCustomVars = [];
-        $obfuscator = function ($vars) use ($blacklistPattern, &$obfuscatedCustomVars, &$obfuscator) {
+        $obfuscator = function ($vars) use ($blacklistPattern, &$obfuscator) {
+            $result = [];
             foreach ($vars as $name => $value) {
                 if ($blacklistPattern && preg_match($blacklistPattern, $name)) {
-                    $obfuscatedCustomVars[$name] = '***';
+                    $result[$name] = '***';
+                } elseif ($value instanceof stdClass || is_array($value)) {
+                    $obfuscated = $obfuscator($value);
+                    $result[$name] = $value instanceof stdClass ? (object) $obfuscated : $obfuscated;
                 } else {
-                    $obfuscatedCustomVars[$name] = $value instanceof stdClass || is_array($value)
-                        ? $obfuscator($value)
-                        : $value;
+                    $result[$name] = $value;
                 }
             }
+
+            return $result;
         };
-        $obfuscator($customvars);
+        $obfuscatedCustomVars = $obfuscator($customvars);
 
         return $customvars instanceof stdClass ? (object) $obfuscatedCustomVars : $obfuscatedCustomVars;
     }