tor-commits March 2021

tor-commits@lists.torproject.org

17 participants
2169 discussions

[bridgedb/develop] Trust but verify bridge descriptors
by cohosh＠torproject.org 02 Mar '21

02 Mar '21

commit 60e809ffa7aa22de9cd7e5e152e6916606b387d5 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Feb 24 11:15:10 2021 -0500 Trust but verify bridge descriptors These descriptors are already validated by the Bridge Authority. Instead of potentially DoS-ing ourselves, accept all descriptors but log an error if stem validation fails. --- bridgedb/parse/descriptors.py | 51 +++++++------ bridgedb/test/test_parse_descriptors.py | 128 +++++++++++++------------------- 2 files changed, 80 insertions(+), 99 deletions(-) diff --git a/bridgedb/parse/descriptors.py b/bridgedb/parse/descriptors.py index d3a3802..8baf7a8 100644 --- a/bridgedb/parse/descriptors.py +++ b/bridgedb/parse/descriptors.py @@ -215,7 +215,7 @@ def deduplicate(descriptors, statistics=False): return newest -def parseExtraInfoFiles(*filenames, **kwargs): +def parseExtraInfoFiles(*descriptorFiles): """Open **filenames** and parse any ``@type bridge-extrainfo-descriptor`` contained within. @@ -229,13 +229,6 @@ def parseExtraInfoFiles(*filenames, **kwargs): .. note:: This function will call :func:`deduplicate` to deduplicate the extrainfo descriptors parsed from all **filenames**. - :kwargs validate: If there is a ``'validate'`` keyword argument, its value - will be passed along as the ``'validate'`` argument to - :class:`stem.descriptor.extrainfo_descriptor.BridgeExtraInfoDescriptor`. - The ``'validate'`` keyword argument defaults to ``True``, meaning that - the hash digest stored in the ``router-digest`` line will be checked - against the actual contents of the descriptor and the extrainfo - document's signature will be verified. :rtype: dict :returns: A dictionary mapping bridge fingerprints to their corresponding, deduplicated @@ -254,33 +247,45 @@ def parseExtraInfoFiles(*filenames, **kwargs): # to be a signature). descriptorType = 'extra-info 1.0' - validate = True - if ('validate' in kwargs) and (kwargs['validate'] is False): - validate = False - - for filename in filenames: - logging.info("Parsing %s descriptors in %s..." - % (descriptorType, filename)) + for descFile in descriptorFiles: # Make sure we open the file rather than passing in a path so that # subsequent calls to parse_file will use the current file position # to continue parsing the remaining descriptors after an exception # is raised - descFile = open(filename, 'rb') + if isinstance(descFile, str): + descFile = open(descFile, 'rb') # open by filename + + filename = os.path.basename(descFile.name) + copied = False while True: try: - document = parse_file(descFile, descriptorType, validate=validate) - + document = parse_file(descFile, descriptorType, validate=True) for router in document: - descriptors.append(router) - + logging.info("Successfully parsed descriptor for %s." + % router.fingerprint) break # Reached end of file except (ValueError, ProtocolError) as error: - logging.error( - ("Stem exception while parsing extrainfo descriptor from " + # For now we are just logging validation errors, we'll + # trust and parse all descriptors later + logging.warning( + ("Stem exception while validating extrainfo descriptor from " "file '%s':\n%s") % (filename, str(error))) - _copyUnparseableDescriptorFile(filename) + if not copied: + _copyUnparseableDescriptorFile(filename) + copied = True + + # Now seek to start of document and parse all descriptors again + descFile.seek(0) + try: + document = parse_file(descFile, descriptorType, validate=False) + for router in document: + descriptors.append(router) + except Exception as error: + logging.error("Stem exception while parsing extrainfo descriptor %s" + % str(error)) + routers = deduplicate(descriptors) return routers diff --git a/bridgedb/test/test_parse_descriptors.py b/bridgedb/test/test_parse_descriptors.py index 86b7d1f..4874161 100644 --- a/bridgedb/test/test_parse_descriptors.py +++ b/bridgedb/test/test_parse_descriptors.py @@ -690,16 +690,6 @@ class ParseDescriptorsTests(unittest.TestCase): with Benchmarker(): routers = descriptors.parseExtraInfoFiles(*descFiles) - def test_parse_descriptors_parseExtraInfoFiles_no_validate(self): - """Test for ``b.p.descriptors.parseExtraInfoFiles`` with - descriptor validation disabled. - """ - descFileOne = self.writeTestDescriptorsToFile('cached-extrainfo', - BRIDGE_EXTRA_INFO_DESCRIPTOR) - routers = descriptors.parseExtraInfoFiles(descFileOne, - validate=False) - self.assertGreaterEqual(len(routers), 1) - def test_parse_descriptors_parseExtraInfoFiles_unparseable(self): """Test parsing three extrainfo descriptors: one is a valid descriptor, one is an older duplicate, and one is unparseable (it has a bad @@ -742,11 +732,39 @@ class ParseDescriptorsTests(unittest.TestCase): datetime.datetime.strptime("2014-12-04 03:10:25", "%Y-%m-%d %H:%M:%S"), "We should have the newest available descriptor for this router.") + def test_parse_descriptors_parseExtraInfoFiles_invalid(self): + """Test parsing three extrainfo descriptors: one is a valid descriptor, + and the other is completely invalid (lacking a signature). + BridgeDB should parse the valid descriptor if it preceeds the mangled + one and then terminate. + """ + # Give it a bad geoip-db-digest: + unparseable = b'DontParseMe F373CC1D86D82267F1F1F5D39470F0E0A022122E' + + descFile = self.writeTestDescriptorsToFile('cached-extrainfo', + BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWEST_DUPLICATE, unparseable, + BRIDGE_EXTRA_INFO_DESCRIPTOR) + routers = descriptors.parseExtraInfoFiles(descFile) + + self.assertIsInstance(routers, dict) + self.assertEqual(len(routers), 2, ( + "There were three extrainfo descriptors: one lacks a signature, " + "and one was duplicate. Given our trust-but-verify policy that should " + "give us two descriptors")) + + bridge = list(routers.values())[0] + self.assertEqual( + bridge.fingerprint, + "E08B324D20AD0A13E114F027AB9AC3F32CA696A0", + ("It looks like the (supposedly) unparseable bridge was returned " + "instead of the valid one!")) + def test_parse_descriptors_parseExtraInfoFiles_unparseable_and_parseable(self): """Test parsing four extrainfo descriptors: two are valid descriptors, - one is an older duplicate of one of the valid descriptors, and one is - unparseable (it has a line we shouldn't recognise). There should be - only two descriptors returned after parsing. + one is an older duplicate of one of the valid descriptors, and fails + Stem's validation. Since the bridge authority already does validation, + we should except the unparseable descriptor. There should be three + descriptors returned after parsing. """ # Mess up the bridge-ip-transports line: unparseable = BRIDGE_EXTRA_INFO_DESCRIPTOR.replace( @@ -770,13 +788,13 @@ class ParseDescriptorsTests(unittest.TestCase): routers = descriptors.parseExtraInfoFiles(descFile) self.assertIsInstance(routers, dict) - self.assertEqual(len(routers), 2, ( + self.assertEqual(len(routers), 3, ( "There were four extrainfo descriptors: one was a duplicate, " - "and one was unparseable, so that should only leave two " - "descriptors remaining.")) + "and one will throw a validation error, but all three " + "descriptors should be returned.")) - self.assertNotIn("F373CC1D86D82267F1F1F5D39470F0E0A022122E", routers.keys(), - "The 'unparseable' descriptor was returned by the parser.") + self.assertIn("F373CC1D86D82267F1F1F5D39470F0E0A022122E", routers.keys(), + "The 'unparseable' descriptor was not returned by the parser.") self.assertIn("E08B324D20AD0A13E114F027AB9AC3F32CA696A0", routers.keys(), ("A bridge extrainfo which had duplicates was completely missing " @@ -789,56 +807,6 @@ 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( - b'-----END SIGNATURE-----', - b'-----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 = b'-----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 = b'-----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(self): """Test parsing three extrainfo descriptors: one is a valid descriptor, one is an older duplicate, and one is unparseable (it has a bad @@ -863,15 +831,23 @@ class ParseDescriptorsTests(unittest.TestCase): descriptors.parseExtraInfoFiles(descFileOne, descFileTwo, descFileThree) - timestamp = datetime.datetime.now() - timestamp = timestamp.isoformat(sep=chr(0x2d)) - timestamp = timestamp.rsplit('.', 1)[0] + matchingFiles = glob.glob("*copy-unparseable-test.unparseable") + self.assertEqual(len(matchingFiles), 1) + + newFile = matchingFiles[-1] + self.assertTrue(os.path.isfile(newFile)) + + timestamp = datetime.datetime.strptime(newFile.split("_")[0], + "%Y-%m-%d-%H:%M:%S") + # The timestamp should be roughly today (unless we just passed + # midnight, then it might be +/- 1): + self.assertApproximates(timestamp.now().day, timestamp.day, 1) - path, sep, fname = descFileThree.rpartition(os.path.sep) - newfilename = "%s%s%s_%s%sunparseable" % (path, sep, timestamp, - fname, os.path.extsep) + # The timestamp should be roughly this hour (+/- 1): + self.assertApproximates(timestamp.now().hour, timestamp.hour, 1) - self.assertTrue(os.path.exists(newfilename)) + # The timestamp should be roughly this minute (+/- 2): + self.assertApproximates(timestamp.now().minute, timestamp.minute, 2) def test_parse_descriptors_parseExtraInfoFiles_empty_file(self): """Test parsing an empty extrainfo descriptors file.""" @@ -930,7 +906,7 @@ class ParseDescriptorsTests(unittest.TestCase): self.assertTrue(os.path.isfile(newFile)) timestamp = datetime.datetime.strptime(newFile.split("_")[0], - "%Y-%m-%d-%H:%M:%S") + "%Y-%m-%d-%H:%M:%S") # The timestamp should be roughly today (unless we just passed # midnight, then it might be +/- 1): self.assertApproximates(timestamp.now().day, timestamp.day, 1)

