ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gi...@apache.org
Subject svn commit: r1492304 - /webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyEnforcer.java
Date Wed, 12 Jun 2013 17:50:19 GMT
Author: giger
Date: Wed Jun 12 17:50:18 2013
New Revision: 1492304

URL: http://svn.apache.org/r1492304
Log:
WSS-453 - "Once" Token Inclusion handling is not working 

Modified:
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyEnforcer.java

Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyEnforcer.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyEnforcer.java?rev=1492304&r1=1492303&r2=1492304&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyEnforcer.java
(original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/PolicyEnforcer.java
Wed Jun 12 17:50:18 2013
@@ -240,11 +240,11 @@ public class PolicyEnforcer implements S
             // Don't return a Token that is not required
             SPConstants.IncludeTokenType includeTokenType = 
                 ((AbstractToken)abstractSecurityAssertion).getIncludeTokenType();
-            if (initiator 
-                && includeTokenType == IncludeTokenType.INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT)
{
+            if (initiator && includeTokenType == IncludeTokenType.INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT)
{
                 return assertableList;
-            } else if (!initiator 
-                && includeTokenType == IncludeTokenType.INCLUDE_TOKEN_ALWAYS_TO_INITIATOR)
{
+            } else if (initiator && includeTokenType == IncludeTokenType.INCLUDE_TOKEN_ONCE)
{
+                return assertableList;
+            } else if (!initiator && includeTokenType == IncludeTokenType.INCLUDE_TOKEN_ALWAYS_TO_INITIATOR)
{
                 return assertableList;
             }
         }



Mime
View raw message