You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2016/11/25 12:30:21 UTC
svn commit: r1771304 [1/2] -
/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/
Author: coheigea
Date: Fri Nov 25 12:30:21 2016
New Revision: 1771304
URL: http://svn.apache.org/viewvc?rev=1771304&view=rev
Log:
More work on the tests
Modified:
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/NoSoapPrefixSignatureTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordEncryptorTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordTypeTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SecurityContextTokenTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAKITest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignedBSTTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SymmetricSignatureTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTSignatureTest.java
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java?rev=1771304&r1=1771303&r2=1771304&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java Fri Nov 25 12:30:21 2016
@@ -95,7 +95,11 @@ public class AttachmentTest extends Asse
@Test
public void testXMLAttachmentContentSignature() throws Exception {
- WSSecSignature builder = new WSSecSignature();
+ Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
+
+ WSSecSignature builder = new WSSecSignature(secHeader);
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
builder.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
@@ -113,10 +117,7 @@ public class AttachmentTest extends Asse
builder.setAttachmentCallbackHandler(attachmentCallbackHandler);
LOG.info("Before Signing....");
- Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader(doc);
- secHeader.insertSecurityHeader();
- Document signedDoc = builder.build(doc, crypto, secHeader);
+ Document signedDoc = builder.build(doc, crypto);
if (LOG.isDebugEnabled()) {
LOG.debug("After Signing....");
@@ -140,7 +141,11 @@ public class AttachmentTest extends Asse
@Test
public void testInvalidXMLAttachmentContentSignature() throws Exception {
- WSSecSignature builder = new WSSecSignature();
+ Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
+
+ WSSecSignature builder = new WSSecSignature(secHeader);
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
builder.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
@@ -158,10 +163,7 @@ public class AttachmentTest extends Asse
builder.setAttachmentCallbackHandler(attachmentCallbackHandler);
LOG.info("Before Signing....");
- Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader(doc);
- secHeader.insertSecurityHeader();
- Document signedDoc = builder.build(doc, crypto, secHeader);
+ Document signedDoc = builder.build(doc, crypto);
if (LOG.isDebugEnabled()) {
LOG.debug("After Signing....");
@@ -196,7 +198,11 @@ public class AttachmentTest extends Asse
@Test
public void testXMLAttachmentCompleteSignature() throws Exception {
- WSSecSignature builder = new WSSecSignature();
+ Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
+
+ WSSecSignature builder = new WSSecSignature(secHeader);
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
builder.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
@@ -214,10 +220,7 @@ public class AttachmentTest extends Asse
builder.setAttachmentCallbackHandler(attachmentCallbackHandler);
LOG.info("Before Signing....");
- Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader(doc);
- secHeader.insertSecurityHeader();
- Document signedDoc = builder.build(doc, crypto, secHeader);
+ Document signedDoc = builder.build(doc, crypto);
if (LOG.isDebugEnabled()) {
LOG.debug("After Signing....");
@@ -241,7 +244,11 @@ public class AttachmentTest extends Asse
@Test
public void testInvalidXMLAttachmentCompleteSignature() throws Exception {
- WSSecSignature builder = new WSSecSignature();
+ Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
+
+ WSSecSignature builder = new WSSecSignature(secHeader);
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
builder.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
@@ -259,10 +266,7 @@ public class AttachmentTest extends Asse
builder.setAttachmentCallbackHandler(attachmentCallbackHandler);
LOG.info("Before Signing....");
- Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader(doc);
- secHeader.insertSecurityHeader();
- Document signedDoc = builder.build(doc, crypto, secHeader);
+ Document signedDoc = builder.build(doc, crypto);
if (LOG.isDebugEnabled()) {
LOG.debug("After Signing....");
@@ -296,7 +300,11 @@ public class AttachmentTest extends Asse
@Test
public void testMultipleAttachmentCompleteSignature() throws Exception {
- WSSecSignature builder = new WSSecSignature();
+ Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
+
+ WSSecSignature builder = new WSSecSignature(secHeader);
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
builder.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
@@ -322,10 +330,7 @@ public class AttachmentTest extends Asse
builder.setAttachmentCallbackHandler(attachmentCallbackHandler);
LOG.info("Before Signing....");
- Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader(doc);
- secHeader.insertSecurityHeader();
- Document signedDoc = builder.build(doc, crypto, secHeader);
+ Document signedDoc = builder.build(doc, crypto);
if (LOG.isDebugEnabled()) {
LOG.debug("After Signing....");
@@ -354,12 +359,12 @@ public class AttachmentTest extends Asse
@Test
public void testXMLAttachmentContentEncryption() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecEncrypt encrypt = new WSSecEncrypt();
- encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
- encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
-
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecEncrypt encrypt = new WSSecEncrypt(secHeader);
+ encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
+ encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
encrypt.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
encrypt.getParts().add(new WSEncryptionPart("cid:Attachments", "Content"));
@@ -376,7 +381,7 @@ public class AttachmentTest extends Asse
encrypt.setAttachmentCallbackHandler(attachmentCallbackHandler);
List<Attachment> encryptedAttachments = attachmentCallbackHandler.getResponseAttachments();
- Document encryptedDoc = encrypt.build(doc, crypto, secHeader);
+ Document encryptedDoc = encrypt.build(doc, crypto);
if (LOG.isDebugEnabled()) {
String outputString = XMLUtils.prettyDocumentToString(encryptedDoc);
@@ -413,14 +418,14 @@ public class AttachmentTest extends Asse
@Test
public void testXMLAttachmentContentEncryptionGCM() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecEncrypt encrypt = new WSSecEncrypt();
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
+
+ WSSecEncrypt encrypt = new WSSecEncrypt(secHeader);
encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
encrypt.setSymmetricEncAlgorithm(WSConstants.AES_128_GCM);
- WSSecHeader secHeader = new WSSecHeader(doc);
- secHeader.insertSecurityHeader();
-
encrypt.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
encrypt.getParts().add(new WSEncryptionPart("cid:Attachments", "Content"));
@@ -436,7 +441,7 @@ public class AttachmentTest extends Asse
encrypt.setAttachmentCallbackHandler(attachmentCallbackHandler);
List<Attachment> encryptedAttachments = attachmentCallbackHandler.getResponseAttachments();
- Document encryptedDoc = encrypt.build(doc, crypto, secHeader);
+ Document encryptedDoc = encrypt.build(doc, crypto);
if (LOG.isDebugEnabled()) {
String outputString = XMLUtils.prettyDocumentToString(encryptedDoc);
@@ -473,12 +478,12 @@ public class AttachmentTest extends Asse
@Test
public void testInvalidXMLAttachmentContentEncryption() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecEncrypt encrypt = new WSSecEncrypt();
- encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
- encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
-
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecEncrypt encrypt = new WSSecEncrypt(secHeader);
+ encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
+ encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
encrypt.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
encrypt.getParts().add(new WSEncryptionPart("cid:Attachments", "Content"));
@@ -495,7 +500,7 @@ public class AttachmentTest extends Asse
encrypt.setAttachmentCallbackHandler(attachmentCallbackHandler);
List<Attachment> encryptedAttachments = attachmentCallbackHandler.getResponseAttachments();
- Document encryptedDoc = encrypt.build(doc, crypto, secHeader);
+ Document encryptedDoc = encrypt.build(doc, crypto);
if (LOG.isDebugEnabled()) {
String outputString = XMLUtils.prettyDocumentToString(encryptedDoc);
@@ -528,12 +533,12 @@ public class AttachmentTest extends Asse
@Test
public void testXMLAttachmentContentEncryptionExternalReferenceList() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecEncrypt encrypt = new WSSecEncrypt();
- encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
- encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
-
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecEncrypt encrypt = new WSSecEncrypt(secHeader);
+ encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
+ encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
encrypt.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
encrypt.getParts().add(new WSEncryptionPart("cid:Attachments", "Content"));
@@ -552,9 +557,9 @@ public class AttachmentTest extends Asse
encrypt.prepare(doc, crypto);
Element refs = encrypt.encrypt();
- encrypt.addAttachmentEncryptedDataElements(secHeader);
- encrypt.addExternalRefElement(refs, secHeader);
- encrypt.prependToHeader(secHeader);
+ encrypt.addAttachmentEncryptedDataElements();
+ encrypt.addExternalRefElement(refs);
+ encrypt.prependToHeader();
if (LOG.isDebugEnabled()) {
String outputString = XMLUtils.prettyDocumentToString(doc);
@@ -593,12 +598,12 @@ public class AttachmentTest extends Asse
@Test
public void testXMLAttachmentContentEncryptionNoReference() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecEncrypt encrypt = new WSSecEncrypt();
- encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
- encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
-
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecEncrypt encrypt = new WSSecEncrypt(secHeader);
+ encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
+ encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
encrypt.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
encrypt.getParts().add(new WSEncryptionPart("cid:Attachments", "Content"));
@@ -617,9 +622,9 @@ public class AttachmentTest extends Asse
encrypt.prepare(doc, crypto);
encrypt.encrypt();
- encrypt.addAttachmentEncryptedDataElements(secHeader);
- //encrypt.addExternalRefElement(refs, secHeader);
- encrypt.prependToHeader(secHeader);
+ encrypt.addAttachmentEncryptedDataElements();
+ //encrypt.addExternalRefElement(refs);
+ encrypt.prependToHeader();
if (LOG.isDebugEnabled()) {
String outputString = XMLUtils.prettyDocumentToString(doc);
@@ -657,12 +662,12 @@ public class AttachmentTest extends Asse
@Test
public void testXMLAttachmentCompleteEncryption() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecEncrypt encrypt = new WSSecEncrypt();
- encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
- encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
-
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecEncrypt encrypt = new WSSecEncrypt(secHeader);
+ encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
+ encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
encrypt.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
encrypt.getParts().add(new WSEncryptionPart("cid:Attachments", "Element"));
@@ -679,7 +684,7 @@ public class AttachmentTest extends Asse
encrypt.setAttachmentCallbackHandler(attachmentCallbackHandler);
List<Attachment> encryptedAttachments = attachmentCallbackHandler.getResponseAttachments();
- Document encryptedDoc = encrypt.build(doc, crypto, secHeader);
+ Document encryptedDoc = encrypt.build(doc, crypto);
Assert.assertEquals(1, encryptedAttachments.get(0).getHeaders().size());
@@ -705,12 +710,12 @@ public class AttachmentTest extends Asse
@Test
public void testInvalidXMLAttachmentCompleteEncryption() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecEncrypt encrypt = new WSSecEncrypt();
- encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
- encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
-
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecEncrypt encrypt = new WSSecEncrypt(secHeader);
+ encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
+ encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
encrypt.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
encrypt.getParts().add(new WSEncryptionPart("cid:Attachments", "Element"));
@@ -727,7 +732,7 @@ public class AttachmentTest extends Asse
encrypt.setAttachmentCallbackHandler(attachmentCallbackHandler);
List<Attachment> encryptedAttachments = attachmentCallbackHandler.getResponseAttachments();
- Document encryptedDoc = encrypt.build(doc, crypto, secHeader);
+ Document encryptedDoc = encrypt.build(doc, crypto);
if (LOG.isDebugEnabled()) {
String outputString = XMLUtils.prettyDocumentToString(encryptedDoc);
@@ -757,12 +762,12 @@ public class AttachmentTest extends Asse
@Test
public void testMultipleAttachmentCompleteEncryption() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecEncrypt encrypt = new WSSecEncrypt();
- encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
- encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
-
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecEncrypt encrypt = new WSSecEncrypt(secHeader);
+ encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
+ encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
encrypt.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
encrypt.getParts().add(new WSEncryptionPart("cid:Attachments", "Element"));
@@ -787,7 +792,7 @@ public class AttachmentTest extends Asse
encrypt.setAttachmentCallbackHandler(attachmentCallbackHandler);
List<Attachment> encryptedAttachments = attachmentCallbackHandler.getResponseAttachments();
- Document encryptedDoc = encrypt.build(doc, crypto, secHeader);
+ Document encryptedDoc = encrypt.build(doc, crypto);
if (LOG.isDebugEnabled()) {
String outputString = XMLUtils.prettyDocumentToString(encryptedDoc);
@@ -822,7 +827,7 @@ public class AttachmentTest extends Asse
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
- WSSecSignature signature = new WSSecSignature();
+ WSSecSignature signature = new WSSecSignature(secHeader);
signature.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
signature.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
@@ -839,9 +844,9 @@ public class AttachmentTest extends Asse
new AttachmentCallbackHandler(Collections.singletonList(attachment));
signature.setAttachmentCallbackHandler(attachmentCallbackHandler);
- doc = signature.build(doc, crypto, secHeader);
+ doc = signature.build(doc, crypto);
- WSSecEncrypt encrypt = new WSSecEncrypt();
+ WSSecEncrypt encrypt = new WSSecEncrypt(secHeader);
encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
encrypt.getParts().addAll(signature.getParts());
@@ -851,7 +856,7 @@ public class AttachmentTest extends Asse
encrypt.setAttachmentCallbackHandler(attachmentCallbackHandler);
List<Attachment> encryptedAttachments = attachmentCallbackHandler.getResponseAttachments();
- Document encryptedDoc = encrypt.build(doc, crypto, secHeader);
+ Document encryptedDoc = encrypt.build(doc, crypto);
if (LOG.isDebugEnabled()) {
String outputString = XMLUtils.prettyDocumentToString(encryptedDoc);
@@ -887,7 +892,7 @@ public class AttachmentTest extends Asse
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
- WSSecSignature signature = new WSSecSignature();
+ WSSecSignature signature = new WSSecSignature(secHeader);
signature.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
signature.getParts().add(new WSEncryptionPart("Body", "http://schemas.xmlsoap.org/soap/envelope/", "Content"));
@@ -917,9 +922,9 @@ public class AttachmentTest extends Asse
}
});
- doc = signature.build(doc, crypto, secHeader);
+ doc = signature.build(doc, crypto);
- WSSecEncrypt encrypt = new WSSecEncrypt();
+ WSSecEncrypt encrypt = new WSSecEncrypt(secHeader);
encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
encrypt.getParts().addAll(signature.getParts());
@@ -940,7 +945,7 @@ public class AttachmentTest extends Asse
}
});
- Document encryptedDoc = encrypt.build(doc, crypto, secHeader);
+ Document encryptedDoc = encrypt.build(doc, crypto);
if (LOG.isDebugEnabled()) {
String outputString = XMLUtils.prettyDocumentToString(encryptedDoc);
@@ -986,7 +991,7 @@ public class AttachmentTest extends Asse
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
- WSSecEncrypt encrypt = new WSSecEncrypt();
+ WSSecEncrypt encrypt = new WSSecEncrypt(secHeader);
encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
@@ -1005,9 +1010,9 @@ public class AttachmentTest extends Asse
encrypt.setAttachmentCallbackHandler(attachmentCallbackHandler);
List<Attachment> encryptedAttachments = attachmentCallbackHandler.getResponseAttachments();
- doc = encrypt.build(doc, crypto, secHeader);
+ doc = encrypt.build(doc, crypto);
- WSSecSignature signature = new WSSecSignature();
+ WSSecSignature signature = new WSSecSignature(secHeader);
signature.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
signature.getParts().addAll(encrypt.getParts());
@@ -1015,7 +1020,7 @@ public class AttachmentTest extends Asse
signature.setAttachmentCallbackHandler(attachmentCallbackHandler);
encryptedAttachments = attachmentCallbackHandler.getResponseAttachments();
- doc = signature.build(doc, crypto, secHeader);
+ doc = signature.build(doc, crypto);
if (LOG.isDebugEnabled()) {
String outputString = XMLUtils.prettyDocumentToString(doc);
@@ -1051,7 +1056,7 @@ public class AttachmentTest extends Asse
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
- WSSecEncrypt encrypt = new WSSecEncrypt();
+ WSSecEncrypt encrypt = new WSSecEncrypt(secHeader);
encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
@@ -1082,9 +1087,9 @@ public class AttachmentTest extends Asse
}
});
- doc = encrypt.build(doc, crypto, secHeader);
+ doc = encrypt.build(doc, crypto);
- WSSecSignature signature = new WSSecSignature();
+ WSSecSignature signature = new WSSecSignature(secHeader);
signature.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
signature.getParts().addAll(encrypt.getParts());
@@ -1104,7 +1109,7 @@ public class AttachmentTest extends Asse
}
});
- doc = signature.build(doc, crypto, secHeader);
+ doc = signature.build(doc, crypto);
if (LOG.isDebugEnabled()) {
String outputString = XMLUtils.prettyDocumentToString(doc);
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java?rev=1771304&r1=1771303&r2=1771304&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java Fri Nov 25 12:30:21 2016
@@ -48,13 +48,14 @@ public class CertErrorTest extends org.j
*/
@Test
public void testX509Signature() throws Exception {
- WSSecSignature builder = new WSSecSignature();
- builder.setUserInfo("bob", "security");
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecSignature builder = new WSSecSignature(secHeader);
+ builder.setUserInfo("bob", "security");
try {
- builder.build(doc, CryptoFactory.getInstance(), secHeader);
+ builder.build(doc, CryptoFactory.getInstance());
fail("Expected failure on a bad username");
} catch (WSSecurityException ex) {
String expectedError = "No certificates for user \"bob\" were found for signature";
@@ -67,13 +68,14 @@ public class CertErrorTest extends org.j
*/
@Test
public void testEncryption() throws Exception {
- WSSecEncrypt builder = new WSSecEncrypt();
- builder.setUserInfo("alice");
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecEncrypt builder = new WSSecEncrypt(secHeader);
+ builder.setUserInfo("alice");
try {
- builder.build(doc, CryptoFactory.getInstance(), secHeader);
+ builder.build(doc, CryptoFactory.getInstance());
fail("Expected failure on a bad username");
} catch (WSSecurityException ex) {
String expectedError = "No certificates for user \"alice\" were found for encryption";
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java?rev=1771304&r1=1771303&r2=1771304&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/DerivedKeyTest.java Fri Nov 25 12:30:21 2016
@@ -71,7 +71,7 @@ public class DerivedKeyTest extends org.
secHeader.insertSecurityHeader();
//EncryptedKey
- WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey();
+ WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey(secHeader);
encrKeyBuilder.setUserInfo("wss40");
encrKeyBuilder.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);
encrKeyBuilder.prepare(doc, crypto);
@@ -81,13 +81,13 @@ public class DerivedKeyTest extends org.
String tokenIdentifier = encrKeyBuilder.getId();
//Derived key encryption
- WSSecDKEncrypt encrBuilder = new WSSecDKEncrypt();
+ WSSecDKEncrypt encrBuilder = new WSSecDKEncrypt(secHeader);
encrBuilder.setSymmetricEncAlgorithm(WSConstants.AES_128);
encrBuilder.setExternalKey(ek, tokenIdentifier);
- Document encryptedDoc = encrBuilder.build(doc, secHeader);
+ Document encryptedDoc = encrBuilder.build(doc);
- encrKeyBuilder.prependToHeader(secHeader);
- encrKeyBuilder.prependBSTElementToHeader(secHeader);
+ encrKeyBuilder.prependToHeader();
+ encrKeyBuilder.prependBSTElementToHeader();
if (LOG.isDebugEnabled()) {
LOG.debug("Encrypted message: 3DES + DerivedKeys");
@@ -109,7 +109,7 @@ public class DerivedKeyTest extends org.
secHeader.insertSecurityHeader();
//EncryptedKey
- WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey();
+ WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey(secHeader);
encrKeyBuilder.setUserInfo("wss40");
encrKeyBuilder.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);
encrKeyBuilder.prepare(doc, crypto);
@@ -119,13 +119,13 @@ public class DerivedKeyTest extends org.
String tokenIdentifier = encrKeyBuilder.getId();
//Derived key encryption
- WSSecDKEncrypt encrBuilder = new WSSecDKEncrypt();
+ WSSecDKEncrypt encrBuilder = new WSSecDKEncrypt(secHeader);
encrBuilder.setSymmetricEncAlgorithm(WSConstants.AES_128);
encrBuilder.setExternalKey(ek, tokenIdentifier);
- Document encryptedDoc = encrBuilder.build(doc, secHeader);
+ Document encryptedDoc = encrBuilder.build(doc);
- encrKeyBuilder.prependToHeader(secHeader);
- encrKeyBuilder.prependBSTElementToHeader(secHeader);
+ encrKeyBuilder.prependToHeader();
+ encrKeyBuilder.prependBSTElementToHeader();
if (LOG.isDebugEnabled()) {
LOG.debug("Encrypted message: 3DES + DerivedKeys");
@@ -143,7 +143,7 @@ public class DerivedKeyTest extends org.
secHeader.insertSecurityHeader();
//EncryptedKey
- WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey();
+ WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey(secHeader);
encrKeyBuilder.setUserInfo("wss40");
encrKeyBuilder.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);
encrKeyBuilder.prepare(doc, crypto);
@@ -153,13 +153,13 @@ public class DerivedKeyTest extends org.
String tokenIdentifier = encrKeyBuilder.getId();
//Derived key encryption
- WSSecDKSign sigBuilder = new WSSecDKSign();
+ WSSecDKSign sigBuilder = new WSSecDKSign(secHeader);
sigBuilder.setExternalKey(ek, tokenIdentifier);
sigBuilder.setSignatureAlgorithm(WSConstants.HMAC_SHA1);
- /* Document signedDoc = */ sigBuilder.build(doc, secHeader);
+ /* Document signedDoc = */ sigBuilder.build(doc);
- encrKeyBuilder.prependToHeader(secHeader);
- encrKeyBuilder.prependBSTElementToHeader(secHeader);
+ encrKeyBuilder.prependToHeader();
+ encrKeyBuilder.prependBSTElementToHeader();
if (LOG.isDebugEnabled()) {
LOG.debug("Signed message: 3DES + DerivedKeys");
@@ -195,13 +195,13 @@ public class DerivedKeyTest extends org.
X509Certificate[] certs = crypto.getX509Certificates(cryptoType);
secToken.setKeyIdentifierThumb(certs[0]);
- WSSecDKSign sigBuilder = new WSSecDKSign();
+ WSSecDKSign sigBuilder = new WSSecDKSign(secHeader);
java.security.Key key = crypto.getPrivateKey("wss40", "security");
sigBuilder.setExternalKey(key.getEncoded(), secToken.getElement());
sigBuilder.setSignatureAlgorithm(WSConstants.HMAC_SHA1);
- sigBuilder.build(doc, secHeader);
+ sigBuilder.build(doc);
- sigBuilder.prependDKElementToHeader(secHeader);
+ sigBuilder.prependDKElementToHeader();
if (LOG.isDebugEnabled()) {
LOG.debug("Encrypted message: ThumbprintSHA1 + DerivedKeys");
@@ -236,13 +236,13 @@ public class DerivedKeyTest extends org.
X509Certificate[] certs = crypto.getX509Certificates(cryptoType);
secToken.setKeyIdentifierSKI(certs[0], crypto);
- WSSecDKSign sigBuilder = new WSSecDKSign();
+ WSSecDKSign sigBuilder = new WSSecDKSign(secHeader);
java.security.Key key = crypto.getPrivateKey("wss40", "security");
sigBuilder.setExternalKey(key.getEncoded(), secToken.getElement());
sigBuilder.setSignatureAlgorithm(WSConstants.HMAC_SHA1);
- sigBuilder.build(doc, secHeader);
+ sigBuilder.build(doc);
- sigBuilder.prependDKElementToHeader(secHeader);
+ sigBuilder.prependDKElementToHeader();
if (LOG.isDebugEnabled()) {
LOG.debug("Encrypted message: SKI + DerivedKeys");
@@ -266,7 +266,7 @@ public class DerivedKeyTest extends org.
secHeader.insertSecurityHeader();
//EncryptedKey
- WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey();
+ WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey(secHeader);
encrKeyBuilder.setUserInfo("wss40");
encrKeyBuilder.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);
encrKeyBuilder.prepare(doc, crypto);
@@ -276,20 +276,20 @@ public class DerivedKeyTest extends org.
String tokenIdentifier = encrKeyBuilder.getId();
//Derived key encryption
- WSSecDKSign sigBuilder = new WSSecDKSign();
+ WSSecDKSign sigBuilder = new WSSecDKSign(secHeader);
sigBuilder.setExternalKey(ek, tokenIdentifier);
sigBuilder.setSignatureAlgorithm(WSConstants.HMAC_SHA1);
LOG.info("Before HMAC-SHA1 signature");
- Document signedDoc = sigBuilder.build(doc, secHeader);
+ Document signedDoc = sigBuilder.build(doc);
//Derived key signature
- WSSecDKEncrypt encrBuilder = new WSSecDKEncrypt();
+ WSSecDKEncrypt encrBuilder = new WSSecDKEncrypt(secHeader);
encrBuilder.setSymmetricEncAlgorithm(WSConstants.AES_128);
encrBuilder.setExternalKey(ek, tokenIdentifier);
- Document signedEncryptedDoc = encrBuilder.build(signedDoc, secHeader);
+ Document signedEncryptedDoc = encrBuilder.build(signedDoc);
- encrKeyBuilder.prependToHeader(secHeader);
- encrKeyBuilder.prependBSTElementToHeader(secHeader);
+ encrKeyBuilder.prependToHeader();
+ encrKeyBuilder.prependBSTElementToHeader();
if (LOG.isDebugEnabled()) {
LOG.debug("Encrypted message: 3DES + DerivedKeys");
@@ -307,7 +307,7 @@ public class DerivedKeyTest extends org.
secHeader.insertSecurityHeader();
//EncryptedKey
- WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey();
+ WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey(secHeader);
encrKeyBuilder.setUserInfo("wss40");
encrKeyBuilder.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);
encrKeyBuilder.prepare(doc, crypto);
@@ -317,20 +317,20 @@ public class DerivedKeyTest extends org.
String tokenIdentifier = encrKeyBuilder.getId();
//Derived key encryption
- WSSecDKEncrypt encrBuilder = new WSSecDKEncrypt();
+ WSSecDKEncrypt encrBuilder = new WSSecDKEncrypt(secHeader);
encrBuilder.setSymmetricEncAlgorithm(WSConstants.AES_128);
encrBuilder.setExternalKey(ek, tokenIdentifier);
- encrBuilder.build(doc, secHeader);
+ encrBuilder.build(doc);
//Derived key signature
- WSSecDKSign sigBuilder = new WSSecDKSign();
+ WSSecDKSign sigBuilder = new WSSecDKSign(secHeader);
sigBuilder.setExternalKey(ek, tokenIdentifier);
sigBuilder.setSignatureAlgorithm(WSConstants.HMAC_SHA1);
LOG.info("Before HMAC-SHA1 signature");
- Document encryptedSignedDoc = sigBuilder.build(doc, secHeader);
+ Document encryptedSignedDoc = sigBuilder.build(doc);
- encrKeyBuilder.prependToHeader(secHeader);
- encrKeyBuilder.prependBSTElementToHeader(secHeader);
+ encrKeyBuilder.prependToHeader();
+ encrKeyBuilder.prependBSTElementToHeader();
if (LOG.isDebugEnabled()) {
LOG.debug("Encrypted message: 3DES + DerivedKeys");
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java?rev=1771304&r1=1771303&r2=1771304&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptedDataInHeaderTest.java Fri Nov 25 12:30:21 2016
@@ -68,11 +68,11 @@ public class EncryptedDataInHeaderTest e
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
- WSSecTimestamp timestamp = new WSSecTimestamp();
+ WSSecTimestamp timestamp = new WSSecTimestamp(secHeader);
timestamp.setTimeToLive(300);
- timestamp.build(doc, secHeader);
+ timestamp.build(doc);
- WSSecEncrypt encrypt = new WSSecEncrypt();
+ WSSecEncrypt encrypt = new WSSecEncrypt(secHeader);
encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
@@ -89,11 +89,11 @@ public class EncryptedDataInHeaderTest e
encrypt.getParts().add(encP);
encrypt.prepare(doc, crypto);
- encrypt.prependToHeader(secHeader);
+ encrypt.prependToHeader();
// Append Reference List to security header
Element refs = encrypt.encrypt();
- secHeader.getSecurityHeader().appendChild(refs);
+ secHeader.getSecurityHeaderElement().appendChild(refs);
if (LOG.isDebugEnabled()) {
String outputString =
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java?rev=1771304&r1=1771303&r2=1771304&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java Fri Nov 25 12:30:21 2016
@@ -66,16 +66,16 @@ public class EncryptionAlgorithmSuiteTes
@Test
public void testEncryption() throws Exception {
- WSSecEncrypt builder = new WSSecEncrypt();
- builder.setUserInfo("wss40");
- builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
- builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
-
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecEncrypt builder = new WSSecEncrypt(secHeader);
+ builder.setUserInfo("wss40");
+ builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
+ builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
- Document encryptedDoc = builder.build(doc, crypto, secHeader);
+ Document encryptedDoc = builder.build(doc, crypto);
if (LOG.isDebugEnabled()) {
String outputString =
@@ -102,18 +102,18 @@ public class EncryptionAlgorithmSuiteTes
public void testEncryptionKeyTransportRSA15() throws Exception {
Crypto wssCrypto = CryptoFactory.getInstance("wss40.properties");
+
+ Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
- WSSecEncrypt builder = new WSSecEncrypt();
+ WSSecEncrypt builder = new WSSecEncrypt(secHeader);
builder.setUserInfo("wss40");
builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSA15);
- Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader(doc);
- secHeader.insertSecurityHeader();
-
- Document encryptedDoc = builder.build(doc, wssCrypto, secHeader);
+ Document encryptedDoc = builder.build(doc, wssCrypto);
if (LOG.isDebugEnabled()) {
String outputString =
@@ -139,18 +139,18 @@ public class EncryptionAlgorithmSuiteTes
public void testEncryptionKeyTransportRSA15NoAlgorithmSuite() throws Exception {
Crypto wssCrypto = CryptoFactory.getInstance("wss40.properties");
+
+ Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
- WSSecEncrypt builder = new WSSecEncrypt();
+ WSSecEncrypt builder = new WSSecEncrypt(secHeader);
builder.setUserInfo("wss40");
builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSA15);
- Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader(doc);
- secHeader.insertSecurityHeader();
-
- Document encryptedDoc = builder.build(doc, wssCrypto, secHeader);
+ Document encryptedDoc = builder.build(doc, wssCrypto);
if (LOG.isDebugEnabled()) {
String outputString =
@@ -183,16 +183,16 @@ public class EncryptionAlgorithmSuiteTes
Crypto wssCrypto = CryptoFactory.getInstance("wss40.properties");
- WSSecEncrypt builder = new WSSecEncrypt();
- builder.setUserInfo("wss40");
- builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
- builder.setSymmetricEncAlgorithm(WSConstants.AES_128);
-
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecEncrypt builder = new WSSecEncrypt(secHeader);
+ builder.setUserInfo("wss40");
+ builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
+ builder.setSymmetricEncAlgorithm(WSConstants.AES_128);
- Document encryptedDoc = builder.build(doc, wssCrypto, secHeader);
+ Document encryptedDoc = builder.build(doc, wssCrypto);
if (LOG.isDebugEnabled()) {
String outputString =
@@ -221,17 +221,17 @@ public class EncryptionAlgorithmSuiteTes
keyGen.init(128);
SecretKey key = keyGen.generateKey();
byte[] keyData = key.getEncoded();
+
+ Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
- WSSecEncrypt builder = new WSSecEncrypt();
+ WSSecEncrypt builder = new WSSecEncrypt(secHeader);
builder.setKeyIdentifierType(WSConstants.ENCRYPTED_KEY_SHA1_IDENTIFIER);
builder.setSymmetricKey(key);
builder.setEncryptSymmKey(false);
- Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader(doc);
- secHeader.insertSecurityHeader();
-
- Document encryptedDoc = builder.build(doc, crypto, secHeader);
+ Document encryptedDoc = builder.build(doc, crypto);
if (LOG.isDebugEnabled()) {
String outputString =
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java?rev=1771304&r1=1771303&r2=1771304&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java Fri Nov 25 12:30:21 2016
@@ -81,14 +81,15 @@ public class EncryptionGCMTest extends o
@Test
public void testAES128GCM() throws Exception {
- WSSecEncrypt builder = new WSSecEncrypt();
- builder.setUserInfo("wss40");
- builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
- builder.setSymmetricEncAlgorithm(WSConstants.AES_128_GCM);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
- Document encryptedDoc = builder.build(doc, crypto, secHeader);
+
+ WSSecEncrypt builder = new WSSecEncrypt(secHeader);
+ builder.setUserInfo("wss40");
+ builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
+ builder.setSymmetricEncAlgorithm(WSConstants.AES_128_GCM);
+ Document encryptedDoc = builder.build(doc, crypto);
String outputString =
XMLUtils.prettyDocumentToString(encryptedDoc);
@@ -102,14 +103,15 @@ public class EncryptionGCMTest extends o
@Test
public void testAES256GCM() throws Exception {
- WSSecEncrypt builder = new WSSecEncrypt();
- builder.setUserInfo("wss40");
- builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
- builder.setSymmetricEncAlgorithm(WSConstants.AES_256_GCM);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
- Document encryptedDoc = builder.build(doc, crypto, secHeader);
+
+ WSSecEncrypt builder = new WSSecEncrypt(secHeader);
+ builder.setUserInfo("wss40");
+ builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
+ builder.setSymmetricEncAlgorithm(WSConstants.AES_256_GCM);
+ Document encryptedDoc = builder.build(doc, crypto);
String outputString =
XMLUtils.prettyDocumentToString(encryptedDoc);
@@ -123,17 +125,18 @@ public class EncryptionGCMTest extends o
@Test
public void testAES192GCM_RSAOAEP_SHA256_MGFSHA256() throws Exception {
- WSSecEncrypt builder = new WSSecEncrypt();
+ Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
+
+ WSSecEncrypt builder = new WSSecEncrypt(secHeader);
builder.setUserInfo("wss40");
builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
builder.setSymmetricEncAlgorithm(WSConstants.AES_192_GCM);
builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOAEP_XENC11);
builder.setDigestAlgorithm(WSConstants.SHA256);
builder.setMGFAlgorithm(WSConstants.MGF_SHA256);
- Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader(doc);
- secHeader.insertSecurityHeader();
- Document encryptedDoc = builder.build(doc, crypto, secHeader);
+ Document encryptedDoc = builder.build(doc, crypto);
String outputString =
XMLUtils.prettyDocumentToString(encryptedDoc);
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java?rev=1771304&r1=1771303&r2=1771304&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java Fri Nov 25 12:30:21 2016
@@ -94,13 +94,13 @@ public class EncryptionPartsTest extends
@SuppressWarnings("unchecked")
@Test
public void testSOAPHeader() throws Exception {
- WSSecEncrypt encrypt = new WSSecEncrypt();
- encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
- encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
-
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecEncrypt encrypt = new WSSecEncrypt(secHeader);
+ encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
+ encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
WSEncryptionPart encP =
new WSEncryptionPart(
@@ -109,7 +109,7 @@ public class EncryptionPartsTest extends
"");
encrypt.getParts().add(encP);
- Document encryptedDoc = encrypt.build(doc, crypto, secHeader);
+ Document encryptedDoc = encrypt.build(doc, crypto);
if (LOG.isDebugEnabled()) {
String outputString =
@@ -143,13 +143,13 @@ public class EncryptionPartsTest extends
@Test
public void testOptionalSOAPHeaderPresent() throws Exception {
- WSSecEncrypt encrypt = new WSSecEncrypt();
- encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
- encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
-
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecEncrypt encrypt = new WSSecEncrypt(secHeader);
+ encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
+ encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
WSEncryptionPart encP =
new WSEncryptionPart(
@@ -167,7 +167,7 @@ public class EncryptionPartsTest extends
);
encrypt.getParts().add(encP);
- Document encryptedDoc = encrypt.build(doc, crypto, secHeader);
+ Document encryptedDoc = encrypt.build(doc, crypto);
if (LOG.isDebugEnabled()) {
String outputString =
@@ -180,13 +180,13 @@ public class EncryptionPartsTest extends
@Test
public void testOptionalSOAPHeaderNotPresent() throws Exception {
- WSSecEncrypt encrypt = new WSSecEncrypt();
- encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
- encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
-
- Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
+ Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecEncrypt encrypt = new WSSecEncrypt(secHeader);
+ encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
+ encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
WSEncryptionPart encP =
new WSEncryptionPart(
@@ -204,7 +204,7 @@ public class EncryptionPartsTest extends
);
encrypt.getParts().add(encP);
- Document encryptedDoc = encrypt.build(doc, crypto, secHeader);
+ Document encryptedDoc = encrypt.build(doc, crypto);
if (LOG.isDebugEnabled()) {
String outputString =
@@ -217,13 +217,13 @@ public class EncryptionPartsTest extends
@Test
public void testRequiredSOAPHeaderNotPresent() throws Exception {
- WSSecEncrypt encrypt = new WSSecEncrypt();
- encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
- encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
-
- Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
+ Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecEncrypt encrypt = new WSSecEncrypt(secHeader);
+ encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
+ encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
WSEncryptionPart encP =
new WSEncryptionPart(
@@ -241,7 +241,7 @@ public class EncryptionPartsTest extends
encrypt.getParts().add(encP);
try {
- encrypt.build(doc, crypto, secHeader);
+ encrypt.build(doc, crypto);
fail("Failure expected on not encrypting a required element");
} catch (WSSecurityException ex) {
assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.FAILURE);
@@ -255,13 +255,13 @@ public class EncryptionPartsTest extends
@SuppressWarnings("unchecked")
@Test
public void testSOAPEncryptedHeader() throws Exception {
- WSSecEncrypt encrypt = new WSSecEncrypt();
- encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
- encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
-
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecEncrypt encrypt = new WSSecEncrypt(secHeader);
+ encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
+ encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
WSEncryptionPart encP =
new WSEncryptionPart(
@@ -270,7 +270,7 @@ public class EncryptionPartsTest extends
"Header");
encrypt.getParts().add(encP);
- Document encryptedDoc = encrypt.build(doc, crypto, secHeader);
+ Document encryptedDoc = encrypt.build(doc, crypto);
String outputString =
XMLUtils.prettyDocumentToString(encryptedDoc);
@@ -303,13 +303,13 @@ public class EncryptionPartsTest extends
@SuppressWarnings("unchecked")
@Test
public void testSOAPEncryptedHeaderWithAttributes() throws Exception {
- WSSecEncrypt encrypt = new WSSecEncrypt();
- encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
- encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
-
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecEncrypt encrypt = new WSSecEncrypt(secHeader);
+ encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
+ encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
WSEncryptionPart encP =
new WSEncryptionPart(
@@ -318,7 +318,7 @@ public class EncryptionPartsTest extends
"Header");
encrypt.getParts().add(encP);
- Document encryptedDoc = encrypt.build(doc, crypto, secHeader);
+ Document encryptedDoc = encrypt.build(doc, crypto);
String outputString =
XMLUtils.prettyDocumentToString(encryptedDoc);
@@ -350,14 +350,13 @@ public class EncryptionPartsTest extends
*/
@Test
public void testBadLocalname() throws Exception {
- WSSecEncrypt encrypt = new WSSecEncrypt();
- encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
- encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
-
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
-
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecEncrypt encrypt = new WSSecEncrypt(secHeader);
+ encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
+ encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
WSEncryptionPart encP =
new WSEncryptionPart(
@@ -367,7 +366,7 @@ public class EncryptionPartsTest extends
encrypt.getParts().add(encP);
try {
- encrypt.build(doc, crypto, secHeader);
+ encrypt.build(doc, crypto);
fail("Failure expected on a bad localname");
} catch (WSSecurityException ex) {
assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.FAILURE);
@@ -380,14 +379,13 @@ public class EncryptionPartsTest extends
*/
@Test
public void testBadNamespace() throws Exception {
- WSSecEncrypt encrypt = new WSSecEncrypt();
- encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
- encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
-
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
-
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecEncrypt encrypt = new WSSecEncrypt(secHeader);
+ encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
+ encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
WSEncryptionPart encP =
new WSEncryptionPart(
@@ -397,7 +395,7 @@ public class EncryptionPartsTest extends
encrypt.getParts().add(encP);
try {
- encrypt.build(doc, crypto, secHeader);
+ encrypt.build(doc, crypto);
fail("Failure expected on a bad namespace");
} catch (WSSecurityException ex) {
assertTrue(ex.getErrorCode() == WSSecurityException.ErrorCode.FAILURE);
@@ -413,12 +411,13 @@ public class EncryptionPartsTest extends
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
SOAPConstants soapConstants =
WSSecurityUtil.getSOAPConstants(doc.getDocumentElement());
- WSSecEncrypt encrypt = new WSSecEncrypt();
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
+
+ WSSecEncrypt encrypt = new WSSecEncrypt(secHeader);
encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
- WSSecHeader secHeader = new WSSecHeader(doc);
- secHeader.insertSecurityHeader();
WSEncryptionPart encP =
new WSEncryptionPart(
@@ -433,7 +432,7 @@ public class EncryptionPartsTest extends
"");
encrypt.getParts().add(encP2);
- Document encryptedDoc = encrypt.build(doc, crypto, secHeader);
+ Document encryptedDoc = encrypt.build(doc, crypto);
if (LOG.isDebugEnabled()) {
String outputString =
@@ -482,12 +481,12 @@ public class EncryptionPartsTest extends
Document doc = SOAPUtil.toSOAPPart(SOAPMSG);
SOAPConstants soapConstants =
WSSecurityUtil.getSOAPConstants(doc.getDocumentElement());
- WSSecEncrypt encrypt = new WSSecEncrypt();
- encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
- encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
-
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecEncrypt encrypt = new WSSecEncrypt(secHeader);
+ encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
+ encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
// Give wrong names to make sure it's picking up the element
WSEncryptionPart encP =
@@ -500,7 +499,7 @@ public class EncryptionPartsTest extends
encP.setElement(bodyElement);
encrypt.getParts().add(encP);
- Document encryptedDoc = encrypt.build(doc, crypto, secHeader);
+ Document encryptedDoc = encrypt.build(doc, crypto);
String outputString =
XMLUtils.prettyDocumentToString(encryptedDoc);
@@ -529,12 +528,12 @@ public class EncryptionPartsTest extends
@Test
public void testMultipleElements() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPMSG_MULTIPLE);
- WSSecEncrypt encrypt = new WSSecEncrypt();
- encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
- encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
-
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecEncrypt encrypt = new WSSecEncrypt(secHeader);
+ encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
+ encrypt.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
WSEncryptionPart encP =
new WSEncryptionPart(
@@ -543,7 +542,7 @@ public class EncryptionPartsTest extends
"");
encrypt.getParts().add(encP);
- Document encryptedDoc = encrypt.build(doc, crypto, secHeader);
+ Document encryptedDoc = encrypt.build(doc, crypto);
String outputString =
XMLUtils.prettyDocumentToString(encryptedDoc);
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java?rev=1771304&r1=1771303&r2=1771304&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java Fri Nov 25 12:30:21 2016
@@ -111,15 +111,16 @@ public class EncryptionTest extends org.
*/
@Test
public void testEncryptionDecryptionRSA15() throws Exception {
- WSSecEncrypt builder = new WSSecEncrypt();
- builder.setUserInfo("wss40");
- builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
- builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecEncrypt builder = new WSSecEncrypt(secHeader);
+ builder.setUserInfo("wss40");
+ builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
+ builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
LOG.info("Before Encryption Triple DES....");
- Document encryptedDoc = builder.build(doc, crypto, secHeader);
+ Document encryptedDoc = builder.build(doc, crypto);
LOG.info("After Encryption Triple DES....");
String outputString =
@@ -152,7 +153,7 @@ public class EncryptionTest extends org.
secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
LOG.info("Before Encryption AES 128/RSA-15....");
- encryptedDoc = builder.build(doc, crypto, secHeader);
+ encryptedDoc = builder.build(doc, crypto);
LOG.info("After Encryption AES 128/RSA-15....");
outputString =
XMLUtils.prettyDocumentToString(encryptedDoc);
@@ -189,15 +190,17 @@ public class EncryptionTest extends org.
*/
@Test
public void testEncryptionDecryptionOAEP() throws Exception {
- WSSecEncrypt builder = new WSSecEncrypt();
- builder.setUserInfo("wss40");
- builder.setKeyIdentifierType(WSConstants.X509_KEY_IDENTIFIER);
- builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOAEP);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecEncrypt builder = new WSSecEncrypt(secHeader);
+ builder.setUserInfo("wss40");
+ builder.setKeyIdentifierType(WSConstants.X509_KEY_IDENTIFIER);
+ builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOAEP);
+
LOG.info("Before Encryption Triple DES/RSA-OAEP....");
- Document encryptedDoc = builder.build(doc, crypto, secHeader);
+ Document encryptedDoc = builder.build(doc, crypto);
LOG.info("After Encryption Triple DES/RSA-OAEP....");
String outputString =
@@ -223,20 +226,21 @@ public class EncryptionTest extends org.
@Test
public void testEncryptionDecryptionPublicKey() throws Exception {
- WSSecEncrypt builder = new WSSecEncrypt();
- builder.setKeyIdentifierType(WSConstants.KEY_VALUE);
- builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOAEP);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+ WSSecEncrypt builder = new WSSecEncrypt(secHeader);
+ builder.setKeyIdentifierType(WSConstants.KEY_VALUE);
+ builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOAEP);
+
CryptoType cryptoType = new CryptoType(CryptoType.TYPE.ALIAS);
cryptoType.setAlias("wss40");
X509Certificate[] certs = crypto.getX509Certificates(cryptoType);
assertNotNull(certs);
builder.setUseThisPublicKey(certs[0].getPublicKey());
- Document encryptedDoc = builder.build(doc, crypto, secHeader);
+ Document encryptedDoc = builder.build(doc, crypto);
String outputString =
XMLUtils.prettyDocumentToString(encryptedDoc);
@@ -264,15 +268,16 @@ public class EncryptionTest extends org.
*/
@Test
public void testEncryptionEncryption() throws Exception {
- Crypto encCrypto = CryptoFactory.getInstance();
- WSSecEncrypt encrypt = new WSSecEncrypt();
- encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e");
- LOG.info("Before Encryption....");
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ Crypto encCrypto = CryptoFactory.getInstance();
+ WSSecEncrypt encrypt = new WSSecEncrypt(secHeader);
+ encrypt.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e");
+ LOG.info("Before Encryption....");
- Document encryptedDoc = encrypt.build(doc, encCrypto, secHeader);
+ Document encryptedDoc = encrypt.build(doc, encCrypto);
if (LOG.isDebugEnabled()) {
LOG.debug("After the first encryption:");
@@ -281,7 +286,7 @@ public class EncryptionTest extends org.
LOG.debug(outputString);
}
- Document encryptedEncryptedDoc = encrypt.build(encryptedDoc, encCrypto, secHeader);
+ Document encryptedEncryptedDoc = encrypt.build(encryptedDoc, encCrypto);
if (LOG.isDebugEnabled()) {
LOG.debug("After the second encryption:");
@@ -304,15 +309,16 @@ public class EncryptionTest extends org.
@Test
public void testX509EncryptionThumb() throws Exception {
Crypto encCrypto = CryptoFactory.getInstance();
- WSSecEncrypt builder = new WSSecEncrypt();
+ Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
+
+ WSSecEncrypt builder = new WSSecEncrypt(secHeader);
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
builder.setKeyIdentifierType(WSConstants.THUMBPRINT_IDENTIFIER);
LOG.info("Before Encrypting ThumbprintSHA1....");
- Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader(doc);
- secHeader.insertSecurityHeader();
- Document encryptedDoc = builder.build(doc, encCrypto, secHeader);
+ Document encryptedDoc = builder.build(doc, encCrypto);
String outputString =
XMLUtils.prettyDocumentToString(encryptedDoc);
@@ -344,15 +350,16 @@ public class EncryptionTest extends org.
@Test
public void testX509EncryptionSHA1() throws Exception {
Crypto encCrypto = CryptoFactory.getInstance();
- WSSecEncrypt builder = new WSSecEncrypt();
+ Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
+
+ WSSecEncrypt builder = new WSSecEncrypt(secHeader);
builder.setUserInfo("16c73ab6-b892-458f-abf5-2f875f74882e", "security");
builder.setKeyIdentifierType(WSConstants.ENCRYPTED_KEY_SHA1_IDENTIFIER);
LOG.info("Before Encrypting EncryptedKeySHA1....");
- Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader(doc);
- secHeader.insertSecurityHeader();
- Document encryptedDoc = builder.build(doc, encCrypto, secHeader);
+ Document encryptedDoc = builder.build(doc, encCrypto);
String outputString =
XMLUtils.prettyDocumentToString(encryptedDoc);
@@ -374,16 +381,17 @@ public class EncryptionTest extends org.
*/
@Test
public void testEncryptionSHA1Symmetric() throws Exception {
- WSSecEncrypt builder = new WSSecEncrypt();
+ Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
+
+ WSSecEncrypt builder = new WSSecEncrypt(secHeader);
builder.setKeyIdentifierType(WSConstants.ENCRYPTED_KEY_SHA1_IDENTIFIER);
builder.setSymmetricKey(key);
builder.setEncryptSymmKey(false);
LOG.info("Before Encrypting EncryptedKeySHA1....");
- Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader(doc);
- secHeader.insertSecurityHeader();
- Document encryptedDoc = builder.build(doc, crypto, secHeader);
+ Document encryptedDoc = builder.build(doc, crypto);
byte[] encodedBytes = KeyUtils.generateDigest(keyData);
String identifier = Base64.getMimeEncoder().encodeToString(encodedBytes);
@@ -409,16 +417,17 @@ public class EncryptionTest extends org.
*/
@Test
public void testEncryptionSHA1SymmetricBytes() throws Exception {
- WSSecEncrypt builder = new WSSecEncrypt();
+ Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
+
+ WSSecEncrypt builder = new WSSecEncrypt(secHeader);
builder.setKeyIdentifierType(WSConstants.ENCRYPTED_KEY_SHA1_IDENTIFIER);
builder.setEphemeralKey(keyData);
builder.setEncryptSymmKey(false);
LOG.info("Before Encrypting EncryptedKeySHA1....");
- Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
- WSSecHeader secHeader = new WSSecHeader(doc);
- secHeader.insertSecurityHeader();
- Document encryptedDoc = builder.build(doc, crypto, secHeader);
+ Document encryptedDoc = builder.build(doc, crypto);
byte[] encodedBytes = KeyUtils.generateDigest(keyData);
String identifier = Base64.getMimeEncoder().encodeToString(encodedBytes);
@@ -489,13 +498,14 @@ public class EncryptionTest extends org.
*/
@Test
public void testEncryptionDecryptionRSA15STR() throws Exception {
- WSSecEncrypt builder = new WSSecEncrypt();
- builder.setUserInfo("wss40");
- builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
- builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecEncrypt builder = new WSSecEncrypt(secHeader);
+ builder.setUserInfo("wss40");
+ builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
+ builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
LOG.info("Before Encryption Triple DES....");
/*
@@ -520,15 +530,15 @@ public class EncryptionTest extends org.
* EncryptedKey element in the Security header (strict layout)
*/
Element refs = builder.encrypt();
- builder.addExternalRefElement(refs, secHeader);
+ builder.addExternalRefElement(refs);
/*
* now add (prepend) the EncryptedKey element, then a
* BinarySecurityToken if one was setup during prepare
*/
- builder.prependToHeader(secHeader);
+ builder.prependToHeader();
- builder.prependBSTElementToHeader(secHeader);
+ builder.prependBSTElementToHeader();
Document encryptedDoc = doc;
LOG.info("After Encryption Triple DES....");
@@ -558,13 +568,14 @@ public class EncryptionTest extends org.
@Test
public void testBadAttribute() throws Exception {
- WSSecEncrypt builder = new WSSecEncrypt();
- builder.setUserInfo("wss40");
- builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
- builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecEncrypt builder = new WSSecEncrypt(secHeader);
+ builder.setUserInfo("wss40");
+ builder.setKeyIdentifierType(WSConstants.BST_DIRECT_REFERENCE);
+ builder.setSymmetricEncAlgorithm(WSConstants.TRIPLE_DES);
/*
* Prepare the Encrypt object with the token, setup data structure
@@ -589,7 +600,7 @@ public class EncryptionTest extends org.
* EncryptedKey element in the Security header (strict layout)
*/
Element refs = builder.encrypt();
- builder.addExternalRefElement(refs, secHeader);
+ builder.addExternalRefElement(refs);
/*
* now add (prepend) the EncryptedKey element, then a
@@ -597,9 +608,9 @@ public class EncryptionTest extends org.
*/
Element encryptedKeyElement = builder.getEncryptedKeyElement();
encryptedKeyElement.setAttributeNS(null, "Type", "SomeType");
- WSSecurityUtil.prependChildElement(secHeader.getSecurityHeader(), encryptedKeyElement);
+ WSSecurityUtil.prependChildElement(secHeader.getSecurityHeaderElement(), encryptedKeyElement);
- builder.prependBSTElementToHeader(secHeader);
+ builder.prependBSTElementToHeader();
Document encryptedDoc = doc;
@@ -631,8 +642,10 @@ public class EncryptionTest extends org.
@Test
public void testEmbeddedEncryptedKey() throws Exception {
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
+ WSSecHeader secHeader = new WSSecHeader(doc);
+ secHeader.insertSecurityHeader();
- WSSecEncrypt builder = new WSSecEncrypt();
+ WSSecEncrypt builder = new WSSecEncrypt(secHeader);
builder.setUserInfo("wss40");
builder.setKeyIdentifierType(WSConstants.SKI_KEY_IDENTIFIER);
builder.setSymmetricEncAlgorithm(WSConstants.AES_128);
@@ -668,15 +681,17 @@ public class EncryptionTest extends org.
*/
@Test
public void testEncryptionDecryptionOAEPSHA256() throws Exception {
- WSSecEncrypt builder = new WSSecEncrypt();
- builder.setUserInfo("wss40");
- builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOAEP);
- builder.setDigestAlgorithm(WSConstants.SHA256);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecEncrypt builder = new WSSecEncrypt(secHeader);
+ builder.setUserInfo("wss40");
+ builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOAEP);
+ builder.setDigestAlgorithm(WSConstants.SHA256);
+
LOG.info("Before Encryption Triple DES/RSA-OAEP....");
- Document encryptedDoc = builder.build(doc, crypto, secHeader);
+ Document encryptedDoc = builder.build(doc, crypto);
LOG.info("After Encryption Triple DES/RSA-OAEP....");
String outputString =
@@ -699,17 +714,18 @@ public class EncryptionTest extends org.
// CN has a "*" in it
@Test
public void testEncryptionWithRegexpCert() throws Exception {
- WSSecEncrypt builder = new WSSecEncrypt();
- builder.setUserInfo("regexp");
- builder.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
- builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOAEP);
Document doc = SOAPUtil.toSOAPPart(SOAPUtil.SAMPLE_SOAP_MSG);
WSSecHeader secHeader = new WSSecHeader(doc);
secHeader.insertSecurityHeader();
+
+ WSSecEncrypt builder = new WSSecEncrypt(secHeader);
+ builder.setUserInfo("regexp");
+ builder.setKeyIdentifierType(WSConstants.ISSUER_SERIAL);
+ builder.setKeyEncAlgo(WSConstants.KEYTRANSPORT_RSAOAEP);
LOG.info("Before Encryption Triple DES/RSA-OAEP....");
Crypto regexpCrypto = CryptoFactory.getInstance("regexp.properties");
- Document encryptedDoc = builder.build(doc, regexpCrypto, secHeader);
+ Document encryptedDoc = builder.build(doc, regexpCrypto);
LOG.info("After Encryption Triple DES/RSA-OAEP....");
String outputString =