LibWeb/Fetch: Handle edge cases in 'get, decode, and split'
Some checks are pending
CI / Lagom (false, NO_FUZZ, ubuntu-22.04, Linux, GNU) (push) Waiting to run
CI / Lagom (false, FUZZ, ubuntu-22.04, Linux, Clang) (push) Waiting to run
CI / Lagom (false, NO_FUZZ, macos-14, macOS, Clang) (push) Waiting to run
CI / Lagom (true, NO_FUZZ, ubuntu-22.04, Linux, Clang) (push) Waiting to run
Package the js repl as a binary artifact / build-and-package (macos-14, macOS, macOS-universal2) (push) Waiting to run
Package the js repl as a binary artifact / build-and-package (ubuntu-22.04, Linux, Linux-x86_64) (push) Waiting to run
Run test262 and test-wasm / run_and_update_results (push) Waiting to run
Lint Code / lint (push) Waiting to run
Push notes / build (push) Waiting to run

See:
- https://github.com/whatwg/fetch/pull/1769
- https://github.com/whatwg/fetch/commit/3153e5e
This commit is contained in:
Jamie Mansfield 2024-09-25 21:19:02 +01:00 committed by Andreas Kling
parent dcf55dd492
commit 84351dfa51
Notes: github-actions[bot] 2024-09-26 06:10:23 +00:00

View file

@ -133,22 +133,20 @@ Optional<Vector<String>> get_decode_and_split_header_value(ReadonlyBytes value)
// 2. Let position be a position variable for input, initially pointing at the start of input. // 2. Let position be a position variable for input, initially pointing at the start of input.
auto lexer = GenericLexer { input }; auto lexer = GenericLexer { input };
// 3. Let values be a list of strings, initially empty. // 3. Let values be a list of strings, initially « ».
Vector<String> values; Vector<String> values;
// 4. Let temporaryValue be the empty string. // 4. Let temporaryValue be the empty string.
StringBuilder temporary_value_builder; StringBuilder temporary_value_builder;
// 5. While position is not past the end of input: // 5. While true:
while (!lexer.is_eof()) { 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. // 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. // NOTE: The result might be the empty string.
temporary_value_builder.append(lexer.consume_until(is_any_of("\","sv))); temporary_value_builder.append(lexer.consume_until(is_any_of("\","sv)));
// 2. If position is not past the end of input, then: // 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()) { if (!lexer.is_eof() && lexer.peek() == '"') {
// 1. If the code point at position within input is U+0022 ("), then:
if (lexer.peek() == '"') {
// 1. Append the result of collecting an HTTP quoted string from input, given position, to temporaryValue. // 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)); temporary_value_builder.append(collect_an_http_quoted_string(lexer));
@ -156,15 +154,6 @@ Optional<Vector<String>> get_decode_and_split_header_value(ReadonlyBytes value)
if (!lexer.is_eof()) if (!lexer.is_eof())
continue; continue;
} }
// 2. Otherwise:
else {
// 1. Assert: the code point at position within input is U+002C (,).
VERIFY(lexer.peek() == ',');
// 2. Advance position by 1.
lexer.ignore(1);
}
}
// 3. Remove all HTTP tab or space from the start and end of temporaryValue. // 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))); auto temporary_value = MUST(String::from_utf8(temporary_value_builder.string_view().trim(HTTP_TAB_OR_SPACE, TrimMode::Both)));
@ -174,10 +163,17 @@ Optional<Vector<String>> get_decode_and_split_header_value(ReadonlyBytes value)
// 5. Set temporaryValue to the empty string. // 5. Set temporaryValue to the empty string.
temporary_value_builder.clear(); temporary_value_builder.clear();
}
// 8. Return values. // 6. If position is past the end of input, then return values.
if (lexer.is_eof())
return values; 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/#concept-header-list-append // https://fetch.spec.whatwg.org/#concept-header-list-append