1 0

[bridgedb/develop] Merge branch 'update_readme' into 'develop'
by cohosh＠torproject.org 02 Mar '21

02 Mar '21

commit ff05e39c51a42d314e973f353d30ecff1e5f141e Merge: 8e7c77a a9be3c3 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Feb 12 14:09:47 2021 +0000 Merge branch 'update_readme' into 'develop' Update instructions for creating mock bridges See merge request tpo/anti-censorship/bridgedb!12 README.rst | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)

1 0

[bridgedb/develop] Update instructions for creating mock bridges
by cohosh＠torproject.org 02 Mar '21

02 Mar '21

commit a9be3c3ce2c6259dbc312451803f2052b709afd1 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Feb 11 20:00:12 2021 -0500 Update instructions for creating mock bridges --- README.rst | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.rst b/README.rst index 559f5e4..de93734 100644 --- a/README.rst +++ b/README.rst @@ -274,16 +274,12 @@ additional dependencies in the Pip requirements file, To create a bunch of fake bridge descriptors to test BridgeDB, do:: - bridgedb mock [-n NUMBER_OF_DESCRIPTORS] + ./scripts/create_descriptors [--num-resistant-descs NUM_RESISTANT_DESCS] NUM_DESCS To run the test suites, do:: make coverage -If you just want to run the tests, and don't care about code coverage -statistics, see the ``bridgedb trial`` and ``bridgedb test`` commands. - - ================ Running BridgeDB ================

1 0

[bridgedb/develop] Bug 40006: Parse remaining descs on validate error
by cohosh＠torproject.org 02 Mar '21

02 Mar '21

commit d0144118e07d868a45108ba82e97a1a181f7bb08 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Feb 18 17:24:37 2021 -0500 Bug 40006: Parse remaining descs on validate error If there was a faulty descriptor in the extrainfo document, Stem will throw an exception and we loose the rest of the extrainfo descriptors in the document. This passes extrainfo file objects to Stem so that if an exception is raised on a single descriptor, the rest of the file can be parsed starting at the file seek position. --- bridgedb/parse/descriptors.py | 29 ++++--- bridgedb/test/test_parse_descriptors.py | 138 +++++++++++++++++++++++--------- 2 files changed, 118 insertions(+), 49 deletions(-) diff --git a/bridgedb/parse/descriptors.py b/bridgedb/parse/descriptors.py index f6dee83..d3a3802 100644 --- a/bridgedb/parse/descriptors.py +++ b/bridgedb/parse/descriptors.py @@ -262,16 +262,25 @@ def parseExtraInfoFiles(*filenames, **kwargs): logging.info("Parsing %s descriptors in %s..." % (descriptorType, filename)) - document = parse_file(filename, descriptorType, validate=validate) - - try: - for router in document: - descriptors.append(router) - except (ValueError, ProtocolError) as error: - logging.error( - ("Stem exception while parsing extrainfo descriptor from " - "file '%s':\n%s") % (filename, str(error))) - _copyUnparseableDescriptorFile(filename) + # Make sure we open the file rather than passing in a path so that + # subsequent calls to parse_file will use the current file position + # to continue parsing the remaining descriptors after an exception + # is raised + descFile = open(filename, 'rb') + while True: + try: + document = parse_file(descFile, descriptorType, validate=validate) + + for router in document: + descriptors.append(router) + + break # Reached end of file + + except (ValueError, ProtocolError) as error: + logging.error( + ("Stem exception while parsing extrainfo descriptor from " + "file '%s':\n%s") % (filename, str(error))) + _copyUnparseableDescriptorFile(filename) routers = deduplicate(descriptors) return routers diff --git a/bridgedb/test/test_parse_descriptors.py b/bridgedb/test/test_parse_descriptors.py index eb86a0e..86b7d1f 100644 --- a/bridgedb/test/test_parse_descriptors.py +++ b/bridgedb/test/test_parse_descriptors.py @@ -280,6 +280,37 @@ EXVgdbhn8RrQiVT69evPXjdr6hmgllUofRT7LimvR60= -----END SIGNATURE----- ''' +BRIDGE_EXTRA_INFO_DESCRIPTOR_MALFORMED = b'''\ +extra-info MiserLandfalls E08B324D20AD0A13E114F027AB9AC3F32CA696A0 +published 2014-11-04 06:23:22 +write-history 2014-11-04 06:23:22 (900 s) 3188736,2226176,2866176 +read-history 2014-11-04 06:23:22 (900 s) 3891200,2483200,2698240 +dirreq-write-history 2014-11-04 06:23:22 (900 s) 1024,0,2048 +dirreq-read-history 2014-11-04 06:23:22 (900 s) 0,0,0 +geoip-db-digest 09A0E093100B279AD9CFF47A67B13A21C6E1483F +geoip6-db-digest E983833985E4BCA34CEF611B2DF51942D188E638 +dirreq-stats-end 2014-11-04 06:23:22 (86400 s) +dirreq-v3-ips +dirreq-v3-reqs +dirreq-v3-resp ok=16,not-enough-sigs=0,unavailable=0,not-found=0,not-modified=0,busy=0 +dirreq-v3-direct-dl complete=0,timeout=0,running=0 +dirreq-v3-tunneled-dl complete=12,timeout=0,running=0 +transport obfs3 [malformed$#*$*(]:4057 +transport obfs2 2.215.61.223:4058 +transport scramblesuit 2.215.61.223:4059 password=ABCDEFGHIJKLMNOPQRSTUVWXYZ234567 +transport obfs4 2.215.61.223:4060 iat-mode=0,node-id=19a448c01aa2e7d55979473b647e282459995b85,public-key=7a61b53701befdae0eeeffaecc73f14e20b537bb0f8b91ad7c2936dc63562b25 +bridge-stats-end 2014-11-04 06:23:22 (86400 s) +bridge-ips ca=8 +bridge-ip-versions v4=8,v6=0 +bridge-ip-transports <OR>=8 +router-signature +-----BEGIN SIGNATURE----- +KOXNPCoe+Q+thFA/Lz7RTja2tWp4oC6SvyIooEZibHtEDgiXuU4sELWT4bSOk3np +RVmu7QPMmNybx4LHowq3pOeNLtJzpWg8Pfo+N6tR+K4nqPwBRmpsuDhCD/tIXJlP +U36EY4UoN5ABPowhNZFeyr5A3vKiDr6j0hCOqYOhxPY= +-----END SIGNATURE----- +''' + class ParseDescriptorsTests(unittest.TestCase): """Unittests for :class:`bridgedb.parse.descriptors` module.""" @@ -469,7 +500,8 @@ class ParseDescriptorsTests(unittest.TestCase): """The return type of ``b.p.descriptors.parseExtraInfoFiles`` should be a dictionary (after deduplication). """ - descFile = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) + descFile = self.writeTestDescriptorsToFile('cached-extrainfo', + BRIDGE_EXTRA_INFO_DESCRIPTOR) routers = descriptors.parseExtraInfoFiles(descFile) self.assertIsInstance(routers, dict) @@ -477,7 +509,8 @@ class ParseDescriptorsTests(unittest.TestCase): """The return of ``b.p.descriptors.parseExtraInfoFiles`` should contain ``BridgeExtraInfoDescriptor``s. """ - descFile = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) + descFile = self.writeTestDescriptorsToFile('cached-extrainfo', + BRIDGE_EXTRA_INFO_DESCRIPTOR) routers = descriptors.parseExtraInfoFiles(descFile) bridge = list(routers.values())[0] self.assertIsInstance(bridge, RelayExtraInfoDescriptor) @@ -486,7 +519,8 @@ class ParseDescriptorsTests(unittest.TestCase): """Test for ``b.p.descriptors.parseExtraInfoFiles`` with only one bridge extrainfo file. """ - descFile = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) + descFile = self.writeTestDescriptorsToFile('cached-extrainfo', + BRIDGE_EXTRA_INFO_DESCRIPTOR) routers = descriptors.parseExtraInfoFiles(descFile) bridge = list(routers.values())[0] @@ -502,9 +536,9 @@ class ParseDescriptorsTests(unittest.TestCase): timestamps should log a ``b.p.descriptors.DescriptorWarning`` and retain only one copy of the descriptor. """ - descFileOne = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) - descFileTwo = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) - routers = descriptors.parseExtraInfoFiles(descFileOne, descFileTwo) + descFile = self.writeTestDescriptorsToFile('cached-extrainfo', + BRIDGE_EXTRA_INFO_DESCRIPTOR, BRIDGE_EXTRA_INFO_DESCRIPTOR) + routers = descriptors.parseExtraInfoFiles(descFile) self.assertEqual(len(routers), 1) @@ -513,8 +547,10 @@ class ParseDescriptorsTests(unittest.TestCase): bridge extrainfo files, and check that only the newest extrainfo descriptor is used. """ - descFileOne = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) - descFileTwo = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWER_DUPLICATE) + descFileOne = self.writeTestDescriptorsToFile('cached-extrainfo', + BRIDGE_EXTRA_INFO_DESCRIPTOR) + descFileTwo = self.writeTestDescriptorsToFile('cached-extrainfo.2', + BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWER_DUPLICATE) routers = descriptors.parseExtraInfoFiles(descFileOne, descFileTwo) # We shouldn't have duplicates: @@ -534,8 +570,10 @@ class ParseDescriptorsTests(unittest.TestCase): that we only keep the newer duplicates of descriptors, no matter what order they appeared in the files. """ - descFileOne = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWER_DUPLICATE) - descFileTwo = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) + descFileOne = self.writeTestDescriptorsToFile('cached-extrainfo', + BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWER_DUPLICATE) + descFileTwo = self.writeTestDescriptorsToFile('cached-extrainfo.2', + BRIDGE_EXTRA_INFO_DESCRIPTOR) routers = descriptors.parseExtraInfoFiles(descFileOne, descFileTwo) self.assertEqual(len(routers), 1, @@ -552,9 +590,12 @@ class ParseDescriptorsTests(unittest.TestCase): bridge extrainfo files, and check that only the newest extrainfo descriptor is used. """ - descFileOne = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWER_DUPLICATE) - descFileTwo = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) - descFileThree = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWEST_DUPLICATE) + descFileOne = self.writeTestDescriptorsToFile('cached-extrainfo', + BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWER_DUPLICATE) + descFileTwo = self.writeTestDescriptorsToFile('cached-extrainfo.2', + BRIDGE_EXTRA_INFO_DESCRIPTOR) + descFileThree = self.writeTestDescriptorsToFile('cached-extrainfo.3', + BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWEST_DUPLICATE) routers = descriptors.parseExtraInfoFiles(descFileOne, descFileTwo, descFileThree) @@ -604,7 +645,10 @@ class ParseDescriptorsTests(unittest.TestCase): newerDuplicate = BRIDGE_EXTRA_INFO_DESCRIPTOR[:].replace( fpr, newerFpr).replace( timestamp, newerTimestamp) - descFiles.append(io.BytesIO(newerDuplicate)) + descFile = self.writeTestDescriptorsToFile( + "cached-extrainfo.%s" % total, + newerDuplicate) + descFiles.append(descFile) count += 1 total += 1 else: @@ -650,7 +694,8 @@ class ParseDescriptorsTests(unittest.TestCase): """Test for ``b.p.descriptors.parseExtraInfoFiles`` with descriptor validation disabled. """ - descFileOne = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) + descFileOne = self.writeTestDescriptorsToFile('cached-extrainfo', + BRIDGE_EXTRA_INFO_DESCRIPTOR) routers = descriptors.parseExtraInfoFiles(descFileOne, validate=False) self.assertGreaterEqual(len(routers), 1) @@ -668,8 +713,10 @@ class ParseDescriptorsTests(unittest.TestCase): b"geoip-db-digest 09A0E093100B279AD9CFF47A67B13A21C6E1483F", b"geoip-db-digest FOOOOOOOOOOOOOOOOOOBAAAAAAAAAAAAAAAAAARR") - descFileOne = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWEST_DUPLICATE) - descFileTwo = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) + descFileOne = self.writeTestDescriptorsToFile('cached-extrainfo', + BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWEST_DUPLICATE) + descFileTwo = self.writeTestDescriptorsToFile('cached-extrainfo.2', + BRIDGE_EXTRA_INFO_DESCRIPTOR) # This must be a "real" file or _copyUnparseableDescriptorFile() will # raise an AttributeError saying: # '_io.BytesIO' object has no attribute 'rpartition'" @@ -712,18 +759,16 @@ class ParseDescriptorsTests(unittest.TestCase): b"MiserLandfalls E08B324D20AD0A13E114F027AB9AC3F32CA696A0", b"ImOkWithBeingParsed 2B5DA67FBA13A6449DE625673B7AE9E3AA7DF75F") - descFileOne = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) - descFileTwo = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWEST_DUPLICATE) # This must be a "real" file or _copyUnparseableDescriptorFile() will # raise an AttributeError saying: # '_io.BytesIO' object has no attribute 'rpartition'" - descFileThree = self.writeTestDescriptorsToFile( - "unparseable-descriptor.new", unparseable) - descFileFour = io.BytesIO(parseable) - routers = descriptors.parseExtraInfoFiles(descFileOne, - descFileTwo, - descFileThree, - descFileFour) + descFile = self.writeTestDescriptorsToFile( + "unparseable-descriptor.new", + BRIDGE_EXTRA_INFO_DESCRIPTOR, + BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWEST_DUPLICATE, + unparseable, parseable) + routers = descriptors.parseExtraInfoFiles(descFile) + self.assertIsInstance(routers, dict) self.assertEqual(len(routers), 2, ( "There were four extrainfo descriptors: one was a duplicate, " @@ -794,12 +839,12 @@ class ParseDescriptorsTests(unittest.TestCase): self.assertEqual(len(routers), 0) - def test_parse_descriptors_parseExtraInfoFiles_unparseable_BytesIO(self): + def test_parse_descriptors_parseExtraInfoFiles_unparseable(self): """Test parsing three extrainfo descriptors: one is a valid descriptor, one is an older duplicate, and one is unparseable (it has a bad - geoip-db-digest line). The parsing should raise an unhandled - AttributeError because _copyUnparseableDescriptorFile() tries to - manipulate the io.BytesIO object's filename, and it doesn't have one. + geoip-db-digest line). The parsing should cause + _copyUnparseableDescriptorFile() to be called and create a copy + based on the filename. """ # Give it a bad geoip-db-digest: unparseable = BRIDGE_EXTRA_INFO_DESCRIPTOR.replace( @@ -808,24 +853,39 @@ class ParseDescriptorsTests(unittest.TestCase): b"geoip-db-digest 09A0E093100B279AD9CFF47A67B13A21C6E1483F", b"geoip-db-digest FOOOOOOOOOOOOOOOOOOBAAAAAAAAAAAAAAAAAARR") - descFileOne = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR) - descFileTwo = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWEST_DUPLICATE) - descFileThree = io.BytesIO(unparseable) - self.assertRaises(AttributeError, - descriptors.parseExtraInfoFiles, - descFileOne, descFileTwo, descFileThree) + descFileOne = self.writeTestDescriptorsToFile('cached-extrainfo', + BRIDGE_EXTRA_INFO_DESCRIPTOR) + descFileTwo = self.writeTestDescriptorsToFile('cached-extrainfo.2', + BRIDGE_EXTRA_INFO_DESCRIPTOR_NEWEST_DUPLICATE) + descFileThree = self.writeTestDescriptorsToFile( + 'copy-unparseable-test', + unparseable) + + descriptors.parseExtraInfoFiles(descFileOne, descFileTwo, descFileThree) + + timestamp = datetime.datetime.now() + timestamp = timestamp.isoformat(sep=chr(0x2d)) + timestamp = timestamp.rsplit('.', 1)[0] + + path, sep, fname = descFileThree.rpartition(os.path.sep) + newfilename = "%s%s%s_%s%sunparseable" % (path, sep, timestamp, + fname, os.path.extsep) + + self.assertTrue(os.path.exists(newfilename)) def test_parse_descriptors_parseExtraInfoFiles_empty_file(self): """Test parsing an empty extrainfo descriptors file.""" - routers = descriptors.parseExtraInfoFiles(io.BytesIO(b'')) + descFile = self.writeTestDescriptorsToFile('cached-extrainfo', b'') + routers = descriptors.parseExtraInfoFiles(descFile) self.assertIsInstance(routers, dict) self.assertEqual(len(routers), 0) def test_parse_descriptors_parseExtraInfoFiles_ed25519(self): """Test parsing an extrainfo descriptor with Ed25519 keys/certificates. """ - descFileOne = io.BytesIO(BRIDGE_EXTRA_INFO_DESCRIPTOR_ED25519) - routers = descriptors.parseExtraInfoFiles(descFileOne) + descFile = self.writeTestDescriptorsToFile('cached-extrainfo', + BRIDGE_EXTRA_INFO_DESCRIPTOR_ED25519) + routers = descriptors.parseExtraInfoFiles(descFile) self.assertEqual(len(routers), 1) def test_parse_descriptors_parseExtraInfoFiles_ed25519(self):

