[cxf] branch 3.1.x-fixes updated: CXF-7760 - JOSE: JwsCompactConsumer parsing headers issue

[coheigea]

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

coheigea 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 288a1df  CXF-7760 - JOSE: JwsCompactConsumer parsing headers issue
288a1df is described below

commit 288a1df9829f224a59b2e93e29db9ee433616827
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Mon Jun 25 18:08:14 2018 +0100

    CXF-7760 - JOSE: JwsCompactConsumer parsing headers issue
    
    (cherry picked from commit 40f78d5bdd5c38ecc535ffce9ce3aa19669ac16e)
---
 .../cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java    |  9 +++++++--
 .../jaxrs/json/basic/JsonMapObjectReaderWriterTest.java    | 14 ++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git 
a/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java
 
b/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java
index 39fe7dd..795458b 100644
--- 
a/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java
+++ 
b/rt/rs/extensions/json-basic/src/main/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriter.java
@@ -245,6 +245,11 @@ public class JsonMapObjectReaderWriter {
                 value = Double.valueOf(valueStr);
             }
         }
+
+        if (value instanceof String) {
+            // Escape an encoded forward slash
+            value = ((String) value).replace("\\/", "/");
+        }
         return value;
     }
 
@@ -264,7 +269,7 @@ public class JsonMapObjectReaderWriter {
         }
         return closingIndex;
     }
-    
+
     protected static int getNextSepCharIndex(String json, char 
curlyBracketChar, int from) {
         int nextCurlyBracketIndex = -1;
         boolean inString = false;
@@ -282,7 +287,7 @@ public class JsonMapObjectReaderWriter {
         }
         return nextCurlyBracketIndex;
     }
-    
+
     public void setFormat(boolean format) {
         this.format = format;
     }
diff --git 
a/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java
 
b/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java
index 0dce1ef..aad0cba 100644
--- 
a/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java
+++ 
b/rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectReaderWriterTest.java
@@ -124,4 +124,18 @@ public class JsonMapObjectReaderWriterTest extends Assert {
         assertEquals(1, xMap.size());
         assertEquals("{\\\"}", xMap.get("y"));
     }
+
+    @Test
+    public void testEscapedForwardSlashInString() throws Exception {
+        JsonMapObjectReaderWriter jsonMapObjectReaderWriter = new 
JsonMapObjectReaderWriter();
+        String s = 
"{\"kid\":\"4pZbe4shQQGzZXHbeIlbDvmHOc1\\/H6jH6oBk3nUrcZE=\",\"alg\":\"RS256\"}";
+
+        Map<String, Object> map = jsonMapObjectReaderWriter.fromJson(s);
+        assertEquals(2, map.size());
+
+        String kid = (String)map.get("kid");
+        String expectedKid = "4pZbe4shQQGzZXHbeIlbDvmHOc1/H6jH6oBk3nUrcZE=";
+        assertEquals(expectedKid, kid);
+    }
+
 }