tor-commits July 2013

tor-commits@lists.torproject.org

19 participants
1044 discussions

[stem/master] Moving retry functionality to Query class
by atagar＠torproject.org 22 Jul '13

22 Jul '13

commit 7d04653d908f0c62e197bafa27a5cd94634cbb53 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jul 15 09:16:54 2013 -0700 Moving retry functionality to Query class It's far better if the Query class handles retries rather than the DescriptorDownloader. Advantages include... * The DescriptorDownloader no longer has a reason to support blocking queries. There's no advantage to them since the Query knows if/when the request fails (and hence can retry it on our behalf). * The Query class is easier to test. The more functionality we can push down into it the simpler the DescriptorDownloader will be. * More advanced use cases will be using Query instances rather than DescriptorDownloader. By having retry functionality there it'll be easily available to them. --- stem/descriptor/remote.py | 88 ++++++++++++++++++++++----------------- test/integ/descriptor/remote.py | 5 +-- test/unit/descriptor/remote.py | 17 ++++---- 3 files changed, 59 insertions(+), 51 deletions(-) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 464e7cd..88e3258 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -48,6 +48,8 @@ import urllib2 import stem.descriptor +from stem.util import log + # Tor directory authorities as of commit f631b73 (7/4/13). This should only # include authorities with 'v3ident': # @@ -72,27 +74,34 @@ class Query(object): mirror. The caller can block on the response by either calling :func:~stem.descriptor.remote.run: or iterating over our descriptor content. - :var str address: address of the authority or mirror we're querying - :var int port: directory port we're querying :var str resource: resource being fetched, such as '/tor/status-vote/current/consensus.z' + :var str descriptor_type: type of descriptors being fetched, see + :func:`~stem.descriptor.__init__.parse_file` + + :var list endpoints: (address, dirport) tuples of the authority or mirror + we're querying, this uses authorities if undefined + :var int retries: number of times to attempt the request if it fails + :var bool fall_back_to_authority: when retrying request issues the last + request to a directory authority if **True** :var Exception error: exception if a problem occured :var bool is_done: flag that indicates if our request has finished - :var str descriptor_type: type of descriptors being fetched, see :func:`~stem.descriptor.__init__.parse_file` :var float start_time: unix timestamp when we first started running :var float timeout: duration before we'll time out our request :var float runtime: time our query took, this is **None** if it's not yet finished """ - def __init__(self, address, port, resource, descriptor_type, timeout = None, start = True): - self.address = address - self.port = port + def __init__(self, resource, descriptor_type, endpoints = None, retries = 2, fall_back_to_authority = True, timeout = None, start = True): self.resource = resource + self.descriptor_type = descriptor_type + + self.endpoints = endpoints if endpoints else [] + self.retries = retries + self.fall_back_to_authority = fall_back_to_authority self.error = None self.is_done = False - self.descriptor_type = descriptor_type self.start_time = None self.timeout = timeout @@ -106,14 +115,23 @@ class Query(object): if start: self.start() - def get_url(self): + def pick_url(self, use_authority = False): """ - Provides the url being queried. + Provides a url that can be queried. If we have multiple endpoints then one + will be picked randomly. + + :param bool use_authority: ignores our endpoints and uses a directory + authority instead :returns: **str** for the url being queried by this request """ - return "http://%s:%i/%s" % (self.address, self.port, self.resource.lstrip('/')) + if use_authority or not self.endpoints: + address, dirport = random.choice(DIRECTORY_AUTHORITIES.values()) + else: + address, dirport = random.choice(self.endpoints) + + return "http://%s:%i/%s" % (address, dirport, self.resource.lstrip('/')) def start(self): """ @@ -122,7 +140,7 @@ class Query(object): with self._downloader_thread_lock: if self._downloader_thread is None: - self._downloader_thread = threading.Thread(target = self._download_descriptors, name="Descriptor Query") + self._downloader_thread = threading.Thread(target = self._download_descriptors, name="Descriptor Query", args = (self.retries,)) self._downloader_thread.setDaemon(True) self._downloader_thread.start() @@ -174,10 +192,13 @@ class Query(object): for desc in self.run(True): yield desc - def _download_descriptors(self): + def _download_descriptors(self, retries): try: + use_authority = retries == 0 and self.fall_back_to_authority + resource_url = self.pick_url(use_authority) + self.start_time = time.time() - response = urllib2.urlopen(self.get_url(), timeout = self.timeout) + response = urllib2.urlopen(resource_url, timeout = self.timeout) self.runtime = time.time() - self.start_time # This sucks. We need to read the full response into memory before @@ -188,8 +209,16 @@ class Query(object): response = io.BytesIO(response.read().strip()) self._results = stem.descriptor.parse_file(response, self.descriptor_type) + log.trace("Descriptors retrieved from '%s' in %0.2fs" % (resource_url, self.runtime)) except: - self.error = sys.exc_info()[1] + exc = sys.exc_info()[1] + + if retries > 0: + log.debug("Unable to download descriptors from '%s' (%i retries remaining): %s" % (resource_url, retries, exc)) + return self._download_descriptors(retries - 1) + else: + log.debug("Unable to download descriptors from '%s': %s" % (resource_url, exc)) + self.error = exc finally: self.is_done = True @@ -200,15 +229,9 @@ class DescriptorDownloader(object): caching, retries, and other capabilities to make downloading descriptors easy and efficient. - Queries can be made in either a blocking or non-blocking fashion. If - non-blocking then retries cannot be performed (since we do not know at the - time of the request if it succeeded or failed). - For more advanced use cases you can use the :class:`~stem.descriptor.remote.Query` class directly. - :var bool block: blocks until requests have been concluded if **True**, - otherwise provides the query as soon as its been issued :var int retries: number of times to attempt the request if it fails :var float timeout: duration before we'll time out our request, no timeout is applied if **None** @@ -219,37 +242,24 @@ class DescriptorDownloader(object): request to a directory authority if **True** """ - def __init__(self, block = True, retries = 2, timeout = None, start_when_requested = True, fall_back_to_authority = True): - self.block = block + def __init__(self, retries = 2, timeout = None, start_when_requested = True, fall_back_to_authority = True): self.retries = retries self.timeout = timeout self.start_when_requested = start_when_requested self.fall_back_to_authority = fall_back_to_authority - self._directories = DIRECTORY_AUTHORITIES.values() + self._endpoints = DIRECTORY_AUTHORITIES.values() def _query(self, resource, descriptor_type, retries): """ Issues a request for the given resource. """ - if self.fall_back_to_authority and retries == 0: - address, dirport = random.choice(DIRECTORY_AUTHORITIES.values()) - else: - address, dirport = random.choice(self._directories) - - query = Query( - address, - dirport, + return Query( resource, descriptor_type, + endpoints = self._endpoints, + retries = self.retries, + fall_back_to_authority = self.fall_back_to_authority, timeout = self.timeout, start = self.start_when_requested, ) - - if self.block: - query.run(True) - - if query.error and retries > 0: - return self.query(resource, descriptor_type, retries - 1) - - return query diff --git a/test/integ/descriptor/remote.py b/test/integ/descriptor/remote.py index 50d6d28..8509556 100644 --- a/test/integ/descriptor/remote.py +++ b/test/integ/descriptor/remote.py @@ -29,11 +29,10 @@ class TestDescriptorReader(unittest.TestCase): for authority, (address, dirport) in stem.descriptor.remote.DIRECTORY_AUTHORITIES.items(): queries.append(stem.descriptor.remote.Query( - address, - dirport, '/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020CE31', 'server-descriptor 1.0', - 30, + endpoints = [(address, dirport)], + timeout = 30, )) for query in queries: diff --git a/test/unit/descriptor/remote.py b/test/unit/descriptor/remote.py index ab2276e..3aadaac 100644 --- a/test/unit/descriptor/remote.py +++ b/test/unit/descriptor/remote.py @@ -65,14 +65,13 @@ class TestDescriptorDownloader(unittest.TestCase): urlopen_mock.return_value = io.BytesIO(TEST_DESCRIPTOR) query = stem.descriptor.remote.Query( - '128.31.0.39', - 9131, '/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020CE31', 'server-descriptor 1.0', + endpoints = [('128.31.0.39', 9131)], ) expeced_url = 'http://128.31.0.39:9131/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020C…' - self.assertEqual(expeced_url, query.get_url()) + self.assertEqual(expeced_url, query.pick_url()) descriptors = list(query) self.assertEqual(1, len(descriptors)) @@ -95,10 +94,9 @@ class TestDescriptorDownloader(unittest.TestCase): urlopen_mock.return_value = io.BytesIO(descriptor_content) query = stem.descriptor.remote.Query( - '128.31.0.39', - 9131, '/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020CE31', 'server-descriptor 1.0', + endpoints = [('128.31.0.39', 9131)], ) # checking via the iterator @@ -119,15 +117,16 @@ class TestDescriptorDownloader(unittest.TestCase): urlopen_mock.side_effect = socket.timeout('connection timed out') query = stem.descriptor.remote.Query( - '128.31.0.39', - 9131, '/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020CE31', 'server-descriptor 1.0', - 5, + endpoints = [('128.31.0.39', 9131)], + fall_back_to_authority = False, + timeout = 5, ) self.assertRaises(socket.timeout, list, query.run()) - urlopen_mock.assert_called_once_with( + urlopen_mock.assert_called_with( 'http://128.31.0.39:9131/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020C…', timeout = 5, ) + self.assertEqual(3, urlopen_mock.call_count)

