tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-23 22:04:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

MonitoredObject: Make customvar protection available to the outside

Browse Source
This commit is contained in:
Johannes Meyer 2021-02-02 16:00:31 +01:00
parent 76dafc8c1e
commit 1dc6f35916
1 changed files with 46 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
modules/monitoring/library/Monitoring/Object/MonitoredObject.php
View File

@ -418,7 +418,37 @@ abstract class MonitoredObject implements Filterable
*/ */
public function fetchCustomvars() public function fetchCustomvars()
{ {
$blacklist = array();
if ($this->type === self::TYPE_SERVICE) {
$this->fetchServiceVariables();
$customvars = $this->serviceVariables;
} else {
$this->fetchHostVariables();
$customvars = $this->hostVariables;
}
$this->customvars = $customvars;
$this->hideBlacklistedProperties();
$this->customvars = $this->obfuscateCustomVars($this->customvars, null);
return $this;
}
/**
* Obfuscate custom variables recursively
*
* @param stdClass|array $customvars The custom variables to obfuscate
*
* @return stdClass|array The obfuscated custom variables
*/
protected function obfuscateCustomVars($customvars, $_)
{
return self::protectCustomVars($customvars);
}
public static function protectCustomVars($customvars)
{
$blacklist = [];
$blacklistPattern = ''; $blacklistPattern = '';
if (($blacklistConfig = Config::module('monitoring')->get('security', 'protected_customvars', '')) !== '') { if (($blacklistConfig = Config::module('monitoring')->get('security', 'protected_customvars', '')) !== '') {
@ -432,44 +462,24 @@ abstract class MonitoredObject implements Filterable
$blacklistPattern = '/^(' . implode('|', $blacklist) . ')$/i'; $blacklistPattern = '/^(' . implode('|', $blacklist) . ')$/i';
} }
if ($this->type === self::TYPE_SERVICE) { if (! $blacklistPattern) {
$this->fetchServiceVariables(); return $customvars;
$customvars = $this->serviceVariables;
} else {
$this->fetchHostVariables();
$customvars = $this->hostVariables;
} }
$this->customvars = $customvars; $obfuscatedCustomVars = [];
$this->hideBlacklistedProperties(); $obfuscator = function ($vars) use ($blacklistPattern, &$obfuscatedCustomVars, &$obfuscator) {
foreach ($vars as $name => $value) {
if ($blacklistPattern) { if ($blacklistPattern && preg_match($blacklistPattern, $name)) {
$this->customvars = $this->obfuscateCustomVars($this->customvars, $blacklistPattern); $obfuscatedCustomVars[$name] = '***';
} } else {
$obfuscatedCustomVars[$name] = $value instanceof stdClass || is_array($value)
return $this; ? $obfuscator($value)
} : $value;
}
/**
* Obfuscate custom variables recursively
*
* @param stdClass|array $customvars The custom variables to obfuscate
* @param string $blacklistPattern Which custom variables to obfuscate
*
* @return stdClass|array The obfuscated custom variables
*/
protected function obfuscateCustomVars($customvars, $blacklistPattern)
{
$obfuscatedCustomVars = array();
foreach ($customvars as $name => $value) {
if ($blacklistPattern && preg_match($blacklistPattern, $name)) {
$obfuscatedCustomVars[$name] = '***';
} else {
$obfuscatedCustomVars[$name] = $value instanceof stdClass || is_array($value)
? $this->obfuscateCustomVars($value, $blacklistPattern)
: $value;
} }
} };
$obfuscator($customvars);
return $customvars instanceof stdClass ? (object) $obfuscatedCustomVars : $obfuscatedCustomVars; return $customvars instanceof stdClass ? (object) $obfuscatedCustomVars : $obfuscatedCustomVars;
} }