Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Manually concatenate ACRH headers to not include a space (#36455)

Browse source 
headers library will join values with `, ` (comma space) but
Access-Control-Request-Headers specifies that it does not use the normal
combining algorithm and values should be joined with `,` (comma).

Testing: WPT tests exist
Fixes: temporary fix for #36451 until hyperium/headers#207 is fixed

---------

Signed-off-by: Sebastian C <sebsebmc@gmail.com>
This commit is contained in:
Sebastian C 2025-04-11 12:01:55 -05:00 • committed by GitHub
parent 0c8bb8287a
commit 87c40b4168
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 15 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -4837,6 +4837,7 @@ dependencies = [
"hyper_serde", "hyper_serde",
"imsz", "imsz",
"ipc-channel", "ipc-channel",
"itertools 0.13.0",
"log", "log",
"malloc_size_of_derive", "malloc_size_of_derive",
"mime", "mime",

1
components/net/Cargo.toml
View file

@ -42,6 +42,7 @@ hyper-util = { workspace = true }
hyper_serde = { workspace = true } hyper_serde = { workspace = true }
imsz = { workspace = true } imsz = { workspace = true }
ipc-channel = { workspace = true } ipc-channel = { workspace = true }
itertools = { workspace = true }
log = { workspace = true } log = { workspace = true }
malloc_size_of = { workspace = true } malloc_size_of = { workspace = true }
malloc_size_of_derive = { workspace = true } malloc_size_of_derive = { workspace = true }

22
components/net/http_loader.rs
View file

@ -20,13 +20,13 @@ use futures::{TryFutureExt, TryStreamExt, future};
use headers::authorization::Basic; use headers::authorization::Basic;
use headers::{ use headers::{
AccessControlAllowCredentials, AccessControlAllowHeaders, AccessControlAllowMethods, AccessControlAllowCredentials, AccessControlAllowHeaders, AccessControlAllowMethods,
AccessControlAllowOrigin, AccessControlMaxAge, AccessControlRequestHeaders, AccessControlAllowOrigin, AccessControlMaxAge, AccessControlRequestMethod, Authorization,
AccessControlRequestMethod, Authorization, CacheControl, ContentLength, HeaderMapExt, CacheControl, ContentLength, HeaderMapExt, IfModifiedSince, LastModified, Pragma, Referer,
IfModifiedSince, LastModified, Pragma, Referer, UserAgent, UserAgent,
}; };
use http::header::{ use http::header::{
self, ACCEPT, AUTHORIZATION, CONTENT_ENCODING, CONTENT_LANGUAGE, CONTENT_LOCATION, self, ACCEPT, ACCESS_CONTROL_REQUEST_HEADERS, AUTHORIZATION, CONTENT_ENCODING,
CONTENT_TYPE, HeaderValue, RANGE, CONTENT_LANGUAGE, CONTENT_LOCATION, CONTENT_TYPE, HeaderValue, RANGE,
}; };
use http::{HeaderMap, Method, Request as HyperRequest, StatusCode}; use http::{HeaderMap, Method, Request as HyperRequest, StatusCode};
use http_body_util::combinators::BoxBody; use http_body_util::combinators::BoxBody;
@ -2139,11 +2139,15 @@ async fn cors_preflight_fetch(
// Step 4 // Step 4
let headers = get_cors_unsafe_header_names(&request.headers); let headers = get_cors_unsafe_header_names(&request.headers);
// Step 5 // Step 5 If headers is not empty, then:
if !headers.is_empty() { if !headers.is_empty() {
preflight // 5.1 Let value be the items in headers separated from each other by `,`
.headers // TODO(36451): replace this with typed_insert when headers fixes headers#207
.typed_insert(AccessControlRequestHeaders::from_iter(headers)); preflight.headers.insert(
ACCESS_CONTROL_REQUEST_HEADERS,
HeaderValue::from_bytes(itertools::join(headers.iter(), ",").as_bytes())
.unwrap_or(HeaderValue::from_static("")),
);
} }
// Step 6 // Step 6

14
tests/wpt/meta/fetch/api/cors/cors-preflight.any.js.ini vendored
View file

@ -1,14 +0,0 @@
[cors-preflight.any.html]
[CORS [GET\] [several headers\], server allows]
expected: FAIL
[CORS [PUT\] [several headers\], server allows]
expected: FAIL
[cors-preflight.any.worker.html]
[CORS [GET\] [several headers\], server allows]
expected: FAIL
[CORS [PUT\] [several headers\], server allows]
expected: FAIL

3
tests/wpt/meta/xhr/access-control-preflight-request-header-sorted.htm.ini vendored
View file

@ -1,3 +0,0 @@
[access-control-preflight-request-header-sorted.htm]
[Tests that Access-Control-Request-Headers are sorted.]
expected: FAIL