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

[bridgedb/master] Merge remote-tracking branch 'tpo-sysrqb/bug10834' into develop
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 2b8b557c2bd3526029b2a09bb48ba95c9e20ff3e Merge: 3a3fe60 7e4a113 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Feb 24 17:01:44 2014 +0000 Merge remote-tracking branch 'tpo-sysrqb/bug10834' into develop bridgedb.conf | 3 +++ lib/bridgedb/HTTPServer.py | 15 +++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-)

1 0

[bridgedb/master] Change a test_crypto class name and add a docstring.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit e89059d9d4741c63d73d7a49eff1856d87a4a7e9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 4 04:34:37 2014 +0000 Change a test_crypto class name and add a docstring. --- lib/bridgedb/test/test_crypto.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_crypto.py b/lib/bridgedb/test/test_crypto.py index 2e6894e..cc1ee9a 100644 --- a/lib/bridgedb/test/test_crypto.py +++ b/lib/bridgedb/test/test_crypto.py @@ -24,7 +24,8 @@ SEKRIT_KEY = b'v\x16Xm\xfc\x1b}\x063\x85\xaa\xa5\xf9\xad\x18\xb2P\x93\xc6k\xf9' SEKRIT_KEY += b'\x8bI\xd9\xb8xw\xf5\xec\x1b\x7f\xa8' -class CryptoTest(unittest.TestCase): +class GetKeyTests(unittest.TestCase): + """Tests for :func:`bridgedb.crypto.getKey`.""" def test_getKey_nokey(self): """Test retrieving the secret_key from an empty file."""

1 0

[bridgedb/master] Remove unused HTTPServer.WebResourceBridges.domains attribute.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 7a439e59c712c0dd1b425044a7493315c0a53476 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 4 04:38:08 2014 +0000 Remove unused HTTPServer.WebResourceBridges.domains attribute. This was left over from commit 120c8e6d4b9d714e79722d83c19e110120977e79, wherein the HTTPS and email distributors were split into different files. The domains are taken from config.EMAIL_DOMAINS and are only applicable to the email server. --- lib/bridgedb/HTTPServer.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 724e8cd..b679ff5 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -249,7 +249,7 @@ class WebResourceBridges(twisted.web.resource.Resource): isLeaf = True def __init__(self, distributor, schedule, N=1, useForwardedHeader=False, - includeFingerprints=True, domains=None): + includeFingerprints=True): """Create a new WebResource. :type distributor: :class:`IPBasedDistributor` @@ -273,10 +273,6 @@ class WebResourceBridges(twisted.web.resource.Resource): self.useForwardedHeader = useForwardedHeader self.includeFingerprints = includeFingerprints - # do not use mutable types as __init__ defaults! - if not domains: domains = [] - self.domains = domains - def render(self, request): """Render a response for a client HTTP request. @@ -481,8 +477,7 @@ def addWebServer(cfg, dist, sched): resource = WebResourceBridges(dist, sched, cfg.HTTPS_N_BRIDGES_PER_ANSWER, cfg.HTTP_USE_IP_FROM_FORWARDED_HEADER, - includeFingerprints=cfg.HTTPS_INCLUDE_FINGERPRINTS, - domains=cfg.EMAIL_DOMAINS) + includeFingerprints=cfg.HTTPS_INCLUDE_FINGERPRINTS) resource_options = WebResourceOptions()

1 0

