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

[bridgedb/master] Merge branch 'hotfix/remove-sqlitedict-class' into develop
by isis＠torproject.org 16 May '14

16 May '14

commit 6480891a3549fbbe906b66183d5306a6c298d5f9 Merge: b98f080 d617d4e Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 21 17:16:00 2014 +0000 Merge branch 'hotfix/remove-sqlitedict-class' into develop lib/bridgedb/Storage.py | 77 ----------------------------------------------- lib/bridgedb/Tests.py | 49 ++---------------------------- 2 files changed, 2 insertions(+), 124 deletions(-)

1 0

[bridgedb/master] Remove unused Storage.SqliteDict class.
by isis＠torproject.org 16 May '14

16 May '14

commit d617d4ec0e442177c64b6a5578ad049798383d57 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 21 17:05:38 2014 +0000 Remove unused Storage.SqliteDict class. --- lib/bridgedb/Storage.py | 77 ----------------------------------------------- lib/bridgedb/Tests.py | 49 ++---------------------------- 2 files changed, 2 insertions(+), 124 deletions(-) diff --git a/lib/bridgedb/Storage.py b/lib/bridgedb/Storage.py index 72c0af2..ab0bf74 100644 --- a/lib/bridgedb/Storage.py +++ b/lib/bridgedb/Storage.py @@ -31,80 +31,6 @@ def timeToStr(t): def strToTime(t): return calendar.timegm(time.strptime(t, "%Y-%m-%d %H:%M")) -class SqliteDict: - """ - A SqliteDict wraps a SQLite table and makes it look like a - Python dictionary. In addition to the single key and value - columns, there can be a number of "fixed" columns, such that - the dictionary only contains elements of the table where the - fixed columns are set appropriately. - """ - def __init__(self, conn, cursor, table, fixedcolnames, fixedcolvalues, - keycol, valcol): - assert len(fixedcolnames) == len(fixedcolvalues) - self._conn = conn - self._cursor = cursor - keys = ", ".join(fixedcolnames+(keycol,valcol)) - vals = "".join("%s, "%_escapeValue(v) for v in fixedcolvalues) - constraint = "WHERE %s = ?"%keycol - if fixedcolnames: - constraint += "".join( - " AND %s = %s"%(c,_escapeValue(v)) - for c,v in zip(fixedcolnames, fixedcolvalues)) - - self._getStmt = "SELECT %s FROM %s %s"%(valcol,table,constraint) - self._delStmt = "DELETE FROM %s %s"%(table,constraint) - self._setStmt = "INSERT OR REPLACE INTO %s (%s) VALUES (%s?, ?)"%( - table, keys, vals) - - constraint = " AND ".join("%s = %s"%(c,_escapeValue(v)) - for c,v in zip(fixedcolnames, fixedcolvalues)) - if constraint: - whereClause = " WHERE %s"%constraint - else: - whereClause = "" - - self._keysStmt = "SELECT %s FROM %s%s"%(keycol,table,whereClause) - - def __setitem__(self, k, v): - self._cursor.execute(self._setStmt, (k,v)) - def __delitem__(self, k): - self._cursor.execute(self._delStmt, (k,)) - if self._cursor.rowcount == 0: - raise KeyError(k) - def __getitem__(self, k): - self._cursor.execute(self._getStmt, (k,)) - val = self._cursor.fetchone() - if val == None: - raise KeyError(k) - else: - return val[0] - def has_key(self, k): - self._cursor.execute(self._getStmt, (k,)) - return self._cursor.rowcount != 0 - def get(self, k, v=None): - self._cursor.execute(self._getStmt, (k,)) - val = self._cursor.fetchone() - if val == None: - return v - else: - return val[0] - def setdefault(self, k, v): - try: - r = self[k] - except KeyError: - r = self[k] = v - return r - def keys(self): - self._cursor.execute(self._keysStmt) - return [ key for (key,) in self._cursor.fetchall() ] - - def commit(self): - self._conn.commit() - def rollback(self): - self._conn.rollback() - - # The old DB system was just a key->value mapping DB, with special key # prefixes to indicate which database they fell into. # @@ -120,9 +46,6 @@ class SqliteDict: # of persistence any more. # Here is the SQL schema. - - - SCHEMA2_SCRIPT = """ CREATE TABLE Config ( key PRIMARY KEY NOT NULL, diff --git a/lib/bridgedb/Tests.py b/lib/bridgedb/Tests.py index 4147549..6fcdbc6 100644 --- a/lib/bridgedb/Tests.py +++ b/lib/bridgedb/Tests.py @@ -436,51 +436,6 @@ class IPBridgeDistTests(unittest.TestCase): filterBridgesByNotBlockedIn("us")]) assert len(b) > 0 -class DictStorageTests(unittest.TestCase): - def setUp(self): - self.fd, self.fname = tempfile.mkstemp() - self.conn = sqlite3.Connection(self.fname) - - def tearDown(self): - self.conn.close() - os.close(self.fd) - os.unlink(self.fname) - - def testSimpleDict(self): - self.conn.execute("CREATE TABLE A ( X PRIMARY KEY, Y )") - d = bridgedb.Storage.SqliteDict(self.conn, self.conn.cursor(), - "A", (), (), "X", "Y") - - self.basictests(d) - - def testComplexDict(self): - self.conn.execute("CREATE TABLE B ( X, Y, Z, " - "CONSTRAINT B_PK PRIMARY KEY (X,Y) )") - d = bridgedb.Storage.SqliteDict(self.conn, self.conn.cursor(), - "B", ("X",), ("x1",), "Y", "Z") - d2 = bridgedb.Storage.SqliteDict(self.conn, self.conn.cursor(), - "B", ("X",), ("x2",), "Y", "Z") - self.basictests(d) - self.basictests(d2) - - def basictests(self, d): - d["hello"] = "goodbye" - d["hola"] = "adios" - self.assertEquals(d["hola"], "adios") - d["hola"] = "hasta luego" - self.assertEquals(d["hola"], "hasta luego") - self.assertEquals(sorted(d.keys()), [u"hello", u"hola"]) - self.assertRaises(KeyError, d.__getitem__, "buongiorno") - self.assertEquals(d.get("buongiorno", "ciao"), "ciao") - self.conn.commit() - d["buongiorno"] = "ciao" - del d['hola'] - self.assertRaises(KeyError, d.__getitem__, "hola") - self.conn.rollback() - self.assertEquals(d["hola"], "hasta luego") - self.assertEquals(d.setdefault("hola","bye"), "hasta luego") - self.assertEquals(d.setdefault("yo","bye"), "bye") - self.assertEquals(d['yo'], "bye") class SQLStorageTests(unittest.TestCase): def setUp(self): @@ -806,8 +761,8 @@ def testSuite(): suite = unittest.TestSuite() loader = unittest.TestLoader() - for klass in [ IPBridgeDistTests, DictStorageTests, SQLStorageTests, - EmailBridgeDistTests, ParseDescFileTests, BridgeStabilityTests ]: + for klass in [IPBridgeDistTests, SQLStorageTests, EmailBridgeDistTests, + ParseDescFileTests, BridgeStabilityTests]: suite.addTest(loader.loadTestsFromTestCase(klass)) for module in [ bridgedb.Bridges,

