Skip to content

[HttpFoundation] Use separate caches for IpUtils checkIp4 and checkIp6 #49758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GromNaN merged 1 commit into from
Mar 22, 2023
Merged

[HttpFoundation] Use separate caches for IpUtils checkIp4 and checkIp6 #49758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Symfony/Component/HttpFoundation/IpUtils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public static function checkIp4(?string $requestIp, string $ip)
return false;
}

$cacheKey = $requestIp.'-'.$ip;
$cacheKey = $requestIp.'-'.$ip.'-v4';
if (isset(self::$checkedIps[$cacheKey])) {
return self::$checkedIps[$cacheKey];
}
Expand Down Expand Up @@ -126,7 +126,7 @@ public static function checkIp6(?string $requestIp, string $ip)
return false;
}

$cacheKey = $requestIp.'-'.$ip;
$cacheKey = $requestIp.'-'.$ip.'-v6';
if (isset(self::$checkedIps[$cacheKey])) {
return self::$checkedIps[$cacheKey];
}
Expand Down
15 changes: 15 additions & 0 deletions src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,21 @@ class IpUtilsTest extends TestCase
{
use ExpectDeprecationTrait;

public function testSeparateCachesPerProtocol()
{
$ip = '192.168.52.1';
$subnet = '192.168.0.0/16';

$this->assertFalse(IpUtils::checkIp6($ip, $subnet));
$this->assertTrue(IpUtils::checkIp4($ip, $subnet));

$ip = '2a01:198:603:0:396e:4789:8e99:890f';
$subnet = '2a01:198:603:0::/65';

$this->assertFalse(IpUtils::checkIp4($ip, $subnet));
$this->assertTrue(IpUtils::checkIp6($ip, $subnet));
}

/**
* @dataProvider getIpv4Data
*/
Expand Down