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 fa...@apache.org on 2008/04/11 20:40:30 UTC

svn commit: r647260 [5/8] - in /webservices/wss4j/trunk: interop/org/apache/ws/axis/oasis/ src/org/apache/ws/security/ src/org/apache/ws/security/action/ src/org/apache/ws/security/components/crypto/ src/org/apache/ws/security/conversation/ src/org/apa...

Modified: webservices/wss4j/trunk/test/interop/TestScenario2b.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/interop/TestScenario2b.java?rev=647260&r1=647259&r2=647260&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/interop/TestScenario2b.java (original)
+++ webservices/wss4j/trunk/test/interop/TestScenario2b.java Fri Apr 11 11:40:21 2008
@@ -1,65 +1,65 @@
-/*
- * Copyright  2003-2004 The Apache Software Foundation.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package interop;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.apache.ws.axis.oasis.Scenario2b;
-
-/**
- * WS-Security Test Case
- * <p/>
- * 
- * @author Davanum Srinivas (dims@yahoo.com)
- */
-public class TestScenario2b extends TestCase {
-    /**
-     * TestScenario1 constructor
-     * <p/>
-     * 
-     * @param name name of the test
-     */
-    public TestScenario2b(String name) {
-        super(name);
-    }
-
-    /**
-     * JUnit suite
-     * <p/>
-     * 
-     * @return a junit test suite
-     */
-    public static Test suite() {
-        return new TestSuite(TestScenario2b.class);
-    }
-
-    /**
-     * Main method
-     * <p/>
-     * 
-     * @param args command line args
-     */
-    public static void main(String[] args) throws Exception {
-        Scenario2b.main(args);
-    }
-
-    public void testScenario2b() throws Exception {
-        Scenario2b.main(new String[]{"-lhttp://localhost:8080/axis/services/Ping2b"});
-    }
-}
+/*
+ * Copyright  2003-2004 The Apache Software Foundation.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package interop;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import org.apache.ws.axis.oasis.Scenario2b;
+
+/**
+ * WS-Security Test Case
+ * <p/>
+ * 
+ * @author Davanum Srinivas (dims@yahoo.com)
+ */
+public class TestScenario2b extends TestCase {
+    /**
+     * TestScenario1 constructor
+     * <p/>
+     * 
+     * @param name name of the test
+     */
+    public TestScenario2b(String name) {
+        super(name);
+    }
+
+    /**
+     * JUnit suite
+     * <p/>
+     * 
+     * @return a junit test suite
+     */
+    public static Test suite() {
+        return new TestSuite(TestScenario2b.class);
+    }
+
+    /**
+     * Main method
+     * <p/>
+     * 
+     * @param args command line args
+     */
+    public static void main(String[] args) throws Exception {
+        Scenario2b.main(args);
+    }
+
+    public void testScenario2b() throws Exception {
+        Scenario2b.main(new String[]{"-lhttp://localhost:8080/axis/services/Ping2b"});
+    }
+}

