Make url for "client" referrer mandatory

components/constellation/constellation.rs

@@ -136,7 +136,7 @@ use msg::constellation_msg::{
     TopLevelBrowsingContextId,
 };
 use net_traits::pub_domains::reg_host;
-use net_traits::request::RequestBuilder;
+use net_traits::request::{Referrer, RequestBuilder};
 use net_traits::storage_thread::{StorageThreadMsg, StorageType};
 use net_traits::{self, FetchResponseMsg, IpcSend, ResourceThreads};
 use profile_traits::mem;
@@ -1544,7 +1544,13 @@ where
             // If there is already a pending page (self.pending_changes), it will not be overridden;
             // However, if the id is not encompassed by another change, it will be.
             FromCompositorMsg::LoadUrl(top_level_browsing_context_id, url) => {
-                let load_data = LoadData::new(LoadOrigin::Constellation, url, None, None, None);
+                let load_data = LoadData::new(
+                    LoadOrigin::Constellation,
+                    url,
+                    None,
+                    Referrer::NoReferrer,
+                    None,
+                );
                 let ctx_id = BrowsingContextId::from(top_level_browsing_context_id);
                 let pipeline_id = match self.browsing_contexts.get(&ctx_id) {
                     Some(ctx) => ctx.pipeline_id,
@@ -2888,7 +2894,13 @@ where
         warn!("creating replacement pipeline for about:failure");
 
         let new_pipeline_id = PipelineId::new();
-        let load_data = LoadData::new(LoadOrigin::Constellation, failure_url, None, None, None);
+        let load_data = LoadData::new(
+            LoadOrigin::Constellation,
+            failure_url,
+            None,
+            Referrer::NoReferrer,
+            None,
+        );
         let sandbox = IFrameSandboxState::IFrameSandboxed;
         let is_private = false;
         self.new_pipeline(
@@ -2998,7 +3010,13 @@ where
         );
         self.embedder_proxy.send(msg);
         let browsing_context_id = BrowsingContextId::from(top_level_browsing_context_id);
-        let load_data = LoadData::new(LoadOrigin::Constellation, url, None, None, None);
+        let load_data = LoadData::new(
+            LoadOrigin::Constellation,
+            url,
+            None,
+            Referrer::NoReferrer,
+            None,
+        );
         let sandbox = IFrameSandboxState::IFrameUnsandboxed;
         let is_private = false;
         let is_visible = true;

components/constellation/network_listener.rs

@@ -116,7 +116,8 @@ impl NetworkListener {
                         self.request_builder.referrer = metadata
                             .referrer
                             .clone()
-                            .map(|referrer_url| Referrer::ReferrerUrl(referrer_url));
+                            .map(|referrer_url| Referrer::ReferrerUrl(referrer_url))
+                            .unwrap_or(Referrer::NoReferrer);
                         self.request_builder.referrer_policy = metadata.referrer_policy;
 
                         let headers = if let Some(ref headers) = metadata.headers {

components/gfx/font_cache_thread.rs

@@ -14,7 +14,7 @@ use crate::platform::font_template::FontTemplateData;
 use app_units::Au;
 use gfx_traits::{FontData, WebrenderApi};
 use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
-use net_traits::request::{Destination, RequestBuilder};
+use net_traits::request::{Destination, Referrer, RequestBuilder};
 use net_traits::{fetch_async, CoreResourceThread, FetchResponseMsg};
 use servo_atoms::Atom;
 use servo_url::ServoUrl;
@@ -235,7 +235,10 @@ impl FontCache {
                     None => return,
                 };
 
-                let request = RequestBuilder::new(url.clone()).destination(Destination::Font);
+                // FIXME:
+                // This shouldn't use NoReferrer, but the current documents url
+                let request = RequestBuilder::new(url.clone(), Referrer::NoReferrer)
+                    .destination(Destination::Font);
 
                 let channel_to_self = self.channel_to_self.clone();
                 let bytes = Mutex::new(Vec::new());

components/net/fetch/methods.rs

@@ -239,13 +239,7 @@ pub fn main_fetch(
     {
         let referrer_url = match mem::replace(&mut request.referrer, Referrer::NoReferrer) {
             Referrer::NoReferrer => None,
-            Referrer::Client => {
-                // FIXME(#14507): We should never get this value here; it should
-                //                already have been handled in the script thread.
-                request.headers.remove(header::REFERER);
-                None
-            },
-            Referrer::ReferrerUrl(url) => {
+            Referrer::ReferrerUrl(url) | Referrer::Client(url) => {
                 request.headers.remove(header::REFERER);
                 let current_url = request.current_url();
                 determine_request_referrer(

components/net/http_loader.rs

@@ -1141,7 +1141,8 @@ fn http_network_or_cache_fetch(
     // Step 5.9
     match http_request.referrer {
         Referrer::NoReferrer => (),
-        Referrer::ReferrerUrl(ref http_request_referrer) => {
+        Referrer::ReferrerUrl(ref http_request_referrer) |
+        Referrer::Client(ref http_request_referrer) => {
             if let Ok(referer) = http_request_referrer.to_string().parse::<Referer>() {
                 http_request.headers.typed_insert(referer);
             } else {
@@ -1151,12 +1152,6 @@ fn http_network_or_cache_fetch(
                 error!("Failed to parse {} as referer", http_request_referrer);
             }
         },
-        Referrer::Client =>
-        // it should be impossible for referrer to be anything else during fetching
-        // https://fetch.spec.whatwg.org/#concept-request-referrer
-        {
-            unreachable!()
-        },
     };
 
     // Step 5.10
@@ -1938,7 +1933,7 @@ fn cors_preflight_fetch(
     context: &FetchContext,
 ) -> Response {
     // Step 1
-    let mut preflight = RequestBuilder::new(request.current_url())
+    let mut preflight = RequestBuilder::new(request.current_url(), request.referrer.clone())
         .method(Method::OPTIONS)
         .origin(match &request.origin {
             Origin::Client => {
@@ -1949,7 +1944,6 @@ fn cors_preflight_fetch(
         .pipeline_id(request.pipeline_id)
         .initiator(request.initiator.clone())
         .destination(request.destination.clone())
-        .referrer(Some(request.referrer.clone()))
         .referrer_policy(request.referrer_policy)
         .build();
 

components/net/tests/data_loader.rs

@@ -6,7 +6,7 @@ use crate::fetch;
 use headers::{ContentType, HeaderMapExt};
 use hyper_serde::Serde;
 use mime::{self, Mime};
-use net_traits::request::{Origin, Request};
+use net_traits::request::{Origin, Referrer, Request};
 use net_traits::response::{HttpsState, ResponseBody};
 use net_traits::{FetchMetadata, FilteredMetadata, NetworkError};
 use servo_url::ServoUrl;
@@ -21,7 +21,13 @@ fn assert_parse(
 ) {
     let url = ServoUrl::parse(url).unwrap();
     let origin = Origin::Origin(url.origin());
-    let mut request = Request::new(url, Some(origin), None, HttpsState::None);
+    let mut request = Request::new(
+        url,
+        Some(origin),
+        Referrer::NoReferrer,
+        None,
+        HttpsState::None,
+    );
 
     let response = fetch(&mut request, None);