This is an automated email from the ASF dual-hosted git repository.
robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
The following commit(s) were added to refs/heads/master by this push:
new 845686ce RAMPART-286: honour wsp:Optional end to end
845686ce is described below
commit 845686ce5f453240ab35834d016615f13e5327ed
Author: Robert Lazarski <[email protected]>
AuthorDate: Fri Nov 13 06:56:28 2026 -1000
RAMPART-286: honour wsp:Optional end to end
The 2010 validator changes left three gaps: a client with no user still
failed on an optional UsernameToken, the validator dereferenced a null
result when an optional UsernameToken was absent, and a request with no
security header was refused even when every assertion was optional. The
symmetric and transport binding builders now carry the IncludeTimestamp
flag too, and builders read wsp:Optional in any WS-Policy namespace.
Co-Authored-By: Claude Fable 5.1 <[email protected]>
---
.../rampart/PolicyBasedResultsValidator.java | 8 +-
.../java/org/apache/rampart/RampartEngine.java | 43 +--
.../org/apache/rampart/builder/BindingBuilder.java | 45 +++-
.../rampart/builder/TransportBindingBuilder.java | 3 +
.../java/org/apache/rampart/util/RampartUtil.java | 65 ++++-
modules/rampart-integration/pom.xml | 3 +
.../test/java/org/apache/rampart/RampartTest.java | 2 +-
.../src/test/resources/rampart/policy/36.xml | 36 +++
.../src/test/resources/rampart/services-36.xml | 55 ++++
.../secpolicy/model/AbstractSecurityAssertion.java | 32 ++-
.../builders/EncryptedElementsBuilder.java | 8 +-
.../builders/EncryptedPartsBuilder.java | 9 +-
.../builders/SignedElementsBuilder.java | 8 +-
.../secpolicy11/builders/SignedPartsBuilder.java | 8 +-
.../builders/SupportingTokensBuilder.java | 9 +-
.../builders/SymmetricBindingBuilder.java | 1 +
.../builders/TransportBindingBuilder.java | 1 +
.../secpolicy11/builders/UsernameTokenBuilder.java | 7 +-
.../ws/secpolicy11/builders/X509TokenBuilder.java | 8 +-
.../builders/EncryptedElementsBuilder.java | 9 +-
.../builders/EncryptedPartsBuilder.java | 9 +-
.../builders/SignedElementsBuilder.java | 8 +-
.../secpolicy12/builders/SignedPartsBuilder.java | 8 +-
.../builders/SupportingTokensBuilder.java | 9 +-
.../builders/SymmetricBindingBuilder.java | 1 +
.../builders/TransportBindingBuilder.java | 1 +
.../secpolicy12/builders/UsernameTokenBuilder.java | 7 +-
.../ws/secpolicy12/builders/X509TokenBuilder.java | 8 +-
.../org/apache/rampart/OptionalAssertionsTest.java | 295 +++++++++++++++++++++
.../policy/rampart-optional-assertions-sp11.xml | 60 +++++
.../policy/rampart-optional-assertions-sp12.xml | 60 +++++
.../policy/rampart-optional-parts-asymm.xml | 76 ++++++
.../policy/rampart-optional-timestamp-symm.xml | 76 ++++++
.../policy/rampart-optional-username-token.xml | 14 +
34 files changed, 856 insertions(+), 136 deletions(-)
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
b/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
index a78e52eb..bd872de2 100644
---
a/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
+++
b/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
@@ -334,10 +334,14 @@ public class PolicyBasedResultsValidator implements
ExtendedPolicyValidatorCallb
//Check presence of a UsernameToken
WSSecurityEngineResult utResult = fetchActionResult(results,
WSConstants.UT);
- if (utResult == null && !ut.isOptional()) {
+ if (utResult == null) {
+ if (ut.isOptional()) {
+ // RAMPART-286: the policy allows the token to be
absent.
+ continue;
+ }
throw new RampartException("usernameTokenMissing");
}
-
+
org.apache.wss4j.dom.message.token.UsernameToken wssUt =
(org.apache.wss4j.dom.message.token.UsernameToken)
utResult.get(WSSecurityEngineResult.TAG_USERNAME_TOKEN);
if(ut.isNoPassword() && wssUt.getPassword() != null) {
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
b/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
index 823d4881..fdceaf7b 100644
--- a/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
+++ b/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
@@ -236,25 +236,36 @@ public class RampartEngine {
ValidatorData data = new ValidatorData(rmd);
SOAPHeader header =
rmd.getMsgContext().getEnvelope().getHeader();
- if(header == null) {
- throw new RampartException("missingSOAPHeader");
- }
-
- ArrayList headerBlocks =
header.getHeaderBlocksWithNSURI(WSConstants.WSSE_NS);
SOAPHeaderBlock secHeader = null;
- //Issue is axiom - a returned collection must not be null
- if(headerBlocks != null) {
- Iterator headerBlocksIterator = headerBlocks.iterator();
- while (headerBlocksIterator.hasNext()) {
- SOAPHeaderBlock elem = (SOAPHeaderBlock)
headerBlocksIterator.next();
- if(elem.getLocalName().equals(WSConstants.WSSE_LN)) {
- secHeader = elem;
- break;
- }
- }
+ if(header != null) {
+ ArrayList headerBlocks =
header.getHeaderBlocksWithNSURI(WSConstants.WSSE_NS);
+ //Issue is axiom - a returned collection must not be null
+ if(headerBlocks != null) {
+ Iterator headerBlocksIterator = headerBlocks.iterator();
+ while (headerBlocksIterator.hasNext()) {
+ SOAPHeaderBlock elem = (SOAPHeaderBlock)
headerBlocksIterator.next();
+ if(elem.getLocalName().equals(WSConstants.WSSE_LN)) {
+ secHeader = elem;
+ break;
+ }
+ }
+ }
}
-
+
if(secHeader == null) {
+ // RAMPART-286: when every security requirement in the
policy is marked
+ // wsp:Optional, a message with no security header is a
permitted
+ // alternative, not a fault. A header that is present is
still processed.
+ if (!RampartUtil.isSecHeaderRequired(rpd,
rmd.isInitiator(), true, false)) {
+ log.debug("RampartEngine: No security header and none
required; policy is all optional");
+ SOAPEnvelope env =
Axis2Util.getSOAPEnvelopeFromDOMDocument(rmd.getDocument(), true);
+ msgCtx.setEnvelope(env);
+ Axis2Util.useDOOM(false);
+ return null;
+ }
+ if(header == null) {
+ throw new RampartException("missingSOAPHeader");
+ }
if (log.isDebugEnabled()) {
log.debug("RampartEngine: No security header found in
received message");
}
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
b/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
index 6b62e721..c1a459dc 100644
---
a/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
+++
b/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
@@ -120,23 +120,41 @@ public abstract class BindingBuilder {
* @return The <code>WSSecUsernameToken</code> instance
* @throws RampartException If an error occurred during the addition of a
UsernameToken Object
*/
+ /**
+ * RAMPART-286: an optional UsernameToken is only sent when a user is
configured.
+ * With none, leaving the token out is the alternative the policy itself
permits,
+ * not an error, so callers skip the token when this returns true.
+ */
+ protected static boolean
isOptionalUsernameTokenWithoutUser(RampartMessageData rmd, Token token) {
+ if (token.isOptional() && getUsernameTokenUser(rmd) == null) {
+ log.debug("No user configured; skipping the optional
UsernameToken");
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * The user a UsernameToken would be built for: the client Options first,
then
+ * the RampartConfig; null when neither names one.
+ */
+ private static String getUsernameTokenUser(RampartMessageData rmd) {
+ String user = rmd.getMsgContext().getOptions().getUserName();
+ if (user == null || user.length() == 0) {
+ RampartPolicyData rpd = rmd.getPolicyData();
+ if (rpd.getRampartConfig() != null) {
+ user = rpd.getRampartConfig().getUser();
+ }
+ }
+ return user == null || user.length() == 0 ? null : user;
+ }
+
protected WSSecUsernameToken addUsernameToken(RampartMessageData rmd,
UsernameToken token) throws RampartException {
log.debug("Adding a UsernameToken");
- RampartPolicyData rpd = rmd.getPolicyData();
-
- //Get the user
- //First try options
Options options = rmd.getMsgContext().getOptions();
- String user = options.getUserName();
- if(user == null || user.length() == 0) {
- //Then try RampartConfig
- if(rpd.getRampartConfig() != null) {
- user = rpd.getRampartConfig().getUser();
- }
- }
-
+ String user = getUsernameTokenUser(rmd);
+
if(user != null && !"".equals(user)) {
if (log.isDebugEnabled()) {
log.debug("User : " + user);
@@ -400,6 +418,9 @@ public abstract class BindingBuilder {
endSuppTokMap.put(token, sig);
} else if (token instanceof UsernameToken) {
+ if (isOptionalUsernameTokenWithoutUser(rmd, token)) {
+ continue;
+ }
WSSecUsernameToken utBuilder = addUsernameToken(rmd,
(UsernameToken) token);
utBuilder.prepare();
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
b/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
index cc065a47..3d642893 100644
---
a/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
+++
b/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
@@ -104,6 +104,9 @@ public class TransportBindingBuilder extends BindingBuilder
{
Token token = (Token) signedSupportingToken;
if (token instanceof UsernameToken) {
+ if (isOptionalUsernameTokenWithoutUser(rmd, token)) {
+ continue;
+ }
WSSecUsernameToken utBuilder = addUsernameToken(rmd,
(UsernameToken) token);
utBuilder.prepare();
diff --git
a/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
b/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
index 2f327652..374583de 100644
---
a/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
+++
b/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
@@ -1665,6 +1665,29 @@ public class RampartUtil {
return retElem;
}
+ /**
+ * Whether a supporting token group demands a token in the message: it has
tokens
+ * and, unless optional ones count, neither the group nor every token in
it is
+ * marked wsp:Optional.
+ */
+ private static boolean hasTokens(SupportingToken group, boolean
countOptional) {
+ if (group == null || group.getTokens().isEmpty()) {
+ return false;
+ }
+ if (countOptional) {
+ return true;
+ }
+ if (group.isOptional()) {
+ return false;
+ }
+ for (org.apache.ws.secpolicy.model.Token token : group.getTokens()) {
+ if (!token.isOptional()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
/**
* Method to check whether security header is required in incoming message
* @param rpd RampartPolicyData
@@ -1673,15 +1696,29 @@ public class RampartUtil {
* @return boolean true if a security header is required in the incoming
message
*/
public static boolean isSecHeaderRequired(RampartPolicyData rpd, boolean
initiator, boolean inflow ) {
+ return isSecHeaderRequired(rpd, initiator, inflow, true);
+ }
+
+ /**
+ * As {@link #isSecHeaderRequired(RampartPolicyData, boolean, boolean)},
but with
+ * {@code countOptional} false an assertion marked wsp:Optional does not
make the
+ * header required. A policy whose every requirement is optional then
permits a
+ * message with no security header at all (RAMPART-286).
+ *
+ * @param countOptional whether optional assertions count as requirements
+ */
+ public static boolean isSecHeaderRequired(RampartPolicyData rpd, boolean
initiator,
+ boolean inflow, boolean
countOptional) {
if (log.isDebugEnabled()) {
String timestamp =
java.time.LocalDateTime.now().format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd
HH:mm:ss.SSS"));
log.debug("RampartUtil.isSecHeaderRequired TIMESTAMP: " +
timestamp);
- log.debug("RampartUtil.isSecHeaderRequired: initiator=" +
initiator + ", inflow=" + inflow);
+ log.debug("RampartUtil.isSecHeaderRequired: initiator=" +
initiator + ", inflow=" + inflow
+ + ", countOptional=" + countOptional);
}
// Checking for time stamp
- if ( rpd.isIncludeTimestamp() ) {
+ if ( rpd.isIncludeTimestamp() && (countOptional ||
!rpd.isIncludeTimestampOptional()) ) {
if (log.isDebugEnabled()) {
log.debug("RampartUtil.isSecHeaderRequired: TRUE - timestamp
required");
}
@@ -1693,8 +1730,8 @@ public class RampartUtil {
}
// Checking for signed parts and elements
- if (rpd.isSignBody() || rpd.getSignedParts().size() != 0 ||
- rpd.getSignedElements().size() != 0) {
+ if ((rpd.isSignBody() && (countOptional || !rpd.isSignBodyOptional()))
+ || rpd.getSignedParts().size() != 0 ||
rpd.getSignedElements().size() != 0) {
if (log.isDebugEnabled()) {
log.debug("RampartUtil.isSecHeaderRequired: TRUE - signing
required (signBody=" + rpd.isSignBody() +
", signedParts=" + rpd.getSignedParts().size() + ",
signedElements=" + rpd.getSignedElements().size() + ")");
@@ -1705,8 +1742,8 @@ public class RampartUtil {
}
// Checking for encrypted parts and elements
- if (rpd.isEncryptBody() || rpd.getEncryptedParts().size() != 0 ||
- rpd.getEncryptedElements().size() != 0 ) {
+ if ((rpd.isEncryptBody() && (countOptional ||
!rpd.isEncryptBodyOptional()))
+ || rpd.getEncryptedParts().size() != 0 ||
rpd.getEncryptedElements().size() != 0 ) {
log.debug("RampartUtil.isSecHeaderRequired: TRUE - encryption
required (encryptBody=" + rpd.isEncryptBody() +
", encryptedParts=" + rpd.getEncryptedParts().size() +
", encryptedElements=" + rpd.getEncryptedElements().size() + ")");
return true;
@@ -1726,50 +1763,50 @@ public class RampartUtil {
List<SupportingToken> supportingToks =
rpd.getSupportingTokensList();
log.debug("RampartUtil.isSecHeaderRequired: SupportingTokensList
size = " + (supportingToks != null ? supportingToks.size() : "null"));
for (SupportingToken supportingTok : supportingToks) {
- if (supportingTok != null && supportingTok.getTokens().size()
!= 0) {
+ if (hasTokens(supportingTok, countOptional)) {
log.debug("RampartUtil.isSecHeaderRequired: TRUE -
supporting tokens found");
return true;
}
}
supportingTokens = rpd.getSignedSupportingTokens();
- if (supportingTokens != null &&
supportingTokens.getTokens().size() != 0) {
+ if (hasTokens(supportingTokens, countOptional)) {
log.debug("RampartUtil.isSecHeaderRequired: TRUE - signed
supporting tokens found");
return true;
}
supportingTokens = rpd.getEndorsingSupportingTokens();
- if (supportingTokens != null &&
supportingTokens.getTokens().size() != 0) {
+ if (hasTokens(supportingTokens, countOptional)) {
log.debug("RampartUtil.isSecHeaderRequired: TRUE - endorsing
supporting tokens found");
return true;
}
supportingTokens = rpd.getSignedEndorsingSupportingTokens();
- if (supportingTokens != null &&
supportingTokens.getTokens().size() != 0) {
+ if (hasTokens(supportingTokens, countOptional)) {
log.debug("RampartUtil.isSecHeaderRequired: TRUE - signed
endorsing supporting tokens found");
return true;
}
supportingTokens = rpd.getEncryptedSupportingTokens();
- if (supportingTokens != null &&
supportingTokens.getTokens().size() != 0) {
+ if (hasTokens(supportingTokens, countOptional)) {
log.debug("RampartUtil.isSecHeaderRequired: TRUE - encrypted
supporting tokens found");
return true;
}
supportingTokens = rpd.getSignedEncryptedSupportingTokens();
- if (supportingTokens != null &&
supportingTokens.getTokens().size() != 0) {
+ if (hasTokens(supportingTokens, countOptional)) {
log.debug("RampartUtil.isSecHeaderRequired: TRUE - signed
encrypted supporting tokens found");
return true;
}
supportingTokens = rpd.getEndorsingEncryptedSupportingTokens();
- if (supportingTokens != null &&
supportingTokens.getTokens().size() != 0) {
+ if (hasTokens(supportingTokens, countOptional)) {
log.debug("RampartUtil.isSecHeaderRequired: TRUE - endorsing
encrypted supporting tokens found");
return true;
}
supportingTokens =
rpd.getSignedEndorsingEncryptedSupportingTokens();
- if (supportingTokens != null &&
supportingTokens.getTokens().size() != 0) {
+ if (hasTokens(supportingTokens, countOptional)) {
log.debug("RampartUtil.isSecHeaderRequired: TRUE - signed
endorsing encrypted supporting tokens found");
return true;
}
diff --git a/modules/rampart-integration/pom.xml
b/modules/rampart-integration/pom.xml
index 40db6e3e..ea5ae1f6 100644
--- a/modules/rampart-integration/pom.xml
+++ b/modules/rampart-integration/pom.xml
@@ -275,6 +275,9 @@
<!-- Service 35 -->
<copy overwrite="yes"
file="src/test/resources/rampart/services-35.xml"
tofile="target/temp-ramp/META-INF/services.xml" />
<jar
jarfile="target/test-resources/rampart_service_repo/services/SecureService35.aar"
basedir="target/temp-ramp" />
+ <!-- Service 36 -->
+ <copy overwrite="yes"
file="src/test/resources/rampart/services-36.xml"
tofile="target/temp-ramp/META-INF/services.xml" />
+ <jar
jarfile="target/test-resources/rampart_service_repo/services/SecureService36.aar"
basedir="target/temp-ramp" />
<!-- Service SC-1 -->
diff --git
a/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
b/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
index 4f6c103f..8c789024 100644
---
a/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
+++
b/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
@@ -90,7 +90,7 @@ public class RampartTest {
}
//for (int i = 34; i <= 34; i++) { //<-The number of tests we have
- for (int i = 1; i <= 35; i++) { //<-The number of tests we have
+ for (int i = 1; i <= 36; i++) { //<-The number of tests we have
if(!basic256Supported && (i == 3 || i == 4 || i == 5)) {
//Skip the Basic256 tests
continue;
diff --git
a/modules/rampart-integration/src/test/resources/rampart/policy/36.xml
b/modules/rampart-integration/src/test/resources/rampart/policy/36.xml
new file mode 100644
index 00000000..cd3d5633
--- /dev/null
+++ b/modules/rampart-integration/src/test/resources/rampart/policy/36.xml
@@ -0,0 +1,36 @@
+<wsp:Policy wsu:Id="OptionalUTOverTransport"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+<wsp:ExactlyOne>
+ <wsp:All>
+ <sp:TransportBinding
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <wsp:Policy>
+ <sp:TransportToken>
+ <wsp:Policy>
+ </wsp:Policy>
+ </sp:TransportToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ </wsp:Policy>
+ </sp:TransportBinding>
+ <!-- RAMPART-286: the UsernameToken is optional and the client
configures no
+ user, so the client must send no token and the service must accept
that. -->
+ <sp:SignedSupportingTokens
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <wsp:Policy>
+ <sp:UsernameToken wsp:Optional="true"
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient"
/>
+ </wsp:Policy>
+ </sp:SignedSupportingTokens>
+
+ <ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy">
+
<ramp:passwordCallbackClass>org.apache.rampart.PWCallback</ramp:passwordCallbackClass>
+ </ramp:RampartConfig>
+ </wsp:All>
+</wsp:ExactlyOne>
+</wsp:Policy>
diff --git
a/modules/rampart-integration/src/test/resources/rampart/services-36.xml
b/modules/rampart-integration/src/test/resources/rampart/services-36.xml
new file mode 100644
index 00000000..c4a6276c
--- /dev/null
+++ b/modules/rampart-integration/src/test/resources/rampart/services-36.xml
@@ -0,0 +1,55 @@
+<service name="SecureService36">
+
+ <module ref="addressing"/>
+ <module ref="rampart"/>
+
+ <parameter locked="false"
name="ServiceClass">org.apache.rampart.Service</parameter>
+
+ <operation name="echo">
+ <messageReceiver
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+ <actionMapping>urn:echo</actionMapping>
+ </operation>
+
+ <operation name="returnError">
+ <messageReceiver
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+ <actionMapping>urn:returnError</actionMapping>
+ </operation>
+
+ <wsp:Policy wsu:Id="OptionalUTOverTransport"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:TransportBinding
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <wsp:Policy>
+ <sp:TransportToken>
+ <wsp:Policy>
+ </wsp:Policy>
+ </sp:TransportToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ </wsp:Policy>
+ </sp:TransportBinding>
+ <!-- RAMPART-286: a request without a UsernameToken must be
accepted. -->
+ <sp:SignedSupportingTokens
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <wsp:Policy>
+ <sp:UsernameToken wsp:Optional="true"
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient"
/>
+ </wsp:Policy>
+ </sp:SignedSupportingTokens>
+
+ <ramp:RampartConfig
xmlns:ramp="http://ws.apache.org/rampart/policy">
+
<ramp:passwordCallbackClass>org.apache.rampart.PWCallback</ramp:passwordCallbackClass>
+ </ramp:RampartConfig>
+
+ </wsp:All>
+ </wsp:ExactlyOne>
+ </wsp:Policy>
+
+</service>
diff --git
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AbstractSecurityAssertion.java
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AbstractSecurityAssertion.java
index b57663a4..5a30ded7 100644
---
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AbstractSecurityAssertion.java
+++
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AbstractSecurityAssertion.java
@@ -15,29 +15,53 @@
*/
package org.apache.ws.secpolicy.model;
+import java.util.Iterator;
+
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
+import org.apache.axiom.om.OMAttribute;
+import org.apache.axiom.om.OMElement;
import org.apache.neethi.Assertion;
+import org.apache.neethi.Constants;
import org.apache.neethi.PolicyComponent;
public abstract class AbstractSecurityAssertion implements Assertion {
private boolean isOptional;
private boolean isIgnorable;
-
- private boolean normalized = true;
-
+
+ private boolean normalized = true;
+
protected int version;
public boolean isOptional() {
return isOptional;
}
-
+
public void setOptional(boolean isOptional) {
this.isOptional = isOptional;
}
+
+ /**
+ * Reads the wsp:Optional attribute of a policy assertion element, in any
of
+ * the WS-Policy namespaces Neethi recognises, so that a builder does not
have
+ * to know which one the policy document used.
+ *
+ * @param element the assertion element as it appears in the policy
+ * @return true if the element declares itself optional
+ */
+ public static boolean readOptionalAttribute(OMElement element) {
+ for (Iterator<OMAttribute> it = element.getAllAttributes();
it.hasNext();) {
+ OMAttribute attribute = it.next();
+ if (Constants.isOptionalAttribute(attribute.getQName())) {
+ String value = attribute.getAttributeValue().trim();
+ return "true".equalsIgnoreCase(value) || "1".equals(value);
+ }
+ }
+ return false;
+ }
public boolean isIgnorable() {
return isIgnorable;
}
diff --git
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java
index 9f1c1b3a..7ac41115 100644
---
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java
+++
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java
@@ -24,11 +24,11 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
-import org.apache.neethi.Constants;
import org.apache.neethi.builders.AssertionBuilder;
import org.apache.ws.secpolicy.SP11Constants;
import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.SignedEncryptedElements;
+import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
public class EncryptedElementsBuilder implements AssertionBuilder<OMElement> {
@@ -40,11 +40,7 @@ public class EncryptedElementsBuilder implements
AssertionBuilder<OMElement> {
signedEncryptedElements.setXPathVersion(attribute.getAttributeValue());
}
- OMAttribute isOptional =
element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
- if (isOptional != null) {
-
signedEncryptedElements.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
- .booleanValue());
- }
+
signedEncryptedElements.setOptional(AbstractSecurityAssertion.readOptionalAttribute(element));
for (Iterator iterator = element.getChildElements();
iterator.hasNext();) {
processElement((OMElement) iterator.next(),
signedEncryptedElements);
diff --git
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java
index bf921fc8..3ffc8bed 100644
---
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java
+++
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java
@@ -24,11 +24,11 @@ import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
-import org.apache.neethi.Constants;
import org.apache.neethi.builders.AssertionBuilder;
import org.apache.ws.secpolicy.SP11Constants;
import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.Header;
+import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
import org.apache.ws.secpolicy.model.SignedEncryptedParts;
public class EncryptedPartsBuilder implements AssertionBuilder<OMElement> {
@@ -49,12 +49,7 @@ public class EncryptedPartsBuilder implements
AssertionBuilder<OMElement> {
signedEncryptedParts.setBody(true);
}
- OMAttribute isOptional = element
- .getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
- if (isOptional != null) {
-
signedEncryptedParts.setOptional(Boolean.valueOf(isOptional
- .getAttributeValue()).booleanValue());
- }
+
signedEncryptedParts.setOptional(AbstractSecurityAssertion.readOptionalAttribute(element));
return signedEncryptedParts;
}
diff --git
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java
index d06d9d45..7e033cc9 100644
---
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java
+++
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java
@@ -24,11 +24,11 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
-import org.apache.neethi.Constants;
import org.apache.neethi.builders.AssertionBuilder;
import org.apache.ws.secpolicy.SP11Constants;
import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.SignedEncryptedElements;
+import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
public class SignedElementsBuilder implements AssertionBuilder<OMElement> {
@@ -41,11 +41,7 @@ public class SignedElementsBuilder implements
AssertionBuilder<OMElement> {
signedEncryptedElements.setXPathVersion(attrXPathVersion.getAttributeValue());
}
- OMAttribute isOptional =
element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
- if (isOptional != null) {
-
signedEncryptedElements.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
- .booleanValue());
- }
+
signedEncryptedElements.setOptional(AbstractSecurityAssertion.readOptionalAttribute(element));
for (Iterator iterator = element.getChildElements();
iterator.hasNext();) {
processElement((OMElement) iterator.next(),
signedEncryptedElements);
diff --git
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java
index 07df5035..fa551401 100644
---
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java
+++
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java
@@ -23,22 +23,18 @@ import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
-import org.apache.neethi.Constants;
import org.apache.neethi.builders.AssertionBuilder;
import org.apache.ws.secpolicy.SP11Constants;
import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.Header;
+import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
import org.apache.ws.secpolicy.model.SignedEncryptedParts;
public class SignedPartsBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
SignedEncryptedParts signedEncryptedParts = new
SignedEncryptedParts(true, SPConstants.SP_V11);
- OMAttribute isOptional =
element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
- if (isOptional != null) {
-
signedEncryptedParts.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
- .booleanValue());
- }
+
signedEncryptedParts.setOptional(AbstractSecurityAssertion.readOptionalAttribute(element));
for (Iterator iterator = element.getChildElements();
iterator.hasNext();) {
processElement((OMElement) iterator.next(), signedEncryptedParts);
}
diff --git
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java
index 5e9306c7..edce022d 100644
---
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java
+++
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java
@@ -20,17 +20,16 @@ import java.util.List;
import javax.xml.namespace.QName;
-import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
-import org.apache.neethi.Constants;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.neethi.builders.AssertionBuilder;
import org.apache.ws.secpolicy.SP11Constants;
import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.AlgorithmSuite;
+import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
import org.apache.ws.secpolicy.model.SignedEncryptedElements;
import org.apache.ws.secpolicy.model.SignedEncryptedParts;
import org.apache.ws.secpolicy.model.SupportingToken;
@@ -53,11 +52,7 @@ public class SupportingTokensBuilder implements
AssertionBuilder<OMElement> {
supportingToken = new
SupportingToken(SPConstants.SUPPORTING_TOKEN_SIGNED_ENDORSING,
SPConstants.SP_V11);
}
- OMAttribute isOptional =
element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
- if (isOptional != null) {
-
supportingToken.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
- .booleanValue());
- }
+
supportingToken.setOptional(AbstractSecurityAssertion.readOptionalAttribute(element));
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
diff --git
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SymmetricBindingBuilder.java
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SymmetricBindingBuilder.java
index d3d2f720..ecdb0ca8 100644
---
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SymmetricBindingBuilder.java
+++
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SymmetricBindingBuilder.java
@@ -75,6 +75,7 @@ public class SymmetricBindingBuilder implements
AssertionBuilder<OMElement> {
} else if (SP11Constants.INCLUDE_TIMESTAMP.equals(name)) {
symmetricBinding.setIncludeTimestamp(true);
+
symmetricBinding.setIncludeTimestampOptional(assertion.isOptional());
} else if (SP11Constants.PROTECTION_TOKEN.equals(name)) {
symmetricBinding.setProtectionToken((ProtectionToken)
assertion);
diff --git
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportBindingBuilder.java
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportBindingBuilder.java
index a1198c8b..bf494958 100644
---
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportBindingBuilder.java
+++
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportBindingBuilder.java
@@ -73,6 +73,7 @@ public class TransportBindingBuilder implements
AssertionBuilder<OMElement> {
} else if (name.equals(SP11Constants.INCLUDE_TIMESTAMP)) {
parent.setIncludeTimestamp(true);
+ parent.setIncludeTimestampOptional(primitive.isOptional());
} else if (name.equals(SP11Constants.LAYOUT)) {
parent.setLayout((Layout) primitive);
diff --git
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
index d9a40165..88a96966 100644
---
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
+++
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
@@ -31,6 +31,7 @@ import org.apache.neethi.builders.AssertionBuilder;
import org.apache.ws.secpolicy.SP11Constants;
import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.UsernameToken;
+import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
public class UsernameTokenBuilder implements AssertionBuilder<OMElement> {
@@ -45,11 +46,7 @@ public class UsernameTokenBuilder implements
AssertionBuilder<OMElement> {
usernameToken.setInclusion(inclusion);
}
- OMAttribute isOptional =
element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
- if (isOptional != null) {
-
usernameToken.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
- .booleanValue());
- }
+
usernameToken.setOptional(AbstractSecurityAssertion.readOptionalAttribute(element));
OMElement policyElement = element.getFirstElement();
diff --git
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java
index 5cd4b010..3dc851c8 100644
---
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java
+++
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java
@@ -24,13 +24,13 @@ import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
-import org.apache.neethi.Constants;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.neethi.builders.AssertionBuilder;
import org.apache.ws.secpolicy.SP11Constants;
import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.X509Token;
+import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
public class X509TokenBuilder implements AssertionBuilder<OMElement> {
@@ -61,11 +61,7 @@ public class X509TokenBuilder implements
AssertionBuilder<OMElement> {
x509Token.setInclusion(inclusion);
}
- OMAttribute isOptional =
element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
- if (isOptional != null) {
-
x509Token.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
- .booleanValue());
- }
+
x509Token.setOptional(AbstractSecurityAssertion.readOptionalAttribute(element));
if (policyElement != null) {
diff --git
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedElementsBuilder.java
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedElementsBuilder.java
index d91d1205..68cd8ac3 100755
---
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedElementsBuilder.java
+++
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedElementsBuilder.java
@@ -24,11 +24,11 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
-import org.apache.neethi.Constants;
import org.apache.neethi.builders.AssertionBuilder;
import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.SP12Constants;
import org.apache.ws.secpolicy.model.SignedEncryptedElements;
+import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
public class EncryptedElementsBuilder implements AssertionBuilder<OMElement> {
@@ -44,12 +44,7 @@ public class EncryptedElementsBuilder implements
AssertionBuilder<OMElement> {
processElement((OMElement) iterator.next(),
signedEncryptedElements);
}
- OMAttribute isOptional = element
- .getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
- if (isOptional != null) {
-
signedEncryptedElements.setOptional(Boolean.valueOf(isOptional
- .getAttributeValue()).booleanValue());
- }
+
signedEncryptedElements.setOptional(AbstractSecurityAssertion.readOptionalAttribute(element));
return signedEncryptedElements;
}
diff --git
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedPartsBuilder.java
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedPartsBuilder.java
index 73666669..58c2c0d5 100755
---
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedPartsBuilder.java
+++
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedPartsBuilder.java
@@ -24,11 +24,11 @@ import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
-import org.apache.neethi.Constants;
import org.apache.neethi.builders.AssertionBuilder;
import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.SP12Constants;
import org.apache.ws.secpolicy.model.Header;
+import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
import org.apache.ws.secpolicy.model.SignedEncryptedParts;
public class EncryptedPartsBuilder implements AssertionBuilder<OMElement> {
@@ -49,12 +49,7 @@ public class EncryptedPartsBuilder implements
AssertionBuilder<OMElement> {
signedEncryptedParts.setBody(true);
}
- OMAttribute isOptional = element
- .getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
- if (isOptional != null) {
-
signedEncryptedParts.setOptional(Boolean.valueOf(isOptional
- .getAttributeValue()).booleanValue());
- }
+
signedEncryptedParts.setOptional(AbstractSecurityAssertion.readOptionalAttribute(element));
return signedEncryptedParts;
}
diff --git
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedElementsBuilder.java
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedElementsBuilder.java
index 02401780..bdd76fc4 100755
---
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedElementsBuilder.java
+++
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedElementsBuilder.java
@@ -24,11 +24,11 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
-import org.apache.neethi.Constants;
import org.apache.neethi.builders.AssertionBuilder;
import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.SP12Constants;
import org.apache.ws.secpolicy.model.SignedEncryptedElements;
+import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
public class SignedElementsBuilder implements AssertionBuilder<OMElement> {
@@ -42,11 +42,7 @@ public class SignedElementsBuilder implements
AssertionBuilder<OMElement> {
signedEncryptedElements.setXPathVersion(attrXPathVersion.getAttributeValue());
}
- OMAttribute isOptional =
element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
- if (isOptional != null) {
-
signedEncryptedElements.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
- .booleanValue());
- }
+
signedEncryptedElements.setOptional(AbstractSecurityAssertion.readOptionalAttribute(element));
for (Iterator iterator = element.getChildElements();
iterator.hasNext();) {
processElement((OMElement) iterator.next(),
signedEncryptedElements);
diff --git
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java
index d008781a..5b15e4af 100755
---
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java
+++
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java
@@ -23,11 +23,11 @@ import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
-import org.apache.neethi.Constants;
import org.apache.neethi.builders.AssertionBuilder;
import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.SP12Constants;
import org.apache.ws.secpolicy.model.Header;
+import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
import org.apache.ws.secpolicy.model.SignedEncryptedParts;
public class SignedPartsBuilder implements AssertionBuilder<OMElement> {
@@ -39,11 +39,7 @@ public class SignedPartsBuilder implements
AssertionBuilder<OMElement> {
processElement((OMElement) iterator.next(), signedEncryptedParts);
}
- OMAttribute isOptional =
element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
- if (isOptional != null) {
-
signedEncryptedParts.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
- .booleanValue());
- }
+
signedEncryptedParts.setOptional(AbstractSecurityAssertion.readOptionalAttribute(element));
//Presence of <sp:SignedParts/> enforces the requirement for sign body
and all the header blocks
if(!element.getChildren().hasNext()){
diff --git
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SupportingTokensBuilder.java
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SupportingTokensBuilder.java
index a01dd65d..b3d1aeca 100755
---
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SupportingTokensBuilder.java
+++
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SupportingTokensBuilder.java
@@ -20,17 +20,16 @@ import java.util.List;
import javax.xml.namespace.QName;
-import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
-import org.apache.neethi.Constants;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.neethi.builders.AssertionBuilder;
import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.SP12Constants;
import org.apache.ws.secpolicy.model.AlgorithmSuite;
+import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
import org.apache.ws.secpolicy.model.SignedEncryptedElements;
import org.apache.ws.secpolicy.model.SignedEncryptedParts;
import org.apache.ws.secpolicy.model.SupportingToken;
@@ -69,11 +68,7 @@ public class SupportingTokensBuilder implements
AssertionBuilder<OMElement> {
SPConstants.SUPPORTING_TOKEN_SIGNED_ENDORSING_ENCRYPTED,
SPConstants.SP_V12);
}
- OMAttribute isOptional =
element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
- if (isOptional != null) {
-
supportingToken.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
- .booleanValue());
- }
+
supportingToken.setOptional(AbstractSecurityAssertion.readOptionalAttribute(element));
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
diff --git
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SymmetricBindingBuilder.java
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SymmetricBindingBuilder.java
index fc627863..09fbf2e6 100755
---
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SymmetricBindingBuilder.java
+++
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SymmetricBindingBuilder.java
@@ -75,6 +75,7 @@ public class SymmetricBindingBuilder implements
AssertionBuilder<OMElement> {
} else if (SP12Constants.INCLUDE_TIMESTAMP.equals(name)) {
symmetricBinding.setIncludeTimestamp(true);
+
symmetricBinding.setIncludeTimestampOptional(assertion.isOptional());
} else if (SP12Constants.PROTECTION_TOKEN.equals(name)) {
symmetricBinding.setProtectionToken((ProtectionToken)
assertion);
diff --git
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java
index e9bb2ab9..d968f0ef 100755
---
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java
+++
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java
@@ -73,6 +73,7 @@ public class TransportBindingBuilder implements
AssertionBuilder<OMElement> {
} else if (name.equals(SP12Constants.INCLUDE_TIMESTAMP)) {
parent.setIncludeTimestamp(true);
+ parent.setIncludeTimestampOptional(primitive.isOptional());
} else if (name.equals(SP12Constants.LAYOUT)) {
parent.setLayout((Layout) primitive);
diff --git
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
index 4924ddfd..b13578ba 100755
---
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
+++
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
@@ -31,6 +31,7 @@ import org.apache.neethi.builders.AssertionBuilder;
import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.SP12Constants;
import org.apache.ws.secpolicy.model.UsernameToken;
+import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
public class UsernameTokenBuilder implements AssertionBuilder<OMElement> {
@@ -45,11 +46,7 @@ public class UsernameTokenBuilder implements
AssertionBuilder<OMElement> {
usernameToken.setInclusion(inclusion);
}
- OMAttribute isOptional =
element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
- if (isOptional != null) {
-
usernameToken.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
- .booleanValue());
- }
+
usernameToken.setOptional(AbstractSecurityAssertion.readOptionalAttribute(element));
OMElement policyElement = element.getFirstElement();
diff --git
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java
index 9a418c31..1dcda74a 100755
---
a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java
+++
b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java
@@ -24,13 +24,13 @@ import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
-import org.apache.neethi.Constants;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.neethi.builders.AssertionBuilder;
import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.SP12Constants;
import org.apache.ws.secpolicy.model.X509Token;
+import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
public class X509TokenBuilder implements AssertionBuilder<OMElement> {
@@ -60,11 +60,7 @@ public class X509TokenBuilder implements
AssertionBuilder<OMElement> {
x509Token.setInclusion(inclusion);
}
- OMAttribute isOptional =
element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
- if (isOptional != null) {
-
x509Token.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
- .booleanValue());
- }
+
x509Token.setOptional(AbstractSecurityAssertion.readOptionalAttribute(element));
if (policyElement != null) {
diff --git
a/modules/rampart-tests/src/test/java/org/apache/rampart/OptionalAssertionsTest.java
b/modules/rampart-tests/src/test/java/org/apache/rampart/OptionalAssertionsTest.java
new file mode 100644
index 00000000..6ecc8fab
--- /dev/null
+++
b/modules/rampart-tests/src/test/java/org/apache/rampart/OptionalAssertionsTest.java
@@ -0,0 +1,295 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.rampart;
+
+import java.io.ByteArrayInputStream;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.util.AXIOMUtil;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPHeaderBlock;
+import org.apache.axis2.builder.SOAPBuilder;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.Parameter;
+import org.apache.neethi.Assertion;
+import org.apache.neethi.Policy;
+import org.apache.neethi.PolicyEngine;
+import org.apache.rampart.policy.RampartPolicyBuilder;
+import org.apache.rampart.policy.RampartPolicyData;
+import org.apache.rampart.util.RampartUtil;
+import org.apache.ws.secpolicy.model.AbstractSecurityAssertion;
+import org.apache.ws.secpolicy.model.SupportingToken;
+import org.apache.ws.secpolicy.model.Token;
+import org.apache.ws.secpolicy.model.UsernameToken;
+import org.apache.ws.secpolicy.model.X509Token;
+import org.apache.wss4j.dom.WSConstants;
+import org.apache.wss4j.dom.handler.WSHandlerConstants;
+
+/**
+ * RAMPART-286: wsp:Optional on IncludeTimestamp, UsernameToken, SignedParts,
+ * EncryptedParts and a supporting X509Token must reach the policy model, a
client
+ * with no user configured must leave an optional UsernameToken out, and a
service
+ * must accept the request that arrives without it.
+ */
+public class OptionalAssertionsTest extends MessageBuilderTestBase {
+
+ private static final String SP12_NS =
"http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702";
+
+ private RampartPolicyData build(String policyXml) throws Exception {
+ Policy policy = loadPolicy(policyXml);
+ List<Assertion> alternative = policy.getAlternatives().next();
+ return RampartPolicyBuilder.build(alternative);
+ }
+
+ private static Token onlyToken(SupportingToken group) {
+ assertNotNull("supporting token group missing", group);
+ assertEquals(1, group.getTokens().size());
+ return group.getTokens().get(0);
+ }
+
+ private void assertOptionalFlagsParsed(RampartPolicyData rpd) {
+ assertTrue(rpd.isIncludeTimestamp());
+ assertTrue("IncludeTimestamp wsp:Optional lost",
rpd.isIncludeTimestampOptional());
+ assertTrue(rpd.isSignBody());
+ assertTrue("SignedParts wsp:Optional lost", rpd.isSignBodyOptional());
+ assertTrue(rpd.isEncryptBody());
+ assertTrue("EncryptedParts wsp:Optional lost",
rpd.isEncryptBodyOptional());
+
+ Token ut = onlyToken(rpd.getSignedSupportingTokens());
+ assertTrue(ut instanceof UsernameToken);
+ assertTrue("UsernameToken wsp:Optional lost", ut.isOptional());
+
+ assertEquals(1, rpd.getSupportingTokensList().size());
+ Token x509 = onlyToken(rpd.getSupportingTokensList().get(0));
+ assertTrue(x509 instanceof X509Token);
+ assertTrue("X509Token wsp:Optional lost", x509.isOptional());
+ }
+
+ public void testOptionalFlagsReachThePolicyDataForSecurityPolicy12()
throws Exception {
+
assertOptionalFlagsParsed(build("test-resources/policy/rampart-optional-assertions-sp12.xml"));
+ }
+
+ public void testOptionalFlagsReachThePolicyDataForSecurityPolicy11()
throws Exception {
+
assertOptionalFlagsParsed(build("test-resources/policy/rampart-optional-assertions-sp11.xml"));
+ }
+
+ /** The attribute is read whichever WS-Policy namespace the document uses.
*/
+ public void testOptionalAttributeIsReadInAnyWsPolicyNamespace() throws
Exception {
+ assertTrue(AbstractSecurityAssertion.readOptionalAttribute(element(
+ "http://schemas.xmlsoap.org/ws/2004/09/policy", "true")));
+ assertTrue(AbstractSecurityAssertion.readOptionalAttribute(element(
+ "http://www.w3.org/ns/ws-policy", "true")));
+ assertTrue(AbstractSecurityAssertion.readOptionalAttribute(element(
+ "http://www.w3.org/ns/ws-policy", "1")));
+ assertFalse(AbstractSecurityAssertion.readOptionalAttribute(element(
+ "http://schemas.xmlsoap.org/ws/2004/09/policy", "false")));
+
assertFalse(AbstractSecurityAssertion.readOptionalAttribute(AXIOMUtil.stringToOM(
+ "<sp:UsernameToken xmlns:sp='" + SP12_NS + "'/>")));
+ }
+
+ private static OMElement element(String wspNs, String value) throws
Exception {
+ return AXIOMUtil.stringToOM("<sp:UsernameToken xmlns:sp='" + SP12_NS
+ + "' xmlns:wsp='" + wspNs + "' wsp:Optional='" + value +
"'/>");
+ }
+
+ /** No user configured: the optional token is left out and the service
accepts. */
+ public void testOptionalUsernameTokenIsSkippedWithoutAUserAndAccepted()
throws Exception {
+ MessageContext ctx = getMsgCtx();
+ Policy policy =
loadPolicy("test-resources/policy/rampart-optional-username-token.xml");
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ new MessageBuilder().build(ctx);
+ assertFalse("client must not send a UsernameToken it has no user for",
+ hasUsernameToken(ctx.getEnvelope()));
+
+ processAsService(ctx, policy);
+ }
+
+ /** With a user configured the optional token is sent and validated as
before. */
+ public void testOptionalUsernameTokenIsSentWithAUser() throws Exception {
+ MessageContext ctx = getMsgCtx();
+ Policy policy =
loadPolicy("test-resources/policy/rampart-optional-username-token.xml");
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+ ctx.getOptions().setUserName("Ron");
+ ctx.getOptions().setPassword("noR");
+
+ new MessageBuilder().build(ctx);
+ assertTrue(hasUsernameToken(ctx.getEnvelope()));
+
+ processAsService(ctx, policy);
+ }
+
+ /** A foreign client may send no security header at all; all-optional
means that is fine. */
+ public void
testRequestWithNoSecurityHeaderIsAcceptedWhenAllAssertionsAreOptional() throws
Exception {
+ MessageContext ctx = getMsgCtx();
+ assertFalse(hasSecurityHeader(ctx.getEnvelope()));
+ processAsService(ctx,
loadPolicy("test-resources/policy/rampart-optional-username-token.xml"));
+ }
+
+ /** ...but a required token still makes the missing header a fault. */
+ public void
testRequestWithNoSecurityHeaderIsStillRefusedForARequiredToken() throws
Exception {
+ MessageContext ctx = getMsgCtx();
+ try {
+ processAsService(ctx,
loadPolicy("test-resources/policy/rampart-plaintext-password.xml"));
+ fail("a required UsernameToken needs a security header");
+ } catch (RampartException expected) {
+ // missingSecurityHeader
+ }
+ }
+
+ private static boolean hasSecurityHeader(SOAPEnvelope env) {
+ return env.getHeader() != null &&
env.getHeader().getFirstChildWithName(
+ new QName(WSConstants.WSSE_NS, WSConstants.WSSE_LN)) != null;
+ }
+
+ /** A required token with no user is still an error, as it always was. */
+ public void testRequiredUsernameTokenWithoutAUserStillFails() throws
Exception {
+ MessageContext ctx = getMsgCtx();
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY,
+
loadPolicy("test-resources/policy/rampart-plaintext-password.xml"));
+ try {
+ new MessageBuilder().build(ctx);
+ fail("a required UsernameToken needs a user");
+ } catch (RampartException expected) {
+ // userMissing
+ }
+ }
+
+ private static final String WSP_NS =
"http://schemas.xmlsoap.org/ws/2004/09/policy";
+
+ /** A transport binding whose only requirement is a timestamp, optional or
not. */
+ private static Policy transportTimestampPolicy(boolean optional) throws
Exception {
+ String xml = "<wsp:Policy xmlns:wsp='" + WSP_NS + "' xmlns:sp='" +
SP12_NS + "'>"
+ + "<wsp:ExactlyOne><wsp:All><sp:TransportBinding><wsp:Policy>"
+ + "<sp:TransportToken><wsp:Policy/></sp:TransportToken>"
+ +
"<sp:AlgorithmSuite><wsp:Policy><sp:Basic128/></wsp:Policy></sp:AlgorithmSuite>"
+ + "<sp:Layout><wsp:Policy><sp:Lax/></wsp:Policy></sp:Layout>"
+ + "<sp:IncludeTimestamp" + (optional ? " wsp:Optional='true'"
: "") + "/>"
+ +
"</wsp:Policy></sp:TransportBinding></wsp:All></wsp:ExactlyOne></wsp:Policy>";
+ return PolicyEngine.getPolicy(AXIOMUtil.stringToOM(xml));
+ }
+
+ private static RampartPolicyData build(Policy policy) throws Exception {
+ return RampartPolicyBuilder.build(policy.getAlternatives().next());
+ }
+
+ /** Only the asymmetric builder used to carry the flag through. */
+ public void
testSymmetricAndTransportBindingsCarryTheOptionalTimestampFlag() throws
Exception {
+ RampartPolicyData symmetric =
build("test-resources/policy/rampart-optional-timestamp-symm.xml");
+ assertTrue(symmetric.isIncludeTimestamp());
+ assertTrue("symmetric binding lost IncludeTimestamp wsp:Optional",
+ symmetric.isIncludeTimestampOptional());
+
+ RampartPolicyData transport = build(transportTimestampPolicy(true));
+ assertTrue(transport.isIncludeTimestamp());
+ assertTrue("transport binding lost IncludeTimestamp wsp:Optional",
+ transport.isIncludeTimestampOptional());
+
assertFalse(build(transportTimestampPolicy(false)).isIncludeTimestampOptional());
+ }
+
+ /** The client always sends a timestamp; a peer that does not is fine only
when optional. */
+ public void testAMissingTimestampIsAcceptedOnlyWhenOptional() throws
Exception {
+ processWithoutTimestamp(transportTimestampPolicy(true));
+ try {
+ processWithoutTimestamp(transportTimestampPolicy(false));
+ fail("a required timestamp must be missed");
+ } catch (RampartException expected) {
+ // timestampMissing
+ }
+ }
+
+ private void processWithoutTimestamp(Policy policy) throws Exception {
+ MessageContext ctx = getMsgCtx();
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+ new MessageBuilder().build(ctx);
+ OMElement timestamp =
securityHeader(ctx.getEnvelope()).getFirstChildWithName(
+ new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
+ assertNotNull("the client still sends a timestamp", timestamp);
+ timestamp.detach();
+ processAsService(ctx, policy);
+ }
+
+ /** Optional body parts: the client leaves the body alone and the service
accepts it. */
+ public void
testOptionalBodyPartsAreNeitherSignedNorEncryptedAndStillAccepted() throws
Exception {
+ MessageContext ctx = getMsgCtx();
+ Policy policy =
loadPolicy("test-resources/policy/rampart-optional-parts-asymm.xml");
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+ new MessageBuilder().build(ctx);
+
+ OMElement body = ctx.getEnvelope().getBody();
+ assertNull("optional EncryptedParts: body must stay in the clear",
+ body.getFirstChildWithName(new QName(WSConstants.ENC_NS,
WSConstants.ENC_DATA_LN)));
+ assertNull("optional SignedParts: body must not be referenced by the
signature",
+ body.getAttributeValue(new QName(WSConstants.WSU_NS, "Id")));
+ assertNotNull("the binding itself still signs the timestamp",
+ securityHeader(ctx.getEnvelope()).getFirstChildWithName(
+ new QName(WSConstants.SIG_NS, WSConstants.SIG_LN)));
+
+ processAsService(ctx, policy);
+ }
+
+ /** The engine's header-less acceptance rests on this distinction. */
+ public void
testAnAllOptionalPolicyRequiresNoSecurityHeaderUnlessOptionalCounts() throws
Exception {
+ RampartPolicyData allOptional =
build("test-resources/policy/rampart-optional-assertions-sp12.xml");
+ assertTrue(RampartUtil.isSecHeaderRequired(allOptional, false, true));
+ assertFalse(RampartUtil.isSecHeaderRequired(allOptional, false, true,
false));
+
+ RampartPolicyData required =
build("test-resources/policy/rampart-asymm-binding-1.xml");
+ assertTrue(RampartUtil.isSecHeaderRequired(required, false, true,
false));
+ }
+
+ private static OMElement securityHeader(SOAPEnvelope env) {
+ assertNotNull(env.getHeader());
+ OMElement security = env.getHeader().getFirstChildWithName(
+ new QName(WSConstants.WSSE_NS, WSConstants.WSSE_LN));
+ assertNotNull("no security header was built", security);
+ return security;
+ }
+
+ private static boolean hasUsernameToken(SOAPEnvelope env) {
+ if (env.getHeader() == null) {
+ return false;
+ }
+ OMElement security = env.getHeader().getFirstChildWithName(
+ new QName(WSConstants.WSSE_NS, WSConstants.WSSE_LN));
+ return security != null && security.getFirstChildWithName(
+ new QName(WSConstants.WSSE_NS, WSConstants.USERNAME_TOKEN_LN))
!= null;
+ }
+
+ /** Re-parses the built envelope and runs it through the engine as the
service. */
+ private static void processAsService(MessageContext ctx, Policy policy)
throws Exception {
+ SOAPEnvelope env = ctx.getEnvelope();
+ ByteArrayInputStream in = new
ByteArrayInputStream(env.toString().getBytes("UTF-8"));
+ env = (SOAPEnvelope) new SOAPBuilder().processDocument(in, "text/xml",
ctx);
+ ctx.setEnvelope(env);
+
+ ctx.setServerSide(true);
+ AxisService axisService = ctx.getAxisService();
+ Parameter clientSide =
axisService.getParameter(RampartMessageData.PARAM_CLIENT_SIDE);
+ if (clientSide != null) {
+ axisService.removeParameter(clientSide);
+ }
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+ ctx.setProperty(WSHandlerConstants.PW_CALLBACK_REF, new
TestCBHandler());
+
+ new RampartEngine().process(ctx);
+ }
+}
diff --git
a/modules/rampart-tests/test-resources/policy/rampart-optional-assertions-sp11.xml
b/modules/rampart-tests/test-resources/policy/rampart-optional-assertions-sp11.xml
new file mode 100644
index 00000000..362b9f2d
--- /dev/null
+++
b/modules/rampart-tests/test-resources/policy/rampart-optional-assertions-sp11.xml
@@ -0,0 +1,60 @@
+<wsp:Policy wsu:Id="OptionalAssertionsSP11"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:AsymmetricBinding
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <wsp:Policy>
+ <sp:InitiatorToken>
+ <wsp:Policy>
+ <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+ <wsp:Policy>
+
<sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:InitiatorToken>
+ <sp:RecipientToken>
+ <wsp:Policy>
+ <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+ <wsp:Policy>
+
<sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:RecipientToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp
wsp:Optional="true"/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ </wsp:Policy>
+ </sp:AsymmetricBinding>
+ <sp:SignedParts wsp:Optional="true"
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <sp:Body/>
+ </sp:SignedParts>
+ <sp:EncryptedParts wsp:Optional="true"
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <sp:Body/>
+ </sp:EncryptedParts>
+ <sp:SignedSupportingTokens
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <wsp:Policy>
+ <sp:UsernameToken wsp:Optional="true"
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient"/>
+ </wsp:Policy>
+ </sp:SignedSupportingTokens>
+ <sp:SupportingTokens
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <wsp:Policy>
+ <sp:X509Token wsp:Optional="true"
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+ <wsp:Policy>
+ <sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:SupportingTokens>
+ </wsp:All>
+ </wsp:ExactlyOne>
+</wsp:Policy>
diff --git
a/modules/rampart-tests/test-resources/policy/rampart-optional-assertions-sp12.xml
b/modules/rampart-tests/test-resources/policy/rampart-optional-assertions-sp12.xml
new file mode 100644
index 00000000..af1e47af
--- /dev/null
+++
b/modules/rampart-tests/test-resources/policy/rampart-optional-assertions-sp12.xml
@@ -0,0 +1,60 @@
+<wsp:Policy wsu:Id="OptionalAssertionsSP12"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:AsymmetricBinding
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:Policy>
+ <sp:InitiatorToken>
+ <wsp:Policy>
+ <sp:X509Token
sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+ <wsp:Policy>
+
<sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:InitiatorToken>
+ <sp:RecipientToken>
+ <wsp:Policy>
+ <sp:X509Token
sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+ <wsp:Policy>
+
<sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:RecipientToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp
wsp:Optional="true"/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ </wsp:Policy>
+ </sp:AsymmetricBinding>
+ <sp:SignedParts wsp:Optional="true"
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <sp:Body/>
+ </sp:SignedParts>
+ <sp:EncryptedParts wsp:Optional="true"
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <sp:Body/>
+ </sp:EncryptedParts>
+ <sp:SignedSupportingTokens
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:Policy>
+ <sp:UsernameToken wsp:Optional="true"
sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient"/>
+ </wsp:Policy>
+ </sp:SignedSupportingTokens>
+ <sp:SupportingTokens
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:Policy>
+ <sp:X509Token wsp:Optional="true"
sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+ <wsp:Policy>
+ <sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:SupportingTokens>
+ </wsp:All>
+ </wsp:ExactlyOne>
+</wsp:Policy>
diff --git
a/modules/rampart-tests/test-resources/policy/rampart-optional-parts-asymm.xml
b/modules/rampart-tests/test-resources/policy/rampart-optional-parts-asymm.xml
new file mode 100644
index 00000000..bcc9eb35
--- /dev/null
+++
b/modules/rampart-tests/test-resources/policy/rampart-optional-parts-asymm.xml
@@ -0,0 +1,76 @@
+<wsp:Policy wsu:Id="OptionalPartsAsymm"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:AsymmetricBinding
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <wsp:Policy>
+ <sp:InitiatorToken>
+ <wsp:Policy>
+ <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+ <wsp:Policy>
+
<sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:InitiatorToken>
+ <sp:RecipientToken>
+ <wsp:Policy>
+ <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+ <wsp:Policy>
+
<sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:RecipientToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ </wsp:Policy>
+ </sp:AsymmetricBinding>
+ <sp:Wss10
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <wsp:Policy>
+ <sp:MustSupportRefKeyIdentifier/>
+ <sp:MustSupportRefIssuerSerial/>
+ </wsp:Policy>
+ </sp:Wss10>
+ <!-- RAMPART-286: both body parts are optional, so the
client may leave the
+ body in the clear and unsigned, and the service
must accept that. -->
+ <sp:SignedParts wsp:Optional="true"
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <sp:Body/>
+ </sp:SignedParts>
+ <sp:EncryptedParts wsp:Optional="true"
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <sp:Body/>
+ </sp:EncryptedParts>
+
+ <ramp:RampartConfig
xmlns:ramp="http://ws.apache.org/rampart/policy">
+ <ramp:user>alice</ramp:user>
+ <ramp:encryptionUser>bob</ramp:encryptionUser>
+
<ramp:passwordCallbackClass>org.apache.rampart.TestCBHandler</ramp:passwordCallbackClass>
+
+ <ramp:signatureCrypto>
+ <ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">pkcs12</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/keys/interop2024.pkcs12</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
+ </ramp:crypto>
+ </ramp:signatureCrypto>
+ <ramp:encryptionCypto>
+ <ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">pkcs12</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/keys/interop2024.pkcs12</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
+ </ramp:crypto>
+ </ramp:encryptionCypto>
+ </ramp:RampartConfig>
+
+ </wsp:All>
+ </wsp:ExactlyOne>
+</wsp:Policy>
diff --git
a/modules/rampart-tests/test-resources/policy/rampart-optional-timestamp-symm.xml
b/modules/rampart-tests/test-resources/policy/rampart-optional-timestamp-symm.xml
new file mode 100644
index 00000000..0dd39ee3
--- /dev/null
+++
b/modules/rampart-tests/test-resources/policy/rampart-optional-timestamp-symm.xml
@@ -0,0 +1,76 @@
+<wsp:Policy wsu:Id="OptionalTimestampSymm"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SymmetricBinding
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <wsp:Policy>
+ <sp:ProtectionToken>
+ <wsp:Policy>
+ <sp:X509Token
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+ <wsp:Policy>
+
<sp:RequireThumbprintReference/>
+
<sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:ProtectionToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Strict/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp
wsp:Optional="true"/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ </wsp:Policy>
+ </sp:SymmetricBinding>
+ <sp:Wss11
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <wsp:Policy>
+ <sp:MustSupportRefKeyIdentifier/>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ </wsp:Policy>
+ </sp:Wss11>
+ <sp:SignedParts
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <sp:Body/>
+ <sp:Header Name="To"
Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="From"
Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="FaultTo"
Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="ReplyTo"
Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="MessageID"
Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="RelatesTo"
Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ <sp:Header Name="Action"
Namespace="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ </sp:SignedParts>
+ <sp:EncryptedParts
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <sp:Body/>
+ </sp:EncryptedParts>
+
+ <ramp:RampartConfig
xmlns:ramp="http://ws.apache.org/rampart/policy">
+ <ramp:user>alice</ramp:user>
+ <ramp:encryptionUser>bob</ramp:encryptionUser>
+
<ramp:passwordCallbackClass>org.apache.rampart.TestCBHandler</ramp:passwordCallbackClass>
+
+ <ramp:signatureCrypto>
+ <ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">pkcs12</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/keys/interop2024.pkcs12</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
+ </ramp:crypto>
+ </ramp:signatureCrypto>
+ <ramp:encryptionCypto>
+ <ramp:crypto
provider="org.apache.ws.security.components.crypto.Merlin">
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.type">pkcs12</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.file">test-resources/keys/interop2024.pkcs12</ramp:property>
+ <ramp:property
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
+ </ramp:crypto>
+ </ramp:encryptionCypto>
+ </ramp:RampartConfig>
+
+
+ </wsp:All>
+ </wsp:ExactlyOne>
+</wsp:Policy>
diff --git
a/modules/rampart-tests/test-resources/policy/rampart-optional-username-token.xml
b/modules/rampart-tests/test-resources/policy/rampart-optional-username-token.xml
new file mode 100644
index 00000000..173bdddf
--- /dev/null
+++
b/modules/rampart-tests/test-resources/policy/rampart-optional-username-token.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsp:Policy wsu:Id="OptionalUT"
+
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
+ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SignedSupportingTokens
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+ <wsp:Policy>
+ <sp:UsernameToken wsp:Optional="true"
sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient"/>
+ </wsp:Policy>
+ </sp:SignedSupportingTokens>
+ </wsp:All>
+ </wsp:ExactlyOne>
+</wsp:Policy>