system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-02 22:24:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

AK: Add typdefs for host URL definitions

Browse source 
And use them where applicable. This will allow us to store the host in
the deserialized format as the spec specifies.

Ideally these typdefs would instead be the existing AK interfaces, but
in the meantime, we can just use this.
This commit is contained in:
Shannon Booth 2023-07-26 20:49:49 +12:00 committed by Andreas Kling
parent 3dd3120a8a
commit 0c0117fc86
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
AK/URL.h
View file

@ -54,6 +54,22 @@ public:
{
}
// https://url.spec.whatwg.org/#concept-ipv4
// An IPv4 address is a 32-bit unsigned integer that identifies a network address. [RFC791]
// FIXME: It would be nice if this were an AK::IPv4Address
using IPv4Address = u32;
// https://url.spec.whatwg.org/#concept-ipv6
// An IPv6 address is a 128-bit unsigned integer that identifies a network address. For the purposes of this standard
// it is represented as a list of eight 16-bit unsigned integers, also known as IPv6 pieces. [RFC4291]
// FIXME: It would be nice if this were an AK::IPv6Address
using IPv6Address = Array<u16, 8>;
// https://url.spec.whatwg.org/#concept-host
// A host is a domain, an IP address, an opaque host, or an empty host. Typically a host serves as a network address,
// but it is sometimes used as opaque identifier in URLs where a network address is not necessary.
using Host = Variant<IPv4Address, IPv6Address, String, Empty>;
bool is_valid() const { return m_valid; }
enum class ApplyPercentDecoding {

8
AK/URLParser.cpp
View file

@ -121,7 +121,7 @@ static Optional<ParsedIPv4Number> parse_ipv4_number(StringView input)
}
// https://url.spec.whatwg.org/#concept-ipv4-parser
static Optional<u32> parse_ipv4_address(StringView input)
static Optional<URL::IPv4Address> parse_ipv4_address(StringView input)
{
// 1. Let parts be the result of strictly splitting input on U+002E (.).
auto parts = input.split_view("."sv, SplitBehavior::KeepEmpty);
@ -201,7 +201,7 @@ static Optional<u32> parse_ipv4_address(StringView input)
}
// https://url.spec.whatwg.org/#concept-ipv4-serializer
static ErrorOr<String> serialize_ipv4_address(u32 address)
static ErrorOr<String> serialize_ipv4_address(URL::IPv4Address address)
{
// 1. Let output be the empty string.
// NOTE: Array to avoid prepend.
@ -227,7 +227,7 @@ static ErrorOr<String> serialize_ipv4_address(u32 address)
}
// https://url.spec.whatwg.org/#concept-ipv6-serializer
static ErrorOr<String> serialize_ipv6_address(Array<u16, 8> const& address)
static ErrorOr<String> serialize_ipv6_address(URL::IPv6Address const& address)
{
// 1. Let output be the empty string.
StringBuilder output;
@ -290,7 +290,7 @@ static ErrorOr<String> serialize_ipv6_address(Array<u16, 8> const& address)
}
// https://url.spec.whatwg.org/#concept-ipv6-parser
static Optional<Array<u16, 8>> parse_ipv6_address(StringView input)
static Optional<URL::IPv6Address> parse_ipv6_address(StringView input)
{
// 1. Let address be a new IPv6 address whose IPv6 pieces are all 0.
Array<u16, 8> address {};