You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wss4j-dev@ws.apache.org by we...@apache.org on 2006/03/06 15:03:03 UTC

svn commit: r383543 - in /webservices/wss4j/trunk/src/org/apache/ws/security: action/ handler/

Author: werner
Date: Mon Mar  6 06:03:01 2006
New Revision: 383543

URL: http://svn.apache.org/viewcvs?rev=383543&view=rev
Log:
Modify WSHandler and the Action classes to use the new refactored message classes.

Modified:
    webservices/wss4j/trunk/src/org/apache/ws/security/action/Action.java
    webservices/wss4j/trunk/src/org/apache/ws/security/action/EncryptionAction.java
    webservices/wss4j/trunk/src/org/apache/ws/security/action/SAMLTokenSignedAction.java
    webservices/wss4j/trunk/src/org/apache/ws/security/action/SAMLTokenUnsignedAction.java
    webservices/wss4j/trunk/src/org/apache/ws/security/action/SignatureAction.java
    webservices/wss4j/trunk/src/org/apache/ws/security/action/SignatureConfirmationAction.java
    webservices/wss4j/trunk/src/org/apache/ws/security/action/TimestampAction.java
    webservices/wss4j/trunk/src/org/apache/ws/security/action/UsernameTokenAction.java
    webservices/wss4j/trunk/src/org/apache/ws/security/action/UsernameTokenSignedAction.java
    webservices/wss4j/trunk/src/org/apache/ws/security/handler/RequestData.java
    webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandler.java

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/action/Action.java
URL: http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/security/action/Action.java?rev=383543&r1=383542&r2=383543&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/action/Action.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/action/Action.java Mon Mar  6 06:03:01 2006
@@ -26,5 +26,6 @@
  * Interface for all actions
  */
 public interface Action {
-    public void execute(WSHandler handler, int actionToDo, boolean mu, Document doc, RequestData reqData) throws WSSecurityException;
+    public void execute(WSHandler handler, int actionToDo, Document doc,
+            RequestData reqData) throws WSSecurityException;
 }

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/action/EncryptionAction.java
URL: http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/security/action/EncryptionAction.java?rev=383543&r1=383542&r2=383543&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/action/EncryptionAction.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/action/EncryptionAction.java Mon Mar  6 06:03:01 2006
@@ -22,13 +22,13 @@
 import org.apache.ws.security.handler.RequestData;
 import org.apache.ws.security.handler.WSHandler;
 import org.apache.ws.security.handler.WSHandlerConstants;
