Merge pull request #35199 from nextcloud/backport/35096/stable25

[stable25] Mark more config values as sensitive
nextcloud · Nov 17, 2022 · e58eb46 · e58eb46
2 parents 468951a + 3b48c25
commit e58eb46
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/lib/private/AppConfig.php b/lib/private/AppConfig.php
@@ -46,6 +46,7 @@ class AppConfig implements IAppConfig {
 	/** @var array[] */
 	protected $sensitiveValues = [
 		'circles' => [
+			'/^key_pairs$/',
 			'/^local_gskey$/',
 		],
 		'external' => [
@@ -132,6 +133,9 @@ class AppConfig implements IAppConfig {
 		'user_ldap' => [
 			'/^(s..)?ldap_agent_password$/',
 		],
+		'user_saml' => [
+			'/^idp-x509cert$/',
+		],
 	];
 
 	/** @var Connection */

diff --git a/lib/private/SystemConfig.php b/lib/private/SystemConfig.php
@@ -72,6 +72,10 @@ class SystemConfig {
 			'host' => true,
 			'password' => true,
 		],
+		'redis.cluster' => [
+			'seeds' => true,
+			'password' => true,
+		],
 		'objectstore' => [
 			'arguments' => [
 				// Legacy Swift (https://github.com/nextcloud/server/pull/17696#discussion_r341302207)