Skip to content

ignoreValidUntil improvements (master) #618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pitbulk merged 2 commits into from
May 22, 2025
Merged

ignoreValidUntil improvements (master) #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51d4b69
Fix typo in ignoreValidUntil that breaks metadata, See #603. Add para…
pitbulk May 21, 2025
01190d3
Fix typo
pitbulk May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/Saml2/Metadata.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,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
Expand Down
5 changes: 3 additions & 2 deletions lib/Saml2/Settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,15 +888,16 @@ public function getIdPSLOResponseUrl()
* or $advancedSettings['security']['wantAssertionsEncrypted'] are enabled.
* @param DateTime|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 OneLogin_Saml2_Error
*/
public function getSPMetadata($alwaysPublishEncryptionCert = false, $validUntil = null, $cacheDuration = null)
public function getSPMetadata($alwaysPublishEncryptionCert = false, $validUntil = null, $cacheDuration = null, $ignoreValidUntil = false)
{
$metadata = OneLogin_Saml2_Metadata::builder($this->_sp, $this->_security['authnRequestsSigned'], $this->_security['wantAssertionsSigned'], $validUntil, $cacheDuration, $this->getContacts(), $this->getOrganization());
$metadata = OneLogin_Saml2_Metadata::builder($this->_sp, $this->_security['authnRequestsSigned'], $this->_security['wantAssertionsSigned'], $validUntil, $cacheDuration, $this->getContacts(), $this->getOrganization(), array(), $ignoreValidUntil);

$certNew = $this->getSPcertNew();
if (!empty($certNew)) {
Expand Down