Skip to content

[stable22] Improve local IP detection #33355

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

[stable22] Improve local IP detection #33355

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c0be5cc
Improve local IP detection
come-nc Jun 27, 2022
4b2fc65
Refactor local IP if and set strict to true for in_array
come-nc Jun 28, 2022
81c18a8
Check for local IPs nested in IPv6 as well
come-nc Jun 28, 2022
f4988d8
Use Symfony IpUtils to check for local IP ranges
come-nc Jul 12, 2022
f1fdc90
Copy IpUtils from Symfony to avoid new dependency on backport
come-nc Aug 1, 2022
6de71bd
Align copied file with our code style
come-nc Aug 1, 2022
3b42eb0
Remove call to undefined function, fix typing
come-nc Aug 1, 2022
e75a4d9
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
Use Symfony IpUtils to check for local IP ranges 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
  • Loading branch information
@come-nc @backportbot-nextcloud
come-nc authored and backportbot-nextcloud[bot] committed Jul 26, 2022
commit f4988d87ab94a82d701cebc86c6f32287417f009
9 changes: 6 additions & 3 deletions lib/private/Http/Client/LocalAddressChecker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,15 @@ public function __construct(ILogger $logger) {
}

public function ThrowIfLocalIp(string $ip) : void {
$localIps = ['100.100.100.200'];
$localRanges = [
'100.64.0.0/10', // See RFC 6598
'192.0.0.0/24', // See RFC 6890
];
if (
(bool)filter_var($ip, FILTER_VALIDATE_IP) &&
(
!filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) ||
in_array($ip, $localIps, true)
IpUtils::checkIp($ip, $localRanges)
)) {
$this->logger->warning("Host $ip was not connected to because it violates local access rules");
throw new LocalServerException('Host violates local access rules');
Expand All @@ -55,7 +58,7 @@ public function ThrowIfLocalIp(string $ip) : void {

if (
!filter_var($ipv4Address, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) ||
in_array($ipv4Address, $localIps, true)) {
IpUtils::checkIp($ip, $localRanges)) {
$this->logger->warning("Host $ip was not connected to because it violates local access rules");
throw new LocalServerException('Host violates local access rules');
}
Expand Down
5 changes: 5 additions & 0 deletions tests/lib/Http/Client/LocalAddressCheckerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ public function dataInternalIPs() : array {
['10.0.0.1'],
['::'],
['::1'],
['100.100.100.200'],
['192.0.0.1'],
];
}

Expand All @@ -116,6 +118,9 @@ public function dataPreventLocalAddress():array {
['another-host.local'],
['service.localhost'],
['!@#$'], // test invalid url
['100.100.100.200'],
['192.0.0.1'],
['randomdomain.internal'],
];
}

Expand Down