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

[bridgedb/master] Merge branch 'hotfix/0.2.4-14797-requirements' into develop
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit a8451767b1327118122ba68a803520fbf5e71927 Merge: 7de653e 9635ec7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 18 00:20:50 2015 +0000 Merge branch 'hotfix/0.2.4-14797-requirements' into develop .travis.requirements.txt | 4 ++-- requirements.txt | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-)

1 0

[bridgedb/master] Handle bridgedb.proxy.loadProxiesFromFile() errors when missing files.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit e831ea05fd833d1490e71edb7565720b6f51a5ff Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 18 00:24:44 2015 +0000 Handle bridgedb.proxy.loadProxiesFromFile() errors when missing files. * FIXES a problem found during #14797, introduced during #4405 (but actually present before that in the legacy code, see branch https://gitweb.torproject.org/user/isis/bridgedb.git/log/?h=hotfix/0.2.4-14…) --- lib/bridgedb/proxy.py | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/lib/bridgedb/proxy.py b/lib/bridgedb/proxy.py index 6b6f6ac..fe575b3 100644 --- a/lib/bridgedb/proxy.py +++ b/lib/bridgedb/proxy.py @@ -82,18 +82,21 @@ def loadProxiesFromFile(filename, proxySet=None, removeStale=False): if proxySet: oldProxySet = proxySet.copy() - with open(filename, 'r') as proxyFile: - for line in proxyFile.readlines(): - line = line.strip() - if proxySet: - # ProxySet.add() will validate the IP address - if proxySet.add(line, tag=filename): - logging.info("Added %s to the proxy list." % line) - addresses.append(line) - else: - ip = isIPAddress(line) - if ip: - addresses.append(ip) + try: + with open(filename, 'r') as proxyFile: + for line in proxyFile.readlines(): + line = line.strip() + if proxySet: + # ProxySet.add() will validate the IP address + if proxySet.add(line, tag=filename): + logging.info("Added %s to the proxy list." % line) + addresses.append(line) + else: + ip = isIPAddress(line) + if ip: + addresses.append(ip) + except Exception as error: + logging.warn("Error while reading a proxy list file: %s" % str(error)) if proxySet: stale = list(oldProxySet.difference(addresses))

1 0

[bridgedb/master] Add test for (broken) b.proxy.ProxySet.intersection().
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 0becb7592d0b8480daf2608a0b5032cc733b3c62 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 19 04:29:53 2015 +0000 Add test for (broken) b.proxy.ProxySet.intersection(). --- lib/bridgedb/test/test_proxy.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lib/bridgedb/test/test_proxy.py b/lib/bridgedb/test/test_proxy.py index 144cf70..2a2b4b5 100644 --- a/lib/bridgedb/test/test_proxy.py +++ b/lib/bridgedb/test/test_proxy.py @@ -476,6 +476,20 @@ class ProxySetUnittests(unittest.TestCase): """ProxySet.issubset() on a subset should return True.""" self.assertTrue(self.proxyList.issuperset(set(self.proxies[:1]))) + def test_ProxySet_intersection(self): + """ProxySet.intersection() should return the combination of two + disjoint sets. + """ + raise unittest.SkipTest( + ("FIXME: bridgedb.proxy.ProxySet.intersection() is broken and " + "always returns an empty set().")) + + a = self.proxies + a.extend(self.moarProxies) + a = set(a) + b = self.proxyList.intersection(set(self.moarProxies)) + self.assertItemsEqual(a, b) + def test_ProxySet_remove(self): """ProxySet.remove() should subtract proxies which were already added to the set.

1 0

[bridgedb/master] Add test for proxy.ProxySet with missing PROXY_LIST_FILE.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 164c545622c3940b3f25eccf561b999899fa16b5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 19 04:13:51 2015 +0000 Add test for proxy.ProxySet with missing PROXY_LIST_FILE. --- lib/bridgedb/test/test_proxy.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/bridgedb/test/test_proxy.py b/lib/bridgedb/test/test_proxy.py index 144cf70..6d62f22 100644 --- a/lib/bridgedb/test/test_proxy.py +++ b/lib/bridgedb/test/test_proxy.py @@ -157,6 +157,11 @@ class LoadProxiesFromFileIntegrationTests(unittest.TestCase): proxies = proxy.loadProxiesFromFile(self.fn0) self.assertEqual(len(proxies), 3) + def test_proxy_loadProxiesFromFile_1_file_missing(self): + """Test loading proxies from one file that doesn't exist.""" + proxies = proxy.loadProxiesFromFile('%s-missing' % self.__class__.__name__) + self.assertEqual(len(proxies), 0) + def test_proxy_loadProxiesFromFile_1_file_and_proxyset(self): """Test loading proxies from one file.""" proxyList = proxy.ProxySet(['1.1.1.1'])

