Merge pull request #147 from disneystreaming/infinite-redirect

fix infinite redirect
disneystreaming · Mar 24, 2022 · 3c2243d · 3c2243d
2 parents b1be6d7 + d842267
commit 3c2243d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/modules/http4s-swagger/src-jvm/smithy4s/http4s/swagger/Docs.scala b/modules/http4s-swagger/src-jvm/smithy4s/http4s/swagger/Docs.scala
@@ -48,7 +48,7 @@ private[smithy4s] abstract class Docs[F[_]](
     }
   }
   def routes: HttpRoutes[F] = HttpRoutes.of[F] {
-    case GET -> DocPath() =>
+    case r @ GET -> DocPath() if r.uri.query.isEmpty =>
       PermanentRedirect(
         Location(Uri.unsafeFromString(s"/$path/index.html?url=/$jsonSpec"))
       )

diff --git a/modules/http4s-swagger/test/resources/swaggerui/index.html b/modules/http4s-swagger/test/resources/swaggerui/index.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<html>
+<body>
+
+</body>
+</html>
diff --git a/modules/http4s-swagger/test/src/smithy4s/http4s/swagger/DocsSpec.scala b/modules/http4s-swagger/test/src/smithy4s/http4s/swagger/DocsSpec.scala
@@ -78,6 +78,20 @@ object DocsSpec extends SimpleIOSuite with TestCompat {
           )
       }
     }
+    test(
+      s"GET /$path/index.html?url=/test-file.json does not redirect"
+    ) {
+      val request =
+        Request[IO](
+          method = Method.GET,
+          uri = Uri.unsafeFromString(
+            s"/$path/index.html?url=/test-file.json"
+          )
+        )
+      app.run(request).map { response =>
+        expect(response.status == Status.Ok)
+      }
+    }
     test(s"GET $path/test-file.json fetches requested file") {
       val filePath = s"/$path/test-file.json"
       val request =