This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 46cb1c1315 [CXF-9048] Update the WSS4J tests (#2024)
46cb1c1315 is described below
commit 46cb1c1315b9f2fa0a609a110518716669a33821
Author: jrihtarsic <[email protected]>
AuthorDate: Fri Nov 15 08:00:48 2024 +0100
[CXF-9048] Update the WSS4J tests (#2024)
Co-authored-by: RIHTARSIC Joze <[email protected]>
---
.../cxf/ws/security/wss4j/WSS4JInOutTest.java | 1 +
.../wss4j/WSS4JInOutWithAttachmentsTest.java | 36 ++++++++++++++++++----
2 files changed, 31 insertions(+), 6 deletions(-)
diff --git
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
index 9404bfd78f..afdef21757 100644
---
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
+++
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
@@ -230,6 +230,7 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
outProperties.put(ConfigurationConstants.USER, alias);
outProperties.put(ConfigurationConstants.ENC_KEY_TRANSPORT,
WSS4JConstants.KEYWRAP_AES128);
outProperties.put(ConfigurationConstants.ENC_KEY_AGREEMENT_METHOD,
WSS4JConstants.AGREEMENT_METHOD_ECDH_ES);
+ outProperties.put(ConfigurationConstants.ENC_KEY_DERIVATION_FUNCTION,
WSS4JConstants.KEYDERIVATION_CONCATKDF);
Map<String, Object> inProperties = new HashMap<>();
inProperties.put(ConfigurationConstants.ACTION,
ConfigurationConstants.ENCRYPTION);
diff --git
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutWithAttachmentsTest.java
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutWithAttachmentsTest.java
index 5511dfc295..7db888644a 100644
---
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutWithAttachmentsTest.java
+++
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutWithAttachmentsTest.java
@@ -86,14 +86,29 @@ public class WSS4JInOutWithAttachmentsTest extends
AbstractSecurityTest {
* @throws Exception if something goes wrong
*/
@Test
- public void testEncryptWithAgreementMethodWithXECAndEDKeys() throws
Exception {
+ public void testEncryptWithAgreementConcatKDFWithXECAndEDKeys() throws
Exception {
Assume.assumeTrue(getJDKVersion() >= 16);
- testEncryptWithAgreementMethod("ed25519", "x25519");
+ testEncryptWithAgreementMethod("ed25519", "x25519",
+ WSS4JConstants.AGREEMENT_METHOD_X25519,
WSS4JConstants.KEYDERIVATION_CONCATKDF);
}
@Test
- public void testEncryptWithAgreementMethodWithECKeys() throws Exception {
- testEncryptWithAgreementMethod("secp256r1", "secp256r1");
+ public void testEncryptWithAgreementConcatKDFWithECKeys() throws Exception
{
+ testEncryptWithAgreementMethod("secp256r1", "secp256r1",
+ WSS4JConstants.AGREEMENT_METHOD_ECDH_ES,
WSS4JConstants.KEYDERIVATION_CONCATKDF);
+ }
+
+ @Test
+ public void testEncryptWithAgreementHKDFWithXECAndEDKeys() throws
Exception {
+ Assume.assumeTrue(getJDKVersion() >= 16);
+ testEncryptWithAgreementMethod("ed25519", "x25519",
+ WSS4JConstants.AGREEMENT_METHOD_X25519,
WSS4JConstants.KEYDERIVATION_HKDF);
+ }
+
+ @Test
+ public void testEncryptWithAgreementHKDFWithECKeys() throws Exception {
+ testEncryptWithAgreementMethod("secp256r1", "secp256r1",
+ WSS4JConstants.AGREEMENT_METHOD_ECDH_ES,
WSS4JConstants.KEYDERIVATION_HKDF);
}
/**
@@ -102,9 +117,12 @@ public class WSS4JInOutWithAttachmentsTest extends
AbstractSecurityTest {
*
* @param signAlias the alias of the signature key
* @param encAlias the alias of the encryption key
+ * @param keyAgreementMethod the key agreement method, e.g., ECDH_ES,
X25519, X448
+ * @param keyDerivationFunction the key derivation function, e.g.,
ConcatKDF, HKDF
* @throws Exception if something goes wrong.
*/
- public void testEncryptWithAgreementMethod(String signAlias, String
encAlias) throws Exception {
+ public void testEncryptWithAgreementMethod(String signAlias, String
encAlias, String keyAgreementMethod,
+ String keyDerivationFunction)
throws Exception {
Map<String, Object> outProperties = new HashMap<>();
// Signature configuration (sign before encrypt)
@@ -127,6 +145,7 @@ public class WSS4JInOutWithAttachmentsTest extends
AbstractSecurityTest {
outProperties.put(ConfigurationConstants.ENC_SYM_ALGO,
WSS4JConstants.AES_256_GCM);
outProperties.put(ConfigurationConstants.ENC_KEY_TRANSPORT,
WSS4JConstants.KEYWRAP_AES128);
outProperties.put(ConfigurationConstants.ENC_KEY_AGREEMENT_METHOD,
WSS4JConstants.AGREEMENT_METHOD_ECDH_ES);
+ outProperties.put(ConfigurationConstants.ENC_KEY_DERIVATION_FUNCTION,
keyDerivationFunction);
outProperties.put(ConfigurationConstants.ENC_KEY_ID,
"DirectReference");
outProperties.put(ConfigurationConstants.ENCRYPTION_PARTS,
"{}cid:Attachments;");
@@ -146,7 +165,12 @@ public class WSS4JInOutWithAttachmentsTest extends
AbstractSecurityTest {
xpaths.add("//wsse:Security/xenc:EncryptedData");
xpaths.add("//xenc:AgreementMethod");
xpaths.add("//xenc11:KeyDerivationMethod");
- xpaths.add("//xenc11:ConcatKDFParams");
+ if (WSS4JConstants.KEYDERIVATION_HKDF.equals(keyDerivationFunction)) {
+ xpaths.add("//rfc9231:HKDFParams");
+ this.testUtilities.addNamespace("rfc9231",
"http://www.w3.org/2021/04/xmldsig-more#";);
+ } else {
+ xpaths.add("//xenc11:ConcatKDFParams");
+ }
xpaths.add("//wsse:Security/ds:Signature");
SoapMessage inSoapMessage =
makeInvocationWithAttachment(outProperties, xpaths, inProperties);
