Add ImmutableOrigin to allow for serializing origins #15438

asajeffrey · 2017-02-08T01:33:30Z

This PR adds a serializable type ImmutableOrigin and a non-serializable type MutableOrigin. The immutable type represents an origin with null domain, and the mutable type represents an origin with a mutable domain. This separation is needed for implementing setting document.domain.

./mach build -d does not report any errors
./mach test-tidy does not report any errors
These changes fix #14892.
These changes do not require tests because it's a refactoring which will enable other features.

This change is

highfive · 2017-02-08T01:33:33Z

Heads up! This PR modifies the following files:

@fitzgen: components/script/dom/htmliframeelement.rs, components/script/dom/document.rs, components/script/dom/node.rs, components/script/dom/xmlhttprequest.rs, components/script/dom/xmldocument.rs, components/script/dom/domparser.rs, components/script/dom/bindings/trace.rs, components/script/lib.rs, components/script/script_thread.rs, components/script/dom/servoparser/mod.rs, components/script/dom/window.rs, components/script/origin.rs, components/script/dom/domimplementation.rs
@KiChjang: components/script/dom/htmliframeelement.rs, components/script/dom/document.rs, components/net/http_loader.rs, components/script/dom/node.rs, components/script/dom/xmlhttprequest.rs, components/script/dom/xmldocument.rs, components/net_traits/request.rs, components/net_traits/request.rs, components/script/dom/domparser.rs, components/script/dom/bindings/trace.rs, components/script/lib.rs, components/script/script_thread.rs, components/script/dom/servoparser/mod.rs, components/script/dom/window.rs, components/script/origin.rs, components/script/dom/domimplementation.rs

asajeffrey · 2017-02-08T01:34:15Z

The original work on this was by @cbrewster. r? @jdm

Ms2ger · 2017-02-10T09:45:35Z

components/script/dom/document.rs