1 0

[bridgedb/develop] Remove files created during unit tests
by cohosh＠torproject.org 02 Mar '21

02 Mar '21

commit f4f1fbb5bffbf1f49608dd67cf3e8cdcf20c4f57 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Feb 26 15:05:55 2021 -0500 Remove files created during unit tests --- bridgedb/test/test_parse_descriptors.py | 53 +++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/bridgedb/test/test_parse_descriptors.py b/bridgedb/test/test_parse_descriptors.py index 4874161..d2ae779 100644 --- a/bridgedb/test/test_parse_descriptors.py +++ b/bridgedb/test/test_parse_descriptors.py @@ -344,6 +344,22 @@ class ParseDescriptorsTests(unittest.TestCase): fh.flush() return descFilename + def removeTestDescriptorsFile(self, filename): + """Remove **filename** from current working directory. + + :param str filename: A filename. It should include the current + working directory in its path. + :rtype: bool + "returns: A bool indicating the success of the operation. + """ + if os.getcwd() not in filename: + return False + try: + os.remove(filename) + except: + return False + return True + def test_parse_descriptors_parseServerDescriptorsFile(self): """Test for ``b.p.descriptors.parseServerDescriptorsFile``.""" descFile = io.BytesIO(BRIDGE_SERVER_DESCRIPTOR) @@ -362,6 +378,7 @@ class ParseDescriptorsTests(unittest.TestCase): BRIDGE_NETWORKSTATUS_0) routers = descriptors.parseNetworkStatusFile(descFile) self.assertIsInstance(routers, list) + self.assertTrue(self.removeTestDescriptorsFile(descFile)) def test_parse_descriptors_parseNetworkStatusFile_has_RouterStatusEntryV2(self): """The items in the dict returned from @@ -375,6 +392,7 @@ class ParseDescriptorsTests(unittest.TestCase): routers = descriptors.parseNetworkStatusFile(descFile) bridge = routers[0] self.assertIsInstance(bridge, RouterStatusEntryV3) + self.assertTrue(self.removeTestDescriptorsFile(descFile)) def test_parse_descriptors_parseNetworkStatusFile_one_file(self): """Test ``b.p.descriptors.parseNetworkStatusFile`` with one bridge @@ -388,6 +406,7 @@ class ParseDescriptorsTests(unittest.TestCase): bridge = routers[0] self.assertEqual(bridge.address, self.expectedIPBridge0) self.assertEqual(bridge.fingerprint, self.expectedFprBridge0) + self.assertTrue(self.removeTestDescriptorsFile(descFile)) def test_parse_descriptors_parseNetworkStatusFile_two_files(self): """Test ``b.p.descriptors.parseNetworkStatusFile`` with two bridge @@ -405,6 +424,7 @@ class ParseDescriptorsTests(unittest.TestCase): self.assertIn(bridge.address, expectedIPs) self.assertEqual(bridge.fingerprint, self.expectedFprBridge0) + self.assertTrue(self.removeTestDescriptorsFile(descFile)) def test_parse_descriptors_parseNetworkStatusFile_bad_nickname(self): """``b.p.descriptors.parseNetworkStatusFile`` with a bridge @@ -421,6 +441,7 @@ class ParseDescriptorsTests(unittest.TestCase): self.assertRaises(descriptors.InvalidRouterNickname, descriptors.parseNetworkStatusFile, descFile) + self.assertTrue(self.removeTestDescriptorsFile(descFile)) def test_parse_descriptors_parseNetworkStatusFile_HSDir_flag(self): """A Bridge networkstatus descriptor with the HSDir flag should be @@ -445,6 +466,7 @@ class ParseDescriptorsTests(unittest.TestCase): ("Expected to parse the %r flag from a bridge " "networkstatus document, but the flag was not " "found!")) + self.assertTrue(self.removeTestDescriptorsFile(descFile)) def test_parse_descriptors_parseNetworkStatusFile_IPv6_ORAddress(self): """A Bridge can't have its primary ORAddress be IPv6 without raising @@ -457,6 +479,7 @@ class ParseDescriptorsTests(unittest.TestCase): self.assertRaises(ValueError, descriptors.parseNetworkStatusFile, descFile) + self.assertTrue(self.removeTestDescriptorsFile(descFile)) def test_parse_descriptors_parseNetworkStatusFile_with_annotations(self): """Test ``b.p.descriptors.parseNetworkStatusFile`` with some document @@ -504,6 +527,7 @@ class ParseDescriptorsTests(unittest.TestCase): BRIDGE_EXTRA_INFO_DESCRIPTOR) routers = descriptors.parseExtraInfoFiles(descFile) self.assertIsInstance(routers, dict) + self.assertTrue(self.removeTestDescriptorsFile(descFile)) def test_parse_descriptors_parseExtraInfoFiles_has_BridgeExtraInfoDescriptor(self): """The return of ``b.p.descriptors.parseExtraInfoFiles`` should @@ -514,6 +538,7 @@ class ParseDescriptorsTests(unittest.TestCase): routers = descriptors.parseExtraInfoFiles(descFile) bridge = list(routers.values())[0] self.assertIsInstance(bridge, RelayExtraInfoDescriptor) + self.assertTrue(self.removeTestDescriptorsFile(descFile)) def test_parse_descriptors_parseExtraInfoFiles_one_file(self): """Test for ``b.p.descriptors.parseExtraInfoFiles`` with only one @@ -530,6 +555,7 @@ class ParseDescriptorsTests(unittest.TestCase): BRIDGE_EXTRA_INFO_DESCRIPTOR.count(b'transport ')) self.assertEqual(bridge.fingerprint, self.expectedFprBridge0) + self.assertTrue(self.removeTestDescriptorsFile(descFile)) def test_parse_descriptors_deduplicate_identical_timestamps(self): """Parsing two descriptors for the same bridge with identical @@ -541,6 +567,7 @@ class ParseDescriptorsTests(unittest.TestCase): routers = descriptors.parseExtraInfoFiles(descFile) self.assertEqual(len(routers), 1) + self.assertTrue(self.removeTestDescriptorsFile(descFile)) def test_parse_descriptors_parseExtraInfoFiles_two_files(self): """Test for ``b.p.descriptors.parseExtraInfoFiles`` with two @@ -563,6 +590,8 @@ class ParseDescriptorsTests(unittest.TestCase): bridge.published, datetime.datetime.strptime("2014-11-04 08:10:25", "%Y-%m-%d %H:%M:%S"), "We should have the newest available descriptor for this router.") + self.assertTrue(self.removeTestDescriptorsFile(descFileOne)) + self.assertTrue(self.removeTestDescriptorsFile(descFileTwo)) def test_parse_descriptors_parseExtraInfoFiles_two_files_reverse(self): """Test for ``b.p.descriptors.parseExtraInfoFiles`` with two bridge @@ -584,6 +613,8 @@ class ParseDescriptorsTests(unittest.TestCase): bridge.published, datetime.datetime.strptime("2014-11-04 08:10:25", "%Y-%m-%d %H:%M:%S"), "We should have the newest available descriptor for this router.") + self.assertTrue(self.removeTestDescriptorsFile(descFileOne)) + self.assertTrue(self.removeTestDescriptorsFile(descFileTwo)) def test_parse_descriptors_parseExtraInfoFiles_three_files(self): """Test for ``b.p.descriptors.parseExtraInfoFiles`` with three @@ -610,6 +641,9 @@ class ParseDescriptorsTests(unittest.TestCase): bridge.published, datetime.datetime.strptime("2014-12-04 03:10:25", "%Y-%m-%d %H:%M:%S"), "We should have the newest available descriptor for this router.") + self.assertTrue(self.removeTestDescriptorsFile(descFileOne)) + self.assertTrue(self.removeTestDescriptorsFile(descFileTwo)) + self.assertTrue(self.removeTestDescriptorsFile(descFileThree)) def createDuplicatesForBenchmark(self, b=1, n=1200): """Create a bunch of duplicate extrainfos for benchmark tests. @@ -666,6 +700,8 @@ class ParseDescriptorsTests(unittest.TestCase): with Benchmarker(): routers = descriptors.parseExtraInfoFiles(*descFiles) + for descFile in descFiles: + self.assertTrue(self.removeTestDescriptorsFile(descFile)) def test_parse_descriptors_parseExtraInfoFiles_benchmark_1000_bridges(self): """Benchmark test for ``b.p.descriptors.parseExtraInfoFiles``.""" raise SkipTest(("This test can take several minutes to complete. " @@ -676,6 +712,8 @@ class ParseDescriptorsTests(unittest.TestCase): descFiles = self.createDuplicatesForBenchmark(b=1000, n=i) with Benchmarker(): routers = descriptors.parseExtraInfoFiles(*descFiles) + for descFile in descFiles: + self.assertTrue(self.removeTestDescriptorsFile(descFile)) def test_parse_descriptors_parseExtraInfoFiles_benchmark_10000_bridges(self): """Benchmark test for ``b.p.descriptors.parseExtraInfoFiles``. @@ -689,6 +727,8 @@ class ParseDescriptorsTests(unittest.TestCase): descFiles = self.createDuplicatesForBenchmark(b=10000, n=i) with Benchmarker(): routers = descriptors.parseExtraInfoFiles(*descFiles) + for descFile in descFiles: + self.assertTrue(self.removeTestDescriptorsFile(descFile)) def test_parse_descriptors_parseExtraInfoFiles_unparseable(self): """Test parsing three extrainfo descriptors: one is a valid descriptor, @@ -731,6 +771,9 @@ class ParseDescriptorsTests(unittest.TestCase): bridge.published, datetime.datetime.strptime("2014-12-04 03:10:25", "%Y-%m-%d %H:%M:%S"), "We should have the newest available descriptor for this router.") + self.assertTrue(self.removeTestDescriptorsFile(descFileOne)) + self.assertTrue(self.removeTestDescriptorsFile(descFileTwo)) + self.assertTrue(self.removeTestDescriptorsFile(descFileThree)) def test_parse_descriptors_parseExtraInfoFiles_invalid(self): """Test parsing three extrainfo descriptors: one is a valid descriptor, @@ -758,6 +801,7 @@ class ParseDescriptorsTests(unittest.TestCase): "E08B324D20AD0A13E114F027AB9AC3F32CA696A0", ("It looks like the (supposedly) unparseable bridge was returned " "instead of the valid one!")) + self.assertTrue(self.removeTestDescriptorsFile(descFile)) def test_parse_descriptors_parseExtraInfoFiles_unparseable_and_parseable(self): """Test parsing four extrainfo descriptors: two are valid descriptors, @@ -806,6 +850,7 @@ class ParseDescriptorsTests(unittest.TestCase): self.assertIn("2B5DA67FBA13A6449DE625673B7AE9E3AA7DF75F", routers.keys(), "The 'parseable' descriptor wasn't returned by the parser.") + self.assertTrue(self.removeTestDescriptorsFile(descFile)) def test_parse_descriptors_parseExtraInfoFiles_unparseable(self): """Test parsing three extrainfo descriptors: one is a valid descriptor, @@ -849,12 +894,18 @@ class ParseDescriptorsTests(unittest.TestCase): # The timestamp should be roughly this minute (+/- 2): self.assertApproximates(timestamp.now().minute, timestamp.minute, 2) + self.assertTrue(self.removeTestDescriptorsFile(descFileOne)) + self.assertTrue(self.removeTestDescriptorsFile(descFileTwo)) + self.assertTrue(self.removeTestDescriptorsFile(descFileThree)) + self.assertTrue(self.removeTestDescriptorsFile(os.path.abspath(newFile))) + def test_parse_descriptors_parseExtraInfoFiles_empty_file(self): """Test parsing an empty extrainfo descriptors file.""" descFile = self.writeTestDescriptorsToFile('cached-extrainfo', b'') routers = descriptors.parseExtraInfoFiles(descFile) self.assertIsInstance(routers, dict) self.assertEqual(len(routers), 0) + self.assertTrue(self.removeTestDescriptorsFile(descFile)) def test_parse_descriptors_parseExtraInfoFiles_ed25519(self): """Test parsing an extrainfo descriptor with Ed25519 keys/certificates. @@ -863,6 +914,7 @@ class ParseDescriptorsTests(unittest.TestCase): BRIDGE_EXTRA_INFO_DESCRIPTOR_ED25519) routers = descriptors.parseExtraInfoFiles(descFile) self.assertEqual(len(routers), 1) + self.assertTrue(self.removeTestDescriptorsFile(descFile)) def test_parse_descriptors_parseExtraInfoFiles_ed25519(self): """Test parsing an extrainfo descriptor with Ed25519 keys/certificates. @@ -913,3 +965,4 @@ class ParseDescriptorsTests(unittest.TestCase): # The timestamp should be roughly this hour (+/- 1): self.assertApproximates(timestamp.now().hour, timestamp.hour, 1) + self.assertTrue(self.removeTestDescriptorsFile(os.path.abspath(newFile)))

