Request now returns an exception instead of a string

Author: EC2 Default User

lib/Saml2/Auth.php

@@ -109,11 +109,11 @@ class OneLogin_Saml2_Auth
     private $_errors = array();
 
     /**
-     * Reason of the last error.
+     * Last error exception object.
      *
-     * @var string|null
+     * @var Exception|null
      */
-    private $_errorReason;
+    private $_lastError;
 
     /**
      * Last AuthNRequest ID or LogoutRequest ID generated by this Service Provider
@@ -188,7 +188,7 @@ public function setStrict($value)
     public function processResponse($requestId = null)
     {
         $this->_errors = array();
-        $this->_errorReason = null;
+        $this->_lastError = null;
         if (isset($_POST) && isset($_POST['SAMLResponse'])) {
             // AuthnResponse -- HTTP_POST Binding
             $response = new OneLogin_Saml2_Response($this->_settings, $_POST['SAMLResponse']);
@@ -207,7 +207,7 @@ public function processResponse($requestId = null)
                 $this->_lastAssertionNotOnOrAfter = $response->getAssertionNotOnOrAfter();
             } else {
                 $this->_errors[] = 'invalid_response';
-                $this->_errorReason = $response->getError();
+                $this->_lastError = $response->getError();
             }
         } else {
             $this->_errors[] = 'invalid_binding';
@@ -234,13 +234,13 @@ public function processResponse($requestId = null)
     public function processSLO($keepLocalSession = false, $requestId = null, $retrieveParametersFromServer = false, $cbDeleteSession = null, $stay = false)
     {
         $this->_errors = array();
-        $this->_errorReason = null;
+        $this->_lastError = null;
         if (isset($_GET) && isset($_GET['SAMLResponse'])) {
             $logoutResponse = new OneLogin_Saml2_LogoutResponse($this->_settings, $_GET['SAMLResponse']);
             $this->_lastResponse = $logoutResponse->getXML();
             if (!$logoutResponse->isValid($requestId, $retrieveParametersFromServer)) {
                 $this->_errors[] = 'invalid_logout_response';
-                $this->_errorReason = $logoutResponse->getError();
+                $this->_lastError = $logoutResponse->getError();
             } else if ($logoutResponse->getStatus() !== OneLogin_Saml2_Constants::STATUS_SUCCESS) {
                 $this->_errors[] = 'logout_not_success';
             } else {
@@ -258,7 +258,7 @@ public function processSLO($keepLocalSession = false, $requestId = null, $retrie
             $this->_lastRequest = $logoutRequest->getXML();
             if (!$logoutRequest->isValid($retrieveParametersFromServer)) {
                 $this->_errors[] = 'invalid_logout_request';
-                $this->_errorReason = $logoutRequest->getError();
+                $this->_lastError = $logoutRequest->getError();
             } else {
                 if (!$keepLocalSession) {
                     if ($cbDeleteSession === null) {
@@ -406,6 +406,17 @@ public function getErrors()
      * @return string|null  Error reason
      */
     public function getLastErrorReason()
+    {
+        return htmlentities($this->_lastError->getMessage());
+    }
+
+
+    /**
+     * Returns the last error
+     *
+     * @return Exception Error
+     */
+    public function getLastError()
     {
         return $this->_errorReason;
     }

lib/Saml2/LogoutRequest.php

@@ -44,7 +44,7 @@ class OneLogin_Saml2_LogoutRequest
     /**
      * After execute a validation process, this var contains the cause
      *
-     * @var string
+     * @var Exception
      */
     private $_error;
 
@@ -397,10 +397,10 @@ public function isValid($retrieveParametersFromServer = false)
 
             return true;
         } catch (Exception $e) {
-            $this->_error = $e->getMessage();
+            $this->_error = $e;
             $debug = $this->_settings->isDebugActive();
             if ($debug) {
-                echo htmlentities($this->_error);
+                echo htmlentities($this->_error->getMessage());
             }
             return false;
         }

lib/Saml2/Response.php

@@ -60,7 +60,7 @@ class OneLogin_Saml2_Response
     /**
      * After validation, if it fail this var has the cause of the problem
      *
-     * @var string
+     * @var Exception
      */
     private $_error;
 
@@ -419,10 +419,10 @@ public function isValid($requestId = null)
             }
             return true;
         } catch (Exception $e) {
-            $this->_error = $e->getMessage();
+            $this->_error = $e;
             $debug = $this->_settings->isDebugActive();
             if ($debug) {
-                echo htmlentities($this->_error);
+                echo htmlentities($e->getMessage());
             }
             return false;
         }