cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1493108 - /cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java
Date Fri, 14 Jun 2013 15:12:19 GMT
Author: coheigea
Date: Fri Jun 14 15:12:19 2013
New Revision: 1493108

URL: http://svn.apache.org/r1493108
Log:
[CXF-5056] - EndorsingSupportingTokens with both transport security and message layer security
applied

Modified:
    cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java

Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java?rev=1493108&r1=1493107&r2=1493108&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java
(original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java
Fri Jun 14 15:12:19 2013
@@ -471,10 +471,14 @@ public abstract class AbstractSupporting
      * @return true if the endorsed supporting token policy is correct
      */
     private boolean checkEndorsed(List<WSSecurityEngineResult> tokenResults) {
+        boolean endorsingSatisfied = false;
         if (isTLSInUse()) {
-            return checkTimestampIsSigned(tokenResults);
+            endorsingSatisfied = checkTimestampIsSigned(tokenResults);
         }
-        return checkSignatureIsSigned(tokenResults);
+        if (!endorsingSatisfied) {
+            endorsingSatisfied = checkSignatureIsSigned(tokenResults);
+        }
+        return endorsingSatisfied;
     }
     
     



Mime
View raw message