1 0

[stem/master] Performing integ test queries in parallel
by atagar＠torproject.org 22 Jul '13

22 Jul '13

commit d87f35c7c0f99d52a530cdf12d03ef6abd9cadb0 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 14 14:06:12 2013 -0700 Performing integ test queries in parallel What good is designing an asynchronous descriptor fetching API if you poll things serially? Trivial tweak to reduce this test's runtime from 2.4s to 0.4s. --- test/integ/descriptor/remote.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/integ/descriptor/remote.py b/test/integ/descriptor/remote.py index 7ac6757..50d6d28 100644 --- a/test/integ/descriptor/remote.py +++ b/test/integ/descriptor/remote.py @@ -25,15 +25,18 @@ class TestDescriptorReader(unittest.TestCase): if test.runner.require_online(self): return + queries = [] + for authority, (address, dirport) in stem.descriptor.remote.DIRECTORY_AUTHORITIES.items(): - query = stem.descriptor.remote.Query( + queries.append(stem.descriptor.remote.Query( address, dirport, '/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020CE31', 'server-descriptor 1.0', 30, - ) + )) + for query in queries: try: descriptors = list(query.run()) except Exception, exc:

1 0

[stem/master] Implementing get_server_descriptors() method
by atagar＠torproject.org 22 Jul '13

22 Jul '13

