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

[bridgedb/master] Change Bridge.nickname into a @property.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 293d390ae320d77d09125cfbb70f63f46127f0bf Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Dec 11 04:31:59 2014 +0000 Change Bridge.nickname into a @property. --- lib/bridgedb/bridges.py | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 2e64fdf..5c92898 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -35,6 +35,7 @@ from bridgedb.parse.addr import PortList from bridgedb.parse.fingerprint import isValidFingerprint from bridgedb.parse.fingerprint import toHex from bridgedb.parse.fingerprint import fromHex +from bridgedb.parse.nickname import isValidRouterNickname class PluggableTransportUnavailable(Exception): @@ -386,7 +387,7 @@ class BridgeBase(object): def __init__(self): self._fingerprint = None - self.nickname = None + self._nickname = None self.address = None self.orPort = None self.socksPort = 0 # Bridges should always have ``SOCKSPort`` and @@ -424,6 +425,29 @@ class BridgeBase(object): """Reset this Bridge's fingerprint.""" self._fingerprint = None + @property + def nickname(self): + """Get this Bridge's nickname. + + :rtype: str + :returns: The Bridge's nickname. + """ + return self._nickname + + @nickname.setter + def nickname(self, value): + """Set this Bridge's nickname to **value**. + + :param str value: The nickname of this Bridge. + """ + if isValidRouterNickname(value): + self._nickname = value + + @nickname.deleter + def nickname(self, value): + """Reset this Bridge's nickname.""" + self._nickname = None + class BridgeBackwardsCompatibility(BridgeBase): """Backwards compatibility methods for the old Bridge class."""

1 0

[bridgedb/master] Move isValidRouterNickname to its own module.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit b1a9f792909e6def9abdc707f27a85854010ec9e Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Dec 11 04:25:08 2014 +0000 Move isValidRouterNickname to its own module. --- lib/bridgedb/parse/networkstatus.py | 19 -------------- lib/bridgedb/parse/nickname.py | 48 +++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 19 deletions(-) diff --git a/lib/bridgedb/parse/networkstatus.py b/lib/bridgedb/parse/networkstatus.py index 8592cd3..106edd9 100644 --- a/lib/bridgedb/parse/networkstatus.py +++ b/lib/bridgedb/parse/networkstatus.py @@ -47,25 +47,6 @@ class NetworkstatusParsingError(Exception): class InvalidNetworkstatusRouterIdentity(ValueError): """The ID field of a networkstatus document 'r'-line is invalid.""" -class InvalidRouterNickname(ValueError): - """Router nickname doesn't follow tor-spec.""" - - -def isValidRouterNickname(nickname): - """Determine if a router's given nickname meets the specification. - - :param string nickname: An OR's nickname. - """ - ALPHANUMERIC = string.letters + string.digits - - if not (1 <= len(nickname) <= 19): - raise InvalidRouterNickname( - "Nicknames must be between 1 and 19 characters: %r" % nickname) - for letter in nickname: - if not letter in ALPHANUMERIC: - raise InvalidRouterNickname( - "Nicknames must only use [A-Za-z0-9]: %r" % nickname) - return True def parseRLine(line): """Parse an 'r'-line from a networkstatus document. diff --git a/lib/bridgedb/parse/nickname.py b/lib/bridgedb/parse/nickname.py new file mode 100644 index 0000000..b38bdb8 --- /dev/null +++ b/lib/bridgedb/parse/nickname.py @@ -0,0 +1,48 @@ +# -*- 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-2014, The Tor Project, Inc. +# (c) 2007-2014, all entities within the AUTHORS file +# :license: 3-clause BSD, see included LICENSE for information + +"""Parsers for bridge nicknames. + +.. py:module:: bridgedb.parse.nickname + :synopsis: Parsers for Tor bridge nicknames. + +bridgedb.parse.nicknames +======================== +:: + + nicknames + |_ isValidRouterNickname - Determine if a nickname is according to spec +.. +""" + +import string + + +class InvalidRouterNickname(ValueError): + """Router nickname doesn't follow tor-spec.""" + + +def isValidRouterNickname(nickname): + """Determine if a router's given nickname meets the specification. + + :raises InvalidRouterNickname: if the nickname is invalid. + :param string nickname: An OR's nickname. + """ + ALPHANUMERIC = string.letters + string.digits + + if not (1 <= len(nickname) <= 19): + raise InvalidRouterNickname( + "Nicknames must be between 1 and 19 characters: %r" % nickname) + for letter in nickname: + if not letter in ALPHANUMERIC: + raise InvalidRouterNickname( + "Nicknames must only use [A-Za-z0-9]: %r" % nickname) + return True