1 0

[bridgedb/master] Add docstring for crypto._createGPGMEErrorInterpreters().
by isis＠torproject.org 16 May '14

16 May '14

commit b8e8218e856ebfff94ab6fd1728ba67d54095066 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 22 14:48:39 2014 +0000 Add docstring for crypto._createGPGMEErrorInterpreters(). --- lib/bridgedb/crypto.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lib/bridgedb/crypto.py b/lib/bridgedb/crypto.py index cddc108..606bce2 100644 --- a/lib/bridgedb/crypto.py +++ b/lib/bridgedb/crypto.py @@ -243,6 +243,20 @@ def getHMACFunc(key, hex=True): return hmac_fn def _createGPGMEErrorInterpreters(): + """Create a mapping of GPGME ERRNOs ←→ human-readable error names/causes. + + This function is called automatically when :mod:`this module + <bridgedb.crypto>` is loaded. The resulting dictionary mapping is stored + as :attr:`~bridgedb.crypto.gpgmeErrorTranslations`, and is used by + :exc:`~bridgedb.crypto.LessCrypticGPGMEError`. + + :returns: A dict of:: + {str(ERRNO): [ERRORNAME, ANOTHER_ERRORNAME, …], + …, + str(ERRORNAME): str(ERRNO), + …} + for all known error numbers and error names/causes. + """ errorDict = {} errorAttrs = []

1 0

[bridgedb/master] Update bridgedb.crypto module docstring.
by isis＠torproject.org 16 May '14

16 May '14

