Skip to content

Fix backchannel logout for Telekom and keep backward compatibility V31 #17

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
wants to merge 8 commits into
base: main
Choose a base branch
from
+81 −10
Open

Fix backchannel logout for Telekom and keep backward compatibility V31 #17

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ae5e5b7
Fix backchannel logout changes
memurats Nov 12, 2024
e6d118e
Fix OIDC state mismatch
memurats Nov 12, 2024
d1cfd56
fixed code style
memurats Nov 14, 2024
65be061
Merge branch 'main' into nmc/408-fix-backchannel-logout
memurats Jan 14, 2025
b255fb5
Merge branch 'main' into nmc/408-fix-backchannel-logout
memurats Feb 4, 2025
d67ca04
fix errors
memurats Feb 4, 2025
f205685
fix merge error
memurats Feb 6, 2025
90207a1
Merge branch 'main' into nmc/408-fix-backchannel-logout
memurats Oct 28, 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
91 changes: 81 additions & 10 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,6 +615,22 @@ public function code(string $state = '', string $code = '', string $scope = '',
$this->eventDispatcher->dispatchTyped(new UserLoggedInEvent($user, $user->getUID(), null, false));
}

// remove code login session values
$this->session->remove(self::STATE);
$this->session->remove(self::NONCE);

// $tokenExchangeEnabled = (isset($oidcSystemConfig['token_exchange']) && $oidcSystemConfig['token_exchange'] === true);
// if ($tokenExchangeEnabled) {
// 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');
/*
$storeLoginTokenEnabled = $this->appConfig->getValueString(Application::APP_ID, 'store_login_token', '0') === '1';
if ($storeLoginTokenEnabled) {
// store all token information for potential token exchange requests
Expand All @@ -611,6 +641,7 @@ public function code(string $state = '', string $code = '', string $scope = '',
$this->tokenService->storeToken($tokenData);
}
$this->config->setUserValue($user->getUID(), Application::APP_ID, 'had_token_once', '1');
*/

// 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 +650,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 @@ -723,7 +754,9 @@ public function singleLogoutService() {
}

// cleanup related oidc session
$this->sessionMapper->deleteFromNcSessionId($this->session->getId());
// it is not a good idea to remove the session early as some IDM send a backchannel logout also to the initiating system.
// This will falsely fail if already deleted. So rely always on backchannel cleanup or make this an option?
// $this->sessionMapper->deleteFromNcSessionId($this->session->getId());

$this->userSession->logout();

Expand Down Expand Up @@ -792,7 +825,28 @@ public function backChannelLogout(string $providerIdentifier, string $logout_tok
);
}

if (!isset($logoutTokenPayload->iss)) {
// get the auth token ID associated with the logout token's sid attr
$sid = $logoutTokenPayload->sid;
try {
$oidcSession = $this->sessionMapper->findSessionBySid($sid);
} catch (DoesNotExistException $e) {
return $this->getBackchannelLogoutErrorResponse(
'invalid SID',
'The sid of the logout token was not found',
['session_sid_not_found' => $sid]
);
} catch (MultipleObjectsReturnedException $e) {
return $this->getBackchannelLogoutErrorResponse(
'invalid SID',
'The sid of the logout token was found multiple times',
['multiple_logout_tokens_found' => $sid]
);
}

$sub = $logoutTokenPayload->sub;
// if ($oidcSession->getSub() !== $sub) {
// handle sub only if it is available; session is enough to identify a logout
if (isset($logoutTokenPayload->sub) && ($oidcSession->getSub() !== $sub)) {
return $this->getBackchannelLogoutErrorResponse(
'invalid iss',
'The logout token should contain an iss attribute',
Expand Down Expand Up @@ -874,7 +928,24 @@ public function backChannelLogout(string $providerIdentifier, string $logout_tok
$this->sessionMapper->delete($oidcSession);
}

return new JSONResponse([], Http::STATUS_OK);
// return new JSONResponse([], Http::STATUS_OK);
return new JSONResponse();
}

/**
* 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);
}

/**
Expand Down
Loading