January 2013 - tor-commits - lists.torproject.org

[stem/master] Add unit tests for Controller.get_protocolinfo()
by atagar＠torproject.org 06 Jan '13

06 Jan '13

commit 043fe6aede76ece7c1a2d44f2e738f471892f3ff Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Sat Jan 5 14:22:52 2013 -0700 Add unit tests for Controller.get_protocolinfo() Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/unit/control/controller.py | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index f25b218..b06dfbf 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -157,6 +157,29 @@ class TestControl(unittest.TestCase): mocking.mock_method(Controller, "get_info", mocking.return_value(response)) self.assertRaises(stem.ProtocolError, self.controller.get_socks_listeners) + def test_get_protocolinfo(self): + """ + Exercises the get_protocolinfo() method. + """ + + # Use the handy mocked protocolinfo response. + mocking.mock(stem.connection.get_protocolinfo, mocking.return_value( + mocking.get_protocolinfo_response() + )) + # Compare the str representation of these object, because the class + # does not have, nor need, a direct comparison operator. + self.assertEqual(str(mocking.get_protocolinfo_response()), str(self.controller.get_protocolinfo())) + + # Raise an exception in the stem.connection.get_protocolinfo() call. + mocking.mock(stem.connection.get_protocolinfo, mocking.raise_exception(ProtocolError)) + + # Get a default value when the call fails. + self.assertEqual("default returned", + self.controller.get_protocolinfo(default = "default returned")) + + # No default value, accept the error. + self.assertRaises(ProtocolError, self.controller.get_protocolinfo) + def test_event_listening(self): """ Exercises the add_event_listener and remove_event_listener methods.

1 0

[stem/master] Move test_get_socks_listeners_*() methods up in module
by atagar＠torproject.org 06 Jan '13

06 Jan '13

commit e70af604c1716d6baff3e0e908ecc94e861b2fd3 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Sat Jan 5 14:21:36 2013 -0700 Move test_get_socks_listeners_*() methods up in module Controller.get_socks_listeners() is next after get_version(). Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/unit/control/controller.py | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index 44b7543..f25b218 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -66,24 +66,6 @@ class TestControl(unittest.TestCase): # Turn caching back on before we leave. self.controller._is_caching_enabled = True - def test_event_listening(self): - """ - Exercises the add_event_listener and remove_event_listener methods. - """ - - # set up for failure to create any events - mocking.mock_method(Controller, "get_version", mocking.return_value(stem.version.Version('0.1.0.14'))) - self.assertRaises(InvalidRequest, self.controller.add_event_listener, mocking.no_op(), EventType.BW) - - # set up to only fail newer events - mocking.mock_method(Controller, "get_version", mocking.return_value(stem.version.Version('0.2.0.35'))) - - # EventType.BW is one of the earliest events - self.controller.add_event_listener(mocking.no_op(), EventType.BW) - - # EventType.SIGNAL was added in tor version 0.2.3.1-alpha - self.assertRaises(InvalidRequest, self.controller.add_event_listener, mocking.no_op(), EventType.SIGNAL) - def test_get_socks_listeners_old(self): """ Exercises the get_socks_listeners() method as though talking to an old tor @@ -175,6 +157,24 @@ class TestControl(unittest.TestCase): mocking.mock_method(Controller, "get_info", mocking.return_value(response)) self.assertRaises(stem.ProtocolError, self.controller.get_socks_listeners) + def test_event_listening(self): + """ + Exercises the add_event_listener and remove_event_listener methods. + """ + + # set up for failure to create any events + mocking.mock_method(Controller, "get_version", mocking.return_value(stem.version.Version('0.1.0.14'))) + self.assertRaises(InvalidRequest, self.controller.add_event_listener, mocking.no_op(), EventType.BW) + + # set up to only fail newer events + mocking.mock_method(Controller, "get_version", mocking.return_value(stem.version.Version('0.2.0.35'))) + + # EventType.BW is one of the earliest events + self.controller.add_event_listener(mocking.no_op(), EventType.BW) + + # EventType.SIGNAL was added in tor version 0.2.3.1-alpha + self.assertRaises(InvalidRequest, self.controller.add_event_listener, mocking.no_op(), EventType.SIGNAL) + def test_get_streams(self): """ Exercises the get_streams() method.

1 0

