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

[bridgedb/develop] Extract bridge_ips from extrainfo descriptors.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 3cd8690d590a197e2b6067f33f020812da8d7513 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 14 07:20:46 2015 +0000 Extract bridge_ips from extrainfo descriptors. --- lib/bridgedb/bridges.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index d69d96f..10e1ffc 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -829,6 +829,7 @@ class Bridge(BridgeBackwardsCompatibility): self.software = None self.os = None self.uptime = None + self.bridgeIPs = None self.onionKey = None self.ntorOnionKey = None @@ -1534,6 +1535,7 @@ class Bridge(BridgeBackwardsCompatibility): return self.descriptors['extrainfo'] = descriptor + self.bridgeIPs = descriptor.bridge_ips oldTransports = self.transports[:]

1 0

[bridgedb/develop] Add another test for Bridge._checkServerDescriptor() with bad digest.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit bbdfb3c4fc6b97364733705801329faf6737de5e Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 14 03:13:17 2015 +0000 Add another test for Bridge._checkServerDescriptor() with bad digest. --- lib/bridgedb/test/test_bridges.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index 1d6f678..7368b8d 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -1013,7 +1013,7 @@ class BridgeTests(unittest.TestCase): # self.bridge.updateFromNetworkStatus, # networkstatus[0]) - def test_Bridge_checkServerDescriptor_digest_mismatch(self): + def test_Bridge_checkServerDescriptor_digest_mismatch_ns(self): """Parsing a server descriptor whose digest doesn't match the one given in the bridge's networkstatus document should raise a ServerDescriptorDigestMismatch. @@ -1037,7 +1037,19 @@ class BridgeTests(unittest.TestCase): self.bridge.updateFromServerDescriptor, self.serverdescriptor) - def test_Bridge_checkServerDescriptor_digest_mismatch(self): + def test_Bridge_checkServerDescriptor_digest_mismatch_sd(self): + """Parsing a server descriptor when the corresponding networkstatus + descriptor didn't include a server bridge.descriptorDigest that matches + should raise a ServerDescriptorDigestMismatch exception. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + + self.bridge.descriptorDigest = 'deadbeef' + self.assertRaises(bridges.ServerDescriptorDigestMismatch, + self.bridge._checkServerDescriptor, + self.serverdescriptor) + + def test_Bridge_checkServerDescriptor_digest_missing(self): """Parsing a server descriptor when the corresponding networkstatus descriptor didn't include a server bridge.descriptorDigest should raise a MissingServerDescriptorDigest exception.

1 0

