maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

better readability

Browse Source
This commit is contained in:
Pascal
2019-10-28 14:16:27 +01:00
parent e8d67f9711
commit 220b493a1b
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Froxlor/Settings/Store.php
View File

@@ -262,9 +262,9 @@ class Store
foreach ($ips as $ip) { foreach ($ips as $ip) {
$org_ip = $ip; $org_ip = $ip;
$ip_cidr = explode("/", $ip); $ip_cidr = explode("/", $ip);
if (count($ip_cidr) == 2) { if (count($ip_cidr) === 2) {
$ip = $ip_cidr[0]; $ip = $ip_cidr[0];
if(in_array((int)strlen((string)$ip_cidr[1]),array(1,2))) { if (strlen($ip_cidr[1]) <= 2) {
$ip_cidr[1] = \Froxlor\Validate\Validate::cidr2NetmaskAddr($org_ip); $ip_cidr[1] = \Froxlor\Validate\Validate::cidr2NetmaskAddr($org_ip);
} }
$newfieldvalue[] = $ip . '/' . $ip_cidr[1]; $newfieldvalue[] = $ip . '/' . $ip_cidr[1];

7
tests/Froxlor/ValidateTest.php
View File

@@ -86,6 +86,13 @@ class ValidateTest extends TestCase
$this->assertEquals("12.34.56.78/24", $result); $this->assertEquals("12.34.56.78/24", $result);
} }
public function testValidateIpv6Disallowed()
{
$this->expectException("Exception");
$this->expectExceptionCode(400);
$result = Validate::validate_ip2("2620:0:2d0:200::7/32", false, 'invalidip', false, false, true, true);
}
public function testValidateIpLocalhostAllowed() public function testValidateIpLocalhostAllowed()
{ {
$result = Validate::validate_ip2("127.0.0.1/32", false, 'invalidip', true, false, true, true); $result = Validate::validate_ip2("127.0.0.1/32", false, 'invalidip', true, false, true, true);