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

[bridgedb/develop] Add note about an annoying technical limitation for filter descriptions.
by isis＠torproject.org 28 Mar '15

28 Mar '15

commit 607c0a6b345dc5eba81eec1d8aeddb4302b09800 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 28 02:35:06 2015 +0000 Add note about an annoying technical limitation for filter descriptions. --- lib/bridgedb/Filters.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/bridgedb/Filters.py b/lib/bridgedb/Filters.py index b06a605..eadf012 100644 --- a/lib/bridgedb/Filters.py +++ b/lib/bridgedb/Filters.py @@ -27,6 +27,8 @@ def filterAssignBridgesToRing(hmac, numRings, assignedRing): return False _assignBridgesToRing.__name__ = ("filterAssignBridgesToRing(%s, %s, %s)" % (hmac, numRings, assignedRing)) + # XXX The `description` attribute must contain an `=`, or else + # dumpAssignments() will not work correctly. setattr(_assignBridgesToRing, "description", "ring=%d" % assignedRing) funcs[ruleset] = _assignBridgesToRing return _assignBridgesToRing

1 0

[bridgedb/develop] PEP8 whitespace fix for one line in Dist.py.
by isis＠torproject.org 28 Mar '15

28 Mar '15

commit 4ec9a3e6748ed59e4399c139210ba706f133d392 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 28 02:30:20 2015 +0000 PEP8 whitespace fix for one line in Dist.py. --- lib/bridgedb/Dist.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index ded8297..c2a8620 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -320,7 +320,7 @@ class IPBasedDistributor(Distributor): # otherwise, add a new ring and populate it if ruleset in self.splitter.filterRings.keys(): logging.debug("Cache hit %s" % ruleset) - _,ring = self.splitter.filterRings[ruleset] + _, ring = self.splitter.filterRings[ruleset] # else create the ring and populate it else:

1 0

[bridgedb/develop] Document countryCode parameter for IPBasedDistributor.getBridgesForIP().
by isis＠torproject.org 28 Mar '15

28 Mar '15

commit ba50829d94e7fdbd8d8498aca15273fb75e60dcf Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 28 02:17:12 2015 +0000 Document countryCode parameter for IPBasedDistributor.getBridgesForIP(). --- lib/bridgedb/Dist.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 20f27bc..ded8297 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -243,7 +243,11 @@ class IPBasedDistributor(Distributor): be any string, so long as it changes with every period. :param int N: The number of bridges to try to give back. (default: 1) - :param str countryCode: DOCDOC (default: None) + :param str countryCode: The two-letter geoip country code of the + client's IP address. If given, the client will be placed in that + "area". Clients within the same area receive the same bridges per + period. If not given, the **ip** is truncated to it's CIDR /24 + representation and used as the "area". (default: None) :param list bridgeFilterRules: A list of callables used filter the bridges returned in the response to the client. See :mod:`~bridgedb.Filters`.

1 0

[bridgedb/develop] Remove the insanely chatty log messages about miscalculated hashrings.
by isis＠torproject.org 28 Mar '15

28 Mar '15

commit 78c3df98888252a2045e1e627397ec8e1f7a3f4c Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 28 02:32:55 2015 +0000 Remove the insanely chatty log messages about miscalculated hashrings. I added these earlier this week for debugging purposes, but it turns out that they print *so* many times that it is impossible to follow the logfiles. --- lib/bridgedb/Filters.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/lib/bridgedb/Filters.py b/lib/bridgedb/Filters.py index b857967..b06a605 100644 --- a/lib/bridgedb/Filters.py +++ b/lib/bridgedb/Filters.py @@ -24,12 +24,7 @@ def filterAssignBridgesToRing(hmac, numRings, assignedRing): if which == assignedRing: return True - else: - logging.debug(("Bridge %s has calculated assignment %d; not " - "in correct ring %d.") - % (bridge, which, assignedRing)) - return False - + return False _assignBridgesToRing.__name__ = ("filterAssignBridgesToRing(%s, %s, %s)" % (hmac, numRings, assignedRing)) setattr(_assignBridgesToRing, "description", "ring=%d" % assignedRing) @@ -88,13 +83,6 @@ def filterBridgesByTransport(methodname, addressClass=None): # ignore method name case if transport.methodname.lower() == methodname.lower(): return True - else: - logging.debug(("Transport methodname '%s' doesn't match " - "requested methodname: '%s'.") - % (transport.methodname, methodname)) - else: - logging.debug(("Transport %s has incorrect address version " - "(%s).") % (transport, addressClass)) return False _filterByTransport.__name__ = ("filterBridgesByTransport(%s,%s)"

