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

[bridgedb/develop] Improve docstring for bridgedb.bridges.Bridge.assertOK().
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 6a6a1021db4a9a0b697f7243c5e7f8d233f5009f Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 13 00:43:32 2015 +0000 Improve docstring for bridgedb.bridges.Bridge.assertOK(). * FIX a typo in bridgedb.bridges.Bridge.assertOK() docstring and clarify the method's data validation steps. * ADD a TODO in the documentation for Bridge.assertOK(). --- 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 33741a8..9a0a0ff 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -1041,9 +1041,17 @@ class Bridge(BridgeBackwardsCompatibility): 1. Any IP addresses contained in :data:`orAddresses` are valid, according to :func:`~bridgedb.parse.addr.isValidIP`. - 3. Any ports in :data:`orAddresses` are between ``1`` and ``65535`` + 2. Any ports in :data:`orAddresses` are between ``1`` and ``65535`` (inclusive). + 3. All IP version numbers given in :data:`orAddresses` are either + ``4`` or ``6``. + + .. todo:: This should probably be reimplemented as a property that + automatically sanitises the values for each ORAddress, as is done + for :property:`bridgedb.bridges.BridgeAddressBase.address` and + :property:`bridgedb.bridges.BridgeBase.orPort`. + :raises MalformedBridgeInfo: if something was found to be malformed or invalid. """

1 0

[bridgedb/develop] Change two log calls in bridgedb.bridges.Bridge to use Bridge.__str__().
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 07288fb57ba855ee6821142a111db1c2e43c875d Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 13 07:34:24 2015 +0000 Change two log calls in bridgedb.bridges.Bridge to use Bridge.__str__(). --- 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 9a0a0ff..54ffbe8 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -1522,7 +1522,7 @@ class Bridge(BridgeBackwardsCompatibility): # it: logging.info( "Received new %s pluggable transport for bridge %s." - % (methodname, safelog.logSafely(self.fingerprint))) + % (methodname, self)) transport = PluggableTransport() transport.updateFromStemTransport(str(self.fingerprint), methodname,

1 0

[bridgedb/develop] Add unittest for Bridge._verifyExtraInfoSignature with a valid sig.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 38446439f0424a544412ac9a15b878eccd282206 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 14 00:34:15 2015 +0000 Add unittest for Bridge._verifyExtraInfoSignature with a valid sig. --- lib/bridgedb/test/test_bridges.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index 11a9d64..9353d1c 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -845,6 +845,14 @@ class BridgeTests(unittest.TestCase): self.bridge.updateFromServerDescriptor, self.serverdescriptor) + def test_Bridge_verifyExtraInfoSignature_good_signature(self): + """Calling _verifyExtraInfoSignature() with a descriptor which has a + good signature should return None. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.assertIsNone(self.bridge._verifyExtraInfoSignature(self.extrainfo)) + def test_Bridge_updateFromExtraInfoDescriptor(self): """Bridge.updateFromExtraInfoDescriptor() should add the expected number of pluggable transports.

1 0

