aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <infra@servo.org>2023-05-18 14:16:45 +0200
committerGitHub <noreply@github.com>2023-05-18 14:16:45 +0200
commitafcd6c4c5fa8438d98cf84667b2eebf32c84806d (patch)
treebfe07562ee5d0c991c6cbf9ffe3984dbec13850d
parent918557ad6d04cd2bd73516e9ccb9019bdaa53500 (diff)
parent095f22c314130e019d3b8eb7e3f268a0cfce51b8 (diff)
downloadservo-afcd6c4c5fa8438d98cf84667b2eebf32c84806d.tar.gz
servo-afcd6c4c5fa8438d98cf84667b2eebf32c84806d.zip
Auto merge of #29637 - AnthonyJ3:Use-same-origin-as-default-credential-mode-for-RequestInit-fix, r=mukilan
Use same-origin as default credential mode for RequestInit fix <!-- Please describe your changes on the following line: --> - Updated the default credential mode from omit to same-origin as per: https://github.com/whatwg/fetch/pull/1153 - Deleted instances of fallback credentials --- - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #29633 (GitHub issue number if applicable) - [X] There are tests for these changes
-rw-r--r--components/net_traits/request.rs4
-rw-r--r--components/script/dom/request.rs18
2 files changed, 5 insertions, 17 deletions
diff --git a/components/net_traits/request.rs b/components/net_traits/request.rs
index c1852e48843..1fb33e37bbd 100644
--- a/components/net_traits/request.rs
+++ b/components/net_traits/request.rs
@@ -270,7 +270,7 @@ impl RequestBuilder {
mode: RequestMode::NoCors,
cache_mode: CacheMode::Default,
use_cors_preflight: false,
- credentials_mode: CredentialsMode::Omit,
+ credentials_mode: CredentialsMode::CredentialsSameOrigin,
use_url_credentials: false,
origin: ImmutableOrigin::new_opaque(),
referrer: referrer,
@@ -517,7 +517,7 @@ impl Request {
synchronous: false,
mode: RequestMode::NoCors,
use_cors_preflight: false,
- credentials_mode: CredentialsMode::Omit,
+ credentials_mode: CredentialsMode::CredentialsSameOrigin,
use_url_credentials: false,
cache_mode: CacheMode::Default,
redirect_mode: RedirectMode::Follow,
diff --git a/components/script/dom/request.rs b/components/script/dom/request.rs
index 9bb857736a4..7bd89875b6f 100644
--- a/components/script/dom/request.rs
+++ b/components/script/dom/request.rs
@@ -79,11 +79,6 @@ impl Request {
// Step 2
let mut fallback_mode: Option<NetTraitsRequestMode> = None;
- // FIXME(cybai): As the spec changed in https://github.com/whatwg/fetch/pull/1153,
- // we will need to change the default value of credentials for
- // NetTraitsRequest and then remove fallback here.
- let mut fallback_credentials: Option<NetTraitsRequestCredentials> = None;
-
// Step 3
let base_url = global.api_base_url();
@@ -107,8 +102,6 @@ impl Request {
temporary_request = net_request_from_global(global, url);
// Step 5.5
fallback_mode = Some(NetTraitsRequestMode::CorsMode);
- // FIXME(cybai): remove this line when we can remove the fallback of credentials
- fallback_credentials = Some(NetTraitsRequestCredentials::CredentialsSameOrigin);
},
// Step 6
RequestInfo::Request(ref input_request) => {
@@ -239,14 +232,9 @@ impl Request {
}
// Step 19
- let credentials = init
- .credentials
- .as_ref()
- .map(|m| m.clone().into())
- .or(fallback_credentials);
-
- if let Some(c) = credentials {
- request.credentials_mode = c;
+ if let Some(init_credentials) = init.credentials.as_ref() {
+ let credentials = init_credentials.clone().into();
+ request.credentials_mode = credentials;
}
// Step 20