From b87164e258b4e7d8405c6916050f29b4d4b46659 Mon Sep 17 00:00:00 2001 From: Tareq Abedrabbo Date: Tue, 18 Aug 2009 16:04:39 +0000 Subject: [PATCH] SWS-515 - Validate WSS headers using new checkReceiverResultsAnyOrder method in WSHandler. --- .../springframework/ws/soap/security/wss4j/Wss4jHandler.java | 4 ++++ .../ws/soap/security/wss4j/Wss4jSecurityInterceptor.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jHandler.java b/security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jHandler.java index c04fe28b..11320714 100644 --- a/security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jHandler.java +++ b/security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jHandler.java @@ -64,6 +64,10 @@ class Wss4jHandler extends WSHandler { return super.checkReceiverResults(wsResult, actions); } + protected boolean checkReceiverResultsAnyOrder(Vector wsResult, Vector actions) { + return super.checkReceiverResultsAnyOrder(wsResult, actions); + } + void setOption(String key, String value) { options.setProperty(key, value); } diff --git a/security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityInterceptor.java b/security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityInterceptor.java index f1c31675..0fd8643b 100755 --- a/security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityInterceptor.java +++ b/security/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityInterceptor.java @@ -549,7 +549,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl */ protected void checkResults(Vector results, Vector validationActionsVector) throws Wss4jSecurityValidationException { - if (!handler.checkReceiverResults(results, validationActionsVector)) { + if (!handler.checkReceiverResultsAnyOrder(results, validationActionsVector)) { throw new Wss4jSecurityValidationException("Security processing failed (actions mismatch)"); } }