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

[torbutton/master] Bug 7255: Address Pearl Crescent's review comments
by gk＠torproject.org 25 Mar '15

25 Mar '15

commit d2c3f9e7dae61b5f18b83398d234ab75186a3e99 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 25 20:14:37 2015 +0000 Bug 7255: Address Pearl Crescent's review comments --- src/chrome/content/torbutton.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 3158c04..83ea395 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -22,6 +22,9 @@ const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion" const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; +const k_tb_tor_resize_warn_pref = + "extensions.torbutton.startup_resize_period" + // status var m_tb_wasinited = false; var m_tb_prefs = false; @@ -1074,7 +1077,7 @@ function torbutton_on_abouttor_load(aDoc) { // OS-specific window maximization on start-up should be done by now. Disable // the respective preference to make sure the user is seeing our notification. - m_tb_prefs.setBoolPref("extensions.torbutton.startup_resize_period", false); + m_tb_prefs.setBoolPref(k_tb_tor_resize_warn_pref, false); } function torbutton_is_abouttor_doc(aDoc) { @@ -3427,9 +3430,9 @@ var torbutton_resizelistener = if (m_tb_resize_date === null) { m_tb_resize_date = Date.now(); } else { - // We at least another second before we show a new notification. - // Should be enough to rule out OSes that call our handler rapidly - // due to internal workings. + // We wait at least another second before we show a new + // notification. Should be enough to rule out OSes that call our + // handler rapidly due to internal workings. if (Date.now() - m_tb_resize_date < 1000) { return; } @@ -3471,7 +3474,7 @@ var torbutton_resizelistener = // maximize the window. We don't want to do that AND don't want to // show the user our notification in this case. if (m_tb_prefs. - getBoolPref("extensions.torbutton.startup_resize_period")) { + getBoolPref(k_tb_tor_resize_warn_pref)) { window.addEventListener("resize", function() { win.resizeBy(width - win.innerWidth, height - win.innerHeight); @@ -3506,8 +3509,7 @@ var torbutton_resizelistener = // the window triggers more than one resize event the first being not the // one we need. Thus we can't remove the listener after the first resize // event got fired. Thus, we have the rather klunky setTimeout() call. - m_tb_prefs.setBoolPref("extensions.torbutton.startup_resize_period", - true); + m_tb_prefs.setBoolPref(k_tb_tor_resize_warn_pref, true); window.addEventListener("sizemodechange", m_tb_resize_handler, false); // This is fun. any attempt to directly set the inner window actually

1 0

[metrics-web/master] Add a question about estimated users per hour.
by karsten＠torproject.org 25 Mar '15

25 Mar '15

commit f753e4dc5b9f38463c26d6ffa5843db25c6c1a65 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Mar 25 20:11:50 2015 +0100 Add a question about estimated users per hour. --- doc/users-q-and-a.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/users-q-and-a.txt b/doc/users-q-and-a.txt index 537ef06..e6bf74f 100644 --- a/doc/users-q-and-a.txt +++ b/doc/users-q-and-a.txt @@ -24,6 +24,13 @@ over the day, or what? A: Average number of concurrent users, estimated from data collected over a day. We can't say how many distinct users there are. +Q: Are there more fine-grained numbers available, for example, on the +number of users per hour? +A: No, the relays that report these statistics aggregate requests by +country of origin and over a period of 24 hours. The statistics we would +need to gather for the number of users per hour would be too detailed and +might put users at risk. + Q: Are these tor clients or users? What if there's more than one user behind a tor client? A: Then we count those users as one. We really count clients, but it's

1 0

[bridgedb/master] Add better checks for vanilla IPv4 bridge lines in test_https.py.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit 414e6a577441a3ceaa207ccb771b839370ff456c Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 23 00:13:54 2015 +0000 Add better checks for vanilla IPv4 bridge lines in test_https.py. --- lib/bridgedb/test/test_https.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index fe9e4e3..6a40a67 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -24,6 +24,7 @@ repository. from __future__ import print_function +import ipaddr import mechanize import os @@ -211,8 +212,9 @@ class HTTPTests(unittest.TestCase): captchaResponse=CAPTCHA_RESPONSE) bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=2) for bridge in bridges: - # TODO: do more interesting checks self.assertTrue(bridge != None) + addr = bridge[0].rsplit(':', 1)[0] + self.assertIsInstance(ipaddr.IPAddress(addr), ipaddr.IPv4Address) def test_get_scramblesuit_ipv4(self): if os.environ.get("CI"):

1 0

