cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1526485 - in /cxf/trunk: rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/ rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/ rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/ services/s...
Date Thu, 26 Sep 2013 13:38:32 GMT
Author: coheigea
Date: Thu Sep 26 13:38:31 2013
New Revision: 1526485

URL: http://svn.apache.org/r1526485
Log:
Compilation fixes following on from recent merge to WSS4J

Modified:
    cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
    cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
    cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
    cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
    cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
    cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
    cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
    cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java
    cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
    cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
    cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java

Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java?rev=1526485&r1=1526484&r2=1526485&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
(original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
Thu Sep 26 13:38:31 2013
@@ -44,7 +44,6 @@ import javax.xml.xpath.XPathFactory;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-
 import org.apache.cxf.Bus;
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
@@ -326,7 +325,7 @@ public class PolicyBasedWSS4JInIntercept
      * Is a Nonce Cache required, i.e. are we expecting a UsernameToken
      */
     @Override
-    protected boolean isNonceCacheRequired(int doAction, SoapMessage msg) {
+    protected boolean isNonceCacheRequired(List<Integer> actions, SoapMessage msg)
{
         AssertionInfoMap aim = msg.get(AssertionInfoMap.class);
         if (aim != null) {
             Collection<AssertionInfo> ais = 
@@ -344,7 +343,7 @@ public class PolicyBasedWSS4JInIntercept
      * Is a Timestamp cache required, i.e. are we expecting a Timestamp 
      */
     @Override
-    protected boolean isTimestampCacheRequired(int doAction, SoapMessage msg) {
+    protected boolean isTimestampCacheRequired(List<Integer> actions, SoapMessage msg)
{
         AssertionInfoMap aim = msg.get(AssertionInfoMap.class);
         if (aim != null) {
             Collection<AssertionInfo> ais = 
@@ -362,7 +361,7 @@ public class PolicyBasedWSS4JInIntercept
      * Is a SAML Cache required, i.e. are we expecting a SAML Token 
      */
     @Override
-    protected boolean isSamlCacheRequired(int doAction, SoapMessage msg) {
+    protected boolean isSamlCacheRequired(List<Integer> actions, SoapMessage msg) {
         AssertionInfoMap aim = msg.get(AssertionInfoMap.class);
         if (aim != null) {
             Collection<AssertionInfo> ais = 

Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?rev=1526485&r1=1526484&r2=1526485&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
(original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
Thu Sep 26 13:38:31 2013
@@ -223,10 +223,9 @@ public class WSS4JInInterceptor extends 
             reqData.setCallbackHandler(getCallback(reqData, utWithCallbacks));
             
             computeAction(msg, reqData);
-            List<Integer> actions = new ArrayList<Integer>();
             String action = getAction(msg, version);
 
-            int doAction = WSSecurityUtil.decodeAction(action, actions);
+            List<Integer> actions = WSSecurityUtil.decodeAction(action);
 
             String actor = (String)getOption(WSHandlerConstants.ACTOR);
             if (actor == null) {
@@ -234,7 +233,7 @@ public class WSS4JInInterceptor extends 
             }
 
             // Configure replay caching
-            configureReplayCaches(reqData, doAction, msg);
+            configureReplayCaches(reqData, actions, msg);
             
             TLSSessionInfo tlsInfo = msg.get(TLSSessionInfo.class);
             if (tlsInfo != null) {
@@ -246,7 +245,7 @@ public class WSS4JInInterceptor extends 
              * Get and check the Signature specific parameters first because
              * they may be used for encryption too.
              */
-            doReceiverAction(doAction, reqData);
+            doReceiverAction(actions, reqData);
             
             /*get chance to check msg context enableRevocation setting
              *when use policy based ws-security where the WSHandler configuration
@@ -394,19 +393,18 @@ public class WSS4JInInterceptor extends 
         //
         Crypto encCrypto = (Crypto)msg.getContextualProperty(SecurityConstants.ENCRYPT_CRYPTO);
         if (encCrypto != null) {
-            reqData.setEncCrypto(encCrypto);
             reqData.setDecCrypto(encCrypto);
         }
         Crypto sigCrypto = (Crypto)msg.getContextualProperty(SecurityConstants.SIGNATURE_CRYPTO);
         if (sigCrypto != null) {
-            reqData.setSigCrypto(sigCrypto);
+            reqData.setSigVerCrypto(sigCrypto);
         }
     }
     
-    protected void configureReplayCaches(RequestData reqData, int doAction, SoapMessage msg)

+    protected void configureReplayCaches(RequestData reqData, List<Integer> actions,
SoapMessage msg) 
         throws WSSecurityException {
         reqData.setEnableNonceReplayCache(false);
-        if (isNonceCacheRequired(doAction, msg)) {
+        if (isNonceCacheRequired(actions, msg)) {
             ReplayCache nonceCache = 
                 getReplayCache(
                     msg, SecurityConstants.ENABLE_NONCE_CACHE, SecurityConstants.NONCE_CACHE_INSTANCE
@@ -418,7 +416,7 @@ public class WSS4JInInterceptor extends 
         }
         
         reqData.setEnableTimestampReplayCache(false);
-        if (isTimestampCacheRequired(doAction, msg)) {
+        if (isTimestampCacheRequired(actions, msg)) {
             ReplayCache timestampCache = 
                 getReplayCache(
                     msg, SecurityConstants.ENABLE_TIMESTAMP_CACHE, SecurityConstants.TIMESTAMP_CACHE_INSTANCE
@@ -430,7 +428,7 @@ public class WSS4JInInterceptor extends 
         }
         
         reqData.setEnableSamlOneTimeUseReplayCache(false);
-        if (isSamlCacheRequired(doAction, msg)) {
+        if (isSamlCacheRequired(actions, msg)) {
             ReplayCache samlCache = 
                 getReplayCache(
                     msg, SecurityConstants.ENABLE_SAML_ONE_TIME_USE_CACHE, 
@@ -446,9 +444,8 @@ public class WSS4JInInterceptor extends 
     /**
      * Is a Nonce Cache required, i.e. are we expecting a UsernameToken 
      */
-    protected boolean isNonceCacheRequired(int doAction, SoapMessage msg) {
-        if ((doAction & WSConstants.UT) == WSConstants.UT
-            || (doAction & WSConstants.UT_NOPASSWORD) == WSConstants.UT_NOPASSWORD) {
+    protected boolean isNonceCacheRequired(List<Integer> actions, SoapMessage msg)
{
+        if (actions.contains(WSConstants.UT) || actions.contains(WSConstants.UT_NOPASSWORD))
{
             return true;
         }
         return false;
@@ -457,8 +454,8 @@ public class WSS4JInInterceptor extends 
     /**
      * Is a Timestamp cache required, i.e. are we expecting a Timestamp 
      */
-    protected boolean isTimestampCacheRequired(int doAction, SoapMessage msg) {
-        if ((doAction & WSConstants.TS) == WSConstants.TS) {
+    protected boolean isTimestampCacheRequired(List<Integer> actions, SoapMessage msg)
{
+        if (actions.contains(WSConstants.TS)) {
             return true;
         }
         return false;
@@ -467,9 +464,8 @@ public class WSS4JInInterceptor extends 
     /**
      * Is a SAML Cache required, i.e. are we expecting a SAML Token 
      */
-    protected boolean isSamlCacheRequired(int doAction, SoapMessage msg) {
-        if ((doAction & WSConstants.ST_UNSIGNED) == WSConstants.ST_UNSIGNED
-            || (doAction & WSConstants.ST_SIGNED) == WSConstants.ST_SIGNED) {
+    protected boolean isSamlCacheRequired(List<Integer> actions, SoapMessage msg) {
+        if (actions.contains(WSConstants.ST_UNSIGNED) || actions.contains(WSConstants.ST_SIGNED))
{
             return true;
         }
         return false;

Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java?rev=1526485&r1=1526484&r2=1526485&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
(original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
Thu Sep 26 13:38:31 2013
@@ -18,7 +18,6 @@
  */
 package org.apache.cxf.ws.security.wss4j;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -30,7 +29,6 @@ import java.util.logging.Logger;
 import javax.xml.soap.SOAPMessage;
 
 import org.w3c.dom.Document;
-
 import org.apache.cxf.binding.soap.SoapFault;
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.binding.soap.SoapVersion;
@@ -45,6 +43,7 @@ import org.apache.wss4j.common.ext.WSSec
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.WSSConfig;
 import org.apache.wss4j.dom.action.Action;
+import org.apache.wss4j.dom.handler.HandlerAction;
 import org.apache.wss4j.dom.handler.RequestData;
 import org.apache.wss4j.dom.handler.WSHandlerConstants;
 import org.apache.wss4j.dom.util.WSSecurityUtil;
@@ -185,15 +184,14 @@ public class WSS4JOutInterceptor extends
                 /*
                  * Get the action first.
                  */
-                List<Integer> actions = new ArrayList<Integer>();
                 String action = getString(WSHandlerConstants.ACTION, mc);
                 if (action == null) {
                     throw new SoapFault(new Message("NO_ACTION", LOG), version
                             .getReceiver());
                 }
     
-                int doAction = WSSecurityUtil.decodeAction(action, actions, config);
-                if (doAction == WSConstants.NO_SECURITY && actions.isEmpty()) {
+                List<HandlerAction> actions = WSSecurityUtil.decodeHandlerAction(action,
config);
+                if (actions.isEmpty()) {
                     return;
                 }
     
@@ -216,8 +214,16 @@ public class WSS4JOutInterceptor extends
                  * functions. No need to do it for encryption only. Check if
                  * username is available and then get a passowrd.
                  */
-                if ((doAction & (WSConstants.SIGN | WSConstants.UT | WSConstants.UT_SIGN))
!= 0
-                        && (reqData.getUsername() == null || reqData.getUsername().equals(""))
+                boolean userNameRequired = false;
+                for (HandlerAction handlerAction : actions) {
+                    if (handlerAction.getAction() == WSConstants.SIGN
+                        || handlerAction.getAction() == WSConstants.UT
+                        || handlerAction.getAction() == WSConstants.UT_SIGN) {
+                        userNameRequired = true;
+                        break;
+                    }
+                }
+                if (userNameRequired && (reqData.getUsername() == null || reqData.getUsername().equals(""))
                         && (String)getOption(WSHandlerConstants.SIGNATURE_USER) ==
null) {
                     /*
                      * We need a username - if none throw an SoapFault. For
@@ -227,7 +233,6 @@ public class WSS4JOutInterceptor extends
                             .getReceiver());
                 }
                 if (doDebug) {
-                    LOG.fine("Action: " + doAction);
                     LOG.fine("Actor: " + reqData.getActor());
                 }
                 /*
@@ -257,7 +262,7 @@ public class WSS4JOutInterceptor extends
                     t1 = System.currentTimeMillis();
                 }
     
-                doSenderAction(doAction, doc, reqData, actions, Boolean.TRUE
+                doSenderAction(doc, reqData, actions, Boolean.TRUE
                         .equals(getProperty(mc, org.apache.cxf.message.Message.REQUESTOR_ROLE)));
     
                 if (doTimeDebug) {

Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java?rev=1526485&r1=1526484&r2=1526485&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
(original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
Thu Sep 26 13:38:31 2013
@@ -53,7 +53,6 @@ import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
-
 import org.apache.cxf.Bus;
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.binding.soap.saaj.SAAJUtils;
@@ -79,6 +78,7 @@ import org.apache.cxf.ws.security.tokens
 import org.apache.cxf.ws.security.tokenstore.TokenStoreFactory;
 import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.neethi.Assertion;
+import org.apache.wss4j.common.WSEncryptionPart;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.crypto.CryptoFactory;
 import org.apache.wss4j.common.crypto.CryptoType;
@@ -94,7 +94,6 @@ import org.apache.wss4j.common.saml.SAML
 import org.apache.wss4j.common.saml.SamlAssertionWrapper;
 import org.apache.wss4j.common.util.Loader;
 import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.WSEncryptionPart;
 import org.apache.wss4j.dom.WSSConfig;
 import org.apache.wss4j.dom.WSSecurityEngineResult;
 import org.apache.wss4j.dom.bsp.BSPEnforcer;

Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java?rev=1526485&r1=1526484&r2=1526485&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
(original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
Thu Sep 26 13:38:31 2013
@@ -30,7 +30,6 @@ import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPMessage;
 
 import org.w3c.dom.Element;
-
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.helpers.CastUtils;
@@ -39,11 +38,11 @@ import org.apache.cxf.ws.policy.Assertio
 import org.apache.cxf.ws.policy.AssertionInfoMap;
 import org.apache.cxf.ws.security.SecurityConstants;
 import org.apache.cxf.ws.security.tokenstore.SecurityToken;
+import org.apache.wss4j.common.WSEncryptionPart;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.common.saml.SamlAssertionWrapper;
 import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.WSEncryptionPart;
 import org.apache.wss4j.dom.WSSConfig;
 import org.apache.wss4j.dom.WSSecurityEngineResult;
 import org.apache.wss4j.dom.handler.WSHandlerConstants;

Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java?rev=1526485&r1=1526484&r2=1526485&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
(original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java
Thu Sep 26 13:38:31 2013
@@ -39,12 +39,12 @@ import org.apache.cxf.ws.policy.Assertio
 import org.apache.cxf.ws.security.SecurityConstants;
 import org.apache.cxf.ws.security.tokenstore.SecurityToken;
 import org.apache.cxf.ws.security.tokenstore.TokenStore;
+import org.apache.wss4j.common.WSEncryptionPart;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.derivedKey.ConversationConstants;
 import org.apache.wss4j.common.derivedKey.ConversationException;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.WSEncryptionPart;
 import org.apache.wss4j.dom.WSSConfig;
 import org.apache.wss4j.dom.WSSecurityEngineResult;
 import org.apache.wss4j.dom.bsp.BSPEnforcer;

Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java?rev=1526485&r1=1526484&r2=1526485&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
(original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java
Thu Sep 26 13:38:31 2013
@@ -32,20 +32,19 @@ import javax.xml.xpath.XPathExpressionEx
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.ws.policy.AssertionInfo;
 import org.apache.cxf.ws.policy.AssertionInfoMap;
 import org.apache.cxf.ws.security.SecurityConstants;
 import org.apache.cxf.ws.security.tokenstore.SecurityToken;
+import org.apache.wss4j.common.WSEncryptionPart;
 import org.apache.wss4j.common.crypto.Crypto;
 import org.apache.wss4j.common.derivedKey.ConversationConstants;
 import org.apache.wss4j.common.ext.WSPasswordCallback;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.common.saml.SamlAssertionWrapper;
 import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.WSEncryptionPart;
 import org.apache.wss4j.dom.WSSConfig;
 import org.apache.wss4j.dom.bsp.BSPEnforcer;
 import org.apache.wss4j.dom.message.WSSecDKSign;

Modified: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java?rev=1526485&r1=1526484&r2=1526485&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java
(original)
+++ cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptorTest.java
Thu Sep 26 13:38:31 2013
@@ -25,13 +25,13 @@ import javax.xml.soap.SOAPMessage;
 import javax.xml.soap.SOAPPart;
 
 import org.w3c.dom.Document;
-
 import org.apache.cxf.binding.soap.SoapFault;
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.ExchangeImpl;
 import org.apache.cxf.message.MessageImpl;
 import org.apache.cxf.phase.PhaseInterceptor;
+import org.apache.wss4j.common.SecurityActionToken;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.dom.WSConstants;
 import org.apache.wss4j.dom.action.UsernameTokenAction;
@@ -262,12 +262,12 @@ public class WSS4JOutInterceptorTest ext
         private int executions;
         
         @Override
-        public void execute(WSHandler handler, int actionToDo, Document doc,
+        public void execute(WSHandler handler, SecurityActionToken actionToken, Document
doc,
                 RequestData reqData) throws WSSecurityException {
             
             this.executions++;
             reqData.setPwType(WSConstants.PW_TEXT);
-            super.execute(handler, actionToDo, doc, reqData);
+            super.execute(handler, actionToken, doc, reqData);
         }
 
         public int getExecutions() {

Modified: cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java?rev=1526485&r1=1526484&r2=1526485&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
(original)
+++ cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/AbstractOperation.java
Thu Sep 26 13:38:31 2013
@@ -76,9 +76,9 @@ import org.apache.cxf.ws.security.sts.pr
 import org.apache.cxf.ws.security.sts.provider.model.secext.SecurityTokenReferenceType;
 import org.apache.cxf.ws.security.sts.provider.model.utility.AttributedDateTime;
 import org.apache.cxf.ws.security.tokenstore.TokenStore;
+import org.apache.wss4j.common.WSEncryptionPart;
 import org.apache.wss4j.common.ext.WSSecurityException;
 import org.apache.wss4j.dom.WSConstants;
-import org.apache.wss4j.dom.WSEncryptionPart;
 import org.apache.wss4j.dom.WSSecurityEngineResult;
 import org.apache.wss4j.dom.handler.WSHandlerConstants;
 import org.apache.wss4j.dom.handler.WSHandlerResult;

Modified: cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java?rev=1526485&r1=1526484&r2=1526485&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
(original)
+++ cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
Thu Sep 26 13:38:31 2013
@@ -332,7 +332,7 @@ public class SAMLTokenRenewer implements
             Crypto sigCrypto = stsProperties.getSignatureCrypto();
             CallbackHandler callbackHandler = stsProperties.getCallbackHandler();
             RequestData requestData = new RequestData();
-            requestData.setSigCrypto(sigCrypto);
+            requestData.setSigVerCrypto(sigCrypto);
             WSSConfig wssConfig = WSSConfig.getNewInstance();
             requestData.setWssConfig(wssConfig);
             requestData.setCallbackHandler(callbackHandler);

Modified: cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java?rev=1526485&r1=1526484&r2=1526485&view=diff
==============================================================================
--- cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java
(original)
+++ cxf/trunk/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/validator/UsernameTokenValidator.java
Thu Sep 26 13:38:31 2013
@@ -118,7 +118,7 @@ public class UsernameTokenValidator impl
         CallbackHandler callbackHandler = stsProperties.getCallbackHandler();
 
         RequestData requestData = new RequestData();
-        requestData.setSigCrypto(sigCrypto);
+        requestData.setSigVerCrypto(sigCrypto);
         WSSConfig wssConfig = WSSConfig.getNewInstance();
         requestData.setWssConfig(wssConfig);
         requestData.setCallbackHandler(callbackHandler);



Mime
View raw message