mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 00:20:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-66166' of https://github.com/brendanheywood/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2019-10-09 11:14:09 +08:00
commit 5dc69b9bbe
4 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/classes/useragent.php
View File

@ -137,6 +137,18 @@ class core_useragent {
}
}
/**
* Get the MoodleBot UserAgent for this site.
*
* @return string UserAgent
*/
public static function get_moodlebot_useragent() {
global $CFG;
$version = moodle_major_version(); // Only major version for security.
return "MoodleBot/$version (+{$CFG->wwwroot})";
}
/**
* Returns the user agent string.
* @return bool|string The user agent string or false if one isn't available.
@ -215,7 +227,8 @@ class core_useragent {
* @return bool
*/
protected function is_useragent_web_crawler() {
$regex = '/Googlebot|google\.com|Yahoo! Slurp|\[ZSEBOT\]|msnbot|bingbot|BingPreview|Yandex|AltaVista|Baiduspider|Teoma/i';
$regex = '/MoodleBot|Googlebot|google\.com|Yahoo! Slurp|\[ZSEBOT\]|msnbot|bingbot|BingPreview|Yandex|AltaVista'
.'|Baiduspider|Teoma/i';
return (preg_match($regex, $this->useragent));
}

4
lib/filelib.php
View File

@ -3103,7 +3103,7 @@ class curl {
*/
public function resetopt() {
$this->options = array();
$this->options['CURLOPT_USERAGENT'] = 'MoodleBot/1.0';
$this->options['CURLOPT_USERAGENT'] = \core_useragent::get_moodlebot_useragent();
// True to include the header in the output
$this->options['CURLOPT_HEADER'] = 0;
// True to Exclude the body from the output
@ -3346,7 +3346,7 @@ class curl {
} else if (!empty($this->options['CURLOPT_USERAGENT'])) {
$useragent = $this->options['CURLOPT_USERAGENT'];
} else {
$useragent = 'MoodleBot/1.0';
$useragent = \core_useragent::get_moodlebot_useragent();
}
// Set headers.

8
lib/tests/filelib_test.php
View File

@ -1060,14 +1060,16 @@ EOF;
$options = $curl->get_options();
$this->assertNotEmpty($options);
$moodlebot = \core_useragent::get_moodlebot_useragent();
$curl->call_apply_opt($options);
$this->assertTrue(in_array('User-Agent: MoodleBot/1.0', $curl->header));
$this->assertTrue(in_array("User-Agent: $moodlebot", $curl->header));
$this->assertFalse(in_array('User-Agent: Test/1.0', $curl->header));
$options['CURLOPT_USERAGENT'] = 'Test/1.0';
$curl->call_apply_opt($options);
$this->assertTrue(in_array('User-Agent: Test/1.0', $curl->header));
$this->assertFalse(in_array('User-Agent: MoodleBot/1.0', $curl->header));
$this->assertFalse(in_array("User-Agent: $moodlebot", $curl->header));
$curl->set_option('CURLOPT_USERAGENT', 'AnotherUserAgent/1.0');
$curl->call_apply_opt();
@ -1082,7 +1084,7 @@ EOF;
$curl->unset_option('CURLOPT_USERAGENT');
$curl->call_apply_opt();
$this->assertTrue(in_array('User-Agent: MoodleBot/1.0', $curl->header));
$this->assertTrue(in_array("User-Agent: $moodlebot", $curl->header));
// Finally, test it via exttests, to ensure the agent is sent properly.
// Matching.

10
lib/tests/useragent_test.php
View File

@ -1387,6 +1387,16 @@ class core_useragent_testcase extends advanced_testcase {
),
),
// MoodleBot.
array(
'User-Agent: MoodleBot/3.8 (+https://moodle.org)',
array(
'is_web_crawler' => true,
'versionclasses' => array(
),
),
),
// Macos Desktop app.
array(
'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) moodlemobile/3.6.0 Chrome/69.0.3497.106 Electron/4.0.1 Safari/537.36 MoodleMobile',