1 0

[community/master] replace \ with \ U to prevent escaping errors
by emmapeel＠torproject.org 02 Mar '21

02 Mar '21

commit 7e6ce5302f1b6b451397a31b6bdcf174d2f412be Author: emma peel <emma.peel(a)riseup.net> Date: Tue Mar 2 15:51:20 2021 +0100 replace \ with \U to prevent escaping errors --- .../technical-setup/bridge/windows/contents.lr | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/windows/contents.lr b/content/relay-operations/technical-setup/bridge/windows/contents.lr index 7bf3ddc..5ce0b6c 100644 --- a/content/relay-operations/technical-setup/bridge/windows/contents.lr +++ b/content/relay-operations/technical-setup/bridge/windows/contents.lr @@ -22,24 +22,24 @@ You will need to show hidden items and file name extensions. In your Explorer wi ### 2. Build files and relocate -Open up the Tor folder on your desktop. Double click `tor.exe`. Once the command prompt reads: `[notice] Bootstrapped 100% (done): Done`, close the window. This creates the folder `C:\Users\<user>\AppData\Roaming\tor\` (where `<user>` is your user name). +Open up the Tor folder on your desktop. Double click `tor.exe`. Once the command prompt reads: `[notice] Bootstrapped 100% (done): Done`, close the window. This creates the folder `C:\Users\<user>\AppData\Roaming\tor\` (where `<user>` is your user name). -From the Tor folder on your desktop, select all `.dll`'s and `.exe`'s and cut/paste them into the `C:\Users\<user>\AppData\Roaming\tor\` folder. +From the Tor folder on your desktop, select all `.dll`'s and `.exe`'s and cut/paste them into the `C:\Users\<user>\AppData\Roaming\tor\` folder. -Open up the Data folder on your desktop. Inside that Tor folder, select both `geoip` and `geoip6` and cut/paste them into the `C:\Users\<user>\AppData\Roaming\tor\` folder. +Open up the Data folder on your desktop. Inside that Tor folder, select both `geoip` and `geoip6` and cut/paste them into the `C:\Users\<user>\AppData\Roaming\tor\` folder. -Navigate to `C:\Users\<user>\Desktop\Tor Browser\Browser\TorBrowser\Tor\PluggableTransports`. Select `obfs4proxy.exe` and cut/paste it into the `C:\Users\<user>\AppData\Roaming\tor\` folder. +Navigate to `C:\Users\<user>\Desktop\Tor Browser\Browser\TorBrowser\Tor\PluggableTransports`. Select `obfs4proxy.exe` and cut/paste it into the `C:\Users\<user>\AppData\Roaming\tor\` folder. ### 3. Create and edit your Tor config file -In the `C:\Users\<user>\AppData\Roaming\tor\` folder, right-click on white space and select `New > Text Document`. Name the file `torrc`; there is no extension. +In the `C:\Users\<user>\AppData\Roaming\tor\` folder, right-click on white space and select `New > Text Document`. Name the file `torrc`; there is no extension. Double-click on the `torrc` file. When prompted *How do you want to open this file?*, select `Notepad`. Add the following: ``` -Log notice file C:\Users\<user>\AppData\Roaming\tor\notice.log -GeoIPFile C:\Users\<user>\AppData\Roaming\tor\geoip -GeoIPv6File C:\Users\<user>\AppData\Roaming\tor\geoip6 +Log notice file C:\Users\<user>\AppData\Roaming\tor\notice.log +GeoIPFile C:\Users\<user>\AppData\Roaming\tor\geoip +GeoIPv6File C:\Users\<user>\AppData\Roaming\tor\geoip6 BridgeRelay 1 @@ -48,7 +48,7 @@ BridgeRelay 1 # Avoid port 9001 because it's commonly associated with Tor and censors may be scanning the Internet for this port. ORPort TODO1 -ServerTransportPlugin obfs4 exec C:\Users\<user>\AppData\Roaming\tor\obfs4proxy.exe +ServerTransportPlugin obfs4 exec C:\Users\<user>\AppData\Roaming\tor\obfs4proxy.exe # Replace "TODO2" with an obfs4 port of your choice. # This port must be externally reachable and must be different from the one specified for ORPort. @@ -77,11 +77,11 @@ Don't forget to change the `ORPort`, `ServerTransportListenAddr`, `ContactInfo`, ### 4. Start tor -Open up the Command Prompt App. Change your directory with: `cd C:\Users\<user>\AppData\Roaming\tor\`. Type: `tor.exe -f torrc`. +Open up the Command Prompt App. Change your directory with: `cd C:\Users\<user>\AppData\Roaming\tor\`. Type: `tor.exe -f torrc`. ### 5. Monitor your logs -To confirm your bridge is running with no issues, you should see something like this in `C:\Users\<user>\AppData\Roaming\tor\notice.log`. +To confirm your bridge is running with no issues, you should see something like this in `C:\Users\<user>\AppData\Roaming\tor\notice.log`. ``` [notice] Your Tor server's identity key fingerprint is '<NICKNAME> <FINGERPRINT>'

