add: redirect strategy to follow redirect in POST

Author: florianepitech

pom.xml

@@ -17,9 +17,9 @@
         </dependency>
         <!-- Apache Httpclient -->
         <dependency>
-            <groupId>org.apache.httpcomponents.client5</groupId>
-            <artifactId>httpclient5</artifactId>
-            <version>5.2-beta1</version>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.13</version>
         </dependency>
         <!-- Json -->
         <dependency>

src/main/java/net/httpclient/wrapper/session/HttpClientSession.java

@@ -26,7 +26,9 @@
 import org.apache.http.impl.client.BasicCookieStore;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.LaxRedirectStrategy;
 import org.apache.http.ssl.SSLContextBuilder;
+import org.jetbrains.annotations.NotNull;
 import org.json.JSONObject;
 
 import javax.net.ssl.SSLContext;
@@ -94,6 +96,13 @@ public HttpClient newHttpClient() throws NoSuchAlgorithmException, KeyManagement
         HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
         httpClientBuilder.setUserAgent(userAgent);
 
+        /*
+         * This line below allow redirection (301, 302, 303, 307, 308) to be followed automatically
+         * in the case of a POST request. By default, the HttpClient does not follow redirections for POST requests.
+         * This is specified in the HTTP specification. (HTTP RFC 2616)
+         */
+        httpClientBuilder.setRedirectStrategy(new LaxRedirectStrategy());
+
         /*
          * Create a SSLContext that uses our Trust Strategy to trust all self-signed certificates.
          */
@@ -124,12 +133,22 @@ public HttpClient newHttpClient() throws NoSuchAlgorithmException, KeyManagement
         return (httpClientBuilder.build());
     }
 