[bridgedb/master] Add test for vanilla IPv6 addresses in test_https.py.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit c1a3d4692270b592a3a2efb7d5a14af357f6f91c Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 23 00:14:57 2015 +0000 Add test for vanilla IPv6 addresses in test_https.py. --- lib/bridgedb/test/test_https.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index 6a40a67..92b07bf 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -216,6 +216,29 @@ class HTTPTests(unittest.TestCase): addr = bridge[0].rsplit(':', 1)[0] self.assertIsInstance(ipaddr.IPAddress(addr), ipaddr.IPv4Address) + def test_get_vanilla_ipv6(self): + if os.environ.get("CI"): + if not self.pid or not processExists(self.pid): + raise FailTest("Could not start BridgeDB process on CI server!") + else: + raise SkipTest(("The mechanize tests cannot handle self-signed " + "TLS certificates, and thus require opening " + "another port for running a plaintext HTTP-only " + "BridgeDB webserver. Because of this, these tests " + "are only run on CI servers.")) + + self.openBrowser() + self.goToOptionsPage() + + PT = '0' + soup = self.submitOptions(transport=PT, ipv6=True, + captchaResponse=CAPTCHA_RESPONSE) + bridges = self.getBridgeLinesFromSoup(soup, fieldsPerBridge=2) + for bridge in bridges: + self.assertTrue(bridge != None) + addr = bridge[0].rsplit(':', 1)[0].strip('[]') + self.assertIsInstance(ipaddr.IPAddress(addr), ipaddr.IPv6Address) + def test_get_scramblesuit_ipv4(self): if os.environ.get("CI"): if not self.pid or not processExists(self.pid):

1 0

[bridgedb/master] Fix BridgeRequestBase.addressClass check.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit 8507fa30378e85e90b71b54de2bcb2f9537936f4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 23 00:32:04 2015 +0000 Fix BridgeRequestBase.addressClass check. * CHANGE `bridgedb.bridgerequest.BridgeRequestBase.__init__()` to check that the `addressClass` *is* either an `ipaddr.IPv4Address` or an `ipaddr.IPv6Address`, rather than checking if `addressClass` is an instance of one of those classes. * FIXES #14065: https://bugs.torproject.org/14065. --- lib/bridgedb/bridgerequest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/bridgerequest.py b/lib/bridgedb/bridgerequest.py index d7b4d18..320074a 100644 --- a/lib/bridgedb/bridgerequest.py +++ b/lib/bridgedb/bridgerequest.py @@ -88,8 +88,8 @@ class BridgeRequestBase(object): def __init__(self, addressClass=None): self.addressClass = addressClass - if not isinstance(self.addressClass, - (ipaddr.IPv4Address, ipaddr.IPv6Address)): + if not ((self.addressClass is ipaddr.IPv4Address) or + (self.addressClass is ipaddr.IPv6Address)): self.addressClass = ipaddr.IPv4Address self.filters = list() self.transports = list()

1 0

[bridgedb/master] Revert back to using Bridge.getID() in filterAssignBridgesToRing().
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit 332ca3fb678bf47ec3fdb100ac6dea6081a37b6e Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 23 01:41:02 2015 +0000 Revert back to using Bridge.getID() in filterAssignBridgesToRing(). Bridge.getID() returns the Bridge's identity key digest in binary, and Bridge.fingerprint return the digest in hexadecimal. While this is not a bug, we should avoid randomly changing the encoding used to assign Bridges to hashrings, as it might result in e.g. a Bridge which was previously assigned to hashing 0 based on the binary digest getting a duplicate assignment in hashring 1 based on the hexadecimal-encoded digest. * REVERT change made in 6015cc35 to the encoding of Bridge identity key digest used for assigning a Bridge to a hashring. --- lib/bridgedb/Filters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/Filters.py b/lib/bridgedb/Filters.py index b7bac87..d96d3ec 100644 --- a/lib/bridgedb/Filters.py +++ b/lib/bridgedb/Filters.py @@ -18,7 +18,7 @@ def filterAssignBridgesToRing(hmac, numRings, assignedRing): return funcs[ruleset] except KeyError: def _assignBridgesToRing(bridge): - digest = hmac(bridge.fingerprint) + digest = hmac(bridge.getID()) pos = long( digest[:8], 16 ) which = pos % numRings

1 0

