Add method in Wss4jSecurityInterceptor to allow setting ADD_INCLUSIVE_PREFIXES. This configuration was added in WSS4J 2.0.0 and sets whether to add an InclusiveNamespaces PrefixList as a CanonicalizationMethod child when generating Signatures using WSConstants.C14N_EXCL_OMIT_COMMENTS.

Author: rmagrin

spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jSecurityInterceptor.java

@@ -141,6 +141,8 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl
 
 	private boolean bspCompliant;
 
+	private boolean addInclusivePrefixes;
+
 	private boolean securementUseDerivedKey;
 
 	// Allow RSA 15 to maintain default behavior
@@ -492,7 +494,16 @@ public void setBspCompliant(boolean bspCompliant) {
 		this.handler.setOption(WSHandlerConstants.IS_BSP_COMPLIANT, bspCompliant);
 		this.bspCompliant = bspCompliant;
 	}
-	
+
+	/**
+	 * Sets whether to add an InclusiveNamespaces PrefixList as a CanonicalizationMethod child
+	 * when generating Signatures using WSConstants.C14N_EXCL_OMIT_COMMENTS. Default is {@code true}.
+	 */
+	public void setAddInclusivePrefixes(boolean addInclusivePrefixes) {
+		this.handler.setOption(WSHandlerConstants.ADD_INCLUSIVE_PREFIXES, addInclusivePrefixes);
+		this.addInclusivePrefixes = addInclusivePrefixes;
+	}
+
 	/**
 	 * Sets whether the RSA 1.5 key transport algorithm is allowed.
 	 */
@@ -629,6 +640,9 @@ protected RequestData initializeValidationRequestData(MessageContext messageCont
 		{
 			requestData.getBSPEnforcer().setDisableBSPRules(!bspCompliant);
 		}
+
+		requestData.setAddInclusivePrefixes(addInclusivePrefixes);
+
 		// allow for qualified password types for .Net interoperability
 		requestData.setAllowNamespaceQualifiedPasswordTypes(true);
 

spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jMessageInterceptorUsernameTokenTestCase.java

@@ -147,6 +147,8 @@ protected Wss4jSecurityInterceptor prepareInterceptor(String actions, boolean va
 		interceptor.setValidationCallbackHandler(callbackHandler);
 
 		interceptor.setBspCompliant(false);
+
+		interceptor.setAddInclusivePrefixes(false);
 
 		interceptor.afterPropertiesSet();
 		return interceptor;