[stem/master] Expansion of Controller unit tests
by atagar＠torproject.org 06 Jan '13

06 Jan '13

commit d580192a95d0b323165cf22cfb8bbaca11af9600 Merge: 04546f8 37fd201 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 6 15:07:44 2013 -0800 Expansion of Controller unit tests Several nice additions from Sean... https://trac.torproject.org/7874 test/unit/control/controller.py | 212 +++++++++++++++++++++++++++++---------- 1 files changed, 158 insertions(+), 54 deletions(-)

1 0

[stem/master] Add unit tests for Controller.get_network_status()
by atagar＠torproject.org 06 Jan '13

06 Jan '13

commit 37fd201683180377ae7dfe0e908c199433166b12 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Sat Jan 5 14:23:45 2013 -0700 Add unit tests for Controller.get_network_status() Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/unit/control/controller.py | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index b06dfbf..af6df3b 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -5,6 +5,7 @@ integ tests, but a few bits lend themselves to unit testing. import unittest +import stem.descriptor.router_status_entry import stem.socket import stem.version @@ -180,6 +181,41 @@ class TestControl(unittest.TestCase): # No default value, accept the error. self.assertRaises(ProtocolError, self.controller.get_protocolinfo) + def test_get_network_status(self): + """ + Exercises the get_network_status() method. + """ + + # Build a single router status entry. + nickname = "Beaver" + fingerprint = "/96bKo4soysolMgKn5Hex2nyFSY" + desc = "r %s %s u5lTXJKGsLKufRLnSyVqT7TdGYw 2012-12-30 22:02:49 77.223.43.54 9001 0\ns Fast Named Running Stable Valid\nw Bandwidth=75" % (nickname, fingerprint) + router = stem.descriptor.router_status_entry.RouterStatusEntryV2(desc) + + # Always return the same router status entry. + mocking.mock_method(Controller, "get_info", mocking.return_value(desc)) + + # Pretend to get the router status entry with its name. + self.assertEqual(router, self.controller.get_network_status(nickname)) + + # Pretend to get the router status entry with its fingerprint. + hex_fingerprint = stem.descriptor.router_status_entry._decode_fingerprint(fingerprint, False) + self.assertEqual(router, self.controller.get_network_status(hex_fingerprint)) + + # Mangle hex fingerprint and try again. + hex_fingerprint = hex_fingerprint[2:] + self.assertRaises(ValueError, self.controller.get_network_status, hex_fingerprint) + + # Raise an exception in the get_info() call. + mocking.mock_method(Controller, "get_info", mocking.raise_exception(InvalidArguments)) + + # Get a default value when the call fails. + self.assertEqual("default returned", + self.controller.get_network_status(nickname, default = "default returned")) + + # No default value, accept the error. + self.assertRaises(InvalidArguments, self.controller.get_network_status, nickname) + def test_event_listening(self): """ Exercises the add_event_listener and remove_event_listener methods.

1 0

[stem/master] Use isinstance for type checks
by atagar＠torproject.org 06 Jan '13

06 Jan '13

commit 1bb38dd2460c0674d97d88504763b2c63ba6e72b Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Jan 4 15:32:34 2013 -0700 Use isinstance for type checks Change the four uses of type() == x to the more Pythonic isinstance idiom. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- stem/control.py | 4 ++-- stem/descriptor/__init__.py | 2 +- stem/util/conf.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stem/control.py b/stem/control.py index b22adfd..6dfb7f2 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1467,7 +1467,7 @@ class Controller(BaseController): * :class:`stem.InvalidArguments` if features passed were invalid """ - if type(features) == str: features = [features] + if isinstance(features, str): features = [features] response = self.msg("USEFEATURE %s" % " ".join(features)) stem.response.convert("SINGLELINE", response) @@ -1609,7 +1609,7 @@ class Controller(BaseController): raise stem.InvalidRequest(512, "EXTENDCIRCUIT requires the path prior to version %s" % path_opt_version) args = [circuit_id] - if type(path) == str: path = [path] + if isinstance(path, str): path = [path] if path: args.append(",".join(path)) if purpose: args.append("purpose=%s" % purpose) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index 3aaf5fd..c66f298 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -196,7 +196,7 @@ def _read_until_keywords(keywords, descriptor_file, inclusive = False, ignore_fi content = None if skip else [] ending_keyword = None - if type(keywords) == str: keywords = (keywords,) + if isinstance(keywords, str): keywords = (keywords,) if ignore_first: first_line = descriptor_file.readline() diff --git a/stem/util/conf.py b/stem/util/conf.py index e15313c..7f4cebe 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -586,7 +586,7 @@ class Config(object): :returns: given configuration value with its type inferred with the above rules """ - is_multivalue = type(default) in (list, tuple, dict) + is_multivalue = isinstance(default, (list, tuple, dict)) val = self.get_value(key, default, is_multivalue) if val == default: return val # don't try to infer undefined values