1 0

[tor/master] Add geoip-db-tool/Cargo.lock to version control, as is the custom.
by nickm＠torproject.org 02 Mar '21

02 Mar '21

commit a1ce89a5543ce1d7e4afb49290761324b21540e8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 2 08:52:25 2021 -0500 Add geoip-db-tool/Cargo.lock to version control, as is the custom. --- scripts/maint/geoip/geoip-db-tool/Cargo.lock | 110 +++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/scripts/maint/geoip/geoip-db-tool/Cargo.lock b/scripts/maint/geoip/geoip-db-tool/Cargo.lock new file mode 100644 index 0000000000..ba610d4fc3 --- /dev/null +++ b/scripts/maint/geoip/geoip-db-tool/Cargo.lock @@ -0,0 +1,110 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "argh" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91792f088f87cdc7a2cfb1d617fa5ea18d7f1dc22ef0e1b5f82f3157cdc522be" +dependencies = [ + "argh_derive", + "argh_shared", +] + +[[package]] +name = "argh_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4eb0c0c120ad477412dc95a4ce31e38f2113e46bd13511253f79196ca68b067" +dependencies = [ + "argh_shared", + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "argh_shared" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "781f336cc9826dbaddb9754cb5db61e64cab4f69668bd19dcc4a0394a86f4cb1" + +[[package]] +name = "geoip-db-tool" +version = "0.1.0" +dependencies = [ + "argh", + "ipnetwork", + "rangemap", +] + +[[package]] +name = "heck" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "ipnetwork" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02c3eaab3ac0ede60ffa41add21970a7df7d91772c03383aac6c2c3d53cc716b" +dependencies = [ + "serde", +] + +[[package]] +name = "proc-macro2" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "quote" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rangemap" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90531bef860f96441c4cb74a1e43c281cd1366143928f944546ef0b1c60392b0" + +[[package]] +name = "serde" +version = "1.0.123" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" + +[[package]] +name = "syn" +version = "1.0.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "unicode-segmentation" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" + +[[package]] +name = "unicode-xid" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"

