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

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

21 Mar '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/master] Add more unittests for Bridge.updateFromExtraInfoDescriptor().
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 0c956389589976308580ab82690c0bc00c945a96 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 13 07:42:48 2015 +0000 Add more unittests for Bridge.updateFromExtraInfoDescriptor(). * ADD test_Bridge_updateFromExtraInfoDescriptor_pt_changed_args() which checks that updateFromExtraInfoDescriptor() updates known PTs with their new args from a newer parsed extrainfo descriptor. * ADD test_Bridge_updateFromExtraInfoDescriptor_pt_died() that updateFromExtraInfoDescriptor() removes previously known PTs which are no longer listed in a Bridge's extrainfo descriptor. --- lib/bridgedb/test/test_bridges.py | 51 +++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index e87ff8a..11a9d64 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -867,6 +867,57 @@ class BridgeTests(unittest.TestCase): self.assertEqual(self.bridge.bandwidthObserved, 1623207134) self.assertEqual(len(self.bridge.transports), 4) + def test_Bridge_updateFromExtraInfoDescriptor_pt_changed_args(self): + """Calling updateFromExtraInfoDescriptor() with a descriptor which + includes different PT args for a known bridge with a known pluggable + transport should update that transport. + + scramblesuit 179.178.155.140:36492 password=ABCDEFGHIJKLMNOPQRSTUVWXYZ234567 + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + self.assertEqual(len(self.bridge.transports), 4) + + for pt in self.bridge.transports: + if pt.methodname == 'scramblesuit': + self.assertEqual(pt.address, ipaddr.IPv4Address('179.178.155.140')) + self.assertEqual(pt.port, 36492) + + # Change the args of scramblesuit transport in the extrainfo descriptor: + transportline = self.extrainfo.transport['scramblesuit'] + self.extrainfo.transport['scramblesuit'] = (transportline[0], + transportline[1], + ['password=PASSWORD']) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + for pt in self.bridge.transports: + if pt.methodname == 'scramblesuit': + self.assertEqual(pt.address, ipaddr.IPv4Address('179.178.155.140')) + self.assertEqual(pt.port, 36492) + self.assertEqual(pt.arguments['password'], 'PASSWORD') + + def test_Bridge_updateFromExtraInfoDescriptor_pt_died(self): + """Calling updateFromExtraInfoDescriptor() with a descriptor which + doesn't include a previously-known transport should remove that + transport. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + self.assertEqual(len(self.bridge.transports), 4) + + # Remove the obfs3 transport from the extrainfo descriptor: + self.extrainfo.transport.pop('obfs3') + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + self.assertEqual(len(self.bridge.transports), 3) + + for pt in self.bridge.transports: + self.failIfEqual(pt.methodname, 'obfs3') + def test_Bridge_descriptorDigest(self): """Parsing a networkstatus descriptor should result in Bridge.descriptorDigest being set.

1 0

[bridgedb/master] Add unittest for Bridge._verifyExtraInfoSignature with a valid sig.
by isis＠torproject.org 21 Mar '15

21 Mar '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/master] Add unittest for parseNetworkStatusFile() with a bad router nickname.
by isis＠torproject.org 21 Mar '15

21 Mar '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/master] Add test for Bridge.updateFromExtraInfoDescriptor() with a changed PT.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit d1909c8a0aa52168d9456df7b0a06f432c61dce5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 14 00:50:29 2015 +0000 Add test for Bridge.updateFromExtraInfoDescriptor() with a changed PT. This tests what happens if we receive an updated extrainfo descriptor for a Bridge where one of its PTs has changed its port number. --- lib/bridgedb/test/test_bridges.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index bae418a..ae9aa92 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -904,6 +904,34 @@ class BridgeTests(unittest.TestCase): self.assertEqual(len(self.bridge.transports), 0) self.assertIsNone(self.bridge.descriptors['extrainfo']) + def test_Bridge_updateFromExtraInfoDescriptor_pt_changed_port(self): + """Calling updateFromExtraInfoDescriptor() with a descriptor which + includes a different port for a known bridge with a known pluggable + transport should update that transport. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + self.assertEqual(len(self.bridge.transports), 4) + + for pt in self.bridge.transports: + if pt.methodname == 'obfs4': + self.assertEqual(pt.address, ipaddr.IPv4Address('179.178.155.140')) + self.assertEqual(pt.port, 36493) + + # Change the port of obfs4 transport in the extrainfo descriptor: + transportline = self.extrainfo.transport['obfs4'] + self.extrainfo.transport['obfs4'] = (transportline[0], + 31337, + transportline[2]) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + for pt in self.bridge.transports: + if pt.methodname == 'obfs4': + self.assertEqual(pt.address, ipaddr.IPv4Address('179.178.155.140')) + self.assertEqual(pt.port, 31337) + def test_Bridge_updateFromExtraInfoDescriptor_pt_changed_args(self): """Calling updateFromExtraInfoDescriptor() with a descriptor which includes different PT args for a known bridge with a known pluggable

1 0

[bridgedb/master] Add unittest for Bridge._checkServerDescriptor with mismatched digest.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 1209ffee6b76b3f849fb326ae6fc41f23665a2f8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 14 00:52:08 2015 +0000 Add unittest for Bridge._checkServerDescriptor with mismatched digest. --- lib/bridgedb/test/test_bridges.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index ae9aa92..1d6f678 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -1037,6 +1037,18 @@ class BridgeTests(unittest.TestCase): self.bridge.updateFromServerDescriptor, self.serverdescriptor) + def test_Bridge_checkServerDescriptor_digest_mismatch(self): + """Parsing a server descriptor when the corresponding networkstatus + descriptor didn't include a server bridge.descriptorDigest should raise + a MissingServerDescriptorDigest exception. + """ + self.bridge.updateFromNetworkStatus(self.networkstatus) + + self.bridge.descriptorDigest = None + self.assertRaises(bridges.MissingServerDescriptorDigest, + self.bridge._checkServerDescriptor, + self.serverdescriptor) + def test_Bridge_assertOK(self): """If all orAddresses are okay, then assertOK() should return None.""" self.bridge.updateFromNetworkStatus(self.networkstatus)

1 0

[bridgedb/master] Add three unittests for parseExtraInfoFiles() with bad router-signatures.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit e8395678b7bfaaab55e4e6dcb59437c42263f29f Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 14 00:46:30 2015 +0000 Add three unittests for parseExtraInfoFiles() with bad router-signatures. --- lib/bridgedb/test/test_parse_descriptors.py | 50 +++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/lib/bridgedb/test/test_parse_descriptors.py b/lib/bridgedb/test/test_parse_descriptors.py index d67ff88..6395fdb 100644 --- a/lib/bridgedb/test/test_parse_descriptors.py +++ b/lib/bridgedb/test/test_parse_descriptors.py @@ -526,6 +526,56 @@ class ParseDescriptorsTests(unittest.TestCase): self.assertIn("2B5DA67FBA13A6449DE625673B7AE9E3AA7DF75F", routers.keys(), "The 'parseable' descriptor wasn't returned by the parser.") + def test_parse_descriptors_parseExtraInfoFiles_bad_signature_footer(self): + """Calling parseExtraInfoFiles() with a descriptor which has a + signature with a bad "-----END SIGNATURE-----" footer should return + zero parsed descriptors. + """ + unparseable = BRIDGE_EXTRA_INFO_DESCRIPTOR.replace( + '-----END SIGNATURE-----', + '-----END SIGNATURE FOR REALZ-----') + # This must be a "real" file or _copyUnparseableDescriptorFile() will + # raise an AttributeError saying: + # '_io.BytesIO' object has no attribute 'rpartition'" + descFileOne = self.writeTestDescriptorsToFile( + "bad-signature-footer", unparseable) + routers = descriptors.parseExtraInfoFiles(descFileOne) + + self.assertEqual(len(routers), 0) + + def test_parse_descriptors_parseExtraInfoFiles_missing_signature(self): + """Calling parseExtraInfoFiles() with a descriptor which is + missing the signature should return zero parsed descriptors. + """ + # Remove the signature + BEGIN_SIG = '-----BEGIN SIGNATURE-----' + unparseable, _ = BRIDGE_EXTRA_INFO_DESCRIPTOR.split(BEGIN_SIG) + # This must be a "real" file or _copyUnparseableDescriptorFile() will + # raise an AttributeError saying: + # '_io.BytesIO' object has no attribute 'rpartition'" + descFileOne = self.writeTestDescriptorsToFile( + "missing-signature", unparseable) + routers = descriptors.parseExtraInfoFiles(descFileOne) + + self.assertEqual(len(routers), 0) + + def test_parse_descriptors_parseExtraInfoFiles_bad_signature_too_short(self): + """Calling _verifyExtraInfoSignature() with a descriptor which has a + bad signature should raise an InvalidExtraInfoSignature exception. + """ + # Truncate the signature to 50 bytes + BEGIN_SIG = '-----BEGIN SIGNATURE-----' + doc, sig = BRIDGE_EXTRA_INFO_DESCRIPTOR.split(BEGIN_SIG) + unparseable = BEGIN_SIG.join([doc, sig[:50]]) + # This must be a "real" file or _copyUnparseableDescriptorFile() will + # raise an AttributeError saying: + # '_io.BytesIO' object has no attribute 'rpartition'" + descFileOne = self.writeTestDescriptorsToFile( + "truncated-signature", unparseable) + routers = descriptors.parseExtraInfoFiles(descFileOne) + + self.assertEqual(len(routers), 0) + def test_parse_descriptors_parseExtraInfoFiles_unparseable_BytesIO(self): """Test parsing three extrainfo descriptors: one is a valid descriptor, one is an older duplicate, and one is unparseable (it has a bad