1 0

[bridgedb/master] Merge branch 'fix/15155-instructions-string' into develop
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 193c80a27b150bbc260f90c33998781301b32165 Merge: 35ace70 1a5f320 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 19 22:07:44 2015 +0000 Merge branch 'fix/15155-instructions-string' into develop lib/bridgedb/strings.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[bridgedb/master] Merge branch 'hotfix/0.2.4-14797-4405-missing-proxylistfile' into develop
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 90bf6d967e636f544945497db3616c06895ba2a3 Merge: a845176 e831ea0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 18 01:04:16 2015 +0000 Merge branch 'hotfix/0.2.4-14797-4405-missing-proxylistfile' into develop lib/bridgedb/proxy.py | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-)

1 0

[bridgedb/master] Merge branch 'hotfix/0.2.4-14797-4405-missing-proxylistfile' into develop
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 35ace70a2e85aadfcad1c55759afd7152d2eaf9a Merge: 0becb75 164c545 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 19 04:36:49 2015 +0000 Merge branch 'hotfix/0.2.4-14797-4405-missing-proxylistfile' into develop lib/bridgedb/test/test_proxy.py | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[bridgedb/master] Update bridgedb.pot file with changed BridgeDB strings for translation.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 4ad7667f12607731fa0996821f1e4824f5c1972b Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 19 22:16:18 2015 +0000 Update bridgedb.pot file with changed BridgeDB strings for translation. --- lib/bridgedb/i18n/templates/bridgedb.pot | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/lib/bridgedb/i18n/templates/bridgedb.pot b/lib/bridgedb/i18n/templates/bridgedb.pot index 276841e..160c2ba 100644 --- a/lib/bridgedb/i18n/templates/bridgedb.pot +++ b/lib/bridgedb/i18n/templates/bridgedb.pot @@ -6,12 +6,12 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: bridgedb 0.2.4-3-ge333d91\n" +"Project-Id-Version: bridgedb 0.2.4-234-g193c80a-dirty\n" "Report-Msgid-Bugs-To: " "'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…" "=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" -"POT-Creation-Date: 2015-02-03 03:24+0000\n" -"PO-Revision-Date: 2015-02-03 03:24+0000\n" +"POT-Creation-Date: 2015-03-19 22:13+0000\n" +"PO-Revision-Date: 2015-03-19 22:13+0000\n" "Last-Translator: Isis Lovecruft <isis(a)torproject.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -30,7 +30,7 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:122 +#: lib/bridgedb/HTTPServer.py:107 msgid "Sorry! Something went wrong with your request." msgstr "" @@ -205,12 +205,13 @@ msgstr "" #: lib/bridgedb/strings.py:121 #, python-format msgid "" -"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" -"Browser download page %s to start Tor Browser." +"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" +"page %s and then follow the instructions there for downloading and starting\n" +"Tor Browser." msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:125 +#: lib/bridgedb/strings.py:126 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and " "follow\n" @@ -218,7 +219,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:129 +#: lib/bridgedb/strings.py:130 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor " "connections\n" @@ -226,7 +227,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:133 +#: lib/bridgedb/strings.py:134 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and" @@ -235,29 +236,29 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: lib/bridgedb/strings.py:141 +#: lib/bridgedb/strings.py:142 msgid "Displays this message." msgstr "" #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: lib/bridgedb/strings.py:145 +#: lib/bridgedb/strings.py:146 msgid "Request vanilla bridges." msgstr "" -#: lib/bridgedb/strings.py:146 +#: lib/bridgedb/strings.py:147 msgid "Request IPv6 bridges." msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:148 +#: lib/bridgedb/strings.py:149 msgid "Request a Pluggable Transport by TYPE." msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:151 +#: lib/bridgedb/strings.py:152 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr ""

