tor-commits January 2014

tor-commits@lists.torproject.org

23 participants
2271 discussions

[bridgedb/master] Sphinxify the docstring for bridgedb.EmailServer.getGPGContext().
by isis＠torproject.org 11 Jan '14

11 Jan '14

commit ef3baa50e9696f0fd4e01aca682b4d7b8e026c80 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Nov 19 05:20:06 2013 +0000 Sphinxify the docstring for bridgedb.EmailServer.getGPGContext(). --- lib/bridgedb/EmailServer.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index 1ee27c0..b2f2bf5 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -433,11 +433,17 @@ def composeEmail(fromAddr, clientAddr, subject, body, msgID=False, return clientAddr, f def getGPGContext(cfg): - """ Returns a gpgme Context() with the signers initialized by the keyfile - specified by the option EMAIL_GPG_SIGNING_KEY in bridgedb.conf, or None - if the option was not enabled or unable to initialize. + """Import a key from a file and initialise a context for GnuPG operations. - The key should not be protected by a passphrase. + The key should not be protected by a passphrase, and should have the + signing flag enabled. + + :type cfg: :class:`bridgedb.persistent.Conf` + :param cfg: The loaded config file. + :rtype: :class:`gpgme.Context` or None + :returns: A GPGME context with the signers initialized by the keyfile + specified by the option EMAIL_GPG_SIGNING_KEY in bridgedb.conf, or + None if the option was not enabled, or was unable to initialize. """ try: # must have enabled signing and specified a key file

1 0

[bridgedb/master] Don't include the old unittests in the calculation of coverage results.
by isis＠torproject.org 11 Jan '14

11 Jan '14

commit 755021c2894c9c7e9b5aacbca2f8a56a91841a49 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Nov 19 07:55:06 2013 +0000 Don't include the old unittests in the calculation of coverage results. --- .coveragerc | 1 + 1 file changed, 1 insertion(+) diff --git a/.coveragerc b/.coveragerc index f8d4732..46c0c56 100644 --- a/.coveragerc +++ b/.coveragerc @@ -12,6 +12,7 @@ omit = */test* */_langs* */_version* + bridgedb/Tests.py # Regexes for lines to exclude from report generation: exclude_lines = pragma: no cover

1 0

[bridgedb/master] Move method wrapper utility @fileCheckDecorator() to bridgedb.test.util.
by isis＠torproject.org 11 Jan '14

11 Jan '14

commit 689ff72c72b4d98fbe86c83b84da2a0e354af4f0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Nov 19 07:55:44 2013 +0000 Move method wrapper utility @fileCheckDecorator() to bridgedb.test.util. * ADD bridgedb.test.util, with method decorator @fileCheckDecorator, and give that decorator a docstring with a doctest example. --- lib/bridgedb/test/test_bridgedb.py | 15 +-------- lib/bridgedb/test/util.py | 62 ++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 14 deletions(-) diff --git a/lib/bridgedb/test/test_bridgedb.py b/lib/bridgedb/test/test_bridgedb.py index a7093a6..3d21080 100644 --- a/lib/bridgedb/test/test_bridgedb.py +++ b/lib/bridgedb/test/test_bridgedb.py @@ -18,7 +18,6 @@ import shutil import signal import time -from functools import wraps from os.path import join as pjoin from subprocess import Popen, PIPE @@ -26,20 +25,8 @@ from twisted.python import log from twisted.python.procutils import which from twisted.trial import unittest +from bridgedb.test.util import fileCheckDecorator -def fileCheckDecorator(func): - @wraps(func) - def wrapper(self, src, dst, description): - print("Copying %s:\n %r\n\t\t↓ ↓ ↓\n %r\n" - % (str(description), src, dst)) - self.assertTrue( - os.path.isfile(src), - "Couldn't find original %s file: %r" % (str(description), src)) - func(self, src, dst, description) - self.assertTrue( - os.path.isfile(dst), - "Couldn't find new %s file: %r" % (str(description), dst)) - return wrapper class BridgeDBCliTest(unittest.TestCase): """Test the `bridgedb` command.""" diff --git a/lib/bridgedb/test/util.py b/lib/bridgedb/test/util.py new file mode 100644 index 0000000..4520e29 --- /dev/null +++ b/lib/bridgedb/test/util.py @@ -0,0 +1,62 @@ +# -*- coding: utf-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 +# :license: 3-Clause BSD, see LICENSE for licensing information + +"""Unittests utilitys the `bridgedb.test` package.""" + +from __future__ import print_function +from __future__ import unicode_literals + +import doctest +import os + +from functools import wraps + + +def fileCheckDecorator(func): + """Method decorator for a t.t.unittest.TestCase test_* method. + + >>> import shutil + >>> from twisted.trial import unittest + >>> pyunit = __import__('unittest') + >>> class TestTests(unittest.TestCase): + ... @fileCheckDecorator + ... def doCopyFile(src, dst, description=None): + ... shutil.copy(src, dst) + ... def test_doCopyFile(self): + ... srcfile = self.mktemp() + ... dstfile = self.mktemp() + ... with open(srcfile, 'wb') as fh: + ... fh.write('testing TestCase method decorator utility') + ... fh.flush() + ... self.doCopyFile(srcfile, dstfile, 'asparagus') + ... + >>> testtest = TestTests() + >>> testtest.runTest() + + :type func: callable + :param func: The ``test_*`` method, from a + :class:`twisted.trial.unittest.TestCase` instance, to wrap. + """ + @wraps(func) + def wrapper(self, src, dst, description): + print("Copying %s:\n %r\n\t\t↓ ↓ ↓\n %r\n" + % (str(description), src, dst)) + self.assertTrue(os.path.isfile(src), + "Couldn't find original %s file: %r" + % (str(description), src)) + func(self, src, dst, description) + self.assertTrue(os.path.isfile(dst), + "Couldn't find new %s file: %r" + % (str(description), dst)) + return wrapper + +if __name__ == "__main__": + doctest.run_docstring_examples(fileCheckDecorator, None)

1 0

[bridgedb/master] Add unittests for bridgedb.EmailServer.getGPGContext() function.
by isis＠torproject.org 11 Jan '14

11 Jan '14

commit b9d80a6ffc09429402ae07dc69fc4e87083019f3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Nov 19 07:59:03 2013 +0000 Add unittests for bridgedb.EmailServer.getGPGContext() function. --- lib/bridgedb/test/test_EmailServer.py | 90 +++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/lib/bridgedb/test/test_EmailServer.py b/lib/bridgedb/test/test_EmailServer.py new file mode 100644 index 0000000..bbcd1b9 --- /dev/null +++ b/lib/bridgedb/test/test_EmailServer.py @@ -0,0 +1,90 @@ +# -*- coding: utf-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 +# :license: 3-Clause BSD, see LICENSE for licensing information + +"""Unittests for the :mod:`bridgedb.EmailServer` module.""" + +from __future__ import print_function + +import os +import shutil + +from io import StringIO + +from bridgedb import EmailServer +from bridgedb.persistent import Conf +from bridgedb.test.util import fileCheckDecorator +from twisted.python import log +from twisted.trial import unittest + + +TEST_CONFIG_FILE = StringIO(unicode("""\ +EMAIL_DIST = True +EMAIL_GPG_SIGNING_ENABLED = True +EMAIL_GPG_SIGNING_KEY = 'TESTING.subkeys.sec' +""")) + + +class EmailGnuPGTest(unittest.TestCase): + """Tests for :func:`bridgedb.EmailServer.getGPGContext`.""" + + timeout = 15 + + @fileCheckDecorator + def doCopyFile(self, src, dst, description=None): + shutil.copy(src, dst) + + def removeRundir(self): + if os.path.isdir(self.runDir): + shutil.rmtree(self.runDir) + + def makeBadKey(self): + keyfile = os.path.join(self.runDir, 'badkey.asc') + with open(keyfile, 'wb') as badkey: + badkey.write('NO PASARÁN, DEATH CAKES!') + badkey.flush() + self.setKey(keyfile) + + def setKey(self, keyfile=''): + setattr(self.config, 'EMAIL_GPG_SIGNING_KEY', keyfile) + + def setUp(self): + here = os.getcwd() + topDir = here.rstrip('_trial_temp') + self.runDir = os.path.join(here, 'rundir') + self.gpgFile = os.path.join(topDir, 'gnupghome', 'TESTING.subkeys.sec') + self.gpgMoved = os.path.join(here, 'TESTING.subkeys.sec') + os.makedirs(self.runDir) + + configuration = {} + TEST_CONFIG_FILE.seek(0) + compiled = compile(TEST_CONFIG_FILE.read(), '<string>', 'exec') + exec compiled in configuration + self.config = Conf(**configuration) + + self.addCleanup(self.removeRundir) + + def test_getGPGContext_good_keyfile(self): + """Test EmailServer.getGPGContext() with a good key filename.""" + self.doCopyFile(self.gpgFile, self.gpgMoved, "GnuPG test keyfile") + ctx = EmailServer.getGPGContext(self.config) + self.assertIsInstance(ctx, EmailServer.gpgme.Context) + + def test_getGPGContext_missing_keyfile(self): + """Test EmailServer.getGPGContext() with a missing key filename.""" + self.setKey('missing-keyfile.asc') + ctx = EmailServer.getGPGContext(self.config) + self.assertTrue(ctx is None) + + def test_getGPGContext_bad_keyfile(self): + """Test EmailServer.getGPGContext() with a missing key filename.""" + self.makeBadKey() + ctx = EmailServer.getGPGContext(self.config) + self.assertTrue(ctx is None)

1 0

[bridgedb/master] Improve error handling for the HTTPServer if a port is already occupied.
by isis＠torproject.org 11 Jan '14

11 Jan '14

commit f6026516b7a4e80d7318ec783e2d56bb1063109c Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Nov 19 08:01:50 2013 +0000 Improve error handling for the HTTPServer if a port is already occupied. --- lib/bridgedb/HTTPServer.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index ca850d5..fe4e095 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -15,6 +15,7 @@ import time import os from twisted.internet import reactor +from twisted.internet.error import CannotListenError import twisted.web.resource from twisted.web.server import Site from twisted.web import static @@ -274,7 +275,10 @@ def addWebServer(cfg, dist, sched): if cfg.HTTP_UNENCRYPTED_PORT: ip = cfg.HTTP_UNENCRYPTED_BIND_IP or "" - reactor.listenTCP(cfg.HTTP_UNENCRYPTED_PORT, site, interface=ip) + try: + reactor.listenTCP(cfg.HTTP_UNENCRYPTED_PORT, site, interface=ip) + except CannotListenError as error: + raise SystemExit(error) if cfg.HTTPS_PORT: from twisted.internet.ssl import DefaultOpenSSLContextFactory @@ -282,7 +286,10 @@ def addWebServer(cfg, dist, sched): ip = cfg.HTTPS_BIND_IP or "" factory = DefaultOpenSSLContextFactory(cfg.HTTPS_KEY_FILE, cfg.HTTPS_CERT_FILE) - reactor.listenSSL(cfg.HTTPS_PORT, site, factory, interface=ip) + try: + reactor.listenSSL(cfg.HTTPS_PORT, site, factory, interface=ip) + except CannotListenError as error: + raise SystemExit(error) return site

1 0

[bridgedb/master] Ignore _trial_temp/ directory.
by isis＠torproject.org 11 Jan '14

11 Jan '14

commit 33b05cb4b9f7c32b4b194d850083d389aaa8e745 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Nov 19 08:22:44 2013 +0000 Ignore _trial_temp/ directory. --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index e1a25c3..7bfc320 100644 --- a/.gitignore +++ b/.gitignore @@ -93,3 +93,6 @@ gnupghome/* # ignore coverage results files: .coverage .coverage.* + +# trial test run directory: +_trial_temp/*

1 0

[bridgedb/master] Fix unittest failures in test_EmailServer due to creating an existent dir.
by isis＠torproject.org 11 Jan '14

11 Jan '14

commit efeeb01627c73de3e70708744290c9a280048283 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Nov 19 08:34:27 2013 +0000 Fix unittest failures in test_EmailServer due to creating an existent dir. --- lib/bridgedb/test/test_EmailServer.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/test/test_EmailServer.py b/lib/bridgedb/test/test_EmailServer.py index bbcd1b9..913aa98 100644 --- a/lib/bridgedb/test/test_EmailServer.py +++ b/lib/bridgedb/test/test_EmailServer.py @@ -61,7 +61,9 @@ class EmailGnuPGTest(unittest.TestCase): self.runDir = os.path.join(here, 'rundir') self.gpgFile = os.path.join(topDir, 'gnupghome', 'TESTING.subkeys.sec') self.gpgMoved = os.path.join(here, 'TESTING.subkeys.sec') - os.makedirs(self.runDir) + + if not os.path.isdir(self.runDir): + os.makedirs(self.runDir) configuration = {} TEST_CONFIG_FILE.seek(0)

1 0

[bridgedb/master] Remove coverage html report generation from .travis.yml directives.
by isis＠torproject.org 11 Jan '14

11 Jan '14

commit 4d0cd7cd57c9b207f70c1e60d6bd86ac2f68292f Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Nov 19 08:35:08 2013 +0000 Remove coverage html report generation from .travis.yml directives. --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5955a13..8a40798 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,14 +40,12 @@ install: # # For testing with CouchDB # - curl -X PUT localhost:5984/myapp_test -# command to run tests, e.g. python setup.py test script: - bridgedb mock -n 250 # Normally, we would do 'bridgedb test' here, but to run with coverage we # have to do this instead: - coverage run $(which trial) ./lib/bridgedb/test/test_* - coverage report - - coverage html - echo "Build successful." after_success:

1 0

[bridgedb/master] Or… we need both libgpgme11 and libgpgme11-dev dependencies.
by isis＠torproject.org 11 Jan '14

11 Jan '14

commit b546035c882f60e44d2d3d90f387b21c619d4e00 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Nov 19 09:06:02 2013 +0000 Or… we need both libgpgme11 and libgpgme11-dev dependencies. --- .travis.yml | 2 +- README | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9e4f2fe..5d53738 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ notifications: before_install: - sudo apt-get update # Distro development header/library/resource/buildtime dependencies - - sudo apt-get install --no-install-suggests --no-install-recommends tor-geoipdb build-essential openssl sqlite3 libgpgme11 + - sudo apt-get install --no-install-suggests --no-install-recommends tor-geoipdb build-essential openssl sqlite3 libgpgme11 libgpgme11-dev # Distro python dependencies - sudo apt-get install --no-install-suggests --no-install-recommends python-dev python-setuptools diff --git a/README b/README index 0061f22..b364469 100644 --- a/README +++ b/README @@ -42,6 +42,7 @@ BridgeDB requires the following OS-level dependencies: - python-dev - build-essential - libgpgme11 + - libgpgme11-dev - OpenSSL>=1.0.1e - [SQLite3](http://www.maxmind.com/app/python) - [MaxMind GeoIP](https://www.maxmind.com/en/geolocation_landing) (packaged @@ -56,8 +57,8 @@ BridgeDB should work with or without a Python virtualenv. - Install Python 2.7, and other OS-level dependencies. On Debian, you can do: - sudo apt-get install build-essential python python-dev \ - python-setuptools openssl sqlite3 tor-geoip libgpgme11 + sudo apt-get install build-essential openssl python python-dev \ + python-setuptools sqlite3 tor-geoip libgpgme11 libgpgme11-dev - Install Pip 1.3.1 or later. Debian has this version, but if for some reason that or a newer version isn't available, the easiest way to install a newer

1 0

[bridgedb/master] Fix dependency requirement libgpgme11-dev → libgpgme11.
by isis＠torproject.org 11 Jan '14

11 Jan '14

commit e6b8c39486b4306bf5e10402aaa93513492af94a Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Nov 19 08:58:12 2013 +0000 Fix dependency requirement libgpgme11-dev → libgpgme11. --- .travis.yml | 2 +- README | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8a40798..9e4f2fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ notifications: before_install: - sudo apt-get update # Distro development header/library/resource/buildtime dependencies - - sudo apt-get install --no-install-suggests --no-install-recommends tor-geoipdb build-essential openssl sqlite3 libgpgme11-dev + - sudo apt-get install --no-install-suggests --no-install-recommends tor-geoipdb build-essential openssl sqlite3 libgpgme11 # Distro python dependencies - sudo apt-get install --no-install-suggests --no-install-recommends python-dev python-setuptools diff --git a/README b/README index 3175957..0061f22 100644 --- a/README +++ b/README @@ -41,7 +41,7 @@ BridgeDB requires the following OS-level dependencies: - python>=2.7 - python-dev - build-essential - - libgpgme11-dev + - libgpgme11 - OpenSSL>=1.0.1e - [SQLite3](http://www.maxmind.com/app/python) - [MaxMind GeoIP](https://www.maxmind.com/en/geolocation_landing) (packaged @@ -57,7 +57,7 @@ BridgeDB should work with or without a Python virtualenv. - Install Python 2.7, and other OS-level dependencies. On Debian, you can do: sudo apt-get install build-essential python python-dev \ - python-setuptools openssl sqlite3 tor-geoip libgpgme11-dev + python-setuptools openssl sqlite3 tor-geoip libgpgme11 - Install Pip 1.3.1 or later. Debian has this version, but if for some reason that or a newer version isn't available, the easiest way to install a newer

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2014