Propchange: webservices/wss4j/trunk/test/interop/TestScenario2b.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/wss4j/trunk/test/wssec/CustomCrypto.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/wss4j/trunk/test/wssec/TestBase64.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew10.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew11.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew11.java?rev=647260&r1=647259&r2=647260&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew11.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew11.java Fri Apr 11 11:40:21 2008
@@ -1,408 +1,408 @@
-/*
- * Copyright  2003-2004 The Apache Software Foundation.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package wssec;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.apache.axis.Message;
-import org.apache.axis.MessageContext;
-import org.apache.axis.client.AxisClient;
-import org.apache.axis.configuration.NullProvider;
-import org.apache.axis.message.SOAPEnvelope;
-import org.apache.axis.utils.XMLUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ws.security.SOAPConstants;
-import org.apache.ws.security.WSEncryptionPart;
-import org.apache.ws.security.WSConstants;
-import org.apache.ws.security.util.WSSecurityUtil;
-import org.apache.ws.security.WSSecurityEngine;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
-import org.apache.ws.security.message.WSSecSignature;
-import org.apache.ws.security.message.WSSecHeader;
-import org.w3c.dom.Document;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.util.Vector;
-
-/**
- * WS-Security Test Case
- * <p/>
- * 
- * @author Davanum Srinivas (dims@yahoo.com)
- */
-public class TestWSSecurityNew11 extends TestCase {
-    private static Log log = LogFactory.getLog(TestWSSecurityNew11.class);
-    static final String NS = "http://www.w3.org/2000/09/xmldsig#";
-    static final String soapMsg = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">" + "<SOAP-ENV:Body>" + "<add xmlns=\"http://ws.apache.org/counter/counter_port_type\">" + "<value xmlns=\"\">15</value>" + "</add>" + "</SOAP-ENV:Body>\r\n       \r\n" + "</SOAP-ENV:Envelope>";
-    static final WSSecurityEngine secEngine = new WSSecurityEngine();
-    static final Crypto crypto = CryptoFactory.getInstance("cryptoSKI.properties");
-
-    MessageContext msgContext;
-    SOAPEnvelope unsignedEnvelope;
-
-    /**
-     * TestWSSecurity constructor
-     * <p/>
-     * 
-     * @param name name of the test
-     */
-    public TestWSSecurityNew11(String name) {
-        super(name);
-    }
-
-    /**
-     * JUnit suite
-     * <p/>
-     * 
-     * @return a junit test suite
-     */
-    public static Test suite() {
-        return new TestSuite(TestWSSecurityNew11.class);
-    }
-
-    /**
-     * Main method
-     * <p/>
-     * 
-     * @param args command line args
-     */
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
-    }
-
-    /**
-     * Setup method
-     * <p/>
-     * 
-     * @throws java.lang.Exception Thrown when there is a problem in setup
-     */
-    protected void setUp() throws Exception {
-        AxisClient tmpEngine = new AxisClient(new NullProvider());
-        msgContext = new MessageContext(tmpEngine);
-        unsignedEnvelope = getSOAPEnvelope();
-    }
-
-    /**
-     * Constructs a soap envelope
-     * <p/>
-     * 
-     * @return soap envelope
-     * @throws java.lang.Exception if there is any problem constructing the soap envelope
-     */
-    protected SOAPEnvelope getSOAPEnvelope() throws Exception {
-        InputStream in = new ByteArrayInputStream(soapMsg.getBytes());
-        Message msg = new Message(in);
-        msg.setMessageContext(msgContext);
-        return msg.getSOAPEnvelope();
-    }
-
-    /**
-     * Test that signs and verifies a WS-Security envelope.
-     * This test uses the direct reference key identifier (certificate included
-     * as a BinarySecurityToken (BST) in the message). The test signs the message
-     * body (SOAP Body) and uses the STRTransform to sign the embedded certificate
-     * <p/>
-     * 
-     * @throws java.lang.Exception Thrown when there is any problem in signing or verification
-     */
-    public void testX509SignatureDirectSTR() throws Exception {
-        WSSecSignature builder = new WSSecSignature();
-        builder.setUserInfo("wss4jcert", "security");
-        // builder.setUserInfo("john", "keypass");
-        SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(unsignedEnvelope.getAsDOM());
-        Vector parts = new Vector();
-        
-        /*
-         * Set up to sign body and use STRTransorm to sign
-         * the signature token (e.g. X.509 certificate)
-         */
-        WSEncryptionPart encP =
-            new WSEncryptionPart(
-                soapConstants.getBodyQName().getLocalPart(),
-                soapConstants.getEnvelopeURI(),
-                "Content");
-        parts.add(encP);
-        encP =
-            new WSEncryptionPart(
-                "STRTransform",
-                soapConstants.getEnvelopeURI(),
-                "Content");
-        parts.add(encP);
-
-        builder.setParts(parts);
-        builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
-
-        log.info("Before Signing STR DirectReference....");
-        Document doc = unsignedEnvelope.getAsDocument();
-
-        WSSecHeader secHeader = new WSSecHeader();
-        secHeader.insertSecurityHeader(doc);
-
-        Document signedDoc = builder.build(doc, crypto, secHeader);
-
-        /*
-         * convert the resulting document into a message first. The toAxisMessage()
-         * mehtod performs the necessary c14n call to properly set up the signed
-         * document and convert it into a SOAP message. After that we extract it
-         * as a document again for further processing.
-         */
-
-        Message signedMsg = SOAPUtil.toAxisMessage(signedDoc);
-        if (log.isDebugEnabled()) {
-            log.debug("Signed message with STR DirectReference key identifier:");
-            XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
-        }
-        signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
-        log.info("After Signing STR DirectReference....");
-        verify(signedDoc);
-    }
-
-    /**
-     * Test that signs and verifies a WS-Security envelope.
-     * This test uses the IssuerSerialDirect reference key identifier (certificate included
-     * as a BinarySecurityToken (BST) in the message) but identified with IssuerSerialNumber
-     * and <b>not</b> with a Reference (relative URI). The test signs the message
-     * body (SOAP Body) and uses the STRTransform to sign the embedded certificate
-     * <p/>
-     * 
-     * @throws java.lang.Exception Thrown when there is any problem in signing or verification
-     */
-//    public void testX509SignatureISDirectSTR() throws Exception {
-//        SOAPEnvelope envelope = null;
-//        WSSignEnvelope builder = new WSSignEnvelope();
-//        builder.setUserInfo("wss4jcert", "security");
-//        // builder.setUserInfo("john", "keypass");
-//        SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(unsignedEnvelope);
-//        Vector parts = new Vector();
-//        
-//        /*
-//         * Set up to sign body and use STRTransorm to sign
-//         * the signature token (e.g. X.509 certificate)
-//         */
-//        WSEncryptionPart encP =
-//            new WSEncryptionPart(
-//                soapConstants.getBodyQName().getLocalPart(),    // define the body
-//                soapConstants.getEnvelopeURI(),
-//                "Content");
-//        parts.add(encP);
-//        encP =
-//            new WSEncryptionPart(
-//                "STRTransform",                // reserved word to use STRTransform
-//                soapConstants.getEnvelopeURI(),
-//                "Content");
-//        parts.add(encP);
-//
-//        builder.setParts(parts);
-//        builder.setKeyIdentifierType(WSConstants.ISSUER_SERIAL_DIRECT);
-//
-//        log.info("Before Signing STR ISDirect....");
-//        Document doc = unsignedEnvelope.getAsDocument();
-//        Document signedDoc = builder.build(doc, crypto);
-//
-//        Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
-//        if (log.isDebugEnabled()) {
-//            log.debug("Signed message with STR IssuerSerialDirect key identifier:");
-//            XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
-//        }
-//        signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
-//        log.info("After Signing STR ISDirect....");
-//        verify(signedDoc);
-//    }
-
-    /**
-     * Test that signs and verifies a WS-Security envelope.
-     * This test uses the IssuerSerial reference key identifier (certificate not included
-     * in the message)and reads the certificate from a keystore using IssuerSerialNumber
-     * to identify it.
-     * <p/>
-     * 
-     * @throws java.lang.Exception Thrown when there is any problem in signing or verification
-     */
-    
-
-    public void testX509SignatureISSTR() throws Exception {
-        SOAPEnvelope envelope = null;
-        WSSecSignature builder = new WSSecSignature();
-        builder.setUserInfo("wss4jcert", "security");
-        // builder.setUserInfo("john", "keypass");
-        SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(unsignedEnvelope.getAsDOM());
-        Vector parts = new Vector();
-        
-        /*
-         * Set up to sign body and use STRTransorm to sign
-         * the signature token (e.g. X.509 certificate)
-         */
-        WSEncryptionPart encP =
-            new WSEncryptionPart(
-                soapConstants.getBodyQName().getLocalPart(),    // define the body
-                soapConstants.getEnvelopeURI(),
-                "Content");
-        parts.add(encP);
-        encP =
-            new WSEncryptionPart(
-                "STRTransform",                // reserved word to use STRTransform
-                soapConstants.getEnvelopeURI(),
-                "Content");
-        parts.add(encP);
-
-        builder.setParts(parts);
-        builder.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
-
-        log.info("Before Signing STR IS....");
-        Document doc = unsignedEnvelope.getAsDocument();
-        
-        WSSecHeader secHeader = new WSSecHeader();
-        secHeader.insertSecurityHeader(doc);
-
-        Document signedDoc = builder.build(doc, crypto, secHeader);
-
-        Message signedMsg = (Message) SOAPUtil.toAxisMessage(signedDoc);
-        if (log.isDebugEnabled()) {
-            log.debug("Signed message with STR IssuerSerial key identifier:");
-            XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
-        }
-        signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
-        log.info("After Signing STR IS....");
-        verify(signedDoc);
-    }
-    
-    /**
-     * Test that signs and verifies a WS-Security envelope.
-     * This test uses the SubjectKeyIdentifier key identifier (certificate not included
-     * in the message) and reads the certificate from a keystore using SKI
-     * to identify it.
-     * <p/>
-     * 
-     * @throws java.lang.Exception Thrown when there is any problem in signing or verification
-     */
-    
-
-    public void testX509SignatureSKISTR() throws Exception {
-        SOAPEnvelope envelope = null;
-        WSSecSignature builder = new WSSecSignature();
-        builder.setUserInfo("wss4jcert", "security");
-        // builder.setUserInfo("john", "keypass");
-        SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(unsignedEnvelope.getAsDOM());
-        Vector parts = new Vector();
-        
-        /*
-         * Set up to sign body and use STRTransorm to sign
-         * the signature token (e.g. X.509 certificate)
-         */
-        WSEncryptionPart encP =
-            new WSEncryptionPart(
-                soapConstants.getBodyQName().getLocalPart(),    // define the body
-                soapConstants.getEnvelopeURI(),
-                "Content");
-        parts.add(encP);
-        encP =
-            new WSEncryptionPart(
-                "STRTransform",                // reserved word to use STRTransform
-                soapConstants.getEnvelopeURI(),
-                "Content");
-        parts.add(encP);
-
-        builder.setParts(parts);
-        builder.setKeyIdentifierType(WSConstants.SKI_KEY_IDENTIFIER);
-
-        log.info("Before Signing STR SKI....");
-        Document doc = unsignedEnvelope.getAsDocument();
-        
-        WSSecHeader secHeader = new WSSecHeader();
-        secHeader.insertSecurityHeader(doc);
-
-        Document signedDoc = builder.build(doc, crypto, secHeader);
-
-        Message signedMsg = (Message) SOAPUtil.toAxisMessage(signedDoc);
-        if (log.isDebugEnabled()) {
-            log.debug("Signed message with STR SKI key identifier:");
-            XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
-        }
-        signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
-        log.info("After Signing STR SKI....");
-        verify(signedDoc);
-    }
-
-    /**
-     * Test that signs and verifies a WS-Security envelope.
-     * This test uses the SubjectKeyIdentifierDirect key identifier (certificate included
-     * in the message).
-     * <p/>
-     * 
-     * @throws java.lang.Exception Thrown when there is any problem in signing or verification
-     */
-    
-
-//    public void testX509SignatureSKIDirectSTR() throws Exception {
-//        SOAPEnvelope envelope = null;
-//        WSSignEnvelope builder = new WSSignEnvelope();
-//        builder.setUserInfo("wss4jcert", "security");
-//        // builder.setUserInfo("john", "keypass");
-//        SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(unsignedEnvelope);
-//        Vector parts = new Vector();
-//        
-//        /*
-//         * Set up to sign body and use STRTransorm to sign
-//         * the signature token (e.g. X.509 certificate)
-//         */
-//        WSEncryptionPart encP =
-//            new WSEncryptionPart(
-//                soapConstants.getBodyQName().getLocalPart(),    // define the body
-//                soapConstants.getEnvelopeURI(),
-//                "Content");
-//        parts.add(encP);
-//        encP =
-//            new WSEncryptionPart(
-//                "STRTransform",                // reserved word to use STRTransform
-//                soapConstants.getEnvelopeURI(),
-//                "Content");
-//        parts.add(encP);
-//
-//        builder.setParts(parts);
-//        builder.setKeyIdentifierType(WSConstants.SKI_KEY_IDENTIFIER_DIRECT);
-//
-//        log.info("Before Signing STR SKIDirect....");
-//        Document doc = unsignedEnvelope.getAsDocument();
-//        Document signedDoc = builder.build(doc, crypto);
-//
-//        Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
-//        if (log.isDebugEnabled()) {
-//            log.debug("Signed message with STR SKIDirect key identifier:");
-//            XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
-//        }
-//        signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
-//        log.info("After Signing STR SKIDirect....");
-//        verify(signedDoc);
-//    }
-
-
-    /**
-     * Verifies the soap envelope
-     * 
-     * @param env soap envelope
-     * @throws java.lang.Exception Thrown when there is a problem in verification
-     */
-    private void verify(Document doc) throws Exception {
-        secEngine.processSecurityHeader(doc, null, null, crypto);
-    }
-}
+/*
+ * Copyright  2003-2004 The Apache Software Foundation.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package wssec;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import org.apache.axis.Message;
+import org.apache.axis.MessageContext;
+import org.apache.axis.client.AxisClient;
+import org.apache.axis.configuration.NullProvider;
+import org.apache.axis.message.SOAPEnvelope;
+import org.apache.axis.utils.XMLUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ws.security.SOAPConstants;
+import org.apache.ws.security.WSEncryptionPart;
+import org.apache.ws.security.WSConstants;
+import org.apache.ws.security.util.WSSecurityUtil;
+import org.apache.ws.security.WSSecurityEngine;
+import org.apache.ws.security.components.crypto.Crypto;
+import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.message.WSSecSignature;
+import org.apache.ws.security.message.WSSecHeader;
+import org.w3c.dom.Document;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.util.Vector;
+
+/**
+ * WS-Security Test Case
+ * <p/>
+ * 
+ * @author Davanum Srinivas (dims@yahoo.com)
+ */
+public class TestWSSecurityNew11 extends TestCase {
+    private static Log log = LogFactory.getLog(TestWSSecurityNew11.class);
+    static final String NS = "http://www.w3.org/2000/09/xmldsig#";
+    static final String soapMsg = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">" + "<SOAP-ENV:Body>" + "<add xmlns=\"http://ws.apache.org/counter/counter_port_type\">" + "<value xmlns=\"\">15</value>" + "</add>" + "</SOAP-ENV:Body>\r\n       \r\n" + "</SOAP-ENV:Envelope>";
+    static final WSSecurityEngine secEngine = new WSSecurityEngine();
+    static final Crypto crypto = CryptoFactory.getInstance("cryptoSKI.properties");
+
+    MessageContext msgContext;
+    SOAPEnvelope unsignedEnvelope;
+
+    /**
+     * TestWSSecurity constructor
+     * <p/>
+     * 
+     * @param name name of the test
+     */
+    public TestWSSecurityNew11(String name) {
+        super(name);
+    }
+
+    /**
+     * JUnit suite
+     * <p/>
+     * 
+     * @return a junit test suite
+     */
+    public static Test suite() {
+        return new TestSuite(TestWSSecurityNew11.class);
+    }
+
+    /**
+     * Main method
+     * <p/>
+     * 
+     * @param args command line args
+     */
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(suite());
+    }
+
+    /**
+     * Setup method
+     * <p/>
+     * 
+     * @throws java.lang.Exception Thrown when there is a problem in setup
+     */
+    protected void setUp() throws Exception {
+        AxisClient tmpEngine = new AxisClient(new NullProvider());
+        msgContext = new MessageContext(tmpEngine);
+        unsignedEnvelope = getSOAPEnvelope();
+    }
+
+    /**
+     * Constructs a soap envelope
+     * <p/>
+     * 
+     * @return soap envelope
+     * @throws java.lang.Exception if there is any problem constructing the soap envelope
+     */
+    protected SOAPEnvelope getSOAPEnvelope() throws Exception {
+        InputStream in = new ByteArrayInputStream(soapMsg.getBytes());
+        Message msg = new Message(in);
+        msg.setMessageContext(msgContext);
+        return msg.getSOAPEnvelope();
+    }
+
+    /**
+     * Test that signs and verifies a WS-Security envelope.
+     * This test uses the direct reference key identifier (certificate included
+     * as a BinarySecurityToken (BST) in the message). The test signs the message
+     * body (SOAP Body) and uses the STRTransform to sign the embedded certificate
+     * <p/>
+     * 
+     * @throws java.lang.Exception Thrown when there is any problem in signing or verification
+     */
+    public void testX509SignatureDirectSTR() throws Exception {
+        WSSecSignature builder = new WSSecSignature();
+        builder.setUserInfo("wss4jcert", "security");
+        // builder.setUserInfo("john", "keypass");
+        SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(unsignedEnvelope.getAsDOM());
+        Vector parts = new Vector();
+        
+        /*
+         * Set up to sign body and use STRTransorm to sign
+         * the signature token (e.g. X.509 certificate)
+         */
+        WSEncryptionPart encP =
+            new WSEncryptionPart(
+                soapConstants.getBodyQName().getLocalPart(),
+                soapConstants.getEnvelopeURI(),
+                "Content");
+        parts.add(encP);
+        encP =
+            new WSEncryptionPart(
+                "STRTransform",
+                soapConstants.getEnvelopeURI(),
+                "Content");
+        parts.add(encP);
+
+        builder.setParts(parts);
+        builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
+
+        log.info("Before Signing STR DirectReference....");
+        Document doc = unsignedEnvelope.getAsDocument();
+
+        WSSecHeader secHeader = new WSSecHeader();
+        secHeader.insertSecurityHeader(doc);
+
+        Document signedDoc = builder.build(doc, crypto, secHeader);
+
+        /*
+         * convert the resulting document into a message first. The toAxisMessage()
+         * mehtod performs the necessary c14n call to properly set up the signed
+         * document and convert it into a SOAP message. After that we extract it
+         * as a document again for further processing.
+         */
+
+        Message signedMsg = SOAPUtil.toAxisMessage(signedDoc);
+        if (log.isDebugEnabled()) {
+            log.debug("Signed message with STR DirectReference key identifier:");
+            XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
+        }
+        signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
+        log.info("After Signing STR DirectReference....");
+        verify(signedDoc);
+    }
+
+    /**
+     * Test that signs and verifies a WS-Security envelope.
+     * This test uses the IssuerSerialDirect reference key identifier (certificate included
+     * as a BinarySecurityToken (BST) in the message) but identified with IssuerSerialNumber
+     * and <b>not</b> with a Reference (relative URI). The test signs the message
+     * body (SOAP Body) and uses the STRTransform to sign the embedded certificate
+     * <p/>
+     * 
+     * @throws java.lang.Exception Thrown when there is any problem in signing or verification
+     */
+//    public void testX509SignatureISDirectSTR() throws Exception {
+//        SOAPEnvelope envelope = null;
+//        WSSignEnvelope builder = new WSSignEnvelope();
+//        builder.setUserInfo("wss4jcert", "security");
+//        // builder.setUserInfo("john", "keypass");
+//        SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(unsignedEnvelope);
+//        Vector parts = new Vector();
+//        
+//        /*
+//         * Set up to sign body and use STRTransorm to sign
+//         * the signature token (e.g. X.509 certificate)
+//         */
+//        WSEncryptionPart encP =
+//            new WSEncryptionPart(
+//                soapConstants.getBodyQName().getLocalPart(),    // define the body
+//                soapConstants.getEnvelopeURI(),
+//                "Content");
+//        parts.add(encP);
+//        encP =
+//            new WSEncryptionPart(
+//                "STRTransform",                // reserved word to use STRTransform
+//                soapConstants.getEnvelopeURI(),
+//                "Content");
+//        parts.add(encP);
+//
+//        builder.setParts(parts);
+//        builder.setKeyIdentifierType(WSConstants.ISSUER_SERIAL_DIRECT);
+//
+//        log.info("Before Signing STR ISDirect....");
+//        Document doc = unsignedEnvelope.getAsDocument();
+//        Document signedDoc = builder.build(doc, crypto);
+//
+//        Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
+//        if (log.isDebugEnabled()) {
+//            log.debug("Signed message with STR IssuerSerialDirect key identifier:");
+//            XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
+//        }
+//        signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
+//        log.info("After Signing STR ISDirect....");
+//        verify(signedDoc);
+//    }
+
+    /**
+     * Test that signs and verifies a WS-Security envelope.
+     * This test uses the IssuerSerial reference key identifier (certificate not included
+     * in the message)and reads the certificate from a keystore using IssuerSerialNumber
+     * to identify it.
+     * <p/>
+     * 
+     * @throws java.lang.Exception Thrown when there is any problem in signing or verification
+     */
+    
+
+    public void testX509SignatureISSTR() throws Exception {
+        SOAPEnvelope envelope = null;
+        WSSecSignature builder = new WSSecSignature();
+        builder.setUserInfo("wss4jcert", "security");
+        // builder.setUserInfo("john", "keypass");
+        SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(unsignedEnvelope.getAsDOM());
+        Vector parts = new Vector();
+        
+        /*
+         * Set up to sign body and use STRTransorm to sign
+         * the signature token (e.g. X.509 certificate)
+         */
+        WSEncryptionPart encP =
+            new WSEncryptionPart(
+                soapConstants.getBodyQName().getLocalPart(),    // define the body
+                soapConstants.getEnvelopeURI(),
+                "Content");
+        parts.add(encP);
+        encP =
+            new WSEncryptionPart(
+                "STRTransform",                // reserved word to use STRTransform
+                soapConstants.getEnvelopeURI(),
+                "Content");
+        parts.add(encP);
+
+        builder.setParts(parts);
+        builder.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
+
+        log.info("Before Signing STR IS....");
+        Document doc = unsignedEnvelope.getAsDocument();
+        
+        WSSecHeader secHeader = new WSSecHeader();
+        secHeader.insertSecurityHeader(doc);
+
+        Document signedDoc = builder.build(doc, crypto, secHeader);
+
+        Message signedMsg = (Message) SOAPUtil.toAxisMessage(signedDoc);
+        if (log.isDebugEnabled()) {
+            log.debug("Signed message with STR IssuerSerial key identifier:");
+            XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
+        }
+        signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
+        log.info("After Signing STR IS....");
+        verify(signedDoc);
+    }
+    
+    /**
+     * Test that signs and verifies a WS-Security envelope.
+     * This test uses the SubjectKeyIdentifier key identifier (certificate not included
+     * in the message) and reads the certificate from a keystore using SKI
+     * to identify it.
+     * <p/>
+     * 
+     * @throws java.lang.Exception Thrown when there is any problem in signing or verification
+     */
+    
+
+    public void testX509SignatureSKISTR() throws Exception {
+        SOAPEnvelope envelope = null;
+        WSSecSignature builder = new WSSecSignature();
+        builder.setUserInfo("wss4jcert", "security");
+        // builder.setUserInfo("john", "keypass");
+        SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(unsignedEnvelope.getAsDOM());
+        Vector parts = new Vector();
+        
+        /*
+         * Set up to sign body and use STRTransorm to sign
+         * the signature token (e.g. X.509 certificate)
+         */
+        WSEncryptionPart encP =
+            new WSEncryptionPart(
+                soapConstants.getBodyQName().getLocalPart(),    // define the body
+                soapConstants.getEnvelopeURI(),
+                "Content");
+        parts.add(encP);
+        encP =
+            new WSEncryptionPart(
+                "STRTransform",                // reserved word to use STRTransform
+                soapConstants.getEnvelopeURI(),
+                "Content");
+        parts.add(encP);
+
+        builder.setParts(parts);
+        builder.setKeyIdentifierType(WSConstants.SKI_KEY_IDENTIFIER);
+
+        log.info("Before Signing STR SKI....");
+        Document doc = unsignedEnvelope.getAsDocument();
+        
+        WSSecHeader secHeader = new WSSecHeader();
+        secHeader.insertSecurityHeader(doc);
+
+        Document signedDoc = builder.build(doc, crypto, secHeader);
+
+        Message signedMsg = (Message) SOAPUtil.toAxisMessage(signedDoc);
+        if (log.isDebugEnabled()) {
+            log.debug("Signed message with STR SKI key identifier:");
+            XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
+        }
+        signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
+        log.info("After Signing STR SKI....");
+        verify(signedDoc);
+    }
+
+    /**
+     * Test that signs and verifies a WS-Security envelope.
+     * This test uses the SubjectKeyIdentifierDirect key identifier (certificate included
+     * in the message).
+     * <p/>
+     * 
+     * @throws java.lang.Exception Thrown when there is any problem in signing or verification
+     */
+    
+
+//    public void testX509SignatureSKIDirectSTR() throws Exception {
+//        SOAPEnvelope envelope = null;
+//        WSSignEnvelope builder = new WSSignEnvelope();
+//        builder.setUserInfo("wss4jcert", "security");
+//        // builder.setUserInfo("john", "keypass");
+//        SOAPConstants soapConstants = WSSecurityUtil.getSOAPConstants(unsignedEnvelope);
+//        Vector parts = new Vector();
+//        
+//        /*
+//         * Set up to sign body and use STRTransorm to sign
+//         * the signature token (e.g. X.509 certificate)
+//         */
+//        WSEncryptionPart encP =
+//            new WSEncryptionPart(
+//                soapConstants.getBodyQName().getLocalPart(),    // define the body
+//                soapConstants.getEnvelopeURI(),
+//                "Content");
+//        parts.add(encP);
+//        encP =
+//            new WSEncryptionPart(
+//                "STRTransform",                // reserved word to use STRTransform
+//                soapConstants.getEnvelopeURI(),
+//                "Content");
+//        parts.add(encP);
+//
+//        builder.setParts(parts);
+//        builder.setKeyIdentifierType(WSConstants.SKI_KEY_IDENTIFIER_DIRECT);
+//
+//        log.info("Before Signing STR SKIDirect....");
+//        Document doc = unsignedEnvelope.getAsDocument();
+//        Document signedDoc = builder.build(doc, crypto);
+//
+//        Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
+//        if (log.isDebugEnabled()) {
+//            log.debug("Signed message with STR SKIDirect key identifier:");
+//            XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
+//        }
+//        signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
+//        log.info("After Signing STR SKIDirect....");
+//        verify(signedDoc);
+//    }
+
+
+    /**
+     * Verifies the soap envelope
+     * 
+     * @param env soap envelope
+     * @throws java.lang.Exception Thrown when there is a problem in verification
+     */
+    private void verify(Document doc) throws Exception {
+        secEngine.processSecurityHeader(doc, null, null, crypto);
+    }
+}