1 0

[stem/master] Use tuple-of-types with isinstance
by atagar＠torproject.org 06 Jan '13

06 Jan '13

commit 04546f858b1c7c7fe737acd0360d3a4c25e83d06 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Fri Jan 4 15:41:16 2013 -0700 Use tuple-of-types with isinstance Move to more Pythonic idiom for multiple type check. This form of isinstance was added in Python 2.2, so it's safe for us to use. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- stem/exit_policy.py | 2 +- stem/util/conf.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 677a3c9..f39fc75 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -88,7 +88,7 @@ class ExitPolicy(object): def __init__(self, *rules): # sanity check the types for rule in rules: - if not (isinstance(rule, str) or isinstance(rule, ExitPolicyRule)): + if not isinstance(rule, (str, ExitPolicyRule)): raise TypeError("Exit policy rules can only contain strings or ExitPolicyRules, got a %s (%s)" % (type(rule), rules)) self._rules = None # lazily loaded series of ExitPolicyRule diff --git a/stem/util/conf.py b/stem/util/conf.py index 7f4cebe..2a6623b 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -539,7 +539,7 @@ class Config(object): else: self._contents[key] = [value] for listener in self._listeners: listener(self, key) - elif isinstance(value, list) or isinstance(value, tuple): + elif isinstance(value, (list, tuple)): if not overwrite and key in self._contents: self._contents[key] += value else: self._contents[key] = value

1 0

[stem/master] Fixing test_reattaching_listeners to work with RUN_ALL
by atagar＠torproject.org 06 Jan '13

06 Jan '13

commit c482e68ebff140bdde174e15566b6be05f5b5dbd Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 6 14:48:31 2013 -0800 Fixing test_reattaching_listeners to work with RUN_ALL Checking the runner's torrc to determine what kind of authentication it's using. This way we can skip this part of the test (rather than fail) for the RUN_COOKIE and RUN_SCOOKIE targets. --- test/integ/control/controller.py | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 36e7f15..3514c23 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -171,16 +171,21 @@ class TestController(unittest.TestCase): event_notice.clear() event_buffer = [] - # reconnect and check that we get events again + # Reconnect and check that we get events again. This is being done by + # calling AUTHENTICATE manually so skipping cookie auth. - controller.connect() - password = "" - if test.runner.CONTROL_PASSWORD: - password = " \"%s\"" % test.runner.CONTROL_PASSWORD - controller.msg("AUTHENTICATE%s" % password) + tor_options = test.runner.get_runner().get_options() - event_notice.wait(2) - self.assertTrue(len(event_buffer) >= 1) + if not test.runner.Torrc.COOKIE in tor_options: + controller.connect() + + if test.runner.Torrc.PASSWORD in tor_options: + controller.msg('AUTHENTICATE "%s"' % test.runner.CONTROL_PASSWORD) + else: + controller.msg('AUTHENTICATE') + + event_notice.wait(2) + self.assertTrue(len(event_buffer) >= 1) def test_getinfo(self): """

1 0

[stem/master] Test different authentication styles with passwords
by atagar＠torproject.org 06 Jan '13

06 Jan '13

commit 01cfab7d61cb167a786c509afb505ac9546e728b Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Sun Jan 6 08:48:51 2013 -0700 Test different authentication styles with passwords This restores testing various authentication paths and keeps password use, if available. RUN_COOKIE and RUN_SCOOKIE targets still do not work. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/integ/control/controller.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 22d06be..36e7f15 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -160,7 +160,7 @@ class TestController(unittest.TestCase): # reconnect and check that we get events again controller.connect() - controller.authenticate(password = test.runner.CONTROL_PASSWORD) + stem.connection.authenticate(controller, password = test.runner.CONTROL_PASSWORD) event_notice.wait(2) self.assertTrue(len(event_buffer) >= 1) @@ -174,7 +174,10 @@ class TestController(unittest.TestCase): # reconnect and check that we get events again controller.connect() - controller.authenticate(password = test.runner.CONTROL_PASSWORD) + password = "" + if test.runner.CONTROL_PASSWORD: + password = " \"%s\"" % test.runner.CONTROL_PASSWORD + controller.msg("AUTHENTICATE%s" % password) event_notice.wait(2) self.assertTrue(len(event_buffer) >= 1)