1 0

[bridgedb/master] Change isValidRouterNickname() to only return booleans.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 192a3e876015fd6bc1414af2df55945bb79471a2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Dec 11 04:28:04 2014 +0000 Change isValidRouterNickname() to only return booleans. --- lib/bridgedb/parse/networkstatus.py | 2 ++ lib/bridgedb/parse/nickname.py | 25 +++++++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/lib/bridgedb/parse/networkstatus.py b/lib/bridgedb/parse/networkstatus.py index 106edd9..8140fe0 100644 --- a/lib/bridgedb/parse/networkstatus.py +++ b/lib/bridgedb/parse/networkstatus.py @@ -39,6 +39,8 @@ from twisted.python.log import showwarning from bridgedb.parse import addr from bridgedb.parse import parseUnpaddedBase64 from bridgedb.parse import InvalidBase64 +from bridgedb.parse.nickname import InvalidRouterNickname +from bridgedb.parse.nickname import isValidRouterNickname class NetworkstatusParsingError(Exception): diff --git a/lib/bridgedb/parse/nickname.py b/lib/bridgedb/parse/nickname.py index b38bdb8..9c3a559 100644 --- a/lib/bridgedb/parse/nickname.py +++ b/lib/bridgedb/parse/nickname.py @@ -33,16 +33,25 @@ class InvalidRouterNickname(ValueError): def isValidRouterNickname(nickname): """Determine if a router's given nickname meets the specification. - :raises InvalidRouterNickname: if the nickname is invalid. :param string nickname: An OR's nickname. + :rtype: bool + :returns: ``True`` if the nickname is valid, ``False`` otherwise. """ ALPHANUMERIC = string.letters + string.digits - if not (1 <= len(nickname) <= 19): - raise InvalidRouterNickname( - "Nicknames must be between 1 and 19 characters: %r" % nickname) - for letter in nickname: - if not letter in ALPHANUMERIC: + try: + if not (1 <= len(nickname) <= 19): raise InvalidRouterNickname( - "Nicknames must only use [A-Za-z0-9]: %r" % nickname) - return True + "Nicknames must be between 1 and 19 characters: %r" % nickname) + for letter in nickname: + if not letter in ALPHANUMERIC: + raise InvalidRouterNickname( + "Nicknames must only use [A-Za-z0-9]: %r" % nickname) + except InvalidRouterNickname as error: + logging.error(str(error)) + except TypeError: # The nickname was probably still set to ``None`` + pass + else: + return True + + return False

1 0