[bridgedb/develop] Remove Bridges.getDescriptorDigests().
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 016815deee25cfb27e474bb8f5be24af68ce0058 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 11 01:22:33 2015 +0000 Remove Bridges.getDescriptorDigests(). The functionality for checking the server-descriptor digest is now in bridgedb.bridges.Bridge.updateFromServerDescriptor(), which calls bridgedb.bridges.Bridge._checkServerDescriptor(). The digests are retrieved per-descriptor, during bridgedb.bridges.updateFromNetworkStatus(). * REMOVE bridgedb.Bridges.getDescriptorDigests() function. --- lib/bridgedb/Bridges.py | 34 ---------------------------------- lib/bridgedb/test/test_bridges.py | 22 ---------------------- 2 files changed, 56 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 9e7c292..a8b0a4f 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -42,40 +42,6 @@ DIGEST_LEN = 20 PORTSPEC_LEN = 16 -def getDescriptorDigests(desc): - """Return the SHA-1 hash hexdigests of all descriptor descs - - :param File desc: A string containing the contents of one - or more bridge descriptors concatenated - together. - :returns: A dict indexed by the SHA-1 hexdigest of the bridge - descriptor, equivalent to that which was published - on the 'r' line of the networkstatus for this bridge. - The value is the bridge's extra-info document digest, - or None, if not provided. - """ - if not desc: return None - - descriptors = {} - sha1hash = hashlib.sha1() - ei_digest = None - - for line in desc: - if line != '-----BEGIN SIGNATURE-----\n': - sha1hash.update(line) - if line.startswith('extra-info-digest'): - parts = line.split() - if len(parts) == 2: - ei_digest = parts[1].lower() - else: - digest = sha1hash.hexdigest().lower() - descriptors[digest] = ei_digest - while line != '-----END SIGNATURE-----\n': - line = next(desc) - sha1hash = hashlib.sha1() - ei_digest = None - return descriptors - def getExtraInfoDigests(doc): """Return the SHA-1 hash hexdigests of all extra-info documents diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index c481578..aff6e65 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -134,7 +134,6 @@ class BridgeIntegrationTests(unittest.TestCase): test_getConfigLine_vanilla_withoutFingerprint test_integration_getConfigLine_vanilla_withoutFingerprint test_getConfigLine_vanilla_withFingerprint test_integration_getConfigLine_vanilla_withFingerprint test_getConfigLine_scramblesuit_withFingeprint test_integration_getConfigLine_scramblesuit_withFingerprint - test_getDescriptorDigests test_integration_getDescriptorDigests test_getExtraInfoDigests test_integration_getExtraInfoDigests test_splitterBridgeInsertion test_integration_splitterBridgeInsertion ============================================== ======================== @@ -287,27 +286,6 @@ class BridgeIntegrationTests(unittest.TestCase): % (self.fingerprint, ptArgsList), bridgeLine) - def test_integration_getDescriptorDigests(self): - raise unittest.SkipTest( - ("The functions getDescriptorDigests() and getExtraInfoDigests() " - "have not been refactored into the new bridgedb.bridges module " - "because it's not clear yet if they're necessary. Skip these " - "tests for now.")) - - sha1hash = hashlib.sha1() - ei_digest = 'abcdefghijklmno' - - test = "this is a test line\nFollowed by another\n" - test += "extra-info-digest %s\n" % ei_digest - sha1hash.update(test) - digest = sha1hash.hexdigest() - test += "-----BEGIN SIGNATURE-----\n" - test += "This is a test line that should be skipped\n" - test += "-----END SIGNATURE-----\n" - digests = bridges.getDescriptorDigests(io.StringIO(test)) - self.failUnlessIn(digest, digests) - self.failUnlessEqual(ei_digest, digests[digest]) - def test_integration_getExtraInfoDigests(self): raise unittest.SkipTest( ("The functions getDescriptorDigests() and getExtraInfoDigests() "

1 0

[bridgedb/develop] Add unittest for parseNetworkStatusFile() with a bad router nickname.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit fe5a4a64db3a73127a2a6cba474b6f5a7a753962 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 14 00:41:00 2015 +0000 Add unittest for parseNetworkStatusFile() with a bad router nickname. --- lib/bridgedb/test/test_parse_descriptors.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index 738360f..d67ff88 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -270,6 +270,22 @@ class ParseDescriptorsTests(unittest.TestCase): self.assertIn(bridge.address, expectedIPs) self.assertEqual(bridge.fingerprint, self.expectedFprBridge0) + def test_parse_descriptors_parseNetworkStatusFile_bad_nickname(self): + """``b.p.descriptors.parseNetworkStatusFile`` with a bridge + networkstatus descriptor which has a nickname that is too long should + raise InvalidRouterNickname. + """ + unparseable = BRIDGE_NETWORKSTATUS_0.replace( + 'MiserLandfalls', + 'MiserLandfallsWaterfallsSnowfallsAvalanche') + # Write the descriptor to a file for testing. This is necessary + # because the function opens the networkstatus file to read it. + descFile = self.writeTestDescriptorsToFile('networkstatus-bridges', + unparseable) + self.assertRaises(descriptors.InvalidRouterNickname, + descriptors.parseNetworkStatusFile, + descFile) + def test_parse_descriptors_parseNetworkStatusFile_with_annotations(self): """Test ``b.p.descriptors.parseNetworkStatusFile`` with some document headers before the first 'r'-line.

1 0

[bridgedb/develop] Use new bridgedb.bridges.Bridge API in bridgedb.Storage.
by isis＠torproject.org 19 Feb '15

19 Feb '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/develop] Monkeypatch old Bridge class into one run of the legacy regression tests.
by isis＠torproject.org 19 Feb '15

