From 162b30a5d73fe21a90544860d84c0b9ca2400f1c Mon Sep 17 00:00:00 2001
From: Urban Müller
Date: Mon, 22 Apr 2024 00:31:10 +0200
Subject: reinstate masking of passwords

---
 it.class | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/it.class b/it.class
index 672de14..9ccb8a1 100644
--- a/it.class
+++ b/it.class
@@ -287,7 +287,7 @@ static function error($p = array(), $extra = null)
 
 		if ($sendmail || EDC('verboseerrors')) # we're mailing: send maximum info
 		{
-			$p['title'] = it::replace(['alert:|server:|^: "' => "", '(pw|passw|password\d*|secret)(=)[^&\s]*' => '$1$2*****'], "$service: " . $p['title']) . " (via " . getenv('HOSTNAME') . ")";
+			$p['title'] = it::replace(['alert:|server:|^: "' => "", '"(pw|passw|password\d*|secret)": *"[^"]*"' => '$1: "*******"'], "$service: " . $p['title']) . " (via " . getenv('HOSTNAME') . ")";
 
 			if (!$p['omitdebuginfo'])
 			{
@@ -307,7 +307,7 @@ static function error($p = array(), $extra = null)
 				$body .= $_FILES      ? "\$_FILES:  " . it::json_encode($_FILES, ['pretty' => true]) . "\n" : "";
 				$body .= "Processes:\n" . it::exec('ps auxf | egrep -v "rotatelogs|getbanner|logaction|httpd|systemd|sd-pam"|egrep "^www|^cron"') . "\n";
 				$body .= $longstack  ? "Full stack: "     . "$longstack\n" : "";
-				$body  = it::replace(array('(pw|passw|password\d*|secret)(\' => |\] => |=)[^&\s]*' => '$1$2********'), $body, array('utf8' => false));
+				$body  = it::replace(['"(pw|passw|password\d*|secret)": *"[^"]*"' => '$1: "*******"'], $body, array('utf8' => false));
 			}
 
 			$type = ($p['fatal'] ? (it::is_live() ? "FATAL: " : "Fatal: ") : "Error: ");
-- 
cgit v1.2.3