Skip to content

[stable24] Detect weird local ips #35141

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
come-nc merged 7 commits into from
Nov 21, 2022
Merged

[stable24] Detect weird local ips #35141

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e5b4a09
Harden tests for local IP detection in URLs
come-nc Sep 20, 2022
1eed8fd
Add missing urldecode and idn_to_utf8 calls to local address checker
come-nc Sep 20, 2022
012576a
Use new dependency to normalize IPs
come-nc Sep 20, 2022
e0d588b
Fix tests for nested v4 in v6
come-nc Sep 20, 2022
4019ef3
Fix idn_to_utf8 stub signature
come-nc Sep 22, 2022
9a774bd
Add mlocati/ip-lib dependency
come-nc Nov 14, 2022
5c6c1c0
Update 3rdparty to latests stable24
come-nc Nov 17, 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 new dependency to normalize IPs 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Nov 14, 2022
commit 012576a3f4572d127917f039b2e423242b27136c
13 changes: 13 additions & 0 deletions lib/private/Http/Client/LocalAddressChecker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
*/
namespace OC\Http\Client;

use IPLib\Factory;
use IPLib\ParseStringFlag;
use OCP\Http\Client\LocalServerException;
use Psr\Log\LoggerInterface;
use OC\Http\IpUtils;
Expand All @@ -37,6 +39,17 @@ public function __construct(LoggerInterface $logger) {
}

public function ThrowIfLocalIp(string $ip) : void {
$parsedIp = Factory::parseAddressString(
$ip,
ParseStringFlag::IPV4_MAYBE_NON_DECIMAL | ParseStringFlag::IPV4ADDRESS_MAYBE_NON_QUAD_DOTTED
);
if ($parsedIp === null) {
/* Not an IP */
return;
}
/* Replace by normalized form */
$ip = (string)$parsedIp;

$localRanges = [
'100.64.0.0/10', // See RFC 6598
'192.0.0.0/24', // See RFC 6890
Expand Down