[bridgedb/master] Fix another typoed name of a Stem descriptor attribute.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit b6d84d3546e2dacc7547d7ccdc0237ae5ceefdee Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Dec 11 03:55:56 2014 +0000 Fix another typoed name of a Stem descriptor attribute. --- lib/bridgedb/bridges.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index ec5aefe..2e64fdf 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -1253,7 +1253,7 @@ class Bridge(BridgeBackwardsCompatibility): self.os = descriptor.operating_system self.uptime = descriptor.uptime - self.extrainfoDigest = descriptor.extrainfoDigest + self.extrainfoDigest = descriptor.extra_info_digest def _verifyExtraInfoSignature(self, descriptor): """Verify the signature on the contents of this :class:`Bridge`'s

1 0

[bridgedb/master] Catch ValueErrors in isValidFingerprint.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 95f0cfecca414ee3fe6c64d121300fe889f13f0f Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Dec 12 11:23:44 2014 +0000 Catch ValueErrors in isValidFingerprint. --- lib/bridgedb/parse/fingerprint.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/bridgedb/parse/fingerprint.py b/lib/bridgedb/parse/fingerprint.py index 17f15c3..900fc06 100644 --- a/lib/bridgedb/parse/fingerprint.py +++ b/lib/bridgedb/parse/fingerprint.py @@ -34,11 +34,13 @@ def isValidFingerprint(fingerprint): :rtype: bool :returns: ``True`` if the **fingerprint** was valid, ``False`` otherwise. """ - if len(fingerprint) == HEX_FINGERPRINT_LEN: - try: - fromHex(fingerprint) - except TypeError: - logging.debug("Invalid hex fingerprint: %r" % repr(fingerprint)) - else: - return True + try: + if len(fingerprint) != HEX_FINGERPRINT_LEN: + raise ValueError("Fingerprint has incorrect length: %r" + % repr(fingerprint)) + fromHex(fingerprint) + except (TypeError, ValueError): + logging.debug("Invalid hex fingerprint: %r" % repr(fingerprint)) + else: + return True return False

1 0

[bridgedb/master] Add docstring for parameter to Bridge.updateFromServerDescriptor().
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 910f749410e58960228b878bf45c2d775b9180cb Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Dec 11 03:55:10 2014 +0000 Add docstring for parameter to Bridge.updateFromServerDescriptor(). --- lib/bridgedb/bridges.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 4ae54c6..ec5aefe 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -1220,7 +1220,7 @@ class Bridge(BridgeBackwardsCompatibility): :type descriptor: :api:`stem.descriptor.server_descriptor.RelayDescriptor` - :param descriptor: + :param descriptor: The bridge's server descriptor to gather data from. :raises MalformedBridgeInfo: If this Bridge has no corresponding networkstatus entry, or its **descriptor** digest didn't match the expected digest (from the networkstatus entry).

1 0

[bridgedb/master] Use new bridgedb.bridges.Bridge API in bridgedb.Storage.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit b7d70cde5c0fddd27551e8768d4503266455d0eb Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Dec 22 03:42:14 2014 +0000 Use new bridgedb.bridges.Bridge API in bridgedb.Storage. --- lib/bridgedb/Storage.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Storage.py b/lib/bridgedb/Storage.py index ab0bf74..1efb139 100644 --- a/lib/bridgedb/Storage.py +++ b/lib/bridgedb/Storage.py @@ -175,14 +175,15 @@ class Database(object): # Update last_seen, address, port and (possibly) distributor. cur.execute("UPDATE Bridges SET address = ?, or_port = ?, " "distributor = ?, last_seen = ? WHERE id = ?", - (str(bridge.ip), bridge.orport, ring, timeToStr(seenAt), i)) + (str(bridge.address), bridge.orPort, ring, + timeToStr(seenAt), i)) return ring else: # Insert it. cur.execute("INSERT INTO Bridges (hex_key, address, or_port, " "distributor, first_seen, last_seen) " "VALUES (?, ?, ?, ?, ?, ?)", - (h, str(bridge.ip), bridge.orport, setRing, t, t)) + (h, str(bridge.address), bridge.orPort, setRing, t, t)) return setRing def cleanEmailedBridges(self, expireBefore):

1 0

[bridgedb/master] Monkeypatch old Bridge class into one run of the legacy regression tests.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit b9be34e53447a522fb83bf66fa492d4f324aab37 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Dec 22 03:44:04 2014 +0000 Monkeypatch old Bridge class into one run of the legacy regression tests. --- lib/bridgedb/test/test_Tests.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/bridgedb/test/test_Tests.py b/lib/bridgedb/test/test_Tests.py index 53d0e81..e78a4c4 100644 --- a/lib/bridgedb/test/test_Tests.py +++ b/lib/bridgedb/test/test_Tests.py @@ -97,6 +97,8 @@ def monkeypatchTests(): deprecated.is_valid_fingerprint) patcher.addPatch(Tests.bridgedb.Bridges, 'PluggableTransport', deprecated.PluggableTransport) + patcher.addPatch(Tests.bridgedb.Bridges, 'Bridge', + deprecated.Bridge) return patcher