1 0

[bridgedb/master] Add skip coverage pragma to import exception line in bridgedb.crypto.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 9b55ea2ad538fdc10e62cfda2e1b736a18d41568 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Feb 22 11:02:41 2015 +0000 Add skip coverage pragma to import exception line in bridgedb.crypto. --- lib/bridgedb/crypto.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/crypto.py b/lib/bridgedb/crypto.py index 63e532b..724d649 100644 --- a/lib/bridgedb/crypto.py +++ b/lib/bridgedb/crypto.py @@ -72,7 +72,7 @@ DIGESTMOD = hashlib.sha1 NEW_BUFFER_INTERFACE = False try: io.BytesIO(buffer('test')) -except TypeError: +except TypeError: # pragma: no cover logging.warn( "This Python version is too old! "\ "It doesn't support new-style buffer interfaces: "\

1 0

[bridgedb/master] Add NO_DISTRIBUTION_COUNTRIES option to config.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit a92cf111584c296a5e589f7412bf5ea27bae5dcd Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Aug 12 03:16:47 2014 +0000 Add NO_DISTRIBUTION_COUNTRIES option to config. This option contains a list of CCs for which, if a bridge is detected to be running on an IP address in one of these countries, it will not be distributed to clients. * FIXES part of #12843. --- bridgedb.conf | 11 ++++++++++- lib/bridgedb/configure.py | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bridgedb.conf b/bridgedb.conf index 1fe61ab..f8b126c 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -15,11 +15,15 @@ # for details. # :copyright: (c) 2007-2014 The Tor Project, Inc. # (c) 2007-2014, all sentient entities within the AUTHORS file -# :version: 0.0.10 +# :version: 0.0.13 #=============================================================================== # # CHANGELOG: # ~~~~~~~~~~ +# Changes in version 0.0.13 - 2015-02-20 +# * ADD NO_DISTRIBUTION_COUNRIES option for refusing to distribute bridges +# whose primary ORAddress is geolocated to any of some certain countries. +# # Changes in version 0.0.12 - 2015-02-06 # * ADD a dictionary of TASKS to be run and the intervals at which they # should be repeated. @@ -187,6 +191,11 @@ COLLECT_TIMESTAMPS = False # Filename that contains blocked bridges list. Comment out to disable. #COUNTRY_BLOCK_FILE = "blocked-bridges" +# (list of two-character, uppercased strings for country codes) Don't +# distribute bridges whose main ORPort IP address is geolocated to any of the +# following countries: +NO_DISTRIBUTION_COUNTRIES = ['IR', 'SY'] + # A list of filenames that contain IP addresses (one per line) of proxies. # All IP-based distributors that see an incoming connection from a proxy # will treat them specially. diff --git a/lib/bridgedb/configure.py b/lib/bridgedb/configure.py index e67a252..83b53d6 100644 --- a/lib/bridgedb/configure.py +++ b/lib/bridgedb/configure.py @@ -111,7 +111,7 @@ def loadConfig(configFile=None, configCls=None): else: setattr(config, attr, os.path.abspath(os.path.expanduser(setting))) - for attr in ["FORCE_PORTS", "FORCE_FLAGS"]: + for attr in ["FORCE_PORTS", "FORCE_FLAGS", "NO_DISTRIBUTION_COUNTRIES"]: setting = getattr(config, attr, []) # Default to empty lists setattr(config, attr, setting)

1 0