Skip to content

Commit ba51841

Browse files
authored
[Saml2] Allow combined keydescriptors for signing (#982)
1 parent 784b7dc commit ba51841

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

Provider.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -510,9 +510,12 @@ protected function validateTimestamps(): void
510510

511511
protected function validateSignature(): void
512512
{
513-
$keyDescriptors = $this->getIdentityProviderEntityDescriptor()
514-
->getFirstIdpSsoDescriptor()
515-
->getAllKeyDescriptorsByUse(KeyDescriptor::USE_SIGNING);
513+
$idpSsoDescriptor = $this->getIdentityProviderEntityDescriptor()->getFirstIdpSsoDescriptor();
514+
515+
$keyDescriptors = array_merge(
516+
$idpSsoDescriptor->getAllKeyDescriptorsByUse(KeyDescriptor::USE_SIGNING),
517+
$idpSsoDescriptor->getAllKeyDescriptorsByUse(null),
518+
);
516519

517520
/** @var SignatureXmlReader $signatureReader */
518521
$signatureReader = $this->messageContext->getMessage()->getSignature() ?: $this->getFirstAssertion()->getSignature();

0 commit comments

Comments
 (0)