commit 5dd8cc2b9488800c8f263807e3eaf6d0f225de08 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Apr 21 17:29:46 2014 +0000 Update bridgedb.crypto module docstring. --- lib/bridgedb/crypto.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/crypto.py b/lib/bridgedb/crypto.py index ebab733..cddc108 100644 --- a/lib/bridgedb/crypto.py +++ b/lib/bridgedb/crypto.py @@ -10,11 +10,17 @@ """crypto - BridgeDB general cryptographic utilities. -**Module Overview:** - -.. +Module Overview: +```````````````` +:: crypto - |_getKey() - Load the master key from a file, or create a new one. + |_getGPGContext() - Get a pre-configured GPGME context. + |_getHMAC() - Compute an HMAC with some key for some data. + |_getHMACFunc() - Get a callable for producing HMACs with the given key. + |_getKey() - Load the master HMAC key from a file, or create a new one. + |_getRSAKey() - Load an RSA key from a file, or create a new one. + |_gpgSignMessage() - Sign a message string according to a GPGME context. + |_writeKeyToFile() - Write to a file readable only by the process owner. | \_SSLVerifyingContextFactory - OpenSSL.SSL.Context factory which verifies | certificate chains and matches hostnames. @@ -23,7 +29,7 @@ |_getHostnameFromURL() - Parses the hostname from the request URL. \_verifyHostname() - Check that the cert CN matches the request hostname. - +:: """ from __future__ import absolute_import

1 0

[bridgedb/master] Add attribute docstring for crypto.gpgmeErrorTranslations.
by isis＠torproject.org 16 May '14

16 May '14

commit 2575fa53ccc444c9d755d28644353d2ff4ea56f1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 22 14:49:14 2014 +0000 Add attribute docstring for crypto.gpgmeErrorTranslations. --- lib/bridgedb/crypto.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/bridgedb/crypto.py b/lib/bridgedb/crypto.py index 606bce2..434dd8a 100644 --- a/lib/bridgedb/crypto.py +++ b/lib/bridgedb/crypto.py @@ -279,6 +279,11 @@ def _createGPGMEErrorInterpreters(): return errorDict +#: This is a dictionary which holds a translation of GPGME ERRNOs ←→ all known +#: names/causes for that ERRNO, and vice versa. It is created automatically, +#: via the :func:`_createGPGMEErrorInterpreters` function, when this module is +#: loaded so that :exc:`LessCrypticGPGMEError` can use it to display +#: human-readable information about why GPGME borked itself on something. gpgmeErrorTranslations = _createGPGMEErrorInterpreters() def getGPGContext(cfg):

1 0

[bridgedb/master] Rename Sphinx build source for bridgedb.util module to new module name.
by isis＠torproject.org 16 May '14

16 May '14

commit 47185024492dc33e240c5d9be25518a07f32c846 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 22 14:52:06 2014 +0000 Rename Sphinx build source for bridgedb.util module to new module name. --- doc/sphinx/source/bridgedb.Util.rst | 9 --------- doc/sphinx/source/bridgedb.util.rst | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/sphinx/source/bridgedb.Util.rst b/doc/sphinx/source/bridgedb.Util.rst deleted file mode 100644 index 63db16d..0000000 --- a/doc/sphinx/source/bridgedb.Util.rst +++ /dev/null @@ -1,9 +0,0 @@ -.. _util: - -bridgedb.util -------------- - -.. automodule:: bridgedb.util - :members: - :undoc-members: - :show-inheritance: diff --git a/doc/sphinx/source/bridgedb.util.rst b/doc/sphinx/source/bridgedb.util.rst new file mode 100644 index 0000000..63db16d --- /dev/null +++ b/doc/sphinx/source/bridgedb.util.rst @@ -0,0 +1,9 @@ +.. _util: + +bridgedb.util +------------- + +.. automodule:: bridgedb.util + :members: + :undoc-members: + :show-inheritance:

1 0

[bridgedb/master] Add file header and module docstring for bridgedb.parse.versions.
by isis＠torproject.org 16 May '14

16 May '14

commit a54a04c550ea7895f51ba59f5672ba81145a5cce Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 22 21:03:23 2014 +0000 Add file header and module docstring for bridgedb.parse.versions. --- lib/bridgedb/parse/versions.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/lib/bridgedb/parse/versions.py b/lib/bridgedb/parse/versions.py index 94d16b2..99944f4 100644 --- a/lib/bridgedb/parse/versions.py +++ b/lib/bridgedb/parse/versions.py @@ -1,4 +1,26 @@ +# -*- coding: utf-8 ; test-case-name: bridgedb.test.test_parse_versions ; -*- +# +# 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) 2014 Isis Lovecruft +# (c) 2007-2014, The Tor Project, Inc. +# (c) 2007-2014, all entities within the AUTHORS file +# :license: see included LICENSE for information +"""Parsers for Tor version number strings. + +.. py:module:: bridgedb.parse.versions + :synopsis: Parsers for Tor version number strings. + +bridgedb.parse.versions +======================= +:: + + Version - Holds, parses, and does comparison operations for package version numbers. +.. +""" from twisted.python import util as txutil