commit ac694d3a98ce1e56c674893f8006efe785eb41c9 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 16 09:16:06 2013 -0700 Implementing get_server_descriptors() method Implementing our first downloader method and added an ONLINE integ test. Initially I did a get_microdescriptors() method but turns out that tor didn't implement what we need... https://trac.torproject.org/9271 --- stem/descriptor/remote.py | 47 +++++++++++++++++++++++++++++++-------- test/integ/descriptor/remote.py | 30 +++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 9 deletions(-) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 88e3258..a4b21d4 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -80,16 +80,20 @@ class Query(object): :var list endpoints: (address, dirport) tuples of the authority or mirror we're querying, this uses authorities if undefined - :var int retries: number of times to attempt the request if it fails + :var int retries: number of times to attempt the request if downloading it + fails :var bool fall_back_to_authority: when retrying request issues the last request to a directory authority if **True** :var Exception error: exception if a problem occured :var bool is_done: flag that indicates if our request has finished + :var str download_url: last url used to download the descriptor, this is + unset until we've actually made a download attempt :var float start_time: unix timestamp when we first started running :var float timeout: duration before we'll time out our request - :var float runtime: time our query took, this is **None** if it's not yet finished + :var float runtime: time our query took, this is **None** if it's not yet + finished """ def __init__(self, resource, descriptor_type, endpoints = None, retries = 2, fall_back_to_authority = True, timeout = None, start = True): @@ -102,6 +106,7 @@ class Query(object): self.error = None self.is_done = False + self.download_url = None self.start_time = None self.timeout = timeout @@ -183,6 +188,8 @@ class Query(object): for desc in self._results: yield desc except ValueError as exc: + # encountered a parsing error + self.error = exc if not suppress: @@ -195,10 +202,10 @@ class Query(object): def _download_descriptors(self, retries): try: use_authority = retries == 0 and self.fall_back_to_authority - resource_url = self.pick_url(use_authority) + self.download_url = self.pick_url(use_authority) self.start_time = time.time() - response = urllib2.urlopen(resource_url, timeout = self.timeout) + response = urllib2.urlopen(self.download_url, timeout = self.timeout) self.runtime = time.time() - self.start_time # This sucks. We need to read the full response into memory before @@ -209,15 +216,15 @@ class Query(object): response = io.BytesIO(response.read().strip()) self._results = stem.descriptor.parse_file(response, self.descriptor_type) - log.trace("Descriptors retrieved from '%s' in %0.2fs" % (resource_url, self.runtime)) + log.trace("Descriptors retrieved from '%s' in %0.2fs" % (self.download_url, self.runtime)) except: exc = sys.exc_info()[1] if retries > 0: - log.debug("Unable to download descriptors from '%s' (%i retries remaining): %s" % (resource_url, retries, exc)) + log.debug("Unable to download descriptors from '%s' (%i retries remaining): %s" % (self.download_url, retries, exc)) return self._download_descriptors(retries - 1) else: - log.debug("Unable to download descriptors from '%s': %s" % (resource_url, exc)) + log.debug("Unable to download descriptors from '%s': %s" % (self.download_url, exc)) self.error = exc finally: self.is_done = True @@ -242,14 +249,36 @@ class DescriptorDownloader(object): request to a directory authority if **True** """ - def __init__(self, retries = 2, timeout = None, start_when_requested = True, fall_back_to_authority = True): + def __init__(self, retries = 2, fall_back_to_authority = True, timeout = None, start_when_requested = True): self.retries = retries self.timeout = timeout self.start_when_requested = start_when_requested self.fall_back_to_authority = fall_back_to_authority self._endpoints = DIRECTORY_AUTHORITIES.values() - def _query(self, resource, descriptor_type, retries): + def get_server_descriptors(self, fingerprints = None): + """ + Provides the server descriptors with the given fingerprints. If no + fingerprints are provided then this returns all descriptors in the present + consensus. + + :param str,list fingerprints: fingerprint or list of fingerprints to be + retrieved, gets all descriptors if **None** + + :returns: :class:`~stem.descriptor.remote.Query` for the server descriptors + """ + + resource = '/tor/server/all' + + if fingerprints: + if isinstance(fingerprints, str): + resource = '/tor/server/fp/%s' % fingerprints + else: + resource = '/tor/server/fp/%s' % '+'.join(fingerprints) + + return self._query(resource, 'server-descriptor 1.0') + + def _query(self, resource, descriptor_type): """ Issues a request for the given resource. """ diff --git a/test/integ/descriptor/remote.py b/test/integ/descriptor/remote.py index 8509556..6e1f426 100644 --- a/test/integ/descriptor/remote.py +++ b/test/integ/descriptor/remote.py @@ -44,3 +44,33 @@ class TestDescriptorReader(unittest.TestCase): self.assertEqual(1, len(descriptors)) self.assertEqual('moria1', descriptors[0].nickname) + def test_get_server_descriptors(self): + """ + Exercises the downloader's get_server_descriptors() method. + """ + + downloader = stem.descriptor.remote.DescriptorDownloader() + + # Fetch a single descriptor and a batch. I'd love to also exercise + # retrieving all descriptors, but that adds roughly a minute to the runtime + # of this test and adds an appreciable load to directory authorities. + + single_query = downloader.get_server_descriptors('9695DFC35FFEB861329B9F1AB04C46397020CE31') + + multiple_query = downloader.get_server_descriptors([ + '9695DFC35FFEB861329B9F1AB04C46397020CE31', + '847B1F850344D7876491A54892F904934E4EB85D', + ]) + + # Explicitly running the queries so they'll provide a useful error if + # unsuccessful. + + single_query.run() + multiple_query.run() + + single_query_results = list(single_query) + self.assertEqual(1, len(single_query_results)) + self.assertEqual('moria1', single_query_results[0].nickname) + + self.assertEqual(2, len(list(multiple_query))) +

1 0

[stem/master] Dropping Tonga from remote descriptor fetching
by atagar＠torproject.org 22 Jul '13

22 Jul '13

commit 61f00819dc3f18b17af0d8d9d3f4f90791364e39 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 14 11:07:40 2013 -0700 Dropping Tonga from remote descriptor fetching Karsten reports that we shouldn't use authorities that lack 'v3ident'. At present that's just Tonga. --- stem/descriptor/remote.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 1f28bbd..ed86eda 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -46,14 +46,15 @@ import urllib2 import stem.descriptor -# Tor directory authorities as of commit f631b73 (7/4/13): +# Tor directory authorities as of commit f631b73 (7/4/13). This should only +# include authorities with 'v3ident': +# # https://gitweb.torproject.org/tor.git/blob/f631b73:/src/or/config.c#l816 DIRECTORY_AUTHORITIES = { 'moria1': ('128.31.0.39', 9131), 'tor26': ('86.59.21.38', 80), 'dizum': ('194.109.206.212', 80), - 'Tonga': ('82.94.251.203', 80), 'turtles': ('76.73.17.194', 9030), 'gabelmoo': ('212.112.245.170', 80), 'dannenberg': ('193.23.244.244', 80),

1 0

