mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-12-07 21:59:54 +00:00
LibHTTP+LibWeb+RequestServer: Move Fetch's HTTP header infra to LibHTTP
The end goal here is for LibHTTP to be the home of our RFC 9111 (HTTP caching) implementation. We currently have one implementation in LibWeb for our in-memory cache and another in RequestServer for our disk cache. The implementations both largely revolve around interacting with HTTP headers. But in LibWeb, we are using Fetch's header infra, and in RS we are using are home-grown header infra from LibHTTP. So to give these a common denominator, this patch replaces the LibHTTP implementation with Fetch's infra. Our existing LibHTTP implementation was not particularly compliant with any spec, so this at least gives us a standards-based common implementation. This migration also required moving a handful of other Fetch AOs over to LibHTTP. (It turns out these AOs were all from the Fetch/Infra/HTTP folder, so perhaps it makes sense for LibHTTP to be the implementation of that entire set of facilities.)
This commit is contained in:
Timothy Flynn
Jelle Raaijmakers
parent
3dce6766a3
commit
9375660b64
Notes:
github-actions[bot]
2025-11-27 13:58:52 +00:00
Author: https://github.com/trflynn89
Commit: 9375660b64
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/6944
Reviewed-by: https://github.com/gmta ✅
78 changed files with 935 additions and 1017 deletions
|
|
@ -380,8 +380,6 @@ set(SOURCES
|
|||
Fetch/Infrastructure/HTTP.cpp
|
||||
Fetch/Infrastructure/HTTP/Bodies.cpp
|
||||
Fetch/Infrastructure/HTTP/CORS.cpp
|
||||
Fetch/Infrastructure/HTTP/Headers.cpp
|
||||
Fetch/Infrastructure/HTTP/Methods.cpp
|
||||
Fetch/Infrastructure/HTTP/MIME.cpp
|
||||
Fetch/Infrastructure/HTTP/Requests.cpp
|
||||
Fetch/Infrastructure/HTTP/Responses.cpp
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@
|
|||
#include <LibWeb/ContentSecurityPolicy/Policy.h>
|
||||
#include <LibWeb/ContentSecurityPolicy/PolicyList.h>
|
||||
#include <LibWeb/ContentSecurityPolicy/SerializedPolicy.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Headers.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Responses.h>
|
||||
#include <LibWeb/Infra/CharacterTypes.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -447,9 +447,9 @@ void Violation::report_a_violation(JS::Realm& realm)
|
|||
// header list
|
||||
// A header list containing a single header whose name is "Content-Type", and value is
|
||||
// "application/csp-report"
|
||||
auto header_list = Fetch::Infrastructure::HeaderList::create(vm);
|
||||
auto header_list = HTTP::HeaderList::create();
|
||||
header_list->append({ "Content-Type"sv, "application/csp-report"sv });
|
||||
request->set_header_list(header_list);
|
||||
request->set_header_list(move(header_list));
|
||||
|
||||
// body
|
||||
// The result of executing § 5.3 Obtain the deprecated serialization of violation on
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@
|
|||
|
||||
#include <AK/GenericLexer.h>
|
||||
#include <AK/TypeCasts.h>
|
||||
#include <LibHTTP/HTTP.h>
|
||||
#include <LibHTTP/HeaderList.h>
|
||||
#include <LibJS/Runtime/ArrayBuffer.h>
|
||||
#include <LibJS/Runtime/Completion.h>
|
||||
#include <LibJS/Runtime/Error.h>
|
||||
|
|
@ -19,7 +21,6 @@
|
|||
#include <LibWeb/Fetch/Body.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Bodies.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Headers.h>
|
||||
#include <LibWeb/FileAPI/Blob.h>
|
||||
#include <LibWeb/FileAPI/File.h>
|
||||
#include <LibWeb/HTML/Scripting/TemporaryExecutionContext.h>
|
||||
|
|
@ -301,10 +302,10 @@ static MultipartParsingErrorOr<MultiPartFormDataHeader> parse_multipart_form_dat
|
|||
auto header_name = lexer.consume_until(is_any_of("\n\r:"sv));
|
||||
|
||||
// 3. Remove any HTTP tab or space bytes from the start or end of header name.
|
||||
header_name = header_name.trim(Infrastructure::HTTP_TAB_OR_SPACE, TrimMode::Both);
|
||||
header_name = header_name.trim(HTTP::HTTP_TAB_OR_SPACE, TrimMode::Both);
|
||||
|
||||
// 4. If header name does not match the field-name token production, return failure.
|
||||
if (!Infrastructure::is_header_name(header_name.bytes()))
|
||||
if (!HTTP::is_header_name(header_name.bytes()))
|
||||
return MultipartParsingError { MUST(String::formatted("Invalid header name {}", header_name)) };
|
||||
|
||||
// 5. If the byte at position is not 0x3A (:), return failure.
|
||||
|
|
@ -313,7 +314,7 @@ static MultipartParsingErrorOr<MultiPartFormDataHeader> parse_multipart_form_dat
|
|||
return MultipartParsingError { MUST(String::formatted("Expected : at position {}", lexer.tell())) };
|
||||
|
||||
// 7. Collect a sequence of bytes that are HTTP tab or space bytes given position. (Do nothing with those bytes.)
|
||||
lexer.ignore_while(Infrastructure::is_http_tab_or_space);
|
||||
lexer.ignore_while(HTTP::is_http_tab_or_space);
|
||||
|
||||
// 8. Byte-lowercase header name and switch on the result:
|
||||
// -> `content-disposition`
|
||||
|
|
@ -346,10 +347,10 @@ static MultipartParsingErrorOr<MultiPartFormDataHeader> parse_multipart_form_dat
|
|||
// -> `content-type`
|
||||
else if (header_name.equals_ignoring_ascii_case("content-type"sv)) {
|
||||
// 1. Let header value be the result of collecting a sequence of bytes that are not 0x0A (LF) or 0x0D (CR), given position.
|
||||
auto header_value = lexer.consume_until(Infrastructure::is_http_newline);
|
||||
auto header_value = lexer.consume_until(HTTP::is_http_newline);
|
||||
|
||||
// 2. Remove any HTTP tab or space bytes from the end of header value.
|
||||
header_value = header_value.trim(Infrastructure::HTTP_TAB_OR_SPACE, TrimMode::Right);
|
||||
header_value = header_value.trim(HTTP::HTTP_TAB_OR_SPACE, TrimMode::Right);
|
||||
|
||||
// 3. Set contentType to the isomorphic decoding of header value.
|
||||
header.content_type = TextCodec::isomorphic_decode(header_value);
|
||||
|
|
@ -357,7 +358,7 @@ static MultipartParsingErrorOr<MultiPartFormDataHeader> parse_multipart_form_dat
|
|||
// -> Otherwise
|
||||
else {
|
||||
// 1. Collect a sequence of bytes that are not 0x0A (LF) or 0x0D (CR), given position. (Do nothing with those bytes.)
|
||||
lexer.ignore_until(Infrastructure::is_http_newline);
|
||||
lexer.ignore_until(HTTP::is_http_newline);
|
||||
}
|
||||
|
||||
// 9. If position does not point to a sequence of bytes starting with 0x0D 0x0A (CR LF), return failure. Otherwise, advance position by 2 (past the newline).
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
#include <AK/Base64.h>
|
||||
#include <AK/Debug.h>
|
||||
#include <AK/ScopeGuard.h>
|
||||
#include <LibHTTP/Method.h>
|
||||
#include <LibJS/Runtime/Completion.h>
|
||||
#include <LibRequests/RequestTimingInfo.h>
|
||||
#include <LibTextCodec/Encoder.h>
|
||||
|
|
@ -33,9 +34,7 @@
|
|||
#include <LibWeb/Fetch/Infrastructure/FetchRecord.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/FetchTimingInfo.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/CORS.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Headers.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/MIME.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Methods.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Requests.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Responses.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Statuses.h>
|
||||
|
|
@ -213,7 +212,7 @@ GC::Ref<Infrastructure::FetchController> fetch(JS::Realm& realm, Infrastructure:
|
|||
}
|
||||
|
||||
// 4. Append (`Accept`, value) to request’s header list.
|
||||
auto header = Infrastructure::Header::isomorphic_encode("Accept"sv, value);
|
||||
auto header = HTTP::Header::isomorphic_encode("Accept"sv, value);
|
||||
request.header_list()->append(move(header));
|
||||
}
|
||||
|
||||
|
|
@ -223,7 +222,7 @@ GC::Ref<Infrastructure::FetchController> fetch(JS::Realm& realm, Infrastructure:
|
|||
StringBuilder accept_language;
|
||||
accept_language.join(","sv, ResourceLoader::the().preferred_languages());
|
||||
|
||||
auto header = Infrastructure::Header::isomorphic_encode("Accept-Language"sv, accept_language.string_view());
|
||||
auto header = HTTP::Header::isomorphic_encode("Accept-Language"sv, accept_language.string_view());
|
||||
request.header_list()->append(move(header));
|
||||
}
|
||||
|
||||
|
|
@ -438,7 +437,7 @@ GC::Ptr<PendingResponse> main_fetch(JS::Realm& realm, Infrastructure::FetchParam
|
|||
if (
|
||||
request->use_cors_preflight()
|
||||
|| (request->unsafe_request()
|
||||
&& (!Infrastructure::is_cors_safelisted_method(request->method())
|
||||
&& (!HTTP::is_cors_safelisted_method(request->method())
|
||||
|| !Infrastructure::get_cors_unsafe_header_names(request->header_list()).is_empty()))) {
|
||||
// 1. Set request’s response tainting to "cors".
|
||||
request->set_response_tainting(Infrastructure::Request::ResponseTainting::CORS);
|
||||
|
|
@ -663,8 +662,7 @@ void fetch_response_handover(JS::Realm& realm, Infrastructure::FetchParams const
|
|||
// The user agent may decide to expose `Server-Timing` headers to non-secure contexts requests as well.
|
||||
auto client = fetch_params.request()->client();
|
||||
if (!response.is_network_error() && client != nullptr && HTML::is_secure_context(*client)) {
|
||||
auto server_timing_headers = response.header_list()->get_decode_and_split("Server-Timing"sv);
|
||||
if (server_timing_headers.has_value())
|
||||
if (auto server_timing_headers = response.header_list()->get_decode_and_split("Server-Timing"sv); server_timing_headers.has_value())
|
||||
timing_info->set_server_timing_headers(server_timing_headers.release_value());
|
||||
}
|
||||
|
||||
|
|
@ -921,10 +919,10 @@ GC::Ref<PendingResponse> scheme_fetch(JS::Realm& realm, Infrastructure::FetchPar
|
|||
response->set_body(body_with_type.body);
|
||||
|
||||
// 4. Set response’s header list to « (`Content-Length`, serializedFullLength), (`Content-Type`, type) ».
|
||||
auto content_length_header = Infrastructure::Header::isomorphic_encode("Content-Length"sv, serialized_full_length);
|
||||
auto content_length_header = HTTP::Header::isomorphic_encode("Content-Length"sv, serialized_full_length);
|
||||
response->header_list()->append(move(content_length_header));
|
||||
|
||||
auto content_type_header = Infrastructure::Header::isomorphic_encode("Content-Type"sv, type);
|
||||
auto content_type_header = HTTP::Header::isomorphic_encode("Content-Type"sv, type);
|
||||
response->header_list()->append(move(content_type_header));
|
||||
}
|
||||
// 14. Otherwise:
|
||||
|
|
@ -936,7 +934,7 @@ GC::Ref<PendingResponse> scheme_fetch(JS::Realm& realm, Infrastructure::FetchPar
|
|||
auto const range_header = request->header_list()->get("Range"sv).value_or({});
|
||||
|
||||
// 3. Let rangeValue be the result of parsing a single range header value given rangeHeader and true.
|
||||
auto maybe_range_value = Infrastructure::parse_single_range_header_value(range_header, true);
|
||||
auto maybe_range_value = HTTP::parse_single_range_header_value(range_header, true);
|
||||
|
||||
// 4. If rangeValue is failure, then return a network error.
|
||||
if (!maybe_range_value.has_value())
|
||||
|
|
@ -979,7 +977,7 @@ GC::Ref<PendingResponse> scheme_fetch(JS::Realm& realm, Infrastructure::FetchPar
|
|||
auto serialized_sliced_length = String::number(sliced_blob->size());
|
||||
|
||||
// 12. Let contentRange be the result of invoking build a content range given rangeStart, rangeEnd, and fullLength.
|
||||
auto content_range = Infrastructure::build_content_range(*range_start, *range_end, full_length);
|
||||
auto content_range = HTTP::build_content_range(*range_start, *range_end, full_length);
|
||||
|
||||
// 13. Set response’s status to 206.
|
||||
response->set_status(206);
|
||||
|
|
@ -990,15 +988,15 @@ GC::Ref<PendingResponse> scheme_fetch(JS::Realm& realm, Infrastructure::FetchPar
|
|||
// 15. Set response’s header list to «
|
||||
|
||||
// (`Content-Length`, serializedSlicedLength),
|
||||
auto content_length_header = Infrastructure::Header::isomorphic_encode("Content-Length"sv, serialized_sliced_length);
|
||||
auto content_length_header = HTTP::Header::isomorphic_encode("Content-Length"sv, serialized_sliced_length);
|
||||
response->header_list()->append(move(content_length_header));
|
||||
|
||||
// (`Content-Type`, type),
|
||||
auto content_type_header = Infrastructure::Header::isomorphic_encode("Content-Type"sv, type);
|
||||
auto content_type_header = HTTP::Header::isomorphic_encode("Content-Type"sv, type);
|
||||
response->header_list()->append(move(content_type_header));
|
||||
|
||||
// (`Content-Range`, contentRange) ».
|
||||
auto content_range_header = Infrastructure::Header::isomorphic_encode("Content-Range"sv, content_range);
|
||||
auto content_range_header = HTTP::Header::isomorphic_encode("Content-Range"sv, content_range);
|
||||
response->header_list()->append(move(content_range_header));
|
||||
}
|
||||
|
||||
|
|
@ -1022,7 +1020,7 @@ GC::Ref<PendingResponse> scheme_fetch(JS::Realm& realm, Infrastructure::FetchPar
|
|||
auto response = Infrastructure::Response::create(vm);
|
||||
response->set_status_message("OK"sv);
|
||||
|
||||
auto header = Infrastructure::Header::isomorphic_encode("Content-Type"sv, mime_type);
|
||||
auto header = HTTP::Header::isomorphic_encode("Content-Type"sv, mime_type);
|
||||
response->header_list()->append(move(header));
|
||||
|
||||
response->set_body(Infrastructure::byte_sequence_as_body(realm, data_url_struct.value().body));
|
||||
|
|
@ -1137,7 +1135,7 @@ GC::Ref<PendingResponse> http_fetch(JS::Realm& realm, Infrastructure::FetchParam
|
|||
// - There is no method cache entry match for request’s method using request, and either request’s
|
||||
// method is not a CORS-safelisted method or request’s use-CORS-preflight flag is set.
|
||||
// FIXME: We currently have no cache, so there will always be no method cache entry.
|
||||
(!Infrastructure::is_cors_safelisted_method(request->method()) || request->use_cors_preflight())
|
||||
(!HTTP::is_cors_safelisted_method(request->method()) || request->use_cors_preflight())
|
||||
// - There is at least one item in the CORS-unsafe request-header names with request’s header list for
|
||||
// which there is no header-name cache entry match using request.
|
||||
// FIXME: We currently have no cache, so there will always be no header-name cache entry.
|
||||
|
|
@ -1418,7 +1416,7 @@ GC::Ptr<PendingResponse> http_redirect_fetch(JS::Realm& realm, Infrastructure::F
|
|||
class CachePartition : public RefCounted<CachePartition> {
|
||||
public:
|
||||
// https://httpwg.org/specs/rfc9111.html#constructing.responses.from.caches
|
||||
GC::Ptr<Infrastructure::Response> select_response(JS::Realm& realm, URL::URL const& url, StringView method, Vector<Infrastructure::Header> const& headers, Vector<GC::Ptr<Infrastructure::Response>>& initial_set_of_stored_responses) const
|
||||
GC::Ptr<Infrastructure::Response> select_response(JS::Realm& realm, URL::URL const& url, StringView method, HTTP::HeaderList const& headers, Vector<GC::Ptr<Infrastructure::Response>>& initial_set_of_stored_responses) const
|
||||
{
|
||||
// When presented with a request, a cache MUST NOT reuse a stored response unless:
|
||||
|
||||
|
|
@ -1569,7 +1567,7 @@ private:
|
|||
}
|
||||
|
||||
// https://httpwg.org/specs/rfc9111.html#update
|
||||
void update_stored_header_fields(Infrastructure::Response const& response, Infrastructure::HeaderList& headers)
|
||||
void update_stored_header_fields(Infrastructure::Response const& response, HTTP::HeaderList& headers)
|
||||
{
|
||||
for (auto const& header : *response.header_list()) {
|
||||
if (!is_exempted_for_updating(header.name))
|
||||
|
|
@ -1583,7 +1581,7 @@ private:
|
|||
}
|
||||
|
||||
// https://httpwg.org/specs/rfc9111.html#storing.fields
|
||||
void store_header_and_trailer_fields(Infrastructure::Response const& response, Web::Fetch::Infrastructure::HeaderList& headers)
|
||||
void store_header_and_trailer_fields(Infrastructure::Response const& response, HTTP::HeaderList& headers)
|
||||
{
|
||||
for (auto const& header : *response.header_list()) {
|
||||
if (!is_exempted_for_storage(header.name))
|
||||
|
|
@ -1922,7 +1920,7 @@ GC::Ref<PendingResponse> http_network_or_cache_fetch(JS::Realm& realm, Infrastru
|
|||
|
||||
// 2. If cookies is not the empty string, then append (`Cookie`, cookies) to httpRequest’s header list.
|
||||
if (!cookies.is_empty()) {
|
||||
auto header = Infrastructure::Header::isomorphic_encode("Cookie"sv, cookies);
|
||||
auto header = HTTP::Header::isomorphic_encode("Cookie"sv, cookies);
|
||||
http_request->header_list()->append(move(header));
|
||||
}
|
||||
}
|
||||
|
|
@ -1950,7 +1948,7 @@ GC::Ref<PendingResponse> http_network_or_cache_fetch(JS::Realm& realm, Infrastru
|
|||
// 4. If authorizationValue is non-null, then append (`Authorization`, authorizationValue) to
|
||||
// httpRequest’s header list.
|
||||
if (authorization_value.has_value()) {
|
||||
auto header = Infrastructure::Header::isomorphic_encode("Authorization"sv, *authorization_value);
|
||||
auto header = HTTP::Header::isomorphic_encode("Authorization"sv, *authorization_value);
|
||||
http_request->header_list()->append(move(header));
|
||||
}
|
||||
}
|
||||
|
|
@ -2019,12 +2017,12 @@ GC::Ref<PendingResponse> http_network_or_cache_fetch(JS::Realm& realm, Infrastru
|
|||
|
||||
// 1. If storedResponse’s header list contains `ETag`, then append (`If-None-Match`, `ETag`'s value) to httpRequest’s header list.
|
||||
if (auto etag = stored_response->header_list()->get("ETag"sv); etag.has_value()) {
|
||||
http_request->header_list()->append(Infrastructure::Header::isomorphic_encode("If-None-Match"sv, *etag));
|
||||
http_request->header_list()->append(HTTP::Header::isomorphic_encode("If-None-Match"sv, *etag));
|
||||
}
|
||||
|
||||
// 2. If storedResponse’s header list contains `Last-Modified`, then append (`If-Modified-Since`, `Last-Modified`'s value) to httpRequest’s header list.
|
||||
if (auto last_modified = stored_response->header_list()->get("Last-Modified"sv); last_modified.has_value()) {
|
||||
http_request->header_list()->append(Infrastructure::Header::isomorphic_encode("If-Modified-Since"sv, *last_modified));
|
||||
http_request->header_list()->append(HTTP::Header::isomorphic_encode("If-Modified-Since"sv, *last_modified));
|
||||
}
|
||||
}
|
||||
// 3. Otherwise, set response to storedResponse and set response’s cache state to "local".
|
||||
|
|
@ -2285,15 +2283,12 @@ GC::Ref<PendingResponse> nonstandard_resource_loader_file_or_http_network_fetch(
|
|||
|
||||
// NOTE: Using LoadRequest::create_for_url_on_page here will unconditionally add cookies as long as there's a page available.
|
||||
// However, it is up to http_network_or_cache_fetch to determine if cookies should be added to the request.
|
||||
LoadRequest load_request;
|
||||
LoadRequest load_request { request->header_list() };
|
||||
load_request.set_url(request->current_url());
|
||||
load_request.set_page(page);
|
||||
load_request.set_method(request->method());
|
||||
load_request.set_store_set_cookie_headers(include_credentials == IncludeCredentials::Yes);
|
||||
|
||||
for (auto const& header : *request->header_list())
|
||||
load_request.set_header(header.name, header.value);
|
||||
|
||||
if (auto const* body = request->body().get_pointer<GC::Ref<Infrastructure::Body>>()) {
|
||||
(*body)->source().visit(
|
||||
[&](ByteBuffer const& byte_buffer) {
|
||||
|
|
@ -2343,7 +2338,7 @@ GC::Ref<PendingResponse> nonstandard_resource_loader_file_or_http_network_fetch(
|
|||
// 13. Set up stream with byte reading support with pullAlgorithm set to pullAlgorithm, cancelAlgorithm set to cancelAlgorithm.
|
||||
stream->set_up_with_byte_reading_support(pull_algorithm, cancel_algorithm);
|
||||
|
||||
auto on_headers_received = GC::create_function(vm.heap(), [&vm, pending_response, stream, request](HTTP::HeaderMap const& response_headers, Optional<u32> status_code, Optional<String> const& reason_phrase) {
|
||||
auto on_headers_received = GC::create_function(vm.heap(), [&vm, pending_response, stream, request](HTTP::HeaderList const& response_headers, Optional<u32> status_code, Optional<String> const& reason_phrase) {
|
||||
if (pending_response->is_resolved()) {
|
||||
// RequestServer will send us the response headers twice, the second time being for HTTP trailers. This
|
||||
// fetch algorithm is not interested in trailers, so just drop them here.
|
||||
|
|
@ -2430,7 +2425,7 @@ GC::Ref<PendingResponse> cors_preflight_fetch(JS::Realm& realm, Infrastructure::
|
|||
preflight->header_list()->append({ "Accept"sv, "*/*"sv });
|
||||
|
||||
// 3. Append (`Access-Control-Request-Method`, request’s method) to preflight’s header list.
|
||||
auto temp_header = Infrastructure::Header::isomorphic_encode("Access-Control-Request-Method"sv, request.method());
|
||||
auto temp_header = HTTP::Header::isomorphic_encode("Access-Control-Request-Method"sv, request.method());
|
||||
preflight->header_list()->append(move(temp_header));
|
||||
|
||||
// 4. Let headers be the CORS-unsafe request-header names with request’s header list.
|
||||
|
|
@ -2470,11 +2465,11 @@ GC::Ref<PendingResponse> cors_preflight_fetch(JS::Realm& realm, Infrastructure::
|
|||
auto header_names_or_failure = response->header_list()->extract_header_list_values("Access-Control-Allow-Headers"sv);
|
||||
|
||||
// 3. If either methods or headerNames is failure, return a network error.
|
||||
if (methods_or_failure.has<Infrastructure::HeaderList::ExtractHeaderParseFailure>()) {
|
||||
if (methods_or_failure.has<HTTP::HeaderList::ExtractHeaderParseFailure>()) {
|
||||
returned_pending_response->resolve(Infrastructure::Response::network_error(vm, "The Access-Control-Allow-Methods in the CORS-preflight response is syntactically invalid"_string));
|
||||
return;
|
||||
}
|
||||
if (header_names_or_failure.has<Infrastructure::HeaderList::ExtractHeaderParseFailure>()) {
|
||||
if (header_names_or_failure.has<HTTP::HeaderList::ExtractHeaderParseFailure>()) {
|
||||
returned_pending_response->resolve(Infrastructure::Response::network_error(vm, "The Access-Control-Allow-Headers in the CORS-preflight response is syntactically invalid"_string));
|
||||
return;
|
||||
}
|
||||
|
|
@ -2496,7 +2491,7 @@ GC::Ref<PendingResponse> cors_preflight_fetch(JS::Realm& realm, Infrastructure::
|
|||
|
||||
// 5. If request’s method is not in methods, request’s method is not a CORS-safelisted method, and request’s credentials mode
|
||||
// is "include" or methods does not contain `*`, then return a network error.
|
||||
if (!methods.contains_slow(request.method()) && !Infrastructure::is_cors_safelisted_method(request.method())) {
|
||||
if (!methods.contains_slow(request.method()) && !HTTP::is_cors_safelisted_method(request.method())) {
|
||||
if (request.credentials_mode() == Infrastructure::Request::CredentialsMode::Include) {
|
||||
returned_pending_response->resolve(Infrastructure::Response::network_error(vm, TRY_OR_IGNORE(String::formatted("Non-CORS-safelisted method '{}' not found in the CORS-preflight response's Access-Control-Allow-Methods header (the header may be missing). '*' is not allowed as the main request includes credentials.", request.method()))));
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -19,10 +19,8 @@ GC_DEFINE_ALLOCATOR(Headers);
|
|||
// https://fetch.spec.whatwg.org/#dom-headers
|
||||
WebIDL::ExceptionOr<GC::Ref<Headers>> Headers::construct_impl(JS::Realm& realm, Optional<HeadersInit> const& init)
|
||||
{
|
||||
auto& vm = realm.vm();
|
||||
|
||||
// The new Headers(init) constructor steps are:
|
||||
auto headers = realm.create<Headers>(realm, Infrastructure::HeaderList::create(vm));
|
||||
auto headers = realm.create<Headers>(realm, HTTP::HeaderList::create());
|
||||
|
||||
// 1. Set this’s guard to "none".
|
||||
headers->m_guard = Guard::None;
|
||||
|
|
@ -34,9 +32,9 @@ WebIDL::ExceptionOr<GC::Ref<Headers>> Headers::construct_impl(JS::Realm& realm,
|
|||
return headers;
|
||||
}
|
||||
|
||||
Headers::Headers(JS::Realm& realm, GC::Ref<Infrastructure::HeaderList> header_list)
|
||||
Headers::Headers(JS::Realm& realm, NonnullRefPtr<HTTP::HeaderList> header_list)
|
||||
: PlatformObject(realm)
|
||||
, m_header_list(header_list)
|
||||
, m_header_list(move(header_list))
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -48,17 +46,11 @@ void Headers::initialize(JS::Realm& realm)
|
|||
Base::initialize(realm);
|
||||
}
|
||||
|
||||
void Headers::visit_edges(JS::Cell::Visitor& visitor)
|
||||
{
|
||||
Base::visit_edges(visitor);
|
||||
visitor.visit(m_header_list);
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#dom-headers-append
|
||||
WebIDL::ExceptionOr<void> Headers::append(String const& name_string, String const& value_string)
|
||||
{
|
||||
// The append(name, value) method steps are to append (name, value) to this.
|
||||
auto header = Infrastructure::Header::isomorphic_encode(name_string, value_string);
|
||||
auto header = HTTP::Header::isomorphic_encode(name_string, value_string);
|
||||
TRY(append(move(header)));
|
||||
return {};
|
||||
}
|
||||
|
|
@ -70,7 +62,7 @@ WebIDL::ExceptionOr<void> Headers::delete_(String const& name)
|
|||
|
||||
// 1. If validating (name, ``) for headers returns false, then return.
|
||||
// NOTE: Passing a dummy header value ought not to have any negative repercussions.
|
||||
auto header = Infrastructure::Header::isomorphic_encode(name, ""sv);
|
||||
auto header = HTTP::Header::isomorphic_encode(name, ""sv);
|
||||
if (!TRY(validate(header)))
|
||||
return {};
|
||||
|
||||
|
|
@ -98,7 +90,7 @@ WebIDL::ExceptionOr<Optional<String>> Headers::get(String const& name)
|
|||
// The get(name) method steps are:
|
||||
|
||||
// 1. If name is not a header name, then throw a TypeError.
|
||||
if (!Infrastructure::is_header_name(name))
|
||||
if (!HTTP::is_header_name(name))
|
||||
return WebIDL::SimpleException { WebIDL::SimpleExceptionType::TypeError, "Invalid header name"sv };
|
||||
|
||||
// 2. Return the result of getting name from this’s header list.
|
||||
|
|
@ -131,7 +123,7 @@ WebIDL::ExceptionOr<bool> Headers::has(String const& name)
|
|||
// The has(name) method steps are:
|
||||
|
||||
// 1. If name is not a header name, then throw a TypeError.
|
||||
if (!Infrastructure::is_header_name(name))
|
||||
if (!HTTP::is_header_name(name))
|
||||
return WebIDL::SimpleException { WebIDL::SimpleExceptionType::TypeError, "Invalid header name"sv };
|
||||
|
||||
// 2. Return true if this’s header list contains name; otherwise false.
|
||||
|
|
@ -144,9 +136,9 @@ WebIDL::ExceptionOr<void> Headers::set(String const& name, String const& value)
|
|||
// The set(name, value) method steps are:
|
||||
|
||||
// 1. Normalize value.
|
||||
auto normalized_value = Infrastructure::normalize_header_value(value);
|
||||
auto normalized_value = HTTP::normalize_header_value(value);
|
||||
|
||||
auto header = Infrastructure::Header::isomorphic_encode(name, normalized_value);
|
||||
auto header = HTTP::Header::isomorphic_encode(name, normalized_value);
|
||||
|
||||
// 2. If validating (name, value) for headers returns false, then return.
|
||||
if (!TRY(validate(header)))
|
||||
|
|
@ -201,15 +193,15 @@ JS::ThrowCompletionOr<void> Headers::for_each(ForEachCallback callback)
|
|||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#headers-validate
|
||||
WebIDL::ExceptionOr<bool> Headers::validate(Infrastructure::Header const& header) const
|
||||
WebIDL::ExceptionOr<bool> Headers::validate(HTTP::Header const& header) const
|
||||
{
|
||||
// To validate a header (name, value) for a Headers object headers:
|
||||
auto const& [name, value] = header;
|
||||
|
||||
// 1. If name is not a header name or value is not a header value, then throw a TypeError.
|
||||
if (!Infrastructure::is_header_name(name))
|
||||
if (!HTTP::is_header_name(name))
|
||||
return WebIDL::SimpleException { WebIDL::SimpleExceptionType::TypeError, "Invalid header name"sv };
|
||||
if (!Infrastructure::is_header_value(value))
|
||||
if (!HTTP::is_header_value(value))
|
||||
return WebIDL::SimpleException { WebIDL::SimpleExceptionType::TypeError, "Invalid header value"sv };
|
||||
|
||||
// 2. If headers’s guard is "immutable", then throw a TypeError.
|
||||
|
|
@ -217,11 +209,11 @@ WebIDL::ExceptionOr<bool> Headers::validate(Infrastructure::Header const& header
|
|||
return WebIDL::SimpleException { WebIDL::SimpleExceptionType::TypeError, "Headers object is immutable"sv };
|
||||
|
||||
// 3. If headers’s guard is "request" and (name, value) is a forbidden request-header, then return false.
|
||||
if (m_guard == Guard::Request && Infrastructure::is_forbidden_request_header(header))
|
||||
if (m_guard == Guard::Request && HTTP::is_forbidden_request_header(header))
|
||||
return false;
|
||||
|
||||
// 4. If headers’s guard is "response" and name is a forbidden response-header name, then return false.
|
||||
if (m_guard == Guard::Response && Infrastructure::is_forbidden_response_header_name(name))
|
||||
if (m_guard == Guard::Response && HTTP::is_forbidden_response_header_name(name))
|
||||
return false;
|
||||
|
||||
// 5. Return true.
|
||||
|
|
@ -229,13 +221,13 @@ WebIDL::ExceptionOr<bool> Headers::validate(Infrastructure::Header const& header
|
|||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#concept-headers-append
|
||||
WebIDL::ExceptionOr<void> Headers::append(Infrastructure::Header header)
|
||||
WebIDL::ExceptionOr<void> Headers::append(HTTP::Header header)
|
||||
{
|
||||
// To append a header (name, value) to a Headers object headers, run these steps:
|
||||
auto& [name, value] = header;
|
||||
|
||||
// 1. Normalize value.
|
||||
value = Infrastructure::normalize_header_value(value);
|
||||
value = HTTP::normalize_header_value(value);
|
||||
|
||||
// 2. If validating (name, value) for headers returns false, then return.
|
||||
if (!TRY(validate(header)))
|
||||
|
|
@ -255,7 +247,7 @@ WebIDL::ExceptionOr<void> Headers::append(Infrastructure::Header header)
|
|||
temporary_value = ByteString::formatted("{}, {}", *temporary_value, value);
|
||||
}
|
||||
|
||||
auto temporary_header = Infrastructure::Header {
|
||||
auto temporary_header = HTTP::Header {
|
||||
.name = name,
|
||||
.value = temporary_value.release_value(),
|
||||
};
|
||||
|
|
@ -288,7 +280,7 @@ WebIDL::ExceptionOr<void> Headers::fill(HeadersInit const& object)
|
|||
return WebIDL::SimpleException { WebIDL::SimpleExceptionType::TypeError, "Array must contain header key/value pair"sv };
|
||||
|
||||
// 2. Append (header[0], header[1]) to headers.
|
||||
auto header = Infrastructure::Header::isomorphic_encode(entry[0], entry[1]);
|
||||
auto header = HTTP::Header::isomorphic_encode(entry[0], entry[1]);
|
||||
TRY(append(move(header)));
|
||||
}
|
||||
return {};
|
||||
|
|
@ -296,7 +288,7 @@ WebIDL::ExceptionOr<void> Headers::fill(HeadersInit const& object)
|
|||
// 2. Otherwise, object is a record, then for each key → value of object, append (key, value) to headers.
|
||||
[&](OrderedHashMap<String, String> const& object) -> WebIDL::ExceptionOr<void> {
|
||||
for (auto const& entry : object) {
|
||||
auto header = Infrastructure::Header::isomorphic_encode(entry.key, entry.value);
|
||||
auto header = HTTP::Header::isomorphic_encode(entry.key, entry.value);
|
||||
TRY(append(move(header)));
|
||||
}
|
||||
return {};
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@
|
|||
#include <AK/Variant.h>
|
||||
#include <AK/Vector.h>
|
||||
#include <LibGC/Ptr.h>
|
||||
#include <LibHTTP/HeaderList.h>
|
||||
#include <LibJS/Forward.h>
|
||||
#include <LibWeb/Bindings/PlatformObject.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Headers.h>
|
||||
#include <LibWeb/WebIDL/ExceptionOr.h>
|
||||
|
||||
namespace Web::Fetch {
|
||||
|
|
@ -38,14 +38,14 @@ public:
|
|||
|
||||
virtual ~Headers() override;
|
||||
|
||||
[[nodiscard]] GC::Ref<Infrastructure::HeaderList> header_list() const { return m_header_list; }
|
||||
void set_header_list(GC::Ref<Infrastructure::HeaderList> header_list) { m_header_list = header_list; }
|
||||
[[nodiscard]] NonnullRefPtr<HTTP::HeaderList> const& header_list() const { return m_header_list; }
|
||||
void set_header_list(NonnullRefPtr<HTTP::HeaderList> header_list) { m_header_list = move(header_list); }
|
||||
|
||||
[[nodiscard]] Guard guard() const { return m_guard; }
|
||||
void set_guard(Guard guard) { m_guard = guard; }
|
||||
|
||||
WebIDL::ExceptionOr<void> fill(HeadersInit const&);
|
||||
WebIDL::ExceptionOr<void> append(Infrastructure::Header);
|
||||
WebIDL::ExceptionOr<void> append(HTTP::Header);
|
||||
|
||||
// JS API functions
|
||||
WebIDL::ExceptionOr<void> append(String const& name, String const& value);
|
||||
|
|
@ -61,17 +61,16 @@ public:
|
|||
private:
|
||||
friend class HeadersIterator;
|
||||
|
||||
Headers(JS::Realm&, GC::Ref<Infrastructure::HeaderList>);
|
||||
Headers(JS::Realm&, NonnullRefPtr<HTTP::HeaderList>);
|
||||
|
||||
virtual void initialize(JS::Realm&) override;
|
||||
virtual void visit_edges(JS::Cell::Visitor&) override;
|
||||
|
||||
WebIDL::ExceptionOr<bool> validate(Infrastructure::Header const&) const;
|
||||
WebIDL::ExceptionOr<bool> validate(HTTP::Header const&) const;
|
||||
void remove_privileged_no_cors_request_headers();
|
||||
|
||||
// https://fetch.spec.whatwg.org/#concept-headers-header-list
|
||||
// A Headers object has an associated header list (a header list), which is initially empty.
|
||||
GC::Ref<Infrastructure::HeaderList> m_header_list;
|
||||
NonnullRefPtr<HTTP::HeaderList> m_header_list;
|
||||
|
||||
// https://fetch.spec.whatwg.org/#concept-headers-guard
|
||||
// A Headers object also has an associated guard, which is a headers guard. A headers guard is "immutable", "request", "request-no-cors", "response" or "none".
|
||||
|
|
|
|||
|
|
@ -4,75 +4,17 @@
|
|||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <AK/GenericLexer.h>
|
||||
#include <AK/String.h>
|
||||
#include <AK/StringBuilder.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP.h>
|
||||
#include <LibWeb/Loader/ResourceLoader.h>
|
||||
|
||||
namespace Web::Fetch::Infrastructure {
|
||||
|
||||
// https://fetch.spec.whatwg.org/#collect-an-http-quoted-string
|
||||
String collect_an_http_quoted_string(GenericLexer& lexer, HttpQuotedStringExtractValue extract_value)
|
||||
// https://fetch.spec.whatwg.org/#default-user-agent-value
|
||||
ByteString const& default_user_agent_value()
|
||||
{
|
||||
// To collect an HTTP quoted string from a string input, given a position variable position and optionally an extract-value flag, run these steps:
|
||||
// 1. Let positionStart be position.
|
||||
auto position_start = lexer.tell();
|
||||
|
||||
// 2. Let value be the empty string.
|
||||
StringBuilder value;
|
||||
|
||||
// 3. Assert: the code point at position within input is U+0022 (").
|
||||
VERIFY(lexer.peek() == '"');
|
||||
|
||||
// 4. Advance position by 1.
|
||||
lexer.ignore(1);
|
||||
|
||||
// 5. While true:
|
||||
while (true) {
|
||||
// 1. Append the result of collecting a sequence of code points that are not U+0022 (") or U+005C (\) from input, given position, to value.
|
||||
auto value_part = lexer.consume_until([](char ch) {
|
||||
return ch == '"' || ch == '\\';
|
||||
});
|
||||
|
||||
value.append(value_part);
|
||||
|
||||
// 2. If position is past the end of input, then break.
|
||||
if (lexer.is_eof())
|
||||
break;
|
||||
|
||||
// 3. Let quoteOrBackslash be the code point at position within input.
|
||||
// 4. Advance position by 1.
|
||||
char quote_or_backslash = lexer.consume();
|
||||
|
||||
// 5. If quoteOrBackslash is U+005C (\), then:
|
||||
if (quote_or_backslash == '\\') {
|
||||
// 1. If position is past the end of input, then append U+005C (\) to value and break.
|
||||
if (lexer.is_eof()) {
|
||||
value.append('\\');
|
||||
break;
|
||||
}
|
||||
|
||||
// 2. Append the code point at position within input to value.
|
||||
// 3. Advance position by 1.
|
||||
value.append(lexer.consume());
|
||||
}
|
||||
|
||||
// 6. Otherwise:
|
||||
else {
|
||||
// 1. Assert: quoteOrBackslash is U+0022 (").
|
||||
VERIFY(quote_or_backslash == '"');
|
||||
|
||||
// 2. Break.
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// 6. If the extract-value flag is set, then return value.
|
||||
if (extract_value == HttpQuotedStringExtractValue::Yes)
|
||||
return MUST(value.to_string());
|
||||
|
||||
// 7. Return the code points from positionStart to position, inclusive, within input.
|
||||
return MUST(String::from_utf8(lexer.input().substring_view(position_start, lexer.tell() - position_start)));
|
||||
// A default `User-Agent` value is an implementation-defined header value for the `User-Agent` header.
|
||||
static auto user_agent = ResourceLoader::the().user_agent().to_byte_string();
|
||||
return user_agent;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,52 +8,15 @@
|
|||
#pragma once
|
||||
|
||||
#include <AK/Forward.h>
|
||||
#include <AK/StringView.h>
|
||||
#include <LibWeb/Export.h>
|
||||
|
||||
namespace Web::Fetch::Infrastructure {
|
||||
|
||||
// https://fetch.spec.whatwg.org/#http-tab-or-space
|
||||
// An HTTP tab or space is U+0009 TAB or U+0020 SPACE.
|
||||
inline constexpr StringView HTTP_TAB_OR_SPACE = "\t "sv;
|
||||
|
||||
// https://fetch.spec.whatwg.org/#http-whitespace
|
||||
// HTTP whitespace is U+000A LF, U+000D CR, or an HTTP tab or space.
|
||||
inline constexpr StringView HTTP_WHITESPACE = "\n\r\t "sv;
|
||||
|
||||
// https://fetch.spec.whatwg.org/#http-newline-byte
|
||||
// An HTTP newline byte is 0x0A (LF) or 0x0D (CR).
|
||||
inline constexpr Array HTTP_NEWLINE_BYTES = {
|
||||
0x0A, 0x0D
|
||||
};
|
||||
|
||||
// https://fetch.spec.whatwg.org/#http-tab-or-space-byte
|
||||
// An HTTP tab or space byte is 0x09 (HT) or 0x20 (SP).
|
||||
inline constexpr Array HTTP_TAB_OR_SPACE_BYTES = {
|
||||
0x09, 0x20
|
||||
};
|
||||
|
||||
constexpr bool is_http_tab_or_space(u32 const code_point)
|
||||
{
|
||||
return code_point == 0x09 || code_point == 0x20;
|
||||
}
|
||||
|
||||
constexpr bool is_http_newline(u32 const code_point)
|
||||
{
|
||||
return code_point == 0x0A || code_point == 0x0D;
|
||||
}
|
||||
|
||||
enum class HttpQuotedStringExtractValue {
|
||||
No,
|
||||
Yes,
|
||||
};
|
||||
|
||||
enum class RedirectTaint {
|
||||
SameOrigin,
|
||||
SameSite,
|
||||
CrossSite,
|
||||
};
|
||||
|
||||
[[nodiscard]] WEB_API String collect_an_http_quoted_string(GenericLexer& lexer, HttpQuotedStringExtractValue extract_value = HttpQuotedStringExtractValue::No);
|
||||
[[nodiscard]] ByteString const& default_user_agent_value();
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,15 +8,15 @@
|
|||
|
||||
#include <AK/Checked.h>
|
||||
#include <LibHTTP/Header.h>
|
||||
#include <LibHTTP/HeaderList.h>
|
||||
#include <LibTextCodec/Decoder.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/CORS.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Headers.h>
|
||||
#include <LibWeb/MimeSniff/MimeType.h>
|
||||
|
||||
namespace Web::Fetch::Infrastructure {
|
||||
|
||||
// https://fetch.spec.whatwg.org/#cors-safelisted-request-header
|
||||
bool is_cors_safelisted_request_header(Header const& header)
|
||||
bool is_cors_safelisted_request_header(HTTP::Header const& header)
|
||||
{
|
||||
auto const& [name, value] = header;
|
||||
|
||||
|
|
@ -61,7 +61,7 @@ bool is_cors_safelisted_request_header(Header const& header)
|
|||
// `range`
|
||||
else if (name.equals_ignoring_ascii_case("range"sv)) {
|
||||
// 1. Let rangeValue be the result of parsing a single range header value given value and false.
|
||||
auto range_value = parse_single_range_header_value(value, false);
|
||||
auto range_value = HTTP::parse_single_range_header_value(value, false);
|
||||
|
||||
// 2. If rangeValue is failure, then return false.
|
||||
if (!range_value.has_value())
|
||||
|
|
@ -93,7 +93,7 @@ bool is_cors_unsafe_request_header_byte(u8 byte)
|
|||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#cors-unsafe-request-header-names
|
||||
Vector<ByteString> get_cors_unsafe_header_names(HeaderList const& headers)
|
||||
Vector<ByteString> get_cors_unsafe_header_names(HTTP::HeaderList const& headers)
|
||||
{
|
||||
// 1. Let unsafeNames be a new list.
|
||||
Vector<ByteString> unsafe_names;
|
||||
|
|
@ -124,7 +124,7 @@ Vector<ByteString> get_cors_unsafe_header_names(HeaderList const& headers)
|
|||
unsafe_names.extend(move(potentially_unsafe_names));
|
||||
|
||||
// 6. Return the result of convert header names to a sorted-lowercase set with unsafeNames.
|
||||
return convert_header_names_to_a_sorted_lowercase_set(unsafe_names.span());
|
||||
return HTTP::convert_header_names_to_a_sorted_lowercase_set(unsafe_names.span());
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#cors-non-wildcard-request-header-name
|
||||
|
|
@ -164,7 +164,7 @@ bool is_cors_safelisted_response_header_name(StringView header_name, ReadonlySpa
|
|||
"Pragma"sv)
|
||||
|| any_of(list, [&](auto list_header_name) {
|
||||
return header_name.equals_ignoring_ascii_case(list_header_name)
|
||||
&& !is_forbidden_response_header_name(list_header_name);
|
||||
&& !HTTP::is_forbidden_response_header_name(list_header_name);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -184,7 +184,7 @@ bool is_no_cors_safelisted_request_header_name(StringView header_name)
|
|||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#no-cors-safelisted-request-header
|
||||
bool is_no_cors_safelisted_request_header(Header const& header)
|
||||
bool is_no_cors_safelisted_request_header(HTTP::Header const& header)
|
||||
{
|
||||
// 1. If name is not a no-CORS-safelisted request-header name, then return false.
|
||||
if (!is_no_cors_safelisted_request_header_name(header.name))
|
||||
|
|
|
|||
|
|
@ -9,17 +9,17 @@
|
|||
#include <AK/ByteString.h>
|
||||
#include <AK/StringView.h>
|
||||
#include <AK/Vector.h>
|
||||
#include <LibWeb/Forward.h>
|
||||
#include <LibHTTP/Forward.h>
|
||||
|
||||
namespace Web::Fetch::Infrastructure {
|
||||
|
||||
[[nodiscard]] bool is_cors_safelisted_request_header(Header const&);
|
||||
[[nodiscard]] bool is_cors_safelisted_request_header(HTTP::Header const&);
|
||||
[[nodiscard]] bool is_cors_unsafe_request_header_byte(u8);
|
||||
[[nodiscard]] Vector<ByteString> get_cors_unsafe_header_names(HeaderList const&);
|
||||
[[nodiscard]] Vector<ByteString> get_cors_unsafe_header_names(HTTP::HeaderList const&);
|
||||
[[nodiscard]] bool is_cors_non_wildcard_request_header_name(StringView);
|
||||
[[nodiscard]] bool is_privileged_no_cors_request_header_name(StringView);
|
||||
[[nodiscard]] bool is_cors_safelisted_response_header_name(StringView, ReadonlySpan<StringView>);
|
||||
[[nodiscard]] bool is_no_cors_safelisted_request_header_name(StringView);
|
||||
[[nodiscard]] bool is_no_cors_safelisted_request_header(Header const&);
|
||||
[[nodiscard]] bool is_no_cors_safelisted_request_header(HTTP::Header const&);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,608 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2022-2023, Linus Groh <linusg@serenityos.org>
|
||||
* Copyright (c) 2022, Kenneth Myhra <kennethmyhra@serenityos.org>
|
||||
* Copyright (c) 2022, Luke Wilde <lukew@serenityos.org>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <AK/CharacterTypes.h>
|
||||
#include <AK/Checked.h>
|
||||
#include <AK/GenericLexer.h>
|
||||
#include <AK/QuickSort.h>
|
||||
#include <AK/StringUtils.h>
|
||||
#include <LibJS/Runtime/VM.h>
|
||||
#include <LibRegex/Regex.h>
|
||||
#include <LibTextCodec/Decoder.h>
|
||||
#include <LibTextCodec/Encoder.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Headers.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Methods.h>
|
||||
#include <LibWeb/Loader/ResourceLoader.h>
|
||||
|
||||
namespace Web::Fetch::Infrastructure {
|
||||
|
||||
GC_DEFINE_ALLOCATOR(HeaderList);
|
||||
|
||||
Header Header::isomorphic_encode(StringView name, StringView value)
|
||||
{
|
||||
return {
|
||||
.name = TextCodec::isomorphic_encode(name),
|
||||
.value = TextCodec::isomorphic_encode(value),
|
||||
};
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#extract-header-values
|
||||
Optional<Vector<ByteString>> Header::extract_header_values() const
|
||||
{
|
||||
// FIXME: 1. If parsing header’s value, per the ABNF for header’s name, fails, then return failure.
|
||||
// FIXME: 2. Return one or more values resulting from parsing header’s value, per the ABNF for header’s name.
|
||||
|
||||
// For now we only parse some headers that are of the ABNF list form "#something"
|
||||
if (name.is_one_of_ignoring_ascii_case(
|
||||
"Access-Control-Request-Headers"sv,
|
||||
"Access-Control-Expose-Headers"sv,
|
||||
"Access-Control-Allow-Headers"sv,
|
||||
"Access-Control-Allow-Methods"sv)
|
||||
&& !value.is_empty()) {
|
||||
Vector<ByteString> trimmed_values;
|
||||
|
||||
value.view().for_each_split_view(',', SplitBehavior::Nothing, [&](auto value) {
|
||||
trimmed_values.append(value.trim(" \t"sv));
|
||||
});
|
||||
|
||||
return trimmed_values;
|
||||
}
|
||||
|
||||
// This always ignores the ABNF rules for now and returns the header value as a single list item.
|
||||
return Vector { value };
|
||||
}
|
||||
|
||||
GC::Ref<HeaderList> HeaderList::create(JS::VM& vm)
|
||||
{
|
||||
return vm.heap().allocate<HeaderList>();
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#header-list-contains
|
||||
bool HeaderList::contains(StringView name) const
|
||||
{
|
||||
// A header list list contains a header name name if list contains a header whose name is a byte-case-insensitive
|
||||
// match for name.
|
||||
return any_of(*this, [&](auto const& header) {
|
||||
return header.name.equals_ignoring_ascii_case(name);
|
||||
});
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#concept-header-list-get
|
||||
Optional<ByteString> HeaderList::get(StringView name) const
|
||||
{
|
||||
// To get a header name name from a header list list, run these steps:
|
||||
|
||||
// 1. If list does not contain name, then return null.
|
||||
if (!contains(name))
|
||||
return {};
|
||||
|
||||
// 2. Return the values of all headers in list whose name is a byte-case-insensitive match for name, separated from
|
||||
// each other by 0x2C 0x20, in order.
|
||||
StringBuilder builder;
|
||||
bool first = true;
|
||||
|
||||
for (auto const& header : *this) {
|
||||
if (!header.name.equals_ignoring_ascii_case(name))
|
||||
continue;
|
||||
|
||||
if (!first)
|
||||
builder.append(", "sv);
|
||||
|
||||
builder.append(header.value);
|
||||
first = false;
|
||||
}
|
||||
|
||||
return builder.to_byte_string();
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#concept-header-list-get-decode-split
|
||||
Optional<Vector<String>> HeaderList::get_decode_and_split(StringView name) const
|
||||
{
|
||||
// To get, decode, and split a header name name from header list list, run these steps:
|
||||
|
||||
// 1. Let value be the result of getting name from list.
|
||||
auto value = get(name);
|
||||
|
||||
// 2. If value is null, then return null.
|
||||
if (!value.has_value())
|
||||
return {};
|
||||
|
||||
// 3. Return the result of getting, decoding, and splitting value.
|
||||
return get_decode_and_split_header_value(*value);
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#concept-header-list-append
|
||||
void HeaderList::append(Header header)
|
||||
{
|
||||
// To append a header (name, value) to a header list list, run these steps:
|
||||
|
||||
// 1. If list contains name, then set name to the first such header’s name.
|
||||
// NOTE: This reuses the casing of the name of the header already in list, if any. If there are multiple matched
|
||||
// headers their names will all be identical.
|
||||
auto matching_header = first_matching([&](auto const& existing_header) {
|
||||
return existing_header.name.equals_ignoring_ascii_case(header.name);
|
||||
});
|
||||
|
||||
if (matching_header.has_value())
|
||||
header.name = matching_header->name;
|
||||
|
||||
// 2. Append (name, value) to list.
|
||||
Vector::append(move(header));
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#concept-header-list-delete
|
||||
void HeaderList::delete_(StringView name)
|
||||
{
|
||||
// To delete a header name name from a header list list, remove all headers whose name is a byte-case-insensitive
|
||||
// match for name from list.
|
||||
remove_all_matching([&](auto const& header) {
|
||||
return header.name.equals_ignoring_ascii_case(name);
|
||||
});
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#concept-header-list-set
|
||||
void HeaderList::set(Header header)
|
||||
{
|
||||
// To set a header (name, value) in a header list list, run these steps:
|
||||
|
||||
// 1. If list contains name, then set the value of the first such header to value and remove the others.
|
||||
auto it = find_if([&](auto const& existing_header) {
|
||||
return existing_header.name.equals_ignoring_ascii_case(header.name);
|
||||
});
|
||||
|
||||
if (it != end()) {
|
||||
it->value = move(header.value);
|
||||
|
||||
size_t i = 0;
|
||||
remove_all_matching([&](auto const& existing_header) {
|
||||
if (i++ <= it.index())
|
||||
return false;
|
||||
|
||||
return existing_header.name.equals_ignoring_ascii_case(it->name);
|
||||
});
|
||||
}
|
||||
// 2. Otherwise, append header (name, value) to list.
|
||||
else {
|
||||
append(move(header));
|
||||
}
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#concept-header-list-combine
|
||||
void HeaderList::combine(Header header)
|
||||
{
|
||||
// To combine a header (name, value) in a header list list, run these steps:
|
||||
|
||||
// 1. If list contains name, then set the value of the first such header to its value, followed by 0x2C 0x20,
|
||||
// followed by value.
|
||||
auto matching_header = first_matching([&](auto const& existing_header) {
|
||||
return existing_header.name.equals_ignoring_ascii_case(header.name);
|
||||
});
|
||||
|
||||
if (matching_header.has_value()) {
|
||||
matching_header->value = ByteString::formatted("{}, {}", matching_header->value, header.value);
|
||||
}
|
||||
// 2. Otherwise, append (name, value) to list.
|
||||
else {
|
||||
append(move(header));
|
||||
}
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#concept-header-list-sort-and-combine
|
||||
Vector<Header> HeaderList::sort_and_combine() const
|
||||
{
|
||||
// To sort and combine a header list list, run these steps:
|
||||
|
||||
// 1. Let headers be an empty list of headers with the key being the name and value the value.
|
||||
Vector<Header> headers;
|
||||
|
||||
// 2. Let names be the result of convert header names to a sorted-lowercase set with all the names of the headers
|
||||
// in list.
|
||||
Vector<ByteString> names_list;
|
||||
names_list.ensure_capacity(size());
|
||||
|
||||
for (auto const& header : *this)
|
||||
names_list.unchecked_append(header.name);
|
||||
|
||||
auto names = convert_header_names_to_a_sorted_lowercase_set(names_list);
|
||||
|
||||
// 3. For each name of names:
|
||||
for (auto& name : names) {
|
||||
// 1. If name is `set-cookie`, then:
|
||||
if (name == "set-cookie"sv) {
|
||||
// 1. Let values be a list of all values of headers in list whose name is a byte-case-insensitive match for
|
||||
// name, in order.
|
||||
// 2. For each value of values:
|
||||
for (auto const& [header_name, value] : *this) {
|
||||
if (header_name.equals_ignoring_ascii_case(name)) {
|
||||
// 1. Append (name, value) to headers.
|
||||
headers.append({ name, value });
|
||||
}
|
||||
}
|
||||
}
|
||||
// 2. Otherwise:
|
||||
else {
|
||||
// 1. Let value be the result of getting name from list.
|
||||
auto value = get(name);
|
||||
|
||||
// 2. Assert: value is not null.
|
||||
VERIFY(value.has_value());
|
||||
|
||||
// 3. Append (name, value) to headers.
|
||||
headers.empend(move(name), value.release_value());
|
||||
}
|
||||
}
|
||||
|
||||
// 4. Return headers.
|
||||
return headers;
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#extract-header-list-values
|
||||
Variant<Empty, Vector<ByteString>, HeaderList::ExtractHeaderParseFailure> HeaderList::extract_header_list_values(StringView name) const
|
||||
{
|
||||
// 1. If list does not contain name, then return null.
|
||||
if (!contains(name))
|
||||
return {};
|
||||
|
||||
// FIXME: 2. If the ABNF for name allows a single header and list contains more than one, then return failure.
|
||||
// NOTE: If different error handling is needed, extract the desired header first.
|
||||
|
||||
// 3. Let values be an empty list.
|
||||
Vector<ByteString> values;
|
||||
|
||||
// 4. For each header header list contains whose name is name:
|
||||
for (auto const& header : *this) {
|
||||
if (!header.name.equals_ignoring_ascii_case(name))
|
||||
continue;
|
||||
|
||||
// 1. Let extract be the result of extracting header values from header.
|
||||
auto extract = header.extract_header_values();
|
||||
|
||||
// 2. If extract is failure, then return failure.
|
||||
if (!extract.has_value())
|
||||
return ExtractHeaderParseFailure {};
|
||||
|
||||
// 3. Append each value in extract, in order, to values.
|
||||
values.extend(extract.release_value());
|
||||
}
|
||||
|
||||
// 5. Return values.
|
||||
return values;
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#header-list-extract-a-length
|
||||
Variant<Empty, u64, HeaderList::ExtractLengthFailure> HeaderList::extract_length() const
|
||||
{
|
||||
// 1. Let values be the result of getting, decoding, and splitting `Content-Length` from headers.
|
||||
auto values = get_decode_and_split("Content-Length"sv);
|
||||
|
||||
// 2. If values is null, then return null.
|
||||
if (!values.has_value())
|
||||
return {};
|
||||
|
||||
// 3. Let candidateValue be null.
|
||||
Optional<String> candidate_value;
|
||||
|
||||
// 4. For each value of values:
|
||||
for (auto const& value : *values) {
|
||||
// 1. If candidateValue is null, then set candidateValue to value.
|
||||
if (!candidate_value.has_value()) {
|
||||
candidate_value = value;
|
||||
}
|
||||
// 2. Otherwise, if value is not candidateValue, return failure.
|
||||
else if (candidate_value.value() != value) {
|
||||
return ExtractLengthFailure {};
|
||||
}
|
||||
}
|
||||
|
||||
// 5. If candidateValue is the empty string or has a code point that is not an ASCII digit, then return null.
|
||||
// 6. Return candidateValue, interpreted as decimal number.
|
||||
// FIXME: This will return an empty Optional if it cannot fit into a u64, is this correct?
|
||||
auto result = candidate_value->to_number<u64>(TrimWhitespace::No);
|
||||
if (!result.has_value())
|
||||
return {};
|
||||
|
||||
return *result;
|
||||
}
|
||||
|
||||
// Non-standard
|
||||
Vector<ByteString> HeaderList::unique_names() const
|
||||
{
|
||||
Vector<ByteString> header_names_set;
|
||||
HashTable<StringView, CaseInsensitiveStringTraits> header_names_seen;
|
||||
|
||||
for (auto const& header : *this) {
|
||||
if (header_names_seen.contains(header.name))
|
||||
continue;
|
||||
|
||||
header_names_set.append(header.name);
|
||||
header_names_seen.set(header.name);
|
||||
}
|
||||
|
||||
return header_names_set;
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#header-name
|
||||
bool is_header_name(StringView header_name)
|
||||
{
|
||||
// A header name is a byte sequence that matches the field-name token production.
|
||||
Regex<ECMA262Parser> regex { R"~~~(^[A-Za-z0-9!#$%&'*+\-.^_`|~]+$)~~~" };
|
||||
return regex.has_match(header_name);
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#header-value
|
||||
bool is_header_value(StringView header_value)
|
||||
{
|
||||
// A header value is a byte sequence that matches the following conditions:
|
||||
// - Has no leading or trailing HTTP tab or space bytes.
|
||||
// - Contains no 0x00 (NUL) or HTTP newline bytes.
|
||||
if (header_value.is_empty())
|
||||
return true;
|
||||
|
||||
auto first_byte = header_value[0];
|
||||
auto last_byte = header_value[header_value.length() - 1];
|
||||
|
||||
if (is_http_tab_or_space(first_byte) || is_http_tab_or_space(last_byte))
|
||||
return false;
|
||||
|
||||
return !any_of(header_value, [](auto byte) {
|
||||
return byte == 0x00 || is_http_newline(byte);
|
||||
});
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#concept-header-value-normalize
|
||||
ByteString normalize_header_value(StringView potential_value)
|
||||
{
|
||||
// To normalize a byte sequence potentialValue, remove any leading and trailing HTTP whitespace bytes from
|
||||
// potentialValue.
|
||||
if (potential_value.is_empty())
|
||||
return {};
|
||||
return potential_value.trim(HTTP_WHITESPACE, TrimMode::Both);
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#forbidden-header-name
|
||||
bool is_forbidden_request_header(Header const& header)
|
||||
{
|
||||
// A header (name, value) is forbidden request-header if these steps return true:
|
||||
auto const& [name, value] = header;
|
||||
|
||||
// 1. If name is a byte-case-insensitive match for one of:
|
||||
// [...]
|
||||
// then return true.
|
||||
if (name.is_one_of_ignoring_ascii_case(
|
||||
"Accept-Charset"sv,
|
||||
"Accept-Encoding"sv,
|
||||
"Access-Control-Request-Headers"sv,
|
||||
"Access-Control-Request-Method"sv,
|
||||
"Connection"sv,
|
||||
"Content-Length"sv,
|
||||
"Cookie"sv,
|
||||
"Cookie2"sv,
|
||||
"Date"sv,
|
||||
"DNT"sv,
|
||||
"Expect"sv,
|
||||
"Host"sv,
|
||||
"Keep-Alive"sv,
|
||||
"Origin"sv,
|
||||
"Referer"sv,
|
||||
"Set-Cookie"sv,
|
||||
"TE"sv,
|
||||
"Trailer"sv,
|
||||
"Transfer-Encoding"sv,
|
||||
"Upgrade"sv,
|
||||
"Via"sv)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// 2. If name when byte-lowercased starts with `proxy-` or `sec-`, then return true.
|
||||
if (name.starts_with("proxy-"sv, CaseSensitivity::CaseInsensitive)
|
||||
|| name.starts_with("sec-"sv, CaseSensitivity::CaseInsensitive)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// 3. If name is a byte-case-insensitive match for one of:
|
||||
// - `X-HTTP-Method`
|
||||
// - `X-HTTP-Method-Override`
|
||||
// - `X-Method-Override`
|
||||
// then:
|
||||
if (name.is_one_of_ignoring_ascii_case(
|
||||
"X-HTTP-Method"sv,
|
||||
"X-HTTP-Method-Override"sv,
|
||||
"X-Method-Override"sv)) {
|
||||
// 1. Let parsedValues be the result of getting, decoding, and splitting value.
|
||||
auto parsed_values = get_decode_and_split_header_value(value);
|
||||
|
||||
// 2. For each method of parsedValues: if the isomorphic encoding of method is a forbidden method, then return true.
|
||||
// NB: The values returned from get_decode_and_split_header_value have already been decoded.
|
||||
if (any_of(parsed_values, [](auto const& method) { return is_forbidden_method(method); }))
|
||||
return true;
|
||||
}
|
||||
|
||||
// 4. Return false.
|
||||
return false;
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#forbidden-response-header-name
|
||||
bool is_forbidden_response_header_name(StringView header_name)
|
||||
{
|
||||
// A forbidden response-header name is a header name that is a byte-case-insensitive match for one of:
|
||||
// - `Set-Cookie`
|
||||
// - `Set-Cookie2`
|
||||
return header_name.is_one_of_ignoring_ascii_case(
|
||||
"Set-Cookie"sv,
|
||||
"Set-Cookie2"sv);
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#header-value-get-decode-and-split
|
||||
Vector<String> get_decode_and_split_header_value(StringView value)
|
||||
{
|
||||
// To get, decode, and split a header value value, run these steps:
|
||||
|
||||
// 1. Let input be the result of isomorphic decoding value.
|
||||
auto input = TextCodec::isomorphic_decode(value);
|
||||
|
||||
// 2. Let position be a position variable for input, initially pointing at the start of input.
|
||||
GenericLexer lexer { input };
|
||||
|
||||
// 3. Let values be a list of strings, initially « ».
|
||||
Vector<String> values;
|
||||
|
||||
// 4. Let temporaryValue be the empty string.
|
||||
StringBuilder temporary_value_builder;
|
||||
|
||||
// 5. While true:
|
||||
while (true) {
|
||||
// 1. Append the result of collecting a sequence of code points that are not U+0022 (") or U+002C (,) from
|
||||
// input, given position, to temporaryValue.
|
||||
// NOTE: The result might be the empty string.
|
||||
temporary_value_builder.append(lexer.consume_until(is_any_of("\","sv)));
|
||||
|
||||
// 2. If position is not past the end of input and the code point at position within input is U+0022 ("):
|
||||
if (!lexer.is_eof() && lexer.peek() == '"') {
|
||||
// 1. Append the result of collecting an HTTP quoted string from input, given position, to temporaryValue.
|
||||
temporary_value_builder.append(collect_an_http_quoted_string(lexer));
|
||||
|
||||
// 2. If position is not past the end of input, then continue.
|
||||
if (!lexer.is_eof())
|
||||
continue;
|
||||
}
|
||||
|
||||
// 3. Remove all HTTP tab or space from the start and end of temporaryValue.
|
||||
auto temporary_value = MUST(String::from_utf8(temporary_value_builder.string_view().trim(HTTP_TAB_OR_SPACE, TrimMode::Both)));
|
||||
|
||||
// 4. Append temporaryValue to values.
|
||||
values.append(move(temporary_value));
|
||||
|
||||
// 5. Set temporaryValue to the empty string.
|
||||
temporary_value_builder.clear();
|
||||
|
||||
// 6. If position is past the end of input, then return values.
|
||||
if (lexer.is_eof())
|
||||
return values;
|
||||
|
||||
// 7. Assert: the code point at position within input is U+002C (,).
|
||||
VERIFY(lexer.peek() == ',');
|
||||
|
||||
// 8. Advance position by 1.
|
||||
lexer.ignore(1);
|
||||
}
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#convert-header-names-to-a-sorted-lowercase-set
|
||||
Vector<ByteString> convert_header_names_to_a_sorted_lowercase_set(ReadonlySpan<ByteString> header_names)
|
||||
{
|
||||
// To convert header names to a sorted-lowercase set, given a list of names headerNames, run these steps:
|
||||
|
||||
// 1. Let headerNamesSet be a new ordered set.
|
||||
HashTable<StringView, CaseInsensitiveStringTraits> header_names_seen;
|
||||
Vector<ByteString> header_names_set;
|
||||
|
||||
// 2. For each name of headerNames, append the result of byte-lowercasing name to headerNamesSet.
|
||||
for (auto const& name : header_names) {
|
||||
if (header_names_seen.contains(name))
|
||||
continue;
|
||||
|
||||
header_names_seen.set(name);
|
||||
header_names_set.append(name.to_lowercase());
|
||||
}
|
||||
|
||||
// 3. Return the result of sorting headerNamesSet in ascending order with byte less than.
|
||||
quick_sort(header_names_set);
|
||||
return header_names_set;
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#build-a-content-range
|
||||
ByteString build_content_range(u64 range_start, u64 range_end, u64 full_length)
|
||||
{
|
||||
// 1. Let contentRange be `bytes `.
|
||||
// 2. Append rangeStart, serialized and isomorphic encoded, to contentRange.
|
||||
// 3. Append 0x2D (-) to contentRange.
|
||||
// 4. Append rangeEnd, serialized and isomorphic encoded to contentRange.
|
||||
// 5. Append 0x2F (/) to contentRange.
|
||||
// 6. Append fullLength, serialized and isomorphic encoded to contentRange.
|
||||
// 7. Return contentRange.
|
||||
return ByteString::formatted("bytes {}-{}/{}", range_start, range_end, full_length);
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#simple-range-header-value
|
||||
Optional<RangeHeaderValue> parse_single_range_header_value(StringView const value, bool const allow_whitespace)
|
||||
{
|
||||
// 1. Let data be the isomorphic decoding of value.
|
||||
auto const data = TextCodec::isomorphic_decode(value);
|
||||
|
||||
// 2. If data does not start with "bytes", then return failure.
|
||||
if (!data.starts_with_bytes("bytes"sv))
|
||||
return {};
|
||||
|
||||
// 3. Let position be a position variable for data, initially pointing at the 5th code point of data.
|
||||
GenericLexer lexer { data };
|
||||
lexer.ignore(5);
|
||||
|
||||
// 4. If allowWhitespace is true, collect a sequence of code points that are HTTP tab or space, from data given position.
|
||||
if (allow_whitespace)
|
||||
lexer.consume_while(is_http_tab_or_space);
|
||||
|
||||
// 5. If the code point at position within data is not U+003D (=), then return failure.
|
||||
// 6. Advance position by 1.
|
||||
if (!lexer.consume_specific('='))
|
||||
return {};
|
||||
|
||||
// 7. If allowWhitespace is true, collect a sequence of code points that are HTTP tab or space, from data given position.
|
||||
if (allow_whitespace)
|
||||
lexer.consume_while(is_http_tab_or_space);
|
||||
|
||||
// 8. Let rangeStart be the result of collecting a sequence of code points that are ASCII digits, from data given position.
|
||||
auto range_start = lexer.consume_while(is_ascii_digit);
|
||||
|
||||
// 9. Let rangeStartValue be rangeStart, interpreted as decimal number, if rangeStart is not the empty string; otherwise null.
|
||||
auto range_start_value = range_start.to_number<u64>();
|
||||
|
||||
// 10. If allowWhitespace is true, collect a sequence of code points that are HTTP tab or space, from data given position.
|
||||
if (allow_whitespace)
|
||||
lexer.consume_while(is_http_tab_or_space);
|
||||
|
||||
// 11. If the code point at position within data is not U+002D (-), then return failure.
|
||||
// 12. Advance position by 1.
|
||||
if (!lexer.consume_specific('-'))
|
||||
return {};
|
||||
|
||||
// 13. If allowWhitespace is true, collect a sequence of code points that are HTTP tab or space, from data given position.
|
||||
if (allow_whitespace)
|
||||
lexer.consume_while(is_http_tab_or_space);
|
||||
|
||||
// 14. Let rangeEnd be the result of collecting a sequence of code points that are ASCII digits, from data given position.
|
||||
auto range_end = lexer.consume_while(is_ascii_digit);
|
||||
|
||||
// 15. Let rangeEndValue be rangeEnd, interpreted as decimal number, if rangeEnd is not the empty string; otherwise null.
|
||||
auto range_end_value = range_end.to_number<u64>();
|
||||
|
||||
// 16. If position is not past the end of data, then return failure.
|
||||
if (!lexer.is_eof())
|
||||
return {};
|
||||
|
||||
// 17. If rangeEndValue and rangeStartValue are null, then return failure.
|
||||
if (!range_end_value.has_value() && !range_start_value.has_value())
|
||||
return {};
|
||||
|
||||
// 18. If rangeStartValue and rangeEndValue are numbers, and rangeStartValue is greater than rangeEndValue, then return failure.
|
||||
if (range_start_value.has_value() && range_end_value.has_value() && *range_start_value > *range_end_value)
|
||||
return {};
|
||||
|
||||
// 19. Return (rangeStartValue, rangeEndValue).
|
||||
return RangeHeaderValue { move(range_start_value), move(range_end_value) };
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#default-user-agent-value
|
||||
ByteString const& default_user_agent_value()
|
||||
{
|
||||
// A default `User-Agent` value is an implementation-defined header value for the `User-Agent` header.
|
||||
static auto user_agent = ResourceLoader::the().user_agent().to_byte_string();
|
||||
return user_agent;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,86 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2022-2023, Linus Groh <linusg@serenityos.org>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <AK/ByteString.h>
|
||||
#include <AK/Optional.h>
|
||||
#include <AK/String.h>
|
||||
#include <AK/Vector.h>
|
||||
#include <LibGC/Heap.h>
|
||||
#include <LibGC/Ptr.h>
|
||||
#include <LibJS/Forward.h>
|
||||
#include <LibJS/Heap/Cell.h>
|
||||
#include <LibWeb/Export.h>
|
||||
|
||||
namespace Web::Fetch::Infrastructure {
|
||||
|
||||
// https://fetch.spec.whatwg.org/#concept-header
|
||||
// A header is a tuple that consists of a name (a header name) and value (a header value).
|
||||
struct WEB_API Header {
|
||||
[[nodiscard]] static Header isomorphic_encode(StringView, StringView);
|
||||
|
||||
Optional<Vector<ByteString>> extract_header_values() const;
|
||||
|
||||
ByteString name;
|
||||
ByteString value;
|
||||
};
|
||||
|
||||
// https://fetch.spec.whatwg.org/#concept-header-list
|
||||
// A header list is a list of zero or more headers. It is initially the empty list.
|
||||
class WEB_API HeaderList final
|
||||
: public JS::Cell
|
||||
, public Vector<Header> {
|
||||
GC_CELL(HeaderList, JS::Cell);
|
||||
GC_DECLARE_ALLOCATOR(HeaderList);
|
||||
|
||||
public:
|
||||
[[nodiscard]] static GC::Ref<HeaderList> create(JS::VM&);
|
||||
|
||||
using Vector::begin;
|
||||
using Vector::clear;
|
||||
using Vector::end;
|
||||
using Vector::is_empty;
|
||||
|
||||
[[nodiscard]] bool contains(StringView) const;
|
||||
[[nodiscard]] Optional<ByteString> get(StringView) const;
|
||||
[[nodiscard]] Optional<Vector<String>> get_decode_and_split(StringView) const;
|
||||
void append(Header);
|
||||
void delete_(StringView name);
|
||||
void set(Header);
|
||||
void combine(Header);
|
||||
[[nodiscard]] Vector<Header> sort_and_combine() const;
|
||||
|
||||
struct ExtractHeaderParseFailure { };
|
||||
[[nodiscard]] Variant<Empty, Vector<ByteString>, ExtractHeaderParseFailure> extract_header_list_values(StringView) const;
|
||||
|
||||
struct ExtractLengthFailure { };
|
||||
[[nodiscard]] Variant<Empty, u64, ExtractLengthFailure> extract_length() const;
|
||||
|
||||
[[nodiscard]] Vector<ByteString> unique_names() const;
|
||||
};
|
||||
|
||||
struct RangeHeaderValue {
|
||||
Optional<u64> start;
|
||||
Optional<u64> end;
|
||||
};
|
||||
|
||||
[[nodiscard]] bool is_header_name(StringView);
|
||||
[[nodiscard]] bool is_header_value(StringView);
|
||||
[[nodiscard]] ByteString normalize_header_value(StringView);
|
||||
|
||||
[[nodiscard]] bool is_forbidden_request_header(Header const&);
|
||||
[[nodiscard]] bool is_forbidden_response_header_name(StringView);
|
||||
|
||||
[[nodiscard]] Vector<String> get_decode_and_split_header_value(StringView);
|
||||
[[nodiscard]] Vector<ByteString> convert_header_names_to_a_sorted_lowercase_set(ReadonlySpan<ByteString>);
|
||||
|
||||
[[nodiscard]] WEB_API ByteString build_content_range(u64 range_start, u64 range_end, u64 full_length);
|
||||
[[nodiscard]] WEB_API Optional<RangeHeaderValue> parse_single_range_header_value(StringView, bool);
|
||||
|
||||
[[nodiscard]] WEB_API ByteString const& default_user_agent_value();
|
||||
|
||||
}
|
||||
|
|
@ -6,14 +6,14 @@
|
|||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <LibHTTP/HeaderList.h>
|
||||
#include <LibTextCodec/Decoder.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Headers.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/MIME.h>
|
||||
|
||||
namespace Web::Fetch::Infrastructure {
|
||||
|
||||
// https://fetch.spec.whatwg.org/#concept-header-extract-mime-type
|
||||
Optional<MimeSniff::MimeType> extract_mime_type(HeaderList const& headers)
|
||||
Optional<MimeSniff::MimeType> extract_mime_type(HTTP::HeaderList const& headers)
|
||||
{
|
||||
// 1. Let charset be null.
|
||||
Optional<String> charset;
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
#pragma once
|
||||
|
||||
#include <AK/Optional.h>
|
||||
#include <LibWeb/Forward.h>
|
||||
#include <LibHTTP/Forward.h>
|
||||
#include <LibWeb/MimeSniff/MimeType.h>
|
||||
|
||||
namespace Web::Fetch::Infrastructure {
|
||||
|
||||
Optional<MimeSniff::MimeType> extract_mime_type(HeaderList const&);
|
||||
Optional<MimeSniff::MimeType> extract_mime_type(HTTP::HeaderList const&);
|
||||
StringView legacy_extract_an_encoding(Optional<MimeSniff::MimeType> const& mime_type, StringView fallback_encoding);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,50 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2022, Linus Groh <linusg@serenityos.org>
|
||||
* Copyright (c) 2022, Kenneth Myhra <kennethmyhra@serenityos.org>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <LibRegex/Regex.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Methods.h>
|
||||
|
||||
namespace Web::Fetch::Infrastructure {
|
||||
|
||||
// https://fetch.spec.whatwg.org/#concept-method
|
||||
bool is_method(StringView 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(method);
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#cors-safelisted-method
|
||||
bool is_cors_safelisted_method(StringView method)
|
||||
{
|
||||
// A CORS-safelisted method is a method that is `GET`, `HEAD`, or `POST`.
|
||||
return method.is_one_of("GET"sv, "HEAD"sv, "POST"sv);
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#forbidden-method
|
||||
bool is_forbidden_method(StringView method)
|
||||
{
|
||||
// A forbidden method is a method that is a byte-case-insensitive match for `CONNECT`, `TRACE`, or `TRACK`.
|
||||
return method.is_one_of_ignoring_ascii_case("CONNECT"sv, "TRACE"sv, "TRACK"sv);
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#concept-method-normalize
|
||||
ByteString normalize_method(StringView method)
|
||||
{
|
||||
// To normalize a method, if it is a byte-case-insensitive match for `DELETE`, `GET`, `HEAD`, `OPTIONS`, `POST`,
|
||||
// or `PUT`, byte-uppercase it.
|
||||
static auto NORMALIZED_METHODS = to_array<ByteString>({ "DELETE"sv, "GET"sv, "HEAD"sv, "OPTIONS"sv, "POST"sv, "PUT"sv });
|
||||
|
||||
for (auto const& normalized_method : NORMALIZED_METHODS) {
|
||||
if (normalized_method.equals_ignoring_ascii_case(method))
|
||||
return normalized_method;
|
||||
}
|
||||
|
||||
return method;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2022, Linus Groh <linusg@serenityos.org>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <AK/ByteString.h>
|
||||
#include <AK/StringView.h>
|
||||
#include <LibWeb/Export.h>
|
||||
|
||||
namespace Web::Fetch::Infrastructure {
|
||||
|
||||
[[nodiscard]] bool is_method(StringView);
|
||||
[[nodiscard]] WEB_API bool is_cors_safelisted_method(StringView);
|
||||
[[nodiscard]] bool is_forbidden_method(StringView);
|
||||
[[nodiscard]] ByteString normalize_method(StringView);
|
||||
|
||||
}
|
||||
|
|
@ -20,15 +20,19 @@ namespace Web::Fetch::Infrastructure {
|
|||
|
||||
GC_DEFINE_ALLOCATOR(Request);
|
||||
|
||||
Request::Request(GC::Ref<HeaderList> header_list)
|
||||
: m_header_list(header_list)
|
||||
GC::Ref<Request> Request::create(JS::VM& vm)
|
||||
{
|
||||
return vm.heap().allocate<Request>(HTTP::HeaderList::create());
|
||||
}
|
||||
|
||||
Request::Request(NonnullRefPtr<HTTP::HeaderList> header_list)
|
||||
: m_header_list(move(header_list))
|
||||
{
|
||||
}
|
||||
|
||||
void Request::visit_edges(JS::Cell::Visitor& visitor)
|
||||
{
|
||||
Base::visit_edges(visitor);
|
||||
visitor.visit(m_header_list);
|
||||
visitor.visit(m_client);
|
||||
m_body.visit(
|
||||
[&](GC::Ref<Body>& body) { visitor.visit(body); },
|
||||
|
|
@ -44,11 +48,6 @@ void Request::visit_edges(JS::Cell::Visitor& visitor)
|
|||
[](auto const&) {});
|
||||
}
|
||||
|
||||
GC::Ref<Request> Request::create(JS::VM& vm)
|
||||
{
|
||||
return vm.heap().allocate<Request>(HeaderList::create(vm));
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#concept-request-url
|
||||
URL::URL& Request::url()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
#include <AK/Variant.h>
|
||||
#include <AK/Vector.h>
|
||||
#include <LibGC/Ptr.h>
|
||||
#include <LibHTTP/HeaderList.h>
|
||||
#include <LibJS/Forward.h>
|
||||
#include <LibJS/Heap/Cell.h>
|
||||
#include <LibURL/Origin.h>
|
||||
|
|
@ -23,7 +24,6 @@
|
|||
#include <LibWeb/Export.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Bodies.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Headers.h>
|
||||
|
||||
namespace Web::Fetch::Infrastructure {
|
||||
|
||||
|
|
@ -178,8 +178,8 @@ public:
|
|||
[[nodiscard]] bool local_urls_only() const { return m_local_urls_only; }
|
||||
void set_local_urls_only(bool local_urls_only) { m_local_urls_only = local_urls_only; }
|
||||
|
||||
[[nodiscard]] GC::Ref<HeaderList> header_list() const { return m_header_list; }
|
||||
void set_header_list(GC::Ref<HeaderList> header_list) { m_header_list = header_list; }
|
||||
NonnullRefPtr<HTTP::HeaderList> const& header_list() const { return m_header_list; }
|
||||
void set_header_list(NonnullRefPtr<HTTP::HeaderList> header_list) { m_header_list = move(header_list); }
|
||||
|
||||
[[nodiscard]] bool unsafe_request() const { return m_unsafe_request; }
|
||||
void set_unsafe_request(bool unsafe_request) { m_unsafe_request = unsafe_request; }
|
||||
|
|
@ -330,7 +330,7 @@ public:
|
|||
}
|
||||
|
||||
private:
|
||||
explicit Request(GC::Ref<HeaderList>);
|
||||
explicit Request(NonnullRefPtr<HTTP::HeaderList>);
|
||||
|
||||
virtual void visit_edges(JS::Cell::Visitor&) override;
|
||||
|
||||
|
|
@ -344,7 +344,7 @@ private:
|
|||
|
||||
// https://fetch.spec.whatwg.org/#concept-request-header-list
|
||||
// A request has an associated header list (a header list). Unless stated otherwise it is empty.
|
||||
GC::Ref<HeaderList> m_header_list;
|
||||
NonnullRefPtr<HTTP::HeaderList> m_header_list;
|
||||
|
||||
// https://fetch.spec.whatwg.org/#unsafe-request-flag
|
||||
// A request has an associated unsafe-request flag. Unless stated otherwise it is unset.
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
#include <LibWeb/Fetch/Infrastructure/HTTP/Bodies.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/CORS.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Responses.h>
|
||||
#include <LibWeb/MimeSniff/MimeType.h>
|
||||
|
||||
namespace Web::Fetch::Infrastructure {
|
||||
|
||||
|
|
@ -24,8 +25,13 @@ GC_DEFINE_ALLOCATOR(CORSFilteredResponse);
|
|||
GC_DEFINE_ALLOCATOR(OpaqueFilteredResponse);
|
||||
GC_DEFINE_ALLOCATOR(OpaqueRedirectFilteredResponse);
|
||||
|
||||
Response::Response(GC::Ref<HeaderList> header_list)
|
||||
: m_header_list(header_list)
|
||||
GC::Ref<Response> Response::create(JS::VM& vm)
|
||||
{
|
||||
return vm.heap().allocate<Response>(HTTP::HeaderList::create());
|
||||
}
|
||||
|
||||
Response::Response(NonnullRefPtr<HTTP::HeaderList> header_list)
|
||||
: m_header_list(move(header_list))
|
||||
, m_response_time(MonotonicTime::now())
|
||||
{
|
||||
}
|
||||
|
|
@ -33,15 +39,9 @@ Response::Response(GC::Ref<HeaderList> header_list)
|
|||
void Response::visit_edges(JS::Cell::Visitor& visitor)
|
||||
{
|
||||
Base::visit_edges(visitor);
|
||||
visitor.visit(m_header_list);
|
||||
visitor.visit(m_body);
|
||||
}
|
||||
|
||||
GC::Ref<Response> Response::create(JS::VM& vm)
|
||||
{
|
||||
return vm.heap().allocate<Response>(HeaderList::create(vm));
|
||||
}
|
||||
|
||||
// https://fetch.spec.whatwg.org/#ref-for-concept-network-error%E2%91%A3
|
||||
// A network error is a response whose status is always 0, status message is always
|
||||
// the empty byte sequence, header list is always empty, and body is always null.
|
||||
|
|
@ -341,8 +341,8 @@ u64 Response::stale_while_revalidate_lifetime() const
|
|||
|
||||
// Non-standard
|
||||
|
||||
FilteredResponse::FilteredResponse(GC::Ref<Response> internal_response, GC::Ref<HeaderList> header_list)
|
||||
: Response(header_list)
|
||||
FilteredResponse::FilteredResponse(GC::Ref<Response> internal_response, NonnullRefPtr<HTTP::HeaderList> header_list)
|
||||
: Response(move(header_list))
|
||||
, m_internal_response(internal_response)
|
||||
{
|
||||
}
|
||||
|
|
@ -361,27 +361,22 @@ GC::Ref<BasicFilteredResponse> BasicFilteredResponse::create(JS::VM& vm, GC::Ref
|
|||
{
|
||||
// A basic filtered response is a filtered response whose type is "basic" and header list excludes
|
||||
// any headers in internal response’s header list whose name is a forbidden response-header name.
|
||||
auto header_list = HeaderList::create(vm);
|
||||
auto header_list = HTTP::HeaderList::create();
|
||||
|
||||
for (auto const& header : *internal_response->header_list()) {
|
||||
if (!is_forbidden_response_header_name(header.name))
|
||||
if (!HTTP::is_forbidden_response_header_name(header.name))
|
||||
header_list->append(header);
|
||||
}
|
||||
|
||||
return vm.heap().allocate<BasicFilteredResponse>(internal_response, header_list);
|
||||
return vm.heap().allocate<BasicFilteredResponse>(internal_response, move(header_list));
|
||||
}
|
||||
|
||||
BasicFilteredResponse::BasicFilteredResponse(GC::Ref<Response> internal_response, GC::Ref<HeaderList> header_list)
|
||||
BasicFilteredResponse::BasicFilteredResponse(GC::Ref<Response> internal_response, NonnullRefPtr<HTTP::HeaderList> header_list)
|
||||
: FilteredResponse(internal_response, header_list)
|
||||
, m_header_list(header_list)
|
||||
, m_header_list(move(header_list))
|
||||
{
|
||||
}
|
||||
|
||||
void BasicFilteredResponse::visit_edges(JS::Cell::Visitor& visitor)
|
||||
{
|
||||
Base::visit_edges(visitor);
|
||||
visitor.visit(m_header_list);
|
||||
}
|
||||
|
||||
GC::Ref<CORSFilteredResponse> CORSFilteredResponse::create(JS::VM& vm, GC::Ref<Response> internal_response)
|
||||
{
|
||||
// A CORS filtered response is a filtered response whose type is "cors" and header list excludes
|
||||
|
|
@ -393,7 +388,7 @@ GC::Ref<CORSFilteredResponse> CORSFilteredResponse::create(JS::VM& vm, GC::Ref<R
|
|||
for (auto const& header_name : internal_response->cors_exposed_header_name_list())
|
||||
cors_exposed_header_name_list.unchecked_append(header_name);
|
||||
|
||||
auto header_list = HeaderList::create(vm);
|
||||
auto header_list = HTTP::HeaderList::create();
|
||||
for (auto const& header : *internal_response->header_list()) {
|
||||
if (is_cors_safelisted_response_header_name(header.name, cors_exposed_header_name_list))
|
||||
header_list->append(header);
|
||||
|
|
@ -402,54 +397,36 @@ GC::Ref<CORSFilteredResponse> CORSFilteredResponse::create(JS::VM& vm, GC::Ref<R
|
|||
return vm.heap().allocate<CORSFilteredResponse>(internal_response, header_list);
|
||||
}
|
||||
|
||||
CORSFilteredResponse::CORSFilteredResponse(GC::Ref<Response> internal_response, GC::Ref<HeaderList> header_list)
|
||||
CORSFilteredResponse::CORSFilteredResponse(GC::Ref<Response> internal_response, NonnullRefPtr<HTTP::HeaderList> header_list)
|
||||
: FilteredResponse(internal_response, header_list)
|
||||
, m_header_list(header_list)
|
||||
, m_header_list(move(header_list))
|
||||
{
|
||||
}
|
||||
|
||||
void CORSFilteredResponse::visit_edges(JS::Cell::Visitor& visitor)
|
||||
{
|
||||
Base::visit_edges(visitor);
|
||||
visitor.visit(m_header_list);
|
||||
}
|
||||
|
||||
GC::Ref<OpaqueFilteredResponse> OpaqueFilteredResponse::create(JS::VM& vm, GC::Ref<Response> internal_response)
|
||||
{
|
||||
// An opaque filtered response is a filtered response whose type is "opaque", URL list is the empty list,
|
||||
// status is 0, status message is the empty byte sequence, header list is empty, and body is null.
|
||||
return vm.heap().allocate<OpaqueFilteredResponse>(internal_response, HeaderList::create(vm));
|
||||
return vm.heap().allocate<OpaqueFilteredResponse>(internal_response, HTTP::HeaderList::create());
|
||||
}
|
||||
|
||||
OpaqueFilteredResponse::OpaqueFilteredResponse(GC::Ref<Response> internal_response, GC::Ref<HeaderList> header_list)
|
||||
OpaqueFilteredResponse::OpaqueFilteredResponse(GC::Ref<Response> internal_response, NonnullRefPtr<HTTP::HeaderList> header_list)
|
||||
: FilteredResponse(internal_response, header_list)
|
||||
, m_header_list(header_list)
|
||||
, m_header_list(move(header_list))
|
||||
{
|
||||
}
|
||||
|
||||
void OpaqueFilteredResponse::visit_edges(JS::Cell::Visitor& visitor)
|
||||
{
|
||||
Base::visit_edges(visitor);
|
||||
visitor.visit(m_header_list);
|
||||
}
|
||||
|
||||
GC::Ref<OpaqueRedirectFilteredResponse> OpaqueRedirectFilteredResponse::create(JS::VM& vm, GC::Ref<Response> internal_response)
|
||||
{
|
||||
// An opaque-redirect filtered response is a filtered response whose type is "opaqueredirect",
|
||||
// status is 0, status message is the empty byte sequence, header list is empty, and body is null.
|
||||
return vm.heap().allocate<OpaqueRedirectFilteredResponse>(internal_response, HeaderList::create(vm));
|
||||
return vm.heap().allocate<OpaqueRedirectFilteredResponse>(internal_response, HTTP::HeaderList::create());
|
||||
}
|
||||
|
||||
OpaqueRedirectFilteredResponse::OpaqueRedirectFilteredResponse(GC::Ref<Response> internal_response, GC::Ref<HeaderList> header_list)
|
||||
OpaqueRedirectFilteredResponse::OpaqueRedirectFilteredResponse(GC::Ref<Response> internal_response, NonnullRefPtr<HTTP::HeaderList> header_list)
|
||||
: FilteredResponse(internal_response, header_list)
|
||||
, m_header_list(header_list)
|
||||
, m_header_list(move(header_list))
|
||||
{
|
||||
}
|
||||
|
||||
void OpaqueRedirectFilteredResponse::visit_edges(JS::Cell::Visitor& visitor)
|
||||
{
|
||||
Base::visit_edges(visitor);
|
||||
visitor.visit(m_header_list);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
#include <AK/Time.h>
|
||||
#include <AK/Vector.h>
|
||||
#include <LibGC/Ptr.h>
|
||||
#include <LibHTTP/HeaderList.h>
|
||||
#include <LibJS/Forward.h>
|
||||
#include <LibJS/Heap/Cell.h>
|
||||
#include <LibURL/URL.h>
|
||||
#include <LibWeb/Export.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Bodies.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Headers.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Statuses.h>
|
||||
|
||||
namespace Web::Fetch::Infrastructure {
|
||||
|
|
@ -81,8 +81,8 @@ public:
|
|||
[[nodiscard]] virtual ByteString const& status_message() const { return m_status_message; }
|
||||
virtual void set_status_message(ByteString status_message) { m_status_message = move(status_message); }
|
||||
|
||||
[[nodiscard]] virtual GC::Ref<HeaderList> header_list() const { return m_header_list; }
|
||||
virtual void set_header_list(GC::Ref<HeaderList> header_list) { m_header_list = header_list; }
|
||||
virtual NonnullRefPtr<HTTP::HeaderList> const& header_list() const { return m_header_list; }
|
||||
virtual void set_header_list(NonnullRefPtr<HTTP::HeaderList> header_list) { m_header_list = move(header_list); }
|
||||
|
||||
[[nodiscard]] virtual GC::Ptr<Body> body() const { return m_body; }
|
||||
virtual void set_body(GC::Ptr<Body> body) { m_body = body; }
|
||||
|
|
@ -130,7 +130,7 @@ public:
|
|||
MonotonicTime response_time() const { return m_response_time; }
|
||||
|
||||
protected:
|
||||
explicit Response(GC::Ref<HeaderList>);
|
||||
explicit Response(NonnullRefPtr<HTTP::HeaderList>);
|
||||
|
||||
virtual void visit_edges(JS::Cell::Visitor&) override;
|
||||
|
||||
|
|
@ -157,7 +157,7 @@ private:
|
|||
|
||||
// https://fetch.spec.whatwg.org/#concept-response-header-list
|
||||
// A response has an associated header list (a header list). Unless stated otherwise it is empty.
|
||||
GC::Ref<HeaderList> m_header_list;
|
||||
NonnullRefPtr<HTTP::HeaderList> m_header_list;
|
||||
|
||||
// https://fetch.spec.whatwg.org/#concept-response-body
|
||||
// A response has an associated body (null or a body). Unless stated otherwise it is null.
|
||||
|
|
@ -215,7 +215,7 @@ class FilteredResponse : public Response {
|
|||
GC_CELL(FilteredResponse, Response);
|
||||
|
||||
public:
|
||||
FilteredResponse(GC::Ref<Response>, GC::Ref<HeaderList>);
|
||||
FilteredResponse(GC::Ref<Response>, NonnullRefPtr<HTTP::HeaderList>);
|
||||
virtual ~FilteredResponse() = 0;
|
||||
|
||||
[[nodiscard]] virtual Type type() const override { return m_internal_response->type(); }
|
||||
|
|
@ -233,8 +233,8 @@ public:
|
|||
[[nodiscard]] virtual ByteString const& status_message() const override { return m_internal_response->status_message(); }
|
||||
virtual void set_status_message(ByteString status_message) override { m_internal_response->set_status_message(move(status_message)); }
|
||||
|
||||
[[nodiscard]] virtual GC::Ref<HeaderList> header_list() const override { return m_internal_response->header_list(); }
|
||||
virtual void set_header_list(GC::Ref<HeaderList> header_list) override { m_internal_response->set_header_list(header_list); }
|
||||
virtual NonnullRefPtr<HTTP::HeaderList> const& header_list() const override { return m_internal_response->header_list(); }
|
||||
virtual void set_header_list(NonnullRefPtr<HTTP::HeaderList> header_list) override { m_internal_response->set_header_list(header_list); }
|
||||
|
||||
[[nodiscard]] virtual GC::Ptr<Body> body() const override { return m_internal_response->body(); }
|
||||
virtual void set_body(GC::Ptr<Body> body) override { m_internal_response->set_body(body); }
|
||||
|
|
@ -276,14 +276,12 @@ public:
|
|||
[[nodiscard]] static GC::Ref<BasicFilteredResponse> create(JS::VM&, GC::Ref<Response>);
|
||||
|
||||
[[nodiscard]] virtual Type type() const override { return Type::Basic; }
|
||||
[[nodiscard]] virtual GC::Ref<HeaderList> header_list() const override { return m_header_list; }
|
||||
virtual NonnullRefPtr<HTTP::HeaderList> const& header_list() const override { return m_header_list; }
|
||||
|
||||
private:
|
||||
BasicFilteredResponse(GC::Ref<Response>, GC::Ref<HeaderList>);
|
||||
BasicFilteredResponse(GC::Ref<Response>, NonnullRefPtr<HTTP::HeaderList>);
|
||||
|
||||
virtual void visit_edges(JS::Cell::Visitor&) override;
|
||||
|
||||
GC::Ref<HeaderList> m_header_list;
|
||||
NonnullRefPtr<HTTP::HeaderList> m_header_list;
|
||||
};
|
||||
|
||||
// https://fetch.spec.whatwg.org/#concept-filtered-response-cors
|
||||
|
|
@ -295,14 +293,12 @@ public:
|
|||
[[nodiscard]] static GC::Ref<CORSFilteredResponse> create(JS::VM&, GC::Ref<Response>);
|
||||
|
||||
[[nodiscard]] virtual Type type() const override { return Type::CORS; }
|
||||
[[nodiscard]] virtual GC::Ref<HeaderList> header_list() const override { return m_header_list; }
|
||||
virtual NonnullRefPtr<HTTP::HeaderList> const& header_list() const override { return m_header_list; }
|
||||
|
||||
private:
|
||||
CORSFilteredResponse(GC::Ref<Response>, GC::Ref<HeaderList>);
|
||||
CORSFilteredResponse(GC::Ref<Response>, NonnullRefPtr<HTTP::HeaderList>);
|
||||
|
||||
virtual void visit_edges(JS::Cell::Visitor&) override;
|
||||
|
||||
GC::Ref<HeaderList> m_header_list;
|
||||
NonnullRefPtr<HTTP::HeaderList> m_header_list;
|
||||
};
|
||||
|
||||
// https://fetch.spec.whatwg.org/#concept-filtered-response-opaque
|
||||
|
|
@ -318,17 +314,15 @@ public:
|
|||
[[nodiscard]] virtual Vector<URL::URL>& url_list() override { return m_url_list; }
|
||||
[[nodiscard]] virtual Status status() const override { return 0; }
|
||||
[[nodiscard]] virtual ByteString const& status_message() const override { return m_method; }
|
||||
[[nodiscard]] virtual GC::Ref<HeaderList> header_list() const override { return m_header_list; }
|
||||
virtual NonnullRefPtr<HTTP::HeaderList> const& header_list() const override { return m_header_list; }
|
||||
[[nodiscard]] virtual GC::Ptr<Body> body() const override { return nullptr; }
|
||||
|
||||
private:
|
||||
OpaqueFilteredResponse(GC::Ref<Response>, GC::Ref<HeaderList>);
|
||||
|
||||
virtual void visit_edges(JS::Cell::Visitor&) override;
|
||||
OpaqueFilteredResponse(GC::Ref<Response>, NonnullRefPtr<HTTP::HeaderList>);
|
||||
|
||||
Vector<URL::URL> m_url_list;
|
||||
ByteString const m_method;
|
||||
GC::Ref<HeaderList> m_header_list;
|
||||
NonnullRefPtr<HTTP::HeaderList> m_header_list;
|
||||
};
|
||||
|
||||
// https://fetch.spec.whatwg.org/#concept-filtered-response-opaque-redirect
|
||||
|
|
@ -342,16 +336,14 @@ public:
|
|||
[[nodiscard]] virtual Type type() const override { return Type::OpaqueRedirect; }
|
||||
[[nodiscard]] virtual Status status() const override { return 0; }
|
||||
[[nodiscard]] virtual ByteString const& status_message() const override { return m_method; }
|
||||
[[nodiscard]] virtual GC::Ref<HeaderList> header_list() const override { return m_header_list; }
|
||||
virtual NonnullRefPtr<HTTP::HeaderList> const& header_list() const override { return m_header_list; }
|
||||
[[nodiscard]] virtual GC::Ptr<Body> body() const override { return nullptr; }
|
||||
|
||||
private:
|
||||
OpaqueRedirectFilteredResponse(GC::Ref<Response>, GC::Ref<HeaderList>);
|
||||
|
||||
virtual void visit_edges(JS::Cell::Visitor&) override;
|
||||
OpaqueRedirectFilteredResponse(GC::Ref<Response>, NonnullRefPtr<HTTP::HeaderList>);
|
||||
|
||||
ByteString const m_method;
|
||||
GC::Ref<HeaderList> m_header_list;
|
||||
NonnullRefPtr<HTTP::HeaderList> m_header_list;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Headers.h>
|
||||
#include <LibHTTP/HeaderList.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/MIME.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Requests.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Responses.h>
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
namespace Web::Fetch::Infrastructure {
|
||||
|
||||
// https://fetch.spec.whatwg.org/#determine-nosniff
|
||||
bool determine_nosniff(HeaderList const& list)
|
||||
bool determine_nosniff(HTTP::HeaderList const& list)
|
||||
{
|
||||
// 1. Let values be the result of getting, decoding, and splitting `X-Content-Type-Options` from list.
|
||||
auto values = list.get_decode_and_split("X-Content-Type-Options"sv.bytes());
|
||||
|
|
|
|||
|
|
@ -7,13 +7,14 @@
|
|||
#pragma once
|
||||
|
||||
#include <AK/Forward.h>
|
||||
#include <LibHTTP/Forward.h>
|
||||
#include <LibWeb/Export.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/RequestOrResponseBlocking.h>
|
||||
#include <LibWeb/Forward.h>
|
||||
|
||||
namespace Web::Fetch::Infrastructure {
|
||||
|
||||
[[nodiscard]] bool determine_nosniff(HeaderList const&);
|
||||
[[nodiscard]] bool determine_nosniff(HTTP::HeaderList const&);
|
||||
[[nodiscard]] WEB_API RequestOrResponseBlocking should_response_to_request_be_blocked_due_to_nosniff(Response const&, Request const&);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <LibHTTP/Method.h>
|
||||
#include <LibJS/Runtime/Completion.h>
|
||||
#include <LibWeb/Bindings/Intrinsics.h>
|
||||
#include <LibWeb/Bindings/RequestPrototype.h>
|
||||
|
|
@ -12,9 +13,7 @@
|
|||
#include <LibWeb/Fetch/Enums.h>
|
||||
#include <LibWeb/Fetch/Headers.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Bodies.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Headers.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/MIME.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Methods.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Requests.h>
|
||||
#include <LibWeb/Fetch/Request.h>
|
||||
#include <LibWeb/HTML/Scripting/Environments.h>
|
||||
|
|
@ -188,7 +187,7 @@ WebIDL::ExceptionOr<GC::Ref<Request>> Request::construct_impl(JS::Realm& realm,
|
|||
|
||||
// header list
|
||||
// A copy of request’s header list.
|
||||
auto header_list_copy = Infrastructure::HeaderList::create(vm);
|
||||
auto header_list_copy = HTTP::HeaderList::create();
|
||||
for (auto& header : *input_request->header_list())
|
||||
header_list_copy->append(header);
|
||||
request->set_header_list(header_list_copy);
|
||||
|
|
@ -370,13 +369,13 @@ WebIDL::ExceptionOr<GC::Ref<Request>> Request::construct_impl(JS::Realm& realm,
|
|||
auto method = *init.method;
|
||||
|
||||
// 2. If method is not a method or method is a forbidden method, then throw a TypeError.
|
||||
if (!Infrastructure::is_method(method))
|
||||
if (!HTTP::is_method(method))
|
||||
return WebIDL::SimpleException { WebIDL::SimpleExceptionType::TypeError, "Method has invalid value"sv };
|
||||
if (Infrastructure::is_forbidden_method(method))
|
||||
if (HTTP::is_forbidden_method(method))
|
||||
return WebIDL::SimpleException { WebIDL::SimpleExceptionType::TypeError, "Method must not be one of CONNECT, TRACE, or TRACK"sv };
|
||||
|
||||
// 3. Normalize method.
|
||||
auto normalized_method = Infrastructure::normalize_method(method);
|
||||
auto normalized_method = HTTP::normalize_method(method);
|
||||
|
||||
// 4. Set request’s method to method.
|
||||
request->set_method(move(normalized_method));
|
||||
|
|
@ -410,7 +409,7 @@ WebIDL::ExceptionOr<GC::Ref<Request>> Request::construct_impl(JS::Realm& realm,
|
|||
// 32. If this’s request’s mode is "no-cors", then:
|
||||
if (request_object->request()->mode() == Infrastructure::Request::Mode::NoCORS) {
|
||||
// 1. If this’s request’s method is not a CORS-safelisted method, then throw a TypeError.
|
||||
if (!Infrastructure::is_cors_safelisted_method(request_object->request()->method()))
|
||||
if (!HTTP::is_cors_safelisted_method(request_object->request()->method()))
|
||||
return WebIDL::SimpleException { WebIDL::SimpleExceptionType::TypeError, "Method must be one of GET, HEAD, or POST"sv };
|
||||
|
||||
// 2. Set this’s headers’s guard to "request-no-cors".
|
||||
|
|
@ -420,24 +419,28 @@ WebIDL::ExceptionOr<GC::Ref<Request>> Request::construct_impl(JS::Realm& realm,
|
|||
// 33. If init is not empty, then:
|
||||
if (!init.is_empty()) {
|
||||
// 1. Let headers be a copy of this’s headers and its associated header list.
|
||||
auto headers = Variant<HeadersInit, GC::Ref<Infrastructure::HeaderList>> { request_object->headers()->header_list() };
|
||||
|
||||
// 2. If init["headers"] exists, then set headers to init["headers"].
|
||||
if (init.headers.has_value())
|
||||
headers = *init.headers;
|
||||
auto headers = [&]() -> Variant<HeadersInit, NonnullRefPtr<HTTP::HeaderList>> {
|
||||
if (init.headers.has_value())
|
||||
return init.headers.value();
|
||||
return HTTP::HeaderList::create(request_object->headers()->header_list()->headers());
|
||||
}();
|
||||
|
||||
// 3. Empty this’s headers’s header list.
|
||||
request_object->headers()->header_list()->clear();
|
||||
|
||||
// 4. If headers is a Headers object, then for each header of its header list, append header to this’s headers.
|
||||
if (auto* header_list = headers.get_pointer<GC::Ref<Infrastructure::HeaderList>>()) {
|
||||
for (auto& header : *header_list->ptr())
|
||||
TRY(request_object->headers()->append(Infrastructure::Header::isomorphic_encode(header.name, header.value)));
|
||||
}
|
||||
// 5. Otherwise, fill this’s headers with headers.
|
||||
else {
|
||||
TRY(request_object->headers()->fill(headers.get<HeadersInit>()));
|
||||
}
|
||||
TRY(headers.visit(
|
||||
// 4. If headers is a Headers object, then for each header of its header list, append header to this’s headers.
|
||||
[&](NonnullRefPtr<HTTP::HeaderList> const& headers) -> WebIDL::ExceptionOr<void> {
|
||||
for (auto const& header : *headers)
|
||||
TRY(request_object->headers()->append(HTTP::Header::isomorphic_encode(header.name, header.value)));
|
||||
return {};
|
||||
},
|
||||
// 5. Otherwise, fill this’s headers with headers.
|
||||
[&](HeadersInit const& headers) -> WebIDL::ExceptionOr<void> {
|
||||
TRY(request_object->headers()->fill(headers));
|
||||
return {};
|
||||
}));
|
||||
}
|
||||
|
||||
// 34. Let inputBody be input’s request’s body if input is a Request object; otherwise null.
|
||||
|
|
@ -465,7 +468,7 @@ WebIDL::ExceptionOr<GC::Ref<Request>> Request::construct_impl(JS::Realm& realm,
|
|||
|
||||
// 4. If type is non-null and this’s headers’s header list does not contain `Content-Type`, then append (`Content-Type`, type) to this’s headers.
|
||||
if (type.has_value() && !request_object->headers()->header_list()->contains("Content-Type"sv))
|
||||
TRY(request_object->headers()->append(Infrastructure::Header::isomorphic_encode("Content-Type"sv, *type)));
|
||||
TRY(request_object->headers()->append(HTTP::Header::isomorphic_encode("Content-Type"sv, *type)));
|
||||
}
|
||||
|
||||
// 38. Let inputOrInitBody be initBody if it is non-null; otherwise inputBody.
|
||||
|
|
|
|||
|
|
@ -200,7 +200,7 @@ WebIDL::ExceptionOr<GC::Ref<Response>> Response::redirect(JS::VM& vm, String con
|
|||
auto value = parsed_url->serialize();
|
||||
|
||||
// 7. Append (`Location`, value) to responseObject’s response’s header list.
|
||||
auto header = Infrastructure::Header::isomorphic_encode("Location"sv, value);
|
||||
auto header = HTTP::Header::isomorphic_encode("Location"sv, value);
|
||||
response_object->response()->header_list()->append(move(header));
|
||||
|
||||
// 8. Return responseObject.
|
||||
|
|
|
|||
|
|
@ -542,14 +542,12 @@ class FetchController;
|
|||
class FetchParams;
|
||||
class FetchRecord;
|
||||
class FetchTimingInfo;
|
||||
class HeaderList;
|
||||
class IncrementalReadLoopReadRequest;
|
||||
class Request;
|
||||
class Response;
|
||||
|
||||
struct BodyWithType;
|
||||
struct ConnectionTimingInfo;
|
||||
struct Header;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@
|
|||
#include <LibWeb/Fetch/Fetching/Fetching.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/FetchAlgorithms.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/FetchController.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Headers.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/MIME.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Requests.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Responses.h>
|
||||
|
|
@ -319,7 +318,7 @@ void EventSource::reestablish_the_connection()
|
|||
if (!m_last_event_id.is_empty()) {
|
||||
// 1. Let lastEventIDValue be the EventSource object's last event ID string, encoded as UTF-8.
|
||||
// 2. Set (`Last-Event-ID`, lastEventIDValue) in request's header list.
|
||||
auto header = Fetch::Infrastructure::Header::isomorphic_encode("Last-Event-ID"sv, m_last_event_id);
|
||||
auto header = HTTP::Header::isomorphic_encode("Last-Event-ID"sv, m_last_event_id);
|
||||
request->header_list()->set(move(header));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1154,7 +1154,7 @@ static void create_navigation_params_by_fetching(GC::Ptr<SessionHistoryEntry> en
|
|||
request_content_type = request_content_type_buffer.string_view();
|
||||
}
|
||||
|
||||
auto header = Fetch::Infrastructure::Header::isomorphic_encode("Content-Type"sv, request_content_type);
|
||||
auto header = HTTP::Header::isomorphic_encode("Content-Type"sv, request_content_type);
|
||||
request->header_list()->append(move(header));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ WebIDL::ExceptionOr<bool> NavigatorBeaconPartial::send_beacon(String const& url,
|
|||
return WebIDL::SimpleException { WebIDL::SimpleExceptionType::TypeError, MUST(String::formatted("Beacon URL {} must be either http:// or https://.", url)) };
|
||||
|
||||
// 4. Let headerList be an empty list.
|
||||
auto header_list = Fetch::Infrastructure::HeaderList::create(vm);
|
||||
auto header_list = HTTP::HeaderList::create();
|
||||
|
||||
// 5. Let corsMode be "no-cors".
|
||||
auto cors_mode = Fetch::Infrastructure::Request::Mode::NoCORS;
|
||||
|
|
@ -62,7 +62,7 @@ WebIDL::ExceptionOr<bool> NavigatorBeaconPartial::send_beacon(String const& url,
|
|||
cors_mode = Fetch::Infrastructure::Request::Mode::CORS;
|
||||
|
||||
// If contentType value is a CORS-safelisted request-header value for the Content-Type header, set corsMode to "no-cors".
|
||||
auto content_type_header = Fetch::Infrastructure::Header::isomorphic_encode("Content-Type"sv, content_type.value());
|
||||
auto content_type_header = HTTP::Header::isomorphic_encode("Content-Type"sv, content_type.value());
|
||||
if (Fetch::Infrastructure::is_cors_safelisted_request_header(content_type_header))
|
||||
cors_mode = Fetch::Infrastructure::Request::Mode::NoCORS;
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@
|
|||
#include <LibWeb/DOMURL/DOMURL.h>
|
||||
#include <LibWeb/Fetch/Fetching/Fetching.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/FetchAlgorithms.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Headers.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/MIME.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Requests.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Responses.h>
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@
|
|||
#pragma once
|
||||
|
||||
#include <AK/ByteBuffer.h>
|
||||
#include <AK/HashMap.h>
|
||||
#include <AK/Time.h>
|
||||
#include <LibCore/ElapsedTimer.h>
|
||||
#include <LibHTTP/HeaderList.h>
|
||||
#include <LibURL/URL.h>
|
||||
#include <LibWeb/Export.h>
|
||||
#include <LibWeb/Forward.h>
|
||||
|
|
@ -19,7 +19,10 @@ namespace Web {
|
|||
|
||||
class WEB_API LoadRequest {
|
||||
public:
|
||||
LoadRequest() = default;
|
||||
explicit LoadRequest(NonnullRefPtr<HTTP::HeaderList> headers)
|
||||
: m_headers(move(headers))
|
||||
{
|
||||
}
|
||||
|
||||
Optional<URL::URL> const& url() const { return m_url; }
|
||||
void set_url(Optional<URL::URL> url) { m_url = move(url); }
|
||||
|
|
@ -39,13 +42,12 @@ public:
|
|||
GC::Ptr<Page> page() const { return m_page.ptr(); }
|
||||
void set_page(Page& page) { m_page = page; }
|
||||
|
||||
void set_header(ByteString const& name, ByteString const& value) { m_headers.set(name, value); }
|
||||
HashMap<ByteString, ByteString, CaseInsensitiveStringTraits> const& headers() const { return m_headers; }
|
||||
HTTP::HeaderList const& headers() const { return m_headers; }
|
||||
|
||||
private:
|
||||
Optional<URL::URL> m_url;
|
||||
ByteString m_method { "GET" };
|
||||
HashMap<ByteString, ByteString, CaseInsensitiveStringTraits> m_headers;
|
||||
NonnullRefPtr<HTTP::HeaderList> m_headers;
|
||||
ByteBuffer m_body;
|
||||
Core::ElapsedTimer m_load_timer;
|
||||
GC::Root<Page> m_page;
|
||||
|
|
|
|||
|
|
@ -109,19 +109,20 @@ static void store_response_cookies(Page& page, URL::URL const& url, ByteString c
|
|||
page.client().page_did_set_cookie(url, cookie.value(), Cookie::Source::Http); // FIXME: Determine cookie source correctly
|
||||
}
|
||||
|
||||
static HTTP::HeaderMap response_headers_for_file(StringView path, Optional<time_t> const& modified_time)
|
||||
static NonnullRefPtr<HTTP::HeaderList> response_headers_for_file(StringView path, Optional<time_t> const& modified_time)
|
||||
{
|
||||
// For file:// and resource:// URLs, we have to guess the MIME type, since there's no HTTP header to tell us what
|
||||
// it is. We insert a fake Content-Type header here, so that clients can use it to learn the MIME type.
|
||||
auto mime_type = Core::guess_mime_type_based_on_filename(path);
|
||||
|
||||
HTTP::HeaderMap response_headers;
|
||||
response_headers.set("Access-Control-Allow-Origin"sv, "null"sv);
|
||||
response_headers.set("Content-Type"sv, mime_type);
|
||||
auto response_headers = HTTP::HeaderList::create({
|
||||
{ "Access-Control-Allow-Origin"sv, "null"sv },
|
||||
{ "Content-Type"sv, mime_type },
|
||||
});
|
||||
|
||||
if (modified_time.has_value()) {
|
||||
auto const datetime = AK::UnixDateTime::from_seconds_since_epoch(modified_time.value());
|
||||
response_headers.set("Last-Modified"sv, datetime.to_byte_string("%a, %d %b %Y %H:%M:%S GMT"sv, AK::UnixDateTime::LocalTime::No));
|
||||
response_headers->set({ "Last-Modified"sv, datetime.to_byte_string("%a, %d %b %Y %H:%M:%S GMT"sv, AK::UnixDateTime::LocalTime::No) });
|
||||
}
|
||||
|
||||
return response_headers;
|
||||
|
|
@ -217,9 +218,10 @@ void ResourceLoader::handle_file_load_request(LoadRequest& request, FileHandler
|
|||
return;
|
||||
}
|
||||
|
||||
FileLoadResult load_result;
|
||||
load_result.data = maybe_response.value().bytes();
|
||||
load_result.response_headers.set("Content-Type"sv, "text/html"sv);
|
||||
FileLoadResult load_result {
|
||||
.data = maybe_response.value().bytes(),
|
||||
.response_headers = HTTP::HeaderList::create({ { "Content-Type"sv, "text/html"sv } }),
|
||||
};
|
||||
on_file(load_result);
|
||||
return;
|
||||
}
|
||||
|
|
@ -243,9 +245,10 @@ void ResourceLoader::handle_file_load_request(LoadRequest& request, FileHandler
|
|||
return;
|
||||
}
|
||||
|
||||
FileLoadResult load_result;
|
||||
load_result.data = maybe_data.value().bytes();
|
||||
load_result.response_headers = response_headers_for_file(request.url()->file_path(), st_or_error.value().st_mtime);
|
||||
FileLoadResult load_result {
|
||||
.data = maybe_data.value().bytes(),
|
||||
.response_headers = response_headers_for_file(request.url()->file_path(), st_or_error.value().st_mtime),
|
||||
};
|
||||
on_file(load_result);
|
||||
});
|
||||
|
||||
|
|
@ -263,8 +266,9 @@ void ResourceLoader::handle_about_load_request(LoadRequest const& request, Callb
|
|||
|
||||
dbgln_if(SPAM_DEBUG, "Loading about: URL {}", url);
|
||||
|
||||
HTTP::HeaderMap response_headers;
|
||||
response_headers.set("Content-Type"sv, "text/html; charset=UTF-8"sv);
|
||||
auto response_headers = HTTP::HeaderList::create({
|
||||
{ "Content-Type"sv, "text/html; charset=UTF-8"sv },
|
||||
});
|
||||
|
||||
// FIXME: Implement timing info for about requests.
|
||||
Requests::RequestTimingInfo timing_info {};
|
||||
|
|
@ -324,23 +328,22 @@ void ResourceLoader::handle_resource_load_request(LoadRequest const& request, Re
|
|||
return;
|
||||
}
|
||||
|
||||
FileLoadResult load_result;
|
||||
load_result.data = maybe_response.value().bytes();
|
||||
load_result.response_headers.set("Content-Type"sv, "text/html"sv);
|
||||
FileLoadResult load_result {
|
||||
.data = maybe_response.value().bytes(),
|
||||
.response_headers = HTTP::HeaderList::create({ { "Content-Type"sv, "text/html"sv } }),
|
||||
};
|
||||
on_resource(load_result);
|
||||
return;
|
||||
}
|
||||
|
||||
auto const& buffer = resource_value->data();
|
||||
auto response_headers = response_headers_for_file(url.file_path(), resource_value->modified_time());
|
||||
|
||||
// FIXME: Implement timing info for resource requests.
|
||||
Requests::RequestTimingInfo timing_info {};
|
||||
|
||||
FileLoadResult load_result;
|
||||
load_result.data = buffer;
|
||||
load_result.response_headers = move(response_headers);
|
||||
load_result.timing_info = timing_info;
|
||||
FileLoadResult load_result {
|
||||
.data = resource_value->data(),
|
||||
.response_headers = response_headers_for_file(url.file_path(), resource_value->modified_time()),
|
||||
.timing_info = timing_info,
|
||||
};
|
||||
on_resource(load_result);
|
||||
}
|
||||
|
||||
|
|
@ -357,7 +360,7 @@ void ResourceLoader::load(LoadRequest& request, GC::Root<OnHeadersReceived> on_h
|
|||
}
|
||||
|
||||
if (url.scheme() == "about"sv) {
|
||||
handle_about_load_request(request, [on_headers_received, on_data_received, on_complete, request](ReadonlyBytes data, Requests::RequestTimingInfo const& timing_info, HTTP::HeaderMap const& response_headers) {
|
||||
handle_about_load_request(request, [on_headers_received, on_data_received, on_complete, request](ReadonlyBytes data, Requests::RequestTimingInfo const& timing_info, HTTP::HeaderList const& response_headers) {
|
||||
log_success(request);
|
||||
on_headers_received->function()(response_headers, {}, {});
|
||||
on_data_received->function()(data);
|
||||
|
|
@ -439,22 +442,13 @@ RefPtr<Requests::Request> ResourceLoader::start_network_request(LoadRequest cons
|
|||
{
|
||||
auto proxy = ProxyMappings::the().proxy_for_url(request.url().value());
|
||||
|
||||
HTTP::HeaderMap headers;
|
||||
|
||||
for (auto const& it : request.headers()) {
|
||||
headers.set(it.key, it.value);
|
||||
}
|
||||
|
||||
if (!headers.contains("User-Agent"))
|
||||
headers.set("User-Agent", m_user_agent.to_byte_string());
|
||||
|
||||
// FIXME: We could put this request in a queue until the client connection is re-established.
|
||||
if (!m_request_client) {
|
||||
log_failure(request, "RequestServer is currently unavailable"sv);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
auto protocol_request = m_request_client->start_request(request.method(), request.url().value(), headers, request.body(), proxy);
|
||||
auto protocol_request = m_request_client->start_request(request.method(), request.url().value(), request.headers(), request.body(), proxy);
|
||||
if (!protocol_request) {
|
||||
log_failure(request, "Failed to initiate load"sv);
|
||||
return nullptr;
|
||||
|
|
@ -472,7 +466,7 @@ RefPtr<Requests::Request> ResourceLoader::start_network_request(LoadRequest cons
|
|||
return protocol_request;
|
||||
}
|
||||
|
||||
void ResourceLoader::handle_network_response_headers(LoadRequest const& request, HTTP::HeaderMap const& response_headers)
|
||||
void ResourceLoader::handle_network_response_headers(LoadRequest const& request, HTTP::HeaderList const& response_headers)
|
||||
{
|
||||
if (!request.page())
|
||||
return;
|
||||
|
|
@ -481,7 +475,7 @@ void ResourceLoader::handle_network_response_headers(LoadRequest const& request,
|
|||
// From https://fetch.spec.whatwg.org/#concept-http-network-fetch:
|
||||
// 15. If includeCredentials is true, then the user agent should parse and store response
|
||||
// `Set-Cookie` headers given request and response.
|
||||
for (auto const& [header, value] : response_headers.headers()) {
|
||||
for (auto const& [header, value] : response_headers) {
|
||||
if (header.equals_ignoring_ascii_case("Set-Cookie"sv)) {
|
||||
store_response_cookies(*request.page(), request.url().value(), value);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
#include <AK/HashTable.h>
|
||||
#include <LibCore/EventReceiver.h>
|
||||
#include <LibGC/Function.h>
|
||||
#include <LibHTTP/HeaderMap.h>
|
||||
#include <LibHTTP/HeaderList.h>
|
||||
#include <LibRequests/Forward.h>
|
||||
#include <LibRequests/RequestTimingInfo.h>
|
||||
#include <LibURL/URL.h>
|
||||
|
|
@ -30,7 +30,7 @@ public:
|
|||
|
||||
void set_client(NonnullRefPtr<Requests::RequestClient>);
|
||||
|
||||
using OnHeadersReceived = GC::Function<void(HTTP::HeaderMap const& response_headers, Optional<u32> status_code, Optional<String> const& reason_phrase)>;
|
||||
using OnHeadersReceived = GC::Function<void(HTTP::HeaderList const& response_headers, Optional<u32> status_code, Optional<String> const& reason_phrase)>;
|
||||
using OnDataReceived = GC::Function<void(ReadonlyBytes data)>;
|
||||
using OnComplete = GC::Function<void(bool success, Requests::RequestTimingInfo const& timing_info, Optional<StringView> error_message)>;
|
||||
|
||||
|
|
@ -69,8 +69,8 @@ private:
|
|||
|
||||
struct FileLoadResult {
|
||||
ReadonlyBytes data;
|
||||
HTTP::HeaderMap response_headers;
|
||||
Requests::RequestTimingInfo timing_info;
|
||||
NonnullRefPtr<HTTP::HeaderList> response_headers;
|
||||
Requests::RequestTimingInfo timing_info {};
|
||||
};
|
||||
template<typename FileHandler, typename ErrorHandler>
|
||||
void handle_file_load_request(LoadRequest& request, FileHandler on_file, ErrorHandler on_error);
|
||||
|
|
@ -80,7 +80,7 @@ private:
|
|||
void handle_resource_load_request(LoadRequest const& request, ResourceHandler on_resource, ErrorHandler on_error);
|
||||
|
||||
RefPtr<Requests::Request> start_network_request(LoadRequest const&);
|
||||
void handle_network_response_headers(LoadRequest const&, HTTP::HeaderMap const&);
|
||||
void handle_network_response_headers(LoadRequest const&, HTTP::HeaderList const&);
|
||||
void finish_network_request(NonnullRefPtr<Requests::Request>);
|
||||
|
||||
int m_pending_loads { 0 };
|
||||
|
|
|
|||
|
|
@ -12,6 +12,8 @@
|
|||
#include <AK/String.h>
|
||||
#include <AK/StringBuilder.h>
|
||||
#include <AK/Utf8View.h>
|
||||
#include <LibHTTP/HTTP.h>
|
||||
#include <LibHTTP/Header.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP.h>
|
||||
#include <LibWeb/Infra/Strings.h>
|
||||
#include <LibWeb/MimeSniff/MimeType.h>
|
||||
|
|
@ -88,7 +90,7 @@ Optional<MimeType> MimeType::parse(StringView string)
|
|||
return OptionalNone {};
|
||||
|
||||
// 1. Remove any leading and trailing HTTP whitespace from input.
|
||||
auto trimmed_string = string.trim(Fetch::Infrastructure::HTTP_WHITESPACE, TrimMode::Both);
|
||||
auto trimmed_string = string.trim(HTTP::HTTP_WHITESPACE, TrimMode::Both);
|
||||
|
||||
// 2. Let position be a position variable for input, initially pointing at the start of input.
|
||||
GenericLexer lexer(trimmed_string);
|
||||
|
|
@ -111,7 +113,7 @@ Optional<MimeType> MimeType::parse(StringView string)
|
|||
auto subtype = lexer.consume_until(';');
|
||||
|
||||
// 8. Remove any trailing HTTP whitespace from subtype.
|
||||
subtype = subtype.trim(Fetch::Infrastructure::HTTP_WHITESPACE, TrimMode::Right);
|
||||
subtype = subtype.trim(HTTP::HTTP_WHITESPACE, TrimMode::Right);
|
||||
|
||||
// 9. If subtype is the empty string or does not solely contain HTTP token code points, then return failure.
|
||||
if (subtype.is_empty() || !contains_only_http_token_code_points(subtype))
|
||||
|
|
@ -126,7 +128,7 @@ Optional<MimeType> MimeType::parse(StringView string)
|
|||
lexer.ignore(1);
|
||||
|
||||
// 2. Collect a sequence of code points that are HTTP whitespace from input given position.
|
||||
lexer.ignore_while(is_any_of(Fetch::Infrastructure::HTTP_WHITESPACE));
|
||||
lexer.ignore_while(is_any_of(HTTP::HTTP_WHITESPACE));
|
||||
|
||||
// 3. Let parameterName be the result of collecting a sequence of code points that are not U+003B (;) or U+003D (=) from input, given position.
|
||||
auto parameter_name_view = lexer.consume_until([](char ch) {
|
||||
|
|
@ -157,7 +159,7 @@ Optional<MimeType> MimeType::parse(StringView string)
|
|||
// 8. If the code point at position within input is U+0022 ("), then:
|
||||
if (lexer.peek() == '"') {
|
||||
// 1. Set parameterValue to the result of collecting an HTTP quoted string from input, given position and the extract-value flag.
|
||||
parameter_value = Fetch::Infrastructure::collect_an_http_quoted_string(lexer, Fetch::Infrastructure::HttpQuotedStringExtractValue::Yes);
|
||||
parameter_value = HTTP::collect_an_http_quoted_string(lexer, HTTP::HttpQuotedStringExtractValue::Yes);
|
||||
|
||||
// 2. Collect a sequence of code points that are not U+003B (;) from input, given position.
|
||||
lexer.ignore_until(';');
|
||||
|
|
@ -169,7 +171,7 @@ Optional<MimeType> MimeType::parse(StringView string)
|
|||
parameter_value = String::from_utf8_without_validation(lexer.consume_until(';').bytes());
|
||||
|
||||
// 2. Remove any trailing HTTP whitespace from parameterValue.
|
||||
parameter_value = MUST(parameter_value.trim(Fetch::Infrastructure::HTTP_WHITESPACE, TrimMode::Right));
|
||||
parameter_value = MUST(parameter_value.trim(HTTP::HTTP_WHITESPACE, TrimMode::Right));
|
||||
|
||||
// 3. If parameterValue is the empty string, then continue.
|
||||
if (parameter_value.is_empty())
|
||||
|
|
|
|||
|
|
@ -217,7 +217,7 @@ static void update(JS::VM& vm, GC::Ref<Job> job)
|
|||
|
||||
// 1. Append `Service-Worker`/`script` to request’s header list.
|
||||
// Note: See https://w3c.github.io/ServiceWorker/#service-worker
|
||||
request->header_list()->append(Fetch::Infrastructure::Header::isomorphic_encode("Service-Worker"sv, "script"sv));
|
||||
request->header_list()->append(HTTP::Header::isomorphic_encode("Service-Worker"sv, "script"sv));
|
||||
|
||||
// 2. Set request’s cache mode to "no-cache" if any of the following are true:
|
||||
// - registration’s update via cache mode is not "all".
|
||||
|
|
@ -273,7 +273,7 @@ static void update(JS::VM& vm, GC::Ref<Job> job)
|
|||
// FIXME: CSP not implemented yet
|
||||
|
||||
// 10. If serviceWorkerAllowed is failure, then:
|
||||
if (service_worker_allowed.has<Fetch::Infrastructure::HeaderList::ExtractHeaderParseFailure>()) {
|
||||
if (service_worker_allowed.has<HTTP::HeaderList::ExtractHeaderParseFailure>()) {
|
||||
// FIXME: Should we reject the job promise with a security error here?
|
||||
|
||||
// 1. Asynchronously complete these steps with a network error.
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ Client::Client(NonnullOwnPtr<Core::BufferedTCPSocket> socket)
|
|||
{
|
||||
m_socket->on_ready_to_read = [this] {
|
||||
if (auto result = on_ready_to_read(); result.is_error())
|
||||
handle_error({}, result.release_error());
|
||||
handle_error(HTTP::HttpRequest { HTTP::HeaderList::create() }, result.release_error());
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -249,7 +249,7 @@ ErrorOr<JsonValue, Client::WrappedError> Client::read_body_as_json(HTTP::HttpReq
|
|||
// FIXME: Check the Content-Type is actually application/json.
|
||||
size_t content_length = 0;
|
||||
|
||||
for (auto const& header : request.headers().headers()) {
|
||||
for (auto const& header : request.headers()) {
|
||||
if (header.name.equals_ignoring_ascii_case("Content-Length"sv)) {
|
||||
content_length = header.value.to_number<size_t>(TrimWhitespace::Yes).value_or(0);
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
#include <LibWeb/DOM/EventDispatcher.h>
|
||||
#include <LibWeb/DOM/IDLEventListener.h>
|
||||
#include <LibWeb/DOMURL/DOMURL.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP.h>
|
||||
#include <LibWeb/FileAPI/Blob.h>
|
||||
#include <LibWeb/HTML/CloseEvent.h>
|
||||
#include <LibWeb/HTML/EventHandler.h>
|
||||
|
|
@ -198,7 +199,7 @@ ErrorOr<void> WebSocket::establish_web_socket_connection(URL::URL const& url_rec
|
|||
for (auto const& protocol : protocols)
|
||||
TRY(protocol_byte_strings.try_append(protocol.to_byte_string()));
|
||||
|
||||
HTTP::HeaderMap additional_headers;
|
||||
auto additional_headers = HTTP::HeaderList::create();
|
||||
|
||||
auto cookies = ([&] {
|
||||
auto& page = Bindings::principal_host_defined_page(HTML::principal_realm(realm()));
|
||||
|
|
@ -206,10 +207,10 @@ ErrorOr<void> WebSocket::establish_web_socket_connection(URL::URL const& url_rec
|
|||
})();
|
||||
|
||||
if (!cookies.is_empty()) {
|
||||
additional_headers.set("Cookie", cookies.to_byte_string());
|
||||
additional_headers->append({ "Cookie"sv, cookies.to_byte_string() });
|
||||
}
|
||||
|
||||
additional_headers.set("User-Agent", ResourceLoader::the().user_agent().to_byte_string());
|
||||
additional_headers->append({ "User-Agent"sv, Fetch::Infrastructure::default_user_agent_value() });
|
||||
|
||||
auto request_client = ResourceLoader::the().request_client();
|
||||
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
#include <AK/Debug.h>
|
||||
#include <AK/GenericLexer.h>
|
||||
#include <AK/QuickSort.h>
|
||||
#include <LibHTTP/Method.h>
|
||||
#include <LibJS/Runtime/ArrayBuffer.h>
|
||||
#include <LibJS/Runtime/Completion.h>
|
||||
#include <LibJS/Runtime/FunctionObject.h>
|
||||
|
|
@ -32,7 +33,6 @@
|
|||
#include <LibWeb/Fetch/Infrastructure/FetchController.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/MIME.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Methods.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Requests.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Responses.h>
|
||||
#include <LibWeb/FileAPI/Blob.h>
|
||||
|
|
@ -62,16 +62,16 @@ GC_DEFINE_ALLOCATOR(XMLHttpRequest);
|
|||
WebIDL::ExceptionOr<GC::Ref<XMLHttpRequest>> XMLHttpRequest::construct_impl(JS::Realm& realm)
|
||||
{
|
||||
auto upload_object = realm.create<XMLHttpRequestUpload>(realm);
|
||||
auto author_request_headers = Fetch::Infrastructure::HeaderList::create(realm.vm());
|
||||
auto author_request_headers = HTTP::HeaderList::create();
|
||||
auto response = Fetch::Infrastructure::Response::network_error(realm.vm(), "Not sent yet"_string);
|
||||
auto fetch_controller = Fetch::Infrastructure::FetchController::create(realm.vm());
|
||||
return realm.create<XMLHttpRequest>(realm, *upload_object, *author_request_headers, *response, *fetch_controller);
|
||||
return realm.create<XMLHttpRequest>(realm, *upload_object, move(author_request_headers), *response, *fetch_controller);
|
||||
}
|
||||
|
||||
XMLHttpRequest::XMLHttpRequest(JS::Realm& realm, XMLHttpRequestUpload& upload_object, Fetch::Infrastructure::HeaderList& author_request_headers, Fetch::Infrastructure::Response& response, Fetch::Infrastructure::FetchController& fetch_controller)
|
||||
XMLHttpRequest::XMLHttpRequest(JS::Realm& realm, XMLHttpRequestUpload& upload_object, NonnullRefPtr<HTTP::HeaderList> author_request_headers, Fetch::Infrastructure::Response& response, Fetch::Infrastructure::FetchController& fetch_controller)
|
||||
: XMLHttpRequestEventTarget(realm)
|
||||
, m_upload_object(upload_object)
|
||||
, m_author_request_headers(author_request_headers)
|
||||
, m_author_request_headers(move(author_request_headers))
|
||||
, m_response(response)
|
||||
, m_response_type(Bindings::XMLHttpRequestResponseType::Empty)
|
||||
, m_fetch_controller(fetch_controller)
|
||||
|
|
@ -91,7 +91,6 @@ void XMLHttpRequest::visit_edges(Cell::Visitor& visitor)
|
|||
{
|
||||
Base::visit_edges(visitor);
|
||||
visitor.visit(m_upload_object);
|
||||
visitor.visit(m_author_request_headers);
|
||||
visitor.visit(m_request_body);
|
||||
visitor.visit(m_response);
|
||||
visitor.visit(m_fetch_controller);
|
||||
|
|
@ -424,21 +423,21 @@ WebIDL::ExceptionOr<void> XMLHttpRequest::set_request_header(String const& name,
|
|||
return WebIDL::InvalidStateError::create(realm, "XHR send() flag is already set"_utf16);
|
||||
|
||||
// 3. Normalize value.
|
||||
auto normalized_value = Fetch::Infrastructure::normalize_header_value(value);
|
||||
auto normalized_value = HTTP::normalize_header_value(value);
|
||||
|
||||
// 4. If name is not a header name or value is not a header value, then throw a "SyntaxError" DOMException.
|
||||
if (!Fetch::Infrastructure::is_header_name(name))
|
||||
if (!HTTP::is_header_name(name))
|
||||
return WebIDL::SyntaxError::create(realm, "Header name contains invalid characters."_utf16);
|
||||
if (!Fetch::Infrastructure::is_header_value(normalized_value))
|
||||
if (!HTTP::is_header_value(normalized_value))
|
||||
return WebIDL::SyntaxError::create(realm, "Header value contains invalid characters."_utf16);
|
||||
|
||||
auto header = Fetch::Infrastructure::Header {
|
||||
auto header = HTTP::Header {
|
||||
.name = name.to_byte_string(),
|
||||
.value = move(normalized_value),
|
||||
};
|
||||
|
||||
// 5. If (name, value) is a forbidden request-header, then return.
|
||||
if (Fetch::Infrastructure::is_forbidden_request_header(header))
|
||||
if (HTTP::is_forbidden_request_header(header))
|
||||
return {};
|
||||
|
||||
// 6. Combine (name, value) in this’s author request headers.
|
||||
|
|
@ -464,15 +463,15 @@ WebIDL::ExceptionOr<void> XMLHttpRequest::open(String const& method, String cons
|
|||
}
|
||||
|
||||
// 2. If method is not a method, then throw a "SyntaxError" DOMException.
|
||||
if (!Fetch::Infrastructure::is_method(method))
|
||||
if (!HTTP::is_method(method))
|
||||
return WebIDL::SyntaxError::create(realm(), "An invalid or illegal string was specified."_utf16);
|
||||
|
||||
// 3. If method is a forbidden method, then throw a "SecurityError" DOMException.
|
||||
if (Fetch::Infrastructure::is_forbidden_method(method))
|
||||
if (HTTP::is_forbidden_method(method))
|
||||
return WebIDL::SecurityError::create(realm(), "Forbidden method, must not be 'CONNECT', 'TRACE', or 'TRACK'"_utf16);
|
||||
|
||||
// 4. Normalize method.
|
||||
auto normalized_method = Fetch::Infrastructure::normalize_method(method);
|
||||
auto normalized_method = HTTP::normalize_method(method);
|
||||
|
||||
// 5. Let parsedURL be the result of parsing url with this’s relevant settings object’s API base URL and this’s relevant settings object’s API URL character encoding.
|
||||
auto& relevant_settings_object = HTML::relevant_settings_object(*this);
|
||||
|
|
@ -604,7 +603,7 @@ WebIDL::ExceptionOr<void> XMLHttpRequest::send(Optional<DocumentOrXMLHttpRequest
|
|||
auto new_content_type_serialized = content_type_record->serialized();
|
||||
|
||||
// 3. Set (`Content-Type`, newContentTypeSerialized) in this’s author request headers.
|
||||
auto header = Fetch::Infrastructure::Header::isomorphic_encode("Content-Type"sv, new_content_type_serialized);
|
||||
auto header = HTTP::Header::isomorphic_encode("Content-Type"sv, new_content_type_serialized);
|
||||
m_author_request_headers->set(move(header));
|
||||
}
|
||||
}
|
||||
|
|
@ -629,7 +628,7 @@ WebIDL::ExceptionOr<void> XMLHttpRequest::send(Optional<DocumentOrXMLHttpRequest
|
|||
}
|
||||
// 3. Otherwise, if extractedContentType is not null, set (`Content-Type`, extractedContentType) in this’s author request headers.
|
||||
else if (extracted_content_type.has_value()) {
|
||||
auto header = Fetch::Infrastructure::Header::isomorphic_encode("Content-Type"sv, extracted_content_type.value());
|
||||
auto header = HTTP::Header::isomorphic_encode("Content-Type"sv, extracted_content_type.value());
|
||||
m_author_request_headers->set(move(header));
|
||||
}
|
||||
}
|
||||
|
|
@ -995,7 +994,7 @@ String XMLHttpRequest::get_all_response_headers() const
|
|||
|
||||
// 3. Let headers be the result of sorting initialHeaders in ascending order, with a being less than b if a’s name is legacy-uppercased-byte less than b’s name.
|
||||
// NOTE: Unfortunately, this is needed for compatibility with deployed content.
|
||||
quick_sort(initial_headers, [](Fetch::Infrastructure::Header const& a, Fetch::Infrastructure::Header const& b) {
|
||||
quick_sort(initial_headers, [](HTTP::Header const& a, HTTP::Header const& b) {
|
||||
return is_legacy_uppercased_byte_less_than(a.name, b.name);
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
#include <AK/ByteBuffer.h>
|
||||
#include <AK/RefCounted.h>
|
||||
#include <AK/Weakable.h>
|
||||
#include <LibHTTP/HeaderList.h>
|
||||
#include <LibURL/URL.h>
|
||||
#include <LibWeb/DOM/EventTarget.h>
|
||||
#include <LibWeb/DOMURL/URLSearchParams.h>
|
||||
#include <LibWeb/Fetch/BodyInit.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Bodies.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Headers.h>
|
||||
#include <LibWeb/Fetch/Infrastructure/HTTP/Statuses.h>
|
||||
#include <LibWeb/HTML/Window.h>
|
||||
#include <LibWeb/MimeSniff/MimeType.h>
|
||||
|
|
@ -95,7 +95,7 @@ private:
|
|||
WebIDL::ExceptionOr<void> handle_errors();
|
||||
JS::ThrowCompletionOr<void> request_error_steps(FlyString const& event_name, GC::Ptr<WebIDL::DOMException> exception = nullptr);
|
||||
|
||||
XMLHttpRequest(JS::Realm&, XMLHttpRequestUpload&, Fetch::Infrastructure::HeaderList&, Fetch::Infrastructure::Response&, Fetch::Infrastructure::FetchController&);
|
||||
XMLHttpRequest(JS::Realm&, XMLHttpRequestUpload&, NonnullRefPtr<HTTP::HeaderList>, Fetch::Infrastructure::Response&, Fetch::Infrastructure::FetchController&);
|
||||
|
||||
// https://xhr.spec.whatwg.org/#upload-object
|
||||
// upload object
|
||||
|
|
@ -135,7 +135,7 @@ private:
|
|||
// https://xhr.spec.whatwg.org/#author-request-headers
|
||||
// author request headers
|
||||
// A header list, initially empty.
|
||||
GC::Ref<Fetch::Infrastructure::HeaderList> m_author_request_headers;
|
||||
NonnullRefPtr<HTTP::HeaderList> m_author_request_headers;
|
||||
|
||||
// https://xhr.spec.whatwg.org/#request-body
|
||||
// request body
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue