You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2018/05/14 09:32:41 UTC

[cxf] branch 3.1.x-fixes updated: [CXF-7731] Minor improvements

This is an automated email from the ASF dual-hosted git repository.

sergeyb pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/3.1.x-fixes by this push:
     new 327a872  [CXF-7731] Minor improvements
327a872 is described below

commit 327a8724a3ec0eb18a8f97da158026287c99fdbb
Author: Sergey Beryozkin <sb...@gmail.com>
AuthorDate: Mon May 14 10:16:22 2018 +0100

    [CXF-7731] Minor improvements
---
 .../cxf/rs/security/jose/jws/JwsJsonProducer.java  | 16 ++++++++++---
 .../jose/cookbook/JwsJoseCookBookTest.java         | 28 ++++++++++++++++++++++
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsJsonProducer.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsJsonProducer.java
index e75e68a..394209f 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsJsonProducer.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsJsonProducer.java
@@ -38,6 +38,7 @@ import org.apache.cxf.rs.security.jose.jwk.JsonWebKey;
 public class JwsJsonProducer {
     protected static final Logger LOG = LogUtils.getL7dLogger(JwsJsonProducer.class);
     private boolean supportFlattened;
+    private boolean supportDetached;
     private String plainPayload;
     private String encodedPayload;
     private List<JwsJsonSignatureEntry> signatures = new LinkedList<JwsJsonSignatureEntry>();
@@ -46,8 +47,13 @@ public class JwsJsonProducer {
         this(tbsDocument, false);
     }
     public JwsJsonProducer(String tbsDocument, boolean supportFlattened) {
-        this.supportFlattened = supportFlattened;
+        this(tbsDocument, supportFlattened, false);
+    }
+    
+    public JwsJsonProducer(String tbsDocument, boolean supportFlattened, boolean supportDetached) {
         this.plainPayload = tbsDocument;
+        this.supportFlattened = supportFlattened;
+        this.supportDetached = supportDetached;
     }
     
     public String getPlainPayload() {
@@ -60,10 +66,14 @@ public class JwsJsonProducer {
         return encodedPayload;
     }
     public String getJwsJsonSignedDocument() {
-        return getJwsJsonSignedDocument(false);
+        return doGetJwsJsonSignedDocument(supportDetached);
     }
+    @Deprecated
     public String getJwsJsonSignedDocument(boolean detached) {
-        if (signatures.isEmpty()) { 
+        return doGetJwsJsonSignedDocument(detached);
+    }
+    private String doGetJwsJsonSignedDocument(boolean detached) {     
+        if (signatures.isEmpty()) {
             return null;
         }
         
diff --git a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwsJoseCookBookTest.java b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwsJoseCookBookTest.java
index 3902cf7..310d77b 100644
--- a/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwsJoseCookBookTest.java
+++ b/rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwsJoseCookBookTest.java
@@ -506,6 +506,7 @@ public class JwsJoseCookBookTest {
         jsonConsumer = new JwsJsonConsumer(jsonProducer.getJwsJsonSignedDocument());
         assertTrue(jsonConsumer.verifySignatureWith(key, SignatureAlgorithm.HS256));
     }
+    @SuppressWarnings("deprecation")
     @Test
     public void testDetachedHMACSignature() throws Exception {
         JwsCompactProducer compactProducer = new JwsCompactProducer(PAYLOAD, true);
@@ -543,6 +544,33 @@ public class JwsJoseCookBookTest {
         assertTrue(jsonConsumer.verifySignatureWith(key, SignatureAlgorithm.HS256));
     }
     @Test
+    public void testDetachedHMACSignature2() throws Exception {
+        JsonWebKeys jwks = readKeySet("cookbookSecretSet.txt");
+        List<JsonWebKey> keys = jwks.getKeys();
+        JsonWebKey key = keys.get(0);
+        
+        JwsJsonProducer jsonProducer = new JwsJsonProducer(PAYLOAD, false, true);
+        assertEquals(jsonProducer.getPlainPayload(), PAYLOAD);
+        assertEquals(jsonProducer.getUnsignedEncodedPayload(), ENCODED_PAYLOAD);
+        JwsHeaders protectedHeader = new JwsHeaders();
+        protectedHeader.setSignatureAlgorithm(SignatureAlgorithm.HS256);
+        protectedHeader.setKeyId(HMAC_KID_VALUE);
+        
+        String jwsJsonCompleteSequence = 
+            jsonProducer.signWith(JwsUtils.getSignatureProvider(key, SignatureAlgorithm.HS256), protectedHeader);
+        assertEquals(jwsJsonCompleteSequence, HMAC_DETACHED_JSON_GENERAL_SERIALIZATION);
+        JwsJsonConsumer jsonConsumer =
+                new JwsJsonConsumer(jsonProducer.getJwsJsonSignedDocument(), ENCODED_PAYLOAD);
+        assertTrue(jsonConsumer.verifySignatureWith(key, SignatureAlgorithm.HS256));
+
+        jsonProducer = new JwsJsonProducer(PAYLOAD, true, true);
+        String jwsJsonFlattenedSequence = 
+            jsonProducer.signWith(JwsUtils.getSignatureProvider(key, SignatureAlgorithm.HS256), protectedHeader);
+        assertEquals(jwsJsonFlattenedSequence, HMAC_DETACHED_JSON_FLATTENED_SERIALIZATION);
+        jsonConsumer = new JwsJsonConsumer(jwsJsonFlattenedSequence, ENCODED_PAYLOAD);
+        assertTrue(jsonConsumer.verifySignatureWith(key, SignatureAlgorithm.HS256));
+    }
+    @Test
     public void testProtectingSpecificHeaderFieldsSignature() throws Exception {
         JwsJsonProducer jsonProducer = new JwsJsonProducer(PAYLOAD);
         assertEquals(jsonProducer.getPlainPayload(), PAYLOAD);

-- 
To stop receiving notification emails like this one, please contact
sergeyb@apache.org.