Skip to content

IDP SAML2: added 'as:NoSession' #644

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
tbenr wants to merge 4 commits into
base: master
Choose a base branch
from
+23 −12
Open

IDP SAML2: added 'as:NoSession' #644

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ebadd8
added 'as:NoSession'
Jun 23, 2017
e5efb27
Merge branch 'master' into for_pull_req2
tbenr Jun 20, 2018
fc2cae8
Merge branch 'master' into for_pull_req2
tvdijen Nov 22, 2019
73c8f6a
Merge branch 'master' into for_pull_req2
tvdijen Sep 8, 2021
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
35 changes: 23 additions & 12 deletions modules/saml/lib/IdP/SAML2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,19 @@ public static function sendResponse(array $state): void
$assertion->setAuthenticatingAuthority($state['saml:AuthenticatingAuthority']);
}

// create the session association (for logout)
$association = [
'id' => 'saml:' . $spEntityId,
'Handler' => '\SimpleSAML\Module\saml\IdP\SAML2',
'Expires' => $assertion->getSessionNotOnOrAfter(),
'saml:entityID' => $spEntityId,
'saml:NameID' => $state['saml:idp:NameID'],
'saml:SessionIndex' => $assertion->getSessionIndex(),
];
$noSession = isset($state['as:NoSession']) && $state['as:NoSession'];
// if current AuthenticationSource says no session: do not to be released to SP (no SLO)
if (!$noSession) {
// create the session association (for logout)
$association = [
'id' => 'saml:' . $spEntityId,
'Handler' => '\SimpleSAML\Module\saml\IdP\SAML2',
'Expires' => $assertion->getSessionNotOnOrAfter(),
'saml:entityID' => $spEntityId,
'saml:NameID' => $state['saml:idp:NameID'],
'saml:SessionIndex' => $assertion->getSessionIndex(),
];
}

// maybe encrypt the assertion
$assertion = self::encryptAssertion($idpMetadata, $spMetadata, $assertion);
Expand All @@ -100,8 +104,11 @@ public static function sendResponse(array $state): void
$ar->setRelayState($relayState);
$ar->setAssertions([$assertion]);

// register the session association with the IdP
$idp->addAssociation($association);
// if current AuthenticationSource says no session to be released to SP (no SLO)
if (!$noSession) {
// register the session association with the IdP
$idp->addAssociation($association);
}

$statsData = [
'spEntityID' => $spEntityId,
Expand Down Expand Up @@ -1146,7 +1153,11 @@ private static function buildAssertion(
$a->setSessionNotOnOrAfter($sessionStart + $sessionLifetime);

$randomUtils = new Utils\Random();
$a->setSessionIndex($randomUtils->generateID());
$noSession = isset($state['as:NoSession']) && $state['as:NoSession'];
// if current AuthenticationSource says no session to be released to SP (no SLO)
if (!$noSession) {
$a->setSessionIndex($randomUtils->generateID());
}

$sc = new SubjectConfirmation();
$scd = new SubjectConfirmationData();
Expand Down