Skip to content

[stable23] Censor more configs #31399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 1 commit into from
Mar 2, 2022
Merged

[stable23] Censor more configs #31399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Censor more configs 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen @backportbot
nickvergessen authored and backportbot[bot] committed Mar 2, 2022
commit 84f8f563feedd6f7f80d8a8d7268ba33394caf42
17 changes: 17 additions & 0 deletions lib/private/AppConfig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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$/',
Expand Down
7 changes: 7 additions & 0 deletions lib/private/SystemConfig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
],
Expand Down