1 0

[bridgedb/master] Fix type specifiers on b.p.versions.Version class attr docstrings.
by isis＠torproject.org 16 May '14

16 May '14

commit 27ad2ee9f4695c11ba25445c9ba31b87fb78f4da Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 22 21:04:04 2014 +0000 Fix type specifiers on b.p.versions.Version class attr docstrings. Also add more information on the potential attribute values. --- lib/bridgedb/parse/versions.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/parse/versions.py b/lib/bridgedb/parse/versions.py index 99944f4..e5e4ab5 100644 --- a/lib/bridgedb/parse/versions.py +++ b/lib/bridgedb/parse/versions.py @@ -28,11 +28,16 @@ from twisted.python import util as txutil class Version(txutil.Version): """Holds, parses, and does comparison operations for version numbers. - :attr string major: The major version number. - :attr string minor: The minor version number. - :attr string micro: The micro version number. - :attr string prerelease: Sometime, another number, though often suffixed - with a `-`, `+`, or `#`. + :attr str package: The package name, if available. + :attr int major: The major version number. + :attr int minor: The minor version number. + :attr int micro: The micro version number. + :attr str prerelease: The **prerelease** specifier isn't always present, + though when it is, it's usually separated from the main + ``major.minor.micro`` part of the version string with a ``-``, ``+``, + or ``#`` character. Sometimes the **prerelease** is another number, + although often it can be a word specifying the release state, + i.e. ``+alpha``, ``-rc2``, etc. """ def __init__(self, version, package=None):

1 0

[bridgedb/master] Add a doctest and fix outdated parameter refs in b.p.v.Version docstring.
by isis＠torproject.org 16 May '14

16 May '14

commit c7805243469e1b6e71d963eae6e58b032998ceca Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 22 21:05:25 2014 +0000 Add a doctest and fix outdated parameter refs in b.p.v.Version docstring. --- lib/bridgedb/parse/versions.py | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/parse/versions.py b/lib/bridgedb/parse/versions.py index e5e4ab5..b327cb8 100644 --- a/lib/bridgedb/parse/versions.py +++ b/lib/bridgedb/parse/versions.py @@ -45,10 +45,25 @@ class Version(txutil.Version): Comparisons may be computed between instances of :class:`Version`s. - :param string version: One of ``SERVER_VERSIONS``. - :param string package: The package or program which we are creating a - version number for, i.e. for "tor-0.2.5.1-alpha" the ``package`` - would be "tor". + >>> from bridgedb.parse.versions import Version + >>> v1 = Version("0.2.3.25", package="tor") + >>> v1.base() + '0.2.3.25' + >>> v1.package + 'tor' + >>> v2 = Version("0.2.5.1-alpha", package="tor") + >>> v2 + Version(package=tor, major=0, minor=2, micro=5, prerelease=1-alpha) + >>> v1 == v2 + False + >>> v2 > v1 + True + + :param str version: A Tor version string specifier, i.e. one taken + from either the ``client-versions`` or ``server-versions`` lines + within a Tor ``cached-consensus`` file. + :param str package: The package or program which we are creating a + version number for. """ if version.find('.') == -1: print("Version.__init__(): %r doesn't look like a version string!"

1 0

[bridgedb/master] Raise an error rather than printing in b.p.v.Versions.
by isis＠torproject.org 16 May '14

16 May '14

commit ce4a13b50cd05f28c54a90a087809f87d835993b Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Apr 22 21:06:49 2014 +0000 Raise an error rather than printing in b.p.v.Versions. --- lib/bridgedb/parse/versions.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/parse/versions.py b/lib/bridgedb/parse/versions.py index b327cb8..0aefe43 100644 --- a/lib/bridgedb/parse/versions.py +++ b/lib/bridgedb/parse/versions.py @@ -25,6 +25,10 @@ bridgedb.parse.versions from twisted.python import util as txutil +class InvalidVersionStringFormat(ValueError): + """Raised when a version string is not in a parseable format.""" + + class Version(txutil.Version): """Holds, parses, and does comparison operations for version numbers. @@ -66,9 +70,8 @@ class Version(txutil.Version): version number for. """ if version.find('.') == -1: - print("Version.__init__(): %r doesn't look like a version string!" - % version.__repr__()) - + raise InvalidVersionStringFormat( + "Invalid delimiters in version string: %r" % version) major, minor, micro, prerelease = ['' for x in xrange(4)] components = version.split('.')

1 0