You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2019/07/12 11:00:28 UTC
svn commit: r1862965 -
/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java
Author: coheigea
Date: Fri Jul 12 11:00:28 2019
New Revision: 1862965
URL: http://svn.apache.org/viewvc?rev=1862965&view=rev
Log:
Removing XMLSignatureInput fallback
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java?rev=1862965&r1=1862964&r2=1862965&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/signature/XMLSignatureInput.java Fri Jul 12 11:00:28 2019
@@ -19,11 +19,9 @@
package org.apache.xml.security.signature;
import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
@@ -573,21 +571,6 @@ public class XMLSignatureInput {
try {
Document doc = XMLUtils.read(this.getOctetStream(), secureValidation);
this.subNode = doc;
- } catch (SAXException ex) {
- byte[] result = null;
- // if a not-wellformed nodeset exists, put a container around it...
- try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
-
- baos.write("<container>".getBytes(StandardCharsets.UTF_8));
- baos.write(this.getBytes());
- baos.write("</container>".getBytes(StandardCharsets.UTF_8));
-
- result = baos.toByteArray();
- }
- try (InputStream is = new ByteArrayInputStream(result)) {
- Document document = XMLUtils.read(is, secureValidation);
- this.subNode = document.getDocumentElement().getFirstChild().getFirstChild();
- }
} finally {
if (this.inputOctetStreamProxy != null) {
this.inputOctetStreamProxy.close();