June 2015 - tor-commits - lists.torproject.org

[tor-browser/tor-browser-38.1.0esr-5.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit d31de7a147a2634e7e8bef0ce48d6fd8e081c08e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 20:42:08 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Disable tiles for now until we can audit the real version in FF45-esr. --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index cddb430..b16737d 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -58,6 +58,7 @@ pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs pref("services.sync.engine.addons", false); pref("services.sync.engine.tabs", false); pref("extensions.getAddons.cache.enabled", false); // https://blog.mozilla.org/addons/how-to-opt-out-of-add-on-metadata-updates/ +pref("browser.newtabpage.enhanced", false); // Bug 16316 - Avoid potential confusion over tiles for now. // Fingerprinting pref("webgl.min_capability_mode", true);

1 0

[tor-browser/tor-browser-38.1.0esr-5.x-1] Bug 16439: remove screencasting code.
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit b8fc9ed4eb889944b1f6d19723e11acb549b1bd5 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jun 24 11:01:11 2015 -0400 Bug 16439: remove screencasting code. Screencasting is disabled in desktop browsers because browser.casting.enabled = false. However, to avoid including code that could lead to proxy bypass, we exclude the related JS modules from Tor Browser. --- browser/modules/moz.build | 6 +++++- toolkit/modules/moz.build | 10 ++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/browser/modules/moz.build b/browser/modules/moz.build index 574455c..3c0162c 100644 --- a/browser/modules/moz.build +++ b/browser/modules/moz.build @@ -12,7 +12,6 @@ XPCSHELL_TESTS_MANIFESTS += [ EXTRA_JS_MODULES += [ 'BrowserUITelemetry.jsm', - 'CastingApps.jsm', 'Chat.jsm', 'ContentClick.jsm', 'ContentLinkHandler.jsm', @@ -39,6 +38,11 @@ EXTRA_JS_MODULES += [ 'WebappManager.jsm', ] +if not CONFIG['TOR_BROWSER_VERSION']: + EXTRA_JS_MODULES += [ + 'CastingApps.jsm', + ] + if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': EXTRA_JS_MODULES += [ 'Windows8WindowFrameColor.jsm', diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build index 35c9a80..6416ac4 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build @@ -44,7 +44,6 @@ EXTRA_JS_MODULES += [ 'RemoteSecurityUI.jsm', 'RemoteWebNavigation.jsm', 'RemoteWebProgress.jsm', - 'secondscreen/SimpleServiceDiscovery.jsm', 'SelectContentHelper.jsm', 'SelectParentHelper.jsm', 'sessionstore/FormData.jsm', @@ -66,7 +65,6 @@ EXTRA_PP_JS_MODULES += [ 'GMPInstallManager.jsm', 'GMPUtils.jsm', 'ResetProfile.jsm', - 'secondscreen/RokuApp.jsm', 'Services.jsm', 'Troubleshoot.jsm', 'UpdateChannel.jsm', @@ -74,6 +72,14 @@ EXTRA_PP_JS_MODULES += [ 'WindowsPrefSync.jsm', ] +if not CONFIG['TOR_BROWSER_VERSION']: + EXTRA_JS_MODULES += [ + 'secondscreen/SimpleServiceDiscovery.jsm', + ] + EXTRA_PP_JS_MODULES += [ + 'secondscreen/RokuApp.jsm', + ] + if 'Android' != CONFIG['OS_TARGET']: EXTRA_PP_JS_MODULES += [ 'LightweightThemeConsumer.jsm',

1 0

[tor-browser/tor-browser-38.1.0esr-5.x-1] Merge remote-tracking branch 'brade/bug16439-01' into tor-browser-38.1.0esr-5.x-1
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit 7989c2c5a56006e2ae1d4988ea8e9ce1e26057d6 Merge: c1baf26 b8fc9ed Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 20:22:37 2015 -0700 Merge remote-tracking branch 'brade/bug16439-01' into tor-browser-38.1.0esr-5.x-1 browser/modules/moz.build | 6 +++++- toolkit/modules/moz.build | 10 ++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-)

1 0

[torbutton/master] Bug 16357: Use Mozilla API to wipe permissions db
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit d8dfd2fbcf46240eddf5c20bc55d2f294856558f Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Jun 12 16:56:05 2015 -0700 Bug 16357: Use Mozilla API to wipe permissions db --- src/chrome/content/torbutton.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 5f4ba5c..0c48f30 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -20,6 +20,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "WebConsoleUtils", "resource://gre/modules/devtools/WebConsoleUtils.jsm"); let { LoadContextInfo } = Cu.import('resource://gre/modules/LoadContextInfo.jsm'); +let { Services } = Cu.import("resource://gre/modules/Services.jsm"); const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; @@ -1769,8 +1770,7 @@ function torbutton_do_new_identity() { // This clears the STS cache and site permissions on Tor Browser // XXX: Tie to some kind of disk-ok pref? try { - m_tb_prefs.setBoolPref('permissions.memory_only', false); - m_tb_prefs.setBoolPref('permissions.memory_only', true); + Services.perms.removeAll(); } catch(e) { // Actually, this catch does not appear to be needed. Leaving it in for // safety though.

1 0

[torbutton/master] Merge remote-tracking branch 'arthur/16357'
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit a3d3114747cf8f758f7b650b141f4fdbdd10868f Merge: bdf2289 d8dfd2f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 20:13:49 2015 -0700 Merge remote-tracking branch 'arthur/16357' src/chrome/content/torbutton.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[bridgedb/develop] Add module docstring for bridgedb.parse.descriptors.
by isis＠torproject.org 25 Jun '15

25 Jun '15

commit 6d7180a895dc205176f34e38a1251f6aae0ef156 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 18 04:39:01 2015 +0000 Add module docstring for bridgedb.parse.descriptors. --- lib/bridgedb/parse/descriptors.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/lib/bridgedb/parse/descriptors.py b/lib/bridgedb/parse/descriptors.py index 81cba7f..1b0108e 100644 --- a/lib/bridgedb/parse/descriptors.py +++ b/lib/bridgedb/parse/descriptors.py @@ -10,6 +10,29 @@ # :license: see LICENSE for licensing information #_____________________________________________________________________________ +"""Parsers for Tor Bridge descriptors, including ``bridge-networkstatus`` +documents, ``bridge-server-descriptor``s, and ``bridge-extrainfo`` +descriptors. + +.. py:module:: bridgedb.parse.descriptors + :synopsis: Parsers for Tor Bridge descriptors. + +bridgedb.parse.descriptors +=========================== +:: + + DescriptorWarning - Raised when we parse a very odd descriptor. + deduplicate - Deduplicate a container of descriptors, keeping only the newest + descriptor for each router. + parseNetworkStatusFile - Parse a bridge-networkstatus document generated and + given to us by the BridgeAuthority. + parseServerDescriptorsFile - Parse a file containing + bridge-server-descriptors. + parseExtraInfoFiles - Parse (multiple) file(s) containing bridge-extrainfo + descriptors. +.. +""" + from __future__ import print_function import datetime

1 0

[bridgedb/develop] Add Sphinx extension for referencing Tor Trac tickets.
by isis＠torproject.org 25 Jun '15

25 Jun '15

commit 8df13d2b5f2bcc4a19c32017bcdf81efe0f6401d Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 18 04:38:19 2015 +0000 Add Sphinx extension for referencing Tor Trac tickets. --- doc/sphinx/ext/traclinks.py | 37 +++++++++++++++++++++++++++++++++++++ doc/sphinx/source/conf.py | 3 ++- lib/bridgedb/parse/descriptors.py | 8 ++++---- 3 files changed, 43 insertions(+), 5 deletions(-) diff --git a/doc/sphinx/ext/traclinks.py b/doc/sphinx/ext/traclinks.py new file mode 100644 index 0000000..fd2d9b3 --- /dev/null +++ b/doc/sphinx/ext/traclinks.py @@ -0,0 +1,37 @@ +"""Sphinx/docutils extension to create links to a Trac site using a +RestructuredText interpreted text role that looks like this:: + + :trac:`trac_link_text` + +for example:: + + :trac:`#2015` + +creates a link to ticket number 2015. + +adapted from recipe here_. + +.. _here: http://stackoverflow.com/a/2111327/13564 +""" + +import urllib +from docutils import nodes, utils + +def make_trac_link(name, rawtext, text, lineno, inliner, + options={}, content=[]): + env = inliner.document.settings.env + trac_url = env.config.traclinks_base_url + ref = trac_url + urllib.quote(text, safe='') + node = nodes.reference(rawtext, + utils.unescape(text), + refuri=ref, + **options) + return [node],[] + + +def setup(app): + """setup function to register the extension""" + app.add_config_value('traclinks_base_url', + 'https://bugs.torproject.org/', + 'env') + app.add_role('trac', make_trac_link) diff --git a/doc/sphinx/source/conf.py b/doc/sphinx/source/conf.py index 5cd485f..e733c42 100644 --- a/doc/sphinx/source/conf.py +++ b/doc/sphinx/source/conf.py @@ -116,7 +116,8 @@ extensions = ['sphinx.ext.autodoc', 'sphinxarg.ext', 'sphinxcontrib.fulltoc', 'repoze.sphinx.autointerface', - 'apilinks_sphinxext'] + 'apilinks_sphinxext', + 'traclinks'] todo_include_todos = True diff --git a/lib/bridgedb/parse/descriptors.py b/lib/bridgedb/parse/descriptors.py index 46f959e..81cba7f 100644 --- a/lib/bridgedb/parse/descriptors.py +++ b/lib/bridgedb/parse/descriptors.py @@ -69,10 +69,10 @@ def parseNetworkStatusFile(filename, validate=True, skipAnnotations=True, descriptorClass=RouterStatusEntryV3): """Parse a file which contains an ``@type bridge-networkstatus`` document. - See `ticket #12254 <https://bugs.torproject.org/12254>`__ for why - networkstatus-bridges documents don't look anything like the networkstatus - v2 documents that they are purported to look like. They are missing all - headers, and the entire footer including authority signatures. + See :trac:`#12254` for why networkstatus-bridges documents don't look + anything like the networkstatus v2 documents that they are purported to + look like. They are missing all headers, and the entire footer including + authority signatures. :param str filename: The location of the file containing bridge networkstatus descriptors.

1 0

[bridgedb/develop] Add module docstring for bridgedb.parse.fingerprint.
by isis＠torproject.org 25 Jun '15

25 Jun '15

commit 217f8e2785c02d1e8edf784aac9dd9a1b83978a9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 18 04:51:30 2015 +0000 Add module docstring for bridgedb.parse.fingerprint. --- lib/bridgedb/parse/fingerprint.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/lib/bridgedb/parse/fingerprint.py b/lib/bridgedb/parse/fingerprint.py index f825271..bf12ee5 100644 --- a/lib/bridgedb/parse/fingerprint.py +++ b/lib/bridgedb/parse/fingerprint.py @@ -10,6 +10,24 @@ # :license: see LICENSE for licensing information #_____________________________________________________________________________ +"""Utility functions for converting between various relay fingerprint formats, +and checking their validity. + +.. py:module:: bridgedb.parse.fingerprints + :synopsis: Parsers for Tor Bridge fingerprints. + +.. todo: This module is very small; it could possibly be combined with another + module, e.g. :mod:`bridgedb.parse.descriptors`. + +bridgedb.parse.fingerprints +============================ +:: + + toHex - Convert a fingerprint from its binary representation to hexadecimal. + fromHex - Convert a fingerprint from hexadecimal to binary. + isValidFingerprint - Validate a fingerprint. +.. +""" import binascii import logging

1 0

[bridgedb/develop] Remove unused code from test/legacy_Tests.py.
by isis＠torproject.org 25 Jun '15

25 Jun '15

commit 3ec9dfb50d37f71b8d77e5b106c07cbc2bd397d2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 14 09:36:49 2015 +0000 Remove unused code from test/legacy_Tests.py. --- lib/bridgedb/test/legacy_Tests.py | 48 +------------------------------------ 1 file changed, 1 insertion(+), 47 deletions(-) diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py index bdea142..0d2512c 100644 --- a/lib/bridgedb/test/legacy_Tests.py +++ b/lib/bridgedb/test/legacy_Tests.py @@ -11,7 +11,6 @@ from __future__ import print_function import os import random -import sqlite3 import tempfile import unittest import warnings @@ -48,11 +47,6 @@ from math import log def suppressWarnings(): warnings.filterwarnings('ignore', '.*tmpnam.*') -def random16IP(): - upper = "123.123." # same 16 - lower = ".".join([str(random.randrange(1,256)) for _ in xrange(2)]) - return upper+lower - def randomPort(): return random.randint(1,65535) @@ -66,23 +60,6 @@ def randomPortSpec(): portspec = ",".join(["%d" % random.choice(ports) for i in range(0,16)]) return portspec -def randomCountry(): - countries = ['us', 'nl', 'de', 'cz', 'sk', 'as', 'si', 'it'] - #XXX: load from geoip - return random.choice(countries) - -def randomCountrySpec(): - countries = ['us', 'nl', 'de', 'cz', 'sk', 'as', 'si', 'it'] - #XXX: load from geoip - spec = "" - choices = [] - for i in xrange(10): - choices.append(random.choice(countries)) - choices = set(choices) #dedupe - choices = list(choices) - spec += ",".join(choices) - return spec - def fakeBridge(orport=8080, running=True, stable=True, or_addresses=False, transports=False): nn = "bridge-%s"%random.randrange(0,1000000) @@ -160,21 +137,11 @@ def fakeBridge6(orport=8080, running=True, stable=True, or_addresses=False, return b -def fake16Bridge(orport=8080, running=True, stable=True): - nn = "bridge-%s"%random.randrange(0,1000000) - ip = random16IP() - fp = "".join([random.choice("0123456789ABCDEF") for _ in xrange(40)]) - b = bridgedb.Bridges.Bridge(nn,ip,orport,fingerprint=fp) - b.setStatus(running, stable) - return b - simpleDesc = "router Unnamed %s %s 0 9030\n"\ "opt fingerprint DEAD BEEF F00F DEAD BEEF F00F DEAD BEEF F00F DEAD\n"\ "opt @purpose bridge\n" orAddress = "or-address %s:%s\n" -def gettimestamp(): - ts = time.strftime("%Y-%m-%d %H:%M:%S") - return "opt published %s\n" % ts + class RhymesWith255Category: def contains(self, ip): @@ -272,19 +239,6 @@ class IPBridgeDistTests(unittest.TestCase): # self.assertEquals(len(fps), 5) # self.assertTrue(count >= 1) - #def testDistWithFilter16(self): - # d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo") - # for _ in xrange(256): - # d.insert(fake16Bridge()) - # n = d.getBridgesForIP("1.2.3.4", "x", 10) - - # slash16s = dict() - # for bridge in n: - # m = re.match(r'(\d+\.\d+)\.\d+\.\d+', bridge.ip) - # upper16 = m.group(1) - # self.assertTrue(upper16 not in slash16s) - # slash16s[upper16] = True - def testDistWithFilterIP6(self): d = bridgedb.Dist.IPBasedDistributor(self.dumbAreaMapper, 3, "Foo") for _ in xrange(250):

1 0

[bridgedb/develop] Document IPBasedDistributor.prepopulateRings().
by isis＠torproject.org 25 Jun '15

25 Jun '15

commit d229941c72e48c3d1550d45983c4ddd2c5ef8961 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Apr 2 22:50:04 2015 +0000 Document IPBasedDistributor.prepopulateRings(). --- lib/bridgedb/Dist.py | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 78741a7..39e70be 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -201,6 +201,61 @@ class IPBasedDistributor(Distributor): self.setDistributorName('HTTPS') def prepopulateRings(self): + """Prepopulate this distributor's hashrings and subhashrings with + bridges. + + The hashring structure for this distributor is influenced by the + ``N_IP_CLUSTERS`` configuration option, as well as the number of + ``PROXY_LIST_FILES``. Essentially, :data:`nClusters` is set to the + specified ``N_IP_CLUSTERS``. The ``PROXY_LIST_FILES`` (plus the + :class:`bridgedb.proxy.ProxySet` for the Tor Exit list downloaded into + memory with :script:`get-tor-exits`) are stored in :data:`categories`. + + The number of subhashrings which this :class:`Distributor` has active + in its hashring is then the :data:`nClusters` plus the number of + :data:`categories`. + + As an example, if BridgeDB was configured with ``N_IP_CLUSTERS=4`` and + ``PROXY_LIST_FILES=["open-socks-proxies.txt"]``, then the total number + of subhashrings is six — four for the "clusters", and two + "categories": one for everything contained within the + ``"open-socks-proxies.txt"`` file and the other for the downloaded + list of Tor Exits. Thus, the resulting hashring-subhashring structure + would look like: + + +------------------+---------------------------------------------------+-------------------------+ + | | Directly connecting users | Tor / known proxy users | + +------------------+------------+------------+------------+------------+------------+------------+ + | Clusters / | Cluster-1 | Cluster-2 | Cluster-3 | Cluster-4 | Cat-1 | Cat-2 | + | Categories | | | | | | | + +==================+============+============+============+============+============+============+ + | Subhashrings | | | | | | | + | (total, assigned)| (6,0) | (6,1) | (6,2) | (6,3) | (6,4) | (6,5) | + +------------------+------------+------------+------------+------------+------------+------------+ + | Filtered | (6,0) | (6,1) | (6,2) | (6,3) | (6,4) | (6,5) | + | Subhashrings +------------+------------+------------+------------+------------+------------+ + | bBy requested | (6,0)-IPv4 | (6,1)-IPv4 | (6,2)-IPv4 | (6,3)-IPv4 | (6,4)-IPv4 | (6,5)-IPv4 | + | bridge type) +------------+------------+------------+------------+------------+------------+ + | | (6,0)-IPv6 | (6,1)-IPv6 | (6,2)-IPv6 | (6,3)-IPv6 | (6,4)-IPv6 | (6,5)-IPv6 | + +------------------+------------+------------+------------+------------+------------+------------+ + + The "filtered subhashrings" are essentially copies of their respective + subhashring, that is, subhashring ``(6,0)`` contains both IPv4 and + IPv6 bridges, meaning that its contents are a superset of the filtered + subhashrings ``(6,0)-IPv4`` and ``(6,0)-IPv6``. (I have no idea of + the relation between ``(6,0)-IPv4`` and ``(6,0)-IPv6``, including + whether or not their contents are disjoint. I didn't design this shit, + I'm just redesigning it.) + + "Why does the ``(6,0)`` superset subhashring exist then?" + + you might ask. That's a very good question. I don't know either. + I'm inclined to think it shouldn't exist, unless we wish to allow + clients to request IPv4 bridges and IPv6 bridges simultaneously + (there's currently no interface to do this, however). + + Thus, in this example, we end up with **18 total subhashrings**. + """ logging.info("Prepopulating %s distributor hashrings..." % self.name) # populate all rings (for dumping assignments and testing) for filterFn in [None, filterBridgesByIP4, filterBridgesByIP6]:

1 0