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

[bridgedb/master] Merge branch 'fix/4405-tor-exit-check_2_r1' into develop
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit ebae225bb9f74998ead06d145c601ad8b171d5b0 Merge: 3a11cf4 9c33a59 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 11 00:56:04 2015 +0000 Merge branch 'fix/4405-tor-exit-check_2_r1' into develop lib/bridgedb/test/test_proxy.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)

1 0

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

21 Mar '15

commit 3a11cf4110d49018eacee7ed3bff32d6e3866c58 Merge: a36e627 f46e16b Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 11 00:43:33 2015 +0000 Merge branch 'hotfix/0.2.4-travis-pyeggcache' into develop .travis.yml | 1 + 1 file changed, 1 insertion(+)

1 0

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

21 Mar '15

commit a36e627157d873aa2c9659cea0c9e863c50a0f52 Merge: 2c9ef89 4dcccee Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 10 23:04:20 2015 +0000 Merge branch 'hotfix/0.2.4-travis-matrix-update' into develop .travis.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)

1 0

[bridgedb/master] Fix DirtyReactorAggregateError in test_proxy_downloadTorExits().
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 9c33a595c131d439bd943567df794da48e116dab Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 11 00:34:36 2015 +0000 Fix DirtyReactorAggregateError in test_proxy_downloadTorExits(). See https://travis-ci.org/isislovecruft/bridgedb/jobs/50275771#L2156 --- lib/bridgedb/test/test_proxy.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/test/test_proxy.py b/lib/bridgedb/test/test_proxy.py index 78e24ff..144cf70 100644 --- a/lib/bridgedb/test/test_proxy.py +++ b/lib/bridgedb/test/test_proxy.py @@ -14,6 +14,7 @@ import sure from twisted.internet import defer +from twisted.internet import reactor from twisted.trial import unittest from bridgedb import proxy @@ -210,12 +211,22 @@ class LoadProxiesFromFileIntegrationTests(unittest.TestCase): class DownloadTorExitsTests(unittest.TestCase): """Tests for `~bridgedb.proxy.downloadTorExits()`.""" + def setUp(self): + self.protocol = MockExitListProtocol + self.proxyList = proxy.ProxySet() + + def tearDown(self): + """Cleanup method after each ``test_*`` method runs; removes all + selectable readers and writers from the reactor. + """ + reactor.removeAll() + def test_proxy_downloadTorExits(self): - proxyList = proxy.ProxySet() - d = proxy.downloadTorExits(proxyList, - 'OurIPWouldGoHere', - protocol=MockExitListProtocol) - self.assertIsInstance(d, defer.Deferred) + def do_test(): + return proxy.downloadTorExits(self.proxyList, + 'OurIPWouldGoHere', + protocol=self.protocol) + d = do_test() class ProxySetUnittests(unittest.TestCase):

1 0

[bridgedb/master] Hotfix unittest failure due to fix for #12664.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 37efc108fdceb49e4c91034b07fd9d12b4e81ea1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 11 08:02:18 2015 +0000 Hotfix unittest failure due to fix for #12664. The newlines in bridgelines for the HTTPS distributor were changed, but not in the unittests. This fixes the unittests in test_https.py. --- lib/bridgedb/test/test_https.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index 4624f08..5225dc3 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -131,7 +131,7 @@ class HTTPTests(unittest.TestCase): self.assertTrue(soup, "Could not find <div class='bridge-lines'>!") for portion in soup: - bridge_lines = portion.text.strip().split('\n') + bridge_lines = portion.text.strip().split('<br></br>') for bridge_line in bridge_lines: fields = bridge_line.split() bridges.append(fields)

1 0