[stem/master] Initial pass at the DescriptorDownloader
by atagar＠torproject.org 22 Jul '13

22 Jul '13

commit 0b1c13553f842088fd5f5ae21600d28e25e6b633 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jul 15 08:43:41 2013 -0700 Initial pass at the DescriptorDownloader Implementation of the DescriptorDownloader's _query() helper method which will be the basis of its other methods. On reflection I should move retry fruntionality and probably caching down to the Query class. --- stem/descriptor/remote.py | 60 +++++++++++++++++++++++++++++++++++++++- test/unit/descriptor/remote.py | 2 +- 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 3db72ea..464e7cd 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -40,6 +40,7 @@ itself... """ import io +import random import sys import threading import time @@ -194,4 +195,61 @@ class Query(object): class DescriptorDownloader(object): - pass + """ + Configurable class through which descriptors can be downloaded. This provides + caching, retries, and other capabilities to make downloading descriptors easy + and efficient. + + Queries can be made in either a blocking or non-blocking fashion. If + non-blocking then retries cannot be performed (since we do not know at the + time of the request if it succeeded or failed). + + For more advanced use cases you can use the + :class:`~stem.descriptor.remote.Query` class directly. + + :var bool block: blocks until requests have been concluded if **True**, + otherwise provides the query as soon as its been issued + :var int retries: number of times to attempt the request if it fails + :var float timeout: duration before we'll time out our request, no timeout is + applied if **None** + :var bool start_when_requested: issues requests when our methods are called + if **True**, otherwise provides non-running + :class:`~stem.descriptor.remote.Query` instances + :var bool fall_back_to_authority: when retrying request issues the last + request to a directory authority if **True** + """ + + def __init__(self, block = True, retries = 2, timeout = None, start_when_requested = True, fall_back_to_authority = True): + self.block = block + self.retries = retries + self.timeout = timeout + self.start_when_requested = start_when_requested + self.fall_back_to_authority = fall_back_to_authority + self._directories = DIRECTORY_AUTHORITIES.values() + + def _query(self, resource, descriptor_type, retries): + """ + Issues a request for the given resource. + """ + + if self.fall_back_to_authority and retries == 0: + address, dirport = random.choice(DIRECTORY_AUTHORITIES.values()) + else: + address, dirport = random.choice(self._directories) + + query = Query( + address, + dirport, + resource, + descriptor_type, + timeout = self.timeout, + start = self.start_when_requested, + ) + + if self.block: + query.run(True) + + if query.error and retries > 0: + return self.query(resource, descriptor_type, retries - 1) + + return query diff --git a/test/unit/descriptor/remote.py b/test/unit/descriptor/remote.py index 079937b..ab2276e 100644 --- a/test/unit/descriptor/remote.py +++ b/test/unit/descriptor/remote.py @@ -81,7 +81,7 @@ class TestDescriptorDownloader(unittest.TestCase): self.assertEqual('moria1', desc.nickname) self.assertEqual('128.31.0.34', desc.address) self.assertEqual('9695DFC35FFEB861329B9F1AB04C46397020CE31', desc.fingerprint) - self.assertEqual(TEST_DESCRIPTOR, desc.get_bytes()) + self.assertEqual(TEST_DESCRIPTOR.strip(), desc.get_bytes()) urlopen_mock.assert_called_once_with(expeced_url, timeout = None)

1 0

[stem/master] Workaround for screwy RuntimeError related to mock causing imports
by atagar＠torproject.org 22 Jul '13

22 Jul '13

commit 762b7239e4866ba1b98212259e9751723e0865df Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 6 10:54:58 2013 -0700 Workaround for screwy RuntimeError related to mock causing imports The following isn't used by this directly, but we're still importing it due to a screwy aspect of how mock works. If patched() results in an import that we haven't done before then we can fail with... ====================================================================== ERROR: test_query_download ---------------------------------------------------------------------- Traceback (most recent call last): File "/usr/local/lib/python2.7/dist-packages/mock.py", line 1201, in patched return func(*args, **keywargs) ... File "/home/atagar/Desktop/stem/stem/descriptor/__init__.py", line 156, in parse_file import stem.descriptor.networkstatus RuntimeError: cannot unmarshal code objects in restricted execution mode I've only seen this arise when running this test directly (without the rest of the unit tests, some of which import networkstatus on their own). --- test/unit/descriptor/remote.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/unit/descriptor/remote.py b/test/unit/descriptor/remote.py index 9e8b5cc..079937b 100644 --- a/test/unit/descriptor/remote.py +++ b/test/unit/descriptor/remote.py @@ -10,6 +10,13 @@ import stem.descriptor.remote from mock import patch +# The following isn't used by this directly, but we're still importing it due +# to a screwy aspect of how mock works. If patched() results in an import that +# we haven't done before then we can fail with a RuntimeError. In practice this +# just arises if we run this unit test on its own. + +import stem.descriptor.networkstatus + # Output from requesting moria1's descriptor from itself... # % curl http://128.31.0.39:9131/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020C…

1 0

[stem/master] Integ test to exercise each of the authorities
by atagar＠torproject.org 22 Jul '13

22 Jul '13

commit dc6632b5afba37111b9b2d6fb0c316cca1d9e046 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 14 11:44:57 2013 -0700 Integ test to exercise each of the authorities Adding an integration test that fetches moria1's descriptor from each of the directory authorities. This obviously requires network activity so it's run via the ONLINE target. This uncovered a couple interesting finds... * This is our first time actually using urllib2 (it was mocked previously), and its 'file like object' is incomplete. It lacks tell() and seek() which means that our parsers don't have random access. As such we need to read this all into memory and use a BytesIO.... damn. * The moria1 authority has an extra newline in its descriptor content. Why? Haven't a clue. Maybe it's running a different version of tor or maybe this is an artifact of fetching its own descriptor. Whatever it is, it's the only authority to do so. Simply stripping the content to avoid having our parser complain about this. --- stem/descriptor/remote.py | 8 +++++++ test/integ/descriptor/remote.py | 44 +++++++++++++++++++++++++++++++++++++++ test/settings.cfg | 1 + 3 files changed, 53 insertions(+) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index ed86eda..3db72ea 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -39,6 +39,7 @@ itself... print " %s (%s)" % (desc.nickname, desc.fingerprint) """ +import io import sys import threading import time @@ -178,6 +179,13 @@ class Query(object): response = urllib2.urlopen(self.get_url(), timeout = self.timeout) self.runtime = time.time() - self.start_time + # This sucks. We need to read the full response into memory before + # processing the content. This is because urllib2 returns a 'file like' + # object that lacks tell() or seek(). Hence we need to read it into our + # own buffer that does support these. + + response = io.BytesIO(response.read().strip()) + self._results = stem.descriptor.parse_file(response, self.descriptor_type) except: self.error = sys.exc_info()[1] diff --git a/test/integ/descriptor/remote.py b/test/integ/descriptor/remote.py new file mode 100644 index 0000000..7ac6757 --- /dev/null +++ b/test/integ/descriptor/remote.py @@ -0,0 +1,44 @@ +""" +Integration tests for stem.descriptor.remote. +""" + +import unittest + +import stem.descriptor.remote +import test.runner + +# Required to prevent unmarshal error when running this test alone. + +import stem.descriptor.networkstatus + +class TestDescriptorReader(unittest.TestCase): + def test_using_authorities(self): + """ + Fetches a descriptor from each of the directory authorities. This is + intended to check that DIRECTORY_AUTHORITIES is still up to date (that + addresses and ports haven't changed). + + This is hardcoded to fetch moria1's descriptor. If its fingerprint changes + then this test will need to be updated. + """ + + if test.runner.require_online(self): + return + + for authority, (address, dirport) in stem.descriptor.remote.DIRECTORY_AUTHORITIES.items(): + query = stem.descriptor.remote.Query( + address, + dirport, + '/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020CE31', + 'server-descriptor 1.0', + 30, + ) + + try: + descriptors = list(query.run()) + except Exception, exc: + self.fail("Unable to use %s (%s:%s, %s): %s" % (authority, address, dirport, type(exc), exc)) + + self.assertEqual(1, len(descriptors)) + self.assertEqual('moria1', descriptors[0].nickname) + diff --git a/test/settings.cfg b/test/settings.cfg index 68b120d..d0fd5b0 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -187,6 +187,7 @@ test.integ_tests |test.integ.util.proc.TestProc |test.integ.util.system.TestSystem |test.integ.descriptor.reader.TestDescriptorReader +|test.integ.descriptor.remote.TestDescriptorReader |test.integ.descriptor.server_descriptor.TestServerDescriptor |test.integ.descriptor.extrainfo_descriptor.TestExtraInfoDescriptor |test.integ.descriptor.microdescriptor.TestMicrodescriptor

