You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2023/08/28 08:24:59 UTC
[ws-wss4j] branch coheigea/xmlsec-4.0.0 created (now 372d4399d)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch coheigea/xmlsec-4.0.0
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
at 372d4399d Updating to XML Security 4.0.0-SNAPSHOT
This branch includes the following new commits:
new 372d4399d Updating to XML Security 4.0.0-SNAPSHOT
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[ws-wss4j] 01/01: Updating to XML Security 4.0.0-SNAPSHOT
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch coheigea/xmlsec-4.0.0
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
commit 372d4399d0e1af4eace0711c149c9bce2c6fa8e0
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Aug 28 09:24:39 2023 +0100
Updating to XML Security 4.0.0-SNAPSHOT
---
bindings/pom.xml | 4 ++++
parent/pom.xml | 8 +++++++-
.../java/org/apache/wss4j/dom/resolvers/ResolverAttachment.java | 3 ++-
.../wss4j/dom/transform/AttachmentContentSignatureTransform.java | 3 ++-
.../main/java/org/apache/wss4j/dom/transform/STRTransform.java | 5 +++--
5 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/bindings/pom.xml b/bindings/pom.xml
index c0a4f3b8b..21dead2a1 100644
--- a/bindings/pom.xml
+++ b/bindings/pom.xml
@@ -39,6 +39,10 @@
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
</dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </dependency>
</dependencies>
<profiles>
diff --git a/parent/pom.xml b/parent/pom.xml
index d6dfed4f7..5f754f586 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -48,7 +48,7 @@
<wsdl4j.version>1.6.3</wsdl4j.version>
<woodstox.version>6.5.1</woodstox.version>
<xz.version>1.9</xz.version>
- <xmlsec.version>3.0.2</xmlsec.version>
+ <xmlsec.version>4.0.0-SNAPSHOT</xmlsec.version>
<xmlunit.version>2.9.1</xmlunit.version>
<!-- OSGi related properties -->
<wss4j.osgi.import />
@@ -56,6 +56,7 @@
<wss4j.osgi.export>org.apache.wss4j.*</wss4j.osgi.export>
<wss4j.osgi.dynamic.import />
<wss4j.manifest.location>${project.build.outputDirectory}/META-INF/MANIFEST.MF</wss4j.manifest.location>
+ <xml.bind.api.version>4.0.0</xml.bind.api.version>
</properties>
<dependencyManagement>
@@ -185,6 +186,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${xml.bind.api.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/resolvers/ResolverAttachment.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/resolvers/ResolverAttachment.java
index 72bf257fd..121f51182 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/resolvers/ResolverAttachment.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/resolvers/ResolverAttachment.java
@@ -19,6 +19,7 @@
package org.apache.wss4j.dom.resolvers;
import org.apache.xml.security.signature.XMLSignatureInput;
+import org.apache.xml.security.signature.XMLSignatureByteInput;
import org.apache.xml.security.utils.resolver.ResourceResolverContext;
import org.apache.xml.security.utils.resolver.ResourceResolverException;
import org.apache.xml.security.utils.resolver.ResourceResolverSpi;
@@ -32,7 +33,7 @@ public class ResolverAttachment extends ResourceResolverSpi {
@Override
public XMLSignatureInput engineResolveURI(ResourceResolverContext context) throws ResourceResolverException {
- XMLSignatureInput xmlSignatureInput = new XMLSignatureInput(EMPTY_BYTE_ARRAY);
+ XMLSignatureInput xmlSignatureInput = new XMLSignatureByteInput(EMPTY_BYTE_ARRAY);
xmlSignatureInput.setSourceURI(context.uriToResolve);
return xmlSignatureInput;
}
diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentContentSignatureTransform.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentContentSignatureTransform.java
index b847c0eb7..7c722f2b5 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentContentSignatureTransform.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentContentSignatureTransform.java
@@ -31,6 +31,7 @@ import org.apache.xml.security.c14n.Canonicalizer;
import org.apache.xml.security.c14n.InvalidCanonicalizerException;
import org.apache.xml.security.parser.XMLParserException;
import org.apache.xml.security.signature.XMLSignatureInput;
+import org.apache.xml.security.signature.XMLSignatureStreamInput;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
@@ -199,7 +200,7 @@ public class AttachmentContentSignatureTransform extends TransformService {
*/
Canonicalizer canon = Canonicalizer.getInstance(WSConstants.C14N_EXCL_OMIT_COMMENTS);
- XMLSignatureInput xmlSignatureInput = new XMLSignatureInput(inputStream);
+ XMLSignatureInput xmlSignatureInput = new XMLSignatureStreamInput(inputStream); //NOPMD
canon.canonicalizeXPathNodeSet(xmlSignatureInput.getNodeSet(), outputStream);
} else if (mimeType != null && mimeType.matches("(?i)(text/).*")) {
diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransform.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransform.java
index 4e1ecbd47..30adf1882 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransform.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/STRTransform.java
@@ -46,6 +46,7 @@ import org.apache.wss4j.dom.WSConstants;
import org.apache.wss4j.dom.WSDocInfo;
import org.apache.xml.security.c14n.Canonicalizer;
import org.apache.xml.security.signature.XMLSignatureInput;
+import org.apache.xml.security.signature.XMLSignatureStreamInput;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -159,8 +160,8 @@ public class STRTransform extends TransformService {
}
} else {
try {
- XMLSignatureInput xmlSignatureInput =
- new XMLSignatureInput(((OctetStreamData)data).getOctetStream());
+ XMLSignatureInput xmlSignatureInput = //NOPMD
+ new XMLSignatureStreamInput(((OctetStreamData)data).getOctetStream());
str = (Element)xmlSignatureInput.getSubNode();
} catch (Exception ex) {
throw new TransformException(ex);