Add support for configuring extra WSS4J options

Closes gh-1093

Author: snicoll

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

@@ -231,6 +231,26 @@ public void setSecurementActions(String securementActions) {
 		this.securementActions = securementActions;
 	}
 
+	/**
+	 * Set a WSS4J option.
+	 * @param key the id of the option as defined in {@link WSHandlerConstants}
+	 * @param value the value of the option
+	 * @since 4.1.0
+	 */
+	public void setOption(String key, String value) {
+		this.handler.setOption(key, value);
+	}
+
+	/**
+	 * Set a WSS4J flag option.
+	 * @param key the id of the option as defined in {@link WSHandlerConstants}
+	 * @param value whether the option is enabled
+	 * @since 4.1.0
+	 */
+	public void setOption(String key, boolean value) {
+		this.handler.setOption(key, value);
+	}
+
 	/**
 	 * The actor name of the {@code wsse:Security} header.
 	 * <p>
@@ -240,7 +260,7 @@ public void setSecurementActions(String securementActions) {
 	 * standard values.
 	 */
 	public void setSecurementActor(String securementActor) {
-		this.handler.setOption(WSHandlerConstants.ACTOR, securementActor);
+		setOption(WSHandlerConstants.ACTOR, securementActor);
 	}
 
 	public void setSecurementEncryptionCrypto(Crypto securementEncryptionCrypto) {
@@ -256,7 +276,7 @@ public void setSecurementEncryptionCrypto(Crypto securementEncryptionCrypto) {
 	 * only.
 	 */
 	public void setSecurementEncryptionKeyIdentifier(String securementEncryptionKeyIdentifier) {
-		this.handler.setOption(WSHandlerConstants.ENC_KEY_ID, securementEncryptionKeyIdentifier);
+		setOption(WSHandlerConstants.ENC_KEY_ID, securementEncryptionKeyIdentifier);
 	}
 
 	/**
@@ -265,7 +285,7 @@ public void setSecurementEncryptionKeyIdentifier(String securementEncryptionKeyI
 	 * {@link WSConstants#KEYTRANSPORT_RSAOAEP}.
 	 */
 	public void setSecurementEncryptionKeyTransportAlgorithm(String securementEncryptionKeyTransportAlgorithm) {
-		this.handler.setOption(WSHandlerConstants.ENC_KEY_TRANSPORT, securementEncryptionKeyTransportAlgorithm);
+		setOption(WSHandlerConstants.ENC_KEY_TRANSPORT, securementEncryptionKeyTransportAlgorithm);
 	}
 
 	/**
@@ -282,7 +302,7 @@ public void setSecurementEncryptionKeyTransportAlgorithm(String securementEncryp
 	 * it is omitted. Example of a list: <pre><code class="xml">
 	 * &lt;property name="securementEncryptionParts"
 	 *	 value="{Content}{http://example.org/paymentv2}CreditCard;
-	 *			   {Element}{}UserName" /&gt;
+	 *               {Element}{}UserName" /&gt;
 	 * </code></pre> The first entry of the list identifies the element {@code CreditCard}
 	 * in the namespace {@code http://example.org/paymentv2}, and will encrypt its
 	 * content. Be aware that the element name, the namespace identifier, and the
@@ -304,7 +324,7 @@ public void setSecurementEncryptionKeyTransportAlgorithm(String securementEncryp
 	 * by default.
 	 */
 	public void setSecurementEncryptionParts(String securementEncryptionParts) {
-		this.handler.setOption(WSHandlerConstants.ENCRYPTION_PARTS, securementEncryptionParts);
+		setOption(WSHandlerConstants.ENCRYPTION_PARTS, securementEncryptionParts);
 	}
 
 	/**
@@ -314,7 +334,7 @@ public void setSecurementEncryptionParts(String securementEncryptionParts) {
 	 * all of these algorithms are required by the XML Encryption specification.
 	 */
 	public void setSecurementEncryptionSymAlgorithm(String securementEncryptionSymAlgorithm) {
-		this.handler.setOption(WSHandlerConstants.ENC_SYM_ALGO, securementEncryptionSymAlgorithm);
+		setOption(WSHandlerConstants.ENC_SYM_ALGO, securementEncryptionSymAlgorithm);
 	}
 
 	/**
@@ -338,7 +358,7 @@ public void setSecurementEncryptionSymAlgorithm(String securementEncryptionSymAl
 	 * a security risk, because the public key of that certificate is used only.
 	 */
 	public void setSecurementEncryptionUser(String securementEncryptionUser) {
-		this.handler.setOption(WSHandlerConstants.ENCRYPTION_USER, securementEncryptionUser);
+		setOption(WSHandlerConstants.ENCRYPTION_USER, securementEncryptionUser);
 	}
 
 	public void setSecurementPassword(String securementPassword) {
@@ -354,7 +374,7 @@ public void setSecurementPassword(String securementPassword) {
 	 * The default setting is PW_DIGEST.
 	 */
 	public void setSecurementPasswordType(String securementUsernameTokenPasswordType) {
-		this.handler.setOption(WSHandlerConstants.PASSWORD_TYPE, securementUsernameTokenPasswordType);
+		setOption(WSHandlerConstants.PASSWORD_TYPE, securementUsernameTokenPasswordType);
 	}
 
 	/**
@@ -363,14 +383,14 @@ public void setSecurementPasswordType(String securementUsernameTokenPasswordType
 	 * @see WSConstants#DSA
 	 */
 	public void setSecurementSignatureAlgorithm(String securementSignatureAlgorithm) {
-		this.handler.setOption(WSHandlerConstants.SIG_ALGO, securementSignatureAlgorithm);
+		setOption(WSHandlerConstants.SIG_ALGO, securementSignatureAlgorithm);
 	}
 
 	/**
 	 * Defines which signature digest algorithm to use.
 	 */
 	public void setSecurementSignatureDigestAlgorithm(String digestAlgorithm) {
-		this.handler.setOption(WSHandlerConstants.SIG_DIGEST_ALGO, digestAlgorithm);
+		setOption(WSHandlerConstants.SIG_DIGEST_ALGO, digestAlgorithm);
 	}
 
 	public void setSecurementSignatureCrypto(Crypto securementSignatureCrypto) {
@@ -384,7 +404,7 @@ public void setSecurementSignatureCrypto(Crypto securementSignatureCrypto) {
 	 * {@code IssuerSerial} and {@code DirectReference} are valid only.
 	 */
 	public void setSecurementSignatureKeyIdentifier(String securementSignatureKeyIdentifier) {
-		this.handler.setOption(WSHandlerConstants.SIG_KEY_ID, securementSignatureKeyIdentifier);
+		setOption(WSHandlerConstants.SIG_KEY_ID, securementSignatureKeyIdentifier);
 	}
 
 	/**
@@ -414,7 +434,7 @@ public void setSecurementSignatureKeyIdentifier(String securementSignatureKeyIde
 	 * the SOAP namespace identifier can be empty ({@code {}}).
 	 */
 	public void setSecurementSignatureParts(String securementSignatureParts) {
-		this.handler.setOption(WSHandlerConstants.SIGNATURE_PARTS, securementSignatureParts);
+		setOption(WSHandlerConstants.SIGNATURE_PARTS, securementSignatureParts);
 	}
 
 	/**
@@ -427,7 +447,7 @@ public void setSecurementSignatureParts(String securementSignatureParts) {
 	 * specified by {@link #setSecurementUsername(String)}.
 	 */
 	public void setSecurementSignatureUser(String securementSignatureUser) {
-		this.handler.setOption(WSHandlerConstants.SIGNATURE_USER, securementSignatureUser);
+		setOption(WSHandlerConstants.SIGNATURE_USER, securementSignatureUser);
 	}
 
 	/**
@@ -548,15 +568,15 @@ public void setValidationSubjectDnConstraints(List<Pattern> patterns) {
 	 */
 	public void setEnableSignatureConfirmation(boolean enableSignatureConfirmation) {
 
-		this.handler.setOption(WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION, enableSignatureConfirmation);
+		setOption(WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION, enableSignatureConfirmation);
 		this.enableSignatureConfirmation = enableSignatureConfirmation;
 	}
 
 	/**
 	 * Sets if the generated timestamp header's precision is in milliseconds.
 	 */
 	public void setTimestampPrecisionInMilliseconds(boolean timestampPrecisionInMilliseconds) {
-		this.handler.setOption(WSHandlerConstants.TIMESTAMP_PRECISION, timestampPrecisionInMilliseconds);
+		setOption(WSHandlerConstants.TIMESTAMP_PRECISION, timestampPrecisionInMilliseconds);
 	}
 
 	/**
@@ -571,23 +591,23 @@ public void setTimestampStrict(boolean timestampStrict) {
 	 * messages. Default is {@code true}.
 	 */
 	public void setSecurementMustUnderstand(boolean securementMustUnderstand) {
-		this.handler.setOption(WSHandlerConstants.MUST_UNDERSTAND, securementMustUnderstand);
+		setOption(WSHandlerConstants.MUST_UNDERSTAND, securementMustUnderstand);
 	}
 
 	/**
 	 * Sets whether a {@code Nonce} element is added to the {@code UsernameToken}s.
 	 * Default is {@code false}.
 	 */
 	public void setSecurementUsernameTokenNonce(boolean securementUsernameTokenNonce) {
-		this.handler.setOption(ConfigurationConstants.ADD_USERNAMETOKEN_NONCE, securementUsernameTokenNonce);
+		setOption(ConfigurationConstants.ADD_USERNAMETOKEN_NONCE, securementUsernameTokenNonce);
 	}
 
 	/**
 	 * Sets whether a {@code Created} element is added to the {@code UsernameToken}s.
 	 * Default is {@code false}.
 	 */
 	public void setSecurementUsernameTokenCreated(boolean securementUsernameTokenCreated) {
-		this.handler.setOption(ConfigurationConstants.ADD_USERNAMETOKEN_CREATED, securementUsernameTokenCreated);
+		setOption(ConfigurationConstants.ADD_USERNAMETOKEN_CREATED, securementUsernameTokenCreated);
 	}
 
 	/**
@@ -616,7 +636,7 @@ public void setEnableRevocation(boolean enableRevocation) {
 	 */
 	public void setBspCompliant(boolean bspCompliant) {
 
-		this.handler.setOption(WSHandlerConstants.IS_BSP_COMPLIANT, bspCompliant);
+		setOption(WSHandlerConstants.IS_BSP_COMPLIANT, bspCompliant);
 		this.bspCompliant = bspCompliant;
 	}
 
@@ -627,7 +647,7 @@ public void setBspCompliant(boolean bspCompliant) {
 	 */
 	public void setAddInclusivePrefixes(boolean addInclusivePrefixes) {
 
-		this.handler.setOption(WSHandlerConstants.ADD_INCLUSIVE_PREFIXES, addInclusivePrefixes);
+		setOption(WSHandlerConstants.ADD_INCLUSIVE_PREFIXES, addInclusivePrefixes);
 		this.addInclusivePrefixes = addInclusivePrefixes;
 	}
 
@@ -640,7 +660,7 @@ public void setAddInclusivePrefixes(boolean addInclusivePrefixes) {
 	 * @see WSHandlerConstants#USE_SINGLE_CERTIFICATE
 	 */
 	public void setUseSingleCertificate(boolean useSingleCertificate) {
-		this.handler.setOption(WSHandlerConstants.USE_SINGLE_CERTIFICATE, useSingleCertificate);
+		setOption(WSHandlerConstants.USE_SINGLE_CERTIFICATE, useSingleCertificate);
 	}
 
 	/**