[bridgedb/master] Set permissions $PYTHON_EGG_CACHE to only be user (not group) writable.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit f46e16b403b7c29a342019983988e6a6e7ac7366 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 11 00:41:31 2015 +0000 Set permissions $PYTHON_EGG_CACHE to only be user (not group) writable. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7e4f6f2..e62551e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,6 +49,7 @@ matrix: before_install: - sudo apt-get update - mkdir $PYTHON_EGG_CACHE + - chmod -R og-w $PYTHON_EGG_CACHE install: - sudo apt-get install -qq --no-install-suggests --no-install-recommends build-essential openssl sqlite3 libgpgme11 libgpgme11-dev python-dev python-setuptools

1 0

[bridgedb/master] Fix missing t.t.unittest.FailTest import in three test modules.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 495d77e249763e68e04f9325d7b85bc633fcbba3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 18 09:31:28 2015 +0000 Fix missing t.t.unittest.FailTest import in three test modules. --- lib/bridgedb/test/test_bridgedb.py | 1 + lib/bridgedb/test/test_https.py | 1 + lib/bridgedb/test/test_smtp.py | 1 + 3 files changed, 3 insertions(+) diff --git a/lib/bridgedb/test/test_bridgedb.py b/lib/bridgedb/test/test_bridgedb.py index 3f0a17a..70c71f0 100644 --- a/lib/bridgedb/test/test_bridgedb.py +++ b/lib/bridgedb/test/test_bridgedb.py @@ -18,6 +18,7 @@ import signal import time from twisted.trial import unittest +from twisted.trial.unittest import FailTest from twisted.trial.unittest import SkipTest from bridgedb.test.util import processExists diff --git a/lib/bridgedb/test/test_https.py b/lib/bridgedb/test/test_https.py index 5225dc3..86b1f84 100644 --- a/lib/bridgedb/test/test_https.py +++ b/lib/bridgedb/test/test_https.py @@ -30,6 +30,7 @@ import os from BeautifulSoup import BeautifulSoup from twisted.trial import unittest +from twisted.trial.unittest import FailTest from twisted.trial.unittest import SkipTest from bridgedb.test.util import processExists diff --git a/lib/bridgedb/test/test_smtp.py b/lib/bridgedb/test/test_smtp.py index cc9e79c..1cbafba 100644 --- a/lib/bridgedb/test/test_smtp.py +++ b/lib/bridgedb/test/test_smtp.py @@ -12,6 +12,7 @@ import os from smtpd import SMTPServer from twisted.trial import unittest +from twisted.trial.unittest import FailTest from twisted.trial.unittest import SkipTest from bridgedb.test.util import processExists

1 0

[bridgedb/master] Add stem-1.2.2 to .travis.requirements.txt.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 5a15c6589382742263a78394e2c233d214393b59 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jun 24 23:31:16 2014 +0000 Add stem-1.2.2 to .travis.requirements.txt. --- .travis.requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index fcc4c77..a298efc 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -30,4 +30,5 @@ pycrypto==2.6.1 pygeoip==0.2.7 pygpgme==0.3 recaptcha-client==1.0.6 +stem==1.2.2 zope.interface==3.6.1

1 0