[bridgedb/develop] Refactor Bridge.supportedTransportTypes property to be shorter and faster.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 4b7845a847d48288ff1ab1008b68e4ea77a35ddd Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 14 03:41:23 2015 +0000 Refactor Bridge.supportedTransportTypes property to be shorter and faster. --- lib/bridgedb/bridges.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index b882e5b..5a5cba7 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -1274,12 +1274,7 @@ class Bridge(BridgeBackwardsCompatibility): """A deduplicated list of all the :data:`PluggableTranport.methodname`s which this bridge supports. """ - supported = [] - - for transport in self.transports: - supported.append(transport.methodname) - - return list(set(supported)) + return list(set([pt.methodname for pt in self.transports])) def updateFromNetworkStatus(self, descriptor): """Update this bridge's attributes from a parsed networkstatus

1 0

[bridgedb/develop] Update class docstring for bridgedb.bridges.Bridge class.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 4eb8701b959610043a385f9fecf2c5a0faa2d21e Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 14 07:19:54 2015 +0000 Update class docstring for bridgedb.bridges.Bridge class. --- lib/bridgedb/bridges.py | 56 +++++++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 19 deletions(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index fc457d1..d69d96f 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -735,43 +735,61 @@ class BridgeBackwardsCompatibility(BridgeBase): class Bridge(BridgeBackwardsCompatibility): """A single bridge, and all the information we have for it. - :type fingerprint: str or None - :ivar fingerprint: + :type fingerprint: str or ``None`` + :ivar fingerprint: This ``Bridge``'s fingerprint, in lowercased + hexadecimal format. - :type nickname: str or None - :ivar nickname: + :type nickname: str or ``None`` + :ivar nickname: This ``Bridge``'s router nickname. - :ivar orPort: int or None - :ivar orPort: - - :ivar socksPort: int - :ivar socksPort: + :type socksPort: int + :ivar socksPort: This ``Bridge``'s SOCKSPort. Should always be ``0``. :type dirPort: int - :ivar dirPort: + :ivar dirPort: This ``Bridge``'s DirPort. Should always be ``0``. :type orAddresses: list - :ivar orAddresses: + :ivar orAddresses: A list of 3-tuples in the form:: + (ADDRESS, PORT, IP_VERSION) + where: + * ADDRESS is an :class:`ipaddr.IPAddress`, + * PORT is an ``int``, + * IP_VERSION is either ``4`` or ``6``. :type transports: list - :ivar transports: + :ivar transports: A list of :class:`PluggableTransport`s, one for each + transport that this :class:`Bridge` currently supports. :type flags: :class:`~bridgedb.bridges.Flags` - :ivar flags: + :ivar flags: All flags assigned by the BridgeAuthority to this + :class:`Bridge`. :type hibernating: bool - :ivar hibernating: + :ivar hibernating: ``True`` if this :class:`Bridge` is hibernating and not + currently serving clients (e.g. if the Bridge hit its configured + ``RelayBandwidthLimit``); ``False`` otherwise. + + :type _blockedIn: dict + :ivar _blockedIn: A dictionary of ``ADDRESS:PORT`` pairs to lists of + lowercased, two-letter country codes (e.g. ``"us"``, ``"gb"``, + ``"cn"``, etc.) which that ``ADDRESS:PORT`` pair is blocked in. - :type contact: str or None - :ivar contact: The contact information for the this bridge's operator. + :type contact: str or ``None`` + :ivar contact: The contact information for the this Bridge's operator. - :type platform: str or None + :type family: set or ``None`` + :ivar family: The fingerprints of other Bridges related to this one. + + :type platform: str or ``None`` :ivar platform: The ``platform`` line taken from the ``@type bridge-server-descriptor``, e.g. ``'Tor 0.2.5.4-alpha on Linux'``. - :type family: set or None - :ivar family: The fingerprints of other bridges related to this one. + :type software: :api:`stem.version.Version` or ``None`` + :ivar software: The OR version portion of the ``platform`` line. + + :type os: str or None + :ivar os: The OS portion of the ``platform`` line. """ #: (bool) If ``True``, check that the signature of the bridge's #: ``@type bridge-server-descriptor`` is valid and that the signature was

1 0

[bridgedb/develop] Add three tests for Bridge.get*LastPublished() methods.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 1b09bc8b412973f9c2aa1a0428e0cf48910f67da Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 14 07:31:24 2015 +0000 Add three tests for Bridge.get*LastPublished() methods. --- lib/bridgedb/test/test_bridges.py | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index 2f21c36..e7b5875 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -12,6 +12,7 @@ from binascii import a2b_hex +import datetime import ipaddr import io import hashlib @@ -1261,3 +1262,39 @@ class BridgeTests(unittest.TestCase): self.assertIsNotNone(line) self.assertIn('179.178.155.140:36489', line) self.assertNotIn('2C3225C4805331025E211F4B6E5BF45C333FDD2C', line) + + def test_Bridge_getNetworkstatusLastPublished(self): + """Calling getNetworkstatusLastPublished() should tell us the last + published time of the Bridge's server-descriptor. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + + published = self.bridge.getNetworkstatusLastPublished() + self.assertIsNotNone(published) + self.assertIsInstance(published, datetime.datetime) + self.assertEqual(str(published), '2014-12-22 21:51:27') + + def test_Bridge_getDescriptorLastPublished(self): + """Calling getDescriptorLastPublished() should tell us the last + published time of the Bridge's server-descriptor. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + + published = self.bridge.getDescriptorLastPublished() + self.assertIsNotNone(published) + self.assertIsInstance(published, datetime.datetime) + self.assertEqual(str(published), '2014-12-22 21:51:27') + + def test_Bridge_getExtrainfoLastPublished(self): + """Calling getNetworkstatusLastPublished() should tell us the last + published time of the Bridge's server-descriptor. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + published = self.bridge.getExtrainfoLastPublished() + self.assertIsNotNone(published) + self.assertIsInstance(published, datetime.datetime) + self.assertEqual(str(published), '2014-12-22 21:51:27')

1 0

[bridgedb/develop] Add several tests for Bridge.getBridgeLine() with many request types.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 4600b58f0a1fa4b6e8aa490d2eb80802af658587 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 14 03:14:21 2015 +0000 Add several tests for Bridge.getBridgeLine() with many request types. --- lib/bridgedb/test/test_bridges.py | 157 +++++++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index 7368b8d..c305c10 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -1080,3 +1080,160 @@ class BridgeTests(unittest.TestCase): # All values are bad (even though IPv5 is a thing): self.bridge.orAddresses.append(('999.999.999.999', -1, 5)) self.assertRaises(bridges.MalformedBridgeInfo, self.bridge.assertOK) + + def test_Bridge_getBridgeLine_request_valid(self): + """Calling getBridgeLine with a valid request should return a bridge + line. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + request = BridgeRequestBase() + request.isValid(True) + line = self.bridge.getBridgeLine(request) + + self.assertIsNotNone(line) + self.assertIn('179.178.155.140:36489', line) + self.assertIn('2C3225C4805331025E211F4B6E5BF45C333FDD2C', line) + + def test_Bridge_getBridgeLine_request_invalid(self): + """Calling getBridgeLine with an invalid request should return None.""" + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + request = BridgeRequestBase() + request.isValid(False) + + self.assertIsNone(self.bridge.getBridgeLine(request)) + + def test_Bridge_getBridgeLine_no_vanilla_addresses(self): + """Calling getBridgeLine() on a Bridge without any vanilla addresses + should return None. + """ + request = BridgeRequestBase() + request.isValid(True) + + self.assertIsNone(self.bridge.getBridgeLine(request)) + + def test_Bridge_getBridgeLine_request_without_block_in_IR(self): + """Calling getBridgeLine() with a valid request for bridges not blocked + in Iran should return a bridge line. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + request = BridgeRequestBase() + request.isValid(True) + request.withoutBlockInCountry('IR') + line = self.bridge.getBridgeLine(request) + + self.assertIsNotNone(line) + self.assertIn('179.178.155.140:36489', line) + self.assertIn('2C3225C4805331025E211F4B6E5BF45C333FDD2C', line) + + def test_Bridge_getBridgeLine_IPv6(self): + """Calling getBridgeLine() with a valid request for IPv6 bridges + should return a bridge line. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + request = BridgeRequestBase() + request.isValid(True) + request.withIPv6() + line = self.bridge.getBridgeLine(request) + + self.assertIsNotNone(line) + self.assertTrue( + line.startswith('[6bf3:806b:78cd:d4b4:f6a7:4ced:cfad:dad4]:36488')) + self.assertNotIn('179.178.155.140:36493', line) + self.assertIn('2C3225C4805331025E211F4B6E5BF45C333FDD2C', line) + + def test_Bridge_getBridgeLine_obfs4(self): + """ """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + request = BridgeRequestBase() + request.isValid(True) + request.withPluggableTransportType('obfs4') + line = self.bridge.getBridgeLine(request) + + self.assertIsNotNone(line) + self.assertIn('179.178.155.140:36493', line) + self.assertTrue(line.startswith('obfs4')) + self.assertIn('iat-mode', line) + self.assertIn('public-key', line) + self.assertIn('node-id', line) + + def test_Bridge_getBridgeLine_obfs3_IPv6(self): + """Calling getBridgeLine() with a request for IPv6 obfs3 bridges (when + the Bridge doesn't have any) should raise a + PluggableTransportUnavailable exception. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + request = BridgeRequestBase() + request.isValid(True) + request.withIPv6() + request.withPluggableTransportType('obfs3') + + self.assertRaises(bridges.PluggableTransportUnavailable, + self.bridge.getBridgeLine, + request) + + def test_Bridge_getBridgeLine_googlygooglybegone(self): + """Calling getBridgeLine() with a request for an unknown PT should + raise a PluggableTransportUnavailable exception. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + request = BridgeRequestBase() + request.isValid(True) + request.withPluggableTransportType('googlygooglybegone') + + self.assertRaises(bridges.PluggableTransportUnavailable, + self.bridge.getBridgeLine, + request) + + def test_Bridge_getBridgeLine_bridge_prefix(self): + """Calling getBridgeLine() with bridgePrefix=True should prefix the + returned bridge line with 'Bridge '. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + request = BridgeRequestBase() + request.isValid(True) + line = self.bridge.getBridgeLine(request, bridgePrefix=True) + + self.assertIsNotNone(line) + self.assertIn('179.178.155.140:36489', line) + self.assertIn('2C3225C4805331025E211F4B6E5BF45C333FDD2C', line) + self.assertTrue(line.startswith('Bridge')) + + def test_Bridge_getBridgeLine_no_include_fingerprint(self): + """Calling getBridgeLine() with includeFingerprint=False should return + a bridge line without a fingerprint. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + request = BridgeRequestBase() + request.isValid(True) + line = self.bridge.getBridgeLine(request, includeFingerprint=False) + + self.assertIsNotNone(line) + self.assertIn('179.178.155.140:36489', line) + self.assertNotIn('2C3225C4805331025E211F4B6E5BF45C333FDD2C', line)

