check alternative ip notatino

This commit is contained in:
Yurii
2026-03-21 18:33:29 +02:00
parent 3fab34e030
commit 647f6f8ce8
2 changed files with 127 additions and 0 deletions

View File

@@ -50,6 +50,12 @@ class HostCheck
return $this->ipAddressIsNotInternal($host);
}
$normalized = $this->normalizeIpAddress($host);
if ($normalized !== false && filter_var($normalized, FILTER_VALIDATE_IP)) {
return false;
}
if (!filter_var($host, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)) {
return false;
}
@@ -93,4 +99,60 @@ class HostCheck
{
return $this->isHostAndNotInternal($host);
}
private function normalizeIpAddress(string $ip): string|false
{
if (!str_contains($ip, '.')) {
return self::normalizePart($ip);
}
$parts = explode('.', $ip);
if (count($parts) !== 4) {
return false;
}
$result = [];
foreach ($parts as $part) {
if (preg_match('/^0x[0-9a-f]+$/i', $part)) {
$num = hexdec($part);
} else if (preg_match('/^0[0-7]+$/', $part) && $part !== '0') {
$num = octdec($part);
} else if (ctype_digit($part)) {
$num = (int)$part;
} else {
return false;
}
if ($num < 0 || $num > 255) {
return false;
}
$result[] = $num;
}
return implode('.', $result);
}
private static function normalizePart(string $ip): string|false
{
if (preg_match('/^0x[0-9a-f]+$/i', $ip)) {
$num = hexdec($ip);
} elseif (preg_match('/^0[0-7]+$/', $ip) && $ip !== '0') {
$num = octdec($ip);
} elseif (ctype_digit($ip)) {
$num = (int) $ip;
} else {
return false;
}
if ($num < 0 || $num > 0xFFFFFFFF) {
return false;
}
$num = (int) $num;
return long2ip($num);
}
}

View File

@@ -0,0 +1,65 @@
<?php
/************************************************************************
* This file is part of EspoCRM.
*
* EspoCRM Open Source CRM application.
* Copyright (C) 2014-2026 EspoCRM, Inc.
* Website: https://www.espocrm.com
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
* The interactive user interfaces in modified source and object code versions
* of this program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU Affero General Public License version 3.
*
* In accordance with Section 7(b) of the GNU Affero General Public License version 3,
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
namespace tests\unit\Espo\Core\Utils\Security;
use Espo\Core\Utils\Security\HostCheck;
use PHPUnit\Framework\TestCase;
class HostCheckTest extends TestCase
{
public function testIsHostAndNotInternal(): void
{
$hostCheck = new HostCheck();
$this->assertTrue(
$hostCheck->isHostAndNotInternal('200.1.1.1')
);
$this->assertFalse(
$hostCheck->isHostAndNotInternal('172.20.0.1')
);
$this->assertFalse(
$hostCheck->isHostAndNotInternal('0177.0.0.1')
);
/*$this->assertFalse(
$hostCheck->isHostAndNotInternal('127.1')
);
$this->assertFalse(
$hostCheck->isHostAndNotInternal('127.0.1')
);*/
$this->assertFalse(
$hostCheck->isHostAndNotInternal('0x7f000001')
);
}
}