From 25f38883f168df228940c816d41329918407ad35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.chilliet@nextcloud.com>
Date: Mon, 17 Feb 2025 12:12:02 +0100
Subject: [PATCH] fix: Work around false-positive psalm taint error calling
 print_r in admin_audit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Same issue as var_export, print_r is listed as sink but it’s not when
 using return:true. Anyway, using the logger context feature is better.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
---
 apps/admin_audit/lib/Actions/Action.php | 7 ++-----
 build/psalm-baseline-security.xml       | 5 -----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/apps/admin_audit/lib/Actions/Action.php b/apps/admin_audit/lib/Actions/Action.php
index 2566025a8ce..acd415d82ea 100644
--- a/apps/admin_audit/lib/Actions/Action.php
+++ b/apps/admin_audit/lib/Actions/Action.php
@@ -37,11 +37,8 @@ class Action {
 					);
 				} else {
 					$this->logger->critical(
-						sprintf(
-							'$params["' . $element . '"] was missing. Transferred value: %s',
-							print_r($params, true)
-						),
-						['app' => 'admin_audit']
+						'$params["' . $element . '"] was missing. Transferred value: {params}',
+						['app' => 'admin_audit', 'params' => $params]
 					);
 				}
 				return;
diff --git a/build/psalm-baseline-security.xml b/build/psalm-baseline-security.xml
index f15718796c2..4df4cd7d687 100644
--- a/build/psalm-baseline-security.xml
+++ b/build/psalm-baseline-security.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
-  <file src="apps/admin_audit/lib/Actions/Action.php">
-    <TaintedHtml>
-      <code><![CDATA[$params]]></code>
-    </TaintedHtml>
-  </file>
   <file src="apps/files_external/lib/Config/ConfigAdapter.php">
     <TaintedCallable>
       <code><![CDATA[$objectClass]]></code>