Merge pull request #1194 from amihaiemil/1193

#1193 follow redirects in JsonResources
self-xdsd · Aug 3, 2021 · 9f57b92 · 9f57b92
2 parents be8afd8 + 0acdf71
commit 9f57b92
Show file tree

Hide file tree

Showing 2 changed files with 116 additions and 1 deletion.
diff --git a/self-core-impl/src/main/java/com/selfxdsd/core/JsonResources.java b/self-core-impl/src/main/java/com/selfxdsd/core/JsonResources.java
@@ -472,9 +472,13 @@ private HttpClient newHttpClient() {
                 client = HttpClient
                     .newBuilder()
                     .version(HttpClient.Version.HTTP_1_1)
+                    .followRedirects(HttpClient.Redirect.NORMAL)
                     .build();
             } else {
-                client = HttpClient.newHttpClient();
+                client = HttpClient
+                    .newBuilder()
+                    .followRedirects(HttpClient.Redirect.NORMAL)
+                    .build();
             }
             return client;
         }

diff --git a/self-core-impl/src/test/java/com/selfxdsd/core/JdkHttpITCase.java b/self-core-impl/src/test/java/com/selfxdsd/core/JdkHttpITCase.java
@@ -86,6 +86,117 @@ public void getJsonObjectOkNoAuth() throws IOException {
         }
     }
 
+    /**
+     * We can GET a JsonObject from the server if the response is 301 (redirect)
+     * with a new Location header.
+     * @throws IOException If something goes wrong.
+     */
+    @Test
+    public void getJsonObjectMovedPermanentlyRedirect() throws IOException {
+        final int port = this.resource.port();
+        final JsonObject json = Json.createObjectBuilder()
+            .add("from", "server")
+            .build();
+        try(
+            final MkContainer container = new MkGrizzlyContainer().next(
+                new MkAnswer.Simple(HttpURLConnection.HTTP_MOVED_PERM)
+                    .withHeader(
+                        "Location", "http://localhost:" + port
+                    )
+            ).next(
+                new MkAnswer.Simple(
+                    HttpURLConnection.HTTP_OK,
+                    json.toString()
+                )
+            ).start(port)
+        ) {
+            final JsonResources resources = new JsonResources.JdkHttp(true);
+            final Resource response = resources.get(container.home());
+            MatcherAssert.assertThat(
+                response.asJsonObject(),
+                Matchers.equalTo(json)
+            );
+            MatcherAssert.assertThat(
+                response.statusCode(),
+                Matchers.equalTo(HttpURLConnection.HTTP_OK)
+            );
+        }
+    }
+
+    /**
+     * We can GET a JsonObject from the server if the response is 302 (redirect)
+     * with a new Location header.
+     * @throws IOException If something goes wrong.
+     */
+    @Test
+    public void getJsonObjectMovedTemporarilyRedirect() throws IOException {
+        final int port = this.resource.port();
+        final JsonObject json = Json.createObjectBuilder()
+            .add("from", "server")
+            .build();
+        try(
+            final MkContainer container = new MkGrizzlyContainer().next(
+                new MkAnswer.Simple(HttpURLConnection.HTTP_MOVED_TEMP)
+                    .withHeader(
+                        "Location", "http://localhost:" + port
+                    )
+            ).next(
+                new MkAnswer.Simple(
+                    HttpURLConnection.HTTP_OK,
+                    json.toString()
+                )
+            ).start(port)
+        ) {
+            final JsonResources resources = new JsonResources.JdkHttp(true);
+            final Resource response = resources.get(container.home());
+            MatcherAssert.assertThat(
+                response.asJsonObject(),
+                Matchers.equalTo(json)
+            );
+            MatcherAssert.assertThat(
+                response.statusCode(),
+                Matchers.equalTo(HttpURLConnection.HTTP_OK)
+            );
+        }
+    }
+
+    /**
+     * We can GET a JsonObject from the server if the response is 303 (redirect)
+     * with a new Location header.
+     * @throws IOException If something goes wrong.
+     */
+    @Test
+    public void getJsonObjectSeeOtherRedirect() throws IOException {
+        final int port = this.resource.port();
+        final JsonObject json = Json.createObjectBuilder()
+            .add("from", "server")
+            .build();
+        try(
+            final MkContainer container = new MkGrizzlyContainer().next(
+                new MkAnswer.Simple(HttpURLConnection.HTTP_SEE_OTHER)
+                    .withHeader(
+                        "Location", "http://localhost:" + port
+                    )
+            ).next(
+                new MkAnswer.Simple(
+                    HttpURLConnection.HTTP_OK,
+                    json.toString()
+                )
+            ).start(port)
+        ) {
+            final JsonResources resources = new JsonResources.JdkHttp(true);
+            final Resource response = resources.get(container.home());
+            MatcherAssert.assertThat(
+                response.asJsonObject(),
+                Matchers.equalTo(json)
+            );
+            MatcherAssert.assertThat(
+                response.statusCode(),
+                Matchers.equalTo(HttpURLConnection.HTTP_OK)
+            );
+        }
+    }
+
     /**
      * We can GET a JsonObject from the server with no access token and
      * request having other headers.