Core: fix empty cookie values (#625).

If the browser sends a (non-DM) cookie with an empty value a proper ClientState object is created. No exception is thrown.

Thanks, Patricia, for reporting!

Close #625

modules/dm4-core/src/main/java/de/deepamehta/core/service/ClientState.java

@@ -15,14 +15,14 @@ public class ClientState {
 
     /**
       * Converts a "Cookie" header value (String) to a map (key=String, value=String).
-      * E.g. "user=jri; workspace_id=123" => {"user"="jri", "workspace_id"="123"}
+      * E.g. "dm4_workspace_id=123; dm4_topicmap_id=234" => {"dm4_workspace_id"="123", "dm4_topicmap_id"="234"}
       * <p>
       * Called by JAX-RS container to create a ClientState from a "Cookie" @HeaderParam
       */
     public ClientState(String cookie) {
         if (cookie != null) {
             for (String value : cookie.split("; ")) {
-                String[] val = value.split("=");
+                String[] val = value.split("=", 2);     // Limit 2 ensures 2nd element in case of empty value
                 values.put(val[0], val[1]);
             }
         }

modules/dm4-test/src/test/java/de/deepamehta/test/JavaAPITest.java

@@ -20,6 +20,8 @@ public class JavaAPITest {
 
     private Logger logger = Logger.getLogger(getClass().getName());
 
+    // ---
+
     @Test
     public void asListWithNullArgument() {
         try {
@@ -35,4 +37,25 @@ public void asListWithNoArguments() {
         List l = Arrays.asList();
         assertSame(0, l.size());
     }
+
+    // ---
+
+    @Test
+    public void split() {
+        String[] a = "abc=123".split("=");
+        assertSame(2, a.length);
+    }
+
+    @Test
+    public void splitWithTrailingEmpty() {
+        String[] a = "abc=".split("=");
+        assertSame(1, a.length);
+    }
+
+    @Test
+    public void splitWithTrailingEmptyAndLimit() {
+        String[] a = "abc=".split("=", 2);
+        assertSame(2, a.length);
+        assertEquals("", a[1]);
+    }
 }

modules/dm4-webclient/src/main/resources/web/script/util/js_utils.js

@@ -381,7 +381,7 @@ var js = {
     },
 
     get_cookie: function(key) {
-        // Note: document.cookie contains all cookies as one string, e.g. "username=jri; workspace_id=83".
+        // Note: document.cookie contains all cookies as one string, e.g. "dm4_workspace_id=123; dm4_topicmap_id=234"
         if (document.cookie.match(new RegExp("\\b" + key + "=(\\w*)"))) {
             return RegExp.$1
         }