[RESTEASY-1266] (#935)

Allow cookies to be added to ResteasyHttpHeaders.

resteasy-client/src/main/java/org/jboss/resteasy/client/jaxrs/internal/ClientInvocationBuilder.java

@@ -76,6 +76,10 @@ public Invocation.Builder acceptEncoding(String... encodings)
    @Override
    public Invocation.Builder cookie(Cookie cookie)
    {
+      if (!(Cookie.class.equals(cookie.getClass())))
+      {
+         cookie = new Cookie(cookie.getName(), cookie.getValue(), cookie.getPath(), cookie.getDomain(), cookie.getVersion());
+      }
       getHeaders().cookie(cookie);
       return this;
    }

resteasy-client/src/main/java/org/jboss/resteasy/client/jaxrs/internal/ClientRequestHeaders.java

@@ -132,6 +132,10 @@ public void accept(MediaType... types)
 
    public void cookie(Cookie cookie)
    {
+      if (!(Cookie.class.equals(cookie.getClass())))
+      {
+         cookie = new Cookie(cookie.getName(), cookie.getValue(), cookie.getPath(), cookie.getDomain(), cookie.getVersion());
+      }
       headers.add(HttpHeaders.COOKIE, cookie);
    }
 

resteasy-jaxrs/src/main/java/org/jboss/resteasy/specimpl/ResteasyHttpHeaders.java

@@ -1,8 +1,7 @@
 package org.jboss.resteasy.specimpl;
 
-import org.jboss.resteasy.util.CaseInsensitiveMap;
+import org.jboss.resteasy.util.CookieParser;
 import org.jboss.resteasy.util.DateUtil;
-import org.jboss.resteasy.util.LocaleHelper;
 import org.jboss.resteasy.util.MediaTypeHelper;
 import org.jboss.resteasy.util.WeightedLanguage;
 
@@ -37,7 +36,7 @@ public ResteasyHttpHeaders(MultivaluedMap<String, String> requestHeaders)
    public ResteasyHttpHeaders(MultivaluedMap<String, String> requestHeaders, Map<String, Cookie> cookies)
    {
       this.requestHeaders = requestHeaders;
-      this.cookies = cookies;
+      this.cookies = (cookies == null ? new HashMap<String, Cookie>() : cookies);
    }
 
    @Override
@@ -72,11 +71,13 @@ public List<String> getRequestHeader(String name)
    @Override
    public Map<String, Cookie> getCookies()
    {
+      mergeCookies();
       return Collections.unmodifiableMap(cookies);
    }
 
    public Map<String, Cookie> getMutableCookies()
    {
+      mergeCookies();
       return cookies;
    }
 
@@ -176,4 +177,20 @@ public List<Locale> getAcceptableLanguages()
       for (WeightedLanguage language : languages) list.add(language.getLocale());
       return Collections.unmodifiableList(list);
    }
+
+   private void mergeCookies()
+   {
+      List<String> cookieHeader = requestHeaders.get(HttpHeaders.COOKIE);
+      if (cookieHeader != null && !cookieHeader.isEmpty())
+      {
+         for (String s : cookieHeader)
+         {
+            List<Cookie> list = CookieParser.parseCookies(s);
+            for (Cookie cookie : list)
+            {
+               cookies.put(cookie.getName(), cookie);
+            }
+         }
+      }
+   }
 }

testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/interceptors/FilteredCookieTest.java

