From c5c10adf75fd0ce75156ced6ad8f06398517f0ce Mon Sep 17 00:00:00 2001 From: Jennifer Mourek Date: Thu, 13 Oct 2016 08:54:30 +0200 Subject: [PATCH] MonitoredObject: Delete fallback for protected custom variables fixes #12848 --- .../library/Monitoring/Object/MonitoredObject.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php index 3214769e6..b57c4c6d4 100644 --- a/modules/monitoring/library/Monitoring/Object/MonitoredObject.php +++ b/modules/monitoring/library/Monitoring/Object/MonitoredObject.php @@ -446,7 +446,7 @@ abstract class MonitoredObject implements Filterable } $blacklist = array(); - $blacklistPattern = '/^(.*pw.*|.*pass.*|community)$/i'; + $blacklistPattern = ''; if (($blacklistConfig = Config::module('monitoring')->get('security', 'protected_customvars', '')) !== '') { foreach (explode(',', $blacklistConfig) as $customvar) { @@ -469,7 +469,10 @@ abstract class MonitoredObject implements Filterable $this->customvars = $customvars; $this->hideBlacklistedProperties(); - $this->customvars = $this->obfuscateCustomVars($this->customvars, $blacklistPattern); + + if ($blacklistPattern) { + $this->customvars = $this->obfuscateCustomVars($this->customvars, $blacklistPattern); + } return $this; }