Skip to content

[stable23] Improve local IP detection #33354

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
blizzz merged 8 commits into from
Aug 3, 2022
Merged

[stable23] Improve local IP detection #33354

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
342934e
Improve local IP detection
come-nc Jun 27, 2022
8ad9a15
Refactor local IP if and set strict to true for in_array
come-nc Jun 28, 2022
a04cb4d
Check for local IPs nested in IPv6 as well
come-nc Jun 28, 2022
91a244e
Use Symfony IpUtils to check for local IP ranges
come-nc Jul 12, 2022
28dd116
Copy IpUtils from Symfony to avoid new dependency on backport
come-nc Aug 1, 2022
f41425c
Align copied file with our code style
come-nc Aug 1, 2022
4664375
Remove call to undefined function, fix typing
come-nc Aug 1, 2022
125a60c
Fix autoloader
come-nc Aug 1, 2022
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
Prev Previous commit
Next Next commit
Remove call to undefined function, fix typing 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Aug 1, 2022
commit 4664375cbc204b3466b91b29d6e281415ed358bc
33 changes: 11 additions & 22 deletions lib/private/Http/IpUtils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
* @author Fabien Potencier <[email protected]>
*/
class IpUtils {
/**
* @var array<string,bool>
*/
private static $checkedIps = [];

/**
Expand All @@ -31,13 +34,7 @@ private function __construct() {
*
* @return bool
*/
public static function checkIp(?string $requestIp, $ips) {
if (null === $requestIp) {
trigger_deprecation('symfony/http-foundation', '5.4', 'Passing null as $requestIp to "%s()" is deprecated, pass an empty string instead.', __METHOD__);

return false;
}

public static function checkIp(string $requestIp, $ips) {
if (!\is_array($ips)) {
$ips = [$ips];
}
Expand All @@ -61,13 +58,7 @@ public static function checkIp(?string $requestIp, $ips) {
*
* @return bool Whether the request IP matches the IP, or whether the request IP is within the CIDR subnet
*/
public static function checkIp4(?string $requestIp, string $ip) {
if (null === $requestIp) {
trigger_deprecation('symfony/http-foundation', '5.4', 'Passing null as $requestIp to "%s()" is deprecated, pass an empty string instead.', __METHOD__);

return false;
}

public static function checkIp4(string $requestIp, string $ip) {
$cacheKey = $requestIp.'-'.$ip;
if (isset(self::$checkedIps[$cacheKey])) {
return self::$checkedIps[$cacheKey];
Expand All @@ -81,9 +72,11 @@ public static function checkIp4(?string $requestIp, string $ip) {
[$address, $netmask] = explode('/', $ip, 2);

if ('0' === $netmask) {
return self::$checkedIps[$cacheKey] = filter_var($address, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV4);
return self::$checkedIps[$cacheKey] = (bool)filter_var($address, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV4);
}

$netmask = (int)$netmask;

if ($netmask < 0 || $netmask > 32) {
return self::$checkedIps[$cacheKey] = false;
}
Expand Down Expand Up @@ -113,13 +106,7 @@ public static function checkIp4(?string $requestIp, string $ip) {
*
* @throws \RuntimeException When IPV6 support is not enabled
*/
public static function checkIp6(?string $requestIp, string $ip) {
if (null === $requestIp) {
trigger_deprecation('symfony/http-foundation', '5.4', 'Passing null as $requestIp to "%s()" is deprecated, pass an empty string instead.', __METHOD__);

return false;
}

public static function checkIp6(string $requestIp, string $ip) {
$cacheKey = $requestIp.'-'.$ip;
if (isset(self::$checkedIps[$cacheKey])) {
return self::$checkedIps[$cacheKey];
Expand All @@ -136,6 +123,8 @@ public static function checkIp6(?string $requestIp, string $ip) {
return (bool) unpack('n*', @inet_pton($address));
}

$netmask = (int)$netmask;

if ($netmask < 1 || $netmask > 128) {
return self::$checkedIps[$cacheKey] = false;
}
Expand Down