@@ -0,0 +1,69 @@
+package org.jboss.resteasy.test.core.interceptors;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Invocation.Builder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Cookie;
+import javax.ws.rs.core.NewCookie;
+import javax.ws.rs.core.Response;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.resteasy.test.core.interceptors.resource.FilteredCookieContainerRequestFilter;
+import org.jboss.resteasy.test.core.interceptors.resource.FilteredCookieResource;
+import org.jboss.resteasy.utils.PortProviderUtil;
+import org.jboss.resteasy.utils.TestUtil;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * @tpSubChapter Cookies and filters
+ * @tpChapter Integration tests
+ * @tpTestCaseDetails Regression test for RESTEASY-1266
+ * @tpSince RESTEasy 3.1.0.Final
+ */
+@RunWith(Arquillian.class)
+@RunAsClient
+public class FilteredCookieTest {
+
+   private static final String OLD_COOKIE_NAME = "old-cookie";
+   private static final String NEW_COOKIE_NAME = "new-cookie";
+
+   @Deployment
+   public static Archive<?> deploySimpleResource() {
+       WebArchive war = TestUtil.prepareArchive(FilteredCookieTest.class.getSimpleName());
+       return TestUtil.finishContainerPrepare(war, null, FilteredCookieResource.class, FilteredCookieContainerRequestFilter.class);
+   }
+
+   private String generateURL(String path) {
+       return PortProviderUtil.generateURL(path, FilteredCookieTest.class.getSimpleName());
+   }
+
+   @Test
+   public void testServerHeaders() {
+
+      Client client = ClientBuilder.newClient();
+      WebTarget target = client.target(generateURL("/test/get"));
+      Response response = target.request().get();
+      NewCookie cookie = response.getCookies().get(OLD_COOKIE_NAME);
+      Assert.assertEquals(200, response.getStatus());
+      Assert.assertNotNull(cookie);
+      client.close();
+
+      client = ClientBuilder.newClient();
+      target = client.target(generateURL("/test/return"));
+      Builder builder = target.request();
+      response = builder.cookie(cookie).get();
+      NewCookie oldCookie = response.getCookies().get(OLD_COOKIE_NAME);
+      NewCookie newCookie = response.getCookies().get(NEW_COOKIE_NAME);
+      Assert.assertEquals(200, response.getStatus());
+      Assert.assertNotNull(oldCookie);
+      Assert.assertNotNull(newCookie);
+      client.close();
+   }
+}

testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/interceptors/resource/FilteredCookieContainerRequestFilter.java

@@ -0,0 +1,27 @@
+package org.jboss.resteasy.test.core.interceptors.resource;
+
+import java.io.IOException;
+
+import javax.ws.rs.container.ContainerRequestContext;
+import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.container.PreMatching;
+import javax.ws.rs.core.Cookie;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@PreMatching
+public class FilteredCookieContainerRequestFilter implements ContainerRequestFilter {
+
+   private static final String OLD_COOKIE_NAME = "old-cookie";
+   private static final String NEW_COOKIE_NAME = "new-cookie";
+
+   @Override
+   public void filter(ContainerRequestContext requestContext) throws IOException {
+
+      final Cookie cookie = requestContext.getCookies().get(OLD_COOKIE_NAME);
+      if (cookie != null) {
+         requestContext.getHeaders().add(HttpHeaders.COOKIE, new Cookie(NEW_COOKIE_NAME, cookie.getValue()).toString());
+      }
+   }
+}

testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/core/interceptors/resource/FilteredCookieResource.java

@@ -0,0 +1,35 @@
+package org.jboss.resteasy.test.core.interceptors.resource;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Cookie;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.NewCookie;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.ResponseBuilder;
+
+@Path("test")
+public class FilteredCookieResource {
+   private static final String OLD_COOKIE_NAME = "old-cookie";
+   private static final String NEW_COOKIE_NAME = "new-cookie";
+   private @Context HttpHeaders headers;
+
+   @GET
+   @Path("get")
+   public Response getCookie() {
+      NewCookie cookie = new NewCookie(OLD_COOKIE_NAME, "value");
+      return Response.ok().cookie(cookie).build();
+   }
+
+   @GET
+   @Path("return")
+   public Response returnCookie() {
+      Cookie oldCookie = headers.getCookies().get(OLD_COOKIE_NAME);
+      Cookie newCookie = headers.getCookies().get(NEW_COOKIE_NAME);
+      ResponseBuilder builder = Response.ok();
+      builder.cookie(new NewCookie(oldCookie.getName(), oldCookie.getValue()));
+      builder.cookie(new NewCookie(newCookie.getName(), newCookie.getValue()));
+      return builder.build();
+   }
+}