You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by di...@apache.org on 2005/08/18 00:09:43 UTC
cvs commit: ws-wss4j/test/wssec SOAPUtil.java TestWSSecurity.java TestWSSecurity10.java TestWSSecurity11.java TestWSSecurity12.java TestWSSecurity13.java TestWSSecurity2.java TestWSSecurity3.java TestWSSecurity4.java TestWSSecurity5.java TestWSSecurity6.java TestWSSecurity7.java TestWSSecurity8.java TestWSSecurity9.java TestWSSecuritySOAP12.java TestWSSecurityST1.java TestWSSecurityST2.java TestWSSecurityST3.java
dims 2005/08/17 15:09:42
Modified: test/wssec TestWSSecurity.java TestWSSecurity10.java
TestWSSecurity11.java TestWSSecurity12.java
TestWSSecurity13.java TestWSSecurity2.java
TestWSSecurity3.java TestWSSecurity4.java
TestWSSecurity5.java TestWSSecurity6.java
TestWSSecurity7.java TestWSSecurity8.java
TestWSSecurity9.java TestWSSecuritySOAP12.java
TestWSSecurityST1.java TestWSSecurityST2.java
TestWSSecurityST3.java
Added: test/wssec SOAPUtil.java
Log:
fix bad checkin (removing axisutil broke tests)
Revision Changes Path
1.6 +2 -3 ws-wss4j/test/wssec/TestWSSecurity.java
Index: TestWSSecurity.java
===================================================================
RCS file: /home/cvs/ws-wss4j/test/wssec/TestWSSecurity.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestWSSecurity.java 9 Aug 2004 17:49:58 -0000 1.5
+++ TestWSSecurity.java 17 Aug 2005 22:09:41 -0000 1.6
@@ -28,7 +28,6 @@
import org.apache.axis.message.SOAPEnvelope;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.axis.security.util.AxisUtil;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.components.crypto.Crypto;
@@ -137,7 +136,7 @@
* as a document again for further processing.
*/
- Message signedMsg = (Message) AxisUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
if (log.isDebugEnabled()) {
log.debug("Signed message with IssuerSerial key identifier:");
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
@@ -167,7 +166,7 @@
// Document doc = unsignedEnvelope.getAsDocument();
// Document signedDoc = builder.build(doc, crypto);
//
-// Message signedMsg = (Message) AxisUtil.toSOAPMessage(signedDoc);
+// Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
// if (log.isDebugEnabled()) {
// log.debug("Signed message with IssuerSerialDirect key identifier:");
// XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
1.4 +1 -2 ws-wss4j/test/wssec/TestWSSecurity10.java
Index: TestWSSecurity10.java
===================================================================
RCS file: /home/cvs/ws-wss4j/test/wssec/TestWSSecurity10.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestWSSecurity10.java 9 Mar 2005 22:33:46 -0000 1.3
+++ TestWSSecurity10.java 17 Aug 2005 22:09:41 -0000 1.4
@@ -27,7 +27,6 @@
import org.apache.axis.utils.XMLUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.axis.security.util.AxisUtil;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSPasswordCallback;
import org.apache.ws.security.WSSConfig;
@@ -204,7 +203,7 @@
* as a document again for further processing.
*/
- Message signedMsg = (Message) AxisUtil.toSOAPMessage(encDoc);
+ Message signedMsg = (Message) SOAPUtil.toSOAPMessage(encDoc);
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
log.info("Encryption Done\n");
1.6 +5 -6 ws-wss4j/test/wssec/TestWSSecurity11.java
Index: TestWSSecurity11.java
===================================================================
RCS file: /home/cvs/ws-wss4j/test/wssec/TestWSSecurity11.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestWSSecurity11.java 9 Aug 2004 17:49:58 -0000 1.5
+++ TestWSSecurity11.java 17 Aug 2005 22:09:41 -0000 1.6
@@ -32,7 +32,6 @@
import org.apache.ws.security.WSEncryptionPart;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.util.WSSecurityUtil;
-import org.apache.ws.axis.security.util.AxisUtil;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.components.crypto.Crypto;
import org.apache.ws.security.components.crypto.CryptoFactory;
@@ -164,7 +163,7 @@
* as a document again for further processing.
*/
- Message signedMsg = (Message) AxisUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
if (log.isDebugEnabled()) {
log.debug("Signed message with STR DirectReference key identifier:");
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
@@ -216,7 +215,7 @@
// Document doc = unsignedEnvelope.getAsDocument();
// Document signedDoc = builder.build(doc, crypto);
//
-// Message signedMsg = (Message) AxisUtil.toSOAPMessage(signedDoc);
+// 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));
@@ -269,7 +268,7 @@
Document doc = unsignedEnvelope.getAsDocument();
Document signedDoc = builder.build(doc, crypto);
- Message signedMsg = (Message) AxisUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
if (log.isDebugEnabled()) {
log.debug("Signed message with STR IssuerSerial key identifier:");
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
@@ -322,7 +321,7 @@
Document doc = unsignedEnvelope.getAsDocument();
Document signedDoc = builder.build(doc, crypto);
- Message signedMsg = (Message) AxisUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
if (log.isDebugEnabled()) {
log.debug("Signed message with STR SKI key identifier:");
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
@@ -374,7 +373,7 @@
// Document doc = unsignedEnvelope.getAsDocument();
// Document signedDoc = builder.build(doc, crypto);
//
-// Message signedMsg = (Message) AxisUtil.toSOAPMessage(signedDoc);
+// 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));
1.4 +3 -4 ws-wss4j/test/wssec/TestWSSecurity12.java
Index: TestWSSecurity12.java
===================================================================
RCS file: /home/cvs/ws-wss4j/test/wssec/TestWSSecurity12.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestWSSecurity12.java 9 Aug 2004 17:49:58 -0000 1.3
+++ TestWSSecurity12.java 17 Aug 2005 22:09:41 -0000 1.4
@@ -27,7 +27,6 @@
import org.apache.axis.message.SOAPEnvelope;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.axis.security.util.AxisUtil;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.components.crypto.Crypto;
@@ -142,7 +141,7 @@
* as a document again for further processing.
*/
- Message signedMsg = (Message) AxisUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
if (log.isDebugEnabled()) {
log.debug("Signed message with DSA_SKI key identifier:");
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
@@ -180,7 +179,7 @@
* as a document again for further processing.
*/
- Message signedMsg = (Message) AxisUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
if (log.isDebugEnabled()) {
log.debug("Signed message with DSA_Autodetect:");
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
@@ -218,7 +217,7 @@
* as a document again for further processing.
*/
- Message signedMsg = (Message) AxisUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
if (log.isDebugEnabled()) {
log.debug("Signed message with RSA Autodetect:");
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
1.2 +1 -2 ws-wss4j/test/wssec/TestWSSecurity13.java
Index: TestWSSecurity13.java
===================================================================
RCS file: /home/cvs/ws-wss4j/test/wssec/TestWSSecurity13.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestWSSecurity13.java 24 Oct 2004 12:42:03 -0000 1.1
+++ TestWSSecurity13.java 17 Aug 2005 22:09:41 -0000 1.2
@@ -28,7 +28,6 @@
import org.apache.axis.message.SOAPEnvelope;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.axis.security.util.AxisUtil;
import org.apache.ws.security.WSPasswordCallback;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSConstants;
@@ -143,7 +142,7 @@
sign.build(doc, null);
log.info("Before adding UsernameToken PW Text....");
Document signedDoc = builder.build(doc, "wernerd", "verySecret");
- Message signedMsg = (Message) AxisUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
if (log.isDebugEnabled()) {
log.debug("Message with UserNameToken PW Text:");
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
1.5 +4 -5 ws-wss4j/test/wssec/TestWSSecurity2.java
Index: TestWSSecurity2.java
===================================================================
RCS file: /home/cvs/ws-wss4j/test/wssec/TestWSSecurity2.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestWSSecurity2.java 9 Aug 2004 17:49:58 -0000 1.4
+++ TestWSSecurity2.java 17 Aug 2005 22:09:41 -0000 1.5
@@ -28,7 +28,6 @@
import org.apache.axis.message.SOAPEnvelope;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.axis.security.util.AxisUtil;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSPasswordCallback;
import org.apache.ws.security.WSSecurityEngine;
@@ -151,7 +150,7 @@
* as a document again for further processing.
*/
- Message encryptedMsg = (Message) AxisUtil.toSOAPMessage(encryptedDoc);
+ Message encryptedMsg = (Message) SOAPUtil.toSOAPMessage(encryptedDoc);
if (log.isDebugEnabled()) {
log.debug("Encrypted message, RSA-15 keytransport, 3DES:");
XMLUtils.PrettyElementToWriter(encryptedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
@@ -180,7 +179,7 @@
log.info("Before Encryption AES 128/RSA-15....");
encryptedDoc = builder.build(doc, crypto);
log.info("After Encryption AES 128/RSA-15....");
- encryptedMsg = (Message) AxisUtil.toSOAPMessage(encryptedDoc);
+ encryptedMsg = (Message) SOAPUtil.toSOAPMessage(encryptedDoc);
if (log.isDebugEnabled()) {
log.debug("Encrypted message, RSA-15 keytransport, AES 128:");
XMLUtils.PrettyElementToWriter(encryptedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
@@ -211,7 +210,7 @@
Document encryptedDoc = builder.build(doc, crypto);
log.info("After Encryption Triple DES/RSA-OAEP....");
- Message encryptedMsg = (Message) AxisUtil.toSOAPMessage(encryptedDoc);
+ Message encryptedMsg = (Message) SOAPUtil.toSOAPMessage(encryptedDoc);
if (log.isDebugEnabled()) {
log.debug("Encrypted message, RSA-OAEP keytransport, 3DES:");
XMLUtils.PrettyElementToWriter(encryptedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
@@ -232,7 +231,7 @@
*/
private void verify(Document doc) throws Exception {
secEngine.processSecurityHeader(doc, null, this, crypto);
- AxisUtil.updateSOAPMessage(doc, message);
+ SOAPUtil.updateSOAPMessage(doc, message);
String decryptedString = message.getSOAPPartAsString();
assertTrue(decryptedString.indexOf("LogTestService2") > 0 ? true : false);
}
1.2 +1 -2 ws-wss4j/test/wssec/TestWSSecurity3.java
Index: TestWSSecurity3.java
===================================================================
RCS file: /home/cvs/ws-wss4j/test/wssec/TestWSSecurity3.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestWSSecurity3.java 13 Feb 2004 20:43:09 -0000 1.1
+++ TestWSSecurity3.java 17 Aug 2005 22:09:41 -0000 1.2
@@ -27,7 +27,6 @@
import org.apache.axis.message.SOAPEnvelope;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.axis.security.util.AxisUtil;
import org.apache.ws.security.WSPasswordCallback;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.components.crypto.Crypto;
@@ -134,7 +133,7 @@
* as a document again for further processing.
*/
- Message signedMsg = (Message) AxisUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
log.info("After Signing....");
verify(signedDoc);
1.6 +1 -1 ws-wss4j/test/wssec/TestWSSecurity4.java
Index: TestWSSecurity4.java
===================================================================
RCS file: /home/cvs/ws-wss4j/test/wssec/TestWSSecurity4.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestWSSecurity4.java 9 Aug 2004 17:49:58 -0000 1.5
+++ TestWSSecurity4.java 17 Aug 2005 22:09:41 -0000 1.6
@@ -135,7 +135,7 @@
// * as a document again for further processing.
// */
//
-// Message signedMsg = (Message) AxisUtil.toSOAPMessage(signedDoc);
+// Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
// XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
//
// signedDoc = signedMsg.getSOAPEnvelope().getAsDocument();
1.4 +2 -3 ws-wss4j/test/wssec/TestWSSecurity5.java
Index: TestWSSecurity5.java
===================================================================
RCS file: /home/cvs/ws-wss4j/test/wssec/TestWSSecurity5.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestWSSecurity5.java 9 Aug 2004 17:49:58 -0000 1.3
+++ TestWSSecurity5.java 17 Aug 2005 22:09:41 -0000 1.4
@@ -28,7 +28,6 @@
import org.apache.axis.message.SOAPEnvelope;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.axis.security.util.AxisUtil;
import org.apache.ws.security.WSPasswordCallback;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSConstants;
@@ -134,7 +133,7 @@
* as a document again for further processing.
*/
- Message signedMsg = (Message) AxisUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
if (log.isDebugEnabled()) {
log.debug("Message with UserNameToken PW Digest:");
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
@@ -157,7 +156,7 @@
log.info("Before adding UsernameToken PW Text....");
Document doc = unsignedEnvelope.getAsDocument();
Document signedDoc = builder.build(doc, "wernerd", "verySecret");
- Message signedMsg = (Message) AxisUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
if (log.isDebugEnabled()) {
log.debug("Message with UserNameToken PW Text:");
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
1.3 +2 -3 ws-wss4j/test/wssec/TestWSSecurity6.java
Index: TestWSSecurity6.java
===================================================================
RCS file: /home/cvs/ws-wss4j/test/wssec/TestWSSecurity6.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestWSSecurity6.java 9 Aug 2004 17:49:58 -0000 1.2
+++ TestWSSecurity6.java 17 Aug 2005 22:09:41 -0000 1.3
@@ -29,7 +29,6 @@
import org.apache.axis.utils.XMLUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.axis.security.util.AxisUtil;
import org.apache.ws.security.WSPasswordCallback;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.components.crypto.Crypto;
@@ -148,7 +147,7 @@
* as a document again for further processing.
*/
- Message encryptedMsg = (Message) AxisUtil.toSOAPMessage(encryptedSignedDoc);
+ Message encryptedMsg = (Message) SOAPUtil.toSOAPMessage(encryptedSignedDoc);
String s = encryptedMsg.getSOAPPartAsString();
((SOAPPart)message.getSOAPPart()).setCurrentMessage(s, SOAPPart.FORM_STRING);
@@ -166,7 +165,7 @@
*/
private void verify(Document doc) throws Exception {
secEngine.processSecurityHeader(doc, null, this, crypto);
- AxisUtil.updateSOAPMessage(doc, message);
+ SOAPUtil.updateSOAPMessage(doc, message);
XMLUtils.PrettyElementToWriter(message.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
}
1.2 +2 -3 ws-wss4j/test/wssec/TestWSSecurity7.java
Index: TestWSSecurity7.java
===================================================================
RCS file: /home/cvs/ws-wss4j/test/wssec/TestWSSecurity7.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestWSSecurity7.java 13 Feb 2004 20:43:09 -0000 1.1
+++ TestWSSecurity7.java 17 Aug 2005 22:09:41 -0000 1.2
@@ -28,7 +28,6 @@
import org.apache.axis.utils.XMLUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.axis.security.util.AxisUtil;
import org.apache.ws.security.WSPasswordCallback;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.components.crypto.Crypto;
@@ -144,7 +143,7 @@
* as a document again for further processing.
*/
- Message encryptedMsg = (Message) AxisUtil.toSOAPMessage(encryptedEncryptedDoc);
+ Message encryptedMsg = (Message) SOAPUtil.toSOAPMessage(encryptedEncryptedDoc);
encryptedEncryptedDoc = encryptedMsg.getSOAPEnvelope().getAsDocument();
log.info("After Encryption....");
verify(encryptedEncryptedDoc);
@@ -159,7 +158,7 @@
*/
private void verify(Document doc) throws Exception {
secEngine.processSecurityHeader(doc, null, this, crypto);
- AxisUtil.updateSOAPMessage(doc, message);
+ SOAPUtil.updateSOAPMessage(doc, message);
XMLUtils.PrettyElementToWriter(message.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
}
1.4 +2 -3 ws-wss4j/test/wssec/TestWSSecurity8.java
Index: TestWSSecurity8.java
===================================================================
RCS file: /home/cvs/ws-wss4j/test/wssec/TestWSSecurity8.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestWSSecurity8.java 9 Aug 2004 17:49:58 -0000 1.3
+++ TestWSSecurity8.java 17 Aug 2005 22:09:41 -0000 1.4
@@ -29,7 +29,6 @@
import org.apache.axis.utils.XMLUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.axis.security.util.AxisUtil;
import org.apache.ws.security.WSPasswordCallback;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSConstants;
@@ -156,7 +155,7 @@
* as a document again for further processing.
*/
- Message encryptedMsg = (Message) AxisUtil.toSOAPMessage(encryptedSignedDoc);
+ Message encryptedMsg = (Message) SOAPUtil.toSOAPMessage(encryptedSignedDoc);
if (log.isDebugEnabled()) {
log.debug("Signed and encrypted message with IssuerSerial key identifier (both), 3DES:");
XMLUtils.PrettyElementToWriter(encryptedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
@@ -179,7 +178,7 @@
*/
private void verify(Document doc) throws Exception {
secEngine.processSecurityHeader(doc, null, this, crypto);
- AxisUtil.updateSOAPMessage(doc, message);
+ SOAPUtil.updateSOAPMessage(doc, message);
if (log.isDebugEnabled()) {
log.debug("Verfied and decrypted message:");
XMLUtils.PrettyElementToWriter(message.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
1.4 +2 -3 ws-wss4j/test/wssec/TestWSSecurity9.java
Index: TestWSSecurity9.java
===================================================================
RCS file: /home/cvs/ws-wss4j/test/wssec/TestWSSecurity9.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestWSSecurity9.java 9 Aug 2004 17:49:58 -0000 1.3
+++ TestWSSecurity9.java 17 Aug 2005 22:09:41 -0000 1.4
@@ -29,7 +29,6 @@
import org.apache.axis.utils.XMLUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.axis.security.util.AxisUtil;
import org.apache.ws.security.WSPasswordCallback;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSConstants;
@@ -170,7 +169,7 @@
* as a document again for further processing.
*/
- Message encryptedMsg = (Message) AxisUtil.toSOAPMessage(encryptedSignedDoc);
+ Message encryptedMsg = (Message) SOAPUtil.toSOAPMessage(encryptedSignedDoc);
if (log.isDebugEnabled()) {
log.debug("Encrypted message, RSA-OAEP keytransport, 3DES:");
XMLUtils.PrettyElementToWriter(encryptedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
@@ -192,7 +191,7 @@
*/
private void verify(Document doc) throws Exception {
secEngine.processSecurityHeader(doc, null, this, crypto);
- AxisUtil.updateSOAPMessage(doc, message);
+ SOAPUtil.updateSOAPMessage(doc, message);
}
/* (non-Javadoc)
1.4 +1 -2 ws-wss4j/test/wssec/TestWSSecuritySOAP12.java
Index: TestWSSecuritySOAP12.java
===================================================================
RCS file: /home/cvs/ws-wss4j/test/wssec/TestWSSecuritySOAP12.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestWSSecuritySOAP12.java 9 Aug 2004 17:49:58 -0000 1.3
+++ TestWSSecuritySOAP12.java 17 Aug 2005 22:09:41 -0000 1.4
@@ -28,7 +28,6 @@
import org.apache.axis.utils.XMLUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.axis.security.util.AxisUtil;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.components.crypto.Crypto;
import org.apache.ws.security.components.crypto.CryptoFactory;
@@ -134,7 +133,7 @@
* as a document again for further processing.
*/
- Message signedMsg = (Message) AxisUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
if (log.isDebugEnabled()) {
log.debug("Signed message SOAP 1.2:");
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
1.4 +2 -3 ws-wss4j/test/wssec/TestWSSecurityST1.java
Index: TestWSSecurityST1.java
===================================================================
RCS file: /home/cvs/ws-wss4j/test/wssec/TestWSSecurityST1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestWSSecurityST1.java 12 Aug 2004 15:16:57 -0000 1.3
+++ TestWSSecurityST1.java 17 Aug 2005 22:09:41 -0000 1.4
@@ -33,7 +33,6 @@
import org.apache.axis.message.SOAPEnvelope;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.axis.security.util.AxisUtil;
import org.apache.ws.security.WSPasswordCallback;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.message.WSSAddSAMLToken;
@@ -157,7 +156,7 @@
* as a document again for further processing.
*/
- Message signedMsg = (Message) AxisUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
if (log.isDebugEnabled()) {
log.debug("Unsigned SAML message (sender vouches):");
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
@@ -177,7 +176,7 @@
*/
private void verify(Document doc) throws Exception {
secEngine.processSecurityHeader(doc, null, this, null);
- AxisUtil.updateSOAPMessage(doc, message);
+ SOAPUtil.updateSOAPMessage(doc, message);
String decryptedString = message.getSOAPPartAsString();
assertTrue(decryptedString.indexOf("LogTestService2") > 0 ? true : false);
}
1.5 +2 -3 ws-wss4j/test/wssec/TestWSSecurityST2.java
Index: TestWSSecurityST2.java
===================================================================
RCS file: /home/cvs/ws-wss4j/test/wssec/TestWSSecurityST2.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestWSSecurityST2.java 12 Aug 2004 15:16:57 -0000 1.4
+++ TestWSSecurityST2.java 17 Aug 2005 22:09:41 -0000 1.5
@@ -32,7 +32,6 @@
import org.apache.axis.message.SOAPEnvelope;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.axis.security.util.AxisUtil;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSPasswordCallback;
import org.apache.ws.security.WSSecurityEngine;
@@ -164,7 +163,7 @@
* as a document again for further processing.
*/
- Message signedMsg = (Message) AxisUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
if (log.isDebugEnabled()) {
log.debug("Signed SAML message (sender vouches):");
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
@@ -185,7 +184,7 @@
*/
private void verify(Document doc) throws Exception {
secEngine.processSecurityHeader(doc, null, this, crypto);
- AxisUtil.updateSOAPMessage(doc, message);
+ SOAPUtil.updateSOAPMessage(doc, message);
String decryptedString = message.getSOAPPartAsString();
assertTrue(decryptedString.indexOf("LogTestService2") > 0 ? true : false);
}
1.5 +2 -3 ws-wss4j/test/wssec/TestWSSecurityST3.java
Index: TestWSSecurityST3.java
===================================================================
RCS file: /home/cvs/ws-wss4j/test/wssec/TestWSSecurityST3.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestWSSecurityST3.java 12 Aug 2004 15:16:57 -0000 1.4
+++ TestWSSecurityST3.java 17 Aug 2005 22:09:41 -0000 1.5
@@ -33,7 +33,6 @@
import org.apache.axis.message.SOAPEnvelope;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.axis.security.util.AxisUtil;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSPasswordCallback;
import org.apache.ws.security.WSSecurityEngine;
@@ -171,7 +170,7 @@
* as a document again for further processing.
*/
- Message signedMsg = (Message) AxisUtil.toSOAPMessage(signedDoc);
+ Message signedMsg = (Message) SOAPUtil.toSOAPMessage(signedDoc);
if (log.isDebugEnabled()) {
log.debug("Signed SAML message (key holder):");
XMLUtils.PrettyElementToWriter(signedMsg.getSOAPEnvelope().getAsDOM(), new PrintWriter(System.out));
@@ -192,7 +191,7 @@
*/
private void verify(Document doc) throws Exception {
secEngine.processSecurityHeader(doc, null, this, crypto);
- AxisUtil.updateSOAPMessage(doc, message);
+ SOAPUtil.updateSOAPMessage(doc, message);
String decryptedString = message.getSOAPPartAsString();
assertTrue(decryptedString.indexOf("LogTestService2") > 0 ? true : false);
}
1.1 ws-wss4j/test/wssec/SOAPUtil.java
Index: SOAPUtil.java
===================================================================
package wssec;
import org.apache.xml.security.c14n.Canonicalizer;
import org.w3c.dom.Document;
import javax.xml.soap.MessageFactory;
import javax.xml.soap.SOAPMessage;
import javax.xml.transform.dom.DOMSource;
import java.io.ByteArrayInputStream;
public class SOAPUtil {
/**
* Convert a DOM Document into a soap message.
* <p/>
*
* @param doc
* @return
* @throws Exception
*/
public static SOAPMessage toSOAPMessage(Document doc) throws Exception {
Canonicalizer c14n =
Canonicalizer.getInstance(Canonicalizer.ALGO_ID_C14N_WITH_COMMENTS);
byte[] canonicalMessage = c14n.canonicalizeSubtree(doc);
ByteArrayInputStream in = new ByteArrayInputStream(canonicalMessage);
MessageFactory factory = MessageFactory.newInstance();
return factory.createMessage(null, in);
}
/**
* Update soap message.
* <p/>
*
* @param doc
* @param message
* @return
* @throws Exception
*/
public static SOAPMessage updateSOAPMessage(Document doc,
SOAPMessage message)
throws Exception {
DOMSource domSource = new DOMSource(doc);
message.getSOAPPart().setContent(domSource);
return message;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: wss4j-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: wss4j-dev-help@ws.apache.org