Skip to content

[stable23] Detect weird local ips #35144

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

[stable23] Detect weird local ips #35144

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
1c58ba5
Harden tests for local IP detection in URLs
come-nc Sep 20, 2022
72f60a6
Add missing urldecode and idn_to_utf8 calls to local address checker
come-nc Sep 20, 2022
be07051
Use new dependency to normalize IPs
come-nc Sep 20, 2022
96d3d09
Fix tests for nested v4 in v6
come-nc Sep 20, 2022
5eddbac
Fix idn_to_utf8 stub signature
come-nc Sep 22, 2022
8360bb8
Add mlocati/ip-lib dependency
come-nc Nov 14, 2022
6bdb5d2
Pass default values to idn_to_utf8 to fix behavior under PHP 7.3
come-nc Nov 15, 2022
b5c8efa
Update 3rdparty to latest stable23
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
Pass default values to idn_to_utf8 to fix behavior under PHP 7.3 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Nov 15, 2022
commit 6bdb5d28042f8b142416f2abb3ae663a4755e5be
2 changes: 1 addition & 1 deletion lib/private/Http/Client/DnsPinMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public function addDnsPinning() {
$ports[] = (string)$port;
}

$targetIps = $this->dnsResolve(idn_to_utf8($hostName), 0);
$targetIps = $this->dnsResolve(idn_to_utf8($hostName, IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46), 0);

$curlResolves = [];

Expand Down
2 changes: 1 addition & 1 deletion lib/private/Http/Client/LocalAddressChecker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public function ThrowIfLocalAddress(string $uri) : void {
throw new LocalServerException('Could not detect any host');
}

$host = idn_to_utf8(strtolower(urldecode($host)));
$host = idn_to_utf8(strtolower(urldecode($host)), IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46);
// Remove brackets from IPv6 addresses
if (strpos($host, '[') === 0 && substr($host, -1) === ']') {
$host = substr($host, 1, -1);
Expand Down