Fix a bug where an empty query is translated into /

line · Apr 5, 2023 · 72f1512 · 72f1512
1 parent b1f64f6
commit 72f1512
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/core/src/main/java/com/linecorp/armeria/internal/common/DefaultRequestTarget.java b/core/src/main/java/com/linecorp/armeria/internal/common/DefaultRequestTarget.java
@@ -477,7 +477,7 @@ private static RequestTarget slowForClient(String reqTarget,
                 // path?query
                 if ((query = decodePercentsAndEncodeToUtf8(
                         reqTarget, queryPos + 1, reqTarget.length(),
-                        ComponentType.QUERY, SLASH_BYTES)) == null) {
+                        ComponentType.QUERY, EMPTY_BYTES)) == null) {
                     return null;
                 }
                 fragment = null;

diff --git a/core/src/test/java/com/linecorp/armeria/internal/common/DefaultRequestTargetTest.java b/core/src/test/java/com/linecorp/armeria/internal/common/DefaultRequestTargetTest.java
@@ -464,6 +464,16 @@ void clientShouldRejectInvalidSchemeOrAuthority() {
         assertRejected(forClient("http:///"));     // empty authority
     }
 
+    @ParameterizedTest
+    @EnumSource(Mode.class)
+    void shouldYieldEmptyStringForEmptyQueryAndFragment(Mode mode) {
+        assertAccepted(parse(mode, "/?"), "/", "");
+        if (mode == Mode.CLIENT) {
+            assertAccepted(forClient("/#"), "/", null, "");
+            assertAccepted(forClient("/?#"), "/", "", "");
+        }
+    }
+
     @Test
     void testToString() {
         assertThat(forServer("/")).asString().isEqualTo("/");