Bug 1315602 - Remove the assertion of FirstPartyDomain should be empty in HTTP redirect. r=smaug (1f6a69c3) · Commits · Tommy Webb / Tor Browser

browser/components/originattributes/test/browser/browser.ini

+6 −0

Original line number	Diff line number	Diff line
		@@ -44,9 +44,15 @@ support-files =
		test_firstParty_html_redirect.html
		test_firstParty_http_redirect.html
		test_firstParty_http_redirect.html^headers^
		test_firstParty_http_redirect_to_same_domain.html
		test_firstParty_http_redirect_to_same_domain.html^headers^
		test_firstParty_iframe_http_redirect.html
		test_firstParty_postMessage.html
		test_form.html
		window.html
		window2.html
		window3.html
		window_redirect.html
		worker_blobify.js
		worker_deblobify.js

browser/components/originattributes/test/browser/browser_firstPartyIsolation.js

+105 −0

Original line number	Diff line number	Diff line
		@@ -172,3 +172,108 @@ add_task(function* openWindow_test() {
		yield BrowserTestUtils.closeWindow(win);
		});

		/**
		* When the web page calls window.open, the top-level docshell in the new
		* created window will have firstPartyDomain set.
		*/
		add_task(function* window_open_redirect_test() {
		Services.prefs.setIntPref("browser.link.open_newwindow", 2);
		registerCleanupFunction(function() {
		Services.prefs.clearUserPref("browser.link.open_newwindow");
		});

		let tab = gBrowser.addTab(BASE_URL + "window_redirect.html");
		let win = yield BrowserTestUtils.waitForNewWindow();
		yield BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);

		yield ContentTask.spawn(win.gBrowser.selectedBrowser, { firstPartyDomain: "mochi.test" }, function* (attrs) {
		Assert.equal(docShell.getOriginAttributes().firstPartyDomain, attrs.firstPartyDomain,
		"window.open() should have firstPartyDomain attribute");
		Assert.equal(content.document.nodePrincipal.originAttributes.firstPartyDomain,
		attrs.firstPartyDomain, "The document should have firstPartyDomain");
		});

		gBrowser.removeTab(tab);
		yield BrowserTestUtils.closeWindow(win);
		});

		/**
		* When the web page calls window.open, the top-level docshell in the new
		* created window will inherit the firstPartyDomain attribute.
		* However the top-level document will override the firstPartyDomain if the
		* document is from another domain.
		*/
		add_task(function* window_open_iframe_test() {
		Services.prefs.setIntPref("browser.link.open_newwindow", 2);
		registerCleanupFunction(function() {
		Services.prefs.clearUserPref("browser.link.open_newwindow");
		});

		let tab = gBrowser.addTab(BASE_URL + "window2.html");
		let win = yield BrowserTestUtils.waitForNewWindow();
		yield BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser, true);

		yield ContentTask.spawn(win.gBrowser.selectedBrowser, { firstPartyDomain: "mochi.test" }, function* (attrs) {
		Assert.equal(docShell.getOriginAttributes().firstPartyDomain, attrs.firstPartyDomain,
		"window.open() should have firstPartyDomain attribute");

		// The document is http://example.com/browser/browser/components/originattributes/test/browser/test_firstParty.html
		// so the firstPartyDomain will be overriden to 'example.com'.
		Assert.equal(content.document.nodePrincipal.originAttributes.firstPartyDomain,
		"example.com", "The document should have firstPartyDomain");

		let iframe = content.document.getElementById("iframe1");
		Assert.equal(iframe.frameLoader.docShell.getOriginAttributes().firstPartyDomain,
		"example.com", "iframe's docshell should have firstPartyDomain");
		Assert.equal(iframe.contentDocument.nodePrincipal.originAttributes.firstPartyDomain,
		"example.com", "iframe should have firstPartyDomain");
		});

		gBrowser.removeTab(tab);
		yield BrowserTestUtils.closeWindow(win);
		});

		/**
		* Test for the loadInfo->TriggeringPrincipal is the document itself.
		*/
		add_task(function* form_test() {
		let tab = gBrowser.addTab(BASE_URL + "test_form.html");
		yield BrowserTestUtils.browserLoaded(tab.linkedBrowser);

		yield ContentTask.spawn(tab.linkedBrowser, { firstPartyDomain: "mochi.test" }, function* (attrs) {
		Assert.equal(content.document.nodePrincipal.originAttributes.firstPartyDomain,
		attrs.firstPartyDomain, "The document should have firstPartyDomain");

		let submit = content.document.getElementById("submit");
		submit.click();
		});

		gBrowser.removeTab(tab);
		});

		/**
		* Another test for loadInfo->TriggeringPrincipal in the window.open case.
		*/
		add_task(function* window_open_form_test() {
		Services.prefs.setIntPref("browser.link.open_newwindow", 2);
		registerCleanupFunction(function() {
		Services.prefs.clearUserPref("browser.link.open_newwindow");
		});

		let tab = gBrowser.addTab(BASE_URL + "window3.html");
		let win = yield BrowserTestUtils.waitForNewWindow();
		yield BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser, true);

		yield ContentTask.spawn(win.gBrowser.selectedBrowser, { firstPartyDomain: "mochi.test" }, function* (attrs) {
		Assert.equal(docShell.getOriginAttributes().firstPartyDomain, attrs.firstPartyDomain,
		"window.open() should have firstPartyDomain attribute");
		Assert.equal(content.document.nodePrincipal.originAttributes.firstPartyDomain,
		"example.com", "The document should have firstPartyDomain");

		let submit = content.document.getElementById("submit");
		submit.click();
		});

		gBrowser.removeTab(tab);
		yield BrowserTestUtils.closeWindow(win);
		});

browser/components/originattributes/test/browser/test_firstParty_http_redirect_to_same_domain.html

0 → 100644

+9 −0

Original line number	Diff line number	Diff line
		<!DOCTYPE HTML>
		<html>
		<head>
		<meta charset="utf-8"/>
		<title>Test for Bug 1260931</title>
		</head>
		<body>
		</body>
		</html>

browser/components/originattributes/test/browser/test_firstParty_http_redirect_to_same_domain.html^headers^

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		HTTP 302 Found
		Location: http://mochi.test:8888/browser/browser/components/originattributes/test/browser/dummy.html

browser/components/originattributes/test/browser/test_form.html

0 → 100644

+14 −0

Original line number	Diff line number	Diff line
		<!DOCTYPE HTML>
		<html>
		<head>
		<meta charset="utf-8">
		<title>Test for Bug 1260931</title>
		</head>
		<body>
		<form action="test_firstParty_http_redirect_to_same_domain.html" method="POST">
		First name: <input type="text" name="fname"><br>
		Last name: <input type="text" name="lname"><br>
		<input type="submit" id="submit" value="Submit">
		</form>
		</body>
		</html>