mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-11 19:42:35 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-74489' of https://github.com/paulholden/moodle

Browse Source
This commit is contained in:
Jun Pataleta 2022-04-13 16:35:19 +08:00
commit 0385178826
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/settings/security.php
View File

@ -151,7 +151,8 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
$sensiblesettingsdefault .= 'dbpass@@enrol_database, bind_pw@@enrol_ldap, ';
$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 .= 'test_password@@cachestore_redis, password@@mlbackend_python, ';
$sensiblesettingsdefault .= 'badges_badgesalt@@none, calendar_exportsalt@@none';
$temp->add(new admin_setting_configtextarea('adminpresets/sensiblesettings',
get_string('sensiblesettings', 'core_adminpresets'),
get_string('sensiblesettingstext', 'core_adminpresets'),

20
lib/db/upgrade.php
View File

@ -4453,5 +4453,25 @@ privatefiles,moodle|/user/files.php';
upgrade_main_savepoint(true, 2022032200.02);
}
if ($oldversion < 2022041200.01) {
// The original default admin presets "sensible settings" (those that should be treated as sensitive).
$originalsensiblesettings = 'recaptchapublickey@@none, recaptchaprivatekey@@none, googlemapkey3@@none, ' .
'secretphrase@@url, cronremotepassword@@none, smtpuser@@none, smtppass@none, proxypassword@@none, ' .
'quizpassword@@quiz, allowedip@@none, blockedip@@none, dbpass@@logstore_database, messageinbound_hostpass@@none, ' .
'bind_pw@@auth_cas, pass@@auth_db, bind_pw@@auth_ldap, dbpass@@enrol_database, bind_pw@@enrol_ldap, ' .
'server_password@@search_solr, ssl_keypassword@@search_solr, alternateserver_password@@search_solr, ' .
'alternatessl_keypassword@@search_solr, test_password@@cachestore_redis, password@@mlbackend_python';
// Check if the current config matches the original default, upgrade to new default if so.
if (get_config('adminpresets', 'sensiblesettings') === $originalsensiblesettings) {
$newsensiblesettings = "{$originalsensiblesettings}, badges_badgesalt@@none, calendar_exportsalt@@none";
set_config('sensiblesettings', $newsensiblesettings, 'adminpresets');
}
// Main savepoint reached.
upgrade_main_savepoint(true, 2022041200.01);
}
return true;
}

2
version.php
View File

@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2022041200.00; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2022041200.01; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.
$release = '4.0rc2 (Build: 20220412)'; // Human-friendly version name