From 66f4e2b3b025fde4ca94872c59c5b3b2c354fed9 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Wed, 21 Sep 2022 10:38:06 +0200 Subject: [PATCH] LibWeb: Add two more scheme helpers to the Fetch infrastructure --- .../Libraries/LibWeb/Fetch/Infrastructure/URL.cpp | 15 +++++++++++++++ .../Libraries/LibWeb/Fetch/Infrastructure/URL.h | 3 +++ 2 files changed, 18 insertions(+) diff --git a/Userland/Libraries/LibWeb/Fetch/Infrastructure/URL.cpp b/Userland/Libraries/LibWeb/Fetch/Infrastructure/URL.cpp index 9ed3612763..2c1f0bfeea 100644 --- a/Userland/Libraries/LibWeb/Fetch/Infrastructure/URL.cpp +++ b/Userland/Libraries/LibWeb/Fetch/Infrastructure/URL.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2022, Linus Groh + * Copyright (c) 2022, Andreas Kling * * SPDX-License-Identifier: BSD-2-Clause */ @@ -15,4 +16,18 @@ bool is_local_url(AK::URL const& url) return any_of(LOCAL_SCHEMES, [&](auto scheme) { return url.scheme() == scheme; }); } +// https://fetch.spec.whatwg.org/#fetch-scheme +bool is_fetch_scheme(StringView scheme) +{ + // A fetch scheme is "about", "blob", "data", "file", or an HTTP(S) scheme. + return any_of(FETCH_SCHEMES, [&](auto fetch_scheme) { return scheme == fetch_scheme; }); +} + +// https://fetch.spec.whatwg.org/#http-scheme +bool is_http_or_https_scheme(StringView scheme) +{ + // An HTTP(S) scheme is "http" or "https". + return any_of(HTTP_SCHEMES, [&](auto http_scheme) { return scheme == http_scheme; }); +} + } diff --git a/Userland/Libraries/LibWeb/Fetch/Infrastructure/URL.h b/Userland/Libraries/LibWeb/Fetch/Infrastructure/URL.h index 17d2497148..908ca11457 100644 --- a/Userland/Libraries/LibWeb/Fetch/Infrastructure/URL.h +++ b/Userland/Libraries/LibWeb/Fetch/Infrastructure/URL.h @@ -1,5 +1,6 @@ /* * Copyright (c) 2022, Linus Groh + * Copyright (c) 2022, Andreas Kling * * SPDX-License-Identifier: BSD-2-Clause */ @@ -30,5 +31,7 @@ inline constexpr Array FETCH_SCHEMES = { }; [[nodiscard]] bool is_local_url(AK::URL const&); +[[nodiscard]] bool is_fetch_scheme(StringView); +[[nodiscard]] bool is_http_or_https_scheme(StringView); }