This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch coheigea/remaining-codeql in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
commit 4069cdde7c586003a496617faeeef1008eba1eef Author: Colm O hEigeartaigh <[email protected]> AuthorDate: Wed Oct 14 15:07:57 2026 +0100 Some remaining codeql fixes --- .../java/org/apache/wss4j/common/token/SecurityTokenReference.java | 3 +++ .../main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java | 5 +++++ .../src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java | 2 +- .../src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/token/SecurityTokenReference.java b/ws-security-common/src/main/java/org/apache/wss4j/common/token/SecurityTokenReference.java index 5eba043be..033ba47ef 100644 --- a/ws-security-common/src/main/java/org/apache/wss4j/common/token/SecurityTokenReference.java +++ b/ws-security-common/src/main/java/org/apache/wss4j/common/token/SecurityTokenReference.java @@ -569,6 +569,9 @@ public class SecurityTokenReference { if (result != 1) { bspEnforcer.handleBSPRule(BSPRule.R3061); } + if (child == null) { + throw new WSSecurityException(WSSecurityException.ErrorCode.INVALID_SECURITY); + } if ("KeyIdentifier".equals(child.getLocalName()) && WSS4JConstants.WSSE_NS.equals(child.getNamespaceURI())) { diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java index fe4ae3370..d038c3069 100644 --- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java +++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java @@ -169,6 +169,11 @@ public class SignatureProcessor implements Processor { if (result != 1) { data.getBSPEnforcer().handleBSPRule(BSPRule.R5402); } + if (child == null) { + throw new WSSecurityException( + WSSecurityException.ErrorCode.INVALID_SECURITY, "unsupportedKeyInfo" + ); + } if (!(SecurityTokenReference.SECURITY_TOKEN_REFERENCE.equals(child.getLocalName()) && WSConstants.WSSE_NS.equals(child.getNamespaceURI()))) { diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java index 5e4a1fba4..6538591d1 100644 --- a/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java +++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java @@ -882,7 +882,7 @@ public class AttachmentTest { break; } } - assertFalse(attachmentEncData == null); + assertNotNull(attachmentEncData); attachmentEncData.setAttributeNS(null, "MimeType", "application/malicious"); encryptedAttachments.get(0).getHeaders().put("X-Attacker-Controlled", "forged"); diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java index 677c80988..889a9ae47 100644 --- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java +++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java @@ -913,7 +913,7 @@ public class AttachmentTest extends AbstractTestBase { break; } } - assertFalse(attachmentEncData == null); + assertNotNull(attachmentEncData); attachmentEncData.setAttributeNS(null, "MimeType", "application/malicious"); encryptedAttachments.get(0).getHeaders().put("X-Attacker-Controlled", "forged");
