瀏覽代碼

LibWeb: Add definitions from '2.2.1. Methods' in the Fetch spec

Linus Groh 3 年之前
父節點
當前提交
9244f1697d

+ 2 - 1
Meta/Lagom/CMakeLists.txt

@@ -517,6 +517,7 @@ if (BUILD_LAGOM)
     file(GLOB LIBWEB_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibWeb/*.cpp")
     file(GLOB LIBWEB_SUBDIR_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibWeb/*/*.cpp")
     file(GLOB LIBWEB_SUBSUBDIR_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibWeb/*/*/*.cpp")
+    file(GLOB LIBWEB_SUBSUBSUBDIR_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibWeb/*/*/*/*.cpp")
     list(REMOVE_ITEM LIBWEB_SUBSUBDIR_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/../../Userland/Libraries/LibWeb/CSS/SyntaxHighlighter/SyntaxHighlighter.cpp")
     list(REMOVE_ITEM LIBWEB_SUBSUBDIR_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/../../Userland/Libraries/LibWeb/HTML/SyntaxHighlighter/SyntaxHighlighter.cpp")
 
@@ -533,7 +534,7 @@ if (BUILD_LAGOM)
     )
 
     lagom_lib(Web web
-        SOURCES ${LIBWEB_SOURCES} ${LIBWEB_SUBDIR_SOURCES} ${LIBWEB_SUBSUBDIR_SOURCES} ${LIBWEB_GENERATED_SOURCES}
+        SOURCES ${LIBWEB_SOURCES} ${LIBWEB_SUBDIR_SOURCES} ${LIBWEB_SUBSUBDIR_SOURCES} ${LIBWEB_SUBSUBSUBDIR_SOURCES} ${LIBWEB_GENERATED_SOURCES}
         LIBS LibMarkdown LibGemini LibGfx LibGL LibJS LibTextCodec LibWasm LibXML
     )
     generate_js_wrappers(LibWeb)

+ 1 - 0
Userland/Libraries/LibWeb/CMakeLists.txt

@@ -119,6 +119,7 @@ set(SOURCES
     Encoding/TextEncoder.cpp
     Fetch/Infrastructure/HTTP.cpp
     Fetch/Infrastructure/URL.cpp
+    Fetch/Infrastructure/HTTP/Methods.cpp
     FontCache.cpp
     Geometry/DOMRectList.cpp
     HTML/AttributeNames.cpp

+ 48 - 0
Userland/Libraries/LibWeb/Fetch/Infrastructure/HTTP/Methods.cpp

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2022, Linus Groh <linusg@serenityos.org>
+ * Copyright (c) 2022, Kenneth Myhra <kennethmyhra@serenityos.org>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#include <AK/ByteBuffer.h>
+#include <AK/StringView.h>
+#include <LibRegex/Regex.h>
+#include <LibWeb/Fetch/Infrastructure/HTTP/Methods.h>
+#include <LibWeb/Infra/ByteSequences.h>
+
+namespace Web::Fetch {
+
+// https://fetch.spec.whatwg.org/#concept-method
+bool is_method(ReadonlyBytes method)
+{
+    // A method is a byte sequence that matches the method token production.
+    Regex<ECMA262Parser> regex { R"~~~(^[A-Za-z0-9!#$%&'*+\-.^_`|~]+$)~~~" };
+    return regex.has_match(StringView { method });
+}
+
+// https://fetch.spec.whatwg.org/#cors-safelisted-method
+bool is_cors_safelisted_method(ReadonlyBytes method)
+{
+    // A CORS-safelisted method is a method that is `GET`, `HEAD`, or `POST`.
+    return StringView { method }.is_one_of("GET"sv, "HEAD"sv, "POST"sv);
+}
+
+// https://fetch.spec.whatwg.org/#forbidden-method
+bool is_forbidden_method(ReadonlyBytes method)
+{
+    // A forbidden method is a method that is a byte-case-insensitive match for `CONNECT`, `TRACE`, or `TRACK`.
+    return StringView { method }.is_one_of_ignoring_case("CONNECT"sv, "TRACE"sv, "TRACK"sv);
+}
+
+// https://fetch.spec.whatwg.org/#concept-method-normalize
+ErrorOr<ByteBuffer> normalize_method(ReadonlyBytes method)
+{
+    // To normalize a method, if it is a byte-case-insensitive match for `DELETE`, `GET`, `HEAD`, `OPTIONS`, `POST`, or `PUT`, byte-uppercase it.
+    auto bytes = TRY(ByteBuffer::copy(method));
+    if (StringView { method }.is_one_of_ignoring_case("DELETE"sv, "GET"sv, "HEAD"sv, "OPTIONS"sv, "POST"sv, "PUT"sv))
+        Infra::byte_uppercase(bytes);
+    return bytes;
+}
+
+}

+ 18 - 0
Userland/Libraries/LibWeb/Fetch/Infrastructure/HTTP/Methods.h

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2022, Linus Groh <linusg@serenityos.org>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#pragma once
+
+#include <AK/Forward.h>
+
+namespace Web::Fetch {
+
+[[nodiscard]] bool is_method(ReadonlyBytes);
+[[nodiscard]] bool is_cors_safelisted_method(ReadonlyBytes);
+[[nodiscard]] bool is_forbidden_method(ReadonlyBytes);
+[[nodiscard]] ErrorOr<ByteBuffer> normalize_method(ReadonlyBytes);
+
+}