From c7e338ad3b84b6a78dd101bfd66e51018cd19b2b Mon Sep 17 00:00:00 2001
From: Sixto Martin <sixto.martin.garcia@workato.com>
Date: Thu, 22 May 2025 01:28:55 +0200
Subject: [PATCH] Fix typo in ignoreValidUntil that breaks metadata, See #603.
 Add parameter to exclude validUntil on Metadata builder, See #568

---
 src/Saml2/Metadata.php | 2 +-
 src/Saml2/Settings.php | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Saml2/Metadata.php b/src/Saml2/Metadata.php
index 91cb0424..0057c175 100644
--- a/src/Saml2/Metadata.php
+++ b/src/Saml2/Metadata.php
@@ -172,7 +172,7 @@ public static function builder($sp, $authnsign = false, $wsign = false, $validUn
 
         if ($ignoreValidUntil) {
             $timeStr = <<<TIME_TEMPLATE
-cacheDuration="PT{$cacheDuration}S";
+cacheDuration="PT{$cacheDuration}S"
 TIME_TEMPLATE;
         } else {
             $timeStr = <<<TIME_TEMPLATE
diff --git a/src/Saml2/Settings.php b/src/Saml2/Settings.php
index aec1bce7..74ec783a 100644
--- a/src/Saml2/Settings.php
+++ b/src/Saml2/Settings.php
@@ -879,14 +879,15 @@ public function getIdPSLOResponseUrl()
      * $advancedSettings['security']['wantAssertionsEncrypted'] are enabled.
      * @param int|null      $validUntil    Metadata's valid time
      * @param int|null      $cacheDuration Duration of the cache in seconds
+     * @param bool          $ignoreValidUntil exclude the validUntil tag from metadata
      *
      * @return string  SP metadata (xml)
      * @throws Exception
      * @throws Error
      */
-    public function getSPMetadata($alwaysPublishEncryptionCert = false, $validUntil = null, $cacheDuration = null)
+    public function getSPMetadata($alwaysPublishEncryptionCert = false, $validUntil = null, $cacheDuration = null, $ignoreValidUntil = false)
     {
-        $metadata = Metadata::builder($this->_sp, $this->_security['authnRequestsSigned'], $this->_security['wantAssertionsSigned'], $validUntil, $cacheDuration, $this->getContacts(), $this->getOrganization());
+        $metadata = Metadata::builder($this->_sp, $this->_security['authnRequestsSigned'], $this->_security['wantAssertionsSigned'], $validUntil, $cacheDuration, $this->getContacts(), $this->getOrganization(), [], $ignoreValidUntil);
 
         $certNew = $this->getSPcertNew();
         if (!empty($certNew)) {