Merge pull request #881 from MCMicS/AXIS2-6083

AXIS2-6083: Cookie Handling not work with 2.0.0

Author: robertlazarski

modules/transport/http/src/main/java/org/apache/axis2/transport/http/impl/httpclient5/RequestImpl.java

@@ -20,13 +20,9 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URISyntaxException;
 import java.net.URI;
-import java.net.URL;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -56,9 +52,11 @@
 import org.apache.hc.core5.http.HttpHost;
 import org.apache.hc.core5.http.HttpVersion;
 import org.apache.hc.core5.http.ProtocolVersion;
-import org.apache.hc.core5.http.ProtocolException;
+import org.apache.hc.core5.http.HeaderElement;
+import org.apache.hc.core5.http.message.BasicHeaderValueParser;
 import org.apache.hc.core5.http.message.HeaderGroup;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.apache.hc.core5.http.message.ParserCursor;
 import org.apache.hc.core5.net.URIAuthority;
 import org.apache.hc.core5.util.Timeout;
 
@@ -195,8 +193,17 @@ public Header[] getResponseHeaders() {
     public Map<String,String> getCookies() {
         Map<String,String> cookies = new HashMap<>();
         for (String name : COOKIE_HEADER_NAMES) {
-            for (final org.apache.hc.core5.http.Header header : response.getHeaders()) {
-                cookies.put(header.getName(), header.getValue());
+            for (final org.apache.hc.core5.http.Header header : response.getHeaders(name)) {
+                final String headerValue = header.getValue();
+                if (headerValue == null) {
+                    continue;
+                }
+                final ParserCursor cursor = new ParserCursor(0, headerValue.length());
+                final HeaderElement[] headerElements = BasicHeaderValueParser.INSTANCE.parseElements(headerValue,
+                        cursor);
+                for (final HeaderElement headerElement : headerElements) {
+                    cookies.put(headerElement.getName(), headerElement.getValue());
+                }
             }	
         }
         return cookies;

modules/transport/http/src/test/java/org/apache/axis2/transport/http/HTTPSenderTest.java

@@ -24,6 +24,8 @@
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.OperationContext;
+import org.apache.axis2.context.ServiceContext;
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.axis2.transport.http.mock.server.AbstractHTTPServerTest;
 import org.apache.axis2.transport.http.mock.server.BasicHttpServer;
 
@@ -58,13 +60,16 @@ public abstract class HTTPSenderTest extends AbstractHTTPServerTest {
      * @throws IOException
      *             Signals that an I/O exception has occurred.
      */
-    protected void sendViaHTTP(String httpMethod, String soapAction, String address, boolean rest)
+    protected MessageContext sendViaHTTP(String httpMethod, String soapAction, String address, boolean rest)
             throws IOException {
         httpSender = getHTTPSender();
+        ServiceContext serviceContext = new ServiceContext();
         MessageContext msgContext = new MessageContext();
+        msgContext.setServiceContext(serviceContext);
         ConfigurationContext configContext = ConfigurationContextFactory
                 .createEmptyConfigurationContext();
         OperationContext opContext = new OperationContext();
+        opContext.setParent(serviceContext);
 
         msgContext.setConfigurationContext(configContext);
         msgContext.setEnvelope(getEnvelope());
@@ -73,7 +78,7 @@ protected void sendViaHTTP(String httpMethod, String soapAction, String address,
         msgContext.setOperationContext(opContext);
         URL url = new URL(address);
         httpSender.send(msgContext, url, soapAction);
-
+        return msgContext;
     }
 
     /**
@@ -303,6 +308,17 @@ public void testHandleResponseHTTPStatusCode500() throws Exception {
         sendViaHTTP(Constants.Configuration.HTTP_METHOD_POST, "urn:postService",
                 "http://localhost:" + port + "/postService", true);
     }
+
+    public void testCookiesAreObtainedAfterRequest() throws Exception {
+        httpSender = getHTTPSender();
+        int port = getBasicHttpServer().getPort();
+        getBasicHttpServer().setResponseTemplate(BasicHttpServer.RESPONSE_HTTP_COOKIE);
+        final MessageContext mc = sendViaHTTP(Constants.Configuration.HTTP_METHOD_POST, "urn:postService",
+                "http://localhost:" + port + "/postService", true);
+
+        assertEquals("Cookie was not set", "JSESSIONID=abcde12345",
+                mc.getProperty(HTTPConstants.COOKIE_STRING));
+    }
 
 
 }

modules/transport/http/src/test/java/org/apache/axis2/transport/http/mock/server/BasicHttpServer.java

@@ -153,6 +153,7 @@ public interface BasicHttpServer {
     public static final String RESPONSE_HTTP_202 = "response.http.202";
     public static final String RESPONSE_HTTP_400 = "response.http.400";
     public static final String RESPONSE_HTTP_500 = "response.http.500";
+    public static final String RESPONSE_HTTP_COOKIE = "response.http.cookie";
 
 
 }

modules/transport/http/src/test/java/org/apache/axis2/transport/http/mock/server/BasicHttpServerImpl.java

@@ -34,6 +34,7 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.axis2.kernel.http.HTTPConstants;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.HttpException;
@@ -263,6 +264,10 @@ public void handle(final ClassicHttpRequest request, final ClassicHttpResponse r
                 response.setCode(HttpStatus.SC_INTERNAL_SERVER_ERROR);
                 body = HttpEntities.create(outStream -> outStream.write((" Server Error").getBytes(StandardCharsets.UTF_8)), ContentType.TEXT_HTML.withCharset(StandardCharsets.UTF_8));
 
+            } else if (server.getResponseTemplate().equals(BasicHttpServer.RESPONSE_HTTP_COOKIE)) {
+                response.setCode(HttpStatus.SC_OK);
+                response.addHeader(HTTPConstants.HEADER_SET_COOKIE, "JSESSIONID=abcde12345; Path=/; HttpOnly");
+                body = HttpEntities.create(outStream -> outStream.write(("<Response>Cookie should be set<Response>").getBytes(StandardCharsets.UTF_8)), ContentType.TEXT_HTML.withCharset(StandardCharsets.UTF_8));
             }
 
 	    if (body != null) {