RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 07:37:46 +00:00
Code Issues Activity Actions

AK: Fix bad parsing of some file:/// URLs with base URL

Browse source 
We were dropping the base URL path components in the resulting URL due
to mistakenly determining the input URL to start with a Windows drive
letter. Fix this, add a spec link, and a test.
This commit is contained in:
Andreas Kling 2022-09-20 15:38:53 +02:00
parent ac76df3d47
commit 287a9b552a
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
AK/URLParser.cpp
View file

@ -84,11 +84,12 @@ static Optional<String> parse_host(StringView input, bool is_not_special = false
return ipv4_host; return ipv4_host;
} }
// https://url.spec.whatwg.org/#start-with-a-windows-drive-letter
constexpr bool starts_with_windows_drive_letter(StringView input) constexpr bool starts_with_windows_drive_letter(StringView input)
{ {
if (input.length() < 2) if (input.length() < 2)
return false; return false;
if (!is_ascii_alpha(input[0]) && !(input[1] == ':' || input[1] == '|')) if (!is_ascii_alpha(input[0]) || !(input[1] == ':' || input[1] == '|'))
return false; return false;
if (input.length() == 2) if (input.length() == 2)
return true; return true;

14
Tests/AK/TestURL.cpp
View file

@ -392,3 +392,17 @@ TEST_CASE(unicode)
EXPECT(url.query().is_null()); EXPECT(url.query().is_null());
EXPECT(url.fragment().is_null()); EXPECT(url.fragment().is_null());
} }
TEST_CASE(complete_file_url_with_base)
{
URL url { "file:///home/index.html" };
EXPECT(url.is_valid());
EXPECT_EQ(url.path(), "/home/index.html");
EXPECT_EQ(url.paths().size(), 2u);
EXPECT_EQ(url.paths()[0], "home");
EXPECT_EQ(url.paths()[1], "index.html");
auto sub_url = url.complete_url("js/app.js");
EXPECT(sub_url.is_valid());
EXPECT_EQ(sub_url.path(), "/home/js/app.js");
}