-    public RequestResponse sendGet(String url) throws IOException, HttpClientException, HttpServerException {
+    /*
+     $      GET
+     */
+
+    public @NotNull RequestResponse sendGet(@NotNull String url) throws IOException, HttpClientException, HttpServerException {
+        return (sendGet(url, getRequestConfig().build()));
+    }
+
+    public @NotNull RequestResponse sendGet(@NotNull String url, @NotNull RequestConfig requestConfig) throws IOException,
+            HttpClientException,
+            HttpServerException {
         Date start = new Date();
         String oldCookieStoreSerialized = BasicCookieStoreSerializerUtils.serializableToBase64(httpCookieStore);
 
         HttpGet httpGet = new HttpGet(url);
-        httpGet.setConfig(getRequestConfig().build());
+        httpGet.setConfig(requestConfig);
         httpGet.addHeader(HttpHeaders.ACCEPT, "application/json, text/plain, */*");
         HttpResponse httpResponse = getHttpClient().execute(httpGet);
 
@@ -138,6 +157,10 @@ public RequestResponse sendGet(String url) throws IOException, HttpClientExcepti
         return (new RequestResponse(httpResponse, start));
     }
 
+    /*
+     $      POST
+     */
+
     public RequestResponse sendPost(String url, String content, ContentType contentType) throws IOException, HttpClientException, HttpServerException {
         Date start = new Date();
         String oldCookieStoreSerialized = BasicCookieStoreSerializerUtils.serializableToBase64(httpCookieStore);
@@ -154,12 +177,27 @@ public RequestResponse sendPost(String url, String content, ContentType contentT
         return (new RequestResponse(httpResponse, start));
     }
 
-    public RequestResponse sendForm(String url, List<NameValuePair> form) throws IOException, HttpClientException, HttpServerException {
+    /*
+     $      FORM
+     */
+
+    public @NotNull RequestResponse sendForm(@NotNull String url,
+                                             @NotNull List<NameValuePair> form) throws IOException,
+            HttpClientException,
+            HttpServerException {
+        return (sendForm(url, form, getRequestConfig().build()));
+    }
+
+    public @NotNull RequestResponse sendForm(@NotNull String url,
+                                             @NotNull List<NameValuePair> form,
+                                             @NotNull RequestConfig requestConfig) throws IOException,
+            HttpClientException,
+            HttpServerException {
         Date start = new Date();
         String oldCookieStoreSerialized = BasicCookieStoreSerializerUtils.serializableToBase64(httpCookieStore);
 
         HttpPost httpPost = new HttpPost(url);
-        httpPost.setConfig(getRequestConfig().build());
+        httpPost.setConfig(requestConfig);
         httpPost.addHeader(HttpHeaders.ACCEPT, "application/json, text/plain, */*");
         UrlEncodedFormEntity entity = new UrlEncodedFormEntity(form, Consts.UTF_8);
         httpPost.setEntity(entity);

src/main/java/net/httpclient/wrapper/session/HttpClientSessionAsync.java

@@ -19,8 +19,10 @@
 import org.apache.http.entity.ContentType;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.LaxRedirectStrategy;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.ssl.SSLContextBuilder;
+import org.jetbrains.annotations.NotNull;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@@ -71,6 +73,13 @@ public HttpClient newHttpClient() throws NoSuchAlgorithmException, KeyManagement
         HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
         httpClientBuilder.setUserAgent(getUserAgent());
 
+        /*
+         * This line below allow redirection (301, 302, 303, 307, 308) to be followed automatically
+         * in the case of a POST request. By default, the HttpClient does not follow redirections for POST requests.
+         * This is specified in the HTTP specification. (HTTP RFC 2616)
+         */
+        httpClientBuilder.setRedirectStrategy(new LaxRedirectStrategy());
+
         /*
          * Create a SSLContext that uses our Trust Strategy to trust all self-signed certificates.
          */
@@ -120,7 +129,7 @@ public HttpClient newHttpClient() throws NoSuchAlgorithmException, KeyManagement
     }
 
     @Override
-    public RequestResponse sendGet(String url) throws IOException, HttpClientException, HttpServerException {
+    public @NotNull RequestResponse sendGet(@NotNull String url) throws IOException, HttpClientException, HttpServerException {
         try {
             semaphore.acquire();
             RequestResponse result = super.sendGet(url);
@@ -146,7 +155,7 @@ public RequestResponse sendPost(String url, String content, ContentType contentT
     }
 
     @Override
-    public RequestResponse sendForm(String url, List<NameValuePair> form) throws IOException, HttpClientException, HttpServerException {
+    public @NotNull RequestResponse sendForm(@NotNull String url, @NotNull List<NameValuePair> form) throws IOException, HttpClientException, HttpServerException {
         try {
             semaphore.acquire();
             RequestResponse response = super.sendForm(url, form);

src/main/java/net/httpclient/wrapper/session/HttpClientSessionRateLimited.java

@@ -32,7 +32,7 @@ public RequestResponse sendPost(String url, String content, ContentType contentT
     }
 
     @Override
-    public RequestResponse sendGet(String url) throws IOException, HttpClientException, HttpServerException {
+    public @NotNull RequestResponse sendGet(@NotNull String url) throws IOException, HttpClientException, HttpServerException {
         rateLimiter.acquire();
         return (super.sendGet(url));
     }

src/test/java/net/httpclient/wrapper/ratelimiter/HttpClientSessionTest.java

@@ -0,0 +1,40 @@
+package net.httpclient.wrapper.ratelimiter;
+
+import net.httpclient.wrapper.exception.HttpClientException;
+import net.httpclient.wrapper.exception.HttpException;
+import net.httpclient.wrapper.exception.HttpServerException;
+import net.httpclient.wrapper.response.RequestResponse;
+import net.httpclient.wrapper.session.HttpClientSession;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.message.BasicNameValuePair;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class HttpClientSessionTest {
+
+    @Test
+    public void testRedirectN() throws IOException, HttpServerException {
+        try {
+            HttpClientSession httpClientSession = new HttpClientSession();
+            String url = "http://t.co/I5YYd9tddw";
+            RequestConfig requestConfig = RequestConfig.custom()
+                    .setRedirectsEnabled(true)
+                    .build();
+            List<NameValuePair> params = new ArrayList<>();
+            params.add(new BasicNameValuePair("url", "https://www.wikipedia.net/"));
+            RequestResponse requestResponse = httpClientSession.sendForm(url, params, requestConfig);
+            assertEquals(200, requestResponse.getStatusCode());
+        } catch (HttpException e) {
+            System.out.println(e.getRequestResponse().getRawResponse());
+            Assertions.fail();
+        }
+    }
+
+}