Propchange: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew11.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew12.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew12.java?rev=647260&r1=647259&r2=647260&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew12.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew12.java Fri Apr 11 11:40:21 2008
@@ -1,250 +1,250 @@
-/*
- * Copyright  2003-2004 The Apache Software Foundation.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-package wssec;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.apache.axis.Message;
-import org.apache.axis.MessageContext;
-import org.apache.axis.utils.XMLUtils;
-import org.apache.axis.client.AxisClient;
-import org.apache.axis.configuration.NullProvider;
-import org.apache.axis.message.SOAPEnvelope;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ws.security.WSSecurityEngine;
-import org.apache.ws.security.WSConstants;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
-import org.apache.ws.security.message.WSSecSignature;
-import org.apache.ws.security.message.WSSecHeader;
-import org.w3c.dom.Document;
-
-import org.apache.xml.security.signature.XMLSignature;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.PrintWriter;
-
-
-/**
- * WS-Security Test Case
- * <p/>
- * 
- * @author Davanum Srinivas (dims@yahoo.com)
- * @author Werner Dittmann (Werner.Dittmann@siemens.com)
- */
-public class TestWSSecurityNew12 extends TestCase {
-    private static Log log = LogFactory.getLog(TestWSSecurityNew12.class);
-    static final String NS = "http://www.w3.org/2000/09/xmldsig#";
-    static final String soapMsg = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">" + "<SOAP-ENV:Body>" + "<add xmlns=\"http://ws.apache.org/counter/counter_port_type\">" + "<value xmlns=\"\">15</value>" + "</add>" + "</SOAP-ENV:Body>\r\n       \r\n" + "</SOAP-ENV:Envelope>";
-    static final WSSecurityEngine secEngine = new WSSecurityEngine();
-    static final Crypto crypto = CryptoFactory.getInstance("cryptoSKI.properties");
-
-    MessageContext msgContext;
-    SOAPEnvelope unsignedEnvelope;
-
-    /**
-     * TestWSSecurity constructor
-     * <p/>
-     * 
-     * @param name name of the test
-     */
-    public TestWSSecurityNew12(String name) {
-        super(name);
-    }
-
-    /**
-     * JUnit suite
-     * <p/>
-     * 
-     * @return a junit test suite
-     */
-    public static Test suite() {
-        return new TestSuite(TestWSSecurityNew12.class);
-    }
-
-    /**
-     * Main method
-     * <p/>
-     * 
-     * @param args command line args
-     */
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
-    }
-
-    /**
-     * Setup method
-     * <p/>
-     * 
-     * @throws java.lang.Exception Thrown when there is a problem in setup
-     */
-    protected void setUp() throws Exception {
-        AxisClient tmpEngine = new AxisClient(new NullProvider());
-        msgContext = new MessageContext(tmpEngine);
-        unsignedEnvelope = getSOAPEnvelope();
-    }
-
-    /**
-     * Constructs a soap envelope
-     * <p/>
-     * 
-     * @return soap envelope
-     * @throws java.lang.Exception if there is any problem constructing the soap envelope
-     */
-    protected SOAPEnvelope getSOAPEnvelope() throws Exception {
-        InputStream in = new ByteArrayInputStream(soapMsg.getBytes());
-        Message msg = new Message(in);
-        msg.setMessageContext(msgContext);
-        return msg.getSOAPEnvelope();
-    }
-
-    /**
-     * Test that signs and verifies a WS-Security envelope using SubjectKeyIdentifier.
-     * This test uses the SubjectKeyIdentifier to identify the certificate. It
-     * uses the Direct version, that is it embedds the certificate in the message.
-     * <p/>
-     * 
-     * @throws java.lang.Exception Thrown when there is any problem in signing or verification
-     */
-    public void testX509SignatureDSA_SKI() throws Exception {
-        WSSecSignature builder = new WSSecSignature();
-        builder.setUserInfo("wss4jcertDSA", "security");
-        builder.setKeyIdentifierType(WSConstants.SKI_KEY_IDENTIFIER);
-        builder.setSignatureAlgorithm(XMLSignature.ALGO_ID_SIGNATURE_DSA);
-        
-        // builder.setUserInfo("john", "keypass");
-        log.info("Before SigningDSA_SKIDirect....");
-        Document doc = unsignedEnvelope.getAsDocument();
-        
-        WSSecHeader secHeader = new WSSecHeader();
-        secHeader.insertSecurityHeader(doc);
-
-        Document signedDoc = builder.build(doc, crypto, secHeader);
-
-        /*
-         * convert the resulting document into a message first. The toAxisMessage()
-         * mehtod performs the necessary c14n call to properly set up the signed
-         * document and convert it into a SOAP message. After that we extract it
-         * as a document again for further processing.
-         */
-
-        Message signedMsg = SOAPUtil.toAxisMessage(signedDoc);
-        if (log.isDebugEnabled()) {
-            log.debug("Signed message with DSA_SKI key identifier:");
-            XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
-        }
-
-        signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
-        log.info("After SigningDSA_SKIDirect....");
-        verify(signedDoc);
-    }
-
-    /**
-     * Test that signs and verifies a WS-Security envelope using SubjectKeyIdentifier.
-     * This test uses the SubjectKeyIdentifier to identify the certificate. 
-     * It gets a certificate with a DSA public key algo to sign, WSSignEnvelope shall
-     * detect the algo and set the signature algo accordingly.
-     * <p/>
-     * 
-     * @throws java.lang.Exception Thrown when there is any problem in signing or verification
-     */
-    public void testX509SignatureDSA_Autodetect() throws Exception {
-        WSSecSignature builder = new WSSecSignature();
-        builder.setUserInfo("wss4jcertDSA", "security");
-        builder.setKeyIdentifierType(WSConstants.SKI_KEY_IDENTIFIER);
-        
-        // builder.setUserInfo("john", "keypass");
-        log.info("Before SigningDSA_Autodetect....");
-        Document doc = unsignedEnvelope.getAsDocument();
-        
-        WSSecHeader secHeader = new WSSecHeader();
-        secHeader.insertSecurityHeader(doc);
-
-        Document signedDoc = builder.build(doc, crypto, secHeader);
-
-        /*
-         * convert the resulting document into a message first. The toAxisMessage()
-         * mehtod performs the necessary c14n call to properly set up the signed
-         * document and convert it into a SOAP message. After that we extract it
-         * as a document again for further processing.
-         */
-
-        Message signedMsg = SOAPUtil.toAxisMessage(signedDoc);
-        if (log.isDebugEnabled()) {
-            log.debug("Signed message with DSA_Autodetect:");
-            XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
-        }
-
-        signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
-        log.info("After SigningDSA_Autodetect....");
-        verify(signedDoc);
-    }
-
-    /**
-     * Test that signs and verifies a WS-Security envelope using SubjectKeyIdentifier.
-     * This test uses the SubjectKeyIdentifier to identify the certificate. 
-     * It gets a certificate with a RSA public key algo to sign, WSSignEnvelope shall
-     * detect the algo and set the signature algo accordingly.
-     * <p/>
-     * 
-     * @throws java.lang.Exception Thrown when there is any problem in signing or verification
-     */
-    public void testX509SignatureRSA_Autodetect() throws Exception {
-        WSSecSignature builder = new WSSecSignature();
-        builder.setUserInfo("wss4jcert", "security");
-        builder.setKeyIdentifierType(WSConstants.SKI_KEY_IDENTIFIER);
-        
-        // builder.setUserInfo("john", "keypass");
-        log.info("Before SigningRSA_Autodetect....");
-        Document doc = unsignedEnvelope.getAsDocument();
-        
-        WSSecHeader secHeader = new WSSecHeader();
-        secHeader.insertSecurityHeader(doc);
-
-        Document signedDoc = builder.build(doc, crypto, secHeader);
-
-        /*
-         * convert the resulting document into a message first. The toAxisMessage()
-         * mehtod performs the necessary c14n call to properly set up the signed
-         * document and convert it into a SOAP message. After that we extract it
-         * as a document again for further processing.
-         */
-
-        Message signedMsg = SOAPUtil.toAxisMessage(signedDoc);
-        if (log.isDebugEnabled()) {
-            log.debug("Signed message with RSA Autodetect:");
-            XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
-        }
-
-        signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
-        log.info("After SigningRSA_Autodetect....");
-        verify(signedDoc);
-    }
-    
-    /**
-     * Verifies the soap envelope
-     * 
-     * @param env soap envelope
-     * @throws java.lang.Exception Thrown when there is a problem in verification
-     */
-    private void verify(Document doc) throws Exception {
-        secEngine.processSecurityHeader(doc, null, null, crypto);
-    }
-}
+/*
+ * Copyright  2003-2004 The Apache Software Foundation.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+package wssec;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import org.apache.axis.Message;
+import org.apache.axis.MessageContext;
+import org.apache.axis.utils.XMLUtils;
+import org.apache.axis.client.AxisClient;
+import org.apache.axis.configuration.NullProvider;
+import org.apache.axis.message.SOAPEnvelope;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ws.security.WSSecurityEngine;
+import org.apache.ws.security.WSConstants;
+import org.apache.ws.security.components.crypto.Crypto;
+import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.message.WSSecSignature;
+import org.apache.ws.security.message.WSSecHeader;
+import org.w3c.dom.Document;
+
+import org.apache.xml.security.signature.XMLSignature;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.PrintWriter;
+
+
+/**
+ * WS-Security Test Case
+ * <p/>
+ * 
+ * @author Davanum Srinivas (dims@yahoo.com)
+ * @author Werner Dittmann (Werner.Dittmann@siemens.com)
+ */
+public class TestWSSecurityNew12 extends TestCase {
+    private static Log log = LogFactory.getLog(TestWSSecurityNew12.class);
+    static final String NS = "http://www.w3.org/2000/09/xmldsig#";
+    static final String soapMsg = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">" + "<SOAP-ENV:Body>" + "<add xmlns=\"http://ws.apache.org/counter/counter_port_type\">" + "<value xmlns=\"\">15</value>" + "</add>" + "</SOAP-ENV:Body>\r\n       \r\n" + "</SOAP-ENV:Envelope>";
+    static final WSSecurityEngine secEngine = new WSSecurityEngine();
+    static final Crypto crypto = CryptoFactory.getInstance("cryptoSKI.properties");
+
+    MessageContext msgContext;
+    SOAPEnvelope unsignedEnvelope;
+
+    /**
+     * TestWSSecurity constructor
+     * <p/>
+     * 
+     * @param name name of the test
+     */
+    public TestWSSecurityNew12(String name) {
+        super(name);
+    }
+
+    /**
+     * JUnit suite
+     * <p/>
+     * 
+     * @return a junit test suite
+     */
+    public static Test suite() {
+        return new TestSuite(TestWSSecurityNew12.class);
+    }
+
+    /**
+     * Main method
+     * <p/>
+     * 
+     * @param args command line args
+     */
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(suite());
+    }
+
+    /**
+     * Setup method
+     * <p/>
+     * 
+     * @throws java.lang.Exception Thrown when there is a problem in setup
+     */
+    protected void setUp() throws Exception {
+        AxisClient tmpEngine = new AxisClient(new NullProvider());
+        msgContext = new MessageContext(tmpEngine);
+        unsignedEnvelope = getSOAPEnvelope();
+    }
+
+    /**
+     * Constructs a soap envelope
+     * <p/>
+     * 
+     * @return soap envelope
+     * @throws java.lang.Exception if there is any problem constructing the soap envelope
+     */
+    protected SOAPEnvelope getSOAPEnvelope() throws Exception {
+        InputStream in = new ByteArrayInputStream(soapMsg.getBytes());
+        Message msg = new Message(in);
+        msg.setMessageContext(msgContext);
+        return msg.getSOAPEnvelope();
+    }
+
+    /**
+     * Test that signs and verifies a WS-Security envelope using SubjectKeyIdentifier.
+     * This test uses the SubjectKeyIdentifier to identify the certificate. It
+     * uses the Direct version, that is it embedds the certificate in the message.
+     * <p/>
+     * 
+     * @throws java.lang.Exception Thrown when there is any problem in signing or verification
+     */
+    public void testX509SignatureDSA_SKI() throws Exception {
+        WSSecSignature builder = new WSSecSignature();
+        builder.setUserInfo("wss4jcertDSA", "security");
+        builder.setKeyIdentifierType(WSConstants.SKI_KEY_IDENTIFIER);
+        builder.setSignatureAlgorithm(XMLSignature.ALGO_ID_SIGNATURE_DSA);
+        
+        // builder.setUserInfo("john", "keypass");
+        log.info("Before SigningDSA_SKIDirect....");
+        Document doc = unsignedEnvelope.getAsDocument();
+        
+        WSSecHeader secHeader = new WSSecHeader();
+        secHeader.insertSecurityHeader(doc);
+
+        Document signedDoc = builder.build(doc, crypto, secHeader);
+
+        /*
+         * convert the resulting document into a message first. The toAxisMessage()
+         * mehtod performs the necessary c14n call to properly set up the signed
+         * document and convert it into a SOAP message. After that we extract it
+         * as a document again for further processing.
+         */
+
+        Message signedMsg = SOAPUtil.toAxisMessage(signedDoc);
+        if (log.isDebugEnabled()) {
+            log.debug("Signed message with DSA_SKI key identifier:");
+            XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
+        }
+
+        signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
+        log.info("After SigningDSA_SKIDirect....");
+        verify(signedDoc);
+    }
+
+    /**
+     * Test that signs and verifies a WS-Security envelope using SubjectKeyIdentifier.
+     * This test uses the SubjectKeyIdentifier to identify the certificate. 
+     * It gets a certificate with a DSA public key algo to sign, WSSignEnvelope shall
+     * detect the algo and set the signature algo accordingly.
+     * <p/>
+     * 
+     * @throws java.lang.Exception Thrown when there is any problem in signing or verification
+     */
+    public void testX509SignatureDSA_Autodetect() throws Exception {
+        WSSecSignature builder = new WSSecSignature();
+        builder.setUserInfo("wss4jcertDSA", "security");
+        builder.setKeyIdentifierType(WSConstants.SKI_KEY_IDENTIFIER);
+        
+        // builder.setUserInfo("john", "keypass");
+        log.info("Before SigningDSA_Autodetect....");
+        Document doc = unsignedEnvelope.getAsDocument();
+        
+        WSSecHeader secHeader = new WSSecHeader();
+        secHeader.insertSecurityHeader(doc);
+
+        Document signedDoc = builder.build(doc, crypto, secHeader);
+
+        /*
+         * convert the resulting document into a message first. The toAxisMessage()
+         * mehtod performs the necessary c14n call to properly set up the signed
+         * document and convert it into a SOAP message. After that we extract it
+         * as a document again for further processing.
+         */
+
+        Message signedMsg = SOAPUtil.toAxisMessage(signedDoc);
+        if (log.isDebugEnabled()) {
+            log.debug("Signed message with DSA_Autodetect:");
+            XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
+        }
+
+        signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
+        log.info("After SigningDSA_Autodetect....");
+        verify(signedDoc);
+    }
+
+    /**
+     * Test that signs and verifies a WS-Security envelope using SubjectKeyIdentifier.
+     * This test uses the SubjectKeyIdentifier to identify the certificate. 
+     * It gets a certificate with a RSA public key algo to sign, WSSignEnvelope shall
+     * detect the algo and set the signature algo accordingly.
+     * <p/>
+     * 
+     * @throws java.lang.Exception Thrown when there is any problem in signing or verification
+     */
+    public void testX509SignatureRSA_Autodetect() throws Exception {
+        WSSecSignature builder = new WSSecSignature();
+        builder.setUserInfo("wss4jcert", "security");
+        builder.setKeyIdentifierType(WSConstants.SKI_KEY_IDENTIFIER);
+        
+        // builder.setUserInfo("john", "keypass");
+        log.info("Before SigningRSA_Autodetect....");
+        Document doc = unsignedEnvelope.getAsDocument();
+        
+        WSSecHeader secHeader = new WSSecHeader();
+        secHeader.insertSecurityHeader(doc);
+
+        Document signedDoc = builder.build(doc, crypto, secHeader);
+
+        /*
+         * convert the resulting document into a message first. The toAxisMessage()
+         * mehtod performs the necessary c14n call to properly set up the signed
+         * document and convert it into a SOAP message. After that we extract it
+         * as a document again for further processing.
+         */
+
+        Message signedMsg = SOAPUtil.toAxisMessage(signedDoc);
+        if (log.isDebugEnabled()) {
+            log.debug("Signed message with RSA Autodetect:");
+            XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
+        }
+
+        signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
+        log.info("After SigningRSA_Autodetect....");
+        verify(signedDoc);
+    }
+    
+    /**
+     * Verifies the soap envelope
+     * 
+     * @param env soap envelope
+     * @throws java.lang.Exception Thrown when there is a problem in verification
+     */
+    private void verify(Document doc) throws Exception {
+        secEngine.processSecurityHeader(doc, null, null, crypto);
+    }
+}

