Upgraded to WSS4J 1.6.15

spring-projects · Apr 25, 2014 · 1a5416d · 1a5416d
1 parent 12a10a3
commit 1a5416d
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -223,7 +223,7 @@ project('spring-ws-security') {
 		optional("com.sun.xml.wss:xws-security:3.0") {
 			exclude group: 'javax.xml.crypto', module: 'xmldsig'
 		}
-		optional("org.apache.ws.security:wss4j:1.6.5")
+		optional("org.apache.ws.security:wss4j:1.6.15")
 
 		// SOAP
 		provided("com.sun.xml.messaging.saaj:saaj-impl:1.3.19") // required for XWSS

diff --git a/...ty/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityInterceptor.java b/...ty/src/main/java/org/springframework/ws/soap/security/wss4j/Wss4jSecurityInterceptor.java
@@ -564,6 +564,8 @@ protected RequestData initializeRequestData(MessageContext messageContext) {
 
         requestData.setWssConfig(wssConfig);
 
+	    messageContext.setProperty(WSHandlerConstants.TTL_TIMESTAMP, Integer.toString(securementTimeToLive));
+
         return requestData;
     }
 

diff --git a/.../ws/soap/security/wss4j/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTestCase.java b/.../ws/soap/security/wss4j/Wss4jMessageInterceptorSpringSecurityCallbackHandlerTestCase.java
@@ -70,9 +70,18 @@ public void testValidateUsernameTokenPlainText() throws Exception {
 
     @Test
     public void testValidateUsernameTokenDigest() throws Exception {
-        EndpointInterceptor interceptor = prepareInterceptor("UsernameToken", true, true);
-        SoapMessage message = loadSoap11Message("usernameTokenDigest-soap.xml");
+	    Wss4jSecurityInterceptor interceptor = new Wss4jSecurityInterceptor();
+	    interceptor.setSecurementActions("UsernameToken");
+	    interceptor.setSecurementUsername("Bert");
+	    interceptor.setSecurementPassword("Ernie");
+	    interceptor.setSecurementPasswordType(WSConstants.PW_DIGEST);
+
+
+	    SoapMessage message = loadSoap11Message("empty-soap.xml");
         MessageContext messageContext = new DefaultMessageContext(message, getSoap11MessageFactory());
+	    interceptor.handleRequest(messageContext);
+
+        interceptor = prepareInterceptor("UsernameToken", true, true);
         interceptor.handleRequest(messageContext, null);
         assertValidateUsernameToken(message);
 
@@ -91,7 +100,7 @@ protected void assertValidateUsernameToken(SoapMessage message) throws Exception
         assertNotNull("No Authentication created", SecurityContextHolder.getContext().getAuthentication());
     }
 
-    protected EndpointInterceptor prepareInterceptor(String actions, boolean validating, boolean digest)
+    protected Wss4jSecurityInterceptor prepareInterceptor(String actions, boolean validating, boolean digest)
             throws Exception {
         Wss4jSecurityInterceptor interceptor = new Wss4jSecurityInterceptor();
         if (validating) {

diff --git a/.../springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorUsernameTokenTestCase.java b/.../springframework/ws/soap/security/wss4j/Wss4jMessageInterceptorUsernameTokenTestCase.java
@@ -49,9 +49,17 @@ public void testValidateUsernameTokenPlainText() throws Exception {
 
     @Test
     public void testValidateUsernameTokenDigest() throws Exception {
-        Wss4jSecurityInterceptor interceptor = prepareInterceptor("UsernameToken", true, true);
-        SoapMessage message = loadSoap11Message("usernameTokenDigest-soap.xml");
+	    Wss4jSecurityInterceptor interceptor = new Wss4jSecurityInterceptor();
+	    interceptor.setSecurementActions("UsernameToken");
+	    interceptor.setSecurementUsername("Bert");
+	    interceptor.setSecurementPassword("Ernie");
+	    interceptor.setSecurementPasswordType(WSConstants.PW_DIGEST);
+
+	    SoapMessage message = loadSoap11Message("empty-soap.xml");
         MessageContext messageContext = new DefaultMessageContext(message, getSoap11MessageFactory());
+	    interceptor.handleRequest(messageContext);
+
+	    interceptor = prepareInterceptor("UsernameToken", true, true);
         interceptor.validateMessage(message, messageContext);
         assertValidateUsernameToken(message);
     }