- tbb-commits - lists.torproject.org

[tor-browser-bundle-testsuite/master] Fix readelf_no_rpath test
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit a05667015ccd4811a3b4901d8bcc97eb455773b7 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon May 18 15:52:27 2020 +0200 Fix readelf_no_rpath test --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index 90d445c..b7014f4 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -180,6 +180,9 @@ our @tests = ( command => [ 'readelf', '-d' ], check_output => sub { ! ( $_[0] =~ m/runpath/ ) }, enable => sub { $OSNAME eq 'linux' }, + skip_files => [ qw( + updater + ) ], # We have tor-browser-build#40092 for investigating this }, { name => 'otool_PIE',

1 0

[tor-browser-bundle-testsuite/master] Fix searchengines test
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit aa420c446bacd1dd800ad75467261726037b5ec2 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon May 18 09:36:03 2020 +0200 Fix searchengines test --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 2 -- marionette/tor_browser_tests/test_searchengines.py | 13 ++++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index 0bf4359..91aa6f0 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -385,8 +385,6 @@ our @tests = ( name => 'searchengines', type => 'marionette', descr => 'Check that we have the default search engines set', - # Bug 30340: temporarily disable test - enable => sub { undef }, }, { name => 'noscript', diff --git a/marionette/tor_browser_tests/test_searchengines.py b/marionette/tor_browser_tests/test_searchengines.py index 69d0ffe..eeb2c6b 100644 --- a/marionette/tor_browser_tests/test_searchengines.py +++ b/marionette/tor_browser_tests/test_searchengines.py @@ -22,12 +22,15 @@ class Test(MarionetteTestCase): def test_searchengines(self): with self.marionette.using_context('content'): - self.marionette.navigate('about:') + self.marionette.navigate('about:robots') with self.marionette.using_context('chrome'): - searchbar = self.marionette.find_element('id', 'searchbar') - txtbox = searchbar.find_element('anon attribute', {'anonid': 'searchbar-textbox'}) - self.assertRegexpMatches(txtbox.get_attribute('label'), 'DuckDuckGo', - 'DuckDuckGo is not the default search engine!') + self.marionette.timeout.implicit = 5 + searchbar = self.marionette.find_element('id', 'urlbar-input') + searchbar.click() + searchbar.send_keys("test") + urlbarresults = self.marionette.find_element('id', 'urlbar-results') + result = urlbarresults.find_element("css selector", "div:first-child .urlbarView-action") + self.assertRegexpMatches(result.text, 'DuckDuckGo', 'DuckDuckGo is not the default search engine!') #XXX: Test whether the second and third engine are the ones we want as well.

1 0

[tor-browser-bundle-testsuite/master] Fix play_videos test
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit e8a5a6b29969e9b68a2d4acc989508b6a5ee748f Author: Alex Catarineu <acat(a)torproject.org> Date: Mon May 18 10:26:07 2020 +0200 Fix play_videos test --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 4 +--- marionette/tor_browser_tests/test_page.py | 5 +++-- test-data/play_videos.html | 3 ++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index 4223132..365b7bc 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -428,10 +428,8 @@ our @tests = ( descr => 'Play some videos', use_net => 1, marionette_test => 'page', - remote => 1, + remote => 0, timeout => 50000, - # Bug 30339: temporarily disable test - enable => sub { undef }, }, { name => 'svg-disable', diff --git a/marionette/tor_browser_tests/test_page.py b/marionette/tor_browser_tests/test_page.py index d03367c..3d1f4cc 100644 --- a/marionette/tor_browser_tests/test_page.py +++ b/marionette/tor_browser_tests/test_page.py @@ -13,9 +13,10 @@ class Test(MarionetteTestCase): if ts.t['test']['remote']: test_data_url = ts.t['options']['test_data_url'] + self.test_page_url = '%s/%s.html' % (test_data_url, ts.t['test']['name']) else: - test_data_url = "file://%s" % ts.t['options']['test_data_dir'] - self.test_page_url = '%s/%s.html' % (test_data_url, ts.t['test']['name']) + self.test_page_url = self.marionette.absolute_url('%s.html' % (ts.t['test']['name'])) + self.marionette.set_pref("network.proxy.allow_hijacking_localhost", False) if ts.t['test']['timeout']: self.timeout = ts.t['test']['timeout'] diff --git a/test-data/play_videos.html b/test-data/play_videos.html index 76e4d1f..a2f4112 100644 --- a/test-data/play_videos.html +++ b/test-data/play_videos.html @@ -34,7 +34,8 @@ for (var i = 0; i < videos.length; i++) { next[v.id] = 'videos_' + (i + 1).toString(); document.getElementById("videos").appendChild(v); } -document.getElementById("videos_0").play(); +const first = document.getElementById("videos_0"); +first.addEventListener("canplay", () => first.play()); </script> </body>

1 0

[tor-browser-bundle-testsuite/master] Fix svg tests
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit 838c00e3f9b562ccd3b4b5809b6fb4fe34b3814d Author: Alex Catarineu <acat(a)torproject.org> Date: Mon May 18 11:42:53 2020 +0200 Fix svg tests --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 10 +---- marionette/tor_browser_tests/test_svg.py | 67 +++++++++++++--------------- test-data/svg/object_data_url.html | 2 +- 3 files changed, 33 insertions(+), 46 deletions(-) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index 365b7bc..90d445c 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -439,11 +439,8 @@ our @tests = ( use_net => 1, prefs => { 'extensions.torbutton.security_custom' => 'true', - 'svg.in-content.enabled' => 'false', + 'svg.disabled' => 'true', }, - # Bug 28798: temporarily disable test - enable => sub { undef }, - #enable => sub { $OSNAME eq 'linux' }, }, { name => 'svg-enable', @@ -453,11 +450,8 @@ our @tests = ( use_net => 1, prefs => { 'extensions.torbutton.security_custom' => 'true', - 'svg.in-content.enabled' => 'true', + 'svg.disabled' => 'false', }, - # Bug 28798: temporarily disable test - enable => sub { undef }, - #enable => sub { $OSNAME eq 'linux' }, }, { name => 'download_pdf', diff --git a/marionette/tor_browser_tests/test_svg.py b/marionette/tor_browser_tests/test_svg.py index e420d60..af55b1b 100644 --- a/marionette/tor_browser_tests/test_svg.py +++ b/marionette/tor_browser_tests/test_svg.py @@ -1,11 +1,9 @@ -from marionette_driver import By from marionette_driver.errors import MarionetteException, JavascriptException, NoSuchElementException from marionette_harness import MarionetteTestCase import testsuite - class Test(MarionetteTestCase): def setUp(self): @@ -14,62 +12,58 @@ class Test(MarionetteTestCase): ts = testsuite.TestSuite() self.ts = ts - self.svg_dir = "file://%s/svg/" % ts.t['options']['test_data_dir'] + self.marionette.set_pref("network.proxy.allow_hijacking_localhost", False) def test_svg(self): m = self.marionette svg_enabled = self.ts.t['test']['name'] == 'svg-enable' - self.assertEqual(self.marionette.get_pref('svg.in-content.enabled'), - svg_enabled, - msg="svg.in-content.enabled is not set correctly") + self.assertEqual(self.marionette.get_pref('svg.disabled'), + not svg_enabled, + msg="svg.disabled is not set correctly") - m.set_search_timeout(1000) + self.marionette.timeout.implicit = 1 with m.using_context('content'): # img src url - m.navigate("%s/img_src_url.html" % self.svg_dir) + m.navigate(self.marionette.absolute_url("svg/img_src_url.html")) svg_elt = m.find_element('id', 'svgImgElem') self.assertEqual(svg_elt.get_property('width'), 450 if svg_enabled else 24, msg="img src url") # img data url - m.navigate("%s/img_data_url.html" % self.svg_dir) + m.navigate(self.marionette.absolute_url("svg/img_data_url.html")) svg_elt = m.find_element('id', 'svgImgElem') self.assertEqual(svg_elt.get_property('width'), 300 if svg_enabled else 24, msg="img data url") # object data url - m.navigate("%s/object_data_url.html" % self.svg_dir) - try: - visibility = m.execute_script(''' + m.navigate(self.marionette.absolute_url("svg/object_data_url.html")) + width = m.execute_script(''' var elt = document.getElementById("svgObjectElem"); - return elt.contentDocument.visibilityState; + return elt.getBoundingClientRect().width; ''') - except JavascriptException: - visibility = 'invisible' - self.assertEqual(visibility, - 'visible' if svg_enabled else 'invisible', - msg='object data url') + self.assertEqual(width, + 450 if svg_enabled else 300, + msg="object data url") # object remote url - m.navigate("%s/object_remote_url.html" % self.svg_dir) - try: - visibility = m.execute_script(''' + m.navigate(self.marionette.absolute_url("svg/object_remote_url.html")) + svg_elt = m.find_element('id', 'svgObjectElem') + + width = m.execute_script(''' var elt = document.getElementById("svgObjectElem"); - return elt.contentDocument.visibilityState; + return elt.getBoundingClientRect().width; ''') - except JavascriptException: - visibility = 'invisible' - self.assertEqual(visibility, - 'visible' if svg_enabled else 'invisible', - msg='object remote url') + self.assertEqual(width, + 450 if svg_enabled else 300, + msg="object remote url") # inline svg - m.navigate('%s/inline_svg.html' % self.svg_dir) + m.navigate(self.marionette.absolute_url("svg/inline_svg.html")) try: elt_width = m.execute_script(''' var elt = document.getElementById("inlineSVG"); @@ -77,19 +71,18 @@ class Test(MarionetteTestCase): ''') except JavascriptException: elt_width = None - print "width: %s" % elt_width self.assertEqual(elt_width, 300 if svg_enabled else None, msg='inline svg') # iframe remote url - m.navigate('%s/iframe_remote_url.html' % self.svg_dir) + m.navigate(self.marionette.absolute_url("svg/iframe_remote_url.html")) m.switch_to_frame(m.find_element('id', 'svgIframeElem')) - found_elt = True - try: - svg_elt = m.find_element('tag name', 'svg') - except NoSuchElementException: - found_elt = False - self.assertEqual(found_elt, True if svg_enabled else False, + svg_elt = m.find_element('tag name', 'svg') + width = m.execute_script(''' + var elt = document.getElementsByTagName("svg")[0]; + return elt.getBoundingClientRect().width; + ''') + self.assertEqual(width, + 450 if svg_enabled else 500, msg="iframe remote url prompt") - diff --git a/test-data/svg/object_data_url.html b/test-data/svg/object_data_url.html index 6d2a8b4..9e3344d 100644 --- a/test-data/svg/object_data_url.html +++ b/test-data/svg/object_data_url.html @@ -5,7 +5,7 @@ <title>SVG Test</title> <body> <div>object with data URL:<br> - <object id="svgObjectElem" type="image/svg+xml" data="data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg'><linearGradient id='g' x2='0' y2='100%'><stop stop-color='%23faf'/><stop offset='100%' stop-color='white'/></linearGradient><rect fill='url(%23g)' width='100%' height='100%'/></svg>"> + <object id="svgObjectElem" type="image/svg+xml" data="data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='450'><linearGradient id='g' x2='0' y2='100%'><stop stop-color='%23faf'/><stop offset='100%' stop-color='white'/></linearGradient><rect fill='url(%23g)' width='100%' height='100%'/></svg>"> this text appears when SVG is disabled </object> </div>

1 0

[tor-browser-bundle-testsuite/master] Bug 30431: Fix the https-everywhere test
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit 3f07e512d087e40845ce4d52ec4221f98baed878 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 14 18:26:12 2020 +0200 Bug 30431: Fix the https-everywhere test Temptatively fixing this flaky test by waiting until HTTPS Everywhere has loaded some rulesets. Also fix https-everywhere tests for builtin addon. --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 15 -------- .../tor_browser_tests/test_https-everywhere.py | 44 ++++++++++++++++++---- 2 files changed, 37 insertions(+), 22 deletions(-) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index e92fe6d..e35e903 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -272,27 +272,12 @@ our @tests = ( type => 'marionette', descr => 'Check that https everywhere is not doing anything when disabled', use_net => 1, - pre => sub { - my ($tbbinfos, $t) = @_; - my $hdir = "$tbbinfos->{tmpdir}/https-everywhere"; - mkdir "$hdir"; - move($tbbinfos->{ffprofiledir} . '/extensions/https-everywhere-eff(a)eff.org.xpi', - $hdir . '/https-everywhere-eff(a)eff.org.xpi'); - }, - post => sub { - my ($tbbinfos, $t) = @_; - my $hdir = "$tbbinfos->{tmpdir}/https-everywhere"; - move($hdir . '/https-everywhere-eff(a)eff.org.xpi', - $tbbinfos->{ffprofiledir} . '/extensions/https-everywhere-eff(a)eff.org.xpi'); - }, }, { name => 'https-everywhere', type => 'marionette', use_net => 1, descr => 'Check that https everywhere is working', - # Bug 30431: temporarily disable test - enable => sub { undef }, }, { name => 'settings', diff --git a/marionette/tor_browser_tests/test_https-everywhere.py b/marionette/tor_browser_tests/test_https-everywhere.py index 25d959e..7819771 100644 --- a/marionette/tor_browser_tests/test_https-everywhere.py +++ b/marionette/tor_browser_tests/test_https-everywhere.py @@ -1,11 +1,7 @@ -from marionette_driver import By -from marionette_driver.errors import MarionetteException - from marionette_harness import MarionetteTestCase - +from marionette_driver import Wait import testsuite - class Test(MarionetteTestCase): def setUp(self): @@ -17,13 +13,47 @@ class Test(MarionetteTestCase): self.HTTP_URL = "http://httpbin.org/" self.HTTPS_URL = "https://httpbin.org/" + self.is_disabled = self.ts.t['test']['name'] == 'https-everywhere-disabled' + + if self.is_disabled: + with self.marionette.using_context('chrome'): + self.marionette.execute_async_script(""" + let [resolve] = arguments; + const { AddonManager } = ChromeUtils.import( + "resource://gre/modules/AddonManager.jsm" + ); + AddonManager.getAddonByID("https-everywhere-eff(a)eff.org") + .then(addon => addon.disable()) + .then(resolve); + """) + + def tearDown(self): + super(Test, self).tearDown() + if self.is_disabled: + with self.marionette.using_context('chrome'): + self.marionette.execute_async_script(""" + let [resolve] = arguments; + const { AddonManager } = ChromeUtils.import( + "resource://gre/modules/AddonManager.jsm" + ); + AddonManager.getAddonByID("https-everywhere-eff(a)eff.org") + .then(addon => addon.enable()) + .then(resolve); + """) def test_https_everywhere(self): + # Wait until .tor.onion rules have been loaded, to make sure HTTPS Everywhere + # has loaded correctly. + m = self.marionette + if not self.is_disabled: + with m.using_context('chrome'): + Wait(m, timeout=m.timeout.page_load).until( + lambda _: m.execute_script("return OnionAliasStore._onionMap.size;") > 0) + with self.marionette.using_context('content'): self.marionette.navigate(self.HTTP_URL) - if self.ts.t['test']['name'] == 'https-everywhere': + if not self.is_disabled: self.assertEqual(self.marionette.get_url(), self.HTTPS_URL) else: self.assertEqual(self.marionette.get_url(), self.HTTP_URL) -

1 0

[tor-browser-bundle-testsuite/master] Fix several bridge tests
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit 7b3991c9ba73b514cdedf23d2d54df3166454466 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon May 18 15:55:45 2020 +0200 Fix several bridge tests --- tor-config/meek_config | 2 +- tor-config/tor_bridge.conf | 2 +- tor-config/tor_meek-azure.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tor-config/meek_config b/tor-config/meek_config index c851390..a795e1d 100644 --- a/tor-config/meek_config +++ b/tor-config/meek_config @@ -1,4 +1,4 @@ [% INCLUDE main_config %] -ClientTransportPlugin meek exec [% tbbinfos.ptdir %]/meek-client-torbrowser -- [% tbbinfos.ptdir %]/meek-client +ClientTransportPlugin meek_lite exec [% tbbinfos.ptdir %]/obfs4proxy diff --git a/tor-config/tor_bridge.conf b/tor-config/tor_bridge.conf index f9a5d7e..5d82115 100644 --- a/tor-config/tor_bridge.conf +++ b/tor-config/tor_bridge.conf @@ -1,4 +1,4 @@ [% INCLUDE main_config %] UseBridges 1 -Bridge 83.212.101.3:6666 +Bridge 35.170.192.213:12358 diff --git a/tor-config/tor_meek-azure.conf b/tor-config/tor_meek-azure.conf index 29f8601..0da1b9f 100644 --- a/tor-config/tor_meek-azure.conf +++ b/tor-config/tor_meek-azure.conf @@ -1,4 +1,4 @@ [% INCLUDE meek_config %] UseBridges 1 -Bridge meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com +Bridge meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com

1 0

[tor-browser-bundle-testsuite/master] Enable noscript test
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit 72d4af38812d87fc43e66891bc1e049f83f9ddb1 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon May 18 17:44:23 2020 +0200 Enable noscript test --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 2 -- marionette/tor_browser_tests/test_noscript.py | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index b7014f4..4a8908e 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -397,8 +397,6 @@ our @tests = ( prefs => { 'extensions.torbutton.security_slider' => 2, }, - # Bug 28876: temporarily disable test - enable => sub { undef }, }, { name => 'fp_screen_dimensions', diff --git a/marionette/tor_browser_tests/test_noscript.py b/marionette/tor_browser_tests/test_noscript.py index 6c3fdeb..8083098 100644 --- a/marionette/tor_browser_tests/test_noscript.py +++ b/marionette/tor_browser_tests/test_noscript.py @@ -7,7 +7,6 @@ from marionette_harness import MarionetteTestCase import testsuite - class Test(MarionetteTestCase): def setUp(self): @@ -21,7 +20,7 @@ class Test(MarionetteTestCase): def test_noscript(self): - self.marionette.set_search_timeout(1000) + self.marionette.timeout.implicit = 1 with self.marionette.using_context('content'):

1 0

[tor-browser-bundle-testsuite/master] Bug 40002: Add test for 'Add v3 onion services client authentication prompt' TB patch
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit 5c0a4650a88d4b616fb36afc2a57ebb78ab7f539 Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Jul 3 00:53:46 2020 +0200 Bug 40002: Add test for 'Add v3 onion services client authentication prompt' TB patch --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 7 + TBBTestSuite/Tests/TorBootstrap.pm | 4 + .../tor_browser_tests/test_onion_client_auth.py | 215 +++++++++++++++++++++ 3 files changed, 226 insertions(+) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index 37efae6..7d6c110 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -494,6 +494,13 @@ our @tests = ( use_net => 1, descr => 'Check that onion alias urlbar rewrites work properly', }, + { + name => 'onion_client_auth', + type => 'marionette', + use_net => 1, + descr => 'Check that onion client auth works properly', + run_once => 1, + }, { name => 'security_level_ui', type => 'marionette', diff --git a/TBBTestSuite/Tests/TorBootstrap.pm b/TBBTestSuite/Tests/TorBootstrap.pm index f35b4a2..006be59 100644 --- a/TBBTestSuite/Tests/TorBootstrap.pm +++ b/TBBTestSuite/Tests/TorBootstrap.pm @@ -153,11 +153,15 @@ sub start_tor { } write_file("$tbbinfos->{datadir}/Tor/torrc", ()) unless -f "$tbbinfos->{datadir}/Tor/torrc"; + # These arguments should be kept in sync with tor-launcher + mkdir "$tbbinfos->{datadir}/Tor/onion-auth" unless -d "$tbbinfos->{datadir}/Tor/onion-auth"; my @cmd = (winpath($tbbinfos->{torbin}), '--defaults-torrc', winpath($torrc_file), '-f', winpath("$tbbinfos->{datadir}/Tor/torrc"), 'DataDirectory', winpath("$tbbinfos->{datadir}/Tor"), 'GeoIPFile', winpath($tbbinfos->{torgeoip}), + 'ClientOnionAuthDir', winpath("$tbbinfos->{datadir}/Tor/onion-auth"), + '__SocksPort', "$options->{'tor-socks-port'} ExtendedErrors IPv6Traffic PreferIPv6 KeepAliveIsolateSOCKSAuth", '__OwningControllerProcess', winpid($$)); $tbbinfos->{torpid} = fork; if ($tbbinfos->{torpid} == 0) { diff --git a/marionette/tor_browser_tests/test_onion_client_auth.py b/marionette/tor_browser_tests/test_onion_client_auth.py new file mode 100644 index 0000000..38c8a34 --- /dev/null +++ b/marionette/tor_browser_tests/test_onion_client_auth.py @@ -0,0 +1,215 @@ +from marionette_driver import By, Wait +from marionette_driver.errors import MarionetteException, NoSuchElementException, TimeoutException +from marionette_driver.legacy_actions import Actions +from marionette_harness import MarionetteTestCase, WindowManagerMixin + +import testsuite + +from stem.control import Controller +from stem.process import launch_tor_with_config + +from urlparse import urlparse +from tempfile import mkdtemp +import shutil +import os +import base64 + +import time + + +class Test(WindowManagerMixin, MarionetteTestCase): + def setUp(self): + super(Test, self).setUp() + + self.public_key = 'E4ST65PDZDVZRAW2FLT5RBFKYEM3GW73SRQDMEBLBDHQP3Y4NADQ' + self.private_key = 'B7H4TVVQNEOIENRS3GW3GI4VLVTSZPKS7NVSJAIDTNLBRWKWPHLQ' + + self.tmp_dir = mkdtemp() + fixtures_port = urlparse(self.marionette.absolute_url('')).port + os.mkdir(os.path.join(self.tmp_dir, 'hidden_service'), 0700) + os.mkdir(os.path.join(self.tmp_dir, 'hidden_service', + 'authorized_clients'), 0700) + with open(os.path.join(self.tmp_dir, 'hidden_service', 'authorized_clients', 'alice.auth'), "w") as myfile: + myfile.write("descriptor:x25519:" + self.public_key + '\n') + + # Add tor executable directory to the LD_LIBRARY_PATH + ld_lib_list = filter(len, os.environ.get( + "LD_LIBRARY_PATH", "").split(":")) + tor_dirname = os.path.dirname( + testsuite.TestSuite().t['tbbinfos']['torbin']) + if tor_dirname not in ld_lib_list: + ld_lib_list = [tor_dirname] + ld_lib_list + os.environ["LD_LIBRARY_PATH"] = ":".join(ld_lib_list) + + self.tor_process = launch_tor_with_config( + config={ + 'ControlPort': '9999', + 'SOCKSPort': '0', + 'DataDirectory': self.tmp_dir, + 'HiddenServiceDir': os.path.join(self.tmp_dir, 'hidden_service'), + 'HiddenServicePort': '80 127.0.0.1:' + str(fixtures_port), + }, + take_ownership=True, + tor_cmd=testsuite.TestSuite().t['tbbinfos']['torbin'] + ) + + with open(os.path.join(self.tmp_dir, 'hidden_service', 'hostname'), 'r') as myfile: + self.onion = myfile.read().strip() + + self.controller = Controller.from_port(port=9999) + self.controller.authenticate() + + def is_published(_): + try: + self.controller.get_hidden_service_descriptor(self.onion) + return True + except: + return False + Wait(self.marionette, timeout=10).until(is_published) + # Wait a reasonable amount of time to increase the chances of the service to work + time.sleep(10) + + def tearDown(self): + self.controller.close() + self.tor_process.terminate() + shutil.rmtree(self.tmp_dir, ignore_errors=True) + super(Test, self).tearDown() + + def load_onion(self, onion=None, wait_auth=True): + if not onion: + onion = self.onion + m = self.marionette + with m.using_context('content'): + self.marionette.execute_script( + 'window.location = "http://' + onion + '/dom-objects-enumeration.html";') + if wait_auth: + with m.using_context('chrome'): + Wait(m, timeout=m.timeout.page_load).until(lambda _: m.find_element( + 'id', 'tor-clientauth-notification-key').is_displayed()) + + def check_errors(self, title, short, long): + m = self.marionette + with m.using_context('content'): + Wait(m, timeout=m.timeout.page_load).until(lambda _: m.find_element( + 'css selector', '#text-container .title-text').text != '') + self.assertEqual(m.find_element( + 'css selector', '#text-container .title-text').text, title) + self.assertEqual(m.find_element( + 'id', 'errorShortDescText').text, short) + self.assertEqual(m.find_element('id', 'errorLongDesc').text, long) + + def get_keys(self): + with self.marionette.using_context('content'): + self.marionette.navigate("about:preferences#privacy") + self.marionette.find_element( + 'id', 'torOnionServiceKeys-savedKeys').click() + return self.marionette.execute_script(''' + const dialog = document.querySelector('.dialogFrame'); + const tree = dialog.contentDocument.querySelector('#onionservices-savedkeys-tree'); + const view = tree.view; + const rowCount = view.rowCount; + const result = []; + for (let i = 0; i < rowCount; ++i) { + result.push([ + view.getCellText(i, tree.columns[0]), + view.getCellText(i, tree.columns[1]), + ]); + } + return result; + ''') + + def new_identity(self): + m = self.marionette + with m.using_context('chrome'): + m.set_pref('extensions.torbutton.confirm_newnym', False) + m.find_element('id', 'new-identity-button').click() + # Wait some time for new identity to finish. + time.sleep(2) + # Reload marionette session after new identity. + self.marionette.quit() + self.marionette.start_session() + self.marionette.timeout.implicit = 10 + + def delete_all_keys(self): + with self.marionette.using_context('content'): + self.marionette.navigate("about:preferences#privacy") + self.marionette.find_element( + 'id', 'torOnionServiceKeys-savedKeys').click() + return self.marionette.execute_script(''' + const dialog = document.querySelector('.dialogFrame'); + dialog.contentDocument.querySelector('#onionservices-savedkeys-removeall').click(); + ''') + + def test_client_auth(self): + m = self.marionette + m.timeout.implicit = 10 + + # Cancel auth + self.load_onion() + with m.using_context('chrome'): + cancel = m.find_element( + 'css selector', '#tor-clientauth-notification .popup-notification-secondary-button') + cancel.click() + + self.check_errors('Onionsite Requires Authentication', 'Access to the onionsite requires a key but none was provided.', + u'Details: 0xF4 \u2014 The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.') + + # Wrong auth + self.load_onion() + with m.using_context('chrome'): + m.find_element('id', 'tor-clientauth-notification-key').send_keys( + 'E4ST65PDZDVZRAW2FLT5RBFKYEM3GW73SRQDMEBLBDHQP3Y4NADQ') + m.find_element( + 'css selector', '#tor-clientauth-notification .popup-notification-primary-button').click() + Wait(m, timeout=m.timeout.page_load).until(lambda _: not m.find_element( + 'id', 'tor-clientauth-notification-key').is_displayed()) + Wait(m, timeout=m.timeout.page_load).until(lambda _: m.find_element( + 'id', 'tor-clientauth-notification-key').is_displayed()) + + # Good auth, don't remember key + with m.using_context('chrome'): + m.find_element( + 'id', 'tor-clientauth-notification-key').send_keys(self.private_key) + m.find_element( + 'css selector', '#tor-clientauth-notification .popup-notification-primary-button').click() + with m.using_context('content'): + m.find_element('id', 'enumeration') + keys = self.get_keys() + self.assertEqual(len(keys), 0) + self.new_identity() + self.load_onion() # This will block if the auth prompt is not displayed + + # Good auth, remember key + with m.using_context('chrome'): + m.find_element( + 'id', 'tor-clientauth-notification-key').send_keys(self.private_key) + m.find_element('id', 'tor-clientauth-persistkey-checkbox').click() + m.find_element( + 'css selector', '#tor-clientauth-notification .popup-notification-primary-button').click() + with m.using_context('content'): + m.find_element('id', 'enumeration') + keys = self.get_keys() + self.assertEqual(len(keys), 1) + self.assertEqual(keys[0][0], self.onion[:-6]) + self.assertEqual(keys[0][1], base64.b64encode( + base64.b32decode(self.private_key + '===='))) + self.new_identity() + with m.using_context('content'): + m.navigate('http://' + self.onion + + '/dom-objects-enumeration.html') # Should not block + + self.delete_all_keys() + # Wait a bit, otherwise it sometimes loads the onion without the auth prompt + time.sleep(5) + with m.using_context('content'): + self.load_onion() # Load and wait for the auth doorgahnger + + # Check invalid onion address error + with m.using_context('content'): + bad_char = 'a' if self.onion[-7:-6] != 'a' else 'b' + self.load_onion( + onion=self.onion[:-7] + bad_char + ".onion", wait_auth=False) + self.check_errors('Invalid Onionsite Address', 'The provided onionsite address is invalid. Please check that you entered it correctly.', + u'Details: 0xF6 \u2014 The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn\'t match, the ed25519 public key is invalid, or the encoding is invalid.') + + # TODO: check other onion errors

1 0

[tor-browser-bundle-testsuite/master] Bug 40004: Add test for 'Implement .onion alias urlbar rewrites' TB patch
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit cf696e9f07b8716e8115d59d9651982f3702fa32 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Jun 29 19:54:14 2020 +0200 Bug 40004: Add test for 'Implement .onion alias urlbar rewrites' TB patch --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 6 +++ marionette/tor_browser_tests/test_onion_alias.py | 67 ++++++++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index 5a642ef..931ab70 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -488,6 +488,12 @@ our @tests = ( use_net => 1, descr => 'Check that Onion-Location header handling works correctly', }, + { + name => 'onion_alias', + type => 'marionette', + use_net => 1, + descr => 'Check that onion alias urlbar rewrites work properly', + }, ); sub set_test_prefs { diff --git a/marionette/tor_browser_tests/test_onion_alias.py b/marionette/tor_browser_tests/test_onion_alias.py new file mode 100644 index 0000000..1495906 --- /dev/null +++ b/marionette/tor_browser_tests/test_onion_alias.py @@ -0,0 +1,67 @@ +from marionette_driver import By, Wait +from marionette_driver.errors import MarionetteException, NoSuchElementException, TimeoutException +from marionette_driver.legacy_actions import Actions +from marionette_harness import MarionetteTestCase, WindowManagerMixin + +import time + + +class Test(WindowManagerMixin, MarionetteTestCase): + def get_urlbar_value(self): + with self.marionette.using_context('chrome'): + return self.marionette.execute_script("return gURLBar.value;") + + def test_onion_alias(self): + m = self.marionette + m.timeout.implicit = 10 + + # Wait until .tor.onion rules have been loaded + with m.using_context('chrome'): + Wait(m, timeout=m.timeout.page_load).until( + lambda _: m.execute_script("return OnionAliasStore._onionMap.size;") > 0) + + with m.using_context('content'): + # Navigating to a known .tor.onion should redirect and rewrite the urlbar with the alias. + m.navigate('http://theintercept.securedrop.tor.onion') + self.assertEqual(m.get_url( + ), 'http://xpxduj55x2j27l2qytu2tcetykyfxbjbafin3x4i3ywddzphkbrd3jyd.onion/') + self.assertEqual(self.get_urlbar_value(), + 'theintercept.securedrop.tor.onion') + + # Bookmark should be created with the onion alias URL + with m.using_context('chrome'): + m.find_element('id', 'star-button-box').click() + m.find_element('id', 'editBookmarkPanelDoneButton').click() + recent_bookmarks = m.execute_script( + "return PlacesUtils.bookmarks.getRecent(1);") + self.assertEqual( + recent_bookmarks[0]["url"], "http://theintercept.securedrop.tor.onion/") + + # Opening a same-origin link should keep the onion alias in the urlbar + el = m.find_element('id', 'submit-documents-button') + action = Actions(m) + action.middle_click(el) + action.perform() + Wait(m, timeout=m.timeout.page_load).until( + lambda _: len(m.window_handles) > 1) + m.switch_to_window(m.window_handles[1]) + Wait(m, timeout=m.timeout.page_load).until( + lambda _: m.get_url() != 'about:blank') + self.assertEqual(m.get_url( + ), 'http://xpxduj55x2j27l2qytu2tcetykyfxbjbafin3x4i3ywddzphkbrd3jyd.onion/gener…') + self.assertEqual(self.get_urlbar_value(), + 'theintercept.securedrop.tor.onion/generate') + m.close() + m.switch_to_window(m.window_handles[0]) + + # Going directly to .onion should not rewrite the urlbar + new_tab = self.open_tab() + m.switch_to_window(new_tab) + m.navigate( + 'http://xpxduj55x2j27l2qytu2tcetykyfxbjbafin3x4i3ywddzphkbrd3jyd.onion') + self.assertEqual(m.get_url( + ), 'http://xpxduj55x2j27l2qytu2tcetykyfxbjbafin3x4i3ywddzphkbrd3jyd.onion/') + self.assertEqual(self.get_urlbar_value( + ), 'xpxduj55x2j27l2qytu2tcetykyfxbjbafin3x4i3ywddzphkbrd3jyd.onion') + m.close() + m.switch_to_window(self.start_tab)

1 0

[tor-browser-bundle-testsuite/master] Bug 40003: Add test for 'Implement Onion-Location' TB patch
by gk＠torproject.org 15 Oct '20

15 Oct '20

commit fe257166a6e9a5bb4100a24674f98eed86822572 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Jun 29 19:41:47 2020 +0200 Bug 40003: Add test for 'Implement Onion-Location' TB patch --- TBBTestSuite/TestSuite/BrowserBundleTests.pm | 6 + .../tor_browser_tests/test_onion_location.py | 135 +++++++++++++++++++++ 2 files changed, 141 insertions(+) diff --git a/TBBTestSuite/TestSuite/BrowserBundleTests.pm b/TBBTestSuite/TestSuite/BrowserBundleTests.pm index 834641e..5a642ef 100644 --- a/TBBTestSuite/TestSuite/BrowserBundleTests.pm +++ b/TBBTestSuite/TestSuite/BrowserBundleTests.pm @@ -482,6 +482,12 @@ our @tests = ( use_net => 1, descr => 'Check onion security expectations', }, + { + name => 'onion_location', + type => 'marionette', + use_net => 1, + descr => 'Check that Onion-Location header handling works correctly', + }, ); sub set_test_prefs { diff --git a/marionette/tor_browser_tests/test_onion_location.py b/marionette/tor_browser_tests/test_onion_location.py new file mode 100644 index 0000000..1188250 --- /dev/null +++ b/marionette/tor_browser_tests/test_onion_location.py @@ -0,0 +1,135 @@ +from marionette_driver import By, Wait +from marionette_driver.errors import MarionetteException, NoSuchElementException, TimeoutException + +from marionette_harness import MarionetteTestCase, WindowManagerMixin + + +class Test(WindowManagerMixin, MarionetteTestCase): + + def test_onion_location(self): + m = self.marionette + m.timeout.implicit = 10 + + self.assertEqual(None, m.get_pref( + 'privacy.prioritizeonions.showNotification')) + + with m.using_context('content'): + m.navigate('https://www.torproject.org/') + + with m.using_context('chrome'): + # Check whether the urlbar badge is displayed + self.assertTrue(m.find_element( + 'id', 'onion-location-box').is_displayed()) + + # Check whether the notification is displayed the first time + notification = m.find_element('id', 'onion-location-notification') + self.assertTrue(notification.is_displayed()) + self.assertFalse(m.get_pref( + 'privacy.prioritizeonions.showNotification')) + always_prioritize = notification.find_element( + 'css selector', '.popup-notification-primary-button') + self.assertEqual(always_prioritize.get_attribute( + 'label'), 'Always Prioritize Onions') + + # Check learn more link + notification.find_element( + 'css selector', '.popup-notification-learnmore-link').click() + with m.using_context('content'): + Wait(m, timeout=m.timeout.page_load).until( + lambda _: len(m.window_handles) > 1) + m.switch_to_window(m.window_handles[1]) + Wait(m, timeout=m.timeout.page_load).until( + lambda _: m.get_url() != "about:blank") + self.assertEqual( + m.get_url(), "https://tb-manual.torproject.org/onion-services/") + m.close() + m.switch_to_window(m.window_handles[0]) + + with m.using_context('chrome'): + # Close the notification and check that it's not displayed anymore. + notification = m.find_element('id', 'onion-location-notification') + not_now = notification.find_element( + 'css selector', '.popup-notification-secondary-button') + self.assertEqual(not_now.get_attribute('label'), 'Not Now') + not_now.click() + try: + self.assertFalse(m.find_element( + 'id', 'onion-location-notification').is_displayed()) + except NoSuchElementException: + pass + + # Show the notification again + m.set_pref('privacy.prioritizeonions.showNotification', None) + new_tab = self.open_tab() + m.switch_to_window(new_tab) + m.close() + m.switch_to_window(self.start_tab) + + # Click "Always prioritize" in the notification + notification = m.find_element('id', 'onion-location-notification') + notification.find_element( + 'css selector', '.popup-notification-primary-button').click() + self.assertTrue(m.get_pref('privacy.prioritizeonions.enabled')) + + with m.using_context('content'): + m.switch_to_window(m.window_handles[1]) + self.assertEqual( + m.get_url(), 'about:preferences#privacy-onionservices') + m.close() + m.switch_to_window(self.start_tab) + + # Check that the original page is redirected to .onion + Wait(m, timeout=m.timeout.page_load).until( + lambda _: m.get_url() != 'https://www.torproject.org/') + self.assertEqual( + m.get_url(), 'http://expyuzz4wqqyqhjn.onion/index.html') + + # Check that auto-redirects work + m.navigate('https://www.torproject.org/') + self.assertEqual(m.get_url(), 'https://www.torproject.org/') + Wait(m, timeout=m.timeout.page_load).until( + lambda _: m.get_url() != 'https://www.torproject.org/') + self.assertEqual( + m.get_url(), 'http://expyuzz4wqqyqhjn.onion/index.html') + + # Go to preferences and disable auto-redirects + new_tab = self.open_tab() + m.switch_to_window(new_tab) + m.navigate('about:preferences#privacy-onionservices') + m.find_element('id', 'onionServicesRadioAsk').click() + self.assertFalse(m.get_pref( + 'privacy.prioritizeonions.enabled')) + m.close() + m.switch_to_window(self.start_tab) + m.navigate('https://www.torproject.org/') + try: + Wait(m, timeout=5).until(lambda _: m.get_url() + != 'https://www.torproject.org/') + self.assertTrue(False, "Should not redirect") + except TimeoutException: + pass + + # Check that the page is redirected when clicking on the urlbar badge + with m.using_context('chrome'): + self.assertTrue(m.find_element( + 'id', 'onion-location-box').is_displayed()) + m.find_element('id', 'onion-location-box').click() + with m.using_context('content'): + Wait(m, timeout=5).until(lambda _: m.get_url() + != 'https://www.torproject.org/') + self.assertEqual( + m.get_url(), 'http://expyuzz4wqqyqhjn.onion/index.html') + + # Check learn more link + with m.using_context('content'): + m.navigate('about:preferences#privacy-onionservices') + m.find_element('id', 'onionServicesLearnMore').click() + Wait(m, timeout=m.timeout.page_load).until( + lambda _: len(m.window_handles) > 1) + m.switch_to_window(m.window_handles[1]) + Wait(m, timeout=m.timeout.page_load).until( + lambda _: m.get_url() != "about:blank") + self.assertEqual( + m.get_url(), "https://tb-manual.torproject.org/onion-services/") + m.close() + m.switch_to_window(m.window_handles[0])

1 0