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 2020/04/16 11:25:04 UTC
[ws-wss4j] branch master updated (09ca920 -> 507c7a0)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git.
from 09ca920 WSS-632 - Support EhCache 3+ (#10)
new 5be5140 Picking up changes from Santuario regarding StAX Encryption action
new a12eec5 WSS-668 - Rename WSSConstants ENCRYPT actions
new d40daa5 WSS-669 - Rename ConfigurationConstants ENCRYPT actions
new 507c7a0 Picking up some changes from SANTUARIO-536
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../integration/test/kerberos/KerberosTest.java | 80 ++++++++++++++++
.../wss4j/performance/PerformanceMemoryTest.java | 8 +-
.../wss4j/performance/PerformanceTimingTest.java | 8 +-
src/site/asciidoc/config.adoc | 11 ++-
.../wss4j/common/ConfigurationConstants.java | 21 ++++
.../org/apache/wss4j/dom/util/WSSecurityUtil.java | 12 ++-
.../apache/wss4j/dom/util/WSSecurityUtilTest.java | 106 +++++++++++++++++++++
.../test/AsymmetricBindingIntegrationTest.java | 50 +++++-----
.../stax/test/TransportBindingIntegrationTest.java | 28 +++---
.../policy/stax/test/VulnerabliltyVectorsTest.java | 4 +-
.../org/apache/wss4j/stax/ext/WSSConstants.java | 8 +-
.../org/apache/wss4j/stax/ext/WSSSecurePart.java | 6 +-
.../output/BinarySecurityTokenOutputProcessor.java | 14 +--
.../output/DerivedKeyTokenOutputProcessor.java | 4 +-
.../processor/output/EncryptOutputProcessor.java | 4 +-
.../output/EncryptedKeyOutputProcessor.java | 10 +-
.../processor/output/SAMLTokenOutputProcessor.java | 4 +-
.../SecurityContextTokenOutputProcessor.java | 2 +-
.../output/SecurityHeaderOutputProcessor.java | 8 +-
.../output/WSSSignatureOutputProcessor.java | 4 +-
.../wss4j/stax/setup/ConfigurationConverter.java | 15 +--
.../org/apache/wss4j/stax/setup/OutboundWSSec.java | 8 +-
.../java/org/apache/wss4j/stax/setup/WSSec.java | 4 +-
.../org/apache/wss4j/stax/test/AttachmentTest.java | 20 ++--
.../stax/test/ConfigurationConverterTest.java | 57 ++++++++++-
.../wss4j/stax/test/DerivedKeyTokenTest.java | 56 ++++++++---
.../apache/wss4j/stax/test/EncDecryptionTest.java | 102 ++++++++++----------
.../apache/wss4j/stax/test/EncryptionCRLTest.java | 4 +-
.../apache/wss4j/stax/test/HeaderOrderingTest.java | 12 +--
.../wss4j/stax/test/InteroperabilityTest.java | 60 ++++++------
.../apache/wss4j/stax/test/MultipleActionTest.java | 4 +-
.../apache/wss4j/stax/test/OutputChainTest.java | 2 +-
.../wss4j/stax/test/PasswordEncryptorTest.java | 4 +-
.../wss4j/stax/test/SecurityContextTokenTest.java | 10 +-
.../wss4j/stax/test/SignatureEncryptionTest.java | 16 ++--
.../org/apache/wss4j/stax/test/TimestampTest.java | 2 +-
.../VulnerabliltyVectorsDecompressedBytesTest.java | 2 +-
.../wss4j/stax/test/VulnerabliltyVectorsTest.java | 18 ++--
38 files changed, 548 insertions(+), 240 deletions(-)
create mode 100644 ws-security-dom/src/test/java/org/apache/wss4j/dom/util/WSSecurityUtilTest.java
[ws-wss4j] 01/04: Picking up changes from Santuario regarding StAX
Encryption action
Posted by co...@apache.org.
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 <co...@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");
[ws-wss4j] 03/04: WSS-669 - Rename ConfigurationConstants ENCRYPT
actions
Posted by co...@apache.org.
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 d40daa58cfb1fdfbbb4b7968eaf192a005a81f2f
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Apr 16 11:03:25 2020 +0100
WSS-669 - Rename ConfigurationConstants ENCRYPT actions
---
.../wss4j/performance/PerformanceMemoryTest.java | 4 +-
.../wss4j/performance/PerformanceTimingTest.java | 4 +-
src/site/asciidoc/config.adoc | 8 +-
.../wss4j/common/ConfigurationConstants.java | 14 +++
.../org/apache/wss4j/dom/util/WSSecurityUtil.java | 12 ++-
.../apache/wss4j/dom/util/WSSecurityUtilTest.java | 106 +++++++++++++++++++++
.../policy/stax/test/VulnerabliltyVectorsTest.java | 2 +-
.../wss4j/stax/setup/ConfigurationConverter.java | 6 +-
.../stax/test/ConfigurationConverterTest.java | 53 ++++++++++-
.../wss4j/stax/test/DerivedKeyTokenTest.java | 20 ++--
.../apache/wss4j/stax/test/EncDecryptionTest.java | 58 +++++------
.../apache/wss4j/stax/test/HeaderOrderingTest.java | 6 +-
.../wss4j/stax/test/InteroperabilityTest.java | 42 ++++----
.../wss4j/stax/test/PasswordEncryptorTest.java | 2 +-
.../wss4j/stax/test/SecurityContextTokenTest.java | 8 +-
.../wss4j/stax/test/SignatureEncryptionTest.java | 8 +-
.../org/apache/wss4j/stax/test/TimestampTest.java | 2 +-
.../wss4j/stax/test/VulnerabliltyVectorsTest.java | 14 +--
18 files changed, 274 insertions(+), 95 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 56c9e68..6c74aa4 100644
--- a/performance/src/test/java/org/apache/wss4j/performance/PerformanceMemoryTest.java
+++ b/performance/src/test/java/org/apache/wss4j/performance/PerformanceMemoryTest.java
@@ -334,7 +334,7 @@ public class PerformanceMemoryTest extends AbstractTestBase {
properties.setProperty(WSHandlerConstants.ENC_SYM_ALGO, "http://www.w3.org/2001/04/xmlenc#aes256-cbc");
properties.setProperty(WSHandlerConstants.ENC_KEY_TRANSPORT, "http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p");
properties.setProperty(WSHandlerConstants.TTL_TIMESTAMP, "" + 60 * 60 * 24 * 7);
- Document doc = doOutboundSecurityWithWSS4J(new FileInputStream(input), WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT, properties);
+ Document doc = doOutboundSecurityWithWSS4J(new FileInputStream(input), WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION, properties);
Transformer transformer = TransformerFactory.newInstance().newTransformer();
transformer.transform(new DOMSource(doc), new StreamResult(output));
}
@@ -367,7 +367,7 @@ public class PerformanceMemoryTest extends AbstractTestBase {
}
private void doDOMInSecurity(File input) throws Exception {
- String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.TTL_TIMESTAMP, "" + 60 * 60 * 24 * 7);
doInboundSecurityWithWSS4J_1(documentBuilderFactory.newDocumentBuilder().parse(input), action, properties, false);
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 2988856..ae3548d 100644
--- a/performance/src/test/java/org/apache/wss4j/performance/PerformanceTimingTest.java
+++ b/performance/src/test/java/org/apache/wss4j/performance/PerformanceTimingTest.java
@@ -254,7 +254,7 @@ public class PerformanceTimingTest extends AbstractTestBase {
properties.setProperty(WSHandlerConstants.ENC_SYM_ALGO, "http://www.w3.org/2001/04/xmlenc#aes256-cbc");
properties.setProperty(WSHandlerConstants.ENC_KEY_TRANSPORT, "http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p");
properties.setProperty(WSHandlerConstants.TTL_TIMESTAMP, "" + 60 * 60 * 24 * 7);
- Document doc = doOutboundSecurityWithWSS4J(new FileInputStream(input), WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT, properties);
+ Document doc = doOutboundSecurityWithWSS4J(new FileInputStream(input), WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION, properties);
Transformer transformer = TransformerFactory.newInstance().newTransformer();
transformer.transform(new DOMSource(doc), new StreamResult(output));
}
@@ -287,7 +287,7 @@ public class PerformanceTimingTest extends AbstractTestBase {
}
private void doDOMInSecurity(File input) throws Exception {
- String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.TTL_TIMESTAMP, "" + 60 * 60 * 24 * 7);
doInboundSecurityWithWSS4J_1(documentBuilderFactory.newDocumentBuilder().parse(input), action, properties, false);
diff --git a/src/site/asciidoc/config.adoc b/src/site/asciidoc/config.adoc
index f7ab907..d550a5e 100644
--- a/src/site/asciidoc/config.adoc
+++ b/src/site/asciidoc/config.adoc
@@ -119,11 +119,13 @@ The configuration tags for Actions are as follows:
* SAML_TOKEN_UNSIGNED (SAMLTokenUnsigned) - Perform an unsigned SAML Token action.
* SAML_TOKEN_SIGNED (SAMLTokenSigned) - Perform a signed SAML Token action.
* SIGNATURE (Signature) - Perform a signature action.
- * ENCRYPT (Encrypt) - Perform an encryption action.
+ * *WSS4J 2.3.0* ENCRYPTION (Encryption) - Perform an encryption action.
+Note that for previous releases, this configuration tag was called ENCRYPT (Encrypt).
* TIMESTAMP (Timestamp) - Perform a Timestamp action.
* *WSS4J 2.0.0* SIGNATURE_DERIVED (SignatureDerived) - Perform a Signature action with derived keys.
- * *WSS4J 2.0.0* ENCRYPT_DERIVED (EncryptDerived) - Perform a Encryption action with derived keys.
- * *WSS4J 2.0.0* SIGNATURE_WITH_KERBEROS_TOKEN (SignatureWithKerberosToken) - Perform a Signature action with a kerberos token. Only for StAX code.
+ * *WSS4J 2.3.0* ENCRYPTION_DERIVED (EncryptionDerived) - Perform a Encryption action with derived keys.
+Note that for releases from 2.0.0 → 2.2.x, this configuration tag was called ENCRYPT_DERIVED (EncryptDerived).
+* *WSS4J 2.0.0* SIGNATURE_WITH_KERBEROS_TOKEN (SignatureWithKerberosToken) - Perform a Signature action with a kerberos token. Only for StAX code.
* *WSS4J 2.3.0* ENCRYPTION_WITH_KERBEROS_TOKEN (EncryptionWithKerberosToken) - Perform a Encryption action with a kerberos token. Only for StAX code.
Note that for releases from 2.0.0 -> 2.2.x, this configuration tag was called ENCRYPT_WITH_KERBEROS_TOKEN (EncryptWithKerberosToken).
* *WSS4J 2.0.0* KERBEROS_TOKEN (KerberosToken) - Add a kerberos token. Only for StAX code.
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/ConfigurationConstants.java b/ws-security-common/src/main/java/org/apache/wss4j/common/ConfigurationConstants.java
index 16b6786..85208c3 100644
--- a/ws-security-common/src/main/java/org/apache/wss4j/common/ConfigurationConstants.java
+++ b/ws-security-common/src/main/java/org/apache/wss4j/common/ConfigurationConstants.java
@@ -77,9 +77,16 @@ public class ConfigurationConstants {
* Perform an Encryption action. The encryption specific parameters define how
* to encrypt, which keys to use, and so on.
*/
+ @Deprecated
public static final String ENCRYPT = "Encrypt";
/**
+ * Perform an Encryption action. The encryption specific parameters define how
+ * to encrypt, which keys to use, and so on.
+ */
+ public static final String ENCRYPTION = "Encryption";
+
+ /**
* Add a timestamp to the security header.
*/
public static final String TIMESTAMP = "Timestamp";
@@ -94,9 +101,16 @@ public class ConfigurationConstants {
* Perform an Encryption action with derived keys. The encryption specific parameters define how
* to encrypt, which keys to use, and so on.
*/
+ @Deprecated
public static final String ENCRYPT_DERIVED = "EncryptDerived";
/**
+ * Perform an Encryption action with derived keys. The encryption specific parameters define how
+ * to encrypt, which keys to use, and so on.
+ */
+ public static final String ENCRYPTION_DERIVED = "EncryptionDerived";
+
+ /**
* Perform a Signature action with a kerberos token. The signature specific parameters define how
* to sign, which keys to use, and so on.
*/
diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java
index 9bb281f..53d3bce 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java
@@ -539,9 +539,11 @@ public final class WSSecurityUtil {
actions.add(WSConstants.SIGN);
} else if (single[i].equals(WSHandlerConstants.SIGNATURE_DERIVED)) {
actions.add(WSConstants.DKT_SIGN);
- } else if (single[i].equals(WSHandlerConstants.ENCRYPT)) {
+ } else if (single[i].equals(WSHandlerConstants.ENCRYPT)
+ || single[i].equals(WSHandlerConstants.ENCRYPTION)) {
actions.add(WSConstants.ENCR);
- } else if (single[i].equals(WSHandlerConstants.ENCRYPT_DERIVED)) {
+ } else if (single[i].equals(WSHandlerConstants.ENCRYPT_DERIVED)
+ || single[i].equals(WSHandlerConstants.ENCRYPTION_DERIVED)) {
actions.add(WSConstants.DKT_ENCR);
} else if (single[i].equals(WSHandlerConstants.SAML_TOKEN_UNSIGNED)) {
actions.add(WSConstants.ST_UNSIGNED);
@@ -593,9 +595,11 @@ public final class WSSecurityUtil {
actions.add(new HandlerAction(WSConstants.SIGN));
} else if (single[i].equals(WSHandlerConstants.SIGNATURE_DERIVED)) {
actions.add(new HandlerAction(WSConstants.DKT_SIGN));
- } else if (single[i].equals(WSHandlerConstants.ENCRYPT)) {
+ } else if (single[i].equals(WSHandlerConstants.ENCRYPT)
+ || single[i].equals(WSHandlerConstants.ENCRYPTION)) {
actions.add(new HandlerAction(WSConstants.ENCR));
- } else if (single[i].equals(WSHandlerConstants.ENCRYPT_DERIVED)) {
+ } else if (single[i].equals(WSHandlerConstants.ENCRYPT_DERIVED)
+ || single[i].equals(WSHandlerConstants.ENCRYPTION_DERIVED)) {
actions.add(new HandlerAction(WSConstants.DKT_ENCR));
} else if (single[i].equals(WSHandlerConstants.SAML_TOKEN_UNSIGNED)) {
actions.add(new HandlerAction(WSConstants.ST_UNSIGNED));
diff --git a/ws-security-dom/src/test/java/org/apache/wss4j/dom/util/WSSecurityUtilTest.java b/ws-security-dom/src/test/java/org/apache/wss4j/dom/util/WSSecurityUtilTest.java
new file mode 100644
index 0000000..5005dec
--- /dev/null
+++ b/ws-security-dom/src/test/java/org/apache/wss4j/dom/util/WSSecurityUtilTest.java
@@ -0,0 +1,106 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.wss4j.dom.util;
+
+import java.util.List;
+
+import org.apache.wss4j.common.ConfigurationConstants;
+import org.apache.wss4j.dom.WSConstants;
+import org.apache.wss4j.dom.engine.WSSConfig;
+import org.apache.wss4j.dom.handler.HandlerAction;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+
+public class WSSecurityUtilTest {
+
+ @Test
+ public void testNewEncryptionAction() throws Exception {
+ String action = ConfigurationConstants.SIGNATURE + " " + ConfigurationConstants.ENCRYPTION;
+ List<Integer> decodeActions = WSSecurityUtil.decodeAction(action);
+ assertEquals(2, decodeActions.size());
+ assertEquals(WSConstants.SIGN, decodeActions.get(0));
+ assertEquals(WSConstants.ENCR, decodeActions.get(1));
+ }
+
+ @Test
+ public void testNewEncryptionHandlerAction() throws Exception {
+ String action = ConfigurationConstants.SIGNATURE + " " + ConfigurationConstants.ENCRYPTION;
+ List<HandlerAction> decodeActions = WSSecurityUtil.decodeHandlerAction(action, WSSConfig.getNewInstance());
+ assertEquals(2, decodeActions.size());
+ assertEquals(WSConstants.SIGN, decodeActions.get(0).getAction());
+ assertEquals(WSConstants.ENCR, decodeActions.get(1).getAction());
+ }
+
+ @Test
+ public void testDeprecatedEncryptionAction() throws Exception {
+ String action = ConfigurationConstants.SIGNATURE + " " + ConfigurationConstants.ENCRYPT;
+ List<Integer> decodeActions = WSSecurityUtil.decodeAction(action);
+ assertEquals(2, decodeActions.size());
+ assertEquals(WSConstants.SIGN, decodeActions.get(0));
+ assertEquals(WSConstants.ENCR, decodeActions.get(1));
+ }
+
+ @Test
+ public void testDeprecatedEncryptionHandlerAction() throws Exception {
+ String action = ConfigurationConstants.SIGNATURE + " " + ConfigurationConstants.ENCRYPT;
+ List<HandlerAction> decodeActions = WSSecurityUtil.decodeHandlerAction(action, WSSConfig.getNewInstance());
+ assertEquals(2, decodeActions.size());
+ assertEquals(WSConstants.SIGN, decodeActions.get(0).getAction());
+ assertEquals(WSConstants.ENCR, decodeActions.get(1).getAction());
+ }
+
+ @Test
+ public void testNewEncryptionDerivedAction() throws Exception {
+ String action = ConfigurationConstants.SIGNATURE + " " + ConfigurationConstants.ENCRYPTION_DERIVED;
+ List<Integer> decodeActions = WSSecurityUtil.decodeAction(action);
+ assertEquals(2, decodeActions.size());
+ assertEquals(WSConstants.SIGN, decodeActions.get(0));
+ assertEquals(WSConstants.DKT_ENCR, decodeActions.get(1));
+ }
+
+ @Test
+ public void testNewEncryptionHandlerDerivedAction() throws Exception {
+ String action = ConfigurationConstants.SIGNATURE + " " + ConfigurationConstants.ENCRYPTION_DERIVED;
+ List<HandlerAction> decodeActions = WSSecurityUtil.decodeHandlerAction(action, WSSConfig.getNewInstance());
+ assertEquals(2, decodeActions.size());
+ assertEquals(WSConstants.SIGN, decodeActions.get(0).getAction());
+ assertEquals(WSConstants.DKT_ENCR, decodeActions.get(1).getAction());
+ }
+
+ @Test
+ public void testDeprecatedEncryptionDerivedAction() throws Exception {
+ String action = ConfigurationConstants.SIGNATURE + " " + ConfigurationConstants.ENCRYPT_DERIVED;
+ List<Integer> decodeActions = WSSecurityUtil.decodeAction(action);
+ assertEquals(2, decodeActions.size());
+ assertEquals(WSConstants.SIGN, decodeActions.get(0));
+ assertEquals(WSConstants.DKT_ENCR, decodeActions.get(1));
+ }
+
+ @Test
+ public void testDeprecatedEncryptionHandlerDerivedAction() throws Exception {
+ String action = ConfigurationConstants.SIGNATURE + " " + ConfigurationConstants.ENCRYPT_DERIVED;
+ List<HandlerAction> decodeActions = WSSecurityUtil.decodeHandlerAction(action, WSSConfig.getNewInstance());
+ assertEquals(2, decodeActions.size());
+ assertEquals(WSConstants.SIGN, decodeActions.get(0).getAction());
+ assertEquals(WSConstants.DKT_ENCR, decodeActions.get(1).getAction());
+ }
+}
\ 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 5429201..e56078e 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
@@ -107,7 +107,7 @@ public class VulnerabliltyVectorsTest extends AbstractTestBase {
public void testSignedBodyRelocationToHeader() throws Exception {
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.SIGNATURE_PARTS, "{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body;");
properties.setProperty(WSHandlerConstants.ENC_SYM_ALGO, "http://www.w3.org/2001/04/xmlenc#aes256-cbc");
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 a44fa5a..5db798f 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
@@ -96,7 +96,8 @@ public final class ConfigurationConverter {
actions.add(WSSConstants.USERNAMETOKEN);
} else if (single[i].equals(ConfigurationConstants.SIGNATURE)) {
actions.add(WSSConstants.SIGNATURE);
- } else if (single[i].equals(ConfigurationConstants.ENCRYPT)) {
+ } else if (single[i].equals(ConfigurationConstants.ENCRYPT)
+ || single[i].equals(ConfigurationConstants.ENCRYPTION)) {
actions.add(WSSConstants.ENCRYPTION);
} else if (single[i].equals(ConfigurationConstants.SAML_TOKEN_UNSIGNED)) {
actions.add(WSSConstants.SAML_TOKEN_UNSIGNED);
@@ -108,7 +109,8 @@ public final class ConfigurationConverter {
actions.add(WSSConstants.USERNAMETOKEN_SIGNED);
} else if (single[i].equals(ConfigurationConstants.SIGNATURE_DERIVED)) {
actions.add(WSSConstants.SIGNATURE_WITH_DERIVED_KEY);
- } else if (single[i].equals(ConfigurationConstants.ENCRYPT_DERIVED)) {
+ } else if (single[i].equals(ConfigurationConstants.ENCRYPT_DERIVED)
+ || single[i].equals(ConfigurationConstants.ENCRYPTION_DERIVED)) {
actions.add(WSSConstants.ENCRYPTION_WITH_DERIVED_KEY);
} else if (single[i].equals(ConfigurationConstants.SIGNATURE_WITH_KERBEROS_TOKEN)) {
actions.add(WSSConstants.SIGNATURE_WITH_KERBEROS_TOKEN);
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 c13e18f..f60e06c 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
@@ -125,7 +125,7 @@ public class ConfigurationConverterTest extends AbstractTestBase {
@Test
public void testOutboundEncryptionConfiguration() throws Exception {
Map<String, Object> config = new HashMap<>();
- config.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
+ config.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPTION);
config.put(ConfigurationConstants.USER, "transmitter");
config.put(ConfigurationConstants.PW_CALLBACK_REF, new CallbackHandlerImpl());
config.put(ConfigurationConstants.ENC_KEY_TRANSPORT, WSSConstants.NS_XENC_RSA15);
@@ -156,8 +156,59 @@ public class ConfigurationConverterTest extends AbstractTestBase {
}
@Test
+ public void testOutboundEncryptionConfigurationOldConfigTag() throws Exception {
+ Map<String, Object> config = new HashMap<>();
+ config.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
+ config.put(ConfigurationConstants.USER, "transmitter");
+ config.put(ConfigurationConstants.PW_CALLBACK_REF, new CallbackHandlerImpl());
+ config.put(ConfigurationConstants.ENC_KEY_TRANSPORT, WSSConstants.NS_XENC_RSA15);
+ config.put(ConfigurationConstants.ENC_KEY_ID, "EncryptedKeySHA1");
+ config.put(ConfigurationConstants.ENC_PROP_FILE, "receiver-crypto.properties");
+ config.put(ConfigurationConstants.ENCRYPTION_PARTS,
+ "{}{http://schemas.xmlsoap.org/soap/envelope/}Body;");
+
+ WSSSecurityProperties properties = ConfigurationConverter.convert(config);
+
+ assertEquals(properties.getEncryptionUser(), "transmitter");
+ assertEquals(properties.getActions().size(), 1);
+ assertEquals(properties.getActions().get(0), WSSConstants.ENCRYPTION);
+ assertTrue(properties.getCallbackHandler() instanceof CallbackHandlerImpl);
+ assertEquals(properties.getEncryptionKeyTransportAlgorithm(),
+ WSSConstants.NS_XENC_RSA15);
+ assertEquals(properties.getEncryptionKeyIdentifier(),
+ WSSecurityTokenConstants.KEYIDENTIFIER_ENCRYPTED_KEY_SHA1_IDENTIFIER);
+ assertNotNull(properties.getEncryptionCrypto());
+ assertNotNull(properties.getEncryptionSecureParts());
+ assertEquals(properties.getEncryptionSecureParts().size(), 1);
+ assertEquals(properties.getEncryptionSecureParts().get(0).getName().getLocalPart(),
+ "Body");
+ assertEquals(properties.getEncryptionSecureParts().get(0).getName().getNamespaceURI(),
+ "http://schemas.xmlsoap.org/soap/envelope/");
+
+ WSSec.validateAndApplyDefaultsToOutboundSecurityProperties(properties);
+ }
+
+ @Test
public void testInboundEncryptionConfiguration() throws Exception {
Map<String, Object> config = new HashMap<>();
+ config.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPTION);
+ config.put(ConfigurationConstants.PW_CALLBACK_REF, new CallbackHandlerImpl());
+ config.put(ConfigurationConstants.DEC_PROP_FILE, "receiver-crypto.properties");
+ config.put(ConfigurationConstants.ALLOW_RSA15_KEY_TRANSPORT_ALGORITHM, "true");
+
+ WSSSecurityProperties properties = ConfigurationConverter.convert(config);
+
+ assertEquals(properties.getActions().size(), 1);
+ assertEquals(properties.getActions().get(0), WSSConstants.ENCRYPTION);
+ assertTrue(properties.getCallbackHandler() instanceof CallbackHandlerImpl);
+ assertNotNull(properties.getDecryptionCrypto());
+
+ WSSec.validateAndApplyDefaultsToInboundSecurityProperties(properties);
+ }
+
+ @Test
+ public void testInboundEncryptionConfigurationOldConfigTag() throws Exception {
+ Map<String, Object> config = new HashMap<>();
config.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
config.put(ConfigurationConstants.PW_CALLBACK_REF, new CallbackHandlerImpl());
config.put(ConfigurationConstants.DEC_PROP_FILE, "receiver-crypto.properties");
diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java
index a3bab34..64634af 100644
--- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java
+++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java
@@ -108,7 +108,7 @@ public class DerivedKeyTokenTest extends AbstractTestBase {
assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_SOAP11_BODY.getLocalPart());
}
{
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
}
@@ -140,7 +140,7 @@ public class DerivedKeyTokenTest extends AbstractTestBase {
assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_SOAP11_BODY.getLocalPart());
}
{
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
}
@@ -247,7 +247,7 @@ public class DerivedKeyTokenTest extends AbstractTestBase {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.ENCRYPT_DERIVED;
+ String action = WSHandlerConstants.ENCRYPTION_DERIVED;
Properties properties = new Properties();
properties.put(WSHandlerConstants.DERIVED_TOKEN_REFERENCE, "EncryptedKey");
@@ -346,7 +346,7 @@ public class DerivedKeyTokenTest extends AbstractTestBase {
assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_SOAP11_BODY.getLocalPart());
}
{
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
}
@@ -415,7 +415,7 @@ public class DerivedKeyTokenTest extends AbstractTestBase {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.ENCRYPT_DERIVED;
+ String action = WSHandlerConstants.ENCRYPTION_DERIVED;
Properties properties = new Properties();
properties.put(WSHandlerConstants.DERIVED_TOKEN_REFERENCE, "EncryptedKey");
@@ -479,7 +479,7 @@ public class DerivedKeyTokenTest extends AbstractTestBase {
assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_WSSE_SECURITY.getLocalPart());
}
{
- String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
}
@@ -621,7 +621,7 @@ public class DerivedKeyTokenTest extends AbstractTestBase {
assertEquals(nodeList.getLength(), 1);
}
{
- String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
}
@@ -755,7 +755,7 @@ public class DerivedKeyTokenTest extends AbstractTestBase {
assertEquals(nodeList.getLength(), 1);
}
{
- String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
}
@@ -888,7 +888,7 @@ public class DerivedKeyTokenTest extends AbstractTestBase {
assertEquals(nodeList.getLength(), 1);
}
{
- String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
}
@@ -1098,7 +1098,7 @@ public class DerivedKeyTokenTest extends AbstractTestBase {
{
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.SIGNATURE_DERIVED + " " + WSHandlerConstants.ENCRYPT_DERIVED;
+ String action = WSHandlerConstants.SIGNATURE_DERIVED + " " + WSHandlerConstants.ENCRYPTION_DERIVED;
Properties properties = new Properties();
properties.put(WSHandlerConstants.DERIVED_TOKEN_REFERENCE, "EncryptedKey");
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 2eabdde..ad9b812 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
@@ -146,7 +146,7 @@ public class EncDecryptionTest extends AbstractTestBase {
//done encryption; now test decryption:
{
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
}
@@ -158,7 +158,7 @@ public class EncDecryptionTest extends AbstractTestBase {
{
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
Document securedDocument = doOutboundSecurityWithWSS4J(sourceDocument, action, new Properties());
//some test that we can really sure we get what we want from WSS4J
@@ -290,7 +290,7 @@ public class EncDecryptionTest extends AbstractTestBase {
//done encryption; now test decryption:
{
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
}
@@ -302,7 +302,7 @@ public class EncDecryptionTest extends AbstractTestBase {
{
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
Document securedDocument = doOutboundSecurityWithWSS4J(sourceDocument, action, new Properties());
//some test that we can really sure we get what we want from WSS4J
@@ -430,7 +430,7 @@ public class EncDecryptionTest extends AbstractTestBase {
//done encryption; now test decryption:
{
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
}
@@ -442,7 +442,7 @@ public class EncDecryptionTest extends AbstractTestBase {
{
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.ENCRYPTION_PARTS, "{Content}{http://www.w3.org/1999/XMLSchema}simpleType;");
Document securedDocument = doOutboundSecurityWithWSS4J(sourceDocument, action, properties);
@@ -705,7 +705,7 @@ public class EncDecryptionTest extends AbstractTestBase {
//done encryption; now test decryption:
{
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
}
@@ -744,7 +744,7 @@ public class EncDecryptionTest extends AbstractTestBase {
//done encryption; now test decryption:
{
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
}
@@ -755,7 +755,7 @@ public class EncDecryptionTest extends AbstractTestBase {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.ENCRYPTION_PARTS, "{Element}{http://www.w3.org/1999/XMLSchema}simpleType;");
@@ -872,7 +872,7 @@ public class EncDecryptionTest extends AbstractTestBase {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-encryptedHeader.xml");
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.ENCRYPTION_PARTS, "{Header}{http://www.example.com}testEncryptedHeader;");
@@ -1073,7 +1073,7 @@ public class EncDecryptionTest extends AbstractTestBase {
//done encryption; now test decryption:
{
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
}
@@ -1084,7 +1084,7 @@ public class EncDecryptionTest extends AbstractTestBase {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.ENC_KEY_ID, "IssuerSerial");
Document securedDocument = doOutboundSecurityWithWSS4J(sourceDocument, action, properties);
@@ -1150,7 +1150,7 @@ public class EncDecryptionTest extends AbstractTestBase {
//done encryption; now test decryption:
{
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
}
@@ -1161,7 +1161,7 @@ public class EncDecryptionTest extends AbstractTestBase {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.ENC_KEY_ID, "DirectReference");
Document securedDocument = doOutboundSecurityWithWSS4J(sourceDocument, action, properties);
@@ -1201,7 +1201,7 @@ public class EncDecryptionTest extends AbstractTestBase {
* ByteArrayOutputStream baos = new ByteArrayOutputStream();
* {
* InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- * String action = WSHandlerConstants.ENCRYPT;
+ * String action = WSHandlerConstants.ENCRYPTION;
* Properties properties = new Properties();
* properties.setProperty(WSHandlerConstants.ENC_KEY_ID, "DirectReference");
* Document securedDocument = doOutboundSecurityWithWSS4J(sourceDocument, action, properties);
@@ -1319,7 +1319,7 @@ public class EncDecryptionTest extends AbstractTestBase {
//done encryption; now test decryption:
{
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
doInboundSecurityWithWSS4J_1(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action, properties, false);
}
@@ -1331,7 +1331,7 @@ public class EncDecryptionTest extends AbstractTestBase {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.ENC_KEY_ID, "X509KeyIdentifier");
Document securedDocument = doOutboundSecurityWithWSS4J(sourceDocument, action, properties);
@@ -1397,7 +1397,7 @@ public class EncDecryptionTest extends AbstractTestBase {
//done encryption; now test decryption:
{
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
}
@@ -1408,7 +1408,7 @@ public class EncDecryptionTest extends AbstractTestBase {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.ENC_KEY_ID, "SKIKeyIdentifier");
Document securedDocument = doOutboundSecurityWithWSS4J(sourceDocument, action, properties);
@@ -1474,7 +1474,7 @@ public class EncDecryptionTest extends AbstractTestBase {
//done encryption; now test decryption:
{
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
}
@@ -1485,7 +1485,7 @@ public class EncDecryptionTest extends AbstractTestBase {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.ENC_KEY_ID, "Thumbprint");
Document securedDocument = doOutboundSecurityWithWSS4J(sourceDocument, action, properties);
@@ -1555,7 +1555,7 @@ public class EncDecryptionTest extends AbstractTestBase {
//done encryption; now test decryption:
{
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
}
@@ -1666,7 +1666,7 @@ public class EncDecryptionTest extends AbstractTestBase {
{
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
Document securedDocument = doOutboundSecurityWithWSS4J(sourceDocument, action, new Properties());
Transformer transformer = TRANSFORMER_FACTORY.newTransformer();
@@ -1886,7 +1886,7 @@ public class EncDecryptionTest extends AbstractTestBase {
//done encryption; now test decryption:
{
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
} finally {
@@ -1900,7 +1900,7 @@ public class EncDecryptionTest extends AbstractTestBase {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.put(WSHandlerConstants.ENC_SYM_ALGO, "http://www.w3.org/2009/xmlenc11#aes128-gcm");
properties.put(WSHandlerConstants.ENC_KEY_TRANSPORT, "http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p");
@@ -1997,7 +1997,7 @@ public class EncDecryptionTest extends AbstractTestBase {
}
//done encryption; now test decryption:
{
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
} finally {
@@ -2011,7 +2011,7 @@ public class EncDecryptionTest extends AbstractTestBase {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.put(WSHandlerConstants.ENC_SYM_ALGO, "http://www.w3.org/2009/xmlenc11#aes192-gcm");
properties.put(WSHandlerConstants.ENC_KEY_TRANSPORT, "http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p");
@@ -2387,7 +2387,7 @@ public class EncDecryptionTest extends AbstractTestBase {
ByteArrayOutputStream baos;
{
Map<String, Object> config = new HashMap<>();
- config.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
+ config.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPTION);
config.put(ConfigurationConstants.ENCRYPTION_USER, "receiver");
config.put(ConfigurationConstants.ENC_PROP_FILE, "transmitter-crypto.properties");
@@ -2454,7 +2454,7 @@ public class EncDecryptionTest extends AbstractTestBase {
//test streaming decryption
{
Map<String, Object> config = new HashMap<>();
- config.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPT);
+ config.put(ConfigurationConstants.ACTION, ConfigurationConstants.ENCRYPTION);
config.put(ConfigurationConstants.DEC_PROP_FILE, "receiver-crypto.properties");
config.put(ConfigurationConstants.PW_CALLBACK_REF, new CallbackHandlerImpl());
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 0f12854..e3be269 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
@@ -521,7 +521,7 @@ public class HeaderOrderingTest extends AbstractTestBase {
//done UsernameToken; now verification:
{
- String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.USERNAME_TOKEN + " " + WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.USERNAME_TOKEN + " " + WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.ENCRYPTION;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
}
@@ -592,7 +592,7 @@ public class HeaderOrderingTest extends AbstractTestBase {
//done UsernameToken; now verification:
{
- String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.USERNAME_TOKEN + " " + WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.USERNAME_TOKEN + " " + WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.ENCRYPTION;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
}
@@ -772,7 +772,7 @@ public class HeaderOrderingTest extends AbstractTestBase {
//done UsernameToken; now verification:
{
- String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.USERNAME_TOKEN + " " + WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.USERNAME_TOKEN + " " + WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.ENCRYPTION;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
}
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 15cae7e..7f17462 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
@@ -83,7 +83,7 @@ public class InteroperabilityTest extends AbstractTestBase {
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.SIGNATURE_PARTS, "{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body;");
Document securedDocument = doOutboundSecurityWithWSS4J(sourceDocument, action, properties);
@@ -184,7 +184,7 @@ public class InteroperabilityTest extends AbstractTestBase {
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.2.xml");
- String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.SIGNATURE_PARTS, "{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://www.w3.org/2003/05/soap-envelope}Body;");
Document securedDocument = doOutboundSecurityWithWSS4J(sourceDocument, action, properties);
@@ -239,7 +239,7 @@ public class InteroperabilityTest extends AbstractTestBase {
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.SIGNATURE_PARTS, "{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body;");
properties.setProperty(WSHandlerConstants.ENCRYPTION_PARTS, "{Element}{http://www.w3.org/2000/09/xmldsig#}Signature;{Content}{http://schemas.xmlsoap.org/soap/envelope/}Body;");
@@ -353,7 +353,7 @@ public class InteroperabilityTest extends AbstractTestBase {
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.ENCRYPT + " " + WSHandlerConstants.SIGNATURE;
+ String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.ENCRYPTION + " " + WSHandlerConstants.SIGNATURE;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.SIGNATURE_PARTS, "{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body;");
properties.setProperty(WSHandlerConstants.ENCRYPTION_PARTS, "{Content}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Content}{http://schemas.xmlsoap.org/soap/envelope/}Body;");
@@ -389,7 +389,7 @@ public class InteroperabilityTest extends AbstractTestBase {
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.ENCRYPT + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.TIMESTAMP;
+ String action = WSHandlerConstants.ENCRYPTION + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.TIMESTAMP;
Document securedDocument = doOutboundSecurityWithWSS4J(sourceDocument, action, new Properties());
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -491,7 +491,7 @@ public class InteroperabilityTest extends AbstractTestBase {
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
ByteArrayOutputStream baos = doOutboundSecurity(securityProperties, sourceDocument);
- String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
@@ -513,7 +513,7 @@ public class InteroperabilityTest extends AbstractTestBase {
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
ByteArrayOutputStream baos = doOutboundSecurity(securityProperties, sourceDocument);
- String action = WSHandlerConstants.ENCRYPT + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.TIMESTAMP;
+ String action = WSHandlerConstants.ENCRYPTION + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.TIMESTAMP;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
@@ -542,7 +542,7 @@ public class InteroperabilityTest extends AbstractTestBase {
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.SIGNATURE_PARTS, "{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body;");
properties.setProperty(WSHandlerConstants.ENCRYPTION_PARTS, "{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Content}{http://schemas.xmlsoap.org/soap/envelope/}Body;");
@@ -663,7 +663,7 @@ public class InteroperabilityTest extends AbstractTestBase {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.SIGNATURE_PARTS, "{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body;");
Map<String, Object> messageContext = doOutboundSecurityWithWSS4J_1(sourceDocument, action, properties);
@@ -739,7 +739,7 @@ public class InteroperabilityTest extends AbstractTestBase {
//verify SigConf response:
{
- String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
doInboundSecurityWithWSS4J_1(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action, properties, true);
}
@@ -782,7 +782,7 @@ public class InteroperabilityTest extends AbstractTestBase {
//done signature; now test sig-verification:
{
- String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
doInboundSecurityWithWSS4J_1(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action, properties, false);
}
@@ -829,7 +829,7 @@ public class InteroperabilityTest extends AbstractTestBase {
}
{
- String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
doInboundSecurityWithWSS4J_1(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action, properties, false);
}
@@ -952,7 +952,7 @@ public class InteroperabilityTest extends AbstractTestBase {
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.SIGNATURE_PARTS, "{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body;");
properties.setProperty(WSHandlerConstants.ACTOR, "test");
@@ -1008,7 +1008,7 @@ public class InteroperabilityTest extends AbstractTestBase {
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.SIGNATURE_PARTS, "{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body;");
properties.setProperty(WSHandlerConstants.ACTOR, "test");
@@ -1050,7 +1050,7 @@ public class InteroperabilityTest extends AbstractTestBase {
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.2.xml");
- String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.ACTOR, "test");
properties.setProperty(WSHandlerConstants.SIGNATURE_PARTS, "{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://www.w3.org/2003/05/soap-envelope}Body;");
@@ -1106,7 +1106,7 @@ public class InteroperabilityTest extends AbstractTestBase {
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.2.xml");
- String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.SIGNATURE_PARTS, "{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://www.w3.org/2003/05/soap-envelope}Body;");
Document securedDocument = doOutboundSecurityWithWSS4J(sourceDocument, action, properties);
@@ -1161,7 +1161,7 @@ public class InteroperabilityTest extends AbstractTestBase {
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
ByteArrayOutputStream baos = doOutboundSecurity(securityProperties, sourceDocument);
- String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.ACTOR, "test");
doInboundSecurityWithWSS4J_1(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action, properties, false);
@@ -1186,7 +1186,7 @@ public class InteroperabilityTest extends AbstractTestBase {
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
ByteArrayOutputStream baos = doOutboundSecurity(securityProperties, sourceDocument);
- String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.ACTOR, "anotherTest");
try {
@@ -1217,7 +1217,7 @@ public class InteroperabilityTest extends AbstractTestBase {
ByteArrayOutputStream baos = doOutboundSecurity(securityProperties, sourceDocument);
- String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.ACTOR, "test");
doInboundSecurityWithWSS4J_1(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action, properties, false);
@@ -1245,7 +1245,7 @@ public class InteroperabilityTest extends AbstractTestBase {
securityProperties.setActor("test");
baos = doOutboundSecurity(securityProperties, new ByteArrayInputStream(baos.toByteArray()));
- String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.ACTOR, "test");
doInboundSecurityWithWSS4J_1(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action, properties, false);
@@ -1259,7 +1259,7 @@ public class InteroperabilityTest extends AbstractTestBase {
while (i < e) {
- String action = WSHandlerConstants.USERNAME_TOKEN + " " + WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.USERNAME_TOKEN + " " + WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
Document securedDocument = doOutboundSecurityWithWSS4J(sourceDocument, action, properties);
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 e7e3fa4..c55bce8 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
@@ -159,7 +159,7 @@ public class PasswordEncryptorTest extends AbstractTestBase {
//done encryption; now test decryption:
{
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
}
diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java
index 52a00c4..01a1698 100644
--- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java
+++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java
@@ -119,7 +119,7 @@ public class SecurityContextTokenTest extends AbstractTestBase {
assertEquals(nodeList.getLength(), 0);
}
{
- String action = WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
WSS4JCallbackHandlerImpl callbackHandler = new WSS4JCallbackHandlerImpl(secret);
properties.put(WSHandlerConstants.PW_CALLBACK_REF, callbackHandler);
@@ -222,7 +222,7 @@ public class SecurityContextTokenTest extends AbstractTestBase {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.ENCRYPT_DERIVED;
+ String action = WSHandlerConstants.ENCRYPTION_DERIVED;
Properties properties = new Properties();
CallbackHandlerImpl callbackHandler = new CallbackHandlerImpl(tempSecret);
@@ -707,7 +707,7 @@ public class SecurityContextTokenTest extends AbstractTestBase {
{
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
String action =
- WSHandlerConstants.SIGNATURE_DERIVED + " " + WSHandlerConstants.ENCRYPT_DERIVED;
+ WSHandlerConstants.SIGNATURE_DERIVED + " " + WSHandlerConstants.ENCRYPTION_DERIVED;
Properties properties = new Properties();
CallbackHandlerImpl callbackHandler = new CallbackHandlerImpl(tempSecret);
@@ -933,7 +933,7 @@ public class SecurityContextTokenTest extends AbstractTestBase {
{
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
String action =
- WSHandlerConstants.ENCRYPT_DERIVED + " " + WSHandlerConstants.SIGNATURE_DERIVED;
+ WSHandlerConstants.ENCRYPTION_DERIVED + " " + WSHandlerConstants.SIGNATURE_DERIVED;
Properties properties = new Properties();
CallbackHandlerImpl callbackHandler = new CallbackHandlerImpl(tempSecret);
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 cef1665..a0b01dd 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
@@ -101,7 +101,7 @@ public class SignatureEncryptionTest extends AbstractTestBase {
//done encryption; now test decryption:
{
- String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT + " " + WSHandlerConstants.TIMESTAMP;
+ String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION + " " + WSHandlerConstants.TIMESTAMP;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
}
@@ -175,7 +175,7 @@ public class SignatureEncryptionTest extends AbstractTestBase {
//done encryption; now test decryption:
{
- String action = WSHandlerConstants.ENCRYPT + " " + WSHandlerConstants.TIMESTAMP;
+ String action = WSHandlerConstants.ENCRYPTION + " " + WSHandlerConstants.TIMESTAMP;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
}
@@ -277,7 +277,7 @@ public class SignatureEncryptionTest extends AbstractTestBase {
//done encryption; now test decryption:
{
- String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT + " " + WSHandlerConstants.TIMESTAMP;
+ String action = WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION + " " + WSHandlerConstants.TIMESTAMP;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
}
@@ -379,7 +379,7 @@ public class SignatureEncryptionTest extends AbstractTestBase {
//done encryption; now test decryption:
{
- String action = WSHandlerConstants.ENCRYPT + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.TIMESTAMP;
+ String action = WSHandlerConstants.ENCRYPTION + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.TIMESTAMP;
doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
}
}
diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java
index 46404b6..5dc850c 100644
--- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java
+++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/TimestampTest.java
@@ -225,7 +225,7 @@ public class TimestampTest extends AbstractTestBase {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
{
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.ENCRYPTION;
Properties outboundProperties = new Properties();
outboundProperties.setProperty(WSHandlerConstants.TTL_TIMESTAMP, "1");
outboundProperties.setProperty(WSHandlerConstants.ENCRYPTION_PARTS, "{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;");
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 9a6c298..4011953 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
@@ -59,7 +59,7 @@ public class VulnerabliltyVectorsTest extends AbstractTestBase {
public void testRecursiveKeyReferencesDOS() throws Exception {
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.SIGNATURE_PARTS, "{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body;");
Document securedDocument = doOutboundSecurityWithWSS4J(sourceDocument, action, properties);
@@ -118,7 +118,7 @@ public class VulnerabliltyVectorsTest extends AbstractTestBase {
public void testRecursiveKeyReferencesDOS2() throws Exception {
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.SIGNATURE_PARTS, "{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body;");
Document securedDocument = doOutboundSecurityWithWSS4J(sourceDocument, action, properties);
@@ -149,7 +149,7 @@ public class VulnerabliltyVectorsTest extends AbstractTestBase {
Element securityHeaderNode = (Element) encryptedKeyElement.getParentNode();
securityHeaderNode.insertBefore(clonedEncryptedElement, encryptedKeyElement);
- doInboundSecurityWithWSS4J(securedDocument, WSHandlerConstants.ENCRYPT);
+ doInboundSecurityWithWSS4J(securedDocument, WSHandlerConstants.ENCRYPTION);
}
*/
@@ -163,7 +163,7 @@ public class VulnerabliltyVectorsTest extends AbstractTestBase {
public void test_publicURIReferenceDOS() throws Exception {
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.SIGNATURE_PARTS, "{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body;");
properties.setProperty(WSHandlerConstants.ENC_SYM_ALGO, "http://www.w3.org/2001/04/xmlenc#aes256-cbc");
@@ -208,7 +208,7 @@ public class VulnerabliltyVectorsTest extends AbstractTestBase {
public void test_DosAttackWithRecursiveEntity() throws Exception {
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.SIGNATURE_PARTS, "{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body;");
properties.setProperty(WSHandlerConstants.ENC_SYM_ALGO, "http://www.w3.org/2001/04/xmlenc#aes256-cbc");
@@ -268,7 +268,7 @@ public class VulnerabliltyVectorsTest extends AbstractTestBase {
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.SIGNATURE_PARTS, "{Element}{http://www.w3.org/1999/XMLSchema}complexType;{Element}{http://www.w3.org/1999/XMLSchema}simpleType;");
Document securedDocument = doOutboundSecurityWithWSS4J(sourceDocument, action, properties);
@@ -333,7 +333,7 @@ public class VulnerabliltyVectorsTest extends AbstractTestBase {
InputStream sourceDocument = this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml");
- String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPT;
+ String action = WSHandlerConstants.TIMESTAMP + " " + WSHandlerConstants.SIGNATURE + " " + WSHandlerConstants.ENCRYPTION;
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.SIGNATURE_PARTS, "{Element}{http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd}Timestamp;{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body;");
Document securedDocument = doOutboundSecurityWithWSS4J(sourceDocument, action, properties);
[ws-wss4j] 04/04: Picking up some changes from SANTUARIO-536
Posted by co...@apache.org.
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 507c7a00dd31cca286d0d3d7451cb7da068f926a
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Apr 16 12:24:32 2020 +0100
Picking up some changes from SANTUARIO-536
---
.../src/main/java/org/apache/wss4j/stax/ext/WSSSecurePart.java | 6 +++++-
.../wss4j/stax/impl/processor/output/EncryptOutputProcessor.java | 4 ++--
.../stax/impl/processor/output/SAMLTokenOutputProcessor.java | 4 ++--
.../stax/impl/processor/output/SecurityHeaderOutputProcessor.java | 8 ++++----
.../stax/impl/processor/output/WSSSignatureOutputProcessor.java | 4 ++--
5 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurePart.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurePart.java
index 4d5e4b2..102c134 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurePart.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurePart.java
@@ -29,6 +29,10 @@ public class WSSSecurePart extends SecurePart {
private String idToReference;
+ public WSSSecurePart(Modifier modifier) {
+ super(modifier);
+ }
+
public WSSSecurePart(QName name, Modifier modifier) {
super(name, modifier);
}
@@ -64,4 +68,4 @@ public class WSSSecurePart extends SecurePart {
public void setIdToReference(String idToReference) {
this.idToReference = idToReference;
}
-}
\ No newline at end of file
+}
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java
index 5f2baa1..6bff9a6 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java
@@ -110,10 +110,10 @@ public class EncryptOutputProcessor extends AbstractEncryptOutputProcessor {
outputProcessorChain.getSecurityContext().getAsMap(WSSConstants.SIGNATURE_PARTS);
if (dynamicSecureParts != null && securePart.getName() != null
&& securePart.equals(dynamicSecureParts.get(securePart.getName()))) {
- securePart.setIdToSign(encryptionPartDef.getEncRefId());
+ securePart.setIdToSecure(encryptionPartDef.getEncRefId());
outputProcessorChain.getSecurityContext().putAsMap(
WSSConstants.SIGNATURE_PARTS,
- securePart.getIdToSign(),
+ securePart.getIdToSecure(),
securePart
);
}
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java
index 6e22962..f500ad5 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java
@@ -186,7 +186,7 @@ public class SAMLTokenOutputProcessor extends AbstractOutputProcessor {
securityProperties.getSignatureSecureParts().iterator();
while (signaturePartsIterator.hasNext()) {
SecurePart securePart = signaturePartsIterator.next();
- if (samlAssertionWrapper.getId().equals(securePart.getIdToSign())
+ if (samlAssertionWrapper.getId().equals(securePart.getIdToSecure())
|| assertionName.equals(securePart.getName())) {
includeSTR = true;
signaturePartsIterator.remove();
@@ -214,7 +214,7 @@ public class SAMLTokenOutputProcessor extends AbstractOutputProcessor {
WSSSecurePart securePart =
new WSSSecurePart(
new QName(WSSConstants.SOAPMESSAGE_NS10_STR_TRANSFORM), SecurePart.Modifier.Element);
- securePart.setIdToSign(tokenId);
+ securePart.setIdToSecure(tokenId);
securePart.setIdToReference(securityTokenReferenceId);
outputProcessorChain.getSecurityContext().putAsMap(WSSConstants.SIGNATURE_PARTS, tokenId, securePart);
}
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderOutputProcessor.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderOutputProcessor.java
index d589d83..546fe50 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderOutputProcessor.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderOutputProcessor.java
@@ -70,7 +70,7 @@ public class SecurityHeaderOutputProcessor extends AbstractOutputProcessor {
// Check to see if the wrong SOAP NS was used
changeSOAPNamespace(securePart, soapMessageVersion);
- if (securePart.getIdToSign() == null) {
+ if (securePart.getIdToSecure() == null) {
outputProcessorChain.getSecurityContext().putAsMap(
WSSConstants.ENCRYPTION_PARTS,
securePart.getName(),
@@ -79,7 +79,7 @@ public class SecurityHeaderOutputProcessor extends AbstractOutputProcessor {
} else {
outputProcessorChain.getSecurityContext().putAsMap(
WSSConstants.ENCRYPTION_PARTS,
- securePart.getIdToSign(),
+ securePart.getIdToSecure(),
securePart
);
}
@@ -91,7 +91,7 @@ public class SecurityHeaderOutputProcessor extends AbstractOutputProcessor {
// Check to see if the wrong SOAP NS was used
changeSOAPNamespace(securePart, soapMessageVersion);
- if (securePart.getIdToSign() == null) {
+ if (securePart.getIdToSecure() == null) {
outputProcessorChain.getSecurityContext().putAsMap(
WSSConstants.SIGNATURE_PARTS,
securePart.getName(),
@@ -100,7 +100,7 @@ public class SecurityHeaderOutputProcessor extends AbstractOutputProcessor {
} else {
outputProcessorChain.getSecurityContext().putAsMap(
WSSConstants.SIGNATURE_PARTS,
- securePart.getIdToSign(),
+ securePart.getIdToSecure(),
securePart
);
}
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java
index 53420d3..ffd3839 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java
@@ -98,7 +98,7 @@ public class WSSSignatureOutputProcessor extends AbstractSignatureOutputProcesso
signaturePartDef.setDigestAlgo(getSecurityProperties().getSignatureDigestAlgorithm());
}
- if (securePart.getIdToSign() == null) {
+ if (securePart.getIdToSecure() == null) {
signaturePartDef.setGenerateXPointer(securePart.isGenerateXPointer());
signaturePartDef.setSigRefId(IDGenerator.generateID(null));
@@ -121,7 +121,7 @@ public class WSSSignatureOutputProcessor extends AbstractSignatureOutputProcesso
};
signaturePartDef.setTransforms(transforms);
} else {
- signaturePartDef.setSigRefId(securePart.getIdToSign());
+ signaturePartDef.setSigRefId(securePart.getIdToSecure());
}
}
[ws-wss4j] 02/04: WSS-668 - Rename WSSConstants ENCRYPT actions
Posted by co...@apache.org.
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 a12eec565d0b41c8b8210927f352a556e17d73c6
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Apr 16 10:25:11 2020 +0100
WSS-668 - Rename WSSConstants ENCRYPT actions
---
.../integration/test/kerberos/KerberosTest.java | 80 ++++++++++++++++++++++
src/site/asciidoc/config.adoc | 3 +-
.../wss4j/common/ConfigurationConstants.java | 7 ++
.../test/AsymmetricBindingIntegrationTest.java | 4 +-
.../org/apache/wss4j/stax/ext/WSSConstants.java | 8 ++-
.../output/BinarySecurityTokenOutputProcessor.java | 8 +--
.../output/DerivedKeyTokenOutputProcessor.java | 4 +-
.../output/EncryptedKeyOutputProcessor.java | 4 +-
.../SecurityContextTokenOutputProcessor.java | 2 +-
.../wss4j/stax/setup/ConfigurationConverter.java | 7 +-
.../org/apache/wss4j/stax/setup/OutboundWSSec.java | 6 +-
.../java/org/apache/wss4j/stax/setup/WSSec.java | 4 +-
.../wss4j/stax/test/DerivedKeyTokenTest.java | 38 +++++++++-
.../wss4j/stax/test/SecurityContextTokenTest.java | 2 +-
14 files changed, 151 insertions(+), 26 deletions(-)
diff --git a/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java b/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java
index 8bcd973..f91effe 100644
--- a/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java
+++ b/integration/src/test/java/org/apache/wss4j/integration/test/kerberos/KerberosTest.java
@@ -947,6 +947,86 @@ public class KerberosTest {
{
WSSSecurityProperties securityProperties = new WSSSecurityProperties();
List<WSSConstants.Action> actions = new ArrayList<>();
+ actions.add(WSSConstants.ENCRYPTION_WITH_KERBEROS_TOKEN);
+ securityProperties.setActions(actions);
+ securityProperties.setEncryptionSymAlgorithm(WSSConstants.NS_XENC_AES128);
+ securityProperties.setCallbackHandler(new CallbackHandler() {
+ @Override
+ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+ if (callbacks[0] instanceof KerberosContextAndServiceNameCallback) {
+ KerberosContextAndServiceNameCallback kerberosContextAndServiceNameCallback =
+ (KerberosContextAndServiceNameCallback) callbacks[0];
+ kerberosContextAndServiceNameCallback.setContextName("alice");
+ kerberosContextAndServiceNameCallback.setServiceName("bob@service.ws.apache.org");
+ } else if (callbacks[0] instanceof PasswordCallback) {
+ PasswordCallback passwordCallback = (PasswordCallback) callbacks[0];
+ if (passwordCallback.getPrompt().contains("alice")) {
+ passwordCallback.setPassword("alice".toCharArray());
+ }
+ }
+ }
+ });
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+ OutboundWSSec wsSecOut = WSSec.getOutboundWSSec(securityProperties);
+ XMLStreamWriter xmlStreamWriter = wsSecOut.processOutMessage(baos, StandardCharsets.UTF_8.name(), new ArrayList<>());
+ XMLStreamReader xmlStreamReader = xmlInputFactory.createXMLStreamReader(this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"));
+ XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
+ xmlStreamWriter.close();
+
+ document = dbf.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray()));
+ NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_xenc_ReferenceList.getNamespaceURI(), WSSConstants.TAG_xenc_ReferenceList.getLocalPart());
+ assertEquals(1, nodeList.getLength());
+ }
+
+ {
+ // Configure the Validator
+ WSSConfig wssConfig = WSSConfig.getNewInstance();
+ KerberosTokenValidator validator = new KerberosTokenValidator();
+ validator.setContextName("bob");
+ validator.setServiceName("bob@service.ws.apache.org");
+ wssConfig.setValidator(WSConstants.BINARY_TOKEN, validator);
+ WSSecurityEngine secEngine = new WSSecurityEngine();
+ secEngine.setWssConfig(wssConfig);
+
+ CallbackHandler callbackHandler = new CallbackHandler() {
+ @Override
+ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+ if (callbacks[0] instanceof PasswordCallback) {
+ PasswordCallback passwordCallback = (PasswordCallback) callbacks[0];
+ if (passwordCallback.getPrompt().contains("bob")) {
+ passwordCallback.setPassword("bob".toCharArray());
+ }
+ }
+ }
+ };
+
+ WSHandlerResult results =
+ secEngine.processSecurityHeader(document, null, callbackHandler, null);
+ WSSecurityEngineResult actionResult =
+ results.getActionResults().get(WSConstants.BST).get(0);
+ BinarySecurity token =
+ (BinarySecurity) actionResult.get(WSSecurityEngineResult.TAG_BINARY_SECURITY_TOKEN);
+ assertNotNull(token);
+
+ Principal principal = (Principal) actionResult.get(WSSecurityEngineResult.TAG_PRINCIPAL);
+ assertTrue(principal instanceof KerberosPrincipal);
+ assertTrue(principal.getName().contains("alice"));
+ }
+ }
+
+ @Test
+ public void testKerberosEncryptionOutboundDeprecatedTag() throws Exception {
+ if (!runTests) {
+ System.out.println("Skipping test because kerberos server could not be started");
+ return;
+ }
+
+ Document document;
+ {
+ WSSSecurityProperties securityProperties = new WSSSecurityProperties();
+ List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.ENCRYPT_WITH_KERBEROS_TOKEN);
securityProperties.setActions(actions);
securityProperties.setEncryptionSymAlgorithm(WSSConstants.NS_XENC_AES128);
diff --git a/src/site/asciidoc/config.adoc b/src/site/asciidoc/config.adoc
index 8b7b19c..f7ab907 100644
--- a/src/site/asciidoc/config.adoc
+++ b/src/site/asciidoc/config.adoc
@@ -124,7 +124,8 @@ The configuration tags for Actions are as follows:
* *WSS4J 2.0.0* SIGNATURE_DERIVED (SignatureDerived) - Perform a Signature action with derived keys.
* *WSS4J 2.0.0* ENCRYPT_DERIVED (EncryptDerived) - Perform a Encryption action with derived keys.
* *WSS4J 2.0.0* SIGNATURE_WITH_KERBEROS_TOKEN (SignatureWithKerberosToken) - Perform a Signature action with a kerberos token. Only for StAX code.
- * *WSS4J 2.0.0* ENCRYPT_WITH_KERBEROS_TOKEN (EncryptWithKerberosToken) - Perform a Encryption action with a kerberos token. Only for StAX code.
+ * *WSS4J 2.3.0* ENCRYPTION_WITH_KERBEROS_TOKEN (EncryptionWithKerberosToken) - Perform a Encryption action with a kerberos token. Only for StAX code.
+Note that for releases from 2.0.0 -> 2.2.x, this configuration tag was called ENCRYPT_WITH_KERBEROS_TOKEN (EncryptWithKerberosToken).
* *WSS4J 2.0.0* KERBEROS_TOKEN (KerberosToken) - Add a kerberos token. Only for StAX code.
* *WSS4J 2.0.0* CUSTOM_TOKEN (CustomToken) - Add a "Custom" token from a CallbackHandler
* *WSS4J 1.6.x only* SIGN_WITH_UT_KEY (UsernameTokenSignature) - Perform a .NET specific signature using a Username Token action.
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/ConfigurationConstants.java b/ws-security-common/src/main/java/org/apache/wss4j/common/ConfigurationConstants.java
index b1d5d3f..16b6786 100644
--- a/ws-security-common/src/main/java/org/apache/wss4j/common/ConfigurationConstants.java
+++ b/ws-security-common/src/main/java/org/apache/wss4j/common/ConfigurationConstants.java
@@ -106,9 +106,16 @@ public class ConfigurationConstants {
* Perform a Encryption action with a kerberos token. The signature specific parameters define how
* to encrypt, which keys to use, and so on.
*/
+ @Deprecated
public static final String ENCRYPT_WITH_KERBEROS_TOKEN = "EncryptWithKerberosToken";
/**
+ * Perform a Encryption action with a kerberos token. The signature specific parameters define how
+ * to encrypt, which keys to use, and so on.
+ */
+ public static final String ENCRYPTION_WITH_KERBEROS_TOKEN = "EncryptionWithKerberosToken";
+
+ /**
* Add a kerberos token.
*/
public static final String KERBEROS_TOKEN = "KerberosToken";
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 a0789f6..7a4711a 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
@@ -2255,7 +2255,7 @@ public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase {
actions.add(WSSConstants.TIMESTAMP);
actions.add(WSSConstants.USERNAMETOKEN);
actions.add(WSSConstants.SAML_TOKEN_SIGNED);
- actions.add(WSSConstants.ENCRYPT_WITH_DERIVED_KEY);
+ actions.add(WSSConstants.ENCRYPTION_WITH_DERIVED_KEY);
outSecurityProperties.setActions(actions);
SAMLCallbackHandlerImpl samlCallbackHandler = new SAMLCallbackHandlerImpl();
samlCallbackHandler.setSamlVersion(Version.SAML_20);
@@ -2385,7 +2385,7 @@ public class AsymmetricBindingIntegrationTest extends AbstractPolicyTestBase {
actions.add(WSSConstants.TIMESTAMP);
actions.add(WSSConstants.USERNAMETOKEN);
actions.add(WSSConstants.SAML_TOKEN_SIGNED);
- actions.add(WSSConstants.ENCRYPT_WITH_DERIVED_KEY);
+ actions.add(WSSConstants.ENCRYPTION_WITH_DERIVED_KEY);
outSecurityProperties.setActions(actions);
SAMLCallbackHandlerImpl samlCallbackHandler = new SAMLCallbackHandlerImpl();
samlCallbackHandler.setSamlVersion(Version.SAML_20);
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSConstants.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSConstants.java
index 904e2b9..edfc5df 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSConstants.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSConstants.java
@@ -219,11 +219,15 @@ public class WSSConstants extends XMLSecurityConstants {
public static final Action USERNAMETOKEN_SIGNED = new Action(ConfigurationConstants.USERNAME_TOKEN_SIGNATURE);
public static final Action SIGNATURE_CONFIRMATION = new Action("SignatureConfirmation");
public static final Action SIGNATURE_WITH_DERIVED_KEY = new Action("SignatureWithDerivedKey");
- public static final Action ENCRYPT_WITH_DERIVED_KEY = new Action("EncryptWithDerivedKey");
+ public static final Action ENCRYPTION_WITH_DERIVED_KEY = new Action("EncryptionWithDerivedKey");
+ @Deprecated
+ public static final Action ENCRYPT_WITH_DERIVED_KEY = ENCRYPTION_WITH_DERIVED_KEY;
public static final Action SAML_TOKEN_SIGNED = new Action(ConfigurationConstants.SAML_TOKEN_SIGNED);
public static final Action SAML_TOKEN_UNSIGNED = new Action(ConfigurationConstants.SAML_TOKEN_UNSIGNED);
public static final Action SIGNATURE_WITH_KERBEROS_TOKEN = new Action("SignatureWithKerberosToken");
- public static final Action ENCRYPT_WITH_KERBEROS_TOKEN = new Action("EncryptWithKerberosToken");
+ public static final Action ENCRYPTION_WITH_KERBEROS_TOKEN = new Action("EncryptionWithKerberosToken");
+ @Deprecated
+ public static final Action ENCRYPT_WITH_KERBEROS_TOKEN = ENCRYPTION_WITH_KERBEROS_TOKEN;
public static final Action KERBEROS_TOKEN = new Action("KerberosToken");
public static final Action CUSTOM_TOKEN = new Action("CustomToken");
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 aa1fbf1..f8ab36b 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
@@ -60,7 +60,7 @@ public class BinarySecurityTokenOutputProcessor extends AbstractOutputProcessor
tokenId = outputProcessorChain.getSecurityContext().get(WSSConstants.PROP_USE_THIS_TOKEN_ID_FOR_SIGNATURE);
} 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())
+ } else if (WSSConstants.ENCRYPTION_WITH_KERBEROS_TOKEN.equals(getAction())
|| WSSConstants.SIGNATURE_WITH_KERBEROS_TOKEN.equals(getAction())
|| WSSConstants.KERBEROS_TOKEN.equals(getAction())) {
tokenId = outputProcessorChain.getSecurityContext().get(WSSConstants.PROP_USE_THIS_TOKEN_ID_FOR_KERBEROS);
@@ -119,7 +119,7 @@ public class BinarySecurityTokenOutputProcessor extends AbstractOutputProcessor
finalBinarySecurityTokenOutputProcessor.addAfterProcessor(EncryptEndingOutputProcessor.class.getName());
finalBinarySecurityTokenOutputProcessor.init(outputProcessorChain);
securityToken.setProcessor(finalBinarySecurityTokenOutputProcessor);
- } else if (WSSConstants.ENCRYPT_WITH_KERBEROS_TOKEN.equals(getAction())
+ } else if (WSSConstants.ENCRYPTION_WITH_KERBEROS_TOKEN.equals(getAction())
|| WSSConstants.SIGNATURE_WITH_KERBEROS_TOKEN.equals(getAction())
|| WSSConstants.KERBEROS_TOKEN.equals(getAction())) {
FinalBinarySecurityTokenOutputProcessor finalBinarySecurityTokenOutputProcessor =
@@ -158,7 +158,7 @@ public class BinarySecurityTokenOutputProcessor extends AbstractOutputProcessor
final QName headerElementName = WSSConstants.TAG_WSSE_BINARY_SECURITY_TOKEN;
- if (WSSConstants.ENCRYPT_WITH_KERBEROS_TOKEN.equals(getAction())
+ if (WSSConstants.ENCRYPTION_WITH_KERBEROS_TOKEN.equals(getAction())
|| WSSConstants.SIGNATURE_WITH_KERBEROS_TOKEN.equals(getAction())
|| WSSConstants.KERBEROS_TOKEN.equals(getAction())) {
OutputProcessorUtils.updateSecurityHeaderOrder(
@@ -175,7 +175,7 @@ public class BinarySecurityTokenOutputProcessor extends AbstractOutputProcessor
((KerberosClientSecurityToken)securityToken).getTicket())
);
createEndElementAndOutputAsEvent(subOutputProcessorChain, headerElementName);
- if (WSSConstants.ENCRYPT_WITH_KERBEROS_TOKEN.equals(getAction())) {
+ if (WSSConstants.ENCRYPTION_WITH_KERBEROS_TOKEN.equals(getAction())) {
OutputProcessorUtils.updateSecurityHeaderOrder(outputProcessorChain, WSSConstants.TAG_xenc_ReferenceList,
getAction(), false);
WSSUtils.createReferenceListStructureForEncryption(this, subOutputProcessorChain);
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java
index 459794c..08e402b 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java
@@ -91,7 +91,7 @@ public class DerivedKeyTokenOutputProcessor extends AbstractOutputProcessor {
length = KeyUtils.getKeyLength(getSecurityProperties().getSignatureAlgorithm()) / 8;
}
}
- } else if (WSSConstants.ENCRYPT_WITH_DERIVED_KEY.equals(action)) {
+ } else if (WSSConstants.ENCRYPTION_WITH_DERIVED_KEY.equals(action)) {
if (((WSSSecurityProperties)getSecurityProperties()).getDerivedEncryptionKeyLength() > 0) {
length = ((WSSSecurityProperties)getSecurityProperties()).getDerivedEncryptionKeyLength();
} else {
@@ -172,7 +172,7 @@ public class DerivedKeyTokenOutputProcessor extends AbstractOutputProcessor {
if (WSSConstants.SIGNATURE_WITH_DERIVED_KEY.equals(action)) {
outputProcessorChain.getSecurityContext().put(WSSConstants.PROP_USE_THIS_TOKEN_ID_FOR_SIGNATURE, wsuIdDKT);
- } else if (WSSConstants.ENCRYPT_WITH_DERIVED_KEY.equals(action)) {
+ } else if (WSSConstants.ENCRYPTION_WITH_DERIVED_KEY.equals(action)) {
outputProcessorChain.getSecurityContext().put(WSSConstants.PROP_USE_THIS_TOKEN_ID_FOR_ENCRYPTION, wsuIdDKT);
}
outputProcessorChain.getSecurityContext().registerSecurityTokenProvider(wsuIdDKT, derivedKeysecurityTokenProvider);
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 36dbb3c..e5feb53 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
@@ -143,7 +143,7 @@ public class EncryptedKeyOutputProcessor extends AbstractOutputProcessor {
finalEncryptedKeyOutputProcessor.addBeforeProcessor(WSSSignatureOutputProcessor.class.getName());
}
finalEncryptedKeyOutputProcessor.init(outputProcessorChain);
- } else if (WSSConstants.ENCRYPT_WITH_DERIVED_KEY.equals(action)) {
+ } else if (WSSConstants.ENCRYPTION_WITH_DERIVED_KEY.equals(action)) {
if (wrappingSecurityToken.getProcessor() != null) {
finalEncryptedKeyOutputProcessor.addBeforeProcessor(wrappingSecurityToken.getProcessor());
finalEncryptedKeyOutputProcessor.init(outputProcessorChain);
@@ -152,7 +152,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_WITH_DERIVED_KEY)
+ if (getSecurityProperties().getActions().indexOf(WSSConstants.ENCRYPTION_WITH_DERIVED_KEY)
< getSecurityProperties().getActions().indexOf(WSSConstants.SIGNATURE_WITH_DERIVED_KEY)) {
finalEncryptedKeyOutputProcessor.setAction(WSSConstants.SIGNATURE_WITH_DERIVED_KEY);
}
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityContextTokenOutputProcessor.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityContextTokenOutputProcessor.java
index cb2be23..d6cec3c 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityContextTokenOutputProcessor.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityContextTokenOutputProcessor.java
@@ -117,7 +117,7 @@ public class SecurityContextTokenOutputProcessor extends AbstractOutputProcessor
} else {
finalSecurityContextTokenOutputProcessor.addBeforeProcessor(WSSSignatureOutputProcessor.class.getName());
}
- } else if (WSSConstants.ENCRYPT_WITH_DERIVED_KEY.equals(action)) {
+ } else if (WSSConstants.ENCRYPTION_WITH_DERIVED_KEY.equals(action)) {
outputProcessorChain.getSecurityContext().put(WSSConstants.PROP_USE_THIS_TOKEN_ID_FOR_DERIVED_KEY, wsuId);
if (wrappingSecurityToken.getProcessor() != null) {
finalSecurityContextTokenOutputProcessor.addBeforeProcessor(wrappingSecurityToken.getProcessor());
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 b9e8280..a44fa5a 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
@@ -109,11 +109,12 @@ public final class ConfigurationConverter {
} else if (single[i].equals(ConfigurationConstants.SIGNATURE_DERIVED)) {
actions.add(WSSConstants.SIGNATURE_WITH_DERIVED_KEY);
} else if (single[i].equals(ConfigurationConstants.ENCRYPT_DERIVED)) {
- actions.add(WSSConstants.ENCRYPT_WITH_DERIVED_KEY);
+ actions.add(WSSConstants.ENCRYPTION_WITH_DERIVED_KEY);
} else if (single[i].equals(ConfigurationConstants.SIGNATURE_WITH_KERBEROS_TOKEN)) {
actions.add(WSSConstants.SIGNATURE_WITH_KERBEROS_TOKEN);
- } else if (single[i].equals(ConfigurationConstants.ENCRYPT_WITH_KERBEROS_TOKEN)) {
- actions.add(WSSConstants.ENCRYPT_WITH_KERBEROS_TOKEN);
+ } else if (single[i].equals(ConfigurationConstants.ENCRYPT_WITH_KERBEROS_TOKEN)
+ || single[i].equals(ConfigurationConstants.ENCRYPTION_WITH_KERBEROS_TOKEN)) {
+ actions.add(WSSConstants.ENCRYPTION_WITH_KERBEROS_TOKEN);
} else if (single[i].equals(ConfigurationConstants.KERBEROS_TOKEN)) {
actions.add(WSSConstants.KERBEROS_TOKEN);
} else if (single[i].equals(ConfigurationConstants.CUSTOM_TOKEN)) {
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 a64f561..27d84ec 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
@@ -580,7 +580,7 @@ public class OutboundWSSec {
for (XMLSecurityConstants.Action action : securityProperties.getActions()) {
if (WSSConstants.SIGNATURE_WITH_DERIVED_KEY.equals(action)) {
derivedSignatureButNotDerivedEncryption = true;
- } else if (WSSConstants.ENCRYPT_WITH_DERIVED_KEY.equals(action)) {
+ } else if (WSSConstants.ENCRYPTION_WITH_DERIVED_KEY.equals(action)) {
derivedSignatureButNotDerivedEncryption = false;
break;
}
@@ -665,7 +665,7 @@ public class OutboundWSSec {
final WSSSignatureOutputProcessor signatureOutputProcessor = new WSSSignatureOutputProcessor();
initializeOutputProcessor(outputProcessorChain, signatureOutputProcessor, action);
- } else if (WSSConstants.ENCRYPT_WITH_DERIVED_KEY.equals(action)) {
+ } else if (WSSConstants.ENCRYPTION_WITH_DERIVED_KEY.equals(action)) {
configuredAction.encryptionAction = true;
configuredAction.derivedEncryption = true;
@@ -733,7 +733,7 @@ public class OutboundWSSec {
final WSSSignatureOutputProcessor signatureOutputProcessor = new WSSSignatureOutputProcessor();
initializeOutputProcessor(outputProcessorChain, signatureOutputProcessor, action);
- } else if (WSSConstants.ENCRYPT_WITH_KERBEROS_TOKEN.equals(action)) {
+ } else if (WSSConstants.ENCRYPTION_WITH_KERBEROS_TOKEN.equals(action)) {
configuredAction.kerberos = true;
configuredAction.encryptionKerberos = true;
final BinarySecurityTokenOutputProcessor kerberosTokenOutputProcessor =
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/WSSec.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/WSSec.java
index cb07d87..abb1c31 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/WSSec.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/WSSec.java
@@ -224,7 +224,7 @@ public class WSSec {
checkDefaultSecureParts(true, securityProperties);
} else if (WSSConstants.SIGNATURE_WITH_DERIVED_KEY.equals(action)) {
checkOutboundSignatureDerivedProperties(securityProperties);
- } else if (WSSConstants.ENCRYPT_WITH_DERIVED_KEY.equals(action)) {
+ } else if (WSSConstants.ENCRYPTION_WITH_DERIVED_KEY.equals(action)) {
checkOutboundEncryptionDerivedProperties(securityProperties);
} else if (WSSConstants.SAML_TOKEN_SIGNED.equals(action)) {
if (securityProperties.getCallbackHandler() == null) {
@@ -266,7 +266,7 @@ public class WSSec {
securityProperties.setSignatureKeyIdentifier(WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE);
}
checkDefaultSecureParts(true, securityProperties);
- } else if (WSSConstants.ENCRYPT_WITH_KERBEROS_TOKEN.equals(action)) {
+ } else if (WSSConstants.ENCRYPTION_WITH_KERBEROS_TOKEN.equals(action)) {
if (securityProperties.getCallbackHandler() == null) {
throw new WSSConfigurationException(WSSConfigurationException.ErrorCode.FAILURE, "noCallback");
}
diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java
index 0341277..a3bab34 100644
--- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java
+++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/DerivedKeyTokenTest.java
@@ -87,7 +87,7 @@ public class DerivedKeyTokenTest extends AbstractTestBase {
{
WSSSecurityProperties securityProperties = new WSSSecurityProperties();
List<WSSConstants.Action> actions = new ArrayList<>();
- actions.add(WSSConstants.ENCRYPT_WITH_DERIVED_KEY);
+ actions.add(WSSConstants.ENCRYPTION_WITH_DERIVED_KEY);
securityProperties.setActions(actions);
byte[] secret = WSSConstants.generateBytes(192 / 8);
CallbackHandlerImpl callbackHandler = new CallbackHandlerImpl(secret);
@@ -115,6 +115,38 @@ public class DerivedKeyTokenTest extends AbstractTestBase {
@ParameterizedTest
@ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12})
+ public void testEncryptionDecryptionOutboundDeprecatedTag(int version) throws Exception {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ {
+ WSSSecurityProperties securityProperties = new WSSSecurityProperties();
+ List<WSSConstants.Action> actions = new ArrayList<>();
+ actions.add(WSSConstants.ENCRYPT_WITH_DERIVED_KEY);
+ securityProperties.setActions(actions);
+ byte[] secret = WSSConstants.generateBytes(192 / 8);
+ CallbackHandlerImpl callbackHandler = new CallbackHandlerImpl(secret);
+ securityProperties.setCallbackHandler(callbackHandler);
+ securityProperties.loadEncryptionKeystore(this.getClass().getClassLoader().getResource("transmitter.jks"), "default".toCharArray());
+ securityProperties.setEncryptionUser("receiver");
+ securityProperties.setEncryptionKeyIdentifier(WSSecurityTokenConstants.KEYIDENTIFIER_THUMBPRINT_IDENTIFIER);
+
+ OutboundWSSec wsSecOut = WSSec.getOutboundWSSec(securityProperties);
+ XMLStreamWriter xmlStreamWriter = wsSecOut.processOutMessage(baos, StandardCharsets.UTF_8.name(), new ArrayList<SecurityEvent>());
+ XMLStreamReader xmlStreamReader = xmlInputFactory.createXMLStreamReader(this.getClass().getClassLoader().getResourceAsStream("testdata/plain-soap-1.1.xml"));
+ XmlReaderToWriter.writeAll(xmlStreamReader, xmlStreamWriter);
+ xmlStreamWriter.close();
+
+ Document document = documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray()));
+ NodeList nodeList = document.getElementsByTagNameNS(WSSConstants.TAG_xenc_EncryptedData.getNamespaceURI(), WSSConstants.TAG_xenc_EncryptedData.getLocalPart());
+ assertEquals(nodeList.item(0).getParentNode().getLocalName(), WSSConstants.TAG_SOAP11_BODY.getLocalPart());
+ }
+ {
+ String action = WSHandlerConstants.ENCRYPT;
+ doInboundSecurityWithWSS4J(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action);
+ }
+ }
+
+ @ParameterizedTest
+ @ValueSource(ints = {ConversationConstants.VERSION_05_02, ConversationConstants.VERSION_05_12})
public void testEncryptionDecryptionTRIPLEDESInbound(int version) throws Exception {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -293,7 +325,7 @@ public class DerivedKeyTokenTest extends AbstractTestBase {
{
WSSSecurityProperties securityProperties = new WSSSecurityProperties();
List<WSSConstants.Action> actions = new ArrayList<>();
- actions.add(WSSConstants.ENCRYPT_WITH_DERIVED_KEY);
+ actions.add(WSSConstants.ENCRYPTION_WITH_DERIVED_KEY);
securityProperties.setActions(actions);
byte[] secret = WSSConstants.generateBytes(128 / 8);
CallbackHandlerImpl callbackHandler = new CallbackHandlerImpl(secret);
@@ -824,7 +856,7 @@ public class DerivedKeyTokenTest extends AbstractTestBase {
WSSSecurityProperties securityProperties = new WSSSecurityProperties();
List<WSSConstants.Action> actions = new ArrayList<>();
actions.add(WSSConstants.SIGNATURE_WITH_DERIVED_KEY);
- actions.add(WSSConstants.ENCRYPT_WITH_DERIVED_KEY);
+ actions.add(WSSConstants.ENCRYPTION_WITH_DERIVED_KEY);
securityProperties.setActions(actions);
CallbackHandlerImpl callbackHandler = new CallbackHandlerImpl();
securityProperties.setCallbackHandler(callbackHandler);
diff --git a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java
index 450073d..52a00c4 100644
--- a/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java
+++ b/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/SecurityContextTokenTest.java
@@ -91,7 +91,7 @@ public class SecurityContextTokenTest extends AbstractTestBase {
{
WSSSecurityProperties securityProperties = new WSSSecurityProperties();
List<WSSConstants.Action> actions = new ArrayList<>();
- actions.add(WSSConstants.ENCRYPT_WITH_DERIVED_KEY);
+ actions.add(WSSConstants.ENCRYPTION_WITH_DERIVED_KEY);
securityProperties.setActions(actions);
CallbackHandlerImpl callbackHandler = new CallbackHandlerImpl(secret);
securityProperties.setCallbackHandler(callbackHandler);