From e0ada881dda4045ae51cc3d2a36412f128e0b504 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Tue, 3 Aug 2010 07:23:43 +0000
Subject: [PATCH] Remove unnecessary test for empty session.
SimpleSAML_Session::getInstance() never returns NULL, so don't
test for it. Also removes an error message from the dictionary.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2464 44740490-163a-0410-bde0-09ae8108e29a
---
dictionaries/errors.definition.json | 6 ----
dictionaries/errors.translation.json | 37 -------------------------
modules/InfoCard/www/getcardform.php | 3 --
modules/InfoCard/www/login-infocard.php | 3 --
www/auth/login-admin.php | 3 --
www/auth/login-ldapmulti.php | 3 --
www/auth/login-radius.php | 3 --
www/auth/login-tlsclient.php | 3 --
8 files changed, 61 deletions(-)
diff --git a/dictionaries/errors.definition.json b/dictionaries/errors.definition.json
index f445a4b77..2b0695080 100644
--- a/dictionaries/errors.definition.json
+++ b/dictionaries/errors.definition.json
@@ -80,12 +80,6 @@
"descr_NORELAYSTATE": {
"en": "The initiator of this request did not provide a RelayState parameter indicating where to go next."
},
- "title_NOSESSION": {
- "en": "No session found"
- },
- "descr_NOSESSION": {
- "en": "Unfortunately, we could not obtain your session information. This could be because your browser does not support cookies, or cookie handling is disabled. Alternately, your session timed out because you let the browser open for a long time."
- },
"title_PROCESSASSERTION": {
"en": "Error processing response from Identity Provider"
},
diff --git a/dictionaries/errors.translation.json b/dictionaries/errors.translation.json
index 5dd0332d3..1499ea2ed 100644
--- a/dictionaries/errors.translation.json
+++ b/dictionaries/errors.translation.json
@@ -508,43 +508,6 @@
"pt": "Este pedido foi iniciado sem o par\u00e2metro RelayState necess\u00e1rio para continuar com o processamento.",
"tr": "Bu iste\u011fin ba\u015flat\u0131c\u0131s\u0131, bir sonraki gidi\u015f yerini bildiren RelayState parametresini sa\u011flamam\u0131\u015f."
},
- "title_NOSESSION": {
- "no": "Ingen informasjon om arbeids\u00f8kta",
- "nn": "Fann ikkje sesjon",
- "sv": "Ingen session hittad",
- "es": "Sesión no encontrada",
- "fr": "Aucune session trouv\u00e9e",
- "de": "Keine Session gefunden",
- "nl": "Geen sessie gevonden",
- "lb": "Keng Sessioun fonnt",
- "sl": "Veljavne seje ni bilo mogo\u010de najti",
- "da": "Ingen session",
- "hr": "Nije prona\u0111ena valjana SSO sjednica",
- "hu": "Nincs \u00e9rv\u00e9nyes munkamenet",
- "fi": "Istuntoa ei l\u00f6ytynyt",
- "pt-BR": "Sess\u00e3o n\u00e3o encontrada",
- "pt": "Sess\u00e3o n\u00e3o encontrada",
- "pl": "Nie znaleziono sesji",
- "tr": "Oturum bulunamad\u0131."
- },
- "descr_NOSESSION": {
- "no": "Dessverre finner vi ingen informasjon om arbeids\u00f8kta di. Det kan skyldes at du har sl\u00e5tt av handtering av informasjonskapsler (cookies) i nettleseren din, eller at nettleseren har v\u00e6rt \u00e5pen s\u00e5 lenge at maksimaltiden er overskredet.",
- "nn": "Vi var ikkje i stand til \u00e5 finna sesjonen din. Det kan vera fordi du mangler Cookies i webklienten din, eller dei er skrudd av hos deg. Eller det kan vera fordi sesjonen din er blitt for gammel, noko som skjer dersom webklienten har st\u00e5tt open lenge.",
- "sv": "Tyv\u00e4rr kunde inte din session hittas. Detta kan bero p\u00e5 att din webbl\u00e4sare inte kan hantera webbl\u00e4sarkakor (cookies) eller att de inte till\u00e5ts. Men det kan ocks\u00e5 vara s\u00e5 att webbl\u00e4saren har varit startad s\u00e5 l\u00e4nge att maxtiden sessionen har uppn\u00e5tts.",
- "es": "Desgraciadamente no hemos podido recuperar su sesión. Esto podría deberse a que su navegador no soporte cookies o a que las cookies están deshabilitadas.. O quizás su sesión caducó si dejó su navegador abierto durante un periodo importante de tiempo.",
- "fr": "Nous n'avons malheureusement pas pu reconnaitre votre session. Cela peut \u00eatre parce que votre navigateur ne prend pas en charge les cookies ou que les cookies sont d\u00e9sactiv\u00e9s. Ou peut-\u00eatre votre session a expir\u00e9 parce que vous avez laiss\u00e9 votre navigateur inactif un long moment.",
- "de": "Die Session konnte nicht gefunden werden. M\u00f6glicherweise unterst\u00fctzt der Browser keine Cookies, oder Cookies sind deaktiviert. Eventuell ist die Session auch abgelaufen, weil der Browser zu lange offen war.",
- "nl": "Helaas kon er geen sessie worden gevonden. Dit kan worden veroorzaakt omdat uw browsser geen cookies ondersteunt, of deze niet gebruikt. Ook kan uw sessie verlopen zijn omdat uw browser al langere tijd openstaat.",
- "lb": "Ongl\u00ebcklecherweis konnte mer aer Sessioun net feststellen. Ursach dofir kint sin dass aeren Browser keng cookies \u00ebnnerst\u00ebtzt oder des Funktioun d\u00e9saktiv\u00e9iert as. Alternativ kinnt et och sin dass aer Sessioun ofgelaaf as well den Browser ze lang op wor.",
- "sl": "\u017dal va\u0161e seje ni bilo mogo\u010de najti. Vzrok je lahko va\u0161 brskalnik, ki ne podpira pi\u0161kotkov, ali pa so pi\u0161kotki onemogo\u010deni. Drug mo\u017een vzrok je iztek \u010dasovne omejitve seje, ker ste pustili brskalnik predolgo odprt.",
- "da": "Det var ikke muligt at finde din session. Dette kan skyldes at din browser ikke underst\u00f8tter cookies eller at underst\u00f8ttelse af cookies er sl\u00e5et fra. Eller hvis du har haft din browser \u00e5bent l\u00e6nge, kan din session v\u00e6re udl\u00f8bet. ",
- "hr": "Na \u017ealost, sustav ne mo\u017ee prona\u0107i podatke o va\u0161oj <i>Single Sign-On<\/i> sjednici. Ova gre\u0161ka mo\u017ee se dogoditi ako va\u0161 web preglednik nema omogu\u0107enu podr\u0161ku za tzv. kola\u010di\u0107e (cookies). Tako\u0111er, navedena gre\u0161ka mogla se dogoditi i ako ste va\u0161 web preglednik ostavili predugo otvoren.",
- "hu": "Sajnos nem tudunk \u00e9rv\u00e9nyes munkamenetet (session) meghat\u00e1rozni. Lehets\u00e9ges, hogy b\u00f6ng\u00e9sz\u0151je nem t\u00e1mogatja a cookie-kat, illetve ezek le vannak tiltva. Amennyiben b\u00f6ng\u00e9sz\u0151je m\u00e1r r\u00e9g\u00f3ta meg van nyitva, az is el\u0151fordulhat, hogy a munkamenet \u00e9rv\u00e9nyess\u00e9ge lej\u00e1rt.",
- "fi": "Valitettavasti istunnon tietoja ei ollut saatavana. T\u00e4m\u00e4 voi johtua selaimesta, joka ei hyv\u00e4ksy ev\u00e4steit\u00e4, tai ev\u00e4steet ovat kiellettyj\u00e4 selaimessa. Toinen vaihtoehto on, ett\u00e4 istuntosi vanheni koska j\u00e4tit selaimen auki liian kauan.",
- "pt-BR": "Infelizmente, n\u00e3o foi poss\u00edvel obter informa\u00e7\u00f5es da sua sess\u00e3o. Isso pode ter ocorrido porque o seu navegador n\u00e3o suporta cookies ou a movimenta\u00e7\u00e3o de cookies est\u00e1 desativado. Alternadamente, sua sess\u00e3o expirou, pois voc\u00ea deixou o navegador aberto por muito tempo.",
- "pt": "N\u00e3o foi poss\u00edvel encontrar informa\u00e7\u00e3o acerca da sua sess\u00e3o. Este problema pode ser causado por o seu browser n\u00e3o suportar cookies ou ter este suporte desactivado. Em alternativa, a sua sess\u00e3o pode ter expirado por ter deixado o browser aberto durante muito tempo.",
- "tr": "Ne yaz\u0131k ki oturum bilgilerinizi alamad\u0131k. Bu, taray\u0131c\u0131n\u0131z\u0131n \u00e7erez (cookie) desteklememesi ya da \u00e7erez deste\u011finin devre d\u0131\u015f\u0131 b\u0131rak\u0131lmas\u0131 nedeniyle olu\u015fmu\u015f olabilir. Ba\u015fka bir olas\u0131l\u0131k, taray\u0131c\u0131n\u0131z\u0131n uzun s\u00fcre a\u00e7\u0131k kalmas\u0131 sebebiyle oturumunuzun s\u00fcresinin dolmas\u0131d\u0131r."
- },
"title_PROCESSASSERTION": {
"no": "Feil i behandling av svar fra innloggingstjenesten",
"nn": "Feil under handtering av svar fr\u00e5 IdP",
diff --git a/modules/InfoCard/www/getcardform.php b/modules/InfoCard/www/getcardform.php
index 5be85584b..c4dd9af68 100644
--- a/modules/InfoCard/www/getcardform.php
+++ b/modules/InfoCard/www/getcardform.php
@@ -20,9 +20,6 @@ $Infocard = $autoconfig->getValue('InfoCard');
/* Load the session of the current user. */
$session = SimpleSAML_Session::getInstance();
-if($session == NULL) {
- SimpleSAML_Utilities::fatalError($session->getTrackID(), 'NOSESSION');
-}
if (!array_key_exists('AuthState', $_REQUEST)) {
SimpleSAML_Logger::debug('NO AUTH STATE');
diff --git a/modules/InfoCard/www/login-infocard.php b/modules/InfoCard/www/login-infocard.php
index af12e8f85..9d0ae3bf6 100644
--- a/modules/InfoCard/www/login-infocard.php
+++ b/modules/InfoCard/www/login-infocard.php
@@ -27,9 +27,6 @@ $contact_info_URL = $autoconfig->getValue('contact_info_URL');
/* Load the session of the current user. */
$session = SimpleSAML_Session::getInstance();
-if($session == NULL) {
- SimpleSAML_Utilities::fatalError($session->getTrackID(), 'NOSESSION');
-}
if (!array_key_exists('AuthState', $_REQUEST)) {
diff --git a/www/auth/login-admin.php b/www/auth/login-admin.php
index b68c265d1..347b19969 100644
--- a/www/auth/login-admin.php
+++ b/www/auth/login-admin.php
@@ -13,9 +13,6 @@ $error = null;
$attributes = array();
$username = null;
-if (empty($session))
- SimpleSAML_Utilities::fatalError($session->getTrackID(), 'NOSESSION');
-
/* Load the RelayState argument. The RelayState argument contains the address
* we should redirect the user to after a successful authentication.
*/
diff --git a/www/auth/login-ldapmulti.php b/www/auth/login-ldapmulti.php
index f5a35845a..4242990ae 100644
--- a/www/auth/login-ldapmulti.php
+++ b/www/auth/login-ldapmulti.php
@@ -13,9 +13,6 @@ require_once($ldapconfigfile);
SimpleSAML_Logger::info('AUTH - ldap-multi: Accessing auth endpoint login-ldapmulti');
-if (empty($session))
- SimpleSAML_Utilities::fatalError($session->getTrackID(), 'NOSESSION');
-
$error = null;
$attributes = array();
diff --git a/www/auth/login-radius.php b/www/auth/login-radius.php
index af9d9686a..073b90e84 100644
--- a/www/auth/login-radius.php
+++ b/www/auth/login-radius.php
@@ -12,9 +12,6 @@ SimpleSAML_Logger::info('AUTH - radius: Accessing auth endpoint login');
$error = null;
$attributes = array();
-if (empty($session))
- SimpleSAML_Utilities::fatalError($session->getTrackID(), 'NOSESSION');
-
/* Load the RelayState argument. The RelayState argument contains the address
* we should redirect the user to after a successful authentication.
*/
diff --git a/www/auth/login-tlsclient.php b/www/auth/login-tlsclient.php
index 9570945cb..af8f164c6 100644
--- a/www/auth/login-tlsclient.php
+++ b/www/auth/login-tlsclient.php
@@ -16,9 +16,6 @@ $error = null;
$attributes = array();
$username = null;
-if (empty($session))
- SimpleSAML_Utilities::fatalError($session->getTrackID(), 'NOSESSION');
-
/* Load the RelayState argument. The RelayState argument contains the address
* we should redirect the user to after a successful authentication.
*/
--
GitLab