@@ -2154,7 +2153,7 @@ impl Document {
                                        HasBrowsingContext::No,
                                        None,
                                        // https://github.com/whatwg/html/issues/2109
-                                        Origin::opaque_identifier(),
+                                        self.origin.clone(),


What's up here?

Well the latest opinion on that discussion was @smaug---- saying whatwg/html#2109 (comment) which looks like it's coming down on the side of a template inheriting its origin, rather than generating a new opaque origin. Can the template document cause script to run? If so, we may need to make sure it runs in the right script thread.

Is this the only remaining issue? I can revert it if we want to keep the old behaviour.

Let's leave this as it is until that issue resolves one way or another.

Ms2ger · 2017-02-10T09:45:35Z

components/url/origin.rs

+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// #[cfg(feature = "servo")] use heapsize::HeapSizeOf;


Oops. Fixed.

Ms2ger · 2017-02-10T09:45:35Z

components/script/dom/domimplementation.rs

@@ -80,7 +80,7 @@ impl DOMImplementationMethods for DOMImplementation {
        let doc = XMLDocument::new(win,
                                   HasBrowsingContext::No,
                                   None,
-                                   self.document.origin().alias(),


I feel we should keep the alias/copy distinction.

The Rust naming contention seems to be that clone copies the reference to Rc.

Since the spec does not talk about aliasing any more there is no need for a special name here.

KiChjang · 2017-02-10T23:38:12Z

components/script/dom/document.rs

@@ -2410,14 +2411,18 @@ impl DocumentMethods for Document {
    // https://html.spec.whatwg.org/multipage/#relaxing-the-same-origin-restriction
    fn Domain(&self) -> DOMString {
        // Step 1.
-        if self.browsing_context().is_none() {
+        if self.has_browsing_context {


Missing !?

asajeffrey · 2017-02-15T22:27:07Z

@jdm ping?

jdm · 2017-02-17T20:26:21Z

Clearly the original origin code is older than March 2016, and I've somehow missed that whatwg/html@438155d happened in the meantime.

asajeffrey · 2017-02-17T21:06:30Z

Yes, the "alias" concept is gone, we may as well use the Rust naming convention for clone.

bors-servo · 2017-02-18T21:28:35Z

☔ The latest upstream changes (presumably #15588) made this pull request unmergeable. Please resolve the merge conflicts.

asajeffrey · 2017-02-20T15:47:31Z

This is blocked because the Serde implementation for Host doesn't exist any more.

IRC conversation with @SimonSapin and @nox at http://logs.glob.uno/?c=mozilla%23servo&s=20+Feb+2017&e=20+Feb+2017#c615535

SimonSapin · 2017-02-20T17:48:25Z

Should be unblocked now: servo/rust-url#280 (comment)

asajeffrey · 2017-02-20T18:23:10Z

Thanks!

nox · 2017-02-21T12:37:58Z

components/url/Cargo.toml

 url = "1.2"
 url_serde = {version = "0.1", optional = true}
+servo_rand = {path = "../rand"}


Alphabetical order.

jdm · 2017-02-21T14:53:07Z

I intend to complete me review today.

asajeffrey · 2017-02-21T15:02:54Z

@jdm: thanks!

jdm

Only a couple small comments. Sorry about the delay!

jdm · 2017-02-21T23:00:36Z

components/script/dom/document.rs

@@ -2154,7 +2153,7 @@ impl Document {
                                        HasBrowsingContext::No,
                                        None,
                                        // https://github.com/whatwg/html/issues/2109
-                                        Origin::opaque_identifier(),
+                                        self.origin.clone(),


Let's leave this as it is until that issue resolves one way or another.

jdm · 2017-02-21T23:00:36Z

components/script/dom/domimplementation.rs

@@ -80,7 +80,7 @@ impl DOMImplementationMethods for DOMImplementation {
        let doc = XMLDocument::new(win,
                                   HasBrowsingContext::No,
                                   None,
-                                   self.document.origin().alias(),


Since the spec does not talk about aliasing any more there is no need for a special name here.

jdm · 2017-02-21T23:00:36Z

components/script/script_thread.rs

@@ -155,7 +154,8 @@ struct InProgressLoad {
    is_visible: bool,
    /// The requested URL of the load.
    url: ServoUrl,
-    origin: Origin,
+    /// The origin for the document
+    origin: MutableOrigin,


I think it might be clearer if we left this as an immutable one, since the domain of the origin can't change while the document is being fetch.

The one case I'm unsure about is if this can represent the origin of an about:blank loaded in a document that has set document.domain. If we need to provide a MutableOrigin for that, then I guess this needs to stay as-is.

Indeed, that is the one case.

asajeffrey · 2017-02-22T15:10:16Z

@nox suggests a forced push then an r+, so...

@bors-servo: r=jdm

bors-servo · 2017-02-22T15:10:18Z

📌 Commit 66049a0 has been approved by jdm

bors-servo · 2017-02-22T15:53:26Z

⌛ Testing commit 66049a0 with merge 2f73c51...


        Auto merge of #15438 - asajeffrey:url-serializable-origin, r=jdm

Add ImmutableOrigin to allow for serializing origins  This PR adds a serializable type `ImmutableOrigin` and a non-serializable type `MutableOrigin`. The immutable type represents an origin with `null` domain, and the mutable type represents an origin with a mutable domain. This separation is needed for implementing setting `document.domain`. ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #14892. - [X] These changes do not require tests because it's a refactoring which will enable other features.   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15438)

bors-servo · 2017-02-22T16:09:05Z

💔 Test failed - mac-dev-unit


        Add ImmutableOrigin to allow for serializing origins

asajeffrey · 2017-02-22T17:13:36Z

Oh yes ./mach build-geckolib.

asajeffrey · 2017-02-22T17:13:52Z

@bors-servo r=jdm

bors-servo · 2017-02-22T17:13:53Z

📌 Commit bfd7b95 has been approved by jdm

bors-servo · 2017-02-22T17:46:28Z

⌛ Testing commit bfd7b95 with merge 78e8c31...


        Auto merge of #15438 - asajeffrey:url-serializable-origin, r=jdm

Add ImmutableOrigin to allow for serializing origins  This PR adds a serializable type `ImmutableOrigin` and a non-serializable type `MutableOrigin`. The immutable type represents an origin with `null` domain, and the mutable type represents an origin with a mutable domain. This separation is needed for implementing setting `document.domain`. ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #14892. - [X] These changes do not require tests because it's a refactoring which will enable other features.   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15438)

bors-servo · 2017-02-22T18:32:44Z

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-gnu-dev, windows-msvc-dev
Approved by: jdm
Pushing 78e8c31 to master...


        Auto merge of #15536 - asajeffrey:script-document-domain-setter, r=<try>

Implement setter for document.domain  This PR implements the setter for `document.domain`. It builds on #15438 and #15478, only the last commit is part of this PR. It includes tests for similar-origin security checks. ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #934. - [X] There are tests for these changes.   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15536)


        Auto merge of #15536 - asajeffrey:script-document-domain-setter, r=nox

Implement setter for document.domain  This PR implements the setter for `document.domain`. It builds on #15438 and #15478, only the last commit is part of this PR. It includes tests for similar-origin security checks. ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #934. - [X] There are tests for these changes.   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15536)


        Auto merge of #15679 - asajeffrey:script-postMessage-xorigin, r=emilio

Implement cross-thread postMessage  This PR implements cross-thread postMessage, It builds on #15438 and #15478, only the last commit is part of this PR. ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] There are tests for these changes   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15679)

asajeffrey added the A-content/script label Feb 8, 2017

highfive assigned metajack Feb 8, 2017

highfive added the S-awaiting-review label Feb 8, 2017

highfive assigned jdm and unassigned metajack Feb 8, 2017

asajeffrey added the S-needs-squash label Feb 9, 2017

asajeffrey mentioned this pull request Feb 9, 2017

Added some same-origin-domain checks #15478

Closed

3 of 3 tasks complete

Ms2ger reviewed Feb 10, 2017

View changes

KiChjang reviewed Feb 10, 2017

View changes

asajeffrey mentioned this pull request Feb 13, 2017

Implement setter for document.domain #15536

Merged

4 of 4 tasks complete

cbrewster mentioned this pull request Feb 17, 2017

[WIP] Make subsequent about:blank loads async #14764

Closed

3 of 5 tasks complete

asajeffrey force-pushed the asajeffrey:url-serializable-origin branch from b07059c to 3087ea2 Feb 17, 2017

highfive added the S-needs-rebase label Feb 18, 2017

asajeffrey force-pushed the asajeffrey:url-serializable-origin branch from 3087ea2 to b7055cb Feb 20, 2017

asajeffrey added the S-blocked-on-external label Feb 20, 2017

asajeffrey force-pushed the asajeffrey:url-serializable-origin branch from b7055cb to 5d703b9 Feb 20, 2017

nox reviewed Feb 21, 2017

View changes

asajeffrey mentioned this pull request Feb 21, 2017

Implement cross-thread postMessage #15679

Merged

3 of 3 tasks complete

jdm requested changes Feb 21, 2017

View changes

highfive added the S-tests-failed label Feb 22, 2017

asajeffrey force-pushed the asajeffrey:url-serializable-origin branch from 1c8c7af to 66049a0 Feb 22, 2017

highfive added S-awaiting-review and removed S-tests-failed labels Feb 22, 2017

highfive added S-awaiting-merge and removed S-awaiting-review labels Feb 22, 2017

highfive added S-tests-failed and removed S-awaiting-merge labels Feb 22, 2017

Add ImmutableOrigin to allow for serializing origins

Loading status checks…

bfd7b95

asajeffrey force-pushed the asajeffrey:url-serializable-origin branch from 66049a0 to bfd7b95 Feb 22, 2017

highfive added S-awaiting-review and removed S-tests-failed labels Feb 22, 2017

highfive added S-awaiting-merge and removed S-awaiting-review labels Feb 22, 2017

bors-servo merged commit bfd7b95 into servo:master Feb 22, 2017
3 checks passed

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details

continuous-integration/travis-ci/pr The Travis CI build passed
Details

homu Test successful
Details

highfive removed the S-awaiting-merge label Feb 22, 2017

servo / servo

Join GitHub today

Add ImmutableOrigin to allow for serializing origins #15438

Add ImmutableOrigin to allow for serializing origins #15438

Conversation

asajeffrey commented Feb 8, 2017 • edited by larsbergstrom

highfive commented Feb 8, 2017

asajeffrey commented Feb 8, 2017

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

asajeffrey commented Feb 15, 2017

jdm commented Feb 17, 2017

asajeffrey commented Feb 17, 2017

bors-servo commented Feb 18, 2017

asajeffrey commented Feb 20, 2017

SimonSapin commented Feb 20, 2017

asajeffrey commented Feb 20, 2017

This comment has been minimized.

This comment has been minimized.

jdm commented Feb 21, 2017

asajeffrey commented Feb 21, 2017

jdm left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

asajeffrey commented Feb 22, 2017

bors-servo commented Feb 22, 2017

bors-servo commented Feb 22, 2017

bors-servo commented Feb 22, 2017

asajeffrey commented Feb 22, 2017

asajeffrey commented Feb 22, 2017

bors-servo commented Feb 22, 2017

bors-servo commented Feb 22, 2017

bors-servo commented Feb 22, 2017

asajeffrey commented Feb 8, 2017 •

edited by larsbergstrom