1 0

[bridgedb/master] Add test for Bridge.updateFromExtraInfoDescriptor() with bad signature.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 5309a94c376529e77008b36c63cc55e91d76ca67 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 14 00:48:51 2015 +0000 Add test for Bridge.updateFromExtraInfoDescriptor() with bad signature. --- lib/bridgedb/test/test_bridges.py | 53 ++++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/lib/bridgedb/test/test_bridges.py b/lib/bridgedb/test/test_bridges.py index 9353d1c..bae418a 100644 --- a/lib/bridgedb/test/test_bridges.py +++ b/lib/bridgedb/test/test_bridges.py @@ -706,19 +706,34 @@ class BridgeBackwardsCompatibilityTests(unittest.TestCase): class BridgeTests(unittest.TestCase): """Tests for :class:`bridgedb.bridges.Bridge`.""" - def _writeDescriptorFiles(self): + def _parseAllDescriptorFiles(self): + self.networkstatus = descriptors.parseNetworkStatusFile( + self._networkstatusFile)[0] + self.serverdescriptor = descriptors.parseServerDescriptorsFile( + self._serverDescriptorFile)[0] + self.extrainfo = descriptors.parseExtraInfoFiles( + self._extrainfoFile).values()[0] + + def _writeNetworkstatus(self, networkstatus): with open(self._networkstatusFile, 'w') as fh: - fh.write(BRIDGE_NETWORKSTATUS) + fh.write(networkstatus) fh.flush() + def _writeServerdesc(self, serverdesc): with open(self._serverDescriptorFile, 'w') as fh: - fh.write(BRIDGE_SERVER_DESCRIPTOR) + fh.write(serverdesc) fh.flush() + def _writeExtrainfo(self, extrainfo): with open(self._extrainfoFile, 'w') as fh: - fh.write(BRIDGE_EXTRAINFO) + fh.write(extrainfo) fh.flush() + def _writeDescriptorFiles(self, networkstatus, serverdesc, extrainfo): + self._writeNetworkstatus(networkstatus) + self._writeServerdesc(serverdesc) + self._writeExtrainfo(extrainfo) + def setUp(self): def _cwd(filename): return os.path.sep.join([os.getcwd(), filename]) @@ -727,14 +742,10 @@ class BridgeTests(unittest.TestCase): self._serverDescriptorFile = _cwd('BridgeTests-bridge-descriptors') self._extrainfoFile = _cwd('BridgeTests-cached-extrainfo') - self._writeDescriptorFiles() - - self.networkstatus = descriptors.parseNetworkStatusFile( - self._networkstatusFile)[0] - self.serverdescriptor = descriptors.parseServerDescriptorsFile( - self._serverDescriptorFile)[0] - self.extrainfo = descriptors.parseExtraInfoFiles( - self._extrainfoFile).values()[0] + self._writeDescriptorFiles(BRIDGE_NETWORKSTATUS, + BRIDGE_SERVER_DESCRIPTOR, + BRIDGE_EXTRAINFO) + self._parseAllDescriptorFiles() self.bridge = bridges.Bridge() @@ -875,6 +886,24 @@ class BridgeTests(unittest.TestCase): self.assertEqual(self.bridge.bandwidthObserved, 1623207134) self.assertEqual(len(self.bridge.transports), 4) + def test_Bridge_updateFromExtraInfoDescriptor_bad_signature_changed(self): + """Calling updateFromExtraInfoDescriptor() with a descriptor which + has a bad signature should not continue to process the descriptor. + """ + # Make the signature uppercased + BEGIN_SIG = '-----BEGIN SIGNATURE-----' + doc, sig = BRIDGE_EXTRAINFO.split(BEGIN_SIG) + ei = BEGIN_SIG.join([doc, sig.upper()]) + self._writeExtrainfo(ei) + self._parseAllDescriptorFiles() + + self.bridge.updateFromNetworkStatus(self.networkstatus) + self.bridge.updateFromServerDescriptor(self.serverdescriptor) + self.bridge.updateFromExtraInfoDescriptor(self.extrainfo) + + self.assertEqual(len(self.bridge.transports), 0) + self.assertIsNone(self.bridge.descriptors['extrainfo']) + def test_Bridge_updateFromExtraInfoDescriptor_pt_changed_args(self): """Calling updateFromExtraInfoDescriptor() with a descriptor which includes different PT args for a known bridge with a known pluggable

