You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rampart-dev@ws.apache.org by ru...@apache.org on 2007/09/08 16:19:46 UTC
svn commit: r573843 -
/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
Author: ruchithf
Date: Sat Sep 8 07:19:46 2007
New Revision: 573843
URL: http://svn.apache.org/viewvc?rev=573843&view=rev
Log:
Endorsing tokens will sign the timestamp even when the signatureParts are missing
No need to validate protection order when TransportBinding is used
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
Modified: webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java?rev=573843&r1=573842&r2=573843&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java Sat Sep 8 07:19:46 2007
@@ -89,9 +89,10 @@
SupportingToken endSupportingToken = rpd.getEndorsingSupportingTokens();
if(endSupportingToken != null) {
SignedEncryptedParts endSignedParts = endSupportingToken.getSignedParts();
- if(endSignedParts != null &&
+ if((endSignedParts != null &&
(endSignedParts.isBody() ||
- endSignedParts.getHeaders().size() > 0)) {
+ endSignedParts.getHeaders().size() > 0)) ||
+ rpd.isIncludeTimestamp()) {
signatureParts.add(
new WSEncryptionPart("EndorsingSupportingTokens"));
}
@@ -100,9 +101,10 @@
SupportingToken sgndEndSupportingToken = rpd.getSignedEndorsingSupportingTokens();
if(sgndEndSupportingToken != null) {
SignedEncryptedParts sgndEndSignedParts = sgndEndSupportingToken.getSignedParts();
- if(sgndEndSignedParts != null &&
+ if((sgndEndSignedParts != null &&
(sgndEndSignedParts.isBody() ||
- sgndEndSignedParts.getHeaders().size() > 0)) {
+ sgndEndSignedParts.getHeaders().size() > 0)) ||
+ rpd.isIncludeTimestamp()) {
signatureParts.add(
new WSEncryptionPart("SignedEndorsingSupportingTokens"));
}
@@ -111,7 +113,9 @@
validateEncrSig(encryptedParts, signatureParts, results);
- validateProtectionOrder(data, results);
+ if(!rpd.isTransportBinding()) {
+ validateProtectionOrder(data, results);
+ }
validateEncryptedParts(data, encryptedParts, results);