1 0

[bridgedb/develop] Update CHANGELOG for bridgedb-0.3.2.
by isis＠torproject.org 28 Mar '15

28 Mar '15

commit 1488ca74f8aeca15a63c2de22acb9bf17935e83c Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Mar 27 04:46:30 2015 +0000 Update CHANGELOG for bridgedb-0.3.2. --- CHANGELOG | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 279ad57..8c1bb0e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,35 @@ +Changes in version 0.3.2 - 2015-03-?? + + * FIXES a problem with the calculation of Levenshtein distances + between blacklisted email addresses and those on incoming + email. This fixes a problem with the fuzzy matching implemented in + #9385: https://bugs.torproject.org/9385. + + * FIXES #12504 https://bugs.torproject.org/12504 + Which Pluggable Transports BridgeDB distributes is now easily + configurable via the bridgedb.conf configuration file. + + * FIXES #13202 https://bugs.torproject.org/13202 + Old bridges running Tor-0.2.4.x with Pluggable Transports like + scramblesuit and obfs4proxy have a bug which causes them to not + include the PT arguments in the `transport` line they submit to + the BridgeAuthority in their extrainfo descriptors. This causes + BridgeDB to have broken bridge lines for these bridges. + For example, scramblesuit requires a `password=` in the + `ClientTransportPlugin` for clients to connect to it. If BridgeDB + receives a line in that bridge's extrainfo which says + `transport scramblesuit 1.2.3.4:1234` (without a password), then + when BridgeDB gives clients a bridge line for that bridge, it'll + look like "Bridge scramblesuit 1.2.3.4:1234" - meaning that it won't + work. This fixes the issue by excluding broken transports from + being distributed to clients. + + * FIXES #15464 https://bugs.torproject.org/15464 + The setup procedure for creating a BridgeDB Continuous Integration + build machine is now simplified and generalised to include build + environments like Jenkins, not just TravisCI. + + Changes in version 0.3.1 - 2015-03-24 * FIXES #14065 https://bugs.torproject.org/14065

1 0

[bridgedb/develop] Fix bug in proxy.loadProxiesFromFile().
by isis＠torproject.org 28 Mar '15

28 Mar '15

commit d9f44fabf0922f1d76a6d313b42ef7ed61ce4977 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 28 02:38:42 2015 +0000 Fix bug in proxy.loadProxiesFromFile(). Checking `if proxySet` when the ProxySet was empty (as at server startup, particularly when loading the PROXY_LIST_FILES), would evaluate to False, cause the proxies from the files *not* to be loaded into the empty ProxySet. This did not effect loading the list of Tor Exit relays, since we use scripts/get-tor-exits and load the list into memory while calling ProxySet.add() for each one (rather than loading Tor Exit relays from a downloaded file, like we used to do). --- lib/bridgedb/proxy.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/proxy.py b/lib/bridgedb/proxy.py index fe575b3..3940ed6 100644 --- a/lib/bridgedb/proxy.py +++ b/lib/bridgedb/proxy.py @@ -79,14 +79,17 @@ def loadProxiesFromFile(filename, proxySet=None, removeStale=False): logging.info("Reloading proxy lists...") addresses = [] - if proxySet: + + # We have to check the instance because, if the ProxySet was newly + # created, it will likely be empty, causing it to evaluate to False: + if isinstance(proxySet, ProxySet): oldProxySet = proxySet.copy() try: with open(filename, 'r') as proxyFile: for line in proxyFile.readlines(): line = line.strip() - if proxySet: + if isinstance(proxySet, ProxySet): # ProxySet.add() will validate the IP address if proxySet.add(line, tag=filename): logging.info("Added %s to the proxy list." % line) @@ -98,7 +101,7 @@ def loadProxiesFromFile(filename, proxySet=None, removeStale=False): except Exception as error: logging.warn("Error while reading a proxy list file: %s" % str(error)) - if proxySet: + if isinstance(proxySet, ProxySet): stale = list(oldProxySet.difference(addresses)) if removeStale:

1 0

[torbutton/master] Fix word order on security slider notification.
by mikeperry＠torproject.org 28 Mar '15

28 Mar '15

commit 71e3da38a123fed8c240311f3aec90fd632234a3 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 27 17:12:53 2015 -0700 Fix word order on security slider notification. Sorry, translators :/. --- src/chrome/locale/en/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index ef1723e..ca048df 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -55,7 +55,7 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an torbutton.popup.never_ask_again = Never ask me again torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! +torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Open security settings torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size.

1 0

[tor-browser-bundle/master] Actually include NoScript 2.6.9.19.
by mikeperry＠torproject.org 27 Mar '15

27 Mar '15

commit 73447ce681adb4f9e4f9d08c44b8ed47dd3e327c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 27 14:31:11 2015 -0700 Actually include NoScript 2.6.9.19. --- gitian/versions.alpha | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 5c9ffb9..6976ea8 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -58,7 +58,7 @@ GO_VER=1.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.15-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.19-fx+fn+sm.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -87,7 +87,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=63d866458e0261d20b612193f8f446728c991dd488c59e49d8f927c63e7eb9b4 +NOSCRIPT_HASH=2579b91fb2f5491a12c49e543a9d2b2583dc82e2393ce1b0ab92b170dcc7c6ad HTTPSE_HASH=059b6141b200c18f5903550d0ee6bdec1e1b874b7e069d246466e77bf3a436c2 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[check/master] Purge old data
by arlo＠torproject.org 27 Mar '15

27 Mar '15

commit ad424311980e22d49b4e99aa00fa1c5c584adfe2 Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Mar 27 12:56:52 2015 -0700 Purge old data --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 0b2d255..bf23366 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,7 @@ data/exit-lists/: data/ data/consensus: data/consensuses/ @echo "Getting latest consensus documents" + @find data/consensuses -mtime +31 | xargs rm -f @pushd data/consensuses/; \ wget -r -nH -nd -nc --no-parent --reject "index.html*" \ $(collector_url)$(consensuses_dir); \ @@ -30,6 +31,7 @@ data/consensus: data/consensuses/ data/exit-addresses: data/exit-lists/ @echo "Getting latest exit lists" + @find data/exit-lists -mtime +31 | xargs rm -f @pushd data/exit-lists/; \ wget -r -nH -nd -nc --no-parent --reject "index.html*" \ $(collector_url)$(exit_lists_dir); \ @@ -38,6 +40,7 @@ data/exit-addresses: data/exit-lists/ descriptors: data/descriptors/ @echo "Getting latest descriptors (This may take a while)" + @find data/descriptors -mtime +31 | xargs rm -f @pushd data/descriptors/; \ wget -r -nH -nd -nc --no-parent --reject "index.html*" \ $(collector_url)$(descriptors_dir); \

1 0

[check/master] Post path independent
by arlo＠torproject.org 27 Mar '15

27 Mar '15

commit 0f2d94673d210068c50e5c34dfc26253c46c3bc2 Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Mar 27 13:32:52 2015 -0700 Post path independent * Make that work for /torbulkexitlist as well. --- public/bulk.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/bulk.html b/public/bulk.html index dfd0683..9f62854 100644 --- a/public/bulk.html +++ b/public/bulk.html @@ -15,7 +15,7 @@ <h4>Welcome to the Tor Bulk Exit List exporting tool.</h4> <p>If you are a service provider and you wish to build a list of possible Tor nodes that might contact one of your servers, enter that single server address below. Giving you the whole list means you can query the list privately, rather than telling us your users' IP addresses. This list allows you to have a nearly real time authoritative source for Tor exits that allow contacting your server on port 80. We don't log the IP address that queries for a given list. If you'd like, you're free to run your own copy of this program. It's Free Software and can be downloaded from the <a href="https://gitweb.torproject.org/check.git">git repository</a>.</p> - <form action="/cgi-bin/TorBulkExitList.py" name="ip"> + <form action="" name="ip"> <div class="form"> <label for="ip">IP:</label> <input type="text" name="ip" />

1 0