[bridgedb/master] Fix indentation of docstring parameters in HTTPServer.WebResourceBridges.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit ba592b4890837ad0eed08a761a273d1d4f7e5277 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 4 04:36:54 2014 +0000 Fix indentation of docstring parameters in HTTPServer.WebResourceBridges. --- lib/bridgedb/HTTPServer.py | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index fb1fb7f..724e8cd 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -241,31 +241,29 @@ class WebResourceOptions(twisted.web.resource.Resource): render_POST = render_GET + class WebResourceBridges(twisted.web.resource.Resource): """This resource is used by Twisted Web to give a web page with some bridges in response to a request.""" + isLeaf = True def __init__(self, distributor, schedule, N=1, useForwardedHeader=False, includeFingerprints=True, domains=None): """Create a new WebResource. - :type distributor: :class:`IPBasedDistributor` - :param distributor: The mechanism to retrieve bridges for - this distributor - :type schedule: :class:`IntervalSchedule` - :param schedule: The time period used to tweak the bridge - selection procedure. - :param int N: The number of bridges to hand out per query. - :param bool useForwardedHeader: Whether or not we should - use the the - X-Forwarded-For header - instead of the source IP - address. - :param bool includeFingerprints: Do we include the - bridge's fingerprint - in the response? - :param list domains: The list of email provider - domain names we support. (unused) + + :type distributor: :class:`IPBasedDistributor` + :param distributor: The mechanism to retrieve bridges for this + distributor. + :type schedule: :class:`IntervalSchedule` + :param schedule: The time period used to tweak the bridge selection + procedure. + :param int N: The number of bridges to hand out per query. + :param bool useForwardedHeader: Whether or not we should use the the + X-Forwarded-For header instead of the + source IP address. + :param bool includeFingerprints: Do we include the bridge's + fingerprint in the response? """ gettext.install("bridgedb", unicode=True) twisted.web.resource.Resource.__init__(self)

1 0

[bridgedb/master] Update copyright year in lib/bridgedb/test/test_parse_networkstatus.py.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 019859f2d0f7b2edcfe58cbdc5512cf3348f4dcb Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 4 04:32:06 2014 +0000 Update copyright year in lib/bridgedb/test/test_parse_networkstatus.py. --- lib/bridgedb/test/test_parse_networkstatus.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/test/test_parse_networkstatus.py b/lib/bridgedb/test/test_parse_networkstatus.py index 46bd90d..6a89c25 100644 --- a/lib/bridgedb/test/test_parse_networkstatus.py +++ b/lib/bridgedb/test/test_parse_networkstatus.py @@ -3,10 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# please also see AUTHORS file -# :copyright: (c) 2013, Isis Lovecruft -# (c) 2007-2013, The Tor Project, Inc. -# (c) 2007-2013, all entities within the AUTHORS file +# :copyright: (c) 2013-2014, Isis Lovecruft +# (c) 2007-2014, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information """Unittests for the :mod:`bridgedb.parse.networkstatus` module.

1 0

[bridgedb/master] Only add a bridge to the splitter if it is new.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 92eb6fe9e7d4e1e7cbb72687b9f41f5f827fa182 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue Mar 4 03:59:41 2014 +0000 Only add a bridge to the splitter if it is new. If it's not new then we want to overwrite the old instance. Unconditionally appending to to the splitter results in duplicate bridges. Closes #9264 --- lib/bridgedb/Bridges.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index e5d5921..1dc4f4e 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -1250,7 +1250,15 @@ class FilteredBridgeSplitter(BridgeHolder): % Util.logSafely(bridge.fingerprint)) return - self.bridges.append(bridge) + index = 0 + logging.debug("Inserting %s into %s ring" % (bridge.fingerprint, self.key)) + for old_bridge in self.bridges: + if bridge.fingerprint == old_bridge.fingerprint: + self.bridges[index] = bridge + break + index += 1 + else: + self.bridges.append(bridge) for ringname, (filterFn, subring) in self.filterRings.items(): if filterFn(bridge): subring.insert(bridge)

1 0

