Skip to content
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

Jump to bottom

fix(request): Handle reverse proxy setting a port in Forwarded-For #43552

Merged
merged 4 commits into from
Feb 15, 2024
Merged

fix(request): Handle reverse proxy setting a port in Forwarded-For #43552

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ffcadf2
fix(request): Handle reverse proxy setting a port in Forwarded-For
Mika56 Feb 5, 2024
9ed3ab7
test(request): Add tests to strip the port when forwarding requests
nickvergessen Feb 13, 2024
c468408
fix(request): Fix regex handling and coding-style
nickvergessen Feb 13, 2024
696ed4a
fix(CS): Fix coding style
nickvergessen Feb 14, 2024
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
13 changes: 9 additions & 4 deletions lib/private/AppFramework/Http/Request.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,10 +607,15 @@ public function getRemoteAddress(): string {
if (isset($this->server[$header])) {
foreach (array_reverse(explode(',', $this->server[$header])) as $IP) {
$IP = trim($IP);

// remove brackets from IPv6 addresses
if (str_starts_with($IP, '[') && str_ends_with($IP, ']')) {
$IP = substr($IP, 1, -1);
$colons = substr_count($IP, ':');
if ($colons > 1) {
// Extract IP from string with brackets and optional port
if (preg_match('/^\[(.+?)\](?::\d+)?$/', $IP, $matches) && isset($matches[1])) {
$IP = $matches[1];
}
} elseif ($colons === 1) {
// IPv4 with port
$IP = substr($IP, 0, strpos($IP, ':'));
}

if ($this->isTrustedProxy($trustedProxies, $IP)) {
Expand Down
Loading
Loading