Propchange: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew12.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew13.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/wssec/TestWSSecurityNew13.java?rev=647260&r1=647259&r2=647260&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/wssec/TestWSSecurityNew13.java (original)
+++ webservices/wss4j/trunk/test/wssec/TestWSSecurityNew13.java Fri Apr 11 11:40:21 2008
@@ -1,228 +1,228 @@
-/*
- * Copyright  2003-2004 The Apache Software Foundation.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package wssec;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.apache.axis.Message;
-import org.apache.axis.MessageContext;
-import org.apache.axis.utils.XMLUtils;
-import org.apache.axis.client.AxisClient;
-import org.apache.axis.configuration.NullProvider;
-import org.apache.axis.message.SOAPEnvelope;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ws.security.WSPasswordCallback;
-import org.apache.ws.security.WSSecurityEngine;
-import org.apache.ws.security.WSConstants;
-import org.apache.ws.security.message.WSSecUsernameToken;
-import org.apache.ws.security.message.WSSecSignature;
-import org.apache.ws.security.message.WSSecHeader;
-
-import org.apache.xml.security.signature.XMLSignature;
-
-import org.w3c.dom.Document;
-
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-
-
-/**
- * WS-Security Test Case
- * <p/>
- * 
- * @author Werner Dittmann (Wern.erDittmann@siemens.com)
- */
-public class TestWSSecurityNew13 extends TestCase implements CallbackHandler {
-    private static Log log = LogFactory.getLog(TestWSSecurityNew13.class);
-    static final String NS = "http://www.w3.org/2000/09/xmldsig#";
-    static final String soapMsg = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">" + "<SOAP-ENV:Body>" + "<add xmlns=\"http://ws.apache.org/counter/counter_port_type\">" + "<value xmlns=\"\">15</value>" + "</add>" + "</SOAP-ENV:Body>\r\n       \r\n" + "</SOAP-ENV:Envelope>";
-    static final WSSecurityEngine secEngine = new WSSecurityEngine();
-    MessageContext msgContext;
-    SOAPEnvelope unsignedEnvelope;
-
-    /**
-     * TestWSSecurity constructor
-     * <p/>
-     * 
-     * @param name name of the test
-     */
-    public TestWSSecurityNew13(String name) {
-        super(name);
-    }
-
-    /**
-     * JUnit suite
-     * <p/>
-     * 
-     * @return a junit test suite
-     */
-    public static Test suite() {
-        return new TestSuite(TestWSSecurityNew13.class);
-    }
-
-    /**
-     * Main method
-     * <p/>
-     * 
-     * @param args command line args
-     */
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
-    }
-
-    /**
-     * Setup method
-     * <p/>
-     * 
-     * @throws java.lang.Exception Thrown when there is a problem in setup
-     */
-    protected void setUp() throws Exception {
-        AxisClient tmpEngine = new AxisClient(new NullProvider());
-        msgContext = new MessageContext(tmpEngine);
-        unsignedEnvelope = getSOAPEnvelope();
-    }
-
-    /**
-     * Constructs a soap envelope
-     * <p/>
-     * 
-     * @return soap envelope
-     * @throws java.lang.Exception if there is any problem constructing the soap envelope
-     */
-    protected SOAPEnvelope getSOAPEnvelope() throws Exception {
-        InputStream in = new ByteArrayInputStream(soapMsg.getBytes());
-        Message msg = new Message(in);
-        msg.setMessageContext(msgContext);
-        return msg.getSOAPEnvelope();
-    }
-
- 
-    /**
-     * Test the specific signing mehtod that use UsernameToken values
-     * <p/>
-     * 
-     * @throws java.lang.Exception Thrown when there is any problem in signing or verification
-     */
-    public void testUsernameTokenSigning() throws Exception {
-        Document doc = unsignedEnvelope.getAsDocument();
-
-        WSSecHeader secHeader = new WSSecHeader();
-        secHeader.insertSecurityHeader(doc);
-
-        WSSecUsernameToken builder = new WSSecUsernameToken();
-        builder.setPasswordType(WSConstants.PASSWORD_TEXT);
-        builder.setUserInfo("wernerd", "verySecret");
-        builder.addCreated();
-        builder.addNonce();
-        builder.prepare(doc);
-        
-        WSSecSignature sign = new WSSecSignature();
-        sign.setUsernameToken(builder);
-        sign.setKeyIdentifierType(WSConstants.UT_SIGNING);
-        sign.setSignatureAlgorithm(XMLSignature.ALGO_ID_MAC_HMAC_SHA1);
-        log.info("Before signing with UT text....");
-        sign.build(doc, null, secHeader);
-        log.info("Before adding UsernameToken PW Text....");
-        builder.prependToHeader(secHeader);
-        Document signedDoc = doc;
-        Message signedMsg = SOAPUtil.toAxisMessage(signedDoc);
-        if (log.isDebugEnabled()) {
-            log.debug("Message with UserNameToken PW Text:");
-            XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
-        }
-        signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
-        log.info("After adding UsernameToken PW Text....");
-        verify(signedDoc);
-    }
-    
-    /**
-     * Test the specific signing mehtod that use UsernameToken values
-     * <p/>
-     * 
-     * @throws java.lang.Exception Thrown when there is any problem in signing or verification
-     */
-    public void testUsernameTokenSigningDigest() throws Exception {
-        Document doc = unsignedEnvelope.getAsDocument();
-
-        WSSecHeader secHeader = new WSSecHeader();
-        secHeader.insertSecurityHeader(doc);
-
-        WSSecUsernameToken builder = new WSSecUsernameToken();
-        builder.setPasswordType(WSConstants.PASSWORD_DIGEST);
-        builder.setUserInfo("wernerd", "verySecret");
-        builder.addCreated();
-        builder.addNonce();
-        builder.prepare(doc);
-        
-        WSSecSignature sign = new WSSecSignature();
-        sign.setUsernameToken(builder);
-        sign.setKeyIdentifierType(WSConstants.UT_SIGNING);
-        sign.setSignatureAlgorithm(XMLSignature.ALGO_ID_MAC_HMAC_SHA1);
-        log.info("Before signing with UT digest....");
-        sign.build(doc, null, secHeader);
-        log.info("Before adding UsernameToken PW Digest....");
-        builder.prependToHeader(secHeader);
-        Document signedDoc = doc;
-        Message signedMsg = SOAPUtil.toAxisMessage(signedDoc);
-        if (log.isDebugEnabled()) {
-            log.debug("Message with UserNameToken PW Digest:");
-            XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
-        }
-        signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
-        log.info("After adding UsernameToken PW Digest....");
-        verify(signedDoc);
-    }
-
-    /**
-     * Verifies the soap envelope
-     * <p/>
-     * 
-     * @param env soap envelope
-     * @throws java.lang.Exception Thrown when there is a problem in verification
-     */
-    private void verify(Document doc) throws Exception {
-        log.info("Before verifying UsernameToken....");
-        secEngine.processSecurityHeader(doc, null, this, null);
-        log.info("After verifying UsernameToken....");
-    }
-
-    public void handle(Callback[] callbacks)
-            throws IOException, UnsupportedCallbackException {
-        for (int i = 0; i < callbacks.length; i++) {
-            if (callbacks[i] instanceof WSPasswordCallback) {
-                WSPasswordCallback pc = (WSPasswordCallback) callbacks[i];
-                /*
-                 * here call a function/method to lookup the password for
-                 * the given identifier (e.g. a user name or keystore alias)
-                 * e.g.: pc.setPassword(passStore.getPassword(pc.getIdentfifier))
-                 * for Testing we supply a fixed name here.
-                 */
-                pc.setPassword("verySecret");
-            } else {
-                throw new UnsupportedCallbackException(callbacks[i], "Unrecognized Callback");
-            }
-        }
-    }
-}
+/*
+ * Copyright  2003-2004 The Apache Software Foundation.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+package wssec;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import org.apache.axis.Message;
+import org.apache.axis.MessageContext;
+import org.apache.axis.utils.XMLUtils;
+import org.apache.axis.client.AxisClient;
+import org.apache.axis.configuration.NullProvider;
+import org.apache.axis.message.SOAPEnvelope;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ws.security.WSPasswordCallback;
+import org.apache.ws.security.WSSecurityEngine;
+import org.apache.ws.security.WSConstants;
+import org.apache.ws.security.message.WSSecUsernameToken;
+import org.apache.ws.security.message.WSSecSignature;
+import org.apache.ws.security.message.WSSecHeader;
+
+import org.apache.xml.security.signature.XMLSignature;
+
+import org.w3c.dom.Document;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+
+
+/**
+ * WS-Security Test Case
+ * <p/>
+ * 
+ * @author Werner Dittmann (Wern.erDittmann@siemens.com)
+ */
+public class TestWSSecurityNew13 extends TestCase implements CallbackHandler {
+    private static Log log = LogFactory.getLog(TestWSSecurityNew13.class);
+    static final String NS = "http://www.w3.org/2000/09/xmldsig#";
+    static final String soapMsg = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">" + "<SOAP-ENV:Body>" + "<add xmlns=\"http://ws.apache.org/counter/counter_port_type\">" + "<value xmlns=\"\">15</value>" + "</add>" + "</SOAP-ENV:Body>\r\n       \r\n" + "</SOAP-ENV:Envelope>";
+    static final WSSecurityEngine secEngine = new WSSecurityEngine();
+    MessageContext msgContext;
+    SOAPEnvelope unsignedEnvelope;
+
+    /**
+     * TestWSSecurity constructor
+     * <p/>
+     * 
+     * @param name name of the test
+     */
+    public TestWSSecurityNew13(String name) {
+        super(name);
+    }
+
+    /**
+     * JUnit suite
+     * <p/>
+     * 
+     * @return a junit test suite
+     */
+    public static Test suite() {
+        return new TestSuite(TestWSSecurityNew13.class);
+    }
+
+    /**
+     * Main method
+     * <p/>
+     * 
+     * @param args command line args
+     */
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(suite());
+    }
+
+    /**
+     * Setup method
+     * <p/>
+     * 
+     * @throws java.lang.Exception Thrown when there is a problem in setup
+     */
+    protected void setUp() throws Exception {
+        AxisClient tmpEngine = new AxisClient(new NullProvider());
+        msgContext = new MessageContext(tmpEngine);
+        unsignedEnvelope = getSOAPEnvelope();
+    }
+
+    /**
+     * Constructs a soap envelope
+     * <p/>
+     * 
+     * @return soap envelope
+     * @throws java.lang.Exception if there is any problem constructing the soap envelope
+     */
+    protected SOAPEnvelope getSOAPEnvelope() throws Exception {
+        InputStream in = new ByteArrayInputStream(soapMsg.getBytes());
+        Message msg = new Message(in);
+        msg.setMessageContext(msgContext);
+        return msg.getSOAPEnvelope();
+    }
+
+ 
+    /**
+     * Test the specific signing mehtod that use UsernameToken values
+     * <p/>
+     * 
+     * @throws java.lang.Exception Thrown when there is any problem in signing or verification
+     */
+    public void testUsernameTokenSigning() throws Exception {
+        Document doc = unsignedEnvelope.getAsDocument();
+
+        WSSecHeader secHeader = new WSSecHeader();
+        secHeader.insertSecurityHeader(doc);
+
+        WSSecUsernameToken builder = new WSSecUsernameToken();
+        builder.setPasswordType(WSConstants.PASSWORD_TEXT);
+        builder.setUserInfo("wernerd", "verySecret");
+        builder.addCreated();
+        builder.addNonce();
+        builder.prepare(doc);
+        
+        WSSecSignature sign = new WSSecSignature();
+        sign.setUsernameToken(builder);
+        sign.setKeyIdentifierType(WSConstants.UT_SIGNING);
+        sign.setSignatureAlgorithm(XMLSignature.ALGO_ID_MAC_HMAC_SHA1);
+        log.info("Before signing with UT text....");
+        sign.build(doc, null, secHeader);
+        log.info("Before adding UsernameToken PW Text....");
+        builder.prependToHeader(secHeader);
+        Document signedDoc = doc;
+        Message signedMsg = SOAPUtil.toAxisMessage(signedDoc);
+        if (log.isDebugEnabled()) {
+            log.debug("Message with UserNameToken PW Text:");
+            XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
+        }
+        signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
+        log.info("After adding UsernameToken PW Text....");
+        verify(signedDoc);
+    }
+    
+    /**
+     * Test the specific signing mehtod that use UsernameToken values
+     * <p/>
+     * 
+     * @throws java.lang.Exception Thrown when there is any problem in signing or verification
+     */
+    public void testUsernameTokenSigningDigest() throws Exception {
+        Document doc = unsignedEnvelope.getAsDocument();
+
+        WSSecHeader secHeader = new WSSecHeader();
+        secHeader.insertSecurityHeader(doc);
+
+        WSSecUsernameToken builder = new WSSecUsernameToken();
+        builder.setPasswordType(WSConstants.PASSWORD_DIGEST);
+        builder.setUserInfo("wernerd", "verySecret");
+        builder.addCreated();
+        builder.addNonce();
+        builder.prepare(doc);
+        
+        WSSecSignature sign = new WSSecSignature();
+        sign.setUsernameToken(builder);
+        sign.setKeyIdentifierType(WSConstants.UT_SIGNING);
+        sign.setSignatureAlgorithm(XMLSignature.ALGO_ID_MAC_HMAC_SHA1);
+        log.info("Before signing with UT digest....");
+        sign.build(doc, null, secHeader);
+        log.info("Before adding UsernameToken PW Digest....");
+        builder.prependToHeader(secHeader);
+        Document signedDoc = doc;
+        Message signedMsg = SOAPUtil.toAxisMessage(signedDoc);
+        if (log.isDebugEnabled()) {
+            log.debug("Message with UserNameToken PW Digest:");
+            XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
+        }
+        signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
+        log.info("After adding UsernameToken PW Digest....");
+        verify(signedDoc);
+    }
+
+    /**
+     * Verifies the soap envelope
+     * <p/>
+     * 
+     * @param env soap envelope
+     * @throws java.lang.Exception Thrown when there is a problem in verification
+     */
+    private void verify(Document doc) throws Exception {
+        log.info("Before verifying UsernameToken....");
+        secEngine.processSecurityHeader(doc, null, this, null);
+        log.info("After verifying UsernameToken....");
+    }
+
+    public void handle(Callback[] callbacks)
+            throws IOException, UnsupportedCallbackException {
+        for (int i = 0; i < callbacks.length; i++) {
+            if (callbacks[i] instanceof WSPasswordCallback) {
+                WSPasswordCallback pc = (WSPasswordCallback) callbacks[i];
+                /*
+                 * here call a function/method to lookup the password for
+                 * the given identifier (e.g. a user name or keystore alias)
+                 * e.g.: pc.setPassword(passStore.getPassword(pc.getIdentfifier))
+                 * for Testing we supply a fixed name here.
+                 */
+                pc.setPassword("verySecret");
+            } else {
+                throw new UnsupportedCallbackException(callbacks[i], "Unrecognized Callback");
+            }
+        }
+    }
+}

Propchange: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew13.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: webservices/wss4j/trunk/test/wssec/TestWSSecurityNew14.java
------------------------------------------------------------------------------
    svn:eol-style = native



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