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 2021/02/15 12:31:47 UTC
[ws-wss4j] branch 2_3_x-fixes updated: Avoid returning null from
the transforms to fix warning logs
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 2_3_x-fixes
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
The following commit(s) were added to refs/heads/2_3_x-fixes by this push:
new 9ad0ba3 Avoid returning null from the transforms to fix warning logs
9ad0ba3 is described below
commit 9ad0ba3cb92d075ba9fa747da36511443068d738
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Feb 15 11:08:11 2021 +0000
Avoid returning null from the transforms to fix warning logs
---
.../org/apache/wss4j/dom/transform/AttachmentCiphertextTransform.java | 2 +-
.../wss4j/dom/transform/AttachmentCompleteSignatureTransform.java | 4 +++-
.../wss4j/dom/transform/AttachmentContentSignatureTransform.java | 3 ++-
.../src/main/java/org/apache/wss4j/dom/transform/STRTransform.java | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentCiphertextTransform.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentCiphertextTransform.java
index 9145f6b..6353312 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentCiphertextTransform.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentCiphertextTransform.java
@@ -48,6 +48,6 @@ public class AttachmentCiphertextTransform extends TransformSpi {
boolean secureValidation)
throws IOException, CanonicalizationException, InvalidCanonicalizerException, TransformationException,
ParserConfigurationException, SAXException {
- return null;
+ return new XMLSignatureInput((byte[])null);
}
}
diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentCompleteSignatureTransform.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentCompleteSignatureTransform.java
index 9858b45..b9312e5 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentCompleteSignatureTransform.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentCompleteSignatureTransform.java
@@ -23,10 +23,12 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import org.apache.jcp.xml.dsig.internal.dom.ApacheNodeSetData;
import org.apache.jcp.xml.dsig.internal.dom.ApacheOctetStreamData;
import org.apache.wss4j.common.ext.Attachment;
import org.apache.wss4j.common.util.AttachmentUtils;
import org.apache.wss4j.dom.WSConstants;
+import org.apache.xml.security.signature.XMLSignatureInput;
import javax.xml.crypto.Data;
import javax.xml.crypto.OctetStreamData;
@@ -83,7 +85,7 @@ public class AttachmentCompleteSignatureTransform extends AttachmentContentSigna
),
attachmentUri, mimeType);
}
- return null;
+ return new ApacheNodeSetData(new XMLSignatureInput((byte[])null));
} catch (IOException e) {
throw new TransformException(e);
}
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 f0c9e03..521b5e9 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
@@ -18,6 +18,7 @@
*/
package org.apache.wss4j.dom.transform;
+import org.apache.jcp.xml.dsig.internal.dom.ApacheNodeSetData;
import org.apache.jcp.xml.dsig.internal.dom.ApacheOctetStreamData;
import org.apache.wss4j.common.ext.Attachment;
import org.apache.wss4j.common.ext.AttachmentRequestCallback;
@@ -236,7 +237,7 @@ public class AttachmentContentSignatureTransform extends TransformService {
),
attachmentUri, mimeType);
}
- return null;
+ return new ApacheNodeSetData(new XMLSignatureInput((byte[])null));
} catch (IOException | InvalidCanonicalizerException | CanonicalizationException
| XMLParserException e) {
throw new TransformException(e);
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 4e1ecbd..62fd550 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
@@ -37,6 +37,7 @@ import javax.xml.crypto.dsig.TransformException;
import javax.xml.crypto.dsig.TransformService;
import javax.xml.crypto.dsig.spec.TransformParameterSpec;
+import org.apache.jcp.xml.dsig.internal.dom.ApacheNodeSetData;
import org.apache.wss4j.common.bsp.BSPEnforcer;
import org.apache.wss4j.common.token.PKIPathSecurity;
import org.apache.wss4j.common.token.SecurityTokenReference;
@@ -214,7 +215,7 @@ public class STRTransform extends TransformService {
//
if (os != null) {
canon.canonicalizeSubtree(dereferencedToken, "#default", true, os);
- return null;
+ return new ApacheNodeSetData(new XMLSignatureInput((byte[])null));
}
try (ByteArrayOutputStream writer = new ByteArrayOutputStream()) {