1 0

[sbws/master] fix: scanner: Return from measure if no helper
by juga＠torproject.org 02 Mar '21

02 Mar '21

commit 9d7ee9785a6363e125ce1b0aa26e22fbe191dc7e Author: juga0 <juga(a)riseup.net> Date: Sat Feb 27 11:00:02 2021 +0000 fix: scanner: Return from measure if no helper After refactoring in #40041, it was forgotten to return the error in the case a helper was not found, what can happen in test networks. Closes #40065. --- sbws/core/scanner.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py index 5fd917a..f9ab1ce 100644 --- a/sbws/core/scanner.py +++ b/sbws/core/scanner.py @@ -346,11 +346,15 @@ def measure_relay(args, conf, destinations, cb, rl, relay): # Instead of ensuring that the relay can exit to all IPs, try first with # the relay as an exit, if it can exit to some IPs. if relay.is_exit_not_bad_allowing_port(dest.port): - circ_fps, nicknames, exit_policy = \ - create_path_relay(relay, dest, rl, cb, relay_as_entry=False) + r = create_path_relay(relay, dest, rl, cb, relay_as_entry=False) else: - circ_fps, nicknames, exit_policy = \ - create_path_relay(relay, dest, rl, cb) + r = create_path_relay(relay, dest, rl, cb) + # When `error_no_helper` is triggered because a helper is not found, what + # can happen in test networks with very few relays, it returns a list with + # the error. + if len(r) == 1: + return r + circ_fps, nicknames, exit_policy = r # Build the circuit circ_id, reason = cb.build_circuit(circ_fps) @@ -378,8 +382,10 @@ def measure_relay(args, conf, destinations, cb, rl, relay): " to connect to %s via circuit %s (%s). Reason: %s. Trying again " "with it as entry.", relay.fingerprint, relay.nickname, exit_policy, dest.url, circ_fps, nicknames, usable_data) - circ_fps, nicknames, exit_policy = \ - create_path_relay(relay, dest, rl, cb) + r = create_path_relay(relay, dest, rl, cb) + if len(r) == 1: + return r + circ_fps, nicknames, exit_policy = r circ_id, reason = cb.build_circuit(circ_fps) if not circ_id: log.warning(