[bridgedb/master] Initial unittests for bridgedb.parse.descriptors module.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 8901a25bc1414bd655f296a7c38144178ad2363f Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Jun 24 23:49:43 2014 +0000 Initial unittests for bridgedb.parse.descriptors module. * ADD unittests for `bridgedb.parse.descriptors module` in bridgedb.test.test_parse_descriptors. --- lib/bridgedb/test/test_parse_descriptors.py | 74 +++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py new file mode 100644 index 0000000..a606e5b --- /dev/null +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -0,0 +1,74 @@ + +"""Unittests for :class:`bridgedb.parse.descriptors` module.""" + +from __future__ import print_function + +import io +import textwrap + +from twisted.trial import unittest + +HAS_STEM = False + +try: + from stem.descriptor.server_descriptor import RelayDescriptor +except (ImportError, NameError), error: + print("There was an error importing stem: %s" % error) +else: + HAS_STEM = True + + +BRIDGE_SERVER_DESCRIPTOR = '''\ +router OutwitsPlod 152.78.9.20 17810 0 0 +or-address [bfbd:7a90:2347:cc4:e854:64b3:2c31:124f]:17810 +platform Tor 0.2.4.16-rc on Linux +protocols Link 1 2 Circuit 1 +published 2014-03-12 16:07:08 +fingerprint 6FA9 216C F3A0 6E89 A031 21AC C31F 70F8 DFD7 DDCC +uptime 57032961 +bandwidth 2240117028 2532306205 1947927850 +extra-info-digest 069EBB610CD8B02BF1BB0CAB17B99DDA73CCC91A +onion-key +-----BEGIN RSA PUBLIC KEY----- +MIGkAgEAMA0GCSqGSIb3DQEBAQUABIGPMIGMAgEAAoGBANI67YIwW8xF2v310PZt +Qc8jm0ptwLHmgBdhAzHAIGagqknjvukX5GTL0zie5covhxrQhZqjJm/gQ8inwkol +kZCue1ZQ9PHaTWjz58ESMQo41h+9Whfd8Egm2ev1+MwqlPy1Kr3rcPNIEetsmtil +DFNocpEfq1MC0tDG6qVO6/FNAgMBAAE= +-----END RSA PUBLIC KEY----- +signing-key +-----BEGIN RSA PUBLIC KEY----- +MIGkAgEAMA0GCSqGSIb3DQEBAQUABIGPMIGMAgEAAoGBALk0Ws5qPlgwKO6IQ1b/ +aamtEdXEPj2DrZTF3aGYR5zoZgw9gwmkbRHjrMQ/Wj+QHg0cTFY2DsYt81QXwiv+ +m1P9sshMZSZZz2P8Ld8WqUNuN7YIIJx/fj9Vy6LRFySzoyQ4FF/1Dio+JD0rvtyc +ZyRJl2aV5iYA9/TQY2zs2cxFAgMBAAE= +-----END RSA PUBLIC KEY----- +hidden-service-dir +contact Somebody <somebody(a)example.com> +reject *:* +router-signature +-----BEGIN SIGNATURE----- +i/nkrD4VxqWcnAlBS48hIilrE7C4DvRJhN4XWep7TXNbEC48IqFG+49xpKV6qkts +yKaUDBfD9Y1tMM0mrRjEWK0xYWX/4Ug9Xbbv2q1so4EuS35AF11d69Yf/2ppnCu7 +r+qtX7csROF4KyFJYFNJUKf/hroPHKWuTGCcqzb+D68= +-----END SIGNATURE-----''' + + +class ParseDescriptorsTests(unittest.TestCase): + """Unittests for :class:`bridgedb.parse.descriptors` module.""" + + def test_parse_descriptors_parseBridgeDescriptorsFile(self): + """Test for ``b.p.descriptors.parseBridgeDescriptorsFile``.""" + if not HAS_STEM: + self.skip = True + raise unittest.SkipTest("Couldn't import Stem.") + + from bridgedb.parse import descriptors + + descFile = io.BytesIO(BRIDGE_SERVER_DESCRIPTOR) + routers = descriptors.parseServerDescriptorsFile(descFile) + self.assertIsInstance(routers, list) + bridge = routers[0] + self.assertIsInstance(bridge, RelayDescriptor) + self.assertEqual(bridge.address, u'152.78.9.20') + self.assertEqual(bridge.fingerprint, + u'6FA9216CF3A06E89A03121ACC31F70F8DFD7DDCC')

1 0