1 0

r25990: {website} Dropping project stubs Removing the remaining stubs as previ (website/trunk/getinvolved/en)
by Damian Johnson 06 Jan '13

06 Jan '13

Author: atagar Date: 2013-01-06 22:31:31 +0000 (Sun, 06 Jan 2013) New Revision: 25990 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Dropping project stubs Removing the remaining stubs as previously discussed (Tor cloud, ExperimenTor, Chutney, and Torperf). I'm also dropping bridge-guard, see my unanswered tor-assistants@ email on 12/28 for why. :) Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2013-01-06 22:22:10 UTC (rev 25989) +++ website/trunk/getinvolved/en/volunteer.wml 2013-01-06 22:31:31 UTC (rev 25990) @@ -177,14 +177,6 @@ </tr> <tr class="alt"> - <td><a href="#project-torcloud">Tor cloud</a></td> - <td>OS image</td> - <td>Sys Admin</td> - <td>Light</td> - <td>runa</td> - </tr> - - <tr> <td>*<a href="#project-torouter">Torouter</a></td> <td>OS image</td> <td>Sys Admin</td> @@ -192,7 +184,7 @@ <td>ioerror</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-torsocks">Torsocks</a></td> <td>Usability</td> <td>C</td> @@ -200,7 +192,7 @@ <td>ioerror, nickm</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-torbirdy">TorBirdy</a></td> <td>Browser Add-on</td> <td>JavaScript</td> @@ -208,7 +200,7 @@ <td>Sukhbir (sukhe), ioerror</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-obfsproxy">Obfsproxy</a></td> <td>Client Add-on</td> <td>C, Python</td> @@ -216,7 +208,7 @@ <td>asn, nickm</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-flash-proxy">Flash Proxy</a></td> <td>Client Add-on</td> <td>Python, JavaScript, Go</td> @@ -224,14 +216,6 @@ <td>dcf, aallai, jct</td> </tr> - <tr class="alt"> - <td><a href="#project-brdgrd">bridge-guard</a></td> - <td>Client Add-on</td> - <td>C</td> - <td>Light</td> - <td>phw</td> - </tr> - <tr> <td>*<a href="#project-thandy">Thandy</a></td> <td>Updater</td> @@ -249,22 +233,6 @@ </tr> <tr> - <td><a href="#project-experimentor">ExperimenTor</a></td> - <td>Simulator</td> - <td>C, Perl</td> - <td>Light</td> - <td></td> - </tr> - - <tr class="alt"> - <td><a href="#project-chutney">Chutney</a></td> - <td>Simulator</td> - <td>Python</td> - <td>Light</td> - <td>nickm</td> - </tr> - - <tr> <td><a href="#project-stem">Stem</a></td> <td>Library</td> <td>Python</td> @@ -321,14 +289,6 @@ </tr> <tr class="alt"> - <td><a href="#project-torperf">Torperf</a></td> - <td>Client Service</td> - <td>C, Python</td> - <td>Light</td> - <td>karsten</td> - </tr> - - <tr> <td><a href="#project-onionoo">Onionoo</a></td> <td>Backend Service</td> <td>Java, Python</td> @@ -336,7 +296,7 @@ <td>karsten, gsathya</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-weather">Weather</a></td> <td>Client Service</td> <td>Python</td> @@ -344,7 +304,7 @@ <td>kaner</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-gettor">GetTor</a></td> <td>Client Service</td> <td>Python</td> @@ -352,7 +312,7 @@ <td>kaner</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-torcheck">TorCheck</a></td> <td>Client Service</td> <td>Python, Perl</td> @@ -360,7 +320,7 @@ <td>ioerror</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-bridgedb">BridgeDB</a></td> <td>Backend Service</td> <td>Python</td> @@ -368,7 +328,7 @@ <td>kaner, nickm</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-ooni-probe">Ooni Probe</a></td> <td>Scanner</td> <td>Python</td> @@ -376,7 +336,7 @@ <td>hellais, isis, ioerror</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-torflow">TorFlow</a></td> <td>Backend Service</td> <td>Python</td> @@ -384,7 +344,7 @@ <td>aagbsn, mikeperry</td> </tr> - <tr class="alt"> + <tr> <td>*<a href="#project-torbel">TorBEL</a></td> <td>Backend Service</td> <td>Python</td> @@ -392,7 +352,7 @@ <td>Sebastian</td> </tr> - <tr> + <tr class="alt"> <td><a href="#project-tor2web">Tor2web</a></td> <td>Client Service</td> <td>Python</td> @@ -400,7 +360,7 @@ <td>hellais</td> </tr> - <tr class="alt"> + <tr> <td><a href="#project-anonbib">Anonbib</a></td> <td>Website</td> <td>Python</td> @@ -601,13 +561,6 @@ purpose is to securely host a Tor server purely in RAM. </p> - <a id="project-torcloud"></a> - <h3><a href="https://cloud.torproject.org/">Tor cloud</a></h3> - - <p> - Tor cloud - </p> - <a id="project-torouter"></a> <h3><a href="<wiki>doc/Torouter">Torouter</a> (<a @@ -687,16 +640,6 @@ address-based blocking. </p> - <a id="project-brdgrd"></a> - <h3><a href="https://gitweb.torproject.org/brdgrd.git/blob/HEAD:/README">bridge-guard</a> (<a - href="https://gitweb.torproject.org/brdgrd.git/tree">code</a>)</h3> - - <p> - brgbrd ("bridge guard") is a simple script that can be run on a - Tor bridge to induce the Tor clients connecting to it to be less - blockable. - </p> - <a id="project-thandy"></a> <h3>Thandy (<a href="https://gitweb.torproject.org/thandy.git">code</a>)</h3> @@ -726,20 +669,6 @@ accurate, efficient, controlled, and repeatable Tor experimentation. </p> - <a id="project-experimentor"></a> - <h3>ExperimenTor</h3> - - <p> - ExperimenTor - </p> - - <a id="project-chutney"></a> - <h3>Chutney</h3> - - <p> - Chutney - </p> - <a id="project-stem"></a> <h3><a href="https://stem.torproject.org/">Stem</a> (<a href="https://gitweb.torproject.org/stem.git">code</a>, <a @@ -840,13 +769,6 @@ <i><a href="#compassRefactoring">Compass Refactoring</a></i> </p> - <a id="project-torperf"></a> - <h3>Torperf</h3> - - <p> - TorPerf - </p> - <a id="project-onionoo"></a> <h3><a href="<page projects/onionoo>">Onionoo</a> (<a href="https://gitweb.torproject.org/onionoo.git">java codebase</a>, <a