1 0

[bridgedb/develop] Move #5482 Bridge @propertys to BridgeBackwardsCompatibility class.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 0271c17d3ccd2f0a42c5dd17335ee682ff42ac8d Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 14 07:18:37 2015 +0000 Move #5482 Bridge @propertys to BridgeBackwardsCompatibility class. --- lib/bridgedb/bridges.py | 81 +++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 41 deletions(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 5a5cba7..fc457d1 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -691,6 +691,46 @@ class BridgeBackwardsCompatibility(BridgeBase): bridgeLine = self.getBridgeLine(bridgeRequest, includeFingerprint) return bridgeLine + # Bridge Stability (`#5482 <https://bugs.torproject.org>`_) properties. + @property + def familiar(self): + """A bridge is "familiar" if 1/8 of all active bridges have appeared + more recently than it, or if it has been around for a Weighted Time of + eight days. + """ + with bridgedb.Storage.getDB() as db: # pragma: no cover + return db.getBridgeHistory(self.fingerprint).familiar + + @property + def wfu(self): + """Weighted Fractional Uptime""" + with bridgedb.Storage.getDB() as db: # pragma: no cover + return db.getBridgeHistory(self.fingerprint).weightedFractionalUptime + + @property + def weightedTime(self): + """Weighted Time""" + with bridgedb.Storage.getDB() as db: # pragma: no cover + return db.getBridgeHistory(self.fingerprint).weightedTime + + @property + def wmtbac(self): + """Weighted Mean Time Between Address Change""" + with bridgedb.Storage.getDB() as db: # pragma: no cover + return db.getBridgeHistory(self.fingerprint).wmtbac + + @property + def tosa(self): + """The Time On Same Address (TOSA)""" + with bridgedb.Storage.getDB() as db: # pragma: no cover + return db.getBridgeHistory(self.fingerprint).tosa + + @property + def weightedUptime(self): + """Weighted Uptime""" + with bridgedb.Storage.getDB() as db: # pragma: no cover + return db.getBridgeHistory(self.fingerprint).weightedUptime + class Bridge(BridgeBackwardsCompatibility): """A single bridge, and all the information we have for it. @@ -1524,44 +1564,3 @@ class Bridge(BridgeBackwardsCompatibility): logging.info("Removing dead transport for bridge %s: %s %s:%s %s" % (self, pt.methodname, pt.address, pt.port, pt.arguments)) self.transports.remove(pt) - - - # Bridge Stability (`#5482 <https://bugs.torproject.org>`_) properties. - @property - def familiar(self): - """A bridge is "familiar" if 1/8 of all active bridges have appeared - more recently than it, or if it has been around for a Weighted Time of - eight days. - """ - with bridgedb.Storage.getDB() as db: - return db.getBridgeHistory(self.fingerprint).familiar - - @property - def wfu(self): - """Weighted Fractional Uptime""" - with bridgedb.Storage.getDB() as db: - return db.getBridgeHistory(self.fingerprint).weightedFractionalUptime - - @property - def weightedTime(self): - """Weighted Time""" - with bridgedb.Storage.getDB() as db: - return db.getBridgeHistory(self.fingerprint).weightedTime - - @property - def wmtbac(self): - """Weighted Mean Time Between Address Change""" - with bridgedb.Storage.getDB() as db: - return db.getBridgeHistory(self.fingerprint).wmtbac - - @property - def tosa(self): - """The Time On Same Address (TOSA)""" - with bridgedb.Storage.getDB() as db: - return db.getBridgeHistory(self.fingerprint).tosa - - @property - def weightedUptime(self): - """Weighted Uptime""" - with bridgedb.Storage.getDB() as db: - return db.getBridgeHistory(self.fingerprint).weightedUptime