1 0

[bridgedb/master] Change Filter.filterBridgesByIPv[46]() to use bridge.address.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit f49a243bb2208ec371b01341d8ad1ecc1669ad48 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 24 08:40:37 2014 +0000 Change Filter.filterBridgesByIPv[46]() to use bridge.address. Using bridge.ip is deprecated. --- lib/bridgedb/Filters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Filters.py b/lib/bridgedb/Filters.py index ab8b74a..f22fcc7 100644 --- a/lib/bridgedb/Filters.py +++ b/lib/bridgedb/Filters.py @@ -51,7 +51,7 @@ def filterBridgesByRules(rules): def filterBridgesByIP4(bridge): try: - if IPv4Address(bridge.ip): return True + if IPv4Address(bridge.address): return True except ValueError: pass @@ -63,7 +63,7 @@ setattr(filterBridgesByIP4, "description", "ip=4") def filterBridgesByIP6(bridge): try: - if IPv6Address(bridge.ip): return True + if IPv6Address(bridge.address): return True except ValueError: pass

1 0

[bridgedb/master] Remove filterBridgesByOnlyIP4() and filterBridgesByOnlyIP6().
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 264d8fc91ae1b7de149bf155e37a6b38e52ad240 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 24 08:43:39 2014 +0000 Remove filterBridgesByOnlyIP4() and filterBridgesByOnlyIP6(). These were only used in lib/bridgedb/test/legacy_Tests.py. --- lib/bridgedb/Filters.py | 16 ---------------- lib/bridgedb/test/legacy_Tests.py | 4 +--- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/lib/bridgedb/Filters.py b/lib/bridgedb/Filters.py index 1a8a8d8..4580c87 100644 --- a/lib/bridgedb/Filters.py +++ b/lib/bridgedb/Filters.py @@ -73,22 +73,6 @@ def filterBridgesByIP6(bridge): return False setattr(filterBridgesByIP6, "description", "ip=6") -def filterBridgesByOnlyIP4(bridge): - for k in bridge.or_addresses.keys(): - if type(k) is IPv6Address: - return False - if type(k) is IPv4Address: - return True - return False - -def filterBridgesByOnlyIP6(bridge): - for k in bridge.or_addresses.keys(): - if type(k) is IPv4Address: - return False - if type(k) is IPv6Address: - return True - return False - def filterBridgesByTransport(methodname, addressClass=None): if addressClass is None: addressClass = IPv4Address assert (addressClass) in (IPv4Address, IPv6Address) diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py index fa7a13c..70196b8 100644 --- a/lib/bridgedb/test/legacy_Tests.py +++ b/lib/bridgedb/test/legacy_Tests.py @@ -29,8 +29,6 @@ import ipaddr from bridgedb.Filters import filterBridgesByIP4 from bridgedb.Filters import filterBridgesByIP6 -from bridgedb.Filters import filterBridgesByOnlyIP4 -from bridgedb.Filters import filterBridgesByOnlyIP6 from bridgedb.Filters import filterBridgesByTransport from bridgedb.Filters import filterBridgesByNotBlockedIn @@ -376,7 +374,7 @@ class IPBridgeDistTests(unittest.TestCase): for i in xrange(5): b = d.getBridgesForIP(randomIP4String(), "x", 1, bridgeFilterRules=[ - filterBridgesByOnlyIP4, filterBridgesByOnlyIP6]) + filterBridgesByIP4, filterBridgesByIP6]) assert len(b) == 0 def testDistWithFilterBlockedCountries(self):

1 0