1 0

r25989: {website} Fixing website build Commit r25988 was missing a quote, brea (website/trunk/press/en)
by Damian Johnson 06 Jan '13

06 Jan '13

Author: atagar Date: 2013-01-06 22:22:10 +0000 (Sun, 06 Jan 2013) New Revision: 25989 Modified: website/trunk/press/en/press.wml Log: Fixing website build Commit r25988 was missing a quote, breaking the site build... mp4h: ERROR:en/press.wml:45: EOF when reading argument of the <tr> tag ** WML:Break: Error in Pass 2 (rc=1). make[1]: *** [press.html.en] Error 1 make[1]: Leaving directory `/home/atagar/Desktop/tor/website/trunk/press' make: *** [press] Error 2 Modified: website/trunk/press/en/press.wml =================================================================== --- website/trunk/press/en/press.wml 2013-01-06 18:19:29 UTC (rev 25988) +++ website/trunk/press/en/press.wml 2013-01-06 22:22:10 UTC (rev 25989) @@ -42,7 +42,7 @@ <th>Topic</th> </tr> </thead> -<tr style="background-color: #e5e5e5;> +<tr style="background-color: #e5e5e5;"> <td>2012 Dec 17</td> <td>Wall Street Journal</td> <td><a href="http://online.wsj.com/article/SB10001424127887324677204578185382377144280.h…">Tor: An Anonymous, And Controversial, Way to Web-Surf</a></td>

1 0