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

[tor-browser-build/maint-9.5] All platforms covers Android for translations
by gk＠torproject.org 24 Jun '20

24 Jun '20

commit ae0a27b74bbc1acec6a6ca38f91d95ef04394837 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 24 07:53:50 2020 +0000 All platforms covers Android for translations --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 419bb80..7a589d9 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -9,8 +9,6 @@ Tor Browser 9.5.1 -- June 30 2020 * Bug 34369: Fix learn more link in Onion Auth prompt * Bug 34379: Fix learn more for Onion-Location * Bug 34347: The Tor Network part on the onboarding is not new anymore - * Android - * Translations update Tor Browser 9.5 -- June 2 2020 * All Platforms

1 0

[bridgedb/develop] Avoid giving out bridges with broken tor versions.
by phw＠torproject.org 23 Jun '20

23 Jun '20

commit 8d169fc45c8cfd7c8c9028d125bff4dbb3afafc6 Author: Philipp Winter <phw(a)nymity.ch> Date: Fri Jun 12 10:05:26 2020 -0700 Avoid giving out bridges with broken tor versions. This patch makes BridgeDB avoid giving out bridges that are affected by the following bug: <https://bugs.torproject.org/28912> This fixes <https://bugs.torproject.org/29184>. --- CHANGELOG | 5 +++++ bridgedb.conf | 10 ++++++++++ bridgedb/bridges.py | 15 +++++++++++++++ bridgedb/main.py | 7 +++++++ bridgedb/parse/versions.py | 29 +++++++++++++++++++++++++++++ bridgedb/test/test_bridges.py | 27 +++++++++++++++++++++++++++ 6 files changed, 93 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 754e2f0..c712436 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ + * FIXES https://bugs.torproject.org/29184 + Add a new configuration option, BLACKLISTED_TOR_VERSIONS, which contains a + list of Tor versions. BridgeDB won't hand out bridges whose Tor version + is present in this blacklist. + * FIXES https://bugs.torproject.org/19774 Add a favicon to BridgeDB's web UI. diff --git a/bridgedb.conf b/bridgedb.conf index 31eb3fa..6d4839d 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -309,6 +309,16 @@ DEFAULT_TRANSPORT = 'obfs4' # Accept-Language,[Kk]lingon BLACKLISTED_REQUEST_HEADERS_FILE="blacklisted-request-headers.csv" +# List of tuples that specify blacklisted tor version ranges. The first +# element marks the start of the range and the second element marks the end. +# Both the start *and* the end version are blocked too. If you want to block a +# single version, have the start and end range be identical. BridgeDB won't +# distribute bridges whose version falls within any version ranges. +BLACKLISTED_TOR_VERSIONS = [ + ('0.3.4', '0.3.4.9'), # See <https://bugs.torproject.org/29184>. + ('0.3.5', '0.3.5.6') +] + # Decoy bridges that we are handing out to bots that we detected using the # regular expressions in BLACKLISTED_REQUEST_HEADERS_FILE. The CSV file must # have the following format: diff --git a/bridgedb/bridges.py b/bridgedb/bridges.py index cd01948..6ec864d 100644 --- a/bridgedb/bridges.py +++ b/bridgedb/bridges.py @@ -1825,3 +1825,18 @@ class Bridge(BridgeBackwardsCompatibility): logging.info("Removing dead transport for bridge %s: %s %s:%s %s" % (self, pt.methodname, pt.address, pt.port, pt.arguments)) self.transports.remove(pt) + + def runsVersion(self, version_tuples): + """Return ``True`` if this bridge runs any of the given versions. + + :param list version_tuples: A list of tuples that contain a minimum and + maximum version number (as :class:`stem.version.Version` objects), + each. + :rtype: bool + :returns: ``True`` if this bridge runs any of the given Tor versions + and ``False`` otherwise. + """ + for min_version, max_version in version_tuples: + if min_version <= self.software <= max_version: + return True + return False diff --git a/bridgedb/main.py b/bridgedb/main.py index 70001a9..44d0668 100644 --- a/bridgedb/main.py +++ b/bridgedb/main.py @@ -38,6 +38,7 @@ from bridgedb.distributors.https.distributor import HTTPSDistributor from bridgedb.distributors.moat.distributor import MoatDistributor from bridgedb.parse import descriptors from bridgedb.parse.blacklist import parseBridgeBlacklistFile +from bridgedb.parse.versions import parseVersionsList import bridgedb.Storage @@ -211,6 +212,10 @@ def load(state, hashring, clear=False): elif bridge in blacklist.keys(): logging.warn("Not distributing blacklisted Bridge %s %s:%s: %s" % (bridge, bridge.address, bridge.orPort, blacklist[bridge])) + # Skip bridges that are running a blacklisted version of Tor. + elif bridge.runsVersion(state.BLACKLISTED_TOR_VERSIONS): + logging.warn("Not distributing bridge %s because it runs blacklisted " + "Tor version %s." % (router.fingerprint, bridge.software)) else: # If the bridge is not running, then it is skipped during the # insertion process. @@ -418,6 +423,8 @@ def run(options, reactor=reactor): proxy.loadProxiesFromFile(proxyfile, proxies, removeStale=True) metrics.setProxies(proxies) + state.BLACKLISTED_TOR_VERSIONS = parseVersionsList(state.BLACKLISTED_TOR_VERSIONS) + logging.info("Reloading blacklisted request headers...") antibot.loadBlacklistedRequestHeaders(config.BLACKLISTED_REQUEST_HEADERS_FILE) logging.info("Reloading decoy bridges...") diff --git a/bridgedb/parse/versions.py b/bridgedb/parse/versions.py index 335e04c..832969e 100644 --- a/bridgedb/parse/versions.py +++ b/bridgedb/parse/versions.py @@ -23,6 +23,10 @@ bridgedb.parse.versions .. """ +import logging + +import stem.version + from twisted import version as _txversion # The twisted.python.util.Version class was moved in Twisted==14.0.0 to @@ -127,3 +131,28 @@ class Version(_Version): str(self.minor), str(self.micro), str(prerelease)) + + +def parseVersionsList(versions_list): + """Turn the given version strings into stem objects. + + :param list versions_list: A list of tuples. Each tuple contains a minimum + and maximum version number as strings. + :rtype: list + :returns: A list of tuples. Each tuple contains a minimum and maximum + version number as :class:`stem.version.Version` objects. + """ + parsed = [] + for v1, v2 in versions_list: + # We're dealing with an already-parsed version list. + if isinstance(v1, stem.version.Version): + return versions_list + try: + parsed.append(tuple([stem.version.Version(v1), + stem.version.Version(v2)])) + except ValueError: + logging.error("Couldn't parse BLACKLISTED_TOR_VERSIONS; " + "probably because of badly formatted " + "configuration file. Ignoring config option.") + return [] + return parsed diff --git a/bridgedb/test/test_bridges.py b/bridgedb/test/test_bridges.py index fd14e87..82d9584 100644 --- a/bridgedb/test/test_bridges.py +++ b/bridgedb/test/test_bridges.py @@ -19,6 +19,8 @@ import hashlib import os import warnings +import stem.version + from twisted.trial import unittest from bridgedb import bridges @@ -1837,3 +1839,28 @@ class BridgeTests(unittest.TestCase): self.assertTrue(len(self.bridge.transports), 3) self.assertNotIn('scramblesuit', [pt.methodname for pt in self.bridge.transports]) + + def test_runsVersions(self): + """Calling runsVersions() should tell us if a bridge is running any of + the given versions. + """ + self.bridge.software = stem.version.Version("0.1.2.3") + + t1 = tuple([stem.version.Version("0.1.2.3"), + stem.version.Version("0.1.2.3")]) + self.assertTrue(self.bridge.runsVersion([t1])) + + t2 = tuple([stem.version.Version("0.1.2"), + stem.version.Version("0.1.2")]) + self.assertFalse(self.bridge.runsVersion([t2])) + + t3 = tuple([stem.version.Version("0.1.2"), + stem.version.Version("0.1.2.5")]) + self.assertTrue(self.bridge.runsVersion([t3])) + + t4 = tuple([stem.version.Version("0.2.2"), + stem.version.Version("0.3.1")]) + self.assertFalse(self.bridge.runsVersion([t4])) + + self.assertTrue(self.bridge.runsVersion([t1, t2, t3, t4])) + self.assertFalse(self.bridge.runsVersion([t2, t4]))

