mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-06-04 09:22:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

AK: Parse query and fragment in URL::parse()

Browse source
This commit is contained in:
Linus Groh 2020-04-11 23:38:28 +01:00 • committed by Andreas Kling
parent 21a61b276b
commit c8d0a2eb3c
Notes: sideshowbarker 2024-07-19 07:41:35 +09:00
2 changed files with 90 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

59
AK/Tests/TestURL.cpp
View file

@ -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)

32
AK/URL.cpp
View file

@ -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;
}
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;
}