L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-15655 - address_in_subnet does not work on 64 bit architectures. Also, we found some other issues with this funtion while diagnosing the problem.

Browse Source
This commit is contained in:
tjhunt
2008-09-01 04:17:01 +00:00
parent d7a113ccf6
commit 4c01616d7e
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/moodlelib.php
+7 -1
View File
@@ -6018,6 +6018,9 @@ function address_in_subnet($addr, $subnetstr) {
$subnet = trim($subnet);
if (strpos($subnet, '/') !== false) { /// type 1
list($ip, $mask) = explode('/', $subnet);
if ($mask === '') {
$mask = 32;
}
$mask = 0xffffffff << (32 - $mask);
$found = ((ip2long($addr) & $mask) == (ip2long($ip) & $mask));
} else if (strpos($subnet, '-') !== false) {/// type 3
@@ -6030,7 +6033,10 @@ function address_in_subnet($addr, $subnetstr) {
$subnetrange[0] <= $lastaddrpart && $lastaddrpart <= $subnetrange[1]);
}
} else { /// type 2
$found = (strpos($addr, $subnet) === 0);
if ($subnet[strlen($subnet) - 1] != '.') {
$subnet .= '.';
}
$found = (strpos($addr . '.', $subnet) === 0);
}
if ($found) {
lib/simpletest/testmoodlelib.php
+7 -1
View File
@@ -32,9 +32,15 @@ class moodlelib_test extends UnitTestCase {
$this->assertTrue(address_in_subnet('123.121.234.15', '123.121.234.2/28'));
$this->assertFalse(address_in_subnet('123.121.234.16', '123.121.234.2/28'));
$this->assertFalse(address_in_subnet('123.121.234.255', '123.121.234.2/28'));
$this->assertTrue(address_in_subnet('123.121.234.1', '123.121.'));
$this->assertTrue(address_in_subnet('123.121.234.0', '123.121.234.0/')); // / is like /32.
$this->assertFalse(address_in_subnet('123.121.234.1', '123.121.234.0/'));
$this->assertFalse(address_in_subnet('232.232.232.232', '123.121.234.0/0'));
$this->assertFalse(address_in_subnet('123.122.234.1', '123.121.'));
$this->assertFalse(address_in_subnet('223.121.234.1', '123.121.'));
$this->assertTrue(address_in_subnet('123.121.234.1', '123.121'));
$this->assertFalse(address_in_subnet('123.122.234.1', '123.121'));
$this->assertFalse(address_in_subnet('223.121.234.1', '123.121'));
$this->assertFalse(address_in_subnet('123.121.234.100', '123.121.234.10'));
$this->assertFalse(address_in_subnet('123.121.234.9', '123.121.234.10-20'));
$this->assertTrue(address_in_subnet('123.121.234.10', '123.121.234.10-20'));
$this->assertTrue(address_in_subnet('123.121.234.15', '123.121.234.10-20'));