summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJoas Schilling <213943+nickvergessen@users.noreply.github.com>2022-11-17 12:05:55 +0100
committerGitHub <noreply@github.com>2022-11-17 12:05:55 +0100
commite58eb4650dc17d6586a09fd03fe62de894b3e580 (patch)
tree63f1caed3edb0794f9e4df571674af2135558872 /lib
parent468951a81458b8cb55178e1aa0cf6b4162a8892a (diff)
parent3b48c251fa032d15273d0ff7f74a6f168eec95ae (diff)
downloadnextcloud-server-e58eb4650dc17d6586a09fd03fe62de894b3e580.tar.gz
nextcloud-server-e58eb4650dc17d6586a09fd03fe62de894b3e580.zip
Merge pull request #35199 from nextcloud/backport/35096/stable25
[stable25] Mark more config values as sensitive
Diffstat (limited to 'lib')
-rw-r--r--lib/private/AppConfig.php4
-rw-r--r--lib/private/SystemConfig.php4
2 files changed, 8 insertions, 0 deletions
diff --git a/lib/private/AppConfig.php b/lib/private/AppConfig.php
index 00e5dddc1f9..708b31b3136 100644
--- 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
index 0bc6154fbc4..6cd0e4376c5 100644
--- 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)