Add issueInstant property to requests

Author: pdavide

lib/Saml2/AuthnRequest.php

@@ -25,6 +25,12 @@ class OneLogin_Saml2_AuthnRequest
      */
     private $_id;
 
+    /**
+     * SAML AuthNRequest IssueInstant.
+     * @var string
+     */
+    private $_issueInstant;
+
     /**
      * Constructs the AuthnRequest object.
      *
@@ -146,6 +152,7 @@ public function __construct(OneLogin_Saml2_Settings $settings, $forceAuthn = fal
 
         $this->_id = $id;
         $this->_authnRequest = $request;
+        $this->_issueInstant = $issueInstant;
     }
 
     /**
@@ -181,6 +188,16 @@ public function getId()
         return $this->_id;
     }
 
+    /**
+     * Returns the AuthNRequest IssueInstant.
+     *
+     * @return string
+     */
+    public function getIssueInstant()
+    {
+        return $this->_issueInstant;
+    }
+
     /**
      * Returns the XML that will be sent as part of the request
      *

lib/Saml2/LogoutRequest.php

@@ -30,6 +30,12 @@ class OneLogin_Saml2_LogoutRequest
     */
     private $_error;
 
+    /**
+     * SAML LogoutRequest IssueInstant.
+     * @var string
+     */
+    private $_issueInstant;
+
     /**
      * Constructs the Logout Request object.
      *
@@ -61,6 +67,7 @@ public function __construct(OneLogin_Saml2_Settings $settings, $request = null,
             $this->id = $id;
 
             $issueInstant = OneLogin_Saml2_Utils::parseTime2SAML(time());
+            $this->_issueInstant = $issueInstant;
 
             $cert = null;
             if (isset($security['nameIdEncrypted']) && $security['nameIdEncrypted']) {
@@ -423,6 +430,16 @@ public function getError()
         return $this->_error;
     }
 
+    /**
+     * Returns the LogoutRequest IssueInstant.
+     *
+     * @return string
+     */
+    public function getIssueInstant()
+    {
+        return $this->_issueInstant;
+    }
+
     /**
      * Returns the XML that will be sent as part of the request
      * or that was received at the SP

tests/src/OneLogin/Saml2/AuthnRequestTest.php

@@ -353,4 +353,21 @@ public function testGetXML()
         $xml = $authnRequest->getXML();
         $this->assertRegExp('#^<samlp:AuthnRequest#', $xml);
     }
+
+    /**
+     * Tests that we can get the IssueInstant attribute
+     *
+     * @covers OneLogin_Saml2_AuthnRequest::getIssueInstant()
+     */
+    public function testGetIssueInstant()
+    {
+        $settingsDir = TEST_ROOT .'/settings/';
+        include $settingsDir.'settings1.php';
+
+        $settings = new OneLogin_Saml2_Settings($settingsInfo);
+        $authnRequest = new OneLogin_Saml2_AuthnRequest($settings);
+
+        $issueInstant = $authnRequest->getIssueInstant();
+        $this->assertNotNull($issueInstant);
+    }
 }

tests/src/OneLogin/Saml2/LogoutRequestTest.php

@@ -893,4 +893,21 @@ public function testGetIDException()
         $xml = $logoutRequest->getXML();
         $id1 = OneLogin_Saml2_LogoutRequest::getID($xml.'<garbage>');
     }
+
+    /**
+     * Tests that we can get the IssueInstant attribute
+     *
+     * @covers OneLogin_Saml2_LogoutRequest::getIssueInstant()
+     */
+    public function testGetIssueInstant()
+    {
+        $settingsDir = TEST_ROOT .'/settings/';
+        include $settingsDir.'settings1.php';
+
+        $settings = new OneLogin_Saml2_Settings($settingsInfo);
+        $logoutRequest = new OneLogin_Saml2_LogoutRequest($settings);
+
+        $issueInstant = $logoutRequest->getIssueInstant();
+        $this->assertNotNull($issueInstant);
+    }
 }