[SANTUARIO-576] Fix saml validation with saaj 1.4+ (#453)

RivalAUT · Lukas Fabian · web-flow · commit 0791fc576426 · 2025-03-21T09:39:35.000Z
* [SANTUARIO-576] Fix saml validation with saaj 1.4

Signature element was not removed due to type mismatch

* [SANTUARIO-576] Check for reference equality first

---------

Co-authored-by: Lukas Fabian &lt;lukas.fabian@svc.co.at&gt;
diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java b/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java
@@ -241,7 +241,7 @@ private void canonicalizeSubTree(
 
             case Node.ELEMENT_NODE :
                 documentLevel = NODE_NOT_BEFORE_OR_AFTER_DOCUMENT_ELEMENT;
-                if (currentNode == excludeNode) {
+                if (currentNode == excludeNode || (excludeNode != null && (excludeNode.isSameNode(currentNode) || currentNode.isSameNode(excludeNode)))) {
                     break;
                 }
                 Element currentElement = (Element)currentNode;

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ private void canonicalizeSubTree(`
`241`	`241`
`242`	`242`	`case Node.ELEMENT_NODE :`
`243`	`243`	`documentLevel = NODE_NOT_BEFORE_OR_AFTER_DOCUMENT_ELEMENT;`
`244`		`- if (currentNode == excludeNode) {`
	`244`	`+ if (currentNode == excludeNode \|\| (excludeNode != null && (excludeNode.isSameNode(currentNode) \|\| currentNode.isSameNode(excludeNode)))) {`
`245`	`245`	`break;`
`246`	`246`	`}`
`247`	`247`	`Element currentElement = (Element)currentNode;`