1 0

[stem/master] Stub for a remote descriptor fetching module
by atagar＠torproject.org 22 Jul '13

22 Jul '13

commit 65924aff93ef70c879175510e9cd2307e8507a9e Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 20 08:57:36 2013 -0700 Stub for a remote descriptor fetching module Starting a module for remote descriptor fetching. Presently this just includes a no-op DescriptorDownloader class. Guts of this sucker are coming soon! --- stem/descriptor/__init__.py | 1 + stem/descriptor/remote.py | 26 ++++++++++++++++++++++++++ test/settings.cfg | 2 +- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 7252e6a..dc982f4 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -40,6 +40,7 @@ Package for parsing and processing descriptor data. __all__ = [ "export", "reader", + "remote", "extrainfo_descriptor", "server_descriptor", "microdescriptor", diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py new file mode 100644 index 0000000..ea8dbb3 --- /dev/null +++ b/stem/descriptor/remote.py @@ -0,0 +1,26 @@ +# Copyright 2013, Damian Johnson +# See LICENSE for licensing information + +""" +Utilities for retrieving descriptors from directory authorities and mirrors. +This is mostly done through the +:class:`~stem.descriptor.remote.DescriptorDownloader` class, which issues the +requests and provides back parsed content. For example... + +:: + + downloader = DescriptorDownloader( + cache = '/tmp/descriptor_cache', + use_mirrors = True, + ) + + try: + for desc in downloader.get_server_descriptors(): + if desc.exit_policy.is_exiting_allowed(): + print "%s (%s)" % (desc.nickname, desc.fingerprint) + except IOError, exc: + print "Unable to query the server descriptors: %s" % exc +""" + +class DescriptorDownloader(object): + pass diff --git a/test/settings.cfg b/test/settings.cfg index 16d8c8b..d5c0997 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -134,7 +134,7 @@ pyflakes.ignore stem/prereq.py => 'RSA' imported but unused pyflakes.ignore stem/prereq.py => 'asn1' imported but unused pyflakes.ignore stem/prereq.py => 'mock' imported but unused pyflakes.ignore stem/prereq.py => 'long_to_bytes' imported but unused -pyflakes.ignore stem/descriptor/__init__.py => redefinition of unused 'OrderedDict' from line 61 +pyflakes.ignore stem/descriptor/__init__.py => redefinition of unused 'OrderedDict' from line 62 pyflakes.ignore stem/util/str_tools.py => redefinition of function '_to_bytes_impl' from line 51 pyflakes.ignore stem/util/str_tools.py => redefinition of function '_to_unicode_impl' from line 57 pyflakes.ignore test/mocking.py => undefined name 'builtins'

1 0

[stem/master] Class for issuing remote descriptor queries
by atagar＠torproject.org 22 Jul '13

22 Jul '13

commit 762f0ad396dd752f0f807871e0715c142cdbf475 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 5 19:18:02 2013 -0700 Class for issuing remote descriptor queries Adding a Query class which does most of the heavy lifting for downloading descriptors. --- stem/control.py | 4 +- stem/descriptor/__init__.py | 1 + stem/descriptor/remote.py | 174 ++++++++++++++++++++++++++++- stem/descriptor/server_descriptor.py | 3 + test/settings.cfg | 1 + test/unit/descriptor/remote.py | 126 +++++++++++++++++++++ test/unit/descriptor/server_descriptor.py | 8 +- 7 files changed, 308 insertions(+), 9 deletions(-) diff --git a/stem/control.py b/stem/control.py index 8a8f410..0f589e1 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1255,8 +1255,8 @@ class Controller(BaseController): :raises: * :class:`stem.ControllerError` if unable to query the descriptor - * **ValueError** if **relay** doesn't conform with the patter for being a - fingerprint or nickname + * **ValueError** if **relay** doesn't conform with the pattern for being + a fingerprint or nickname An exception is only raised if we weren't provided a default response. """ diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index dc982f4..a527329 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -137,6 +137,7 @@ def parse_file(descriptor_file, descriptor_type = None, validate = True, documen :returns: iterator for :class:`~stem.descriptor.__init__.Descriptor` instances in the file :raises: + * **ValueError** if the contents is malformed and validate is True * **TypeError** if we can't match the contents of the file to a descriptor type * **IOError** if unable to read from the descriptor_file """ diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index ea8dbb3..1f28bbd 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -4,8 +4,9 @@ """ Utilities for retrieving descriptors from directory authorities and mirrors. This is mostly done through the -:class:`~stem.descriptor.remote.DescriptorDownloader` class, which issues the -requests and provides back parsed content. For example... +:class:`~stem.descriptor.remote.DescriptorDownloader` class, which issues +:class:`~stem.descriptor.remote.Query` to get descriptor content. For +example... :: @@ -14,13 +15,174 @@ requests and provides back parsed content. For example... use_mirrors = True, ) + query = downloader.get_server_descriptors() + + print "Exit Relays:" + try: - for desc in downloader.get_server_descriptors(): + for desc in query.run(): if desc.exit_policy.is_exiting_allowed(): - print "%s (%s)" % (desc.nickname, desc.fingerprint) - except IOError, exc: - print "Unable to query the server descriptors: %s" % exc + print " %s (%s)" % (desc.nickname, desc.fingerprint) + + print + print "Query took %0.2f seconds" % query.runtime + except Exception as exc: + print "Unable to query the server descriptors: %s" % query.error + +If you don't care about errors then you can also simply iterate over the query +itself... + +:: + + for desc in downloader.get_server_descriptors(): + if desc.exit_policy.is_exiting_allowed(): + print " %s (%s)" % (desc.nickname, desc.fingerprint) """ +import sys +import threading +import time +import urllib2 + +import stem.descriptor + +# Tor directory authorities as of commit f631b73 (7/4/13): +# https://gitweb.torproject.org/tor.git/blob/f631b73:/src/or/config.c#l816 + +DIRECTORY_AUTHORITIES = { + 'moria1': ('128.31.0.39', 9131), + 'tor26': ('86.59.21.38', 80), + 'dizum': ('194.109.206.212', 80), + 'Tonga': ('82.94.251.203', 80), + 'turtles': ('76.73.17.194', 9030), + 'gabelmoo': ('212.112.245.170', 80), + 'dannenberg': ('193.23.244.244', 80), + 'urras': ('208.83.223.34', 443), + 'maatuska': ('171.25.193.9', 443), + 'Faravahar': ('154.35.32.5', 80), +} + + +class Query(object): + """ + Asynchronous request for descriptor content from a directory authority or + mirror. The caller can block on the response by either calling + :func:~stem.descriptor.remote.run: or iterating over our descriptor content. + + :var str address: address of the authority or mirror we're querying + :var int port: directory port we're querying + :var str resource: resource being fetched, such as '/tor/status-vote/current/consensus.z' + + :var Exception error: exception if a problem occured + :var bool is_done: flag that indicates if our request has finished + :var str descriptor_type: type of descriptors being fetched, see :func:`~stem.descriptor.__init__.parse_file` + + :var float start_time: unix timestamp when we first started running + :var float timeout: duration before we'll time out our request + :var float runtime: time our query took, this is **None** if it's not yet finished + """ + + def __init__(self, address, port, resource, descriptor_type, timeout = None, start = True): + self.address = address + self.port = port + self.resource = resource + + self.error = None + self.is_done = False + self.descriptor_type = descriptor_type + + self.start_time = None + self.timeout = timeout + self.runtime = None + + self._downloader_thread = None + self._downloader_thread_lock = threading.RLock() + + self._results = None # descriptor iterator + + if start: + self.start() + + def get_url(self): + """ + Provides the url being queried. + + :returns: **str** for the url being queried by this request + """ + + return "http://%s:%i/%s" % (self.address, self.port, self.resource.lstrip('/')) + + def start(self): + """ + Starts downloading the scriptors if we haven't started already. + """ + + with self._downloader_thread_lock: + if self._downloader_thread is None: + self._downloader_thread = threading.Thread(target = self._download_descriptors, name="Descriptor Query") + self._downloader_thread.setDaemon(True) + self._downloader_thread.start() + + def run(self, suppress = False): + """ + Blocks until our request is complete then provides the descriptors. If we + haven't yet started our request then this does so. + + :param bool suppress: avoids raising exceptions if **True** + + :returns: iterator for the requested :class:`~stem.descriptor.__init__.Descriptor` instances + + :raises: + Using the iterator can fail with the following if **suppress** is + **False**... + + * **ValueError** if the descriptor contents is malformed + * **socket.timeout** if our request timed out + * **urllib2.URLError** for most request failures + + Note that the urllib2 module may fail with other exception types, in + which case we'll pass it along. + """ + + with self._downloader_thread_lock: + self.start() + self._downloader_thread.join() + + if self.error: + if not suppress: + raise self.error + else: + if self._results is None: + if not suppress: + raise ValueError('BUG: _download_descriptors() finished without either results or an error') + + return + + try: + for desc in self._results: + yield desc + except ValueError as exc: + self.error = exc + + if not suppress: + raise self.error + + def __iter__(self): + for desc in self.run(True): + yield desc + + def _download_descriptors(self): + try: + self.start_time = time.time() + response = urllib2.urlopen(self.get_url(), timeout = self.timeout) + self.runtime = time.time() - self.start_time + + self._results = stem.descriptor.parse_file(response, self.descriptor_type) + except: + self.error = sys.exc_info()[1] + finally: + self.is_done = True + + class DescriptorDownloader(object): pass diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 4af4976..d23f41e 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -136,6 +136,9 @@ def _parse_file(descriptor_file, is_bridge = False, validate = True): else: yield RelayDescriptor(descriptor_text, validate, annotations) else: + if validate and annotations: + raise ValueError('Content conform to being a server descriptor:\n%s' % '\n'.join(annotations)) + break # done parsing descriptors diff --git a/test/settings.cfg b/test/settings.cfg index d5c0997..68b120d 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -156,6 +156,7 @@ test.unit_tests |test.unit.util.tor_tools.TestTorTools |test.unit.descriptor.export.TestExport |test.unit.descriptor.reader.TestDescriptorReader +|test.unit.descriptor.remote.TestDescriptorDownloader |test.unit.descriptor.server_descriptor.TestServerDescriptor |test.unit.descriptor.extrainfo_descriptor.TestExtraInfoDescriptor |test.unit.descriptor.microdescriptor.TestMicrodescriptor diff --git a/test/unit/descriptor/remote.py b/test/unit/descriptor/remote.py new file mode 100644 index 0000000..9e8b5cc --- /dev/null +++ b/test/unit/descriptor/remote.py @@ -0,0 +1,126 @@ +""" +Unit tests for stem.descriptor.remote. +""" + +import io +import socket +import unittest + +import stem.descriptor.remote + +from mock import patch + +# Output from requesting moria1's descriptor from itself... +# % curl http://128.31.0.39:9131/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020C… + +TEST_DESCRIPTOR = b"""\ +router moria1 128.31.0.34 9101 0 9131 +platform Tor 0.2.5.0-alpha-dev on Linux +protocols Link 1 2 Circuit 1 +published 2013-07-05 23:48:52 +fingerprint 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31 +uptime 1818933 +bandwidth 512000 62914560 1307929 +extra-info-digest 17D0142F6EBCDF60160EB1794FA6C9717D581F8C +caches-extra-info +onion-key +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBALzd4bhz1usB7wpoaAvP+BBOnNIk7mByAKV6zvyQ0p1M09oEmxPMc3qD +AAm276oJNf0eq6KWC6YprzPWFsXEIdXSqA6RWXCII1JG/jOoy6nt478BkB8TS9I9 +1MJW27ppRaqnLiTmBmM+qzrsgJGwf+onAgUKKH2GxlVgahqz8x6xAgMBAAE= +-----END RSA PUBLIC KEY----- +signing-key +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBALtJ9uD7cD7iHjqNA3AgsX9prES5QN+yFQyr2uOkxzhvunnaf6SNhzWW +bkfylnMrRm/qCz/czcjZO6N6EKHcXmypehvP566B7gAQ9vDsb+l7VZVWgXvzNc2s +tl3P7qpC08rgyJh1GqmtQTCesIDqkEyWxwToympCt09ZQRq+fIttAgMBAAE= +-----END RSA PUBLIC KEY----- +hidden-service-dir +contact 1024D/28988BF5 arma mit edu +ntor-onion-key 9ZVjNkf/iLEnD685SpC5kcDytQ7u5ViiI9JOftdbE0k= +reject *:* +router-signature +-----BEGIN SIGNATURE----- +Y8Tj2e7mPbFJbguulkPEBVYzyO57p4btpWEXvRMD6vxIh/eyn25pehg5dUVBtZlL +iO3EUE0AEYah2W9gdz8t+i3Dtr0zgqLS841GC/TyDKCm+MKmN8d098qnwK0NGF9q +01NZPuSqXM1b6hnl2espFzL7XL8XEGRU+aeg+f/ukw4= +-----END SIGNATURE----- +""" + + +class TestDescriptorDownloader(unittest.TestCase): + @patch('urllib2.urlopen') + def test_query_download(self, urlopen_mock): + """ + Check Query functionality when we successfully download a descriptor. + """ + + urlopen_mock.return_value = io.BytesIO(TEST_DESCRIPTOR) + + query = stem.descriptor.remote.Query( + '128.31.0.39', + 9131, + '/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020CE31', + 'server-descriptor 1.0', + ) + + expeced_url = 'http://128.31.0.39:9131/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020C…' + self.assertEqual(expeced_url, query.get_url()) + + descriptors = list(query) + self.assertEqual(1, len(descriptors)) + desc = descriptors[0] + + self.assertEqual('moria1', desc.nickname) + self.assertEqual('128.31.0.34', desc.address) + self.assertEqual('9695DFC35FFEB861329B9F1AB04C46397020CE31', desc.fingerprint) + self.assertEqual(TEST_DESCRIPTOR, desc.get_bytes()) + + urlopen_mock.assert_called_once_with(expeced_url, timeout = None) + + @patch('urllib2.urlopen') + def test_query_with_malformed_content(self, urlopen_mock): + """ + Query with malformed descriptor content. + """ + + descriptor_content = b'some malformed stuff' + urlopen_mock.return_value = io.BytesIO(descriptor_content) + + query = stem.descriptor.remote.Query( + '128.31.0.39', + 9131, + '/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020CE31', + 'server-descriptor 1.0', + ) + + # checking via the iterator + + expected_error_msg = 'Content conform to being a server descriptor:\nsome malformed stuff' + + descriptors = list(query) + self.assertEqual(0, len(descriptors)) + self.assertEqual(ValueError, type(query.error)) + self.assertEqual(expected_error_msg, str(query.error)) + + # check via the run() method + + self.assertRaises(ValueError, list, query.run()) + + @patch('urllib2.urlopen') + def test_query_with_timeout(self, urlopen_mock): + urlopen_mock.side_effect = socket.timeout('connection timed out') + + query = stem.descriptor.remote.Query( + '128.31.0.39', + 9131, + '/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020CE31', + 'server-descriptor 1.0', + 5, + ) + + self.assertRaises(socket.timeout, list, query.run()) + urlopen_mock.assert_called_once_with( + 'http://128.31.0.39:9131/tor/server/fp/9695DFC35FFEB861329B9F1AB04C46397020C…', + timeout = 5, + ) diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index c679588..50f27f6 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -213,10 +213,16 @@ class TestServerDescriptor(unittest.TestCase): desc_text = b"@pepperjack very tasty\n@mushrooms not so much\n" desc_text += get_relay_server_descriptor(content = True) - desc_text += b"\ntrailing text that should be ignored, ho hum" + desc_text += b"\ntrailing text that should be invalid, ho hum" # running _parse_file should provide an iterator with a single descriptor desc_iter = stem.descriptor.server_descriptor._parse_file(io.BytesIO(desc_text)) + self.assertRaises(ValueError, list, desc_iter) + + desc_text = b"@pepperjack very tasty\n@mushrooms not so much\n" + desc_text += get_relay_server_descriptor(content = True) + desc_iter = stem.descriptor.server_descriptor._parse_file(io.BytesIO(desc_text)) + desc_entries = list(desc_iter) self.assertEquals(1, len(desc_entries)) desc = desc_entries[0]

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 21 Jul '13

21 Jul '13

commit 07fc035c1241d9be879ca265993595f2db9be5ce Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 21 16:45:19 2013 +0000 Update translations for tsum --- he/short-user-manual_he_noimg.xhtml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/he/short-user-manual_he_noimg.xhtml b/he/short-user-manual_he_noimg.xhtml index aea7132..e02eafd 100644 --- a/he/short-user-manual_he_noimg.xhtml +++ b/he/short-user-manual_he_noimg.xhtml @@ -66,7 +66,7 @@ sub 2048R/EB399FD7 2003-10-16 <h3 id="what-to-do-when-tor-does-not-connect">מה לעשות כאשר Tor לא מתחבר</h3> משתמשים מסוימים יבחינו כי Vidalia נתקע כאשר מנסים להתחבר אל הרשת Tor. במידה וזה מתרחש, ודאו כי אתם מחוברים אל האינטרנט. במידה ואתם צריכים להתחבר אל שרת פרוקסי, ראו כיצד להשתמש בפרוקסי פתוח מטה. במידה וחיבור האינטרנט הרגיל שלכם עובד, אך Tor עדיין לא מסוגל להתחבר אל הרשת, נסו את אלה; פתחו את לוח בקרה Vidalia, לחצו על יומן הודעות ובחרו את הכרטיסייה מתקדם. יכול להיות כי Tor לא יתחבר מכיוון: - Your system clock is off: Make sure that the date and time on your system is correct, and restart Tor. You may need to synchronize your system clock with an Internet time server. + שעון המערכת שלכם כבוי: ודאו כי התאריך והזמן במערכת שלכם הינו מדויק, ותאתחלו את Tor. ייתכן ויהיה עליכם לסנכרן את שעון המערכת שלכם עם שרת זמן אינטרנט. אתם מאחורי חומת אש מסייגת: כדי להורות על Tor לנסות רק את יציאה 80 ואת יציאה 443, פתחו את לוח בקרה Vidalia, לחצו על הגדרות וגם רשת, וסמנו את התיבה אשר אומרת חומת האש שלי מאפשרת לי להתחבר רק אל יציאות מסוימות. תוכנית האנטי וירוס שלכם חוסמת את Tor: ודאו כי תוכנית האנטי וירוס שלכם אינה מהווה גורם אשר מונע מן Tor מלבסס חיבורי רשת. אם Tor עדיין לא עובד, סביר כי ספק האינטרנט (ISP) שלכם חוסם את Tor. לעתים קרובות בעיה זו יכולה להיפתר בעזרת גשרי Tor, ממסרים נסתרים אשר אינם קלים לחסימה באותה הקלות. @@ -115,8 +115,8 @@ sub 2048R/EB399FD7 2003-10-16 <li>Uncheck Hide extensions for known file types and click OK</li> </ol> <h3 id="vidalia-asks-for-a-password">Vidalia מבקשת סיסמה</h3> - You should not have to enter a password when starting Vidalia. If you are prompted for one, you are likely affected by one of these problems: - You are already running Vidalia and Tor: For example, this situation can happen if you installed the Vidalia bundle and now you're trying to run the Tor Browser Bundle. In that case, you will need to close the old Vidalia and Tor before you can run this one. + אתם לא מוכרחים להזין סיסמה בעת התחלת Vidalia. במידה ואתם נשאלים עבור כזו, סביר להניח כי אתם מושפעים על ידי אחת מבעיות אלה: + אתם כבר מריצים את Vidalia ואת Tor: לדוגמא, סיטואציה זו עשויה להתרחש אם התקנתם את אגודת Vidalia וכעת אתם מנסים להריץ את Tor Browser Bundle. במקרה הזה, יהיה עליכם לסגור את Vidalia ואת Tor הישנים טרם תעמוד לכם האפשרות להריץ את זה. Vidalia קרסה, אך הותירה את Tor מורץ: במידה ולתיבת הדו שיח אשר שואלת אתכם עבור סיסמת בקרה יש לחצן אתחול, באפשרותכם ללחוץ על הלחצן Vidalia תאתחל את Tor בעזרת סיסמת בקרה אקראית חדשה. במידה ואינכם רואים לחצן אתחול, אוו אם Vidalia אינה מסוגלת לאתחל את Tor עבורכם; המשיו אל מנהל תהליכים או משימות, וסיימו את התהליך Tor. אחרי כן תשתמשו בתוכנית Vidalia כדי לאתחל את Tor. למידע נוסף, ראו <a href="https://torproject.org/docs/faq.html#VidaliaPassword">שות</a> באתר הרשת של הפרויקט Tor. <h3 id="flash-does-not-work">Flash לא פועל</h3>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2013