[bridgedb/develop] Fix several docstrings which generated Sphinx build warnings.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 56e6b940cc80ae930c1883957c603f0739905deb Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 21 00:33:23 2015 +0000 Fix several docstrings which generated Sphinx build warnings. --- lib/bridgedb/parse/addr.py | 7 +++++++ lib/bridgedb/parse/descriptors.py | 10 +++++----- lib/bridgedb/util.py | 8 +++----- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/lib/bridgedb/parse/addr.py b/lib/bridgedb/parse/addr.py index 750ed78..af63192 100644 --- a/lib/bridgedb/parse/addr.py +++ b/lib/bridgedb/parse/addr.py @@ -224,6 +224,7 @@ def canonicalizeEmailDomain(domain, domainmap): example:: EMAIL_DOMAIN_MAP = {'mail.google.com': 'gmail.com', 'googlemail.com': 'gmail.com'} + :raises UnsupportedDomain: if the domain portion of the email address is not within the map of alternate to canonical allowed domain names. :rtype: str @@ -448,18 +449,24 @@ def normalizeEmail(emailaddr, domainmap, domainrules, ignorePlus=True): to their canonical domain names (in lowercase). This can be configured with the ``EMAIL_DOMAIN_MAP`` option in ``bridgedb.conf``, for example:: + EMAIL_DOMAIN_MAP = {'mail.google.com': 'gmail.com', 'googlemail.com': 'gmail.com'} + :param dict domainrules: A mapping of canonical permitted domain names to a list of rules which should be applied to processing them, for example:: + EMAIL_DOMAIN_RULES = {'gmail.com': ["ignore_dots", "dkim"] + Currently, ``"ignore_dots"`` means that all ``"."`` characters will be removed from the local part of the validated email address. + :param bool ignorePlus: If ``True``, assume that ``blackhole+kerr(a)torproject.org`` is an alias for ``blackhole(a)torproject.org``, and remove everything after the first ``'+'`` character. + :raises UnsupportedDomain: if the email address originated from a domain that we do not explicitly support. :raises BadEmail: if the email address could not be parsed or validated. diff --git a/lib/bridgedb/parse/descriptors.py b/lib/bridgedb/parse/descriptors.py index c1e4706..80063ca 100644 --- a/lib/bridgedb/parse/descriptors.py +++ b/lib/bridgedb/parse/descriptors.py @@ -94,7 +94,7 @@ def parseNetworkStatusFile(filename, validate=True, skipAnnotations=True, :raises IOError: if the file at **filename** can't be read. :rtype: list :returns: A list of - :api:`stem.descriptor.router_status_entry.RouterStatusEntryV#`s. + :api:`stem.descriptor.router_status_entry.RouterStatusEntryV`s. """ routers = [] @@ -127,11 +127,11 @@ def parseServerDescriptorsFile(filename, validate=True): bug in Leekspin, the fake descriptor generator, where Stem thinks the fingerprint doesn't match the key… - .. note:: We have to lie to Stem, pretending that these are ``@type - server-descriptor``s, **not** ``@type bridge-server-descriptor``s. - See ticket `#11257`_. + .. note:: We have to lie to Stem, pretending that these are + ``@type server-descriptor``s, **not** + ``@type bridge-server-descriptor``s. See ticket #`11257`_. - .. _`#11257`: https://trac.torproject.org/projects/tor/ticket/11257 + .. _`11257`: https://bugs.torproject.org/11257 :param str filename: The file to parse descriptors from. :param bool validate: Whether or not to validate descriptor diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index 4253d4e..ca2a88f 100644 --- a/lib/bridgedb/util.py +++ b/lib/bridgedb/util.py @@ -146,13 +146,11 @@ def levenshteinDistance(s1, s2, len1=None, len2=None, offset1=0, offset2=0, memo=None): """Compute the Levenstein Distance between two strings. - The `Levenshtein String Distance Algorithm`_ efficiently computes the - number of characters which must be changed in **s1** to make it + The `Levenshtein String Distance Algorithm + <https://en.wikipedia.org/wiki/Levenshtein_distance>` efficiently computes + the number of characters which must be changed in **s1** to make it identical to **s2**. - .. `Levenshtein String Distance Algorithm`: - https://en.wikipedia.org/wiki/Levenshtein_distance - >>> levenshteinDistance('cat', 'cat') 0 >>> levenshteinDistance('cat', 'hat')

1 0