1 0

[bridgedb/develop] Merge branch 'enhancement/29184' into 'develop'
by phw＠torproject.org 23 Jun '20

23 Jun '20

commit 28c5479c455a499e4ac77203920dc8cc62981d29 Merge: 6d3e899 8d169fc Author: Philipp Winter <phw(a)torproject.org> Date: Tue Jun 23 23:08:36 2020 +0000 Merge branch 'enhancement/29184' into 'develop' Avoid giving out bridges with broken tor versions. See merge request tpo/anti-censorship/bridgedb!3 CHANGELOG | 5 +++++ bridgedb.conf | 10 ++++++++++ bridgedb/bridges.py | 15 +++++++++++++++ bridgedb/main.py | 7 +++++++ bridgedb/parse/versions.py | 29 +++++++++++++++++++++++++++++ bridgedb/test/test_bridges.py | 27 +++++++++++++++++++++++++++ 6 files changed, 93 insertions(+)

1 0

[tor-browser-build/maint-9.5] New NoScript version, TB tag, and Changelog
by sysrqb＠torproject.org 23 Jun '20

23 Jun '20

commit acbe3a6a21b0ee834374ace05b0cb8c86112a0a0 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Jun 23 20:29:09 2020 +0000 New NoScript version, TB tag, and Changelog --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 +++- projects/tor-browser/config | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index b5d3d08..1398149 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index a893105..419bb80 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,12 +1,14 @@ Tor Browser 9.5.1 -- June 30 2020 * All Platforms * Update Firefox to 68.10.0esr - * Update NoScript to 11.0.31 + * Update NoScript to 11.0.32 + * Translations update * Windows + OS X + Linux * Bug 34361: "Prioritize .onion sites when known" appears under General * Bug 34362: Improve Onion Service Authentication prompt * Bug 34369: Fix learn more link in Onion Auth prompt * Bug 34379: Fix learn more for Onion-Location + * Bug 34347: The Tor Network part on the onboarding is not new anymore * Android * Translations update diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 697f737..6bd09de 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -73,9 +73,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 16691879de18566c01d5ae9fcdfde183ab645ee6580cae2ee5a37770deac375f + sha256sum: 088c0b0f08529d88aacee3b1c09cfafe304b98cb2847c3fc255e05d1bf10bd6d - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[tor-browser/tor-browser-68.10.0esr-9.5-1] fixup! Bug 34321 - Add Learn More onboarding item
by sysrqb＠torproject.org 23 Jun '20

