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/02/21 09:30:01 UTC
svn commit: r1854026 [2/2] - in
/santuario/xml-security-java/branches/2.1.x-fixes/src:
main/java/org/apache/jcp/xml/dsig/internal/dom/
main/java/org/apache/xml/security/utils/
test/java/javax/xml/crypto/test/dsig/
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java?rev=1854026&r1=1854025&r2=1854026&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java Thu Feb 21 09:30:01 2019
@@ -25,10 +25,13 @@
package org.apache.jcp.xml.dsig.internal.dom;
import javax.xml.crypto.*;
+import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dsig.*;
import java.util.*;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -36,7 +39,7 @@ import org.w3c.dom.Node;
* DOM-based implementation of SignatureProperties.
*
*/
-public final class DOMSignatureProperties extends BaseStructure
+public final class DOMSignatureProperties extends DOMStructure
implements SignatureProperties {
private final String id;
@@ -54,7 +57,7 @@ public final class DOMSignaturePropertie
* @throws IllegalArgumentException if <code>properties</code> is empty
* @throws NullPointerException if <code>properties</code>
*/
- public DOMSignatureProperties(List<DOMSignatureProperty> properties,
+ public DOMSignatureProperties(List<? extends SignatureProperty> properties,
String id)
{
if (properties == null) {
@@ -84,7 +87,13 @@ public final class DOMSignaturePropertie
throws MarshalException
{
// unmarshal attributes
- id = DOMUtils.getIdAttributeValue(propsElem, "Id");
+ Attr attr = propsElem.getAttributeNodeNS(null, "Id");
+ if (attr != null) {
+ id = attr.getValue();
+ propsElem.setIdAttributeNode(attr, true);
+ } else {
+ id = null;
+ }
List<SignatureProperty> newProperties = new ArrayList<>();
Node firstChild = propsElem.getFirstChild();
@@ -107,32 +116,34 @@ public final class DOMSignaturePropertie
}
}
- @Override
public List<SignatureProperty> getProperties() {
return properties;
}
- @Override
public String getId() {
return id;
}
- public static void marshal(XmlWriter xwriter, SignatureProperties sigProps, String dsPrefix, XMLCryptoContext context)
+ @Override
+ public void marshal(Node parent, String dsPrefix, DOMCryptoContext context)
throws MarshalException
{
- xwriter.writeStartElement(dsPrefix, "SignatureProperties", XMLSignature.XMLNS);
+ Document ownerDoc = DOMUtils.getOwnerDocument(parent);
+ Element propsElem = DOMUtils.createElement(ownerDoc,
+ "SignatureProperties",
+ XMLSignature.XMLNS,
+ dsPrefix);
// set attributes
- xwriter.writeIdAttribute("", "", "Id", sigProps.getId());
+ DOMUtils.setAttributeID(propsElem, "Id", id);
// create and append any properties
- @SuppressWarnings("unchecked")
- List<SignatureProperty> properties = sigProps.getProperties();
for (SignatureProperty property : properties) {
- DOMSignatureProperty.marshal(xwriter, property, dsPrefix, context);
+ ((DOMSignatureProperty)property).marshal(propsElem, dsPrefix,
+ context);
}
- xwriter.writeEndElement(); // "SignatureProperties"
+ parent.appendChild(propsElem);
}
@Override
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java?rev=1854026&r1=1854025&r2=1854026&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java Thu Feb 21 09:30:01 2019
@@ -25,10 +25,13 @@
package org.apache.jcp.xml.dsig.internal.dom;
import javax.xml.crypto.*;
+import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dsig.*;
import java.util.*;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -36,7 +39,7 @@ import org.w3c.dom.Node;
* DOM-based implementation of SignatureProperty.
*
*/
-public final class DOMSignatureProperty extends BaseStructure
+public final class DOMSignatureProperty extends DOMStructure
implements SignatureProperty {
private final String id;
@@ -92,7 +95,13 @@ public final class DOMSignatureProperty
if (target == null) {
throw new MarshalException("target cannot be null");
}
- id = DOMUtils.getIdAttributeValue(propElem, "Id");
+ Attr attr = propElem.getAttributeNodeNS(null, "Id");
+ if (attr != null) {
+ id = attr.getValue();
+ propElem.setIdAttributeNode(attr, true);
+ } else {
+ id = null;
+ }
List<XMLStructure> newContent = new ArrayList<>();
Node firstChild = propElem.getFirstChild();
@@ -107,37 +116,37 @@ public final class DOMSignatureProperty
}
}
- @Override
public List<XMLStructure> getContent() {
return content;
}
- @Override
public String getId() {
return id;
}
- @Override
public String getTarget() {
return target;
}
- public static void marshal(XmlWriter xwriter, SignatureProperty sigProp, String dsPrefix, XMLCryptoContext context)
+ @Override
+ public void marshal(Node parent, String dsPrefix, DOMCryptoContext context)
throws MarshalException
{
- xwriter.writeStartElement(dsPrefix, "SignatureProperty", XMLSignature.XMLNS);
+ Document ownerDoc = DOMUtils.getOwnerDocument(parent);
+ Element propElem = DOMUtils.createElement(ownerDoc, "SignatureProperty",
+ XMLSignature.XMLNS, dsPrefix);
// set attributes
- xwriter.writeIdAttribute("", "", "Id", sigProp.getId());
- xwriter.writeAttribute("", "", "Target", sigProp.getTarget());
+ DOMUtils.setAttributeID(propElem, "Id", id);
+ DOMUtils.setAttribute(propElem, "Target", target);
// create and append any elements and mixed content
- List<XMLStructure> content = getContent(sigProp);
for (XMLStructure property : content) {
- xwriter.marshalStructure(property, dsPrefix, context);
+ DOMUtils.appendChild(propElem,
+ ((javax.xml.crypto.dom.DOMStructure)property).getNode());
}
- xwriter.writeEndElement(); // "SignatureProperty"
+ parent.appendChild(propElem);
}
@Override
@@ -172,10 +181,6 @@ public final class DOMSignatureProperty
return result;
}
- @SuppressWarnings("unchecked")
- private static List<XMLStructure> getContent(SignatureProperty prop) {
- return prop.getContent();
- }
private boolean equalsContent(List<XMLStructure> otherContent) {
int osize = otherContent.size();
if (content.size() != osize) {
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java?rev=1854026&r1=1854025&r2=1854026&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSignedInfo.java Thu Feb 21 09:30:01 2019
@@ -25,6 +25,7 @@
package org.apache.jcp.xml.dsig.internal.dom;
import javax.xml.crypto.*;
+import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dsig.*;
import java.io.ByteArrayInputStream;
@@ -35,7 +36,9 @@ import java.io.IOException;
import java.security.Provider;
import java.util.*;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
import org.apache.xml.security.utils.Constants;
import org.apache.xml.security.utils.UnsyncBufferedOutputStream;
import org.apache.xml.security.utils.XMLUtils;
@@ -66,6 +69,7 @@ public final class DOMSignedInfo extends
private CanonicalizationMethod canonicalizationMethod;
private SignatureMethod signatureMethod;
private String id;
+ private Document ownerDoc;
private Element localSiElem;
private InputStream canonData;
@@ -134,6 +138,7 @@ public final class DOMSignedInfo extends
public DOMSignedInfo(Element siElem, XMLCryptoContext context, Provider provider)
throws MarshalException {
localSiElem = siElem;
+ ownerDoc = siElem.getOwnerDocument();
// get Id attribute, if specified
id = DOMUtils.getAttributeValue(siElem, "Id");
@@ -185,27 +190,22 @@ public final class DOMSignedInfo extends
references = Collections.unmodifiableList(refList);
}
- @Override
public CanonicalizationMethod getCanonicalizationMethod() {
return canonicalizationMethod;
}
- @Override
public SignatureMethod getSignatureMethod() {
return signatureMethod;
}
- @Override
public String getId() {
return id;
}
- @Override
public List<Reference> getReferences() {
return references;
}
- @Override
public InputStream getCanonicalizedData() {
return canonData;
}
@@ -246,32 +246,31 @@ public final class DOMSignedInfo extends
}
@Override
- public void marshal(XmlWriter xwriter, String dsPrefix, XMLCryptoContext context)
+ public void marshal(Node parent, String dsPrefix, DOMCryptoContext context)
throws MarshalException
{
- xwriter.writeStartElement(dsPrefix, "SignedInfo", XMLSignature.XMLNS);
- XMLStructure siStruct = xwriter.getCurrentNodeAsStructure();
- localSiElem = (Element) ((javax.xml.crypto.dom.DOMStructure) siStruct).getNode();
-
- // append Id attribute
- xwriter.writeIdAttribute("", "", "Id", id);
+ ownerDoc = DOMUtils.getOwnerDocument(parent);
+ Element siElem = DOMUtils.createElement(ownerDoc, "SignedInfo",
+ XMLSignature.XMLNS, dsPrefix);
// create and append CanonicalizationMethod element
DOMCanonicalizationMethod dcm =
(DOMCanonicalizationMethod)canonicalizationMethod;
- dcm.marshal(xwriter, dsPrefix, context);
+ dcm.marshal(siElem, dsPrefix, context);
// create and append SignatureMethod element
- ((AbstractDOMSignatureMethod)signatureMethod).marshal(xwriter, dsPrefix);
+ ((DOMStructure)signatureMethod).marshal(siElem, dsPrefix, context);
// create and append Reference elements
for (Reference reference : references) {
- // TODO - either suppress warning here, or figure out how to get rid of the cast.
- DOMReference domRef = (DOMReference)reference;
- domRef.marshal(xwriter, dsPrefix, context);
+ ((DOMReference)reference).marshal(siElem, dsPrefix, context);
}
- xwriter.writeEndElement(); // "SignedInfo"
+ // append Id attribute
+ DOMUtils.setAttributeID(siElem, "Id", id);
+
+ parent.appendChild(siElem);
+ localSiElem = siElem;
}
@Override
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMStructure.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMStructure.java?rev=1854026&r1=1854025&r2=1854026&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMStructure.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMStructure.java Thu Feb 21 09:30:01 2019
@@ -25,13 +25,24 @@
package org.apache.jcp.xml.dsig.internal.dom;
import javax.xml.crypto.MarshalException;
-import javax.xml.crypto.XMLCryptoContext;
+import javax.xml.crypto.XMLStructure;
+import javax.xml.crypto.dom.DOMCryptoContext;
+import org.w3c.dom.Node;
/**
* DOM-based abstract implementation of XMLStructure.
*
*/
-public abstract class DOMStructure extends BaseStructure {
+public abstract class DOMStructure implements XMLStructure {
- public abstract void marshal(XmlWriter xwriter, String dsPrefix, XMLCryptoContext context) throws MarshalException;
+ public final boolean isFeatureSupported(String feature) {
+ if (feature == null) {
+ throw new NullPointerException();
+ } else {
+ return false;
+ }
+ }
+
+ public abstract void marshal(Node parent, String dsPrefix,
+ DOMCryptoContext context) throws MarshalException;
}
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java?rev=1854026&r1=1854025&r2=1854026&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java Thu Feb 21 09:30:01 2019
@@ -78,7 +78,6 @@ public class DOMSubTreeData implements N
this.withComments = !excludeComments;
}
- @Override
public boolean hasNext() {
if (nodeSet == null) {
nodeSet = dereferenceSameDocumentURI(root);
@@ -87,7 +86,6 @@ public class DOMSubTreeData implements N
return li.hasNext();
}
- @Override
public Node next() {
if (nodeSet == null) {
nodeSet = dereferenceSameDocumentURI(root);
@@ -100,7 +98,6 @@ public class DOMSubTreeData implements N
}
}
- @Override
public void remove() {
throw new UnsupportedOperationException();
}
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java?rev=1854026&r1=1854025&r2=1854026&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java Thu Feb 21 09:30:01 2019
@@ -33,12 +33,14 @@ import java.security.spec.AlgorithmParam
import javax.xml.crypto.Data;
import javax.xml.crypto.MarshalException;
import javax.xml.crypto.XMLCryptoContext;
+import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dsig.Transform;
import javax.xml.crypto.dsig.TransformException;
import javax.xml.crypto.dsig.TransformService;
import javax.xml.crypto.dsig.XMLSignature;
import javax.xml.crypto.dsig.dom.DOMSignContext;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -46,7 +48,7 @@ import org.w3c.dom.Node;
* DOM-based abstract implementation of Transform.
*
*/
-public class DOMTransform extends BaseStructure implements Transform {
+public class DOMTransform extends DOMStructure implements Transform {
protected TransformService spi;
@@ -70,6 +72,7 @@ public class DOMTransform extends BaseSt
throws MarshalException
{
String algorithm = DOMUtils.getAttributeValue(transElem, "Algorithm");
+
if (provider == null) {
try {
spi = TransformService.getInstance(algorithm, "DOM");
@@ -94,12 +97,10 @@ public class DOMTransform extends BaseSt
}
}
- @Override
public final AlgorithmParameterSpec getParameterSpec() {
return spi.getParameterSpec();
}
- @Override
public final String getAlgorithm() {
return spi.getAlgorithm();
}
@@ -107,18 +108,29 @@ public class DOMTransform extends BaseSt
/**
* This method marshals any algorithm-specific parameters.
*/
- public void marshal(XmlWriter xwriter, String dsPrefix, XMLCryptoContext context)
+ @Override
+ public void marshal(Node parent, String dsPrefix, DOMCryptoContext context)
throws MarshalException
{
- String parentLocalName = xwriter.getCurrentLocalName();
- String localName = "Transforms".equals(parentLocalName) ? "Transform" : "CanonicalizationMethod";
- xwriter.writeStartElement(dsPrefix, localName, XMLSignature.XMLNS);
- xwriter.writeAttribute("", "", "Algorithm", getAlgorithm());
+ Document ownerDoc = DOMUtils.getOwnerDocument(parent);
- javax.xml.crypto.XMLStructure xmlStruct = xwriter.getCurrentNodeAsStructure();
- spi.marshalParams(xmlStruct, context);
+ Element transformElem = null;
+ if (parent.getLocalName().equals("Transforms")) {
+ transformElem = DOMUtils.createElement(ownerDoc, "Transform",
+ XMLSignature.XMLNS,
+ dsPrefix);
+ } else {
+ transformElem = DOMUtils.createElement(ownerDoc,
+ "CanonicalizationMethod",
+ XMLSignature.XMLNS,
+ dsPrefix);
+ }
+ DOMUtils.setAttribute(transformElem, "Algorithm", getAlgorithm());
+
+ spi.marshalParams(new javax.xml.crypto.dom.DOMStructure(transformElem),
+ context);
- xwriter.writeEndElement(); // "Transforms" or "CanonicalizationMethod"
+ parent.appendChild(transformElem);
}
/**
@@ -132,7 +144,6 @@ public class DOMTransform extends BaseSt
* @throws XMLSignatureException if an unexpected error occurs while
* executing the transform
*/
- @Override
public Data transform(Data data, XMLCryptoContext xc)
throws TransformException
{
@@ -152,7 +163,6 @@ public class DOMTransform extends BaseSt
* @throws XMLSignatureException if an unexpected error occurs while
* executing the transform
*/
- @Override
public Data transform(Data data, XMLCryptoContext xc, OutputStream os)
throws TransformException
{
@@ -206,9 +216,8 @@ public class DOMTransform extends BaseSt
Data transform(Data data, XMLCryptoContext xc, DOMSignContext context)
throws MarshalException, TransformException
{
- Node parent = context.getParent();
- XmlWriter xwriter = new XmlWriterToTree(Marshaller.getMarshallers(), parent);
- marshal(xwriter, DOMUtils.getSignaturePrefix(context), context);
+ marshal(context.getParent(),
+ DOMUtils.getSignaturePrefix(context), context);
return transform(data, xc);
}
}
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java?rev=1854026&r1=1854025&r2=1854026&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java Thu Feb 21 09:30:01 2019
@@ -50,7 +50,6 @@ public final class DOMURIDereferencer im
Init.init();
}
- @Override
public Data dereference(URIReference uriRef, XMLCryptoContext context)
throws URIReferenceException {
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java?rev=1854026&r1=1854025&r2=1854026&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMUtils.java Thu Feb 21 09:30:01 2019
@@ -88,7 +88,9 @@ public final class DOMUtils {
public static Element createElement(Document doc, String tag,
String nsURI, String prefix)
{
- return doc.createElementNS(nsURI, getQNameString(prefix, tag));
+ String qName = prefix == null || prefix.length() == 0
+ ? tag : prefix + ":" + tag;
+ return doc.createElementNS(nsURI, qName);
}
/**
@@ -331,25 +333,20 @@ public final class DOMUtils {
this.nl = nl;
}
- @Override
public int size() { return nl.getLength(); }
- @Override
public Iterator<Node> iterator() {
return new Iterator<Node>() {
private int index;
- @Override
public void remove() {
throw new UnsupportedOperationException();
}
- @Override
public Node next() {
if (!hasNext()) {
throw new NoSuchElementException();
}
return nl.item(index++);
}
- @Override
public boolean hasNext() {
return index < nl.getLength();
}
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java?rev=1854026&r1=1854025&r2=1854026&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509Data.java Thu Feb 21 09:30:01 2019
@@ -29,11 +29,15 @@ import java.io.IOException;
import java.security.cert.*;
import java.util.*;
-import javax.xml.crypto.*;
-import javax.xml.crypto.dsig.*;
-import javax.xml.crypto.dsig.keyinfo.X509Data;
import javax.security.auth.x500.X500Principal;
+import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.XMLStructure;
+import javax.xml.crypto.dom.DOMCryptoContext;
+import javax.xml.crypto.dsig.XMLSignature;
+import javax.xml.crypto.dsig.keyinfo.X509Data;
+import javax.xml.crypto.dsig.keyinfo.X509IssuerSerial;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -44,7 +48,7 @@ import org.apache.xml.security.utils.XML
*
*/
//@@@ check for illegal combinations of data violating MUSTs in W3c spec
-public final class DOMX509Data extends BaseStructure implements X509Data {
+public final class DOMX509Data extends DOMStructure implements X509Data {
private final List<Object> content;
private CertificateFactory cf;
@@ -121,68 +125,90 @@ public final class DOMX509Data extends B
this.content = Collections.unmodifiableList(newContent);
}
- @Override
public List<Object> getContent() {
return content;
}
- public static void marshal(XmlWriter xwriter, X509Data x509Data, String dsPrefix, XMLCryptoContext context)
+ @Override
+ public void marshal(Node parent, String dsPrefix, DOMCryptoContext context)
throws MarshalException
{
- xwriter.writeStartElement(dsPrefix, "X509Data", XMLSignature.XMLNS);
+ Document ownerDoc = DOMUtils.getOwnerDocument(parent);
+ Element xdElem = DOMUtils.createElement(ownerDoc, "X509Data",
+ XMLSignature.XMLNS, dsPrefix);
- List<?> content = x509Data.getContent();
// append children and preserve order
for (int i = 0, size = content.size(); i < size; i++) {
Object object = content.get(i);
if (object instanceof X509Certificate) {
- marshalCert(xwriter, (X509Certificate) object, dsPrefix);
+ marshalCert((X509Certificate)object,xdElem,ownerDoc,dsPrefix);
} else if (object instanceof XMLStructure) {
- xwriter.marshalStructure((XMLStructure) object, dsPrefix, context);
+ if (object instanceof X509IssuerSerial) {
+ ((DOMX509IssuerSerial)object).marshal
+ (xdElem, dsPrefix, context);
+ } else {
+ javax.xml.crypto.dom.DOMStructure domContent =
+ (javax.xml.crypto.dom.DOMStructure)object;
+ DOMUtils.appendChild(xdElem, domContent.getNode());
+ }
} else if (object instanceof byte[]) {
- marshalSKI(xwriter, (byte[]) object, dsPrefix);
+ marshalSKI((byte[])object, xdElem, ownerDoc, dsPrefix);
} else if (object instanceof String) {
- marshalSubjectName(xwriter, (String) object, dsPrefix);
+ marshalSubjectName((String)object, xdElem, ownerDoc,dsPrefix);
} else if (object instanceof X509CRL) {
- marshalCRL(xwriter, (X509CRL) object, dsPrefix);
+ marshalCRL((X509CRL)object, xdElem, ownerDoc, dsPrefix);
}
}
- xwriter.writeEndElement(); // "X509Data"
+
+ parent.appendChild(xdElem);
}
- private static void marshalSKI(XmlWriter xwriter, byte[] skid, String dsPrefix)
+ private void marshalSKI(byte[] skid, Node parent, Document doc,
+ String dsPrefix)
{
- xwriter.writeTextElement(dsPrefix, "X509SKI", XMLSignature.XMLNS,
- XMLUtils.encodeToString(skid));
+ Element skidElem = DOMUtils.createElement(doc, "X509SKI",
+ XMLSignature.XMLNS, dsPrefix);
+ skidElem.appendChild(doc.createTextNode(XMLUtils.encodeToString(skid)));
+ parent.appendChild(skidElem);
}
- private static void marshalSubjectName(XmlWriter xwriter, String name, String dsPrefix)
+ private void marshalSubjectName(String name, Node parent, Document doc,
+ String dsPrefix)
{
- xwriter.writeTextElement(dsPrefix, "X509SubjectName", XMLSignature.XMLNS, name);
+ Element snElem = DOMUtils.createElement(doc, "X509SubjectName",
+ XMLSignature.XMLNS, dsPrefix);
+ snElem.appendChild(doc.createTextNode(name));
+ parent.appendChild(snElem);
}
- private static void marshalCert(XmlWriter xwriter, X509Certificate cert, String dsPrefix)
+ private void marshalCert(X509Certificate cert, Node parent, Document doc,
+ String dsPrefix)
throws MarshalException
{
+ Element certElem = DOMUtils.createElement(doc, "X509Certificate",
+ XMLSignature.XMLNS, dsPrefix);
try {
- byte[] encoded = cert.getEncoded();
- xwriter.writeTextElement(dsPrefix, "X509Certificate", XMLSignature.XMLNS,
- XMLUtils.encodeToString(encoded));
+ certElem.appendChild(doc.createTextNode
+ (XMLUtils.encodeToString(cert.getEncoded())));
} catch (CertificateEncodingException e) {
throw new MarshalException("Error encoding X509Certificate", e);
}
+ parent.appendChild(certElem);
}
- private static void marshalCRL(XmlWriter xwriter, X509CRL crl, String dsPrefix)
+ private void marshalCRL(X509CRL crl, Node parent, Document doc,
+ String dsPrefix)
throws MarshalException
{
+ Element crlElem = DOMUtils.createElement(doc, "X509CRL",
+ XMLSignature.XMLNS, dsPrefix);
try {
- byte[] encoded = crl.getEncoded();
- xwriter.writeTextElement(dsPrefix, "X509CRL", XMLSignature.XMLNS,
- XMLUtils.encodeToString(encoded));
+ crlElem.appendChild(doc.createTextNode
+ (XMLUtils.encodeToString(crl.getEncoded())));
} catch (CRLException e) {
throw new MarshalException("Error encoding X509CRL", e);
}
+ parent.appendChild(crlElem);
}
private X509Certificate unmarshalX509Certificate(Element elem)
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java?rev=1854026&r1=1854025&r2=1854026&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java Thu Feb 21 09:30:01 2019
@@ -25,20 +25,22 @@
package org.apache.jcp.xml.dsig.internal.dom;
import javax.xml.crypto.MarshalException;
+import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dsig.XMLSignature;
import javax.xml.crypto.dsig.keyinfo.X509IssuerSerial;
import java.math.BigInteger;
import javax.security.auth.x500.X500Principal;
-
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/**
* DOM-based implementation of X509IssuerSerial.
*
*/
-public final class DOMX509IssuerSerial extends BaseStructure
+public final class DOMX509IssuerSerial extends DOMStructure
implements X509IssuerSerial {
private final String issuerName;
@@ -85,17 +87,34 @@ public final class DOMX509IssuerSerial e
serialNumber = new BigInteger(sNElem.getFirstChild().getNodeValue());
}
- @Override
public String getIssuerName() {
return issuerName;
}
- @Override
public BigInteger getSerialNumber() {
return serialNumber;
}
@Override
+ public void marshal(Node parent, String dsPrefix, DOMCryptoContext context)
+ throws MarshalException
+ {
+ Document ownerDoc = DOMUtils.getOwnerDocument(parent);
+
+ Element isElem = DOMUtils.createElement(ownerDoc, "X509IssuerSerial",
+ XMLSignature.XMLNS, dsPrefix);
+ Element inElem = DOMUtils.createElement(ownerDoc, "X509IssuerName",
+ XMLSignature.XMLNS, dsPrefix);
+ Element snElem = DOMUtils.createElement(ownerDoc, "X509SerialNumber",
+ XMLSignature.XMLNS, dsPrefix);
+ inElem.appendChild(ownerDoc.createTextNode(issuerName));
+ snElem.appendChild(ownerDoc.createTextNode(serialNumber.toString()));
+ isElem.appendChild(inElem);
+ isElem.appendChild(snElem);
+ parent.appendChild(isElem);
+ }
+
+ @Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java?rev=1854026&r1=1854025&r2=1854026&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLObject.java Thu Feb 21 09:30:01 2019
@@ -25,12 +25,14 @@
package org.apache.jcp.xml.dsig.internal.dom;
import javax.xml.crypto.*;
+import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dsig.*;
import java.security.Provider;
import java.util.*;
import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -39,12 +41,13 @@ import org.w3c.dom.Node;
* DOM-based implementation of XMLObject.
*
*/
-public final class DOMXMLObject extends BaseStructure implements XMLObject {
+public final class DOMXMLObject extends DOMStructure implements XMLObject {
private final String id;
private final String mimeType;
private final String encoding;
private final List<XMLStructure> content;
+ private Element objectElem;
/**
* Creates an <code>XMLObject</code> from the specified parameters.
@@ -138,51 +141,56 @@ public final class DOMXMLObject extends
} else {
this.content = Collections.unmodifiableList(newContent);
}
+ this.objectElem = objElem;
}
- @Override
public List<XMLStructure> getContent() {
return content;
}
- @Override
public String getId() {
return id;
}
- @Override
public String getMimeType() {
return mimeType;
}
- @Override
public String getEncoding() {
return encoding;
}
- public static void marshal(XmlWriter xwriter, XMLObject xmlObj, String dsPrefix, XMLCryptoContext context)
+ @Override
+ public void marshal(Node parent, String dsPrefix, DOMCryptoContext context)
throws MarshalException {
- xwriter.writeStartElement(dsPrefix, "Object", XMLSignature.XMLNS);
+ Document ownerDoc = DOMUtils.getOwnerDocument(parent);
- // set attributes
- xwriter.writeIdAttribute("", "", "Id", xmlObj.getId());
- xwriter.writeAttribute("", "", "MimeType", xmlObj.getMimeType());
- xwriter.writeAttribute("", "", "Encoding", xmlObj.getEncoding());
-
- // create and append any elements and mixed content, if necessary
- @SuppressWarnings("unchecked")
- List<XMLStructure> content = xmlObj.getContent();
- for (XMLStructure object : content) {
- xwriter.marshalStructure(object, dsPrefix, context);
+ Element objElem = objectElem != null ? objectElem : null;
+ if (objElem == null) {
+ objElem = DOMUtils.createElement(ownerDoc, "Object",
+ XMLSignature.XMLNS, dsPrefix);
+
+ // set attributes
+ DOMUtils.setAttributeID(objElem, "Id", id);
+ DOMUtils.setAttribute(objElem, "MimeType", mimeType);
+ DOMUtils.setAttribute(objElem, "Encoding", encoding);
+
+ // create and append any elements and mixed content, if necessary
+ for (XMLStructure object : content) {
+ if (object instanceof DOMStructure) {
+ ((DOMStructure)object).marshal(objElem, dsPrefix, context);
+ } else {
+ javax.xml.crypto.dom.DOMStructure domObject =
+ (javax.xml.crypto.dom.DOMStructure)object;
+ DOMUtils.appendChild(objElem, domObject.getNode());
+ }
+ }
}
- xwriter.writeEndElement(); // "Object"
- }
- @SuppressWarnings("unchecked")
- public static List<XMLStructure> getXmlObjectContent(XMLObject xo) {
- return xo.getContent();
+ parent.appendChild(objElem);
}
+ @SuppressWarnings("unchecked")
@Override
public boolean equals(Object o) {
if (this == o) {
@@ -204,7 +212,7 @@ public final class DOMXMLObject extends
: mimeType.equals(oxo.getMimeType());
return idsEqual && encodingsEqual && mimeTypesEqual &&
- equalsContent(getXmlObjectContent(oxo));
+ equalsContent(oxo.getContent());
}
@Override
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java?rev=1854026&r1=1854025&r2=1854026&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java Thu Feb 21 09:30:01 2019
@@ -32,6 +32,7 @@
package org.apache.jcp.xml.dsig.internal.dom;
import javax.xml.crypto.*;
+import javax.xml.crypto.dom.*;
import javax.xml.crypto.dsig.*;
import javax.xml.crypto.dsig.dom.DOMSignContext;
import javax.xml.crypto.dsig.dom.DOMValidateContext;
@@ -46,6 +47,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -65,6 +68,9 @@ public final class DOMXMLSignature exten
private KeyInfo ki;
private List<XMLObject> objects;
private SignedInfo si;
+ private Document ownerDoc = null;
+ private Element localSigElem = null;
+ private Element sigElem = null;
private boolean validationStatus;
private boolean validated = false;
private KeySelectorResult ksr;
@@ -122,7 +128,8 @@ public final class DOMXMLSignature exten
Provider provider)
throws MarshalException
{
- Element localSigElem = sigElem;
+ localSigElem = sigElem;
+ ownerDoc = localSigElem.getOwnerDocument();
// get Id attribute, if specified
id = DOMUtils.getAttributeValue(localSigElem, "Id");
@@ -166,69 +173,74 @@ public final class DOMXMLSignature exten
}
}
- @Override
public String getId() {
return id;
}
- @Override
public KeyInfo getKeyInfo() {
return ki;
}
- @Override
public SignedInfo getSignedInfo() {
return si;
}
- @Override
public List<XMLObject> getObjects() {
return objects;
}
- @Override
public SignatureValue getSignatureValue() {
return sv;
}
- @Override
public KeySelectorResult getKeySelectorResult() {
return ksr;
}
@Override
- public void marshal(XmlWriter xwriter, String dsPrefix, XMLCryptoContext context)
+ public void marshal(Node parent, String dsPrefix, DOMCryptoContext context)
throws MarshalException
{
- // rationalize the prefix.
- String prefix = dsPrefix;
- if (prefix == null) {
- prefix = "";
- }
- xwriter.writeStartElement(prefix, "Signature", XMLSignature.XMLNS);
-
- xwriter.writeNamespace(prefix, XMLSignature.XMLNS);
+ marshal(parent, null, dsPrefix, context);
+ }
- // append Id attribute
- xwriter.writeIdAttribute("", "", "Id", id);
+ public void marshal(Node parent, Node nextSibling, String dsPrefix,
+ DOMCryptoContext context)
+ throws MarshalException
+ {
+ ownerDoc = DOMUtils.getOwnerDocument(parent);
+ sigElem = DOMUtils.createElement(ownerDoc, "Signature",
+ XMLSignature.XMLNS, dsPrefix);
+
+ // append xmlns attribute
+ if (dsPrefix == null || dsPrefix.length() == 0) {
+ sigElem.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns",
+ XMLSignature.XMLNS);
+ } else {
+ sigElem.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:" +
+ dsPrefix, XMLSignature.XMLNS);
+ }
// create and append SignedInfo element
- ((DOMSignedInfo) si).marshal(xwriter, prefix, context);
+ ((DOMSignedInfo)si).marshal(sigElem, dsPrefix, context);
// create and append SignatureValue element
- ((DOMSignatureValue) sv).marshal(xwriter, prefix, context);
+ ((DOMSignatureValue)sv).marshal(sigElem, dsPrefix, context);
// create and append KeyInfo element if necessary
if (ki != null) {
- DOMKeyInfo.marshal(xwriter, ki, prefix, context);
+ ((DOMKeyInfo)ki).marshal(sigElem, null, dsPrefix, context);
}
// create and append Object elements if necessary
- for (XMLObject xmlObj : objects) {
- DOMXMLObject.marshal(xwriter, xmlObj, prefix, context);
+ for (int i = 0, size = objects.size(); i < size; i++) {
+ ((DOMXMLObject)objects.get(i)).marshal(sigElem, dsPrefix, context);
}
- xwriter.writeEndElement(); // "Signature"
+ // append Id attribute
+ DOMUtils.setAttributeID(sigElem, "Id", id);
+
+ parent.insertBefore(sigElem, nextSibling);
}
@Override
@@ -257,7 +269,8 @@ public final class DOMXMLSignature exten
}
// validate all References
- List<Reference> refs = DOMSignedInfo.getSignedInfoReferences(this.si);
+ @SuppressWarnings("unchecked")
+ List<Reference> refs = this.si.getReferences();
boolean validateRefs = true;
for (int i = 0, size = refs.size(); validateRefs && i < size; i++) {
Reference ref = refs.get(i);
@@ -279,14 +292,16 @@ public final class DOMXMLSignature exten
{
for (int i=0, size=objects.size(); validateMans && i < size; i++) {
XMLObject xo = objects.get(i);
- List<XMLStructure> content = DOMXMLObject.getXmlObjectContent(xo);
+ @SuppressWarnings("unchecked")
+ List<XMLStructure> content = xo.getContent();
int csize = content.size();
for (int j = 0; validateMans && j < csize; j++) {
XMLStructure xs = content.get(j);
if (xs instanceof Manifest) {
LOG.debug("validating manifest");
Manifest man = (Manifest)xs;
- List<Reference> manRefs = DOMManifest.getManifestReferences(man);
+ @SuppressWarnings("unchecked")
+ List<Reference> manRefs = man.getReferences();
int rsize = manRefs.size();
for (int k = 0; validateMans && k < rsize; k++) {
Reference ref = manRefs.get(k);
@@ -314,13 +329,8 @@ public final class DOMXMLSignature exten
throw new NullPointerException("signContext cannot be null");
}
DOMSignContext context = (DOMSignContext)signContext;
- Node nextSibling = context.getNextSibling();
-
- XmlWriterToTree xwriter = new XmlWriterToTree(Marshaller.getMarshallers(), context.getParent(), nextSibling);
- marshal(xwriter,
- DOMUtils.getSignaturePrefix(signContext), signContext);
-
- Element sigElem = xwriter.getCreatedElement();
+ marshal(context.getParent(), context.getNextSibling(),
+ DOMUtils.getSignaturePrefix(context), context);
// generate references and signature value
List<Reference> allReferences = new ArrayList<>();
@@ -330,18 +340,21 @@ public final class DOMXMLSignature exten
signatureIdMap = new HashMap<>();
signatureIdMap.put(id, this);
signatureIdMap.put(si.getId(), si);
- List<Reference> refs = DOMSignedInfo.getSignedInfoReferences(si);
+ @SuppressWarnings("unchecked")
+ List<Reference> refs = si.getReferences();
for (Reference ref : refs) {
signatureIdMap.put(ref.getId(), ref);
}
for (XMLObject obj : objects) {
signatureIdMap.put(obj.getId(), obj);
- List<XMLStructure> content = DOMXMLObject.getXmlObjectContent(obj);
+ @SuppressWarnings("unchecked")
+ List<XMLStructure> content = obj.getContent();
for (XMLStructure xs : content) {
if (xs instanceof Manifest) {
Manifest man = (Manifest)xs;
signatureIdMap.put(man.getId(), man);
- List<Reference> manRefs = DOMManifest.getManifestReferences(man);
+ @SuppressWarnings("unchecked")
+ List<Reference> manRefs = man.getReferences();
for (Reference ref : manRefs) {
allReferences.add(ref);
signatureIdMap.put(ref.getId(), ref);
@@ -384,14 +397,14 @@ public final class DOMXMLSignature exten
// calculate signature value
try {
- Element sigValue = (Element) sigElem.getElementsByTagNameNS(XMLSignature.XMLNS, "SignatureValue").item(0);
- xwriter.resetToNewParent(sigValue);
byte[] val = ((AbstractDOMSignatureMethod)
- si.getSignatureMethod()).sign(signingKey, (DOMSignedInfo) si, signContext);
- ((DOMSignatureValue)sv).setValue(xwriter, val);
+ si.getSignatureMethod()).sign(signingKey, si, signContext);
+ ((DOMSignatureValue)sv).setValue(val);
} catch (InvalidKeyException ike) {
throw new XMLSignatureException(ike);
}
+
+ this.localSigElem = sigElem;
}
@Override
@@ -479,6 +492,7 @@ public final class DOMXMLSignature exten
private String id;
private byte[] value;
private String valueBase64;
+ private Element sigValueElem;
private boolean validated = false;
private boolean validationStatus;
@@ -493,15 +507,20 @@ public final class DOMXMLSignature exten
String content = XMLUtils.getFullTextChildrenFromNode(sigValueElem);
value = XMLUtils.decode(content);
- id = DOMUtils.getIdAttributeValue(sigValueElem, "Id");
+ Attr attr = sigValueElem.getAttributeNodeNS(null, "Id");
+ if (attr != null) {
+ id = attr.getValue();
+ sigValueElem.setIdAttributeNode(attr, true);
+ } else {
+ id = null;
+ }
+ this.sigValueElem = sigValueElem;
}
- @Override
public String getId() {
return id;
}
- @Override
public byte[] getValue() {
return (value == null) ? null : value.clone();
}
@@ -547,7 +566,7 @@ public final class DOMXMLSignature exten
// canonicalize SignedInfo and verify signature
try {
validationStatus = ((AbstractDOMSignatureMethod)sm).verify
- (validationKey, (DOMSignedInfo) si, value, validateContext);
+ (validationKey, si, value, validateContext);
} catch (Exception e) {
throw new XMLSignatureException(e);
}
@@ -585,29 +604,26 @@ public final class DOMXMLSignature exten
return result;
}
- @Override
- public void marshal(XmlWriter xwriter, String dsPrefix,
- XMLCryptoContext context)
+ public void marshal(Node parent, String dsPrefix,
+ DOMCryptoContext context)
throws MarshalException
{
// create SignatureValue element
- xwriter.writeStartElement(dsPrefix, "SignatureValue", XMLSignature.XMLNS);
-
- // append Id attribute, if specified
- xwriter.writeIdAttribute("", "", "Id", id);
+ sigValueElem = DOMUtils.createElement(ownerDoc, "SignatureValue",
+ XMLSignature.XMLNS, dsPrefix);
if (valueBase64 != null) {
- xwriter.writeCharacters(valueBase64);
+ sigValueElem.appendChild(ownerDoc.createTextNode(valueBase64));
}
- xwriter.writeEndElement(); // "SignatureValue"
+ // append Id attribute, if specified
+ DOMUtils.setAttributeID(sigValueElem, "Id", id);
+ parent.appendChild(sigValueElem);
}
- void setValue(XmlWriter xwriter, byte[] value) {
+ void setValue(byte[] value) {
this.value = value;
valueBase64 = XMLUtils.encodeToString(value);
- if (xwriter != null) {
- xwriter.writeCharacters(valueBase64);
- }
+ sigValueElem.appendChild(ownerDoc.createTextNode(valueBase64));
}
}
}
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java?rev=1854026&r1=1854025&r2=1854026&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java Thu Feb 21 09:30:01 2019
@@ -50,24 +50,20 @@ public final class DOMXMLSignatureFactor
*/
public DOMXMLSignatureFactory() {}
- @Override
public XMLSignature newXMLSignature(SignedInfo si, KeyInfo ki) {
return new DOMXMLSignature(si, ki, null, null, null);
}
- @Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public XMLSignature newXMLSignature(SignedInfo si, KeyInfo ki,
List objects, String id, String signatureValueId) {
return new DOMXMLSignature(si, ki, objects, id, signatureValueId);
}
- @Override
public Reference newReference(String uri, DigestMethod dm) {
return newReference(uri, dm, null, null, null);
}
- @Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public Reference newReference(String uri, DigestMethod dm, List transforms,
String type, String id) {
@@ -92,7 +88,6 @@ public final class DOMXMLSignatureFactor
(uri, type, dm, appliedTransforms, result, transforms, id, getProvider());
}
- @Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public Reference newReference(String uri, DigestMethod dm, List transforms,
String type, String id, byte[] digestValue) {
@@ -103,14 +98,12 @@ public final class DOMXMLSignatureFactor
(uri, type, dm, null, null, transforms, id, digestValue, getProvider());
}
- @Override
@SuppressWarnings({ "rawtypes" })
public SignedInfo newSignedInfo(CanonicalizationMethod cm,
SignatureMethod sm, List references) {
return newSignedInfo(cm, sm, references, null);
}
- @Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public SignedInfo newSignedInfo(CanonicalizationMethod cm,
SignatureMethod sm, List references, String id) {
@@ -118,39 +111,33 @@ public final class DOMXMLSignatureFactor
}
// Object factory methods
- @Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public XMLObject newXMLObject(List content, String id, String mimeType,
String encoding) {
return new DOMXMLObject(content, id, mimeType, encoding);
}
- @Override
@SuppressWarnings({ "rawtypes" })
public Manifest newManifest(List references) {
return newManifest(references, null);
}
- @Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public Manifest newManifest(List references, String id) {
return new DOMManifest(references, id);
}
- @Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public SignatureProperties newSignatureProperties(List props, String id) {
return new DOMSignatureProperties(props, id);
}
- @Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public SignatureProperty newSignatureProperty
(List info, String target, String id) {
return new DOMSignatureProperty(info, target, id);
}
- @Override
public XMLSignature unmarshalXMLSignature(XMLValidateContext context)
throws MarshalException {
@@ -160,7 +147,6 @@ public final class DOMXMLSignatureFactor
return unmarshal(((DOMValidateContext) context).getNode(), context);
}
- @Override
public XMLSignature unmarshalXMLSignature(XMLStructure xmlStructure)
throws MarshalException {
@@ -208,7 +194,6 @@ public final class DOMXMLSignatureFactor
}
}
- @Override
public boolean isFeatureSupported(String feature) {
if (feature == null) {
throw new NullPointerException();
@@ -217,7 +202,6 @@ public final class DOMXMLSignatureFactor
}
}
- @Override
public DigestMethod newDigestMethod(String algorithm,
DigestMethodParameterSpec params) throws NoSuchAlgorithmException,
InvalidAlgorithmParameterException {
@@ -251,7 +235,6 @@ public final class DOMXMLSignatureFactor
}
}
- @Override
public SignatureMethod newSignatureMethod(String algorithm,
SignatureMethodParameterSpec params) throws NoSuchAlgorithmException,
InvalidAlgorithmParameterException {
@@ -315,7 +298,6 @@ public final class DOMXMLSignatureFactor
}
}
- @Override
public Transform newTransform(String algorithm,
TransformParameterSpec params) throws NoSuchAlgorithmException,
InvalidAlgorithmParameterException {
@@ -335,7 +317,6 @@ public final class DOMXMLSignatureFactor
return new DOMTransform(spi);
}
- @Override
public Transform newTransform(String algorithm,
XMLStructure params) throws NoSuchAlgorithmException,
InvalidAlgorithmParameterException {
@@ -358,7 +339,6 @@ public final class DOMXMLSignatureFactor
return new DOMTransform(spi);
}
- @Override
public CanonicalizationMethod newCanonicalizationMethod(String algorithm,
C14NMethodParameterSpec params) throws NoSuchAlgorithmException,
InvalidAlgorithmParameterException {
@@ -377,7 +357,6 @@ public final class DOMXMLSignatureFactor
return new DOMCanonicalizationMethod(spi);
}
- @Override
public CanonicalizationMethod newCanonicalizationMethod(String algorithm,
XMLStructure params) throws NoSuchAlgorithmException,
InvalidAlgorithmParameterException {
@@ -400,7 +379,6 @@ public final class DOMXMLSignatureFactor
return new DOMCanonicalizationMethod(spi);
}
- @Override
public URIDereferencer getURIDereferencer() {
return DOMURIDereferencer.INSTANCE;
}
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java?rev=1854026&r1=1854025&r2=1854026&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java Thu Feb 21 09:30:01 2019
@@ -53,7 +53,6 @@ import org.w3c.dom.NamedNodeMap;
*/
public final class DOMXPathFilter2Transform extends ApacheTransform {
- @Override
public void init(TransformParameterSpec params)
throws InvalidAlgorithmParameterException
{
@@ -66,7 +65,6 @@ public final class DOMXPathFilter2Transf
this.params = params;
}
- @Override
public void init(XMLStructure parent, XMLCryptoContext context)
throws InvalidAlgorithmParameterException
{
@@ -122,7 +120,6 @@ public final class DOMXPathFilter2Transf
this.params = new XPathFilter2ParameterSpec(list);
}
- @Override
public void marshalParams(XMLStructure parent, XMLCryptoContext context)
throws MarshalException
{
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java?rev=1854026&r1=1854025&r2=1854026&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java Thu Feb 21 09:30:01 2019
@@ -56,7 +56,6 @@ public final class DOMXPathTransform ext
this.params = params;
}
- @Override
public void init(XMLStructure parent, XMLCryptoContext context)
throws InvalidAlgorithmParameterException
{
@@ -85,7 +84,6 @@ public final class DOMXPathTransform ext
}
}
- @Override
public void marshalParams(XMLStructure parent, XMLCryptoContext context)
throws MarshalException
{
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java?rev=1854026&r1=1854025&r2=1854026&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java Thu Feb 21 09:30:01 2019
@@ -51,7 +51,6 @@ public final class DOMXSLTTransform exte
this.params = params;
}
- @Override
public void init(XMLStructure parent, XMLCryptoContext context)
throws InvalidAlgorithmParameterException {
@@ -64,7 +63,6 @@ public final class DOMXSLTTransform exte
(new javax.xml.crypto.dom.DOMStructure(sheet));
}
- @Override
public void marshalParams(XMLStructure parent, XMLCryptoContext context)
throws MarshalException {
super.marshalParams(parent, context);
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/xml/security/utils/Base64.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/xml/security/utils/Base64.java?rev=1854026&r1=1854025&r2=1854026&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/xml/security/utils/Base64.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/xml/security/utils/Base64.java Thu Feb 21 09:30:01 2019
@@ -144,7 +144,8 @@ public class Base64 {
* @return String with Base64 encoding
*/
public static final String encode(BigInteger big) {
- return encode(getBytes(big, big.bitLength()));
+ byte[] bytes = XMLUtils.getBytes(big, big.bitLength());
+ return XMLUtils.encodeToString(bytes);
}
/**
@@ -210,9 +211,9 @@ public class Base64 {
* @return a decoded BigInteger
* @throws Base64DecodingException
*/
- public static BigInteger decodeBigIntegerFromString(String base64str)
- throws Base64DecodingException {
- return new BigInteger(1, Base64.decode(base64str));
+ public static final BigInteger decodeBigIntegerFromText(Text text)
+ throws Base64DecodingException {
+ return new BigInteger(1, Base64.decode(text.getData()));
}
/**
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/xml/security/utils/ElementProxy.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/xml/security/utils/ElementProxy.java?rev=1854026&r1=1854025&r2=1854026&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/xml/security/utils/ElementProxy.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/xml/security/utils/ElementProxy.java Thu Feb 21 09:30:01 2019
@@ -366,7 +366,6 @@ public abstract class ElementProxy {
if (n != null) {
return new BigInteger(1, XMLUtils.decode(XMLUtils.getFullTextChildrenFromNode(n)));
}
-
return null;
}
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java?rev=1854026&r1=1854025&r2=1854026&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/CreateBaltimore23Test.java Thu Feb 21 09:30:01 2019
@@ -145,7 +145,6 @@ public class CreateBaltimore23Test {
DOMSignContext dsc = new DOMSignContext(signingKey, envelope);
sig.sign(dsc);
- TestUtils.validateSecurityOrEncryptionElement(envelope.getFirstChild());
DOMValidateContext dvc = new DOMValidateContext
(kvks, envelope.getFirstChild());
@@ -580,7 +579,6 @@ public class CreateBaltimore23Test {
dsc.setURIDereferencer(ud);
sig.sign(dsc);
- TestUtils.validateSecurityOrEncryptionElement(ys.getLastChild());
// DOM L2 does not support the creation of DOCTYPEs, so instead
// we insert it before the document using a StringWriter
@@ -669,7 +667,6 @@ public class CreateBaltimore23Test {
dsc.setURIDereferencer(ud);
sig.sign(dsc);
- TestUtils.validateSecurityOrEncryptionElement(doc.getDocumentElement());
/*
System.out.println("doc is:");
@@ -726,7 +723,6 @@ public class CreateBaltimore23Test {
DOMSignContext dsc = new DOMSignContext(signingKey, doc);
sig.sign(dsc);
- TestUtils.validateSecurityOrEncryptionElement(doc.getDocumentElement());
DOMValidateContext dvc = new DOMValidateContext
(ks, doc.getDocumentElement());
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java?rev=1854026&r1=1854025&r2=1854026&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXFilter2Test.java Thu Feb 21 09:30:01 2019
@@ -159,7 +159,6 @@ public class CreateInteropXFilter2Test {
DOMSignContext dsc = new DOMSignContext(signingKey, document);
sig.sign(dsc);
- TestUtils.validateSecurityOrEncryptionElement(document.getLastChild());
DOMValidateContext dvc = new DOMValidateContext
(new KeySelectors.KeyValueKeySelector(), document.getLastChild());
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXMLDSig11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXMLDSig11Test.java?rev=1854026&r1=1854025&r2=1854026&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXMLDSig11Test.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/CreateInteropXMLDSig11Test.java Thu Feb 21 09:30:01 2019
@@ -311,7 +311,6 @@ public class CreateInteropXMLDSig11Test
dsc.setDefaultNamespacePrefix("dsig");
sig.sign(dsc);
- TestUtils.validateSecurityOrEncryptionElement(doc.getDocumentElement());
DOMValidateContext dvc = new DOMValidateContext
(ks, doc.getDocumentElement());
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/CreatePhaosXMLDSig3Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/CreatePhaosXMLDSig3Test.java?rev=1854026&r1=1854025&r2=1854026&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/CreatePhaosXMLDSig3Test.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/CreatePhaosXMLDSig3Test.java Thu Feb 21 09:30:01 2019
@@ -110,7 +110,6 @@ public class CreatePhaosXMLDSig3Test {
dsc.setURIDereferencer(ud);
sig.sign(dsc);
- TestUtils.validateSecurityOrEncryptionElement(doc.getDocumentElement());
DOMValidateContext dvc = new DOMValidateContext
(new KeySelectors.SecretKeySelector
@@ -167,7 +166,6 @@ public class CreatePhaosXMLDSig3Test {
dsc.putNamespacePrefix(XMLSignature.XMLNS, "dsig");
sig.sign(dsc);
- TestUtils.validateSecurityOrEncryptionElement(player.getLastChild());
DOMValidateContext dvc = new DOMValidateContext
(new KeySelectors.SecretKeySelector
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/DetachedTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/DetachedTest.java?rev=1854026&r1=1854025&r2=1854026&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/DetachedTest.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/DetachedTest.java Thu Feb 21 09:30:01 2019
@@ -144,7 +144,6 @@ public class DetachedTest {
// Generate (and sign) the XMLSignature
signature.sign(signContext);
TestUtils.validateSecurityOrEncryptionElement(doc.getDocumentElement());
-
//
// PART 2 : Validating the detached signature
//
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/ReferenceTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/ReferenceTest.java?rev=1854026&r1=1854025&r2=1854026&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/ReferenceTest.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/ReferenceTest.java Thu Feb 21 09:30:01 2019
@@ -230,7 +230,6 @@ public class ReferenceTest {
(kifac.newKeyValue(TestUtils.getPublicKey(CRYPTO_ALGS[i])))));
try {
sig.sign(signContext);
- TestUtils.validateSecurityOrEncryptionElement(doc.getDocumentElement());
if (!cache) {
assertNull(ref.getDereferencedData());
assertNull(ref.getDigestInputStream());
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java?rev=1854026&r1=1854025&r2=1854026&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/test/java/javax/xml/crypto/test/dsig/XMLSignatureTest.java Thu Feb 21 09:30:01 2019
@@ -180,7 +180,6 @@ public class XMLSignatureTest {
signContext = new DOMSignContext(SIGN_KEYS[i], doc);
signContext.setURIDereferencer(ud);
sig.sign(signContext);
- TestUtils.validateSecurityOrEncryptionElement(doc.getDocumentElement());
validateContext = new DOMValidateContext
(VALIDATE_KEYS[i], doc.getDocumentElement());
validateContext.setURIDereferencer(ud);
@@ -216,7 +215,6 @@ public class XMLSignatureTest {
signContext.setURIDereferencer(ud);
try {
sig.sign(signContext);
- // note - don't bother validating the returned XML here, because there shouldn't be any.
fail("Should have failed because TestProvider does not " +
"support " + SIGN_KEYS[i].getAlgorithm());
} catch (Exception e) {
@@ -237,7 +235,6 @@ public class XMLSignatureTest {
signContext.putNamespacePrefix(XMLSignature.XMLNS, "");
signContext.setURIDereferencer(ud);
sig.sign(signContext);
- TestUtils.validateSecurityOrEncryptionElement(doc.getDocumentElement());
/*
StringWriter sw = new StringWriter();
dumpDocument(doc, sw);
@@ -281,7 +278,6 @@ public class XMLSignatureTest {
DOMSignContext dsc = new DOMSignContext(SIGN_KEYS[1], doc);
sig.sign(dsc);
- TestUtils.validateSecurityOrEncryptionElement(doc.getDocumentElement());
/*
StringWriter sw = new StringWriter();
@@ -333,7 +329,6 @@ public class XMLSignatureTest {
// remove the signature node (since it will get recreated)
parent.removeChild(domSignature.getNode());
newSignature.sign(signContext);
- TestUtils.validateSecurityOrEncryptionElement(parent.getLastChild());
// check that Object element retained namespace definitions
Element objElem = (Element)parent.getFirstChild().getLastChild();