Properly set origin of fetch requests

components/gfx/font_cache_thread.rs

@@ -216,7 +216,8 @@ impl FontCache {
                     url: url.clone(),
                     type_: RequestType::Font,
                     destination: Destination::Font,
-                    origin: url.clone(),
+                    // TODO: Add a proper origin - Can't import GlobalScope from gfx
+                    // We can leave origin to be set by default
                     .. RequestInit::default()
                 };
 

components/net/http_loader.rs

@@ -1371,7 +1371,7 @@ fn cors_check(request: &Request, response: &Response) -> Result<(), ()> {
     };
 
     match request.origin {
-        Origin::Origin(ref o) if o.ascii_serialization() == origin => {},
+        Origin::Origin(ref o) if o.ascii_serialization() == origin.trim() => {},
         _ => return Err(())
     }
 

components/net_traits/request.rs

@@ -158,9 +158,7 @@ pub struct RequestInit {
     pub use_cors_preflight: bool,
     pub credentials_mode: CredentialsMode,
     pub use_url_credentials: bool,
-    // this should actually be set by fetch, but fetch
-    // doesn't have info about the client right now
-    pub origin: ServoUrl,
+    pub origin: ImmutableOrigin,
     // XXXManishearth these should be part of the client object
     pub referrer_url: Option<ServoUrl>,
     pub referrer_policy: Option<ReferrerPolicy>,
@@ -188,7 +186,7 @@ impl Default for RequestInit {
             use_cors_preflight: false,
             credentials_mode: CredentialsMode::Omit,
             use_url_credentials: false,
-            origin: ServoUrl::parse("about:blank").unwrap(),
+            origin: ImmutableOrigin::new_opaque(),
             referrer_url: None,
             referrer_policy: None,
             pipeline_id: None,
@@ -302,7 +300,7 @@ impl Request {
 
     pub fn from_init(init: RequestInit) -> Request {
         let mut req = Request::new(init.url.clone(),
-                                   Some(Origin::Origin(init.origin.origin())),
+                                   Some(Origin::Origin(init.origin)),
                                    init.pipeline_id);
         req.method = init.method;
         req.headers = init.headers;

components/script/dom/dedicatedworkerglobalscope.rs

@@ -160,6 +160,7 @@ impl DedicatedWorkerGlobalScope {
         let serialized_worker_url = worker_url.to_string();
         let name = format!("WebWorker for {}", serialized_worker_url);
         let top_level_browsing_context_id = TopLevelBrowsingContextId::installed();
+        let origin = GlobalScope::current().expect("No current global object").origin().immutable().clone();
 
         thread::Builder::new().name(name).spawn(move || {
             thread_state::initialize(thread_state::SCRIPT | thread_state::IN_WORKER);
@@ -179,10 +180,10 @@ impl DedicatedWorkerGlobalScope {
                 destination: Destination::Worker,
                 credentials_mode: CredentialsMode::Include,
                 use_url_credentials: true,
-                origin: worker_url,
                 pipeline_id: pipeline_id,
                 referrer_url: referrer_url,
                 referrer_policy: referrer_policy,
+                origin,
                 .. RequestInit::default()
             };
 

components/script/dom/eventsource.rs

@@ -387,7 +387,7 @@ impl EventSource {
         // TODO: Step 9 set request's client settings
         let mut request = RequestInit {
             url: url_record,
-            origin: global.get_url(),
+            origin: global.origin().immutable().clone(),
             pipeline_id: Some(global.pipeline_id()),
             // https://html.spec.whatwg.org/multipage/#create-a-potential-cors-request
             use_url_credentials: true,

components/script/dom/htmlimageelement.rs

@@ -259,7 +259,7 @@ impl HTMLImageElement {
 
         let request = RequestInit {
             url: img_url.clone(),
-            origin: document.url().clone(),
+            origin: document.origin().immutable().clone(),
             type_: RequestType::Image,
             pipeline_id: Some(document.global().pipeline_id()),
             .. RequestInit::default()

components/script/dom/htmlmediaelement.rs

@@ -550,7 +550,7 @@ impl HTMLMediaElement {
                 destination: Destination::Media,
                 credentials_mode: CredentialsMode::Include,
                 use_url_credentials: true,
-                origin: document.url(),
+                origin: document.origin().immutable().clone(),
                 pipeline_id: Some(self.global().pipeline_id()),
                 referrer_url: Some(document.url()),
                 referrer_policy: document.get_referrer_policy(),

components/script/dom/htmlscriptelement.rs

@@ -253,7 +253,7 @@ fn fetch_a_classic_script(script: &HTMLScriptElement,
             Some(CorsSettings::Anonymous) => CredentialsMode::CredentialsSameOrigin,
             _ => CredentialsMode::Include,
         },
-        origin: doc.url(),
+        origin: doc.origin().immutable().clone(),
         pipeline_id: Some(script.global().pipeline_id()),
         referrer_url: Some(doc.url()),
         referrer_policy: doc.get_referrer_policy(),

components/script/dom/serviceworkerglobalscope.rs

@@ -151,6 +151,7 @@ impl ServiceWorkerGlobalScope {
                           .. } = scope_things;
 
         let serialized_worker_url = script_url.to_string();
+        let origin = GlobalScope::current().expect("No current global object").origin().immutable().clone();
         thread::Builder::new().name(format!("ServiceWorker for {}", serialized_worker_url)).spawn(move || {
             thread_state::initialize(SCRIPT | IN_WORKER);
             let roots = RootCollection::new();
@@ -164,10 +165,10 @@ impl ServiceWorkerGlobalScope {
                 destination: Destination::ServiceWorker,
                 credentials_mode: CredentialsMode::Include,
                 use_url_credentials: true,
-                origin: script_url,
                 pipeline_id: pipeline_id,
                 referrer_url: referrer_url,
                 referrer_policy: referrer_policy,
+                origin,
                 .. RequestInit::default()
             };
 

components/script/dom/workerglobalscope.rs

@@ -211,7 +211,7 @@ impl WorkerGlobalScopeMethods for WorkerGlobalScope {
                 destination: Destination::Script,
                 credentials_mode: CredentialsMode::Include,
                 use_url_credentials: true,
-                origin: self.worker_url.clone(),
+                origin: global_scope.origin().immutable().clone(),
                 pipeline_id: Some(self.upcast::<GlobalScope>().pipeline_id()),
                 referrer_url: None,
                 referrer_policy: None,

components/script/dom/worklet.rs

@@ -588,17 +588,14 @@ impl WorkletThread {
         // TODO: Fetch a module graph, not just a single script.
         // TODO: Fetch the script asynchronously?
         // TODO: Caching.
-        // TODO: Avoid re-parsing the origin as a URL.
         let resource_fetcher = self.global_init.resource_threads.sender();
-        let origin_url = ServoUrl::parse(&*origin.unicode_serialization())
-            .unwrap_or_else(|_| ServoUrl::parse("about:blank").unwrap());
         let request = RequestInit {
             url: script_url,
             type_: RequestType::Script,
             destination: Destination::Script,
             mode: RequestMode::CorsMode,
-            origin: origin_url,
             credentials_mode: credentials.into(),
+            origin,
             .. RequestInit::default()
         };
         let script = load_whole_resource(request, &resource_fetcher).ok()

components/script/dom/xmlhttprequest.rs

@@ -594,7 +594,7 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
             use_cors_preflight: has_handlers,
             credentials_mode: credentials_mode,
             use_url_credentials: use_url_credentials,
-            origin: self.global().get_url(),
+            origin: self.global().origin().immutable().clone(),
             referrer_url: self.referrer_url.clone(),
             referrer_policy: self.referrer_policy.clone(),
             pipeline_id: Some(self.global().pipeline_id()),

components/script/fetch.rs

@@ -56,10 +56,7 @@ fn request_init_from_request(request: NetTraitsRequest) -> NetTraitsRequestInit
         use_cors_preflight: request.use_cors_preflight,
         credentials_mode: request.credentials_mode,
         use_url_credentials: request.use_url_credentials,
-        // TODO: NetTraitsRequestInit and NetTraitsRequest have different "origin"
-        // ... NetTraitsRequestInit.origin: Url
-        // ... NetTraitsRequest.origin: RefCell<Origin>
-        origin: request.url(),
+        origin: GlobalScope::current().expect("No current global object").origin().immutable().clone(),
         referrer_url: from_referrer_to_referrer_url(&request),
         referrer_policy: request.referrer_policy,
         pipeline_id: request.pipeline_id,

components/script/layout_image.rs

@@ -70,7 +70,7 @@ pub fn fetch_image_for_layout(url: ServoUrl,
 
     let request = FetchRequestInit {
         url: url,
-        origin: document.url().clone(),
+        origin: document.origin().immutable().clone(),
         type_: RequestType::Image,
         pipeline_id: Some(document.global().pipeline_id()),
         .. FetchRequestInit::default()

components/script/script_thread.rs

@@ -1919,6 +1919,12 @@ impl ScriptThread {
         ROUTER.route_ipc_receiver_to_mpsc_sender(ipc_timer_event_port,
                                                  self.timer_event_chan.clone());
 
+        let origin = if final_url.as_str() == "about:blank" {
+            incomplete.origin.clone()
+        } else {
+            MutableOrigin::new(final_url.origin())
+        };
+
         // Create the window and document objects.
         let window = Window::new(self.js_runtime.clone(),
                                  MainThreadScriptChan(sender.clone()),
@@ -1942,7 +1948,7 @@ impl ScriptThread {
                                  incomplete.pipeline_id,
                                  incomplete.parent_info,
                                  incomplete.window_size,
-                                 incomplete.origin.clone(),
+                                 origin,
                                  self.webvr_thread.clone());
 
         // Initialize the browsing context for the window.
@@ -2274,13 +2280,13 @@ impl ScriptThread {
             destination: Destination::Document,
             credentials_mode: CredentialsMode::Include,
             use_url_credentials: true,
-            origin: load_data.url.clone(),
             pipeline_id: Some(id),
             referrer_url: load_data.referrer_url,
             referrer_policy: load_data.referrer_policy,
             headers: load_data.headers,
             body: load_data.data,
             redirect_mode: RedirectMode::Manual,
+            origin: incomplete.origin.immutable().clone(),
             .. RequestInit::default()
         };
 

components/script/stylesheet_loader.rs

@@ -261,7 +261,7 @@ impl<'a> StylesheetLoader<'a> {
                 Some(CorsSettings::Anonymous) => CredentialsMode::CredentialsSameOrigin,
                 _ => CredentialsMode::Include,
             },
-            origin: document.url(),
+            origin: document.origin().immutable().clone(),
             pipeline_id: Some(self.elem.global().pipeline_id()),
             referrer_url: Some(document.url()),
             referrer_policy: referrer_policy,