1 0

[bridgedb/master] Add another test for Bridge._checkServerDescriptor() with bad digest.
by isis＠torproject.org 21 Mar '15

21 Mar '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/master] Bridge._constructBridgeLine() won't be handed an invalid addresses.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit fa007b2e422a604f6f3a855720009c2406fb1a96 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 14 03:08:58 2015 +0000 Bridge._constructBridgeLine() won't be handed an invalid addresses. The only way that Bridge._constructBridgeLine() is called is through Bridge.getBridgeLine() when vanilla bridges are requested. Because of all the sanitisation in Stem and the rest of BridgeDB's parsers, no type of bridgerequest, no matter how malformed, will ever result in an invalid addrport from Bridge._getVanillaForRequest(). Secondly, we'll never get anything other than IPv4 and IPv6 addresses, for the same reasons. * REMOVE lines which raise MalformedBridgeInfo in Bridge._constructBridgeLine(). --- lib/bridgedb/bridges.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 901baf5..3c47967 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -860,8 +860,6 @@ class Bridge(BridgeBackwardsCompatibility): line. :param bool bridgePrefix: if ``True``, prefix the :term:`Bridge Line` with ``'Bridge '``. - :raises MalformedBridgeInfo: if the **addrport** didn't turn out to be - a 2-tuple containing ``(ipaddress, port)``. :rtype: string :returns: A bridge line suitable for adding into a ``torrc`` file or Tor Launcher. @@ -869,11 +867,7 @@ class Bridge(BridgeBackwardsCompatibility): if not addrport: return - try: - address, port, version = addrport - except (TypeError, ValueError): - raise MalformedBridgeInfo("Can't process addrport: %r" % addrport) - + address, port, version = addrport bridgeLine = [] if bridgePrefix: @@ -883,8 +877,6 @@ class Bridge(BridgeBackwardsCompatibility): bridgeLine.append("%s:%d" % (str(address), port)) elif version == 6: bridgeLine.append("[%s]:%d" % (str(address), port)) - else: - raise MalformedBridgeInfo("IP version must be 4 or 6") if includeFingerprint: bridgeLine.append("%s" % self.fingerprint)

1 0