From 9d8090a8766577ad33b0a589377bf9fa66c912e4 Mon Sep 17 00:00:00 2001 From: AnthonyJ3 Date: Sun, 16 Apr 2023 22:31:03 -0400 Subject: [PATCH 1/4] defaulted credentials mode to same-origin & removed fallback credentials Signed-off-by: AnthonyJ3 --- components/net_traits/request.rs | 2 +- components/script/dom/request.rs | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/components/net_traits/request.rs b/components/net_traits/request.rs index 443f4c57dab..82551cb7063 100644 --- a/components/net_traits/request.rs +++ b/components/net_traits/request.rs @@ -269,7 +269,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, diff --git a/components/script/dom/request.rs b/components/script/dom/request.rs index 9bb857736a4..8b654a92260 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 = 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 = 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) => { @@ -242,8 +235,7 @@ impl Request { let credentials = init .credentials .as_ref() - .map(|m| m.clone().into()) - .or(fallback_credentials); + .map(|m| m.clone().into()); if let Some(c) = credentials { request.credentials_mode = c; From 7fda52ba5c8397c1389e783c8bccc71ade1927a4 Mon Sep 17 00:00:00 2001 From: AnthonyJ3 Date: Mon, 17 Apr 2023 17:34:57 -0400 Subject: [PATCH 2/4] fixup! defaulted credentials mode to same-origin & removed fallback credentials --- components/script/dom/request.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/components/script/dom/request.rs b/components/script/dom/request.rs index 8b654a92260..7702b48ce08 100644 --- a/components/script/dom/request.rs +++ b/components/script/dom/request.rs @@ -232,10 +232,7 @@ impl Request { } // Step 19 - let credentials = init - .credentials - .as_ref() - .map(|m| m.clone().into()); + let credentials = init.credentials.as_ref().map(|m| m.clone().into()); if let Some(c) = credentials { request.credentials_mode = c; From 6907f6be3eca291245d93fc7070e2ad83501d49c Mon Sep 17 00:00:00 2001 From: AnthonyJ3 Date: Tue, 25 Apr 2023 19:01:49 -0400 Subject: [PATCH 3/4] fixup! defaulted credentials mode to same-origin & removed fallback credentials --- components/script/dom/request.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/components/script/dom/request.rs b/components/script/dom/request.rs index 7702b48ce08..7bd89875b6f 100644 --- a/components/script/dom/request.rs +++ b/components/script/dom/request.rs @@ -232,10 +232,9 @@ impl Request { } // Step 19 - let credentials = init.credentials.as_ref().map(|m| m.clone().into()); - - 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 From 095f22c314130e019d3b8eb7e3f268a0cfce51b8 Mon Sep 17 00:00:00 2001 From: AnthonyJ3 Date: Thu, 27 Apr 2023 18:07:07 -0400 Subject: [PATCH 4/4] fixup! defaulted credentials mode to same-origin & removed fallback credentials --- components/net_traits/request.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/net_traits/request.rs b/components/net_traits/request.rs index 82551cb7063..418bdd9df74 100644 --- a/components/net_traits/request.rs +++ b/components/net_traits/request.rs @@ -509,7 +509,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,