-import org.apache.ws.security.message.WSEncryptBody;
+import org.apache.ws.security.message.WSSecEncrypt;
 import org.w3c.dom.Document;
 
 public class EncryptionAction implements Action {
-    public void execute(WSHandler handler, int actionToDo, boolean mu, Document doc, RequestData reqData)
+    public void execute(WSHandler handler, int actionToDo, Document doc, RequestData reqData)
             throws WSSecurityException {
-        WSEncryptBody wsEncrypt = new WSEncryptBody(reqData.getActor(), mu);
+        WSSecEncrypt wsEncrypt = new WSSecEncrypt();
         wsEncrypt.setWsConfig(reqData.getWssConfig());
 
         if (reqData.getEncKeyId() != 0) {
@@ -59,7 +59,7 @@
             wsEncrypt.setParts(reqData.getEncryptParts());
         }
         try {
-            wsEncrypt.build(doc, reqData.getEncCrypto());
+            wsEncrypt.build(doc, reqData.getEncCrypto(), reqData.getSecHeader());
         } catch (WSSecurityException e) {
             throw new WSSecurityException("WSHandler: Encryption: error during message processing"
                     + e);

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/action/SAMLTokenSignedAction.java
URL: http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/security/action/SAMLTokenSignedAction.java?rev=383543&r1=383542&r2=383543&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/action/SAMLTokenSignedAction.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/action/SAMLTokenSignedAction.java Mon Mar  6 06:03:01 2006
@@ -26,16 +26,14 @@
 import org.apache.ws.security.handler.WSHandlerConstants;
 import org.apache.ws.security.saml.SAMLIssuer;
 import org.apache.ws.security.saml.SAMLIssuerFactory;
-import org.apache.ws.security.saml.WSSignSAMLEnvelope;
+import org.apache.ws.security.saml.WSSecSignatureSAML;
 import org.opensaml.SAMLAssertion;
 import org.w3c.dom.Document;
 
 public class SAMLTokenSignedAction implements Action {
     private static Log log = LogFactory.getLog(SAMLTokenSignedAction.class.getName());
-    private static Log tlog =
-            LogFactory.getLog("org.apache.ws.security.TIME");
 
-    public void execute(WSHandler handler, int actionToDo, boolean mu, Document doc, RequestData reqData)
+    public void execute(WSHandler handler, int actionToDo, Document doc, RequestData reqData)
             throws WSSecurityException {
         Crypto crypto = null;
         /*
@@ -62,7 +60,7 @@
         String issuerKeyPW = null;
         Crypto issuerCrypto = null;
 
-        WSSignSAMLEnvelope wsSign = new WSSignSAMLEnvelope(reqData.getActor(), mu);
+        WSSecSignatureSAML wsSign = new WSSecSignatureSAML();
         wsSign.setWsConfig(reqData.getWssConfig());
 
         String password = null;
@@ -89,7 +87,8 @@
                     assertion,
                     issuerCrypto,
                     issuerKeyName,
-                    issuerKeyPW);
+                    issuerKeyPW,
+                    reqData.getSecHeader());
             reqData.getSignatureValues().add(wsSign.getSignatureValue());
         } catch (WSSecurityException e) {
             throw new WSSecurityException("WSHandler: Signed SAML: error during message processing"

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/action/SAMLTokenUnsignedAction.java
URL: http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/security/action/SAMLTokenUnsignedAction.java?rev=383543&r1=383542&r2=383543&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/action/SAMLTokenUnsignedAction.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/action/SAMLTokenUnsignedAction.java Mon Mar  6 06:03:01 2006
@@ -20,16 +20,16 @@
 import org.apache.ws.security.WSSecurityException;
 import org.apache.ws.security.handler.RequestData;
 import org.apache.ws.security.handler.WSHandler;
-import org.apache.ws.security.message.WSSAddSAMLToken;
+import org.apache.ws.security.message.WSSecSAMLToken;
 import org.apache.ws.security.saml.SAMLIssuer;
 import org.opensaml.SAMLAssertion;
 import org.w3c.dom.Document;
 
-public class SAMLTokenUnsignedAction extends SAMLTokenSignedAction implements Action {
+public class SAMLTokenUnsignedAction extends SAMLTokenSignedAction {
 
-    public void execute(WSHandler handler, int actionToDo, boolean mu, Document doc, RequestData reqData)
+    public void execute(WSHandler handler, int actionToDo, Document doc, RequestData reqData)
             throws WSSecurityException {
-        WSSAddSAMLToken builder = new WSSAddSAMLToken(reqData.getActor(), mu);
+        WSSecSAMLToken builder = new WSSecSAMLToken();
         builder.setWsConfig(reqData.getWssConfig());
 
         SAMLIssuer saml = loadSamlIssuer(handler, reqData);
@@ -37,6 +37,6 @@
         SAMLAssertion assertion = saml.newAssertion();
 
         // add the SAMLAssertion Token to the SOAP Enevelope
-        builder.build(doc, assertion);
+        builder.build(doc, assertion, reqData.getSecHeader());
     }
 }

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/action/SignatureAction.java
URL: http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/security/action/SignatureAction.java?rev=383543&r1=383542&r2=383543&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/action/SignatureAction.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/action/SignatureAction.java Mon Mar  6 06:03:01 2006
@@ -21,11 +21,11 @@
 import org.apache.ws.security.handler.RequestData;
 import org.apache.ws.security.handler.WSHandler;
 import org.apache.ws.security.handler.WSHandlerConstants;
-import org.apache.ws.security.message.WSSignEnvelope;
+import org.apache.ws.security.message.WSSecSignature;
 import org.w3c.dom.Document;
 
 public class SignatureAction implements Action {
-    public void execute(WSHandler handler, int actionToDo, boolean mu, Document doc, RequestData reqData)
+    public void execute(WSHandler handler, int actionToDo, Document doc, RequestData reqData)
             throws WSSecurityException {
         String password;
         password =
@@ -35,7 +35,7 @@
                         WSHandlerConstants.PW_CALLBACK_REF, reqData)
                         .getPassword();
 
-        WSSignEnvelope wsSign = new WSSignEnvelope(reqData.getActor(), mu);
+        WSSecSignature wsSign = new WSSecSignature();
         wsSign.setWsConfig(reqData.getWssConfig());
 
         if (reqData.getSigKeyId() != 0) {
@@ -51,7 +51,7 @@
         }
 
         try {
-            wsSign.build(doc, reqData.getSigCrypto());
+            wsSign.build(doc, reqData.getSigCrypto(), reqData.getSecHeader());
             reqData.getSignatureValues().add(wsSign.getSignatureValue());
         } catch (WSSecurityException e) {
             throw new WSSecurityException("WSHandler: Signature: error during message procesing" + e);

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/action/SignatureConfirmationAction.java
URL: http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/security/action/SignatureConfirmationAction.java?rev=383543&r1=383542&r2=383543&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/action/SignatureConfirmationAction.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/action/SignatureConfirmationAction.java Mon Mar  6 06:03:01 2006
@@ -27,7 +27,7 @@
 import org.apache.ws.security.handler.WSHandler;
 import org.apache.ws.security.handler.WSHandlerConstants;
 import org.apache.ws.security.handler.WSHandlerResult;
-import org.apache.ws.security.message.WSAddSignatureConfirmation;
+import org.apache.ws.security.message.WSSecSignatureConfirmation;
 import org.apache.ws.security.util.WSSecurityUtil;
 import org.w3c.dom.Document;
 
@@ -36,7 +36,7 @@
 public class SignatureConfirmationAction implements Action {
     protected static Log log = LogFactory.getLog(WSHandler.class.getName());
 
-    public void execute(WSHandler handler, int actionToDo, boolean mu, Document doc, RequestData reqData)
+    public void execute(WSHandler handler, int actionToDo, Document doc, RequestData reqData)
             throws WSSecurityException {
         if (log.isDebugEnabled()) {
             log.debug("Perform Signature confirmation");
@@ -62,8 +62,7 @@
         }
         Vector signatureParts = reqData.getSignatureParts();
         // prepare a SignatureConfirmation token
-        WSAddSignatureConfirmation wsc = new WSAddSignatureConfirmation(reqData
-                .getActor(), mu);
+        WSSecSignatureConfirmation wsc = new WSSecSignatureConfirmation();
         int idHash = wsc.hashCode();
         if (signatureActions.size() > 0) {
             if (log.isDebugEnabled()) {
@@ -74,16 +73,12 @@
                 WSSecurityEngineResult wsr = (WSSecurityEngineResult) signatureActions
                         .get(i);
                 byte[] sigVal = wsr.getSignatureValue();
-                String id = "sigcon-" + (idHash + i);
-                wsc.setId(id);
-                wsc.build(doc, sigVal);
-                signatureParts.add(new WSEncryptionPart(id));
+                wsc.build(doc, sigVal, reqData.getSecHeader());
+                signatureParts.add(new WSEncryptionPart(wsc.getId()));
             }
         } else {
-            String id = "sigcon-" + idHash;
-            wsc.setId(id);
-            wsc.build(doc, null);
-            signatureParts.add(new WSEncryptionPart(id));
+            wsc.build(doc, null, reqData.getSecHeader());
+            signatureParts.add(new WSEncryptionPart(wsc.getId()));
         }
         handler.setProperty(reqData.getMsgContext(), WSHandlerConstants.SIG_CONF_DONE,
                 WSHandler.DONE);

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/action/TimestampAction.java
URL: http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/security/action/TimestampAction.java?rev=383543&r1=383542&r2=383543&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/action/TimestampAction.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/action/TimestampAction.java Mon Mar  6 06:03:01 2006
@@ -20,20 +20,17 @@
 import org.apache.ws.security.WSSecurityException;
 import org.apache.ws.security.handler.RequestData;
 import org.apache.ws.security.handler.WSHandler;
-import org.apache.ws.security.message.WSAddTimestamp;
+import org.apache.ws.security.message.WSSecTimestamp;
 import org.w3c.dom.Document;
 
 public class TimestampAction implements Action {
-    public void execute(WSHandler handler, int actionToDo, boolean mu, Document doc, RequestData reqData)
+    public void execute(WSHandler handler, int actionToDo, Document doc, RequestData reqData)
             throws WSSecurityException {
-        WSAddTimestamp timeStampBuilder =
-                new WSAddTimestamp(reqData.getActor(), mu);
+        WSSecTimestamp timeStampBuilder =
+                new WSSecTimestamp();
         timeStampBuilder.setWsConfig(reqData.getWssConfig());
-
-
-        timeStampBuilder.setId("Timestamp-" + System.currentTimeMillis());
-
+        timeStampBuilder.setTimeToLive(handler.decodeTimeToLive(reqData));
         // add the Timestamp to the SOAP Enevelope
-        timeStampBuilder.build(doc, handler.decodeTimeToLive(reqData));
+        timeStampBuilder.build(doc, reqData.getSecHeader());
     }
 }

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/action/UsernameTokenAction.java
URL: http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/security/action/UsernameTokenAction.java?rev=383543&r1=383542&r2=383543&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/action/UsernameTokenAction.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/action/UsernameTokenAction.java Mon Mar  6 06:03:01 2006
@@ -21,11 +21,11 @@
 import org.apache.ws.security.handler.RequestData;
 import org.apache.ws.security.handler.WSHandler;
 import org.apache.ws.security.handler.WSHandlerConstants;
-import org.apache.ws.security.message.WSSAddUsernameToken;
+import org.apache.ws.security.message.WSSecUsernameToken;
 import org.w3c.dom.Document;
 
 public class UsernameTokenAction implements Action {
-    public void execute(WSHandler handler, int actionToDo, boolean mu, Document doc, RequestData reqData)
+    public void execute(WSHandler handler, int actionToDo, Document doc, RequestData reqData)
             throws WSSecurityException {
         String password;
         password =
@@ -35,27 +35,23 @@
                         WSHandlerConstants.PW_CALLBACK_REF, reqData)
                         .getPassword();
 
-        WSSAddUsernameToken builder = new WSSAddUsernameToken(reqData.getActor(), mu);
+        WSSecUsernameToken builder = new WSSecUsernameToken();
         builder.setWsConfig(reqData.getWssConfig());
         builder.setPasswordType(reqData.getPwType());
-
-        //Set the wsu:Id of the UNT
-        builder.setId("UsernameToken-" + System.currentTimeMillis());
-
-        // add the UsernameToken to the SOAP Enevelope
-        builder.build(doc, reqData.getUsername(), password);
+        builder.setUserInfo(reqData.getUsername(), password);
 
         if (reqData.getUtElements() != null && reqData.getUtElements().length > 0) {
             for (int j = 0; j < reqData.getUtElements().length; j++) {
                 reqData.getUtElements()[j].trim();
                 if (reqData.getUtElements()[j].equals("Nonce")) {
-                    builder.addNonce(doc);
+                    builder.addNonce();
                 }
                 if (reqData.getUtElements()[j].equals("Created")) {
-                    builder.addCreated(doc);
+                    builder.addCreated();
                 }
                 reqData.getUtElements()[j] = null;
             }
         }
+        builder.build(doc, reqData.getSecHeader());        
     }
 }

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/action/UsernameTokenSignedAction.java
URL: http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/security/action/UsernameTokenSignedAction.java?rev=383543&r1=383542&r2=383543&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/action/UsernameTokenSignedAction.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/action/UsernameTokenSignedAction.java Mon Mar  6 06:03:01 2006
@@ -22,28 +22,28 @@
 import org.apache.ws.security.handler.RequestData;
 import org.apache.ws.security.handler.WSHandler;
 import org.apache.ws.security.handler.WSHandlerConstants;
-import org.apache.ws.security.message.WSSAddUsernameToken;
-import org.apache.ws.security.message.WSSignEnvelope;
+import org.apache.ws.security.message.WSSecUsernameToken;
+import org.apache.ws.security.message.WSSecSignature;
 import org.apache.xml.security.signature.XMLSignature;
 import org.w3c.dom.Document;
 
 public class UsernameTokenSignedAction implements Action {
-    public void execute(WSHandler handler, int actionToDo, boolean mu, Document doc, RequestData reqData)
+    public void execute(WSHandler handler, int actionToDo, Document doc, RequestData reqData)
             throws WSSecurityException {
         String password;
         password = handler.getPassword(reqData.getUsername(), actionToDo,
                 WSHandlerConstants.PW_CALLBACK_CLASS,
                 WSHandlerConstants.PW_CALLBACK_REF, reqData).getPassword();
 
-        WSSAddUsernameToken builder = new WSSAddUsernameToken(reqData.getActor(), mu);
+        WSSecUsernameToken builder = new WSSecUsernameToken();
         builder.setWsConfig(reqData.getWssConfig());
-
         builder.setPasswordType(WSConstants.PASSWORD_TEXT);
-        builder.preSetUsernameToken(doc, reqData.getUsername(), password);
-        builder.addCreated(doc);
-        builder.addNonce(doc);
-
-        WSSignEnvelope sign = new WSSignEnvelope(reqData.getActor(), mu);
+        builder.setUserInfo(reqData.getUsername(), password);
+        builder.addCreated();
+        builder.addNonce();
+        builder.prepare(doc);
+        
+        WSSecSignature sign = new WSSecSignature();
         sign.setWsConfig(reqData.getWssConfig());
 
         if (reqData.getSignatureParts().size() > 0) {
@@ -53,12 +53,12 @@
         sign.setKeyIdentifierType(WSConstants.UT_SIGNING);
         sign.setSignatureAlgorithm(XMLSignature.ALGO_ID_MAC_HMAC_SHA1);
         try {
-            sign.build(doc, null);
+            sign.build(doc, null, reqData.getSecHeader());
             reqData.getSignatureValues().add(sign.getSignatureValue());
         } catch (WSSecurityException e) {
             throw new WSSecurityException("WSHandler: Error during Signatur with UsernameToken secret"
                     + e);
         }
-        builder.build(doc, null, null);
+        builder.prependToHeader(reqData.getSecHeader());
     }
 }

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/handler/RequestData.java
URL: http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/security/handler/RequestData.java?rev=383543&r1=383542&r2=383543&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/handler/RequestData.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/handler/RequestData.java Mon Mar  6 06:03:01 2006
@@ -3,6 +3,7 @@
 import org.apache.ws.security.SOAPConstants;
 import org.apache.ws.security.WSSConfig;
 import org.apache.ws.security.components.crypto.Crypto;
+import org.apache.ws.security.message.WSSecHeader;
 
 import java.util.Vector;
 import java.security.cert.X509Certificate;
@@ -35,6 +36,7 @@
     private int timeToLive = 300; 	// Timestamp: time in seconds between creation and expiry
     private WSSConfig wssConfig = null;
     private Vector signatureValues = new Vector();
+    private WSSecHeader secHeader = null;
 
     public void clear() {
         soapConstants = null;
@@ -42,12 +44,10 @@
        	sigCrypto = decCrypto = encCrypto = null;
        	signatureParts.clear();
        	encryptParts.clear();
-       	signatureParts = encryptParts = null;
        	encCert = null;
        	utElements = null;
         wssConfig = null;
         signatureValues.clear();
-        signatureValues = null;
     }
 
     public Object getMsgContext() {
@@ -142,10 +142,6 @@
         return signatureParts;
     }
 
-//    public void setSignatureParts(Vector signatureParts) {
-//        this.signatureParts = signatureParts;
-//    }
-
     public Crypto getEncCrypto() {
         return encCrypto;
     }
@@ -190,10 +186,6 @@
         return encryptParts;
     }
 
-//    public void setEncryptParts(Vector encryptParts) {
-//        this.encryptParts = encryptParts;
-//    }
-
     public X509Certificate getEncCert() {
         return encCert;
     }
@@ -230,10 +222,17 @@
         return signatureValues;
     }
 
-//    /**
-//     * @param signatureValue The signature value to store.
-//     */
-//    public void addSignatureValue(byte[] signatureValue) {
-//        this.signatureValues.add(signatureValue);
-//    }    
+    /**
+     * @return Returns the secHeader.
+     */
+    public WSSecHeader getSecHeader() {
+        return secHeader;
+    }
+
+    /**
+     * @param secHeader The secHeader to set.
+     */
+    public void setSecHeader(WSSecHeader secHeader) {
+        this.secHeader = secHeader;
+    }
 }

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandler.java
URL: http://svn.apache.org/viewcvs/webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandler.java?rev=383543&r1=383542&r2=383543&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandler.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandler.java Mon Mar  6 06:03:01 2006
@@ -28,6 +28,7 @@
 import org.apache.ws.security.components.crypto.Crypto;
 import org.apache.ws.security.components.crypto.CryptoFactory;
 import org.apache.ws.security.message.token.Timestamp;
+import org.apache.ws.security.message.WSSecHeader;
 import org.apache.ws.security.util.Loader;
 import org.apache.ws.security.util.StringUtil;
 import org.apache.ws.security.util.WSSecurityUtil;
@@ -93,6 +94,10 @@
         String actor = getString(WSHandlerConstants.ACTOR, mc);
         reqData.setActor(actor);
 
+        WSSecHeader secHeader = new WSSecHeader(actor, mu);
+        secHeader.insertSecurityHeader(doc);
+        
+        reqData.setSecHeader(secHeader);
         reqData.setSoapConstants(WSSecurityUtil.getSOAPConstants(doc
                 .getDocumentElement()));
         /*
@@ -160,7 +165,7 @@
                 Vector results = null;
                 if ((results = (Vector) getProperty(reqData.getMsgContext(),
                         WSHandlerConstants.RECV_RESULTS)) != null) {
-                    wssConfig.getAction(WSConstants.SC).execute(this, WSConstants.SC, mu, doc, reqData);
+                    wssConfig.getAction(WSConstants.SC).execute(this, WSConstants.SC, doc, reqData);
                 }
             }
         }
@@ -183,7 +188,7 @@
                 case WSConstants.ST_UNSIGNED:
                 case WSConstants.TS:
                 case WSConstants.UT_SIGN:
-                    wssConfig.getAction(actionToDo).execute(this, actionToDo, mu, doc, reqData);
+                    wssConfig.getAction(actionToDo).execute(this, actionToDo, doc, reqData);
                     break;
                 case WSConstants.NO_SERIALIZE:
                     reqData.setNoSerialization(true);



---------------------------------------------------------------------
To unsubscribe, e-mail: wss4j-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: wss4j-dev-help@ws.apache.org