mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-19 15:10:05 +01:00
Code Issues Projects Releases Wiki Activity

MDL-57274 upgrade: fix curl security notices during upgrade/install

Browse Source 
Handles the case where $CFG->curlsecurityxxx vars don't yet exist
during install or upgrade by treating not set the same as empty.
This commit is contained in:
Jake Dallimore 2017-02-15 13:31:52 +08:00
parent 9ec952f237
commit a448a38b1d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/classes/files/curl_security_helper.php
View File

@ -235,6 +235,9 @@ class curl_security_helper extends curl_security_helper_base {
*/
protected function get_whitelisted_ports() {
global $CFG;
if (!isset($CFG->curlsecurityallowedport)) {
return [];
}
return array_filter(explode("\n", $CFG->curlsecurityallowedport), function($entry) {
return !empty($entry);
});
@ -247,6 +250,9 @@ class curl_security_helper extends curl_security_helper_base {
*/
protected function get_blacklisted_hosts() {
global $CFG;
if (!isset($CFG->curlsecurityblockedhosts)) {
return [];
}
return array_filter(array_map('trim', explode("\n", $CFG->curlsecurityblockedhosts)), function($entry) {
return !empty($entry);
});