[bridgedb/master] Merge branch 'fix/14065-vanilla-ipv6' into develop
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit 481d36868e8c1e5a430b82ccd1d17ecfb0ed0837 Merge: 332ca3f 0449560 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 23 01:52:38 2015 +0000 Merge branch 'fix/14065-vanilla-ipv6' into develop lib/bridgedb/bridgerequest.py | 4 ++-- lib/bridgedb/bridges.py | 4 +++- lib/bridgedb/test/test_https.py | 23 +++++++++++++++++++++++ 3 files changed, 28 insertions(+), 3 deletions(-)

1 0

[bridgedb/master] Log whether a Bridge is attempting to answer a request for IPv6 or IPv4.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit 0449560f737fb71fb2fafe8691f018dc9cc6d362 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 23 00:40:21 2015 +0000 Log whether a Bridge is attempting to answer a request for IPv6 or IPv4. --- lib/bridgedb/bridges.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index b791730..96f995e 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -1038,7 +1038,9 @@ class Bridge(BridgeBackwardsCompatibility): return a :term:`Bridge Line` for the requested pluggable transport type. """ - logging.info("Bridge %s answering request for vanilla address..." % self) + logging.info( + "Bridge %s answering request for IPv%s vanilla address..." % + (self, "6" if bridgeRequest.addressClass is ipaddr.IPv6Address else "4")) if not bridgeRequest.filters: logging.debug(("Request %s didn't have any filters; "

1 0

[bridgedb/master] Remove the need for the recaptcha-client dependency.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit 032ac80ad1f14e3a47a0c28a0e5fff1a787e8c8e Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 25 01:24:47 2015 +0000 Remove the need for the recaptcha-client dependency. --- lib/bridgedb/txrecaptcha.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/txrecaptcha.py b/lib/bridgedb/txrecaptcha.py index 96b288c..a8a0532 100644 --- a/lib/bridgedb/txrecaptcha.py +++ b/lib/bridgedb/txrecaptcha.py @@ -25,9 +25,6 @@ which are copyright the authors of the recaptcha-client_ package. import logging import urllib -from recaptcha.client.captcha import API_SSL_SERVER -from recaptcha.client.captcha import RecaptchaResponse -from recaptcha.client.captcha import displayhtml from twisted import version as _twistedversion from twisted.internet import defer @@ -44,7 +41,8 @@ from zope.interface import implements from bridgedb.crypto import SSLVerifyingContextFactory -API_SERVER = API_SSL_SERVER +#: This was taken from recaptcha.client.captcha.API_SSL_SERVER. +API_SSL_SERVER = API_SERVER = "https://www.google.com/recaptcha/api" API_SSL_VERIFY_URL = "%s/verify" % API_SSL_SERVER # `t.w.client.HTTPConnectionPool` isn't available in Twisted-12.0.0 (see @@ -107,6 +105,15 @@ class RecaptchaResponseError(ValueError): """There was an error with the reCaptcha API server's response.""" +class RecaptchaResponse(object): + """Taken from recaptcha.client.captcha.`RecaptchaResponse`_. + .. RecaptchaResponse: https://code.google.com/p/recaptcha/source/browse/trunk/recaptcha-plugins/p… + """ + def __init__(self, is_valid, error_code=None): + self.is_valid = is_valid + self.error_code = error_code + + class RecaptchaResponseProtocol(protocol.Protocol): """HTML parser which creates a :class:`RecaptchaResponse` from the body of the reCaptcha API server's response.

1 0

[bridgedb/master] Add a module docstring to bridgedb.txrecaptcha.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit 32194b8575b6a0781a164d0c9527a025a754f0ce Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 25 01:22:51 2015 +0000 Add a module docstring to bridgedb.txrecaptcha. --- lib/bridgedb/txrecaptcha.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lib/bridgedb/txrecaptcha.py b/lib/bridgedb/txrecaptcha.py index 477e112..96b288c 100644 --- a/lib/bridgedb/txrecaptcha.py +++ b/lib/bridgedb/txrecaptcha.py @@ -7,6 +7,20 @@ # (c) 2007-2015, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information +"""Twisted-based reCAPTCHA client. + +This client *always* uses TLS with strict hostname checking, unlike the +official Google Python recaptcha-client_, which is harcoded_ to use plaintext +HTTP. + +Small portions of this code were taken from the official Google Python +recaptcha-client_ module, version 1.0.6. Those portions are +:class:`RecaptchaResponse`, :data:`API_SERVER`, They total 5 lines of code, +which are copyright the authors of the recaptcha-client_ package. + +.. _hardcoded: https://code.google.com/p/recaptcha/source/browse/trunk/recaptcha-plugins/p… +.. _recaptcha-client: https://pypi.python.org/pypi/recaptcha-client/1.0.6 +""" import logging import urllib

1 0