Skip to content

fix(DnsPinMiddleware): Don't log misleading port value / log request port instead #50583

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

Open
joshtrichards wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(DnsPinMiddleware): Don't log misleading port value / log request port instead #50583

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e07c89d
fix(DnsPinMiddleware): Don't log misleading port value
joshtrichards Jan 31, 2025
a1be491
fix: log request port instead since it's more relevant to the admin
joshtrichards Jan 31, 2025
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
9 changes: 5 additions & 4 deletions lib/private/Http/Client/DnsPinMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,15 @@ public function addDnsPinning() {
}

$hostName = (string)$request->getUri()->getHost();
$port = $request->getUri()->getPort();
$requestPort = $request->getUri()->getPort();

$ports = [
'80',
'443',
];

if ($port !== null) {
$ports[] = (string)$port;
if ($requestPort !== null) {
$ports[] = (string)$requestPort;
}

$targetIps = $this->dnsResolve(idn_to_utf8($hostName), 0);
Expand All @@ -135,7 +135,8 @@ public function addDnsPinning() {
foreach ($targetIps as $ip) {
if ($this->ipAddressClassifier->isLocalAddress($ip)) {
// TODO: continue with all non-local IPs?
throw new LocalServerException('Host "' . $ip . '" (' . $hostName . ':' . $port . ') violates local access rules');
// log requestPort because that's more relevant to the admin
throw new LocalServerException('Host "' . $ip . '" (' . $hostName . ':' . $requestPort . ') violates local access rules');
}
$curlResolves["$hostName:$port"][] = $ip;
}
Expand Down
Loading