Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorblizzz <blizzz@arthur-schiwon.de>2022-03-02 19:39:18 +0300
committerGitHub <noreply@github.com>2022-03-02 19:39:18 +0300
commit0d5c2cd0f048108bd28f494895a9200a18e7cfb4 (patch)
tree14a451c30321fd6578eeb800f0de4b1998a9fe16 /lib/private
parent2993e9a667069db470402d12bc53b0fb46c6f254 (diff)
parent84f8f563feedd6f7f80d8a8d7268ba33394caf42 (diff)
Merge pull request #31399 from nextcloud/backport/31390/stable23
[stable23] Censor more configs
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/AppConfig.php17
-rw-r--r--lib/private/SystemConfig.php7
2 files changed, 24 insertions, 0 deletions
diff --git a/lib/private/AppConfig.php b/lib/private/AppConfig.php
index e2d6d49a845..fc7c770fe08 100644
--- a/lib/private/AppConfig.php
+++ b/lib/private/AppConfig.php
@@ -45,17 +45,34 @@ class AppConfig implements IAppConfig {
/** @var array[] */
protected $sensitiveValues = [
+ 'circles' => [
+ '/^local_gskey$/',
+ ],
'external' => [
'/^sites$/',
],
+ 'integration_discourse' => [
+ '/^private_key$/',
+ '/^public_key$/',
+ ],
+ 'notify_push' => [
+ '/^cookie$/',
+ ],
'spreed' => [
'/^bridge_bot_password/',
'/^signaling_servers$/',
'/^signaling_ticket_secret$/',
+ '/^sip_bridge_dialin_info$/',
+ '/^sip_bridge_shared_secret$/',
'/^stun_servers$/',
'/^turn_servers$/',
'/^turn_server_secret$/',
],
+ 'support' => [
+ '/^last_response$/',
+ '/^potential_subscription_key$/',
+ '/^subscription_key$/',
+ ],
'theming' => [
'/^imprintUrl$/',
'/^privacyUrl$/',
diff --git a/lib/private/SystemConfig.php b/lib/private/SystemConfig.php
index c435b9180b9..187779c25c9 100644
--- a/lib/private/SystemConfig.php
+++ b/lib/private/SystemConfig.php
@@ -53,6 +53,13 @@ class SystemConfig {
'updater.secret' => true,
'trusted_proxies' => true,
'proxyuserpwd' => true,
+ 'sentry.dsn' => true,
+ 'sentry.public-dsn' => true,
+ 'zammad.download.secret' => true,
+ 'zammad.portal.secret' => true,
+ 'zammad.secret' => true,
+ 'github.client_id' => true,
+ 'github.client_secret' => true,
'log.condition' => [
'shared_secret' => true,
],