Skip to content

[V33] Backchannel logout fix #29

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
memurats wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[V33] Backchannel logout fix #29

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a2ffd1
backchannel logout fix
memurats Oct 29, 2025
1424e83
Clean up LoginController by removing unused comments
memurats Dec 5, 2025
e6b556f
Merge branch 'main' into nmc/33/408-backchannel-logout-fix
memurats Dec 5, 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
57 changes: 40 additions & 17 deletions lib/Controller/LoginController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,26 @@ public function login(int $providerId, ?string $redirectUrl = null) {
return $this->buildErrorTemplateResponse($message, Http::STATUS_NOT_FOUND, ['reason' => 'provider unreachable']);
}

$state = $this->random->generate(32, ISecureRandom::CHAR_DIGITS . ISecureRandom::CHAR_UPPER);
$this->session->set(self::STATE, $state);
$this->session->set(self::REDIRECT_AFTER_LOGIN, $redirectUrl);
// $state = $this->random->generate(32, ISecureRandom::CHAR_DIGITS . ISecureRandom::CHAR_UPPER);
// $this->session->set(self::STATE, $state);
// $this->session->set(self::REDIRECT_AFTER_LOGIN, $redirectUrl);

$nonce = $this->random->generate(32, ISecureRandom::CHAR_DIGITS . ISecureRandom::CHAR_UPPER);
$this->session->set(self::NONCE, $nonce);
// $nonce = $this->random->generate(32, ISecureRandom::CHAR_DIGITS . ISecureRandom::CHAR_UPPER);
// $this->session->set(self::NONCE, $nonce);

// check if oidc state is present in session data
if ($this->session->exists(self::STATE)) {
$state = $this->session->get(self::STATE);
$nonce = $this->session->get(self::NONCE);
} else {
$state = $this->random->generate(32, ISecureRandom::CHAR_DIGITS . ISecureRandom::CHAR_UPPER);
$this->session->set(self::STATE, $state);
$this->session->set(self::REDIRECT_AFTER_LOGIN, $redirectUrl);

$nonce = $this->random->generate(32, ISecureRandom::CHAR_DIGITS . ISecureRandom::CHAR_UPPER);
$this->session->set(self::NONCE, $nonce);
$this->session->set(self::PROVIDERID, $providerId);
}

$oidcSystemConfig = $this->config->getSystemValue('user_oidc', []);
$isPkceSupported = in_array('S256', $discovery['code_challenge_methods_supported'] ?? [], true);
Expand All @@ -188,7 +202,7 @@ public function login(int $providerId, ?string $redirectUrl = null) {
$this->session->set(self::CODE_VERIFIER, $code_verifier);
}

$this->session->set(self::PROVIDERID, $providerId);
// $this->session->set(self::PROVIDERID, $providerId);
$this->session->close();

// get attribute mapping settings
Expand Down Expand Up @@ -601,16 +615,9 @@ public function code(string $state = '', string $code = '', string $scope = '',
$this->eventDispatcher->dispatchTyped(new UserLoggedInEvent($user, $user->getUID(), null, false));
}

$storeLoginTokenEnabled = $this->appConfig->getValueString(Application::APP_ID, 'store_login_token', '0', lazy: true) === '1';
if ($storeLoginTokenEnabled) {
// store all token information for potential token exchange requests
$tokenData = array_merge(
$data,
['provider_id' => $providerId],
);
$this->tokenService->storeToken($tokenData);
}
$this->config->setUserValue($user->getUID(), Application::APP_ID, 'had_token_once', '1');
// remove code login session values
$this->session->remove(self::STATE);
$this->session->remove(self::NONCE);

// Set last password confirm to the future as we don't have passwords to confirm against with SSO
$this->session->set('last-password-confirm', strtotime('+4 year', time()));
Expand All @@ -619,7 +626,7 @@ public function code(string $state = '', string $code = '', string $scope = '',
try {
$authToken = $this->authTokenProvider->getToken($this->session->getId());
$this->sessionMapper->createOrUpdateSession(
$idTokenPayload->sid ?? 'fallback-sid',
$idTokenPayload->{'urn:telekom.com:session_token'} ?? 'fallback-sid',
$idTokenPayload->sub ?? 'fallback-sub',
$idTokenPayload->iss ?? 'fallback-iss',
$authToken->getId(),
Expand Down Expand Up @@ -901,6 +908,22 @@ private function getBackchannelLogoutErrorResponse(
);
}

/**
* Backward compatible function for MagentaCLOUD to smoothly transition to new config
*
* @PublicPage
* @NoCSRFRequired
* @BruteForceProtection(action=userOidcBackchannelLogout)
*
* @param string $logout_token
* @return JSONResponse
* @throws Exception
* @throws \JsonException
*/
public function telekomBackChannelLogout(string $logout_token = '') {
return $this->backChannelLogout('Telekom', $logout_token);
}

private function toCodeChallenge(string $data): string {
// Basically one big work around for the base64url decode being weird
$h = pack('H*', hash('sha256', $data));
Expand Down
Loading