8000 [HttpFoundation] Add optional `$bytesToAnonymize` argument to `IpUtil… · symfony/symfony@dc6d42e · GitHub
[go: up one dir, main page]
Skip to content

Commit dc6d42e

Browse files
alexandre-dauboisalexandre-daubois
committed
[HttpFoundation] Add optional $bytesToAnonymize argument to IpUtils::anonymize() 
1 parent 99b25a1 commit dc6d42e

File tree

3 files changed

+92
-5
lines changed

3 files changed

+92
-5
lines changed

‎src/Symfony/Component/HttpFoundation/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ CHANGELOG
55
---
66

77
* Add optional `$requests` argument to `RequestStack::__construct()`
8+
* Add optional `$bytesToAnonymize` argument to `IpUtils::anonymize()`
89

910
7.1
1011
---

‎src/Symfony/Component/HttpFoundation/IpUtils.php

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,24 +179,46 @@ public static function checkIp6(string $requestIp, string $ip): bool
179179
* Anonymizes an IP/IPv6.
180180
*
181181
* Removes the last byte for v4 and the last 8 bytes for v6 IPs
182+
*
183+
* @param array{'v4'?: int<0, 4>, 'v6'?: int<0, 16>} $bytesToAnonymize
182184
*/
183-
public static function anonymize(string $ip): string
185+
public static function anonymize(string $ip/* , array $bytesToAnonymize = ['v4' => 1, 'v6' => 8]*/): string
184186
{
187+
$bytesToAnonymize = 1 < \func_num_args() ? func_get_arg(1) : ['v4' => 1, 'v6' => 8];
188+
$bytesForV4 = $bytesToAnonymize['v4'] ?? 1;
189+
$bytesForV6 = $bytesToAnonymize['v6'] ?? 8;
190+
191+
if ($bytesForV4 < 0 || $bytesForV6 < 0) {
192+
throw new \InvalidArgumentException('Cannot anonymize less than 0 bytes.');
193+
}
194+
195+
if ($bytesForV4 > 4 || $bytesForV6 > 16) {
196+
throw new \InvalidArgumentException('Cannot anonymize more than 4 bytes for IPv4 and 16 bytes for IPv6.');
197+
}
198+
185199
$wrappedIPv6 = false;
186200
if (str_starts_with($ip, '[') && str_ends_with($ip, ']')) {
187201
$wrappedIPv6 = true;
188202
$ip = substr($ip, 1, -1);
189203
}
190204

205+
$mappedIpV4MaskGenerator = function (string $mask, int $bytesToAnonymize) {
206+
$mask .= str_repeat('ff', 4 - $bytesToAnonymize);
207+
$mask .= str_repeat('00', $bytesToAnonymize);
208+
209+
return '::'.implode(':', str_split($mask, 4));
210+
};
211+
191212
$packedAddress = inet_pton($ip);
192213
if (4 === \strlen($packedAddress)) {
193-
$mask = '255.255.255.0';
214+
$mask = rtrim(str_repeat('255.', 4 - $bytesForV4).str_repeat('0.', $bytesForV4), '.');
194215
} elseif ($ip === inet_ntop($packedAddress & inet_pton('::ffff:ffff:ffff'))) {
195-
$mask = '::ffff:ffff:ff00';
216+
$mask = $mappedIpV4MaskGenerator('ffff', $bytesForV4);
196217
} elseif ($ip === inet_ntop($packedAddress & inet_pton('::ffff:ffff'))) {
197-
$mask = '::ffff:ff00';
218+
$mask = $mappedIpV4MaskGenerator('', $bytesForV4);
198219
} else {
199-
$mask = 'ffff:ffff:ffff:ffff:0000:0000:0000:0000';
220+
$mask = str_repeat('ff', 16 - $bytesForV6).str_repeat('00', $bytesForV6);
221+
$mask = implode(':', str_split($mask, 4));
200222
}
201223
$ip = inet_ntop($packedAddress & inet_pton($mask));
202224

‎src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,70 @@ public static function anonymizedIpData()
150150
];
151151
}
152152

153+
/**
154+
* @dataProvider anonymizedIpDataWithBytes
155+
*/
156+
public function testAnonymizeWithBytes($ip, $expected, $bytesToAnonymize)
157+
{
158+
$this->assertSame($expected, IpUtils::anonymize($ip, $bytesToAnonymize));
159+
}
160+
161+
public static function anonymizedIpDataWithBytes()
162+
{
163+
return [
164+
['192.168.1.1', '192.168.0.0', ['v4' => 2]],
165+
['192.168.1.1', '192.0.0.0', ['v4' => 3]],
166+
['192.168.1.1', '0.0.0.0', ['v4' => 4]],
167+
['1.2.3.4', '1.2.3.0', ['v4' => 1]],
168+
['1.2.3.4', '1.2.3.4', ['v4' => 0]],
169+
['2a01:198:603:0:396e:4789:8e99:890f', '2a01:198:603:0:396e:4789:8e99:890f', ['v6' => 0]],
170+
['2a01:198:603:0:396e:4789:8e99:890f', '2a01:198:603:0:396e:4789::', ['v6' => 4]],
171+
['2a01:198:603:10:396e:4789:8e9 9E88 9:890f', '2a01:198:603:10:396e:4700::', ['v6' => 5]],
172+
['2a01:198:603:10:396e:4789:8e99:890f', '2a00::', ['v6' => 15]],
173+
['2a01:198:603:10:396e:4789:8e99:890f', '::', ['v6' => 16]],
174+
['::1', '::', ['v6' => 1]],
175+
['0:0:0:0:0:0:0:1', '::', ['v6' => 1]],
176+
['1:0:0:0:0:0:0:1', '1::', ['v6' => 1]],
177+
['0:0:603:50:396e:4789:8e99:0001', '0:0:603::', ['v6' => 10]],
178+
['[0:0:603:50:396e:4789:8e99:0001]', '[::603:50:396e:4789:8e00:0]', ['v6' => 3]],
179+
['[2a01:198::3]', '[2a01:198::]', ['v6' => 2]],
180+
['::ffff:123.234.235.236', '::ffff:123.234.235.0', ['v4' => 1]], // IPv4-mapped IPv6 addresses
181+
['::123.234.235.236', '::123.234.0.0', ['v4' => 2]], // deprecated IPv4-compatible IPv6 address
182+
];
183+
}
184+
185+
public function testAnonymizeV4WithNegativeBytes()
186+
{
187+
$this->expectException(\InvalidArgumentException::class);
188+
$this->expectExceptionMessage('Cannot anonymize less than 0 bytes.');
189+
190+
IpUtils::anonymize('anything', ['v4' => -1]);
191+
}
192+
1 F104 93+
public function testAnonymizeV6WithNegativeBytes()
194+
{
195+
$this->expectException(\InvalidArgumentException::class);
196+
$this->expectExceptionMessage('Cannot anonymize less than 0 bytes.');
197+
198+
IpUtils::anonymize('anything', ['v6' => -1]);
199+
}
200+
201+
public function testAnonymizeV4WithTooManyBytes()
202+
{
203+
$this->expectException(\InvalidArgumentException::class);
204+
$this->expectExceptionMessage('Cannot anonymize more than 4 bytes for IPv4 and 16 bytes for IPv6.');
205+
206+
IpUtils::anonymize('anything', ['v4' => 5]);
207+
}
208+
209+
public function testAnonymizeV6WithTooManyBytes()
210+
{
211+
$this->expectException(\InvalidArgumentException::class);
212+
$this->expectExceptionMessage('Cannot anonymize more than 4 bytes for IPv4 and 16 bytes for IPv6.');
213+
214+
IpUtils::anonymize('anything', ['v6' => 17]);
215+
}
216+
153217
/**
154218
* @dataProvider getIp4SubnetMaskZeroData
155219
*/

0 commit comments

Comments
 (0)
0