mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-06-02 06:05:31 +02:00
Code Issues Projects Releases Wiki Activity

MDL-67861 libraries: Refactor is_ip_in_subnet_list in ip_utils

Browse Source
This commit is contained in:
Brendan Heywood 2020-02-05 22:50:20 +11:00 committed by Eloy Lafuente (stronk7)
parent 1186275685
commit 516c8aa506
3 changed files with 50 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/classes/ip_utils.php
View File

@ -224,4 +224,25 @@ final class ip_utils {
}
return false;
}
/**
* Is an ip in a given list of subnets?
*
* @param string $ip - the IP to test against the list
* @param string $list - the list of IP subnets
* @param string $delim a delimiter of the list
* @return bool
*/
public static function is_ip_in_subnet_list($ip, $list, $delim = "\n") {
$list = explode($delim, $list);
foreach ($list as $line) {
$tokens = explode('#', $line);
$subnet = trim($tokens[0]);
if (address_in_subnet($ip, $subnet)) {
return true;
}
}
return false;
}
}

13
lib/moodlelib.php
View File

@ -9170,24 +9170,13 @@ function cleardoubleslashes ($path) {
* @return bool
*/
function remoteip_in_list($list) {
$inlist = false;
$clientip = getremoteaddr(null);
if (!$clientip) {
// Ensure access on cli.
return true;
}
$list = explode("\n", $list);
foreach ($list as $line) {
$tokens = explode('#', $line);
$subnet = trim($tokens[0]);
if (address_in_subnet($clientip, $subnet)) {
$inlist = true;
break;
}
}
return $inlist;
return \core\ip_utils::is_ip_in_subnet_list($clientip, $list);
}
/**

28
lib/tests/ip_utils_test.php
View File

@ -376,4 +376,32 @@ class core_ip_utils_testcase extends basic_testcase {
[false, 'trouble.com.au'] // The allowed domain (above) has a space at the front and so will return false.
];
}
/**
* Data provider for test_is_ip_in_subnet_list.
*
* @return array
*/
public function data_is_ip_in_subnet_list() {
return [
[true, '1.1.1.1', '1.1.1.1', "\n"],
[false, '1.1.1.1', '2.2.2.2', "\n"],
[true, '1.1.1.1', "1.1.1.5\n1.1.1.1", "\n"],
[true, '1.1.1.1', "1.1.1.5,1.1.1.1", ","],
];
}
/**
* Test checking ips against a list of allowed domains.
*
* @param bool $expected Expected result
* @param string $ip IP address
* @param string $list list of IP subnets
* @param string $delim delimiter of list
* @dataProvider data_is_ip_in_subnet_list
*/
public function test_is_ip_in_subnet_list($expected, $ip, $list, $delim) {
$this->assertEquals($expected, \core\ip_utils::is_ip_in_subnet_list($ip, $list, $delim));
}
}