1 0

[bridgedb/develop] Remove Bridges.parseDescFile() and its unittests.
by isis＠torproject.org 19 Feb '15

19 Feb '15

commit 58718f5d6f287d6bf5effbd594295325606248e6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Feb 11 01:43:47 2015 +0000 Remove Bridges.parseDescFile() and its unittests. * REMOVE bridgedb.Bridges.parseDescFile() function because it was replaced by bridgedb.parse.descriptors.parseServerDescriptorsFile(). * REMOVE four unittests in legacy_Tests.ParseDescFileTests: - testSimpleDesc - testSingleOrAddress - testMultipleOrAddress - testConvolutedOrAddress * RENAME legacy_Tests.ParseDescFileTests class to ParseCountryBlockFileTests. --- lib/bridgedb/Bridges.py | 56 --------------------------------- lib/bridgedb/test/legacy_Tests.py | 62 ++----------------------------------- 2 files changed, 2 insertions(+), 116 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index e92e23e..31b7cf6 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -41,62 +41,6 @@ ID_LEN = 20 # XXX Only used in commented out line in Storage.py DIGEST_LEN = 20 PORTSPEC_LEN = 16 - -def parseDescFile(f, bridge_purpose='bridge'): - """Generator. Parses a cached-descriptors file 'f' and yeilds a Bridge object - for every entry whose purpose matches bridge_purpose. - This Generator understands the new descriptor format described in - 186-multiple-orports.txt - - The new specification provides for specifying multiple ORports as well - as supporting new address format for IPv6 addresses. - - The router descriptor "or-address" may occur zero, one, or multiple times. - parseDescFile adds each ADDRESS:PORTSPEC to the Bridge.or_addresses list. - - The "or-address" should not duplicate the address:port pair from the "router" - description. (Should we try to catch this case?) - - A node may not list more than 8 or-address lines. - (should we try to enforce this too?) - - Here is the new format: - - or-address SP ADDRESS ":" PORTLIST NL - ADDRESS = IP6ADDR | IP4ADDR - IPV6ADDR = an ipv6 address, surrounded by square brackets. - IPV4ADDR = an ipv4 address, represented as a dotted quad. - PORTLIST = PORTSPEC | PORTSPEC "," PORTLIST - PORTSPEC = PORT - PORT = a number between 1 and 65535 inclusive. - """ - - nickname = ip = orport = fingerprint = purpose = None - num_or_address_lines = 0 - or_addresses = {} - - for line in f: - line = line.strip() - if line.startswith("opt "): - line = line[4:] - if line.startswith("@purpose "): - items = line.split() - purpose = items[1] - elif line.startswith("router "): - items = line.split() - if len(items) >= 4: - nickname = items[1] - ip = items[2].strip('[]') - orport = int(items[3]) - elif line.startswith("fingerprint "): - fingerprint = line[12:].replace(" ", "") - elif line.startswith("router-signature"): - purposeMatches = (purpose == bridge_purpose or bridge_purpose is None) - if purposeMatches and nickname and ip and orport and fingerprint: - yield (nickname, ipaddr.IPAddress(ip), orport, fingerprint) - nickname = ip = orport = fingerprint = purpose = None - - re_ipv6 = re.compile("\[([a-fA-F0-9:]+)\]:(.*$)") re_ipv4 = re.compile("((?:\d{1,3}\.?){4}):(.*$)") diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py index 6d55fce..7be5270 100644 --- a/lib/bridgedb/test/legacy_Tests.py +++ b/lib/bridgedb/test/legacy_Tests.py @@ -547,65 +547,7 @@ class SQLStorageTests(unittest.TestCase): db.cleanWarnedEmails(t+200) self.assertEquals(db.getWarnedEmail("def(a)example.com"), False) -class ParseDescFileTests(unittest.TestCase): - def testSimpleDesc(self): - test = "" - - for i in range(100): - test+= "".join(simpleDesc % (randomIP(), randomPort())) - test+=gettimestamp() - test+="router-signature\n" - - bs = [b for b in bridgedb.Bridges.parseDescFile(test.split('\n'))] - self.assertEquals(len(bs), 100) - - for b in bs: - b.assertOK() - - def testSingleOrAddress(self): - test = "" - - for i in range(100): - test+= simpleDesc % (randomIP(), randomPort()) - test+= orAddress % (randomIP(),randomPort()) - test+=gettimestamp() - test+= "router-signature\n" - - bs = [b for b in bridgedb.Bridges.parseDescFile(test.split('\n'))] - self.assertEquals(len(bs), 100) - - for b in bs: - b.assertOK() - - def testMultipleOrAddress(self): - test = "" - for i in range(100): - test+= simpleDesc % (randomIPString(), randomPort()) - for i in xrange(8): - test+= orAddress % (randomIPString(),randomPortSpec()) - test+=gettimestamp() - test+= "router-signature\n" - - bs = [b for b in bridgedb.Bridges.parseDescFile(test.split('\n'))] - self.assertEquals(len(bs), 100) - - for b in bs: - b.assertOK() - - def testConvolutedOrAddress(self): - test = "" - for i in range(100): - test+= simpleDesc % (randomIPString(), randomPort()) - for i in xrange(8): - test+= orAddress % (randomIPString(),randomPortSpec()) - test+=gettimestamp() - test+= "router-signature\n" - - bs = [b for b in bridgedb.Bridges.parseDescFile(test.split('\n'))] - self.assertEquals(len(bs), 100) - - for b in bs: - b.assertOK() +class ParseCountryBlockFileTests(unittest.TestCase): def testParseCountryBlockFile(self): simpleBlock = "%s:%s %s\n" @@ -765,7 +707,7 @@ def testSuite(): loader = unittest.TestLoader() for klass in [IPBridgeDistTests, SQLStorageTests, EmailBridgeDistTests, - ParseDescFileTests, BridgeStabilityTests]: + ParseCountryBlockFileTests, BridgeStabilityTests]: suite.addTest(loader.loadTestsFromTestCase(klass)) for module in [ bridgedb.Bridges,