1 0

[sbws/master] Merge remote-tracking branch 'gitlab/merge-requests/70' into maint-1.1
by juga＠torproject.org 02 Mar '21

02 Mar '21

commit c6b7fd680781d002a3a2d56bca984b8e4e6f2ab3 Merge: 79d7007 9d7ee97 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 2 09:16:34 2021 +0000 Merge remote-tracking branch 'gitlab/merge-requests/70' into maint-1.1 sbws/core/scanner.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)

1 0

[sbws/master] Revert "fix: stem: Remove torrc option that is the default"
by juga＠torproject.org 02 Mar '21

02 Mar '21

commit 79d700700be2709621f8b3cd3aefcd6409822831 Author: juga0 <juga(a)riseup.net> Date: Mon Mar 1 09:04:27 2021 +0000 Revert "fix: stem: Remove torrc option that is the default" This reverts commit 15da07d6a447d8310354124f6020b4cf74b75488. Because it's not the default. No additional changes are needed in the tests. Closes #40064. --- docs/source/config_tor.rst | 1 + sbws/globals.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/docs/source/config_tor.rst b/docs/source/config_tor.rst index b204ca2..e609468 100644 --- a/docs/source/config_tor.rst +++ b/docs/source/config_tor.rst @@ -9,6 +9,7 @@ connection to an existing Tor daemon. Default configuration: +- ``SocksPort auto``: To proxy requests over Tor. - ``CookieAuthentication 1``: The easiest way to authenticate to Tor. - ``UseEntryGuards 0``: To avoid path bias warnings. - ``UseMicrodescriptors 0``: Because full server descriptors are needed. diff --git a/sbws/globals.py b/sbws/globals.py index f5b3ec6..fa16096 100644 --- a/sbws/globals.py +++ b/sbws/globals.py @@ -22,6 +22,9 @@ SPEC_VERSION = '1.5.0' # Options that are known at runtime (from configuration file) are added # in utils/stem.py launch_tor TORRC_STARTING_POINT = { + # We will find out via the ControlPort and not setting something static + # means a lower chance of conflict + 'SocksPort': 'auto', # Easier than password authentication 'CookieAuthentication': '1', # To avoid path bias warnings

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2021