23 Jun '20

commit 75c2bb720d4ceb76231e8ecc3455754bf05ba19b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 13:24:39 2020 +0000 fixup! Bug 34321 - Add Learn More onboarding item --- browser/extensions/onboarding/content/Onboarding.jsm | 2 -- 1 file changed, 2 deletions(-) diff --git a/browser/extensions/onboarding/content/Onboarding.jsm b/browser/extensions/onboarding/content/Onboarding.jsm index 2115b2bd9d27..b411a3039a3e 100644 --- a/browser/extensions/onboarding/content/Onboarding.jsm +++ b/browser/extensions/onboarding/content/Onboarding.jsm @@ -124,7 +124,6 @@ var onboardingTourset = { "tor-network-9.0": { id: "onboarding-tour-tor-network-9-0", tourNameId: "onboarding.tour-tor-network", - highlightId: "onboarding.tour-tor-update.prefix-new", getPage(win) { let div = win.document.createElement("div"); @@ -249,7 +248,6 @@ var onboardingTourset = { "toolbar-update-9.0": { id: "onboarding-tour-tor-toolbar-update-9-0", tourNameId: "onboarding.tour-tor-toolbar", - highlightId: "onboarding.tour-tor-update.prefix-updated", getPage(win) { let div = win.document.createElement("div");

1 0

[tor-browser/tor-browser-68.10.0esr-9.5-1] fixup! Pick up latest Torbutton code
by sysrqb＠torproject.org 23 Jun '20

23 Jun '20

commit fd82aba0467c49f6561ac73a73f7ec9def5413ef Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Jun 23 20:11:52 2020 +0000 fixup! Pick up latest Torbutton code --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 605e9d398ab0..ebe2bedab44e 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 605e9d398ab026ce53ec8ad106848bfe5ae5e627 +Subproject commit ebe2bedab44e38f18c7968bd327d99eef7660f34

1 0

[translation/tails-iuk] https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk
by translation＠torproject.org 23 Jun '20

23 Jun '20

commit eaa30a69cc6aba203bc8e5f18b212c1b4a21702b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 23 20:16:23 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk --- sw.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sw.po b/sw.po index b209cb7974..912e7aa222 100644 --- a/sw.po +++ b/sw.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2019-11-28 16:51+0100\n" -"PO-Revision-Date: 2019-11-29 03:10+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2020-06-23 20:12+0000\n" +"Last-Translator: Heldina Mwingira <mwingira.hg(a)gmail.com>\n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -217,7 +217,7 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:627 msgid "Restart now" -msgstr "" +msgstr "Washa upya sasa" #: ../lib/Tails/IUK/Frontend.pm:628 msgid "Restart later"

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 23 Jun '20

23 Jun '20

commit 2385c95480e592a72391223a1558825309c7fda6 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 23 20:16:22 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- sw.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sw.po b/sw.po index 7e1cdcac87..bec751b6b2 100644 --- a/sw.po +++ b/sw.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-04 13:11+0200\n" -"PO-Revision-Date: 2020-06-22 06:46+0000\n" -"Last-Translator: Zaituni Njovu <zaituni(a)zainafoundationtz.org>\n" +"PO-Revision-Date: 2020-06-23 20:12+0000\n" +"Last-Translator: Heldina Mwingira <mwingira.hg(a)gmail.com>\n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 23 Jun '20

23 Jun '20

commit d8420c55b80101383b71abf54e6b1a79b5c33917 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 23 20:15:46 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- sw.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sw.po b/sw.po index b9341bff24..cc29b7bb61 100644 --- a/sw.po +++ b/sw.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-04 13:11+0200\n" -"PO-Revision-Date: 2020-06-22 06:46+0000\n" -"Last-Translator: Zaituni Njovu <zaituni(a)zainafoundationtz.org>\n" +"PO-Revision-Date: 2020-06-23 20:12+0000\n" +"Last-Translator: Heldina Mwingira <mwingira.hg(a)gmail.com>\n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -311,7 +311,7 @@ msgstr "" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:714 msgid "Restart now" -msgstr "" +msgstr "Washa upya sasa" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:715 msgid "Restart later"

1 0

[chutney/master] Restore bridges-obfs4 network
by nickm＠torproject.org 23 Jun '20

23 Jun '20

commit d2c04fa91a0c44369ee5ffdc078fd30087c4ce21 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 23 15:59:11 2020 -0400 Restore bridges-obfs4 network This network is not only useful, but it's an example of multi-phase initialization. --- networks/bridges-obfs4 | 39 +++++++++++++++++++++++++++++++++ torrc_templates/bridgeclient-obfs4.tmpl | 3 +++ 2 files changed, 42 insertions(+) diff --git a/networks/bridges-obfs4 b/networks/bridges-obfs4 new file mode 100644 index 0000000..b1ca6c4 --- /dev/null +++ b/networks/bridges-obfs4 @@ -0,0 +1,39 @@ +# By default, Authorities are not configured as exits +Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") +ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl") +Client = Node(tag="c", client=1, torrc="client.tmpl") + +BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1, + relay=1, torrc="bridgeauthority.tmpl") +Bridge = Node(tag="br", bridge=1, pt_bridge=1, relay=1, pt_transport="obfs4", + torrc="bridge-obfs4.tmpl") + +def obfs4_extra_args(env): + import os, re + # find the obfs4_bridgeline file. + location = os.path.join(env['dir'], + "pt_state", + "obfs4_bridgeline.txt") + if not os.path.exists(location): + return "" + # read the file and find the actual line + with open(location, 'r') as f: + for line in f: + if line.startswith("#"): + continue + if line.isspace(): + continue + m = re.match(r'(.*<FINGERPRINT>) (cert.*)', line) + if m: + return m.group(2) + return "" + +Bridge.set_runtime("pt_extra", obfs4_extra_args) + +BridgeClient = Node(tag="bc", client=1, bridgeclient=1, + torrc="bridgeclient-obfs4.tmpl", config_phase=2, launch_phase=2) + +NODES = Authority.getN(3) + BridgeAuthority.getN(1) + ExitRelay.getN(4) + \ + Bridge.getN(1) + Client.getN(1) + BridgeClient.getN(1) + +ConfigureNodes(NODES) diff --git a/torrc_templates/bridgeclient-obfs4.tmpl b/torrc_templates/bridgeclient-obfs4.tmpl new file mode 100644 index 0000000..403d2f6 --- /dev/null +++ b/torrc_templates/bridgeclient-obfs4.tmpl @@ -0,0 +1,3 @@ +${include:bridgeclient.tmpl} + +ClientTransportPlugin obfs4 exec ${path:obfs4proxy}

1 0