diff --git a/admin/settings/security.php b/admin/settings/security.php index f069b658489..e43665a04cb 100644 --- a/admin/settings/security.php +++ b/admin/settings/security.php @@ -152,7 +152,9 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page $sensiblesettingsdefault .= 'server_password@@search_solr, ssl_keypassword@@search_solr, '; $sensiblesettingsdefault .= 'alternateserver_password@@search_solr, alternatessl_keypassword@@search_solr, '; $sensiblesettingsdefault .= 'test_password@@cachestore_redis, password@@mlbackend_python, '; - $sensiblesettingsdefault .= 'badges_badgesalt@@none, calendar_exportsalt@@none'; + $sensiblesettingsdefault .= 'badges_badgesalt@@none, calendar_exportsalt@@none, '; + $sensiblesettingsdefault .= 'bigbluebuttonbn_shared_secret@@none, apikey@@tiny_premium, '; + $sensiblesettingsdefault .= 'matrixaccesstoken@@communication_matrix, api_secret@@factor_sms'; $temp->add(new admin_setting_configtextarea('adminpresets/sensiblesettings', get_string('sensiblesettings', 'core_adminpresets'), get_string('sensiblesettingstext', 'core_adminpresets'), diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 6496c542eb9..d9c353f5066 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -1217,5 +1217,28 @@ function xmldb_main_upgrade($oldversion) { upgrade_main_savepoint(true, 2024072600.01); } + if ($oldversion < 2024080500.00) { + + // Fix missing default admin presets "sensible settings" (those that should be treated as sensitive). + $newsensiblesettings = [ + 'bigbluebuttonbn_shared_secret@@none', + 'apikey@@tiny_premium', + 'matrixaccesstoken@@communication_matrix', + 'api_secret@@factor_sms', + ]; + + $sensiblesettings = get_config('adminpresets', 'sensiblesettings'); + foreach ($newsensiblesettings as $newsensiblesetting) { + if (strpos($sensiblesettings, $newsensiblesetting) === false) { + $sensiblesettings .= ", {$newsensiblesetting}"; + } + } + + set_config('sensiblesettings', $sensiblesettings, 'adminpresets'); + + // Main savepoint reached. + upgrade_main_savepoint(true, 2024080500.00); + } + return true; } diff --git a/version.php b/version.php index 70f908024b6..35075ecdbfe 100644 --- a/version.php +++ b/version.php @@ -29,7 +29,7 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2024080200.00; // YYYYMMDD = weekly release date of this DEV branch. +$version = 2024080500.00; // YYYYMMDD = weekly release date of this DEV branch. // RR = release increments - 00 in DEV branches. // .XX = incremental changes. $release = '4.5dev (Build: 20240802)'; // Human-friendly version name