April 2017 - tbb-commits - lists.torproject.org

[tor-browser/tor-browser-52.1.0esr-7.0-2] Bug 1274020 - Tests that shows the Cache Web API is separated by origin attributes. r=baku
by gk＠torproject.org 27 Apr '17

27 Apr '17

commit 3da33fc90ce348fbc594d5aa45e85d8a4f08e539 Author: Jonathan Hao <jhao(a)mozilla.com> Date: Tue Dec 13 11:44:59 2016 +0800 Bug 1274020 - Tests that shows the Cache Web API is separated by origin attributes. r=baku --HG-- extra : rebase_source : 8964090126795ed45650e76c4f9e02b2e60f62cf --- .../originattributes/test/browser/browser.ini | 1 + .../originattributes/test/browser/browser_cacheAPI.js | 18 ++++++++++++++++++ .../components/originattributes/test/browser/head.js | 7 +++++-- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/browser/components/originattributes/test/browser/browser.ini b/browser/components/originattributes/test/browser/browser.ini index 121dd0c..911d42f 100644 --- a/browser/components/originattributes/test/browser/browser.ini +++ b/browser/components/originattributes/test/browser/browser.ini @@ -68,3 +68,4 @@ support-files = [browser_sharedworker.js] [browser_httpauth.js] [browser_clientAuth.js] +[browser_cacheAPI.js] diff --git a/browser/components/originattributes/test/browser/browser_cacheAPI.js b/browser/components/originattributes/test/browser/browser_cacheAPI.js new file mode 100644 index 0000000..87dcfe5 --- /dev/null +++ b/browser/components/originattributes/test/browser/browser_cacheAPI.js @@ -0,0 +1,18 @@ +const requestURL = "https://test1.example.com"; + +function getResult(aBrowser) { + return ContentTask.spawn(aBrowser, requestURL, function* (url) { + let cache = yield content.caches.open("TEST_CACHE"); + let response = yield cache.match(url); + if (response) { + return response.statusText; + } + let result = Math.random().toString(); + response = new content.Response("", { statusText: result }); + yield cache.put(url, response); + return result; + }); +} + +IsolationTestTools.runTests("https://test2.example.com", getResult, null, null, + false, /* aUseHttps */ true); diff --git a/browser/components/originattributes/test/browser/head.js b/browser/components/originattributes/test/browser/head.js index 96559a1..7835ccf 100644 --- a/browser/components/originattributes/test/browser/head.js +++ b/browser/components/originattributes/test/browser/head.js @@ -279,7 +279,7 @@ this.IsolationTestTools = { * An optional boolean to ensure we get results before the next tab is opened. */ runTests(aURL, aGetResultFuncs, aCompareResultFunc, aBeforeFunc, - aGetResultImmediately) { + aGetResultImmediately, aUseHttps) { let pageURL; let firstFrameSetting; let secondFrameSetting; @@ -301,7 +301,10 @@ this.IsolationTestTools = { aGetResultFuncs = [aGetResultFuncs]; } - let tabSettings = [ + let tabSettings = aUseHttps ? [ + { firstPartyDomain: "https://example.com", userContextId: 1}, + { firstPartyDomain: "https://example.org", userContextId: 2} + ] : [ { firstPartyDomain: "http://example.com", userContextId: 1}, { firstPartyDomain: "http://example.org", userContextId: 2} ];

1 0

[tor-browser/tor-browser-52.1.0esr-7.0-2] Bug 1315602 - Remove the assertion of FirstPartyDomain should be empty in HTTP redirect. r=smaug
by gk＠torproject.org 27 Apr '17

27 Apr '17

commit efd86213b996d351757498968481962eb610c06c Author: Yoshi Huang <allstars.chh(a)mozilla.com> Date: Mon Nov 7 14:59:05 2016 +0800 Bug 1315602 - Remove the assertion of FirstPartyDomain should be empty in HTTP redirect. r=smaug --- .../originattributes/test/browser/browser.ini | 6 ++ .../test/browser/browser_firstPartyIsolation.js | 105 +++++++++++++++++++++ ...st_firstParty_http_redirect_to_same_domain.html | 9 ++ ...arty_http_redirect_to_same_domain.html^headers^ | 2 + .../originattributes/test/browser/test_form.html | 14 +++ .../originattributes/test/browser/window2.html | 11 +++ .../originattributes/test/browser/window3.html | 11 +++ .../test/browser/window_redirect.html | 12 +++ netwerk/protocol/http/HttpBaseChannel.cpp | 2 - 9 files changed, 170 insertions(+), 2 deletions(-) diff --git a/browser/components/originattributes/test/browser/browser.ini b/browser/components/originattributes/test/browser/browser.ini index 61f6743..121dd0c 100644 --- a/browser/components/originattributes/test/browser/browser.ini +++ b/browser/components/originattributes/test/browser/browser.ini @@ -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 diff --git a/browser/components/originattributes/test/browser/browser_firstPartyIsolation.js b/browser/components/originattributes/test/browser/browser_firstPartyIsolation.js index ddda6af..53fa858 100644 --- a/browser/components/originattributes/test/browser/browser_firstPartyIsolation.js +++ b/browser/components/originattributes/test/browser/browser_firstPartyIsolation.js @@ -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… + // 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); +}); diff --git a/browser/components/originattributes/test/browser/test_firstParty_http_redirect_to_same_domain.html b/browser/components/originattributes/test/browser/test_firstParty_http_redirect_to_same_domain.html new file mode 100644 index 0000000..7b794a0 --- /dev/null +++ b/browser/components/originattributes/test/browser/test_firstParty_http_redirect_to_same_domain.html @@ -0,0 +1,9 @@ +<!DOCTYPE HTML> +<html> +<head> + <meta charset="utf-8"/> + <title>Test for Bug 1260931</title> +</head> +<body> +</body> +</html> diff --git a/browser/components/originattributes/test/browser/test_firstParty_http_redirect_to_same_domain.html^headers^ b/browser/components/originattributes/test/browser/test_firstParty_http_redirect_to_same_domain.html^headers^ new file mode 100644 index 0000000..e4af8ed --- /dev/null +++ b/browser/components/originattributes/test/browser/test_firstParty_http_redirect_to_same_domain.html^headers^ @@ -0,0 +1,2 @@ +HTTP 302 Found +Location: http://mochi.test:8888/browser/browser/components/originattributes/test/bro… diff --git a/browser/components/originattributes/test/browser/test_form.html b/browser/components/originattributes/test/browser/test_form.html new file mode 100644 index 0000000..db1b900 --- /dev/null +++ b/browser/components/originattributes/test/browser/test_form.html @@ -0,0 +1,14 @@ +<!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> diff --git a/browser/components/originattributes/test/browser/window2.html b/browser/components/originattributes/test/browser/window2.html new file mode 100644 index 0000000..3c5a7fb --- /dev/null +++ b/browser/components/originattributes/test/browser/window2.html @@ -0,0 +1,11 @@ +<html> + <head> + <meta charset="utf8"> + <title>Page creating a popup</title> + </head> + <body> + <script type="text/javascript"> + var w = window.open("http://example.com/browser/browser/components/originattributes/test/browser…", "test"); + </script> + </body> +</html> diff --git a/browser/components/originattributes/test/browser/window3.html b/browser/components/originattributes/test/browser/window3.html new file mode 100644 index 0000000..168ced6 --- /dev/null +++ b/browser/components/originattributes/test/browser/window3.html @@ -0,0 +1,11 @@ +<html> + <head> + <meta charset="utf8"> + <title>Page creating a popup</title> + </head> + <body> + <script type="text/javascript"> + var w = window.open("http://example.com/browser/browser/components/originattributes/test/browser…", "test"); + </script> + </body> +</html> diff --git a/browser/components/originattributes/test/browser/window_redirect.html b/browser/components/originattributes/test/browser/window_redirect.html new file mode 100644 index 0000000..b51cdf4 --- /dev/null +++ b/browser/components/originattributes/test/browser/window_redirect.html @@ -0,0 +1,12 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"> +<html> + <head> + <meta charset="utf8"> + <title>Page creating a popup</title> + </head> + <body> + <script type="text/javascript"> + var w = window.open('test_firstParty_http_redirect_to_same_domain.html', "test"); + </script> + </body> +</html> diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp index d2bc0cc..e0f7ede 100644 --- a/netwerk/protocol/http/HttpBaseChannel.cpp +++ b/netwerk/protocol/http/HttpBaseChannel.cpp @@ -3034,8 +3034,6 @@ HttpBaseChannel::SetupReplacementChannel(nsIURI *newURI, if (loadContext) { loadContext->GetOriginAttributes(docShellAttrs); } - MOZ_ASSERT(docShellAttrs.mFirstPartyDomain.IsEmpty(), - "top-level docshell shouldn't have firstPartyDomain attribute."); NeckoOriginAttributes attrs = newLoadInfo->GetOriginAttributes();

1 0

[tor-browser/tor-browser-52.1.0esr-7.0-2] Bug 1282655 - Test if site permissions are universal across origin attributes. r=tanvi
by gk＠torproject.org 27 Apr '17

27 Apr '17

commit 59cba8d0681caf53c46cd3718e34c9a49f9c5921 Author: Jonathan Hao <jhao(a)mozilla.com> Date: Mon Dec 26 22:38:00 2016 -0500 Bug 1282655 - Test if site permissions are universal across origin attributes. r=tanvi --HG-- extra : rebase_source : 6155960b626c29092c96ea7fbc605cc0b637d918 --- .../originattributes/test/browser/browser.ini | 1 + .../test/browser/browser_permissions.js | 44 ++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/browser/components/originattributes/test/browser/browser.ini b/browser/components/originattributes/test/browser/browser.ini index 911d42f..d503e9e 100644 --- a/browser/components/originattributes/test/browser/browser.ini +++ b/browser/components/originattributes/test/browser/browser.ini @@ -69,3 +69,4 @@ support-files = [browser_httpauth.js] [browser_clientAuth.js] [browser_cacheAPI.js] +[browser_permissions.js] diff --git a/browser/components/originattributes/test/browser/browser_permissions.js b/browser/components/originattributes/test/browser/browser_permissions.js new file mode 100644 index 0000000..fd3220b --- /dev/null +++ b/browser/components/originattributes/test/browser/browser_permissions.js @@ -0,0 +1,44 @@ +/** + * Bug 1282655 - Test if site permissions are universal across origin attributes. + * + * This test is testing the cookie "permission" for a specific URI. + */ + +const TEST_PAGE = "http://example.net"; +const uri = Services.io.newURI(TEST_PAGE, null, null); + +function disableCookies() { + Services.cookies.removeAll(); + Services.perms.add(uri, "cookie", Services.perms.DENY_ACTION); +} + +function ensureCookieNotSet(aBrowser) { + ContentTask.spawn(aBrowser, null, function*() { + content.document.cookie = "key=value"; + is(content.document.cookie, "", "Setting/reading cookies should be disabled" + + " for this domain for all origin attribute combinations."); + }); +} + +IsolationTestTools.runTests(TEST_PAGE, ensureCookieNotSet, () => true, + disableCookies); + +function enableCookies() { + Services.cookies.removeAll(); + Services.perms.add(uri, "cookie", Services.perms.ALLOW_ACTION); +} + +function ensureCookieSet(aBrowser) { + ContentTask.spawn(aBrowser, null, function() { + content.document.cookie = "key=value"; + is(content.document.cookie, "key=value", "Setting/reading cookies should be" + + " enabled for this domain for all origin attribute combinations."); + }); +} + +IsolationTestTools.runTests(TEST_PAGE, ensureCookieSet, () => true, + enableCookies); + +registerCleanupFunction(() => { + Services.cookies.removeAll(); +});

1 0

[rbm/master] Fix how we set origin_project in input_files
by boklm＠torproject.org 27 Apr '17

27 Apr '17

commit 1a2a9d99ee058d5ca9d4e0f524cbb4eb771762e7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 27 12:14:12 2017 +0200 Fix how we set origin_project in input_files --- lib/RBM.pm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index c92ae65..57a6161 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -761,7 +761,6 @@ sub input_files { $input_file->{target}); $input_file->{_target_processed} = 1; } - $options->{origin_project} = $project; if ($action eq 'getfnames') { my $getfnames_name; if ($input_file->{name}) { @@ -773,7 +772,10 @@ sub input_files { $res_getfnames{$getfnames_name} = sub { my ($project, $options) = @_; $options //= {}; - $options->{origin_project} = $project; + if ($input_file->{project}) { + $options = {%$options}; + $options->{origin_project} = $project; + } my $t = sub { RBM::project_config($project, $_[0], { %$options, %$input_file }) }; @@ -791,6 +793,7 @@ sub input_files { if ($input_file->{project}) { $proj_out_dir = path(project_step_config($t->('project'), 'output_dir', { %$options, step => $t->('pkg_type'), + origin_project => $project, output_dir => undef, %$input_file })); } else { $proj_out_dir = path(project_config($project, 'output_dir', @@ -802,7 +805,8 @@ sub input_files { $url ? basename($url) : undef; $name //= project_step_config($t->('project'), 'filename', - {%$options, step => $t->('pkg_type'), %$input_file}) + {%$options, step => $t->('pkg_type'), + origin_project => $project, %$input_file}) if $input_file->{project}; exit_error("Missing filename:\n" . pp($input_file)) unless $name; my ($fname) = file_in_dir($name, $src_dir, $proj_out_dir); @@ -827,7 +831,8 @@ sub input_files { my $run_save = $config->{run}; $config->{run} = { target => $input_file->{target} }; $config->{run}{target} //= $run_save->{target}; - build_pkg($p, {%$options, %$input_file, output_dir => $proj_out_dir}); + build_pkg($p, {%$options, origin_project => $project, %$input_file, + output_dir => $proj_out_dir}); $config->{run} = $run_save; print "Finished build of project $p - $name\n"; } else {

1 0

[rbm/master] Remove useless comma
by boklm＠torproject.org 27 Apr '17

27 Apr '17

commit 0bf69095d566885d3daa23fd51dae28a02d84590 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 27 12:29:03 2017 +0200 Remove useless comma --- lib/RBM.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 3fa8d35..50332d7 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -745,7 +745,7 @@ sub input_files { my $need_dl = $action ne 'getfpaths'; my $input_files_id = ''; $options = {$options ? %$options : ()}; - my $input_files = project_config($project, 'input_files', $options,); + my $input_files = project_config($project, 'input_files', $options); goto RETURN_RES unless $input_files; my $proj_dir = path(project_config($project, 'projects_dir', $options)); my $src_dir = "$proj_dir/$project";

1 0

[rbm/master] Avoid modifying $input_files
by boklm＠torproject.org 27 Apr '17

27 Apr '17

commit 106e9b05aeff6309e241a3c9bae1781e0d551e7a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 27 12:30:25 2017 +0200 Avoid modifying $input_files If an input_file contains a 'target' value we process it as a template and modify it. However we should not do that as a project (and its input files) can be used multiple times with different contexts in the same build. Instead we should make a copy of the $input_file before we modify it. --- lib/RBM.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 50332d7..6825050 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -751,7 +751,8 @@ sub input_files { my $src_dir = "$proj_dir/$project"; my $old_cwd = getcwd; chdir $src_dir || exit_error "cannot chdir to $src_dir"; - foreach my $input_file (@$input_files) { + foreach my $input_file_alias (@$input_files) { + my $input_file = $input_file_alias; if (!ref $input_file) { $input_file = project_config($project, process_template_opt($project, $input_file, $options), $options); @@ -765,10 +766,10 @@ sub input_files { if ($input_file->{enable} && !$t->('enable')) { next; } - if ($input_file->{target} && ! $input_file->{_target_processed}) { + if ($input_file->{target}) { + $input_file = { %$input_file }; $input_file->{target} = process_template_opt($project, $input_file->{target}, $options); - $input_file->{_target_processed} = 1; } if ($action eq 'getfnames') { my $getfnames_name;

1 0

[rbm/master] Add process_template_opt subroutine
by boklm＠torproject.org 27 Apr '17

27 Apr '17

commit 36d9a7357740ba9d7b939738b199f7ec11ce80b2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 27 12:19:57 2017 +0200 Add process_template_opt subroutine In the few places where we are using process_template directly, the $options is ignored. We fix that by adding a process_template_opt subroutine which applies the $options. --- lib/RBM.pm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 57a6161..3fa8d35 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -587,6 +587,15 @@ sub sha256file { return $res{$f} = -f $f ? sha256_hex(scalar read_file($f)) : ''; } +sub process_template_opt { + my ($project, $tmpl, $opt, $dest_dir) = @_; + my $save_opt = $config->{opt}; + $config->{opt} = {%{$config->{opt}}, %$opt} if $opt; + my $res = process_template($project, $tmpl, $dest_dir); + $config->{opt} = $save_opt; + return $res; +} + sub process_template { my ($project, $tmpl, $dest_dir) = @_; return undef unless defined $tmpl; @@ -745,7 +754,7 @@ sub input_files { foreach my $input_file (@$input_files) { if (!ref $input_file) { $input_file = project_config($project, - process_template($project, $input_file), $options); + process_template_opt($project, $input_file, $options), $options); } next unless $input_file; my $t = sub { @@ -757,8 +766,8 @@ sub input_files { next; } if ($input_file->{target} && ! $input_file->{_target_processed}) { - $input_file->{target} = process_template($project, - $input_file->{target}); + $input_file->{target} = process_template_opt($project, + $input_file->{target}, $options); $input_file->{_target_processed} = 1; } if ($action eq 'getfnames') {

1 0

[tor-browser/tor-browser-52.1.0esr-7.0-2] fixup! Bug 12827: Create preference to disable SVG.
by gk＠torproject.org 26 Apr '17

26 Apr '17

commit 2d386f0b0ce34aaf97b814da1867bb94a93b62a2 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Apr 19 16:29:59 2017 -0400 fixup! Bug 12827: Create preference to disable SVG. If the top window's URI is not available, check for the system principal to determine if SVGs may be used. This fixes bug 21962. --- layout/svg/nsSVGUtils.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/layout/svg/nsSVGUtils.cpp b/layout/svg/nsSVGUtils.cpp index 1217e92..98dd287e 100644 --- a/layout/svg/nsSVGUtils.cpp +++ b/layout/svg/nsSVGUtils.cpp @@ -114,6 +114,7 @@ NS_SVGEnabledForChannel(nsIChannel *aChannel) #ifdef DEBUG_SVG_ENABLE nsAutoCString topDocSpec; // Set if approved via a whitelisted top doc. + bool checkedSystemPrincipal = false; #endif bool isSVGAllowed = false; @@ -152,6 +153,18 @@ NS_SVGEnabledForChannel(nsIChannel *aChannel) if (isSVGAllowed) topDocURI->GetSpec(topDocSpec); #endif + } else { + // Unable to retrieve the top window's URI. Fallback to checking + // the system principal (see bug 21962). +#ifdef DEBUG_SVG_ENABLE + checkedSystemPrincipal = true; +#endif + nsCOMPtr<nsIScriptObjectPrincipal> scriptObjPrin = + do_QueryInterface(topWin); + if (scriptObjPrin) { + isSVGAllowed = nsContentUtils::IsSystemPrincipal( + scriptObjPrin->GetPrincipal()); + } } } } @@ -166,7 +179,10 @@ NS_SVGEnabledForChannel(nsIChannel *aChannel) if (uri) uri->GetSpec(spec); - if (topDocSpec.IsEmpty()) { + if (checkedSystemPrincipal) { + printf("NS_SVGEnabledForChannel for %s: %s (via system principal check)\n", + spec.get(), isSVGAllowed ? "YES" : "NO"); + } else if (topDocSpec.IsEmpty()) { printf("NS_SVGEnabledForChannel for %s: %s\n", spec.get(), isSVGAllowed ? "YES" : "NO"); } else {

1 0

[rbm/master] Give access to input files in remote_start
by boklm＠torproject.org 25 Apr '17

25 Apr '17

commit 4ba70051b24eb0cf71f3d57f66a1c604d7d1125d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Apr 25 22:17:17 2017 +0200 Give access to input files in remote_start --- doc/rbm_remote.asc | 4 +++- lib/RBM.pm | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/rbm_remote.asc b/doc/rbm_remote.asc index 8888696..479062a 100644 --- a/doc/rbm_remote.asc +++ b/doc/rbm_remote.asc @@ -44,7 +44,9 @@ remote_get:: remote_start:: the template of a command that will start the remote host before we can access it. This can be useful for instance if you need - to start a VM, or fetch a container. + to start a VM, or fetch a container. If access to an input file is + needed, the +remote_srcdir+ option is pointing to a temporary + directory containing the input files. remote_finish:: the template of a command that will stop the remote host after diff --git a/lib/RBM.pm b/lib/RBM.pm index 79e0670..c92ae65 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -949,7 +949,10 @@ sub build_run { my @scripts = ('pre', $script_name, 'post'); my %scripts_root = ( pre => 1, post => 1); if (project_config($project, "remote_exec", $options)) { - my $cmd = project_config($project, "remote_start", $options); + my $cmd = project_config($project, "remote_start", { + %$options, + remote_srcdir => $srcdir, + }); if ($cmd) { my ($stdout, $stderr, $success, $exit_code) = run_script($project, $cmd, \&capture_exec);

1 0

[tor-browser/tor-browser-52.1.0esr-7.0-2] fixup! Bug 6253: Add canvas image extraction prompt.
by gk＠torproject.org 25 Apr '17

25 Apr '17

commit 1182bee9789a632f374f0a6d3ed90f21af1e37c5 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Apr 25 11:52:26 2017 -0400 fixup! Bug 6253: Add canvas image extraction prompt. Bug 21778: Canvas prompt not showing in Tor Browser based in ESR52 When running in multiprocess mode, use IPC to relay the canvas-permissions-prompt observer notification to the chrome (parent) process. --- browser/base/content/browser.js | 23 +++++++++++++++++++---- dom/canvas/CanvasUtils.cpp | 17 ++++++++++++++--- dom/ipc/PBrowser.ipdl | 8 ++++++++ dom/ipc/TabParent.cpp | 12 ++++++++++++ dom/ipc/TabParent.h | 1 + 5 files changed, 54 insertions(+), 7 deletions(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 686805fb..83aca07 100755 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -6302,20 +6302,35 @@ var CanvasPermissionPromptHelper = { Services.obs.removeObserver(this, this._permissionsPrompt, false); }, - // aSubject is an nsIDOMWindow. + // aSubject is an nsIBrowser (e10s) or an nsIDOMWindow (non-e10s). // aData is an URL string. observe: function CanvasPermissionPromptHelper_observe(aSubject, aTopic, aData) { if (aTopic != this._permissionsPrompt) { - throw new Error("Unexpected topic"); + throw new Error("Unexpected topic"); } + + let browser; + try { + browser = aSubject.QueryInterface(Ci.nsIBrowser); + } catch (e) {} + + if (!browser) { + try { + let contentWindow = aSubject.QueryInterface(Ci.nsIDOMWindow); + browser = gBrowser.getBrowserForContentWindow(contentWindow); + } catch (e) {} + + if (!browser) { + throw new Error("No browser"); + } + } + if (!aData) { throw new Error("Missing URL"); } var uri = makeURI(aData); - var contentWindow = aSubject.QueryInterface(Ci.nsIDOMWindow); - var browser = gBrowser.getBrowserForContentWindow(contentWindow); if (gBrowser.selectedBrowser !== browser) { // Must belong to some other window. return; diff --git a/dom/canvas/CanvasUtils.cpp b/dom/canvas/CanvasUtils.cpp index bd5c44d..dceccfd 100644 --- a/dom/canvas/CanvasUtils.cpp +++ b/dom/canvas/CanvasUtils.cpp @@ -15,6 +15,7 @@ #include "nsICanvasRenderingContextInternal.h" #include "nsIHTMLCollection.h" #include "mozilla/dom/HTMLCanvasElement.h" +#include "mozilla/dom/TabChild.h" #include "nsIPrincipal.h" #include "nsGfxCIID.h" @@ -144,9 +145,19 @@ bool IsImageExtractionAllowed(nsIDocument *aDocument, JSContext *aCx) nsContentUtils::LogMessageToConsole(message.get()); // Prompt the user (asynchronous). - nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService(); - obs->NotifyObservers(win, TOPIC_CANVAS_PERMISSIONS_PROMPT, - NS_ConvertUTF8toUTF16(topLevelDocURISpec).get()); + if (XRE_IsContentProcess()) { + TabChild* tabChild = TabChild::GetFrom(win); + if (tabChild) { + tabChild->SendShowCanvasPermissionPrompt(topLevelDocURISpec); + } + } else { + nsCOMPtr<nsIObserverService> obs = + mozilla::services::GetObserverService(); + if (obs) { + obs->NotifyObservers(win, TOPIC_CANVAS_PERMISSIONS_PROMPT, + NS_ConvertUTF8toUTF16(topLevelDocURISpec).get()); + } + } // We don't extract the image for now -- user may override at prompt. return false; diff --git a/dom/ipc/PBrowser.ipdl b/dom/ipc/PBrowser.ipdl index 249657c..cc4c4dc 100644 --- a/dom/ipc/PBrowser.ipdl +++ b/dom/ipc/PBrowser.ipdl @@ -619,6 +619,14 @@ parent: */ async RequestCrossBrowserNavigation(uint32_t aGlobalIndex); + /** + * This function is used to notify the parent that it should display a + * canvas permission prompt. + * + * @param aFirstPartyURI first party of the tab that is requesting access. + */ + async ShowCanvasPermissionPrompt(nsCString aFirstPartyURI); + child: /** * Notify the remote browser that it has been Show()n on this diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp index 0df4c12..ff1b41a 100644 --- a/dom/ipc/TabParent.cpp +++ b/dom/ipc/TabParent.cpp @@ -3277,6 +3277,18 @@ TabParent::RecvRequestCrossBrowserNavigation(const uint32_t& aGlobalIndex) return NS_SUCCEEDED(frameLoader->RequestGroupedHistoryNavigation(aGlobalIndex)); } +bool +TabParent::RecvShowCanvasPermissionPrompt(const nsCString& firstPartyURI) +{ + nsCOMPtr<nsIBrowser> browser = do_QueryInterface(mFrameElement); + NS_ENSURE_TRUE(browser, false); + nsCOMPtr<nsIObserverService> os = services::GetObserverService(); + NS_ENSURE_TRUE(os, false); + nsresult rv = os->NotifyObservers(browser, "canvas-permissions-prompt", + NS_ConvertUTF8toUTF16(firstPartyURI).get()); + return NS_SUCCEEDED(rv); +} + NS_IMETHODIMP FakeChannel::OnAuthAvailable(nsISupports *aContext, nsIAuthInformation *aAuthInfo) { diff --git a/dom/ipc/TabParent.h b/dom/ipc/TabParent.h index 43afb05..b8022e1 100644 --- a/dom/ipc/TabParent.h +++ b/dom/ipc/TabParent.h @@ -633,6 +633,7 @@ protected: virtual bool RecvNotifySessionHistoryChange(const uint32_t& aCount) override; virtual bool RecvRequestCrossBrowserNavigation(const uint32_t& aGlobalIndex) override; + virtual bool RecvShowCanvasPermissionPrompt(const nsCString& firstPartyURI) override; ContentCacheInParent mContentCache;

1 0