1 0

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

19 Feb '15

commit 777f2389fc6f1e7cb728966f5be204bf062ccf32 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 13 01:05:16 2015 +0000 Add two unittests for bridgedb.bridges.Bridge.assertOK(). * ADD test_Bridge_assertOK() which checks the case where everything is in fact okay. * ADD test_Bridge_assertOK_all_bad_values() which checks the case where everything is totes not okay. --- lib/bridgedb/test/test_bridges.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index 8ff0557..e87ff8a 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -920,3 +920,23 @@ class BridgeTests(unittest.TestCase): self.assertRaises(bridges.ServerDescriptorDigestMismatch, self.bridge.updateFromServerDescriptor, self.serverdescriptor) + + def test_Bridge_assertOK(self): + """If all orAddresses are okay, then assertOK() should return None.""" + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + + self.assertIsNone(self.bridge.assertOK()) + + def test_Bridge_assertOK_all_bad_values(self): + """If an orAddress has an IP address of 999.999.999.999 and a port of + -1 and claims to be IPv5, then everything about it is bad and it should + fail all the checks in assertOK(), then a MalformedBridgeInfo should be + raised. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + + # All values are bad (even though IPv5 is a thing): + self.bridge.orAddresses.append(('999.999.999.999', -1, 5)) + self.assertRaises(bridges.MalformedBridgeInfo, self.bridge.assertOK)

1 0

[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