[bridgedb/master] Add a module docstring to bridgedb.crypto.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit a41cf0d90fd80243c0e0b81a1648c5f19598772c Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 4 04:46:27 2014 +0000 Add a module docstring to bridgedb.crypto. --- lib/bridgedb/crypto.py | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/crypto.py b/lib/bridgedb/crypto.py index 6b16e49..d615489 100644 --- a/lib/bridgedb/crypto.py +++ b/lib/bridgedb/crypto.py @@ -3,17 +3,33 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# please also see AUTHORS file -# :copyright: (c) 2007-2013, The Tor Project, Inc. -# (c) 2007-2013, all entities within the AUTHORS file +# :copyright: (c) 2007-2014, The Tor Project, Inc. +# (c) 2013-2014, Isis Lovecruft +# (c) 2007-2014, all entities within the AUTHORS file # :license: 3-clause BSD, see included LICENSE for information +"""crypto - BridgeDB general cryptographic utilities. + +**Module Overview:** + +.. + crypto + |_getKey() - Load the master key from a file, or create a new one. + | + \_SSLVerifyingContextFactory - OpenSSL.SSL.Context factory which verifies + | certificate chains and matches hostnames. + |_getContext() - Retrieve an SSL context configured for certificate + | verification. + |_getHostnameFromURL() - Parses the hostname from the request URL. + \_verifyHostname() - Check that the cert CN matches the request + hostname. + +""" from __future__ import absolute_import from __future__ import unicode_literals import logging - import os import OpenSSL.rand

1 0

[bridgedb/master] Merge branch 'fix/update-gsoc-text' into develop
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit fff100491206a0bc943c22e5876b0561f9b7ba57 Merge: a41cf0d d5f2563 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 6 21:41:05 2014 +0000 Merge branch 'fix/update-gsoc-text' into develop doc/gsoc2014-volunteer.txt | 117 ++++++++++---------------------------------- 1 file changed, 26 insertions(+), 91 deletions(-)

1 0

[bridgedb/master] Update bridgehistory timestamps for each bridge, as appropriate.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit ff3a2641ac3447238511ce3436386d9ee2553011 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue Mar 4 04:03:29 2014 +0000 Update bridgehistory timestamps for each bridge, as appropriate. --- lib/bridgedb/Main.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 36e4e88..28d6c8f 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -124,16 +124,17 @@ def load(state, splitter, clear=False): logging.info("Opening bridge-server-descriptor file: '%s'" % fname) f = open(fname, 'r') desc_digests.update(Bridges.getDescriptorDigests(f)) - if bridge.getID() in timestamps.keys(): - ts = timestamps[bridge.getID()][:] - ts.sort() - for timestamp in ts: - logging.debug( - "Adding/updating timestamps in BridgeHistory for "\ - "'%s' in database: %s" - % (bridge.fingerprint, timestamp)) - bridgedb.Stability.addOrUpdateBridgeHistory( - bridge, timestamp) + for bridge in bridges.values(): + if bridge.getID() in timestamps.keys(): + ts = timestamps[bridge.getID()][:] + ts.sort() + for timestamp in ts: + logging.debug( + "Adding/updating timestamps in BridgeHistory for "\ + "'%s' in database: %s" + % (bridge.fingerprint, timestamp)) + bridgedb.Stability.addOrUpdateBridgeHistory( + bridge, timestamp) logging.debug("Closing bridge-server-descriptor file: '%s'" % fname) f.close()

1 0

[bridgedb/master] Disable two pylint warnings, W1201 and W1401, in .pylintrc.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit ed08f19067db40f8d1c43e7b5af013ca78b29688 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 12 00:40:30 2014 +0000 Disable two pylint warnings, W1201 and W1401, in .pylintrc. These warnings are for: :logging-not-lazy (W1201): *Specify string format arguments as logging function parameters* Used when a logging statement has a call form of "logging.<logging method>(format_string % (format_args...))". Such calls should leave string interpolation to the logging method itself and be written "logging.<logging method>(format_string, format_args...)" so that the program may avoid incurring the cost of the interpolation in those cases in which no message will be logged. For more, see http://www.python.org/dev/peps/pep-0282/. This message belongs to the logging checker. :anomalous-backslash-in-string (W1401): *Anomalous backslash in string: '%s'. String constant might be missing an r prefix.* Used when a backslash is in a literal string but not as an escape. This message belongs to the string_constant checker. --- .pylintrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pylintrc b/.pylintrc index ab53c88..6ba152c 100644 --- a/.pylintrc +++ b/.pylintrc @@ -33,7 +33,7 @@ load-plugins= # can either give multiple identifier separated by comma (,) or put this option # multiple time (only on the command line, not in the configuration file where # it should appear only once). -#disable= +disable=W1201,W1401 [REPORTS]

1 0