private/desktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adasd
All checks were successful
Deploy / deploy-staging (push) Successful in 42s
Details
Deploy / deploy-production (push) Has been skipped
Details

Browse Source
This commit is contained in:
Lars Gebhardt-Kusche
2026-06-08 02:52:05 +02:00
parent 1ae7b98378
commit dc2fbbc496
1 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/App/KeycloakAuth.php
View File

@@ -214,10 +214,8 @@ final class KeycloakAuth
public function redirectUri(): string public function redirectUri(): string
{ {
$path = (string) ($this->config['redirect_path'] ?? '/auth/callback'); $path = (string) ($this->config['redirect_path'] ?? '/auth/callback');
$scheme = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
$host = (string) ($_SERVER['HTTP_HOST'] ?? 'localhost');
return $scheme . '://' . $host . $path; return $this->requestOrigin() . $path;
} }
public function baseUrl(): string public function baseUrl(): string
@@ -266,10 +264,52 @@ final class KeycloakAuth
private function postLogoutRedirectUri(): string private function postLogoutRedirectUri(): string
{ {
$scheme = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http'; return $this->requestOrigin() . '/auth/login';
$host = (string) ($_SERVER['HTTP_HOST'] ?? 'localhost'); }
return $scheme . '://' . $host . '/auth/login'; private function requestOrigin(): string
{
$forwardedProto = trim((string) ($_SERVER['HTTP_X_FORWARDED_PROTO'] ?? ''));
$forwardedHost = trim((string) ($_SERVER['HTTP_X_FORWARDED_HOST'] ?? ''));
$forwardedPort = trim((string) ($_SERVER['HTTP_X_FORWARDED_PORT'] ?? ''));
$scheme = $this->normalizeForwardedValue($forwardedProto);
if ($scheme === '') {
$scheme = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
}
$host = $this->normalizeForwardedValue($forwardedHost);
if ($host === '') {
$host = (string) ($_SERVER['HTTP_HOST'] ?? $_SERVER['SERVER_NAME'] ?? 'localhost');
}
if ($forwardedPort !== '') {
$port = $this->normalizeForwardedValue($forwardedPort);
$hostWithoutPort = preg_replace('/:\d+$/', '', $host) ?? $host;
if (
$port !== ''
&& !str_contains($host, ':')
&& !(($scheme === 'https' && $port === '443') || ($scheme === 'http' && $port === '80'))
) {
$host = $hostWithoutPort . ':' . $port;
}
}
return $scheme . '://' . $host;
}
private function normalizeForwardedValue(string $value): string
{
if ($value === '') {
return '';
}
$first = trim(explode(',', $value)[0] ?? '');
return strtolower($first);
} }
/** /**