Skip to content

Commit

Permalink
DEP Use symfony for IPUtils
Browse files Browse the repository at this point in the history
  • Loading branch information
emteknetnz committed Aug 19, 2024
1 parent c27f66b commit b2789d1
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"symfony/config": "^6.1",
"symfony/dom-crawler": "^6.1",
"symfony/filesystem": "^6.1",
"symfony/http-foundation": "^6.1",
"symfony/mailer": "^6.1",
"symfony/mime": "^6.1",
"symfony/translation": "^6.1",
Expand Down
2 changes: 1 addition & 1 deletion src/Control/Middleware/TrustedProxyMiddleware.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace SilverStripe\Control\Middleware;

use SilverStripe\Control\HTTPRequest;
use SilverStripe\Control\Util\IPUtils;
use Symfony\Component\HttpFoundation\IpUtils;

/**
* This middleware will rewrite headers that provide IP and host details from an upstream proxy.
Expand Down
7 changes: 7 additions & 0 deletions src/Control/Util/IPUtils.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,13 @@

namespace SilverStripe\Control\Util;

use SilverStripe\Dev\Deprecation;

/**
* Http utility functions.
*
* @author Fabien Potencier <[email protected]>
* @deprecated 5.3.0 Use Symfony\Component\HttpFoundation\IpUtils instead
*/
class IPUtils
{
Expand All @@ -37,6 +40,7 @@ private function __construct()
*/
public static function checkIP($requestIP, $ips)
{
Deprecation::notice('5.3.0', 'Use Symfony\Component\HttpFoundation\IpUtils::checkIP() instead');
if (!is_array($ips)) {
$ips = [$ips];
}
Expand All @@ -62,6 +66,7 @@ public static function checkIP($requestIP, $ips)
*/
public static function checkIP4($requestIP, $ip)
{
Deprecation::notice('5.3.0', 'Use Symfony\Component\HttpFoundation\IpUtils::checkIP4() instead');
if (!filter_var($requestIP, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
return false;
}
Expand Down Expand Up @@ -100,6 +105,7 @@ public static function checkIP4($requestIP, $ip)
*/
public static function checkIP6($requestIP, $ip)
{
Deprecation::notice('5.3.0', 'Use Symfony\Component\HttpFoundation\IpUtils::checkIP6() instead');
if (!((extension_loaded('sockets') && defined('AF_INET6')) || @inet_pton('::1'))) {
throw new \RuntimeException('Unable to check IPv6. Check that PHP was not compiled with option "disable-ipv6".');
}
Expand Down Expand Up @@ -141,6 +147,7 @@ public static function checkIP6($requestIP, $ip)
*/
public static function anonymize(string $ip): string
{
Deprecation::notice('5.3.0', 'Use Symfony\Component\HttpFoundation\IpUtils::anonymize() instead');
$wrappedIPv6 = false;
if (str_starts_with($ip, '[') && str_ends_with($ip, ']')) {
$wrappedIPv6 = true;
Expand Down

0 comments on commit b2789d1

Please sign in to comment.