Merge pull request #171 from sfuhrm/link-fixes

JERSEY-2879: Link HTTP Header: Fix for comma separated multiple header values

Author: Adam Lindenthal

core-common/src/main/java/org/glassfish/jersey/message/internal/InboundMessageContext.java

@@ -59,6 +59,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.StringTokenizer;
 
 import javax.ws.rs.ProcessingException;
 import javax.ws.rs.core.Cookie;
@@ -653,8 +654,29 @@ public Set<Link> getLinks() {
 
         try {
             Set<Link> result = new HashSet<Link>(links.size());
-            for (String l : links) {
-                result.add(Link.valueOf(l));
+            StringBuilder linkString;
+            for (String link : links) {
+                linkString = new StringBuilder();
+                StringTokenizer st = new StringTokenizer(link, "<>,", true);
+                boolean linkOpen = false;
+                while (st.hasMoreTokens()) {
+                    String n = st.nextToken();
+                    if (n.equals("<")) {
+                        linkOpen = true;
+                    } else if (n.equals(">")) {
+                        linkOpen = false;
+                    } else if (!linkOpen && n.equals(",")) {
+                        result.add(Link.valueOf(linkString.toString().trim()));
+                        linkString = new StringBuilder();
+                        continue; // don't add the ","
+                    }
+
+                    linkString.append(n);
+                }
+
+                if (linkString.length() > 0) {
+                    result.add(Link.valueOf(linkString.toString().trim()));
+                }
             }
             return result;
         } catch (IllegalArgumentException e) {

core-common/src/test/java/org/glassfish/jersey/message/internal/InboundMessageContextTest.java

@@ -195,6 +195,49 @@ public void testGetLinks() {
         assertTrue(r.getLinks().contains(link2));
     }
 
+    @Test
+    public void testGetLinksWithCommaInUri() {
+        InboundMessageContext r = createInboundMessageContext();
+        Link link1 = Link.fromUri("http://example.org/app/foo,bar").param("produces", "application/json").param("method",
+                "GET").rel("self").build();
+        r.header("Link", link1.toString());
+        assertEquals(1, r.getLinks().size());
+        assertTrue(r.getLinks().contains(link1));
+    }
+
+    @Test
+    public void testGetLinksWithMultipleLinksInOneHeaderAndCommaInUri() {
+        InboundMessageContext r = createInboundMessageContext();
+        Link link1 = Link.fromUri("https://example.org/one/api/groups?foo,page=2").rel("next").build();
+        Link link2 = Link.fromUri("https://example.org/one/api/groups?bar,page=39").rel("last").build();
+        r.header("Link", "<https://example.org/one/api/groups?foo,page=2>; rel=\"next\", <https://example.org/one/api/groups?bar,page=39>; rel=\"last\"");
+        assertEquals(2, r.getLinks().size());
+        assertTrue(r.getLinks().contains(link1));
+        assertTrue(r.getLinks().contains(link2));
+    }
+
+    @Test
+    public void testGetLinksWithMultipleLinksInOneHeader() {
+        InboundMessageContext r = createInboundMessageContext();
+        Link link1 = Link.fromUri("https://example.org/one/api/groups?page=2").rel("next").build();
+        Link link2 = Link.fromUri("https://example.org/one/api/groups?page=39").rel("last").build();
+        r.header("Link", "<https://example.org/one/api/groups?page=2>; rel=\"next\", <https://example.org/one/api/groups?page=39>; rel=\"last\"");
+        assertEquals(2, r.getLinks().size());
+        assertTrue(r.getLinks().contains(link1));
+        assertTrue(r.getLinks().contains(link2));
+    }
+
+    @Test
+    public void testGetLinksWithMultipleLinksInOneHeaderWithLtInValue() {
+        InboundMessageContext r = createInboundMessageContext();
+        Link link1 = Link.fromUri("https://example.org/one/api/groups?page=2").rel("next").param("foo", "<bar>").build();
+        Link link2 = Link.fromUri("https://example.org/one/api/groups?page=39").rel("last").param("bar", "<<foo").build();
+        r.header("Link", "<https://example.org/one/api/groups?page=2>; rel=\"next\"; foo=\"<bar>\", <https://example.org/one/api/groups?page=39>; rel=\"last\"; bar=\"<<foo\"");
+        assertEquals(2, r.getLinks().size());
+        assertTrue(r.getLinks().contains(link1));
+        assertTrue(r.getLinks().contains(link2));
+    }
+
     @Test
     public void testGetLink() {
         InboundMessageContext r = createInboundMessageContext();