From 84d9aacc840ec77b9530a21b9c833242aa0bdbf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Pe=CC=81rez?= <jaime.perez@uninett.no>
Date: Mon, 4 Jul 2016 15:32:38 +0200
Subject: [PATCH] Capture errors when setting the auth token cookie.
If it fails for some reason, we clear all the authentication-related data from the session, log an error, and throw again the exception, so that the user does not continue as if anything happened when the auth token is not set.
---
lib/SimpleSAML/Session.php | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/lib/SimpleSAML/Session.php b/lib/SimpleSAML/Session.php
index b96ee69db..5bd89debe 100644
--- a/lib/SimpleSAML/Session.php
+++ b/lib/SimpleSAML/Session.php
@@ -560,11 +560,23 @@ class SimpleSAML_Session
$this->setRememberMeExpire();
} else {
- SimpleSAML\Utils\HTTP::setCookie(
- $globalConfig->getString('session.authtoken.cookiename', 'SimpleSAMLAuthToken'),
- $this->authToken,
- $sessionHandler->getCookieParams()
- );
+ try {
+ SimpleSAML\Utils\HTTP::setCookie(
+ $globalConfig->getString('session.authtoken.cookiename', 'SimpleSAMLAuthToken'),
+ $this->authToken,
+ $sessionHandler->getCookieParams()
+ );
+ } catch (SimpleSAML\Error\CannotSetCookie $e) {
+ /*
+ * Something went wrong when setting the auth token. We cannot recover from this, so we better log a
+ * message and throw an exception. The user is not properly logged in anyway, so clear all login
+ * information from the session.
+ */
+ unset($this->authToken);
+ unset($this->authData[$authority]);
+ \SimpleSAML\Logger::error('Cannot set authentication token cookie: '.$e->getMessage());
+ throw $e;
+ }
}
}
--
GitLab