Skip to content
Snippets Groups Projects
Commit f294b508 authored by Olav Morken's avatar Olav Morken
Browse files

Add error message for errors due to logout information being lost during a logout operation.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@580 44740490-163a-0410-bde0-09ae8108e29a
parent 0d422549
No related branches found
No related tags found
No related merge requests found
......@@ -632,4 +632,13 @@ $lang = array(
'es' => 'La clave de acceso del fichero de configuración (auth.adminpassword) no ha sido cambiada de su valor por defecto. Por favor, edite dicho fichero'
),
'title_LOGOUTINFOLOST' => array(
'en' => 'Logout information lost',
'no' => 'Informasjon om utlogging er tapt',
),
'descr_LOGOUTINFOLOST' => array(
'en' => 'The information about the current logout operation has been lost. You should return to the service you were trying to log out from and try to log out again. This error can be caused by the logout information expiring. The logout information is stored for a limited amout of time - usually a number of hours. This is longer than any normal logout operation should take, so this error may indicate some other error with the configuration. If the problem persists, contact your service provider.',
'no' => 'Informasjonen om den nåværende utloggingen har gått tapt. Du bør gå tilbake til den opprinnelige tjesesten og prøve å logge ut på nytt. Informasjon om utloggingsoperasjoner er kun lagret i en begrenset tid - vanligvis noen timer. Dette er lengere tid enn en vanlig utlogging skal ta, så denne feilen kan tyde på at noe er galt med oppsettet. Ta kontakt med tjenesteyteren hvis problemet gjentar seg.',
),
);
\ No newline at end of file
......@@ -319,7 +319,7 @@ if ($session->getAuthority() == 'shib13') {
try {
if(!$logoutInfo) {
throw new Exception('The logout information has been lost during logout processing.');
SimpleSAML_Utilities::fatalError($session->getTrackID(), 'LOGOUTINFOLOST');
}
SimpleSAML_Logger::debug('SAML2.0 - IdP.SingleLogoutService: Found logout info with these keys: ' . join(',', array_keys($logoutInfo)));
......
......@@ -110,7 +110,7 @@ if (isset($_GET['SAMLRequest'])) {
$returnTo = $session->getData('spLogoutReturnTo', $id);
if(empty($returnTo)) {
SimpleSAML_Utilities::fatalError($session->getTrackID(), 'NORELAYSTATE');
SimpleSAML_Utilities::fatalError($session->getTrackID(), 'LOGOUTINFOLOST');
}
SimpleSAML_Utilities::redirect($returnTo);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment