December 2014 - tor-commits - lists.torproject.org

[check/master] It's Tor Browser now, not Tor Browser Bundle.
by arlo＠torproject.org 22 Dec '14

22 Dec '14

commit 35c0076b8cd55a85f5a91ced4ae21060eb748889 Author: Matt Pagan <matt(a)pagan.io> Date: Sat Dec 20 19:40:51 2014 -0600 It's Tor Browser now, not Tor Browser Bundle. --- check.pot | 4 ++-- public/index.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/check.pot b/check.pot index b412daf..79398e1 100644 --- a/check.pot +++ b/check.pot @@ -22,7 +22,7 @@ msgid "" "the Internet anonymously." msgstr "" -msgid "There is a security update available for the Tor Browser Bundle." +msgid "There is a security update available for Tor Browser." msgstr "" msgid "" @@ -89,7 +89,7 @@ msgstr "" msgid "JavaScript is disabled." msgstr "" -msgid "However, it does not appear to be the Tor Browser Bundle." +msgid "However, it does not appear to be Tor Browser." msgstr "" msgid "Run a Relay" diff --git a/public/index.html b/public/index.html index 16eaff2..05c2e56 100644 --- a/public/index.html +++ b/public/index.html @@ -81,13 +81,13 @@ {{ if .IsTor }} {{ if .NotUpToDate }} - {{ GetText .Lang "There is a security update available for the Tor Browser Bundle." }} + {{ GetText .Lang "There is a security update available for Tor Browser." }} {{ GetText .Lang "<a href=\"https://www.torproject.org/download/download-easy.html\">Click here to go to the download page</a>" | UnEscaped }} {{ else }} {{ if .NotTBB }} - {{ GetText .Lang "However, it does not appear to be the Tor Browser Bundle." }} + {{ GetText .Lang "However, it does not appear to be Tor Browser." }} {{ GetText .Lang "<a href=\"https://www.torproject.org/download/download-easy.html\">Click here to go to the download page</a>" | UnEscaped }} {{ end }}

1 0

[check/master] Check is also the home page for Orweb.
by arlo＠torproject.org 22 Dec '14

22 Dec '14

commit 59b5baff211856c022d8677c3f46d5e418f8ff28 Author: Matt Pagan <matt(a)pagan.io> Date: Sat Dec 20 20:00:01 2014 -0600 Check is also the home page for Orweb. --- docs/ABOUT.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/ABOUT.md b/docs/ABOUT.md index dcf0864..9eb6f91 100644 --- a/docs/ABOUT.md +++ b/docs/ABOUT.md @@ -1,6 +1,6 @@ ## What is check.torproject.org? -The core service is a website that allows a user to check if their connection seems to be a [Tor](https://www.torproject.org/) connection or not. This allows the user to know if they have successfully setup their client and are ready to browse the internet privately. It is the default homepage for users of the [Tor Browser Bundle (TBB)](https://www.torproject.org/projects/torbrowser.html.en) for versions below 3.X. +The core service is a website that allows a user to check if their connection seems to be a [Tor](https://www.torproject.org/) connection or not. This allows the user to know if they have successfully setup their client and are ready to browse the internet privately. It is the default homepage for users of the [Tor Browser Bundle (TBB)](https://www.torproject.org/projects/torbrowser.html.en) for versions below 3.X and for [the Guardian Project](https://guardianproject.info)'s Orweb. Users of the TBB will also receive a notification if there are updates available for their software. @@ -26,4 +26,4 @@ Feel free to send a PR here if you spot anything you can help with. If you want - [Volunteering](https://www.torproject.org/getinvolved/volunteer.html.en) - [Translating TorCheck](https://www.transifex.com/projects/p/torproject/resource/2-torche… - [Translating other Tor projects](https://www.transifex.com/projects/p/torproject/resources/) - - [Donating to The Tor Project](https://www.torproject.org/donate/donate.html.en) \ No newline at end of file + - [Donating to The Tor Project](https://www.torproject.org/donate/donate.html.en)

1 0

[check/master] Merge pull request #25 from mttp/bundle-verbiage
by arlo＠torproject.org 22 Dec '14

22 Dec '14

commit 3dfc6f8fecc4430c05bf4c682ef4e83d52b6cc32 Merge: 7274522 35c0076 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sun Dec 21 18:11:39 2014 -0800 Merge pull request #25 from mttp/bundle-verbiage It's Tor Browser now, not Tor Browser Bundle. check.pot | 4 ++-- public/index.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)

1 0

[check/master] Merge pull request #26 from mttp/doc-clarify
by arlo＠torproject.org 22 Dec '14

22 Dec '14

commit d1718ecc580996d68e73d7be7a0cca21701e299a Merge: 3dfc6f8 59b5baf Author: Arlo Breault <arlolra(a)gmail.com> Date: Sun Dec 21 18:12:47 2014 -0800 Merge pull request #26 from mttp/doc-clarify Check is also the home page for Orweb. docs/ABOUT.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[stem/master] Updating changelog and download page to reflect new release
by atagar＠torproject.org 22 Dec '14

22 Dec '14

commit ffb47d68e4366891b894a059b63c7671fdaff6e9 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 21 16:53:02 2014 -0800 Updating changelog and download page to reflect new release --- docs/change_log.rst | 11 +++++++++++ docs/download.rst | 4 ++-- stem/__init__.py | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index def9881..d487ceb 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -7,6 +7,7 @@ unreleased. For a monthly report on work being done see my `development log * :ref:`versioning` * :ref:`unreleased` +* :ref:`version_1.3` * :ref:`version_1.2` * :ref:`version_1.1` * :ref:`version_1.0` @@ -40,6 +41,16 @@ Unreleased The following are only available within Stem's `git repository <download.html>`_. +.. _version_1.3: + +Version 1.3 +----------- + +With Stem's 1.3 release it's much easier to `work with hidden services +<tutorials/over_the_river.html>`_. This release also improves our +descriptor parsing performance by 40%, and includes many other +improvements. + * **Controller** * Added :class:`~stem.control.Controller` methods to more easily work with hidden service configurations: :func:`~stem.control.Controller.get_hidden_service_conf`, :func:`~stem.control.Controller.set_hidden_service_conf`, :func:`~stem.control.Controller.create_hidden_service`, and :func:`~stem.control.Controller.remove_hidden_service` (:trac:`12533`) diff --git a/docs/download.rst b/docs/download.rst index 1355968..cac296a 100644 --- a/docs/download.rst +++ b/docs/download.rst @@ -66,9 +66,9 @@ Download Signed releases and instructions for both Python 2.x and 3.x. You can install from its `tarball - <https://pypi.python.org/packages/source/s/stem/stem-1.2.2.tar.bz2>`_ + <https://pypi.python.org/packages/source/s/stem/stem-1.3.0.tar.bz2>`_ (`sig - <https://pypi.python.org/packages/source/s/stem/stem-1.2.2.tar.bz2.asc>`_), + <https://pypi.python.org/packages/source/s/stem/stem-1.3.0.tar.bz2.asc>`_), or if you have **pip** installed then getting stem can be as simple as... diff --git a/stem/__init__.py b/stem/__init__.py index a5fc41a..baa2ef8 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -438,7 +438,7 @@ Library for working with the tor process. ================= =========== """ -__version__ = '1.3.0' +__version__ = '1.3.0-dev' __author__ = 'Damian Johnson' __contact__ = 'atagar(a)torproject.org' __url__ = 'https://stem.torproject.org/'

1 0

[stem/master] Reordering tutorials
by atagar＠torproject.org 22 Dec '14

22 Dec '14

commit d9764691fa812da9fcce4ea0650bc9610d2ffcf7 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 21 16:29:35 2014 -0800 Reordering tutorials The hidden service tutorial is closer to client usage than descriptor handling, so swapping the two. --- docs/_templates/layout.html | 2 +- docs/tutorials.rst | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html index 32657da..bc80512 100644 --- a/docs/_templates/layout.html +++ b/docs/_templates/layout.html @@ -25,8 +25,8 @@ <li><a href="{{ pathto('tutorials/the_little_relay_that_could') }}">Hello World</a></li> <li><a href="{{ pathto('tutorials/to_russia_with_love') }}">Client Usage</a></li> <li><a href="{{ pathto('tutorials/tortoise_and_the_hare') }}">Event Listening</a></li> - <li><a href="{{ pathto('tutorials/mirror_mirror_on_the_wall') }}">Tor Descriptors</a></li> <li><a href="{{ pathto('tutorials/over_the_river') }}">Hidden Services</a></li> + <li><a href="{{ pathto('tutorials/mirror_mirror_on_the_wall') }}">Tor Descriptors</a></li> <li><a href="{{ pathto('tutorials/east_of_the_sun') }}">Utilities</a></li> <li><a href="{{ pathto('tutorials/down_the_rabbit_hole') }}">Interpreter</a></li> <li><a href="{{ pathto('tutorials/double_double_toil_and_trouble') }}">Examples</a></li> diff --git a/docs/tutorials.rst b/docs/tutorials.rst index f4db5bd..b5f6063 100644 --- a/docs/tutorials.rst +++ b/docs/tutorials.rst @@ -20,17 +20,17 @@ Tutorial Author: arking License: Public Domain + * Over the River and Through the Wood - riding_hood.png + Source: https://openclipart.org/detail/163771/little-red-riding-hood-by-tzunghaor + Author: tzunghaor + License: Public Domain + * Mirror Mirror On The Wall - mirror.png Source: https://openclipart.org/detail/152155/mirror-frame-by-gsagri04 Author: Unknown (gsagri04?) License: Public Domain Alternate: https://openclipart.org/detail/174179/miroir-rectangulaire-by-defaz36-174179 - * Over the River and Through the Wood - riding_hood.png - Source: https://openclipart.org/detail/163771/little-red-riding-hood-by-tzunghaor - Author: tzunghaor - License: Public Domain - * East of the Sun & West of the Moon - windrose.png Source: https://commons.wikimedia.org/wiki/File:Compass_card_%28sl%29.svg Author: Andrejj @@ -84,17 +84,6 @@ by jumping straight in with some tutorials... subscribe to be notified of. In this tutorial we'll do just that, writing a curses application that graphs the bandwidth usage of Tor. - * - .. image:: /_static/section/tutorials/mirror.png - :target: tutorials/mirror_mirror_on_the_wall.html - - - .. image:: /_static/label/mirror_mirror_on_the_wall.png - :target: tutorials/mirror_mirror_on_the_wall.html - - Getting and acting upon information about relays in the Tor network. - Relay information is provided through documents called **descriptors**. - This walks you through both where to get them and a small script to tell - you the fastest Tor exits. - * - .. image:: /_static/section/tutorials/riding_hood.png :target: tutorials/over_the_river.html @@ -107,6 +96,17 @@ by jumping straight in with some tutorials... instance, this could let you safely publish a blog without getting your door kicked down. Here we'll walk you through an example. + * - .. image:: /_static/section/tutorials/mirror.png + :target: tutorials/mirror_mirror_on_the_wall.html + + - .. image:: /_static/label/mirror_mirror_on_the_wall.png + :target: tutorials/mirror_mirror_on_the_wall.html + + Getting and acting upon information about relays in the Tor network. + Relay information is provided through documents called **descriptors**. + This walks you through both where to get them and a small script to tell + you the fastest Tor exits. + * - .. image:: /_static/section/tutorials/windrose.png :target: tutorials/east_of_the_sun.html

1 0

[stem/master] Stem release 1.3.0
by atagar＠torproject.org 22 Dec '14

22 Dec '14

commit bdb75e148df473edcd3b85d0a73dd9e0d06a6ee2 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 21 16:32:56 2014 -0800 Stem release 1.3.0 --- docs/index.rst | 2 +- stem/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index bcc2269..5e8b97a 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,7 +1,7 @@ Welcome to Stem! ================ -Stem is a Python controller library for `Tor <https://www.torproject.org/>`_. With it you can use Tor's `control protocol <https://gitweb.torproject.org/torspec.git/tree/control-spec.txt>`_ to script against the Tor process, or build things similar to `Vidalia <https://www.torproject.org/projects/vidalia.html.en>`_ and `arm <https://www.atagar.com/arm/>`_. Stem's latest version is **1.2.2** (released June 7th, 2014). +Stem is a Python controller library for `Tor <https://www.torproject.org/>`_. With it you can use Tor's `control protocol <https://gitweb.torproject.org/torspec.git/tree/control-spec.txt>`_ to script against the Tor process, or build things similar to `Vidalia <https://www.torproject.org/projects/vidalia.html.en>`_ and `arm <https://www.atagar.com/arm/>`_. Stem's latest version is **1.3.0** (released December 21st, 2014). .. Main Stem Logo Source: http://www.wpclipart.com/plants/assorted/P/plant_stem.png.html diff --git a/stem/__init__.py b/stem/__init__.py index 640cdff..a5fc41a 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -438,7 +438,7 @@ Library for working with the tor process. ================= =========== """ -__version__ = '1.2.2-dev' +__version__ = '1.3.0' __author__ = 'Damian Johnson' __contact__ = 'atagar(a)torproject.org' __url__ = 'https://stem.torproject.org/'

1 0

[stem/master] assertDictEqual is unavailable in python 2.6
by atagar＠torproject.org 22 Dec '14

22 Dec '14

commit 7f1f8be658da9d0940810eed2a95fa15267f372a Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 21 15:47:49 2014 -0800 assertDictEqual is unavailable in python 2.6 Sweet, only one minor regression for python 2.6. assertDictEqual was added in python 2.7, and running it is actually discouraged since under the covers assertEqual uses it... https://docs.python.org/2/library/unittest.html#unittest.TestCase.assertDic… --- test/integ/control/controller.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index b6d7036..cd0b578 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -476,12 +476,12 @@ class TestController(unittest.TestCase): try: # initially we shouldn't be running any hidden services - self.assertDictEqual({}, controller.get_hidden_service_conf()) + self.assertEqual({}, controller.get_hidden_service_conf()) # try setting a blank config, shouldn't have any impact controller.set_hidden_service_conf({}) - self.assertDictEqual({}, controller.get_hidden_service_conf()) + self.assertEqual({}, controller.get_hidden_service_conf()) # create a hidden service @@ -507,13 +507,13 @@ class TestController(unittest.TestCase): } controller.set_hidden_service_conf(initialconf) - self.assertDictEqual(initialconf, controller.get_hidden_service_conf()) + self.assertEqual(initialconf, controller.get_hidden_service_conf()) # add already existing services, with/without explicit target self.assertEqual(None, controller.create_hidden_service(service1_path, 8020)) self.assertEqual(None, controller.create_hidden_service(service1_path, 8021, target_port = 8021)) - self.assertDictEqual(initialconf, controller.get_hidden_service_conf()) + self.assertEqual(initialconf, controller.get_hidden_service_conf()) # add a new service, with/without explicit target

1 0

[stem/master] Updating changelog
by atagar＠torproject.org 22 Dec '14

22 Dec '14

commit 6bd1d528b96e140430160a4e65c66d678fdb1313 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 21 15:33:09 2014 -0800 Updating changelog Just a few notes I forgot to add for recent changes. --- docs/change_log.rst | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 132043b..def9881 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -65,19 +65,23 @@ The following are only available within Stem's `git repository * **Utilities** - * Added support for directories to :func:`stem.util.conf.Config.load`. - * Changed :func:`stem.util.conf.uses_settings` to only provide a 'config' keyword arument if the decorated function would accept it. + * Added support for directories to :func:`stem.util.conf.Config.load` + * Changed :func:`stem.util.conf.uses_settings` to only provide a 'config' keyword arument if the decorated function would accept it * Added :func:`stem.util.str_tools.crop` * Added :func:`stem.util.proc.file_descriptors_used` * Dropped the 'get_*' prefix from most function names. Old names will still work, but are a deprecated alias. * **Interpreter** - * The /info command errored for relays without contact information. + * The /info command errored for relays without contact information * **Website** - * Added an example for `writing descriptors to disk and reading them back <tutorials/mirror_mirror_on_the_wall.html#saving-and-loading-descriptors>`_ (:trac:`13774`) + * Tutorial for `hidden services <tutorials/over_the_river.html>`_ + * Example for `writing descriptors to disk and reading them back <tutorials/mirror_mirror_on_the_wall.html#saving-and-loading-descriptors>`_ (:trac:`13774`) + * Added Gentoo to our `download page <download.html>`_ and handful of testing revisions for that platform (:trac:`13904`) + * Tests for our tutorial examples (:trac:`11335`) + * Revised `GitWeb <https://gitweb.torproject.org/>`_ urls to work after its upgrade .. _version_1.2:

1 0

[stem/master] Revising tutorial example tests
by atagar＠torproject.org 22 Dec '14

22 Dec '14

commit 8c44ef6f557055adc5aedb8a914466985803817d Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 21 15:12:30 2014 -0800 Revising tutorial example tests Mostly just minor formatting revisions. The most substantial changes were for test_votes_by_bandwidth_authorities to cut runtime from 5 to 0.05 seconds. Also, think the Query objects were accidently still hitting the directory authorities - they're now completely mocked. --- test/unit/tutorial_examples.py | 216 +++++++++++++++++++++------------------- 1 file changed, 115 insertions(+), 101 deletions(-) diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py index aeeb761..75a480d 100644 --- a/test/unit/tutorial_examples.py +++ b/test/unit/tutorial_examples.py @@ -21,9 +21,9 @@ from test.mocking import ( try: # added in python 3.3 - from unittest.mock import patch + from unittest.mock import Mock, patch except ImportError: - from mock import patch + from mock import Mock, patch CIRC_CONTENT = '650 CIRC %d %s \ %s \ @@ -106,19 +106,23 @@ def _get_circ_event(id, status, hop1, hop2, hop3, purpose): def _get_router_status(address = None, port = None, nickname = None, fingerprint_base64 = None, s_line = None): r_line = ROUTER_STATUS_ENTRY_V3_HEADER[0][1] + if address: r_line = r_line.replace('71.35.150.29', address) + if port: r_line = r_line.replace('9001', port) + if nickname: r_line = r_line.replace('caerSidi', nickname) + if fingerprint_base64: r_line = r_line.replace('p1aag7VwarGxqctS7/fS0y5FU+s', fingerprint_base64) + if s_line: - content = get_router_status_entry_v3({'r': r_line, 's': s_line}) + return get_router_status_entry_v3({'r': r_line, 's': s_line}) else: - content = get_router_status_entry_v3({'r': r_line}) - return content + return get_router_status_entry_v3({'r': r_line}) class TestTutorialExamples(unittest.TestCase): @@ -162,6 +166,7 @@ class TestTutorialExamples(unittest.TestCase): controller = from_port_mock().__enter__() controller.get_circuits.return_value = [circuit_4, circuit_6, circuit_10] + controller.get_network_status.side_effect = lambda fingerprint, *args: { path_1[0]: _get_router_status("173.209.180.61"), path_2[0]: _get_router_status("87.238.194.176"), @@ -171,42 +176,46 @@ class TestTutorialExamples(unittest.TestCase): path_6[0]: _get_router_status("86.59.119.83"), path_7[0]: _get_router_status("176.67.169.171") }[fingerprint] + tutorial_example() self.assertEqual(LIST_CIRCUITS_OUTPUT, stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO.StringIO) @patch('stem.control.Controller.from_port', spec = Controller) def test_exit_used(self, from_port_mock, stdout_mock): - import functools + def tutorial_example(mock_event): + import functools - from stem import StreamStatus - from stem.control import EventType, Controller + from stem import StreamStatus + from stem.control import EventType, Controller - def main(): - print "Tracking requests for tor exits. Press 'enter' to end." - print + def main(): + print "Tracking requests for tor exits. Press 'enter' to end." + print - with Controller.from_port() as controller: - controller.authenticate() + with Controller.from_port() as controller: + controller.authenticate() - stream_listener = functools.partial(stream_event, controller) - controller.add_event_listener(stream_listener, EventType.STREAM) + stream_listener = functools.partial(stream_event, controller) + controller.add_event_listener(stream_listener, EventType.STREAM) - raw_input() + stream_event(controller, mock_event) # simulate an event during the raw_input() - def stream_event(controller, event): - if event.status == StreamStatus.SUCCEEDED and event.circ_id: - circ = controller.get_circuit(event.circ_id) + def stream_event(controller, event): + if event.status == StreamStatus.SUCCEEDED and event.circ_id: + circ = controller.get_circuit(event.circ_id) - exit_fingerprint = circ.path[-1][0] - exit_relay = controller.get_network_status(exit_fingerprint) + exit_fingerprint = circ.path[-1][0] + exit_relay = controller.get_network_status(exit_fingerprint) - print "Exit relay for our connection to %s" % (event.target) - print " address: %s:%i" % (exit_relay.address, exit_relay.or_port) - print " fingerprint: %s" % exit_relay.fingerprint - print " nickname: %s" % exit_relay.nickname - print " locale: %s" % controller.get_info("ip-to-country/%s" % exit_relay.address, 'unknown') - print + print "Exit relay for our connection to %s" % (event.target) + print " address: %s:%i" % (exit_relay.address, exit_relay.or_port) + print " fingerprint: %s" % exit_relay.fingerprint + print " nickname: %s" % exit_relay.nickname + print " locale: %s" % controller.get_info("ip-to-country/%s" % exit_relay.address, 'unknown') + print + + main() path_1 = ('9EA317EECA56BDF30CAEB208A253FB456EDAB1A0', 'bolobolo1') path_2 = ('00C2C2A16AEDB51D5E5FB7D6168FC66B343D822F', 'ph3x') @@ -216,15 +225,13 @@ class TestTutorialExamples(unittest.TestCase): event_content = '650 STREAM 15 SUCCEEDED 3 64.15.112.44:80' event = _get_event(event_content) - controller = from_port_mock().__enter() + controller = from_port_mock().__enter__() controller.get_circuit.return_value = circuit - controller.get_network_status.return_value = _get_router_status("31.172.30.2", "443", path_3[1], "pZ4efH6u4IPXVu4f9uwxyj2GUdc=") + controller.get_network_status.return_value = _get_router_status('31.172.30.2', '443', path_3[1], 'pZ4efH6u4IPXVu4f9uwxyj2GUdc=') controller.get_info.return_value = 'unknown' - origin_raw_input = __builtins__['raw_input'] - __builtins__['raw_input'] = lambda: "" - main() - __builtins__['raw_input'] = origin_raw_input - stream_event(controller, event) + + tutorial_example(event) + self.assertEqual(EXIT_USED_OUTPUT, stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO.StringIO) @@ -251,12 +258,15 @@ class TestTutorialExamples(unittest.TestCase): print print "%i outdated relays found, %i had contact information" % (count, with_contact) - desc_1 = get_relay_server_descriptor({'platform': 'node-Tor 0.2.3.0 on Linux x86_64'}) - desc_2 = get_relay_server_descriptor({'platform': 'node-Tor 0.1.0 on Linux x86_64'}) - desc_3 = get_relay_server_descriptor({'opt': 'contact Random Person admin(a)gtr-10.de', 'platform': 'node-Tor 0.2.3.0 on Linux x86_64'}) - desc_4 = get_relay_server_descriptor({'opt': 'contact Sambuddha Basu', 'platform': 'node-Tor 0.1.0 on Linux x86_64'}) - downloader_mock().get_server_descriptors.return_value = [desc_1, desc_2, desc_3, desc_4] + downloader_mock().get_server_descriptors.return_value = [ + get_relay_server_descriptor({'platform': 'node-Tor 0.2.3.0 on Linux x86_64'}), + get_relay_server_descriptor({'platform': 'node-Tor 0.1.0 on Linux x86_64'}), + get_relay_server_descriptor({'opt': 'contact Random Person admin(a)gtr-10.de', 'platform': 'node-Tor 0.2.3.0 on Linux x86_64'}), + get_relay_server_descriptor({'opt': 'contact Sambuddha Basu', 'platform': 'node-Tor 0.1.0 on Linux x86_64'}), + ] + tutorial_example() + self.assertEqual(OUTDATED_RELAYS_OUTPUT, stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO.StringIO) @@ -307,36 +317,45 @@ class TestTutorialExamples(unittest.TestCase): print "maatuska has the Running flag but moria1 doesn't: %s" % fingerprint get_authorities_mock().items.return_value = [('moria1', DIRECTORY_AUTHORITIES['moria1']), ('maatuska', DIRECTORY_AUTHORITIES['maatuska'])] - fingerprint = [] - fingerprint.append(('92FCB6748A40E6088E22FBAB943AB2DD743EA818', 'kvy2dIpA5giOIvurlDqy3XQ+qBg=')) - fingerprint.append(('6871F682350BA931838C0EC1E4A23044DAE06A73', 'aHH2gjULqTGDjA7B5KIwRNrganM=')) - fingerprint.append(('E2BB13AA2F6960CD93ABE5257A825687F3973C62', '4rsTqi9pYM2Tq+UleoJWh/OXPGI=')) - fingerprint.append(('546C54E2A89D88E0794D04AECBF1AC8AC9DA81DE', 'VGxU4qidiOB5TQSuy/Gsisnagd4=')) - fingerprint.append(('DCAEC3D069DC39AAE43D13C8AF31B5645E05ED61', '3K7D0GncOarkPRPIrzG1ZF4F7WE=')) - entry = [] - # Entries for moria1. - entry.append(_get_router_status(fingerprint_base64 = fingerprint[0][1], s_line = ' ')) - entry.append(_get_router_status(fingerprint_base64 = fingerprint[1][1], s_line = ' ')) - entry.append(_get_router_status(fingerprint_base64 = fingerprint[2][1], s_line = ' ')) - entry.append(_get_router_status(fingerprint_base64 = fingerprint[3][1])) - entry.append(_get_router_status(fingerprint_base64 = fingerprint[4][1])) - # Entries for maatuska. - entry.append(_get_router_status(fingerprint_base64 = fingerprint[0][1])) - entry.append(_get_router_status(fingerprint_base64 = fingerprint[1][1])) - entry.append(_get_router_status(fingerprint_base64 = fingerprint[2][1])) - entry.append(_get_router_status(fingerprint_base64 = fingerprint[3][1], s_line = ' ')) - entry.append(_get_router_status(fingerprint_base64 = fingerprint[4][1], s_line = ' ')) - network_status = [] - network_status.append(get_network_status_document_v3(routers = (entry[0], entry[1], entry[2], entry[3], entry[4],))) - network_status.append(get_network_status_document_v3(routers = (entry[5], entry[6], entry[7], entry[8], entry[9],))) - query_mock().run.side_effect = [[network_status[0]], [network_status[1]]] + + fingerprint = [ + ('92FCB6748A40E6088E22FBAB943AB2DD743EA818', 'kvy2dIpA5giOIvurlDqy3XQ+qBg='), + ('6871F682350BA931838C0EC1E4A23044DAE06A73', 'aHH2gjULqTGDjA7B5KIwRNrganM='), + ('E2BB13AA2F6960CD93ABE5257A825687F3973C62', '4rsTqi9pYM2Tq+UleoJWh/OXPGI='), + ('546C54E2A89D88E0794D04AECBF1AC8AC9DA81DE', 'VGxU4qidiOB5TQSuy/Gsisnagd4='), + ('DCAEC3D069DC39AAE43D13C8AF31B5645E05ED61', '3K7D0GncOarkPRPIrzG1ZF4F7WE='), + ] + + entry = [ + # entries for moria1 + + _get_router_status(fingerprint_base64 = fingerprint[0][1], s_line = ' '), + _get_router_status(fingerprint_base64 = fingerprint[1][1], s_line = ' '), + _get_router_status(fingerprint_base64 = fingerprint[2][1], s_line = ' '), + _get_router_status(fingerprint_base64 = fingerprint[3][1]), + _get_router_status(fingerprint_base64 = fingerprint[4][1]), + + # entries for maatuska + + _get_router_status(fingerprint_base64 = fingerprint[0][1]), + _get_router_status(fingerprint_base64 = fingerprint[1][1]), + _get_router_status(fingerprint_base64 = fingerprint[2][1]), + _get_router_status(fingerprint_base64 = fingerprint[3][1], s_line = ' '), + _get_router_status(fingerprint_base64 = fingerprint[4][1], s_line = ' '), + ] + + query_mock().run.side_effect = [ + [get_network_status_document_v3(routers = (entry[0], entry[1], entry[2], entry[3], entry[4]))], + [get_network_status_document_v3(routers = (entry[5], entry[6], entry[7], entry[8], entry[9]))], + ] + tutorial_example() self.assertEqual(COMPARE_FLAGS_OUTPUT, stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO.StringIO) @patch('stem.descriptor.remote.get_authorities') - @patch('stem.descriptor.remote.Query.run') - def test_votes_by_bandwidth_authorities(self, query_run_mock, get_authorities_mock, stdout_mock): + @patch('stem.descriptor.remote.DescriptorDownloader.query') + def test_votes_by_bandwidth_authorities(self, query_mock, get_authorities_mock, stdout_mock): def tutorial_example(): from stem.descriptor import remote @@ -368,43 +387,37 @@ class TestTutorialExamples(unittest.TestCase): except Exception as exc: print " failed to get the vote (%s)" % exc - directory_values = [] - directory_values.append(DIRECTORY_AUTHORITIES['gabelmoo']) + directory_values = [ + DIRECTORY_AUTHORITIES['gabelmoo'], + DIRECTORY_AUTHORITIES['tor26'], + DIRECTORY_AUTHORITIES['moria1'], + DIRECTORY_AUTHORITIES['maatuska'], + ] + directory_values[0].address = '212.112.245.170' - directory_values.append(DIRECTORY_AUTHORITIES['tor26']) - directory_values.append(DIRECTORY_AUTHORITIES['moria1']) - directory_values.append(DIRECTORY_AUTHORITIES['maatuska']) get_authorities_mock().values.return_value = directory_values - router_status = [] - # Count for gabelmoo. - entry = [] - for count in range(5935): - entry.append(get_router_status_entry_v3({'w': 'Bandwidth=1 Measured=1'})) - for count in range(1332): - entry.append(get_router_status_entry_v3()) - router_status.append(entry) - # Count for tor26. - entry = [] - for count in range(5735): - entry.append(get_router_status_entry_v3({'w': 'Bandwidth=1 Measured=1'})) - for count in range(1690): - entry.append(get_router_status_entry_v3()) - router_status.append(entry) - # Count for moria1. - entry = [] - for count in range(6647): - entry.append(get_router_status_entry_v3({'w': 'Bandwidth=1 Measured=1'})) - for count in range(625): - entry.append(get_router_status_entry_v3()) - router_status.append(entry) - # Count for maatuska. - entry = [] - for count in range(6313): - entry.append(get_router_status_entry_v3({'w': 'Bandwidth=1 Measured=1'})) - for count in range(1112): - entry.append(get_router_status_entry_v3()) - router_status.append(entry) - query_run_mock.side_effect = router_status + + entry_with_measurement = get_router_status_entry_v3({'w': 'Bandwidth=1 Measured=1'}) + entry_without_measurement = get_router_status_entry_v3() + + query1 = Mock() + query1.download_url = 'http://212.112.245.170:80/tor/status-vote/current/authority' + query1.run.return_value = [entry_with_measurement] * 5935 + [entry_without_measurement] * 1332 + + query2 = Mock() + query2.download_url = 'http://86.59.21.38:80/tor/status-vote/current/authority' + query2.run.return_value = [entry_with_measurement] * 5735 + [entry_without_measurement] * 1690 + + query3 = Mock() + query3.download_url = 'http://128.31.0.39:9131/tor/status-vote/current/authority' + query3.run.return_value = [entry_with_measurement] * 6647 + [entry_without_measurement] * 625 + + query4 = Mock() + query4.download_url = 'http://171.25.193.9:443/tor/status-vote/current/authority' + query4.run.return_value = [entry_with_measurement] * 6313 + [entry_without_measurement] * 1112 + + query_mock.side_effect = [query1, query2, query3, query4] + tutorial_example() self.assertEqual(VOTES_BY_BANDWIDTH_AUTHORITIES_OUTPUT, stdout_mock.getvalue()) @@ -435,10 +448,11 @@ class TestTutorialExamples(unittest.TestCase): for fingerprint, relay in consensus.routers.items(): print "%s: %s" % (fingerprint, relay.nickname) - entry = get_router_status_entry_v3() - network_status = get_network_status_document_v3(routers = (entry,)) + network_status = get_network_status_document_v3(routers = (get_router_status_entry_v3(),)) query_mock().run.return_value = [network_status] parse_file_mock.return_value = itertools.cycle([network_status]) + tutorial_example_1() tutorial_example_2() + self.assertEqual(PERSISTING_A_CONSENSUS_OUTPUT, stdout_mock.getvalue())

1 0