Fix multi-predicate support in check_saml2int ruleset

From commit hash ukf/ukf-testbed/3a2ac084ffed84ef2de3ba7a08b6c4012b86cc96 See ukf/ukf-meta#416 for details
InCommon · Apr 16, 2024 · b0187a4 · b0187a4
1 parent ff6950e
commit b0187a4
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/mdx/_rules/check_saml2int.xsl b/mdx/_rules/check_saml2int.xsl
@@ -126,16 +126,14 @@
     -->
     <xsl:template match="md:IDPSSODescriptor
         [contains(@protocolSupportEnumeration, 'urn:oasis:names:tc:SAML:2.0:protocol')]
-        [not(md:KeyDescriptor[descendant::ds:X509Data][@use='signing'])]
-        [not(md:KeyDescriptor[descendant::ds:X509Data][not(@use)])]">
+        [not((md:KeyDescriptor[descendant::ds:X509Data][@use='signing']) or (md:KeyDescriptor[descendant::ds:X509Data][not(@use)]))]">
         <xsl:call-template name="error">
             <xsl:with-param name="m">SAML 2.0 IdP has no embedded signing key</xsl:with-param>
         </xsl:call-template>
     </xsl:template>
     <xsl:template match="md:AttributeAuthorityDescriptor
         [contains(@protocolSupportEnumeration, 'urn:oasis:names:tc:SAML:2.0:protocol')]
-        [not(md:KeyDescriptor[descendant::ds:X509Data][@use='signing'])]
-        [not(md:KeyDescriptor[descendant::ds:X509Data][not(@use)])]">
+        [not((md:KeyDescriptor[descendant::ds:X509Data][@use='signing']) or (md:KeyDescriptor[descendant::ds:X509Data][not(@use)]))]">
         <xsl:call-template name="error">
             <xsl:with-param name="m">SAML 2.0 AttributeAuthority has no embedded signing key</xsl:with-param>
         </xsl:call-template>