19 Feb '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/develop] Add better logging to Filters.filterAssignBridgesToRing().
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 6015cc35b9f54da04213e7198d2d2e515d7f7a5b Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 24 08:39:40 2014 +0000 Add better logging to Filters.filterAssignBridgesToRing(). --- lib/bridgedb/Filters.py | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/lib/bridgedb/Filters.py b/lib/bridgedb/Filters.py index 79d50f8..ab8b74a 100644 --- a/lib/bridgedb/Filters.py +++ b/lib/bridgedb/Filters.py @@ -10,21 +10,31 @@ funcs = {} def filterAssignBridgesToRing(hmac, numRings, assignedRing): #XXX: ruleset should have a key unique to this function # ruleset ensures that the same + logging.debug("Creating a filter for assigning bridges to hashrings...") ruleset = frozenset([hmac, numRings, assignedRing]) + logging.debug("Filter created: %s" % ruleset) + try: return funcs[ruleset] except KeyError: - def f(bridge): - digest = hmac(bridge.getID()) + def _assignBridgesToRing(bridge): + digest = hmac(bridge.fingerprint) pos = long( digest[:8], 16 ) which = pos % numRings - if which == assignedRing: return True - return False - f.__name__ = "filterAssignBridgesToRing(%s, %s, %s)" % (hmac, numRings, - assignedRing) - setattr(f, "description", "ring=%d" % assignedRing) - funcs[ruleset] = f - return f + + if which == assignedRing: + return True + else: + logging.debug(("Bridge %s has calculated assignment %d; not " + "in correct ring %d.") + % (bridge, which, assignedRing)) + return False + + _assignBridgesToRing.__name__ = ("filterAssignBridgesToRing(%s, %s, %s)" + % (hmac, numRings, assignedRing)) + setattr(_assignBridgesToRing, "description", "ring=%d" % assignedRing) + funcs[ruleset] = _assignBridgesToRing + return _assignBridgesToRing def filterBridgesByRules(rules): ruleset = frozenset(rules)

1 0

[bridgedb/develop] Use PluggableTransports._runChecks() only if initialised with params.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 4cba2a52d777f4a1e330fcd6940d495d049b4df0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 24 08:53:38 2014 +0000 Use PluggableTransports._runChecks() only if initialised with params. --- lib/bridgedb/bridges.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 61ea860..4968988 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -285,8 +285,7 @@ class PluggableTransport(BridgeAddressBase): # parameters, or use the ``updateFromStemTransport()`` method, we'll # only use the ``_runChecks()`` method now if we were initialised with # parameters: - if (self.fingerprint or self.address or self.port or - self.methodname or self.arguments): + if (fingerprint or address or port or methodname or arguments): self._runChecks() def _parseArgumentsIntoDict(self, argumentList):

1 0

[bridgedb/develop] Refactor Filters.filterBridgesByTransport().
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit adb67e64ab65bee8cca6ff0638ab97772c474bc9 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 24 08:59:53 2014 +0000 Refactor Filters.filterBridgesByTransport(). --- lib/bridgedb/Filters.py | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/lib/bridgedb/Filters.py b/lib/bridgedb/Filters.py index 4580c87..b7bac87 100644 --- a/lib/bridgedb/Filters.py +++ b/lib/bridgedb/Filters.py @@ -74,23 +74,34 @@ def filterBridgesByIP6(bridge): setattr(filterBridgesByIP6, "description", "ip=6") def filterBridgesByTransport(methodname, addressClass=None): - if addressClass is None: addressClass = IPv4Address - assert (addressClass) in (IPv4Address, IPv6Address) + if not isinstance(addressClass, (IPv6Address, IPv4Address)): + addressClass = IPv4Address + ruleset = frozenset([methodname, addressClass]) try: return funcs[ruleset] except KeyError: - def f(bridge): + + def _filterByTransport(bridge): for transport in bridge.transports: - # ignore method name case - if isinstance(transport.address, addressClass) and \ - transport.methodname.lower() == methodname.lower(): return True + if isinstance(transport.address, addressClass): + # ignore method name case + if transport.methodname.lower() == methodname.lower(): + return True + else: + logging.debug(("Transport methodname '%s' doesn't match " + "requested methodname: '%s'.") + % (transport.methodname, methodname)) + else: + logging.debug(("Transport %s has incorrect address version " + "(%s).") % (transport, addressClass)) return False - f.__name__ = "filterBridgesByTransport(%s,%s)" % (methodname, - addressClass) - setattr(f, "description", "transport=%s"%methodname) - funcs[ruleset] = f - return f + + _filterByTransport.__name__ = ("filterBridgesByTransport(%s,%s)" + % (methodname, addressClass)) + setattr(_filterByTransport, "description", "transport=%s" % methodname) + funcs[ruleset] = _filterByTransport + return _filterByTransport def filterBridgesByNotBlockedIn(countryCode, addressClass=None, methodname=None): """ if at least one address:port of the selected addressClass and

1 0