moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-75889 core: compare domain names in a case-insensitive manner.

Browse source 
As per https://www.rfc-editor.org/rfc/rfc1035#section-3.1
This commit is contained in:
Paul Holden 2022-10-04 21:28:33 +01:00
parent fee1b8ce5f
commit c4c823c20e
3 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/classes/ip_utils.php
View file

@ -187,8 +187,8 @@ final class ip_utils {
} }
/** /**
* Checks the domain name against a list of allowed domains. The list of allowed domains is may use * Checks the domain name against a list of allowed domains. The list of allowed domains may use wildcards
* wildcards that match {@link is_domain_matching_pattern()}. * that match {@see is_domain_matching_pattern()}. Domains are compared in a case-insensitive manner
* *
* @param string $domain Domain address * @param string $domain Domain address
* @param array $alloweddomains An array of allowed domains. * @param array $alloweddomains An array of allowed domains.
@ -208,7 +208,7 @@ final class ip_utils {
// Use of wildcard for possible subdomains. // Use of wildcard for possible subdomains.
$escapeperiods = str_replace('.', '\.', $alloweddomain); $escapeperiods = str_replace('.', '\.', $alloweddomain);
$replacewildcard = str_replace('*', '.*', $escapeperiods); $replacewildcard = str_replace('*', '.*', $escapeperiods);
$ultimatepattern = '/' . $replacewildcard . '$/'; $ultimatepattern = '/' . $replacewildcard . '$/i';
if (preg_match($ultimatepattern, $domain)) { if (preg_match($ultimatepattern, $domain)) {
return true; return true;
} }
@ -217,7 +217,7 @@ final class ip_utils {
continue; continue;
} }
// Strict domain setting. // Strict domain setting.
if ($domain === $alloweddomain) { if (strcasecmp($domain, $alloweddomain) === 0) {
return true; return true;
} }
} }

5
lib/tests/ip_utils_test.php
View file

@ -14,13 +14,13 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>. // along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace core; namespace core;
/** /**
* This tests the static helper functions contained in the class '\core\ip_utils'. * This tests the static helper functions contained in the class '\core\ip_utils'.
* *
* @package core * @package core
* @covers \core\ip_utils
* @copyright 2016 Jake Dallimore <jrhdallimore@gmail.com> * @copyright 2016 Jake Dallimore <jrhdallimore@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/ */
@ -355,6 +355,7 @@ class ip_utils_test extends \basic_testcase {
public function data_domain_addresses() { public function data_domain_addresses() {
return [ return [
[true, 'example.com'], [true, 'example.com'],
[true, 'ExAmPle.com'],
[false, 'sub.example.com'], [false, 'sub.example.com'],
[false, 'example.com.au'], [false, 'example.com.au'],
[false, ' example.com'], // A space at the front of the domain is invalid. [false, ' example.com'], // A space at the front of the domain is invalid.
@ -362,6 +363,8 @@ class ip_utils_test extends \basic_testcase {
[false, 'test.example.com'], [false, 'test.example.com'],
[false, 'moodle.com'], [false, 'moodle.com'],
[true, 'test.moodle.com'], [true, 'test.moodle.com'],
[true, 'TeSt.moodle.com'],
[true, 'test.MoOdLe.com'],
[false, 'test.moodle.com.au'], [false, 'test.moodle.com.au'],
[true, 'nice.address.per.this.penny-arcade.com'], [true, 'nice.address.per.this.penny-arcade.com'],
[false, 'normal.per.this.penny-arcade.com.au'], [false, 'normal.per.this.penny-arcade.com.au'],

8
lib/tests/moodlelib_test.php
View file

@ -4354,7 +4354,13 @@ EOF;
'config' => "\r\n example.com \r\n test.com \r\n", 'config' => "\r\n example.com \r\n test.com \r\n",
'result' => true 'result' => true
], ],
[
'email' => 'fromuser@EXAMPLE.com',
'display' => \core_user::MAILDISPLAY_EVERYONE,
'samecourse' => false,
'config' => "example.com\r\ntest.com",
'result' => true,
],
// Test from email is not in allowed domain. // Test from email is not in allowed domain.
// Test that from display is set to show no one. // Test that from display is set to show no one.
[ 'email' => 'fromuser@moodle.com', [ 'email' => 'fromuser@moodle.com',