RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 09:48:11 +00:00
Code Issues Activity Actions

AK: Decode data URLs to separate class (and parse like every other URL)

Browse source 
Parsing 'data:' URLs took it's own route. It never set standard URL
fields like path, query or fragment (except for scheme) and instead
gave us separate methods called `data_payload()`, `data_mime_type()`,
and `data_payload_is_base64()`.

Because parsing 'data:' didn't use standard fields, running the
following JS code:

    new URL('#a', 'data:text/plain,hello').toString()

not only cleared the path as URLParser doesn't check for data from
data_payload() function (making the result be 'data:#a'), but it also
crashes the program because we forbid having an empty MIME type when we
serialize to string.

With this change, 'data:' URLs will be parsed like every other URLs.
To decode the 'data:' URL contents, one needs to call process_data_url()
on a URL, which will return a struct containing MIME type with already
decoded data! :^)
This commit is contained in:
Karol Kosek 2023-07-06 19:11:58 +02:00 • committed by Andreas Kling
parent f27b9b9563
commit eb41f0144b
9 changed files with 172 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

83
Tests/AK/TestURL.cpp
View file

@ -7,7 +7,6 @@
#include <LibTest/TestCase.h>
#include <AK/Base64.h>
#include <AK/URL.h>
#include <AK/URLParser.h>
@ -111,7 +110,6 @@ TEST_CASE(some_bad_urls)
EXPECT_EQ(URL("http://serenityos.org:abc"sv).is_valid(), false);
EXPECT_EQ(URL("http://serenityos.org:abc:80"sv).is_valid(), false);
EXPECT_EQ(URL("http://serenityos.org:abc:80/"sv).is_valid(), false);
EXPECT_EQ(URL("data:"sv).is_valid(), false);
}
TEST_CASE(serialization)
@ -246,10 +244,11 @@ TEST_CASE(data_url)
EXPECT(url.is_valid());
EXPECT_EQ(url.scheme(), "data");
EXPECT(url.host().has<Empty>());
EXPECT_EQ(url.data_mime_type(), "text/html");
EXPECT_EQ(url.data_payload(), "test");
EXPECT(!url.data_payload_is_base64());
EXPECT_EQ(url.serialize(), "data:text/html,test");
auto data_url = TRY_OR_FAIL(url.process_data_url());
EXPECT_EQ(data_url.mime_type, "text/html");
EXPECT_EQ(StringView(data_url.body.bytes()), "test"sv);
}
TEST_CASE(data_url_default_mime_type)
@ -258,10 +257,11 @@ TEST_CASE(data_url_default_mime_type)
EXPECT(url.is_valid());
EXPECT_EQ(url.scheme(), "data");
EXPECT(url.host().has<Empty>());
EXPECT_EQ(url.data_mime_type(), "text/plain");
EXPECT_EQ(url.data_payload(), "test");
EXPECT(!url.data_payload_is_base64());
EXPECT_EQ(url.serialize(), "data:text/plain,test");
EXPECT_EQ(url.serialize(), "data:,test");
auto data_url = TRY_OR_FAIL(url.process_data_url());
EXPECT_EQ(data_url.mime_type, "text/plain;charset=US-ASCII");
EXPECT_EQ(StringView(data_url.body.bytes()), "test"sv);
}
TEST_CASE(data_url_encoded)
@ -270,46 +270,50 @@ TEST_CASE(data_url_encoded)
EXPECT(url.is_valid());
EXPECT_EQ(url.scheme(), "data");
EXPECT(url.host().has<Empty>());
EXPECT_EQ(url.data_mime_type(), "text/html");
EXPECT_EQ(url.data_payload(), "Hello friends,%0X%X0");
EXPECT(!url.data_payload_is_base64());
EXPECT_EQ(url.serialize(), "data:text/html,Hello friends,%0X%X0");
EXPECT_EQ(url.serialize(), "data:text/html,Hello%20friends%2C%0X%X0");
auto data_url = TRY_OR_FAIL(url.process_data_url());
EXPECT_EQ(data_url.mime_type, "text/html");
EXPECT_EQ(StringView(data_url.body.bytes()), "Hello friends,%0X%X0"sv);
}
TEST_CASE(data_url_base64_encoded)
{
URL url("data:text/html;base64,test"sv);
URL url("data:text/html;base64,dGVzdA=="sv);
EXPECT(url.is_valid());
EXPECT_EQ(url.scheme(), "data");
EXPECT(url.host().has<Empty>());
EXPECT_EQ(url.data_mime_type(), "text/html");
EXPECT_EQ(url.data_payload(), "test");
EXPECT(url.data_payload_is_base64());
EXPECT_EQ(url.serialize(), "data:text/html;base64,test");
EXPECT_EQ(url.serialize(), "data:text/html;base64,dGVzdA==");
auto data_url = TRY_OR_FAIL(url.process_data_url());
EXPECT_EQ(data_url.mime_type, "text/html");
EXPECT_EQ(StringView(data_url.body.bytes()), "test"sv);
}
TEST_CASE(data_url_base64_encoded_default_mime_type)
{
URL url("data:;base64,test"sv);
URL url("data:;base64,dGVzdA=="sv);
EXPECT(url.is_valid());
EXPECT_EQ(url.scheme(), "data");
EXPECT(url.host().has<Empty>());
EXPECT_EQ(url.data_mime_type(), "text/plain");
EXPECT_EQ(url.data_payload(), "test");
EXPECT(url.data_payload_is_base64());
EXPECT_EQ(url.serialize(), "data:text/plain;base64,test");
EXPECT_EQ(url.serialize(), "data:;base64,dGVzdA==");
auto data_url = TRY_OR_FAIL(url.process_data_url());
EXPECT_EQ(data_url.mime_type, "text/plain;charset=US-ASCII");
EXPECT_EQ(StringView(data_url.body.bytes()), "test"sv);
}
TEST_CASE(data_url_base64_encoded_with_whitespace)
{
URL url("data: text/html ; bAsE64 , test with whitespace "sv);
URL url("data: text/html ; bAsE64 , dGVz dA== "sv);
EXPECT(url.is_valid());
EXPECT_EQ(url.scheme(), "data");
EXPECT(url.host().has<Empty>());
EXPECT_EQ(url.data_mime_type(), "text/html");
EXPECT_EQ(url.data_payload(), " test with whitespace ");
EXPECT(url.data_payload_is_base64());
EXPECT_EQ(url.serialize(), "data:text/html;base64, test with whitespace ");
EXPECT_EQ(url.serialize(), "data: text/html ; bAsE64 , dGVz dA==");
auto data_url = TRY_OR_FAIL(url.process_data_url());
EXPECT_EQ(data_url.mime_type, "text/html");
EXPECT_EQ(StringView(data_url.body.bytes()), "test");
}
TEST_CASE(data_url_base64_encoded_with_inline_whitespace)
@ -318,12 +322,23 @@ TEST_CASE(data_url_base64_encoded_with_inline_whitespace)
EXPECT(url.is_valid());
EXPECT_EQ(url.scheme(), "data");
EXPECT(url.host().has<Empty>());
EXPECT_EQ(url.data_mime_type(), "text/javascript");
EXPECT(url.data_payload_is_base64());
EXPECT_EQ(url.data_payload(), " ZD Qg\r\nPS An Zm91cic\r\n 7 "sv);
auto decode_result = decode_base64(url.data_payload());
EXPECT_EQ(decode_result.is_error(), false);
EXPECT_EQ(StringView(decode_result.value()), "d4 = 'four';"sv);
auto data_url = TRY_OR_FAIL(url.process_data_url());
EXPECT_EQ(data_url.mime_type, "text/javascript");
EXPECT_EQ(StringView(data_url.body.bytes()), "d4 = 'four';"sv);
}
TEST_CASE(data_url_completed_with_fragment)
{
auto url = URL("data:text/plain,test"sv).complete_url("#a"sv);
EXPECT(url.is_valid());
EXPECT_EQ(url.scheme(), "data");
EXPECT_EQ(url.fragment(), "a");
EXPECT(url.host().has<Empty>());
auto data_url = TRY_OR_FAIL(url.process_data_url());
EXPECT_EQ(data_url.mime_type, "text/plain");
EXPECT_EQ(StringView(data_url.body.bytes()), "test"sv);
}
TEST_CASE(trailing_slash_with_complete_url)