This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
commit 5be5140914f9f33480ac87b507101da9916e8b87 Author: Colm O hEigeartaigh <cohei...@apache.org> AuthorDate: Thu Apr 16 09:54:32 2020 +0100 Picking up changes from Santuario regarding StAX Encryption action --- .../wss4j/performance/PerformanceMemoryTest.java | 4 +- .../wss4j/performance/PerformanceTimingTest.java | 4 +- .../test/AsymmetricBindingIntegrationTest.java | 46 +++++++++++----------- .../stax/test/TransportBindingIntegrationTest.java | 28 ++++++------- .../policy/stax/test/VulnerabliltyVectorsTest.java | 2 +- .../output/BinarySecurityTokenOutputProcessor.java | 6 +-- .../output/EncryptedKeyOutputProcessor.java | 6 +-- .../wss4j/stax/setup/ConfigurationConverter.java | 2 +- .../org/apache/wss4j/stax/setup/OutboundWSSec.java | 2 +- .../org/apache/wss4j/stax/test/AttachmentTest.java | 20 +++++----- .../stax/test/ConfigurationConverterTest.java | 4 +- .../apache/wss4j/stax/test/EncDecryptionTest.java | 44 ++++++++++----------- .../apache/wss4j/stax/test/EncryptionCRLTest.java | 4 +- .../apache/wss4j/stax/test/HeaderOrderingTest.java | 6 +-- .../wss4j/stax/test/InteroperabilityTest.java | 18 ++++----- .../apache/wss4j/stax/test/MultipleActionTest.java | 4 +- .../apache/wss4j/stax/test/OutputChainTest.java | 2 +- .../wss4j/stax/test/PasswordEncryptorTest.java | 2 +- .../wss4j/stax/test/SignatureEncryptionTest.java | 8 ++-- .../VulnerabliltyVectorsDecompressedBytesTest.java | 2 +- .../wss4j/stax/test/VulnerabliltyVectorsTest.java | 4 +- 21 files changed, 109 insertions(+), 109 deletions(-) diff --git a/performance/src/test/java/org/apache/wss4j/performance/PerformanceMemoryTest.java b/performance/src/test/java/org/apache/wss4j/performance/PerformanceMemoryTest.java index ccbb965..56c9e68 100644 --- a/performance/src/test/java/org/apache/wss4j/performance/PerformanceMemoryTest.java +++ b/performance/src/test/java/org/apache/wss4j/performance/PerformanceMemoryTest.java @@ -287,7 +287,7 @@ public class PerformanceMemoryTest extends AbstractTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.setTimestampTTL(60 * 60 * 24 * 7); //a week for testing:) outboundWSSec = WSSec.getOutboundWSSec(securityProperties); @@ -314,7 +314,7 @@ public class PerformanceMemoryTest extends AbstractTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.setTimestampTTL(60 * 60 * 24 * 7); //a week for testing:) securityProperties.setEncryptionCompressionAlgorithm(compress); diff --git a/performance/src/test/java/org/apache/wss4j/performance/PerformanceTimingTest.java b/performance/src/test/java/org/apache/wss4j/performance/PerformanceTimingTest.java index 363eb30..2988856 100644 --- a/performance/src/test/java/org/apache/wss4j/performance/PerformanceTimingTest.java +++ b/performance/src/test/java/org/apache/wss4j/performance/PerformanceTimingTest.java @@ -207,7 +207,7 @@ public class PerformanceTimingTest extends AbstractTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.setTimestampTTL(60 * 60 * 24 * 7); //a week for testing:) outboundWSSec = WSSec.getOutboundWSSec(securityProperties); @@ -234,7 +234,7 @@ public class PerformanceTimingTest extends AbstractTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.setTimestampTTL(60 * 60 * 24 * 7); //a week for testing:) securityProperties.setEncryptionCompressionAlgorithm(compress); diff --git a/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingIntegrationTest.java b/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingIntegrationTest.java index 0506cc4..a0789f6 100644 --- a/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingIntegrationTest.java +++ b/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/AsymmetricBindingIntegrationTest.java @@ -137,7 +137,7 @@ public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -280,7 +280,7 @@ public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -386,7 +386,7 @@ public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -515,7 +515,7 @@ public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase { actions.add(WSSConstants.USERNAMETOKEN); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -636,7 +636,7 @@ public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase { actions.add(WSSConstants.USERNAMETOKEN); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -765,7 +765,7 @@ public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase { actions.add(WSSConstants.USERNAMETOKEN); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -886,7 +886,7 @@ public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.USERNAMETOKEN); actions.add(WSSConstants.TIMESTAMP); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); actions.add(WSSConstants.SIGNATURE); outSecurityProperties.setActions(actions); @@ -996,7 +996,7 @@ public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -1115,7 +1115,7 @@ public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -1235,7 +1235,7 @@ public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -1352,7 +1352,7 @@ public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -1461,7 +1461,7 @@ public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -1569,7 +1569,7 @@ public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -1683,7 +1683,7 @@ public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -1812,7 +1812,7 @@ public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -1912,7 +1912,7 @@ public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -2021,7 +2021,7 @@ public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -2134,7 +2134,7 @@ public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase { outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_WSU_CREATED, SecurePart.Modifier.Element)); outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_WSU_EXPIRES, SecurePart.Modifier.Content)); outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_SOAP11_BODY, SecurePart.Modifier.Content)); - WSSConstants.Action[] actions = new WSSConstants.Action[]{WSSConstants.TIMESTAMP, WSSConstants.SIGNATURE, WSSConstants.ENCRYPT}; + WSSConstants.Action[] actions = new WSSConstants.Action[]{WSSConstants.TIMESTAMP, WSSConstants.SIGNATURE, WSSConstants.ENCRYPTION}; outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -2519,7 +2519,7 @@ public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -2633,7 +2633,7 @@ public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -2745,7 +2745,7 @@ public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase { outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_SOAP11_BODY, SecurePart.Modifier.Content)); List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); actions.add(WSSConstants.SIGNATURE); outSecurityProperties.setActions(actions); @@ -2860,7 +2860,7 @@ public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -2895,4 +2895,4 @@ public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase { assertEquals(((WSSecurityException) e.getCause()).getFaultCode(), WSSecurityException.INVALID_SECURITY); } } -} \ No newline at end of file +} diff --git a/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingIntegrationTest.java b/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingIntegrationTest.java index 720e8f1..2d83be4 100644 --- a/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingIntegrationTest.java +++ b/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/TransportBindingIntegrationTest.java @@ -118,7 +118,7 @@ public class TransportBindingIntegrationTest extends AbstractPolicyTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -220,7 +220,7 @@ public class TransportBindingIntegrationTest extends AbstractPolicyTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -343,7 +343,7 @@ public class TransportBindingIntegrationTest extends AbstractPolicyTestBase { actions.add(WSSConstants.USERNAMETOKEN); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -457,7 +457,7 @@ public class TransportBindingIntegrationTest extends AbstractPolicyTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -558,7 +558,7 @@ public class TransportBindingIntegrationTest extends AbstractPolicyTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -681,7 +681,7 @@ public class TransportBindingIntegrationTest extends AbstractPolicyTestBase { actions.add(WSSConstants.USERNAMETOKEN); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -788,7 +788,7 @@ public class TransportBindingIntegrationTest extends AbstractPolicyTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.USERNAMETOKEN); actions.add(WSSConstants.TIMESTAMP); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -921,7 +921,7 @@ public class TransportBindingIntegrationTest extends AbstractPolicyTestBase { actions.add(WSSConstants.USERNAMETOKEN); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -1041,7 +1041,7 @@ public class TransportBindingIntegrationTest extends AbstractPolicyTestBase { actions.add(WSSConstants.USERNAMETOKEN); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -1158,7 +1158,7 @@ public class TransportBindingIntegrationTest extends AbstractPolicyTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -1276,7 +1276,7 @@ public class TransportBindingIntegrationTest extends AbstractPolicyTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -1396,7 +1396,7 @@ public class TransportBindingIntegrationTest extends AbstractPolicyTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -1510,7 +1510,7 @@ public class TransportBindingIntegrationTest extends AbstractPolicyTestBase { outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_WSU_CREATED.getNamespaceURI(), WSSConstants.TAG_WSU_CREATED.getLocalPart()), SecurePart.Modifier.Element)); outSecurityProperties.addEncryptionPart(new SecurePart(new QName(WSSConstants.TAG_WSU_EXPIRES.getNamespaceURI(), WSSConstants.TAG_WSU_EXPIRES.getLocalPart()), SecurePart.Modifier.Content)); outSecurityProperties.addEncryptionPart(new SecurePart(WSSConstants.TAG_SOAP12_ROLEBody, SecurePart.Modifier.Content)); - WSSConstants.Action[] actions = new WSSConstants.Action[]{WSSConstants.TIMESTAMP, WSSConstants.SIGNATURE, WSSConstants.ENCRYPT}; + WSSConstants.Action[] actions = new WSSConstants.Action[]{WSSConstants.TIMESTAMP, WSSConstants.SIGNATURE, WSSConstants.ENCRYPTION}; outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -1555,4 +1555,4 @@ public class TransportBindingIntegrationTest extends AbstractPolicyTestBase { "Policy enforces LaxTsFirst but X509Token occured first"); } }*/ -} \ No newline at end of file +} diff --git a/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/VulnerabliltyVectorsTest.java b/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/VulnerabliltyVectorsTest.java index 9849465..5429201 100644 --- a/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/VulnerabliltyVectorsTest.java +++ b/ws-security-policy-stax/src/test/java/org/apache/wss4j/policy/stax/test/VulnerabliltyVectorsTest.java @@ -73,7 +73,7 @@ public class VulnerabliltyVectorsTest extends AbstractTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java index bcfb342..aa1fbf1 100644 --- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java +++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java @@ -58,7 +58,7 @@ public class BinarySecurityTokenOutputProcessor extends AbstractOutputProcessor if (WSSConstants.SIGNATURE.equals(action) || WSSConstants.SAML_TOKEN_SIGNED.equals(action)) { tokenId = outputProcessorChain.getSecurityContext().get(WSSConstants.PROP_USE_THIS_TOKEN_ID_FOR_SIGNATURE); - } else if (WSSConstants.ENCRYPT.equals(action)) { + } else if (WSSConstants.ENCRYPTION.equals(action)) { tokenId = outputProcessorChain.getSecurityContext().get(WSSConstants.PROP_USE_THIS_TOKEN_ID_FOR_ENCRYPTED_KEY); } else if (WSSConstants.ENCRYPT_WITH_KERBEROS_TOKEN.equals(getAction()) || WSSConstants.SIGNATURE_WITH_KERBEROS_TOKEN.equals(getAction()) @@ -81,7 +81,7 @@ public class BinarySecurityTokenOutputProcessor extends AbstractOutputProcessor && !getSecurityProperties().getSignatureKeyIdentifiers().isEmpty()) { includeToken = ((WSSSecurityProperties) getSecurityProperties()).isIncludeSignatureToken(); keyIdentifier = getSecurityProperties().getSignatureKeyIdentifiers().get(0); - } else if (WSSConstants.ENCRYPT.equals(action)) { + } else if (WSSConstants.ENCRYPTION.equals(action)) { includeToken = ((WSSSecurityProperties) getSecurityProperties()).isIncludeEncryptionToken(); keyIdentifier = getSecurityProperties().getEncryptionKeyIdentifier(); } @@ -108,7 +108,7 @@ public class BinarySecurityTokenOutputProcessor extends AbstractOutputProcessor finalBinarySecurityTokenOutputProcessor.addBeforeProcessor(WSSSignatureOutputProcessor.class.getName()); finalBinarySecurityTokenOutputProcessor.init(outputProcessorChain); securityToken.setProcessor(finalBinarySecurityTokenOutputProcessor); - } else if (WSSConstants.ENCRYPT.equals(action) + } else if (WSSConstants.ENCRYPTION.equals(action) && (includeToken || WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE.equals(keyIdentifier)) && (securityToken.getTokenType() == null || WSSecurityTokenConstants.X509V3Token.equals(securityToken.getTokenType()))) { diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptedKeyOutputProcessor.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptedKeyOutputProcessor.java index 54143af..36dbb3c 100644 --- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptedKeyOutputProcessor.java +++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptedKeyOutputProcessor.java @@ -111,7 +111,7 @@ public class EncryptedKeyOutputProcessor extends AbstractOutputProcessor { finalEncryptedKeyOutputProcessor.setXMLSecurityProperties(getSecurityProperties()); finalEncryptedKeyOutputProcessor.setAction(getAction()); XMLSecurityConstants.Action action = getAction(); - if (WSSConstants.ENCRYPT.equals(action)) { + if (WSSConstants.ENCRYPTION.equals(action)) { if (wrappingSecurityToken.getProcessor() != null) { finalEncryptedKeyOutputProcessor.addBeforeProcessor(wrappingSecurityToken.getProcessor()); finalEncryptedKeyOutputProcessor.init(outputProcessorChain); @@ -119,7 +119,7 @@ public class EncryptedKeyOutputProcessor extends AbstractOutputProcessor { finalEncryptedKeyOutputProcessor.addAfterProcessor(EncryptEndingOutputProcessor.class.getName()); //hint for the headerReordering processor where to place the EncryptedKey - if (getSecurityProperties().getActions().indexOf(WSSConstants.ENCRYPT) + if (getSecurityProperties().getActions().indexOf(WSSConstants.ENCRYPTION) < getSecurityProperties().getActions().indexOf(WSSConstants.SIGNATURE)) { finalEncryptedKeyOutputProcessor.addBeforeProcessor(WSSSignatureOutputProcessor.class.getName()); finalEncryptedKeyOutputProcessor.setAction(WSSConstants.SIGNATURE); @@ -342,7 +342,7 @@ public class EncryptedKeyOutputProcessor extends AbstractOutputProcessor { createEndElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_xenc_CipherValue); createEndElementAndOutputAsEvent(subOutputProcessorChain, WSSConstants.TAG_xenc_CipherData); - if (outputReferenceList && WSSConstants.ENCRYPT.equals(getAction())) { + if (outputReferenceList && WSSConstants.ENCRYPTION.equals(getAction())) { WSSUtils.createReferenceListStructureForEncryption(this, subOutputProcessorChain); } createEndElementAndOutputAsEvent(subOutputProcessorChain, headerElementName); diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/ConfigurationConverter.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/ConfigurationConverter.java index 6c0d190..b9e8280 100644 --- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/ConfigurationConverter.java +++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/ConfigurationConverter.java @@ -97,7 +97,7 @@ public final class ConfigurationConverter { } else if (single[i].equals(ConfigurationConstants.SIGNATURE)) { actions.add(WSSConstants.SIGNATURE); } else if (single[i].equals(ConfigurationConstants.ENCRYPT)) { - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); } else if (single[i].equals(ConfigurationConstants.SAML_TOKEN_UNSIGNED)) { actions.add(WSSConstants.SAML_TOKEN_UNSIGNED); } else if (single[i].equals(ConfigurationConstants.SAML_TOKEN_SIGNED)) { diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/OutboundWSSec.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/OutboundWSSec.java index 8c456f6..a64f561 100644 --- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/OutboundWSSec.java +++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/OutboundWSSec.java @@ -601,7 +601,7 @@ public class OutboundWSSec { final WSSSignatureOutputProcessor signatureOutputProcessor = new WSSSignatureOutputProcessor(); initializeOutputProcessor(outputProcessorChain, signatureOutputProcessor, action); - } else if (WSSConstants.ENCRYPT.equals(action)) { + } else if (WSSConstants.ENCRYPTION.equals(action)) { configuredAction.encryptionAction = true; EncryptedKeyOutputProcessor encryptedKeyOutputProcessor = null; diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java index ef64f17..6c7c325 100644 --- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java +++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java @@ -437,7 +437,7 @@ public class AttachmentTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("receiver"); @@ -509,7 +509,7 @@ public class AttachmentTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("receiver"); @@ -580,7 +580,7 @@ public class AttachmentTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("receiver"); @@ -735,7 +735,7 @@ public class AttachmentTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("receiver"); @@ -808,7 +808,7 @@ public class AttachmentTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("receiver"); @@ -896,7 +896,7 @@ public class AttachmentTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("receiver"); @@ -957,7 +957,7 @@ public class AttachmentTest extends AbstractTestBase { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setSignatureUser("transmitter"); @@ -1058,7 +1058,7 @@ public class AttachmentTest extends AbstractTestBase { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setSignatureUser("transmitter"); @@ -1150,7 +1150,7 @@ public class AttachmentTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); actions.add(WSSConstants.SIGNATURE); securityProperties.setActions(actions); securityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); @@ -1251,7 +1251,7 @@ public class AttachmentTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); actions.add(WSSConstants.SIGNATURE); securityProperties.setActions(actions); securityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ConfigurationConverterTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ConfigurationConverterTest.java index 8ee1754..c13e18f 100644 --- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ConfigurationConverterTest.java +++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ConfigurationConverterTest.java @@ -138,7 +138,7 @@ public class ConfigurationConverterTest extends AbstractTestBase { assertEquals(properties.getEncryptionUser(), "transmitter"); assertEquals(properties.getActions().size(), 1); - assertEquals(properties.getActions().get(0), WSSConstants.ENCRYPT); + assertEquals(properties.getActions().get(0), WSSConstants.ENCRYPTION); assertTrue(properties.getCallbackHandler() instanceof CallbackHandlerImpl); assertEquals(properties.getEncryptionKeyTransportAlgorithm(), WSSConstants.NS_XENC_RSA15); @@ -166,7 +166,7 @@ public class ConfigurationConverterTest extends AbstractTestBase { WSSSecurityProperties properties = ConfigurationConverter.convert(config); assertEquals(properties.getActions().size(), 1); - assertEquals(properties.getActions().get(0), WSSConstants.ENCRYPT); + assertEquals(properties.getActions().get(0), WSSConstants.ENCRYPTION); assertTrue(properties.getCallbackHandler() instanceof CallbackHandlerImpl); assertNotNull(properties.getDecryptionCrypto()); diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java index e00357f..2eabdde 100644 --- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java +++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncDecryptionTest.java @@ -104,7 +104,7 @@ public class EncDecryptionTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("receiver"); @@ -246,7 +246,7 @@ public class EncDecryptionTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); Properties properties = CryptoFactory.getProperties("transmitter-crypto.properties", this.getClass().getClassLoader()); @@ -392,7 +392,7 @@ public class EncDecryptionTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("receiver"); @@ -679,7 +679,7 @@ public class EncDecryptionTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("receiver"); @@ -717,7 +717,7 @@ public class EncDecryptionTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("receiver"); @@ -962,7 +962,7 @@ public class EncDecryptionTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("receiver"); @@ -986,7 +986,7 @@ public class EncDecryptionTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); KeyStore keyStore = KeyStore.getInstance("jks"); @@ -1046,7 +1046,7 @@ public class EncDecryptionTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("receiver"); @@ -1123,7 +1123,7 @@ public class EncDecryptionTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("receiver"); @@ -1243,7 +1243,7 @@ public class EncDecryptionTest extends AbstractTestBase { ByteArrayOutputStream baos; { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); - WSSConstants.Action[] actions = new WSSConstants.Action[]{WSSConstants.ENCRYPT}; + WSSConstants.Action[] actions = new WSSConstants.Action[]{WSSConstants.ENCRYPTION}; securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("receiver"); @@ -1293,7 +1293,7 @@ public class EncDecryptionTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("receiver"); @@ -1370,7 +1370,7 @@ public class EncDecryptionTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("receiver"); @@ -1447,7 +1447,7 @@ public class EncDecryptionTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("receiver"); @@ -1524,7 +1524,7 @@ public class EncDecryptionTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("receiver"); @@ -1609,7 +1609,7 @@ public class EncDecryptionTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("receiver"); @@ -1719,7 +1719,7 @@ public class EncDecryptionTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("receiver"); @@ -1842,7 +1842,7 @@ public class EncDecryptionTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("receiver"); @@ -1949,7 +1949,7 @@ public class EncDecryptionTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("receiver"); @@ -2067,7 +2067,7 @@ public class EncDecryptionTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("receiver"); @@ -2194,7 +2194,7 @@ public class EncDecryptionTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("receiver"); @@ -2536,7 +2536,7 @@ public class EncDecryptionTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("receiver"); @@ -2703,4 +2703,4 @@ public class EncDecryptionTest extends AbstractTestBase { assertEquals(nodeList.getLength(), 0); } } -} \ No newline at end of file +} diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncryptionCRLTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncryptionCRLTest.java index 9f31038..7e4a19a 100644 --- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncryptionCRLTest.java +++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/EncryptionCRLTest.java @@ -55,7 +55,7 @@ public class EncryptionCRLTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("keys/wss40rev.jks"), "security".toCharArray()); securityProperties.setEncryptionUser("wss40rev"); @@ -106,7 +106,7 @@ public class EncryptionCRLTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setEnableRevocation(true); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("keys/wss40rev.jks"), "security".toCharArray()); diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/HeaderOrderingTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/HeaderOrderingTest.java index ec973f1..0f12854 100644 --- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/HeaderOrderingTest.java +++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/HeaderOrderingTest.java @@ -467,7 +467,7 @@ public class HeaderOrderingTest extends AbstractTestBase { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); actions.add(WSSConstants.USERNAMETOKEN); actions.add(WSSConstants.TIMESTAMP); securityProperties.setActions(actions); @@ -534,7 +534,7 @@ public class HeaderOrderingTest extends AbstractTestBase { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); actions.add(WSSConstants.USERNAMETOKEN); actions.add(WSSConstants.TIMESTAMP); securityProperties.setActions(actions); @@ -711,7 +711,7 @@ public class HeaderOrderingTest extends AbstractTestBase { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); actions.add(WSSConstants.USERNAMETOKEN); actions.add(WSSConstants.TIMESTAMP); securityProperties.setActions(actions); diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java index 1ab93dd..15cae7e 100644 --- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java +++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/InteroperabilityTest.java @@ -485,7 +485,7 @@ public class InteroperabilityTest extends AbstractTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -505,7 +505,7 @@ public class InteroperabilityTest extends AbstractTestBase { securityProperties.setSignatureUser("transmitter"); securityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); actions.add(WSSConstants.SIGNATURE); actions.add(WSSConstants.TIMESTAMP); securityProperties.setActions(actions); @@ -710,7 +710,7 @@ public class InteroperabilityTest extends AbstractTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("receiver.jks"), "default".toCharArray()); securityProperties.setSignatureUser("receiver"); @@ -753,7 +753,7 @@ public class InteroperabilityTest extends AbstractTestBase { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); @@ -807,7 +807,7 @@ public class InteroperabilityTest extends AbstractTestBase { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadSignatureKeyStore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); @@ -1155,7 +1155,7 @@ public class InteroperabilityTest extends AbstractTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -1180,7 +1180,7 @@ public class InteroperabilityTest extends AbstractTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -1210,7 +1210,7 @@ public class InteroperabilityTest extends AbstractTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.2.xml"); @@ -1235,7 +1235,7 @@ public class InteroperabilityTest extends AbstractTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.2.xml"); diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/MultipleActionTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/MultipleActionTest.java index 0d20d7a..7555244 100644 --- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/MultipleActionTest.java +++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/MultipleActionTest.java @@ -100,8 +100,8 @@ public class MultipleActionTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("transmitter"); diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/OutputChainTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/OutputChainTest.java index 7d255dd..e866c88 100644 --- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/OutputChainTest.java +++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/OutputChainTest.java @@ -49,7 +49,7 @@ public class OutputChainTest extends AbstractTestBase { public void testEncryptionAction() throws Exception { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("receiver.jks"), "default".toCharArray()); securityProperties.setEncryptionUser("receiver"); diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PasswordEncryptorTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PasswordEncryptorTest.java index ad57c7b..e7e3fa4 100644 --- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PasswordEncryptorTest.java +++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/PasswordEncryptorTest.java @@ -113,7 +113,7 @@ public class PasswordEncryptorTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); securityProperties.setActions(actions); Properties properties = CryptoFactory.getProperties("transmitter-crypto-enc.properties", this.getClass().getClassLoader()); diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureEncryptionTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureEncryptionTest.java index cf91a4b..cef1665 100644 --- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureEncryptionTest.java +++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SignatureEncryptionTest.java @@ -77,7 +77,7 @@ public class SignatureEncryptionTest extends AbstractTestBase { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); actions.add(WSSConstants.TIMESTAMP); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); @@ -113,7 +113,7 @@ public class SignatureEncryptionTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); actions.add(WSSConstants.TIMESTAMP); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); @@ -188,7 +188,7 @@ public class SignatureEncryptionTest extends AbstractTestBase { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); actions.add(WSSConstants.TIMESTAMP); securityProperties.setActions(actions); securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray()); @@ -289,7 +289,7 @@ public class SignatureEncryptionTest extends AbstractTestBase { { WSSSecurityProperties securityProperties = new WSSSecurityProperties(); List<WSSConstants.Action> actions = new ArrayList<>(); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); actions.add(WSSConstants.SIGNATURE); actions.add(WSSConstants.TIMESTAMP); securityProperties.setActions(actions); diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsDecompressedBytesTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsDecompressedBytesTest.java index 43f7349..2f9c7e6 100644 --- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsDecompressedBytesTest.java +++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsDecompressedBytesTest.java @@ -60,7 +60,7 @@ public class VulnerabliltyVectorsDecompressedBytesTest extends AbstractTestBase List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outboundSecurityProperties.setActions(actions); outboundSecurityProperties.setEncryptionCompressionAlgorithm("http://www.apache.org/2012/04/xmlsec/xz"); diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java index 75404fb..9a6c298 100644 --- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java +++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/VulnerabliltyVectorsTest.java @@ -305,7 +305,7 @@ public class VulnerabliltyVectorsTest extends AbstractTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outboundSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"); @@ -389,7 +389,7 @@ public class VulnerabliltyVectorsTest extends AbstractTestBase { List<WSSConstants.Action> actions = new ArrayList<>(); actions.add(WSSConstants.TIMESTAMP); actions.add(WSSConstants.SIGNATURE); - actions.add(WSSConstants.ENCRYPT); + actions.add(WSSConstants.ENCRYPTION); outboundSecurityProperties.setActions(actions); InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");