From c8d0a2eb3c88a4d0751245ca83a1d01a87f2bb91 Mon Sep 17 00:00:00 2001
From: Linus Groh <mail@linusgroh.de>
Date: Sat, 11 Apr 2020 23:38:28 +0100
Subject: [PATCH] AK: Parse query and fragment in URL::parse()

---
 AK/Tests/TestURL.cpp | 59 +++++++++++++++++++++++++++++++++++++++++++-
 AK/URL.cpp           | 34 +++++++++++++++++++++++--
 2 files changed, 90 insertions(+), 3 deletions(-)

diff --git a/AK/Tests/TestURL.cpp b/AK/Tests/TestURL.cpp
index 10d5a33d15..1c9f2e388e 100644
--- a/AK/Tests/TestURL.cpp
+++ b/AK/Tests/TestURL.cpp
@@ -36,18 +36,74 @@ TEST_CASE(construct)
 TEST_CASE(basic)
 {
     {
-        URL url("http://www.serenityos.org/index.html");
+        URL url("http://www.serenityos.org");
         EXPECT_EQ(url.is_valid(), true);
         EXPECT_EQ(url.protocol(), "http");
+        EXPECT_EQ(url.host(), "www.serenityos.org");
         EXPECT_EQ(url.port(), 80);
+        EXPECT_EQ(url.path(), "/");
+        EXPECT_EQ(url.query(), "");
+        EXPECT_EQ(url.fragment(), "");
+    }
+    {
+        URL url("https://www.serenityos.org/index.html");
+        EXPECT_EQ(url.is_valid(), true);
+        EXPECT_EQ(url.protocol(), "https");
+        EXPECT_EQ(url.host(), "www.serenityos.org");
+        EXPECT_EQ(url.port(), 443);
         EXPECT_EQ(url.path(), "/index.html");
+        EXPECT_EQ(url.query(), "");
+        EXPECT_EQ(url.fragment(), "");
     }
     {
         URL url("https://localhost:1234/~anon/test/page.html");
         EXPECT_EQ(url.is_valid(), true);
         EXPECT_EQ(url.protocol(), "https");
+        EXPECT_EQ(url.host(), "localhost");
         EXPECT_EQ(url.port(), 1234);
         EXPECT_EQ(url.path(), "/~anon/test/page.html");
+        EXPECT_EQ(url.query(), "");
+        EXPECT_EQ(url.fragment(), "");
+    }
+    {
+        URL url("http://www.serenityos.org/index.html?#");
+        EXPECT_EQ(url.is_valid(), true);
+        EXPECT_EQ(url.protocol(), "http");
+        EXPECT_EQ(url.host(), "www.serenityos.org");
+        EXPECT_EQ(url.port(), 80);
+        EXPECT_EQ(url.path(), "/index.html");
+        EXPECT_EQ(url.query(), "");
+        EXPECT_EQ(url.fragment(), "");
+    }
+    {
+        URL url("http://www.serenityos.org/index.html?foo=1&bar=2");
+        EXPECT_EQ(url.is_valid(), true);
+        EXPECT_EQ(url.protocol(), "http");
+        EXPECT_EQ(url.host(), "www.serenityos.org");
+        EXPECT_EQ(url.port(), 80);
+        EXPECT_EQ(url.path(), "/index.html");
+        EXPECT_EQ(url.query(), "foo=1&bar=2");
+        EXPECT_EQ(url.fragment(), "");
+    }
+    {
+        URL url("http://www.serenityos.org/index.html#fragment");
+        EXPECT_EQ(url.is_valid(), true);
+        EXPECT_EQ(url.protocol(), "http");
+        EXPECT_EQ(url.host(), "www.serenityos.org");
+        EXPECT_EQ(url.port(), 80);
+        EXPECT_EQ(url.path(), "/index.html");
+        EXPECT_EQ(url.query(), "");
+        EXPECT_EQ(url.fragment(), "fragment");
+    }
+    {
+        URL url("http://www.serenityos.org/index.html?foo=1&bar=2&baz=/?#frag/ment?test#");
+        EXPECT_EQ(url.is_valid(), true);
+        EXPECT_EQ(url.protocol(), "http");
+        EXPECT_EQ(url.host(), "www.serenityos.org");
+        EXPECT_EQ(url.port(), 80);
+        EXPECT_EQ(url.path(), "/index.html");
+        EXPECT_EQ(url.query(), "foo=1&bar=2&baz=/?");
+        EXPECT_EQ(url.fragment(), "frag/ment?test#");
     }
 }
 
@@ -71,6 +127,7 @@ TEST_CASE(serialization)
 {
     EXPECT_EQ(URL("http://www.serenityos.org/").to_string(), "http://www.serenityos.org/");
     EXPECT_EQ(URL("http://www.serenityos.org:81/").to_string(), "http://www.serenityos.org:81/");
+    EXPECT_EQ(URL("https://www.serenityos.org:443/foo/bar.html?query#fragment").to_string(), "https://www.serenityos.org/foo/bar.html?query#fragment");
 }
 
 TEST_MAIN(URL)
diff --git a/AK/URL.cpp b/AK/URL.cpp
index c0f91b3286..62e23e062c 100644
--- a/AK/URL.cpp
+++ b/AK/URL.cpp
@@ -52,6 +52,8 @@ bool URL::parse(const StringView& string)
         InHostname,
         InPort,
         InPath,
+        InQuery,
+        InFragment,
     };
 
     Vector<char, 256> buffer;
@@ -136,6 +138,26 @@ bool URL::parse(const StringView& string)
             }
             return false;
         case State::InPath:
+            if (peek() == '?' || peek() == '#') {
+                m_path = String::copy(buffer);
+                buffer.clear();
+                state = peek() == '?' ? State::InQuery : State::InFragment;
+                consume();
+                continue;
+            }
+            buffer.append(consume());
+            continue;
+        case State::InQuery:
+            if (peek() == '#') {
+                m_query = String::copy(buffer);
+                buffer.clear();
+                consume();
+                state = State::InFragment;
+                continue;
+            }
+            buffer.append(consume());
+            continue;
+        case State::InFragment:
             buffer.append(consume());
             continue;
         }
@@ -146,9 +168,17 @@ bool URL::parse(const StringView& string)
             return false;
         m_host = String::copy(buffer);
         m_path = "/";
-        return true;
     }
-    m_path = String::copy(buffer);
+    if (state == State::InPath)
+        m_path = String::copy(buffer);
+    if (state == State::InQuery)
+        m_query = String::copy(buffer);
+    if (state == State::InFragment)
+        m_fragment = String::copy(buffer);
+    if (m_query.is_null())
+        m_query = "";
+    if (m_fragment.is_null())
+        m_fragment = "";
     return true;
 }