tor-commits February 2015

tor-commits@lists.torproject.org

15 participants
2121 discussions

[webwml/master] Nobody wants irix or mac os x 10.2 systems
by sebastian＠torproject.org 09 Feb '15

09 Feb '15

commit 0e965dd5b3d93a40592af34fc09953e6c612e7fd Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Feb 9 05:54:11 2015 +0100 Nobody wants irix or mac os x 10.2 systems --- donate/en/donate-hardware.wml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/donate/en/donate-hardware.wml b/donate/en/donate-hardware.wml index e605dd2..6dbe35d 100644 --- a/donate/en/donate-hardware.wml +++ b/donate/en/donate-hardware.wml @@ -14,10 +14,9 @@ that could be used to provide the infrastructure that supports Tor's operations, including website mirrors, database servers, build systems and legacy hardware for supporting packages on older Operating - Systems; such as OS X 10.2, OS X 10.3, Windows XP, Windows 7, IRIX, - Redhat, CentOS, Fedora, Debian, etc. A number of service providers - have an abundance of bandwidth capacity, but need hardware in order - to donate it to us.</p> + Systems; Windows 7, Redhat, CentOS, Fedora, Debian, etc. A number of + service providers have an abundance of bandwidth capacity, but need + hardware in order to donate it to us.</p> <p>By donating hardware, you're joining our many <a href="<page about/sponsors>">sponsors</a> in providing online privacy and anonymity. If

1 0

[webwml/master] Remove duplicated mission statement from become-sponsor
by sebastian＠torproject.org 09 Feb '15

09 Feb '15

commit 18965ae70eb6b896c4b08bcc9602d61f52cf6c5d Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Feb 9 05:45:25 2015 +0100 Remove duplicated mission statement from become-sponsor --- donate/en/become-sponsor.wml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/donate/en/become-sponsor.wml b/donate/en/become-sponsor.wml index 888a12a..1d1bb18 100644 --- a/donate/en/become-sponsor.wml +++ b/donate/en/become-sponsor.wml @@ -23,19 +23,6 @@ through various <a href="<page about/sponsors>">sponsors</a>. Our <a href="https://trac.torproject.org/projects/tor/wiki/org/sponsors">current list of projects</a> is available. Please join us to further online anonymity!</p>  -  - <h2>Tor's Mission Statement is:</h2> - <p><i>The Corporation is organized and shall be operated exclusively for - scientific, charitable and educational purposes within the meaning - of section 501(c)(3) of the Internal Revenue Code, including (a) - to develop, improve and distribute free, publicly available tools - and programs that promote free speech, free expression, civic - engagement and privacy rights online; (b) to conduct scientific - research regarding, and to promote the use of and knowledge about, - such tools, programs and related issues around the world; (c) to - educate the general public around the world about privacy rights - and anonymity issues connected to Internet use.</i></p> -  </div>  <div id = "sidecol">

1 0

[stem/master] Integ test for when spawning a tor process fails
by atagar＠torproject.org 09 Feb '15

09 Feb '15

commit e006b5660eab77679939f6cbe329a71dbc3bed34 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 1 13:23:37 2015 -0800 Integ test for when spawning a tor process fails Spotted that we're missing a test for this while looking into an issue where we possibly leave lingering tor processes... https://trac.torproject.org/projects/tor/ticket/14419 --- test/integ/process.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/test/integ/process.py b/test/integ/process.py index bd080b6..163fd2b 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -67,6 +67,32 @@ class TestProcess(unittest.TestCase): tor_process.kill() tor_process.wait() + def test_with_invalid_config(self): + """ + Spawn a tor process with a configuration that should make it dead on arrival. + """ + + if test.runner.only_run_once(self, 'test_with_invalid_config'): + return + + # Set the same SocksPort and ControlPort, this should fail with... + # + # [warn] Failed to parse/validate config: Failed to bind one of the listener ports. + # [err] Reading config failed--see warnings above. + + try: + stem.process.launch_tor_with_config( + tor_cmd = test.runner.get_runner().get_tor_command(), + config = { + 'SocksPort': '2777', + 'ControlPort': '2777', + 'DataDirectory': self.data_directory, + }, + ) + self.fail("We should abort when there's an identical SocksPort and ControlPort") + except OSError as exc: + self.assertEqual('Process terminated: Failed to bind one of the listener ports.', str(exc)) + def test_launch_tor_with_timeout(self): """ Runs launch_tor where it times out before completing.

1 0

[stem/master] Test that 'tor --version' matches 'GETINFO version'
by atagar＠torproject.org 09 Feb '15

09 Feb '15

commit 852423c08b67a40eea6414a0118e8b747c8e5ef1 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Feb 2 09:16:52 2015 -0800 Test that 'tor --version' matches 'GETINFO version' Improved version of test_cmdline_args.py's test_version(). This is kinda a duplicate of test/integ/version.py's test_get_system_tor_version_value(), but checks this a bit more directly. Besides, it gets us to lay the groundwork for the other tests. --- test/integ/process.py | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/test/integ/process.py b/test/integ/process.py index 163fd2b..88ad8ca 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -29,6 +29,14 @@ class TestProcess(unittest.TestCase): def tearDown(self): shutil.rmtree(self.data_directory) + def test_version_argument(self): + """ + Check that 'tor --version' matches 'GETINFO version'. + """ + + with test.runner.get_runner().get_tor_controller() as controller: + self.assertEqual('Tor version %s.\n' % controller.get_version(), self.run_tor('--version')) + def test_launch_tor_with_config(self): """ Exercises launch_tor_with_config. @@ -191,3 +199,25 @@ class TestProcess(unittest.TestCase): time.sleep(1) self.fail("tor didn't quit after the controller that owned it disconnected") + + def run_tor(self, *args, **kwargs): + # python doesn't allow us to have individual keyword arguments when there's + # an arbitrary number of positional arguments, so explicitly checking + + expect_failure = kwargs.pop('expect_failure', False) + + if kwargs: + raise ValueError("Got unexpected keyword arguments: %s" % kwargs) + + args = [test.runner.get_runner().get_tor_command()] + list(args) + tor_process = subprocess.Popen(args, stdout = subprocess.PIPE) + + stdout = tor_process.communicate()[0] + exit_status = tor_process.poll() + + if exit_status and not expect_failure: + self.fail("Didn't expect tor to be able to start when we run: %s\n%s" % (' '.join(args), stdout)) + elif not exit_status and expect_failure: + self.fail("Tor failed to start when we ran: %s\n%s" % (' '.join(args), stdout)) + + return stdout

1 0

[stem/master] Test that 'tor --quiet' suppresses stdout
by atagar＠torproject.org 09 Feb '15

09 Feb '15

commit c155a8cc80098ff0632055f41248cdac8f699e9e Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Feb 2 09:22:31 2015 -0800 Test that 'tor --quiet' suppresses stdout Simple port of test_cmdline_args.py's test_quiet(). --- test/integ/process.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/integ/process.py b/test/integ/process.py index 88ad8ca..c449db3 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -37,6 +37,13 @@ class TestProcess(unittest.TestCase): with test.runner.get_runner().get_tor_controller() as controller: self.assertEqual('Tor version %s.\n' % controller.get_version(), self.run_tor('--version')) + def test_quiet_argument(self): + """ + Check that we don't provide anything on stdout when running 'tor --quiet'. + """ + + self.assertEqual('', self.run_tor('--quiet', '--invalid_argument', expect_failure = True)) + def test_launch_tor_with_config(self): """ Exercises launch_tor_with_config.

1 0

[stem/master] Test that 'tor --help' provides the expected output
by atagar＠torproject.org 09 Feb '15

09 Feb '15

commit 367794c432b97b79102009ad550911c87f39fe34 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Feb 2 09:57:29 2015 -0800 Test that 'tor --help' provides the expected output Simple port of test_cmdline_args.py's test_help(). --- test/integ/process.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/test/integ/process.py b/test/integ/process.py index c449db3..47a9336 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -37,6 +37,20 @@ class TestProcess(unittest.TestCase): with test.runner.get_runner().get_tor_controller() as controller: self.assertEqual('Tor version %s.\n' % controller.get_version(), self.run_tor('--version')) + def test_help_argument(self): + """ + Check that 'tor --help' provides the expected output. + """ + + help_output = self.run_tor('--help') + + self.assertTrue(help_output.startswith('Copyright (c) 2001')) + self.assertTrue(help_output.endswith('tor -f <torrc> [args]\nSee man page for options, or https://www.torproject.org/ for documentation.\n')) + + # should be an alias for 'tor -h' + + self.assertEqual(help_output, self.run_tor('-h')) + def test_quiet_argument(self): """ Check that we don't provide anything on stdout when running 'tor --quiet'.

1 0

[stem/master] Test that 'tor --hush' only outputs warnings and errors
by atagar＠torproject.org 09 Feb '15

09 Feb '15

commit c15d04d19addaeb5e0e1d3fca4a6ca9e8d7bb1f5 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Feb 2 10:17:53 2015 -0800 Test that 'tor --hush' only outputs warnings and errors Simple port of test_cmdline_args.py's test_hush(). --- test/integ/process.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/test/integ/process.py b/test/integ/process.py index 47a9336..ef4182c 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -56,7 +56,20 @@ class TestProcess(unittest.TestCase): Check that we don't provide anything on stdout when running 'tor --quiet'. """ - self.assertEqual('', self.run_tor('--quiet', '--invalid_argument', expect_failure = True)) + self.assertEqual('', self.run_tor('--quiet', '--invalid_argument', 'true', expect_failure = True)) + + def test_hush_argument(self): + """ + Check that we only get warnings and errors when running 'tor --hush'. + """ + + output = self.run_tor('--hush', '--invalid_argument', expect_failure = True) + self.assertTrue("[warn] Command-line option '--invalid_argument' with no value. Failing." in output) + self.assertTrue("[err] Reading config failed--see warnings above." in output) + + output = self.run_tor('--hush', '--invalid_argument', 'true', expect_failure = True) + self.assertTrue("[warn] Failed to parse/validate config: Unknown option 'invalid_argument'. Failing." in output) + self.assertTrue("[err] Reading config failed--see warnings above." in output) def test_launch_tor_with_config(self): """

1 0

[stem/master] Test 'tor --hash-password'
by atagar＠torproject.org 09 Feb '15

09 Feb '15

commit 186b09101f828b7075c6b3aea096a5cccb20dc71 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Feb 5 08:56:02 2015 -0800 Test 'tor --hash-password' Checking both in the happy case and when we don't provide an argument. --- test/integ/process.py | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/test/integ/process.py b/test/integ/process.py index ef4182c..e1a1432 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -2,6 +2,9 @@ Tests the stem.process functions with various use cases. """ +import binascii +import hashlib +import re import shutil import subprocess import tempfile @@ -71,6 +74,38 @@ class TestProcess(unittest.TestCase): self.assertTrue("[warn] Failed to parse/validate config: Unknown option 'invalid_argument'. Failing." in output) self.assertTrue("[err] Reading config failed--see warnings above." in output) + def test_hash_password(self): + """ + Hash a controller password. It's salted so can't assert that we get a + particular value. Also, tor's output is unnecessarily verbose so including + hush to cut it down. + """ + + output = self.run_tor('--hush', '--hash-password', 'my_password') + self.assertTrue(re.match("^16:[0-9A-F]{58}\n$", output)) + + # I'm not gonna even pretend to understand the following. Ported directly + # from tor's test_cmdline_args.py. + + output_hex = binascii.a2b_hex(output.strip()[3:]) + salt, how, hashed = output_hex[:8], ord(output_hex[8]), output_hex[9:] + count = (16 + (how & 15)) << ((how >> 4) + 6) + stuff = salt + 'my_password' + repetitions = count // len(stuff) + 1 + inp = (stuff * repetitions)[:count] + + self.assertEqual(hashlib.sha1(inp).digest(), hashed) + + def test_hash_password_requires_argument(self): + """ + Check that 'tor --hash-password' balks if not provided with something to + hash. + """ + + output = self.run_tor('--hash-password', expect_failure = True) + self.assertTrue("[warn] Command-line option '--hash-password' with no value. Failing." in output) + self.assertTrue("[err] Reading config failed--see warnings above." in output) + def test_launch_tor_with_config(self): """ Exercises launch_tor_with_config.

1 0

[stem/master] Test 'tor --dump-config' and 'tor --validate-config'
by atagar＠torproject.org 09 Feb '15

09 Feb '15

commit e935661834a27b421509fa82b6a17a4ccc571fa0 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Feb 7 17:07:15 2015 -0800 Test 'tor --dump-config' and 'tor --validate-config' --- test/integ/process.py | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/test/integ/process.py b/test/integ/process.py index e1a1432..65f4a7a 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -106,6 +106,34 @@ class TestProcess(unittest.TestCase): self.assertTrue("[warn] Command-line option '--hash-password' with no value. Failing." in output) self.assertTrue("[err] Reading config failed--see warnings above." in output) + def test_dump_config_argument(self): + """ + Exercises our 'tor --dump-config' arugments. + """ + + short_output = self.run_tor('--dump-config', 'short', with_torrc = True) + non_builtin_output = self.run_tor('--dump-config', 'non-builtin', with_torrc = True) + full_output = self.run_tor('--dump-config', 'full', with_torrc = True) + self.run_tor('--dump-config', 'invalid_option', with_torrc = True, expect_failure = True) + + torrc_contents = [line for line in test.runner.get_runner().get_torrc_contents().splitlines() if not line.startswith('#')] + + self.assertItemsEqual(torrc_contents, short_output.strip().splitlines()) + self.assertItemsEqual(torrc_contents, non_builtin_output.strip().splitlines()) + + for line in torrc_contents: + self.assertTrue(line in full_output) + + def test_validate_config_argument(self): + """ + Exercises our 'tor --validate-config' argument. + """ + + valid_output = self.run_tor('--hush', '--verify-config', with_torrc = True) + self.assertTrue('Configuration was valid\n' in valid_output) + + self.run_tor('--verify-config', '-f', __file__, expect_failure = True) + def test_launch_tor_with_config(self): """ Exercises launch_tor_with_config. @@ -274,10 +302,14 @@ class TestProcess(unittest.TestCase): # an arbitrary number of positional arguments, so explicitly checking expect_failure = kwargs.pop('expect_failure', False) + with_torrc = kwargs.pop('with_torrc', False) if kwargs: raise ValueError("Got unexpected keyword arguments: %s" % kwargs) + if with_torrc: + args = ['-f', test.runner.get_runner().get_torrc_path()] + list(args) + args = [test.runner.get_runner().get_tor_command()] + list(args) tor_process = subprocess.Popen(args, stdout = subprocess.PIPE)

1 0

[stem/master] Test 'tor --list-fingerprint' and 'tor --list-torrc-options'
by atagar＠torproject.org 09 Feb '15

09 Feb '15

commit 776faae5cba979e031f4e2df7586f63a083f6761 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 8 11:08:32 2015 -0800 Test 'tor --list-fingerprint' and 'tor --list-torrc-options' --- test/integ/process.py | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/test/integ/process.py b/test/integ/process.py index 65f4a7a..b9b168a 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -4,6 +4,7 @@ Tests the stem.process functions with various use cases. import binascii import hashlib +import os import re import shutil import subprocess @@ -15,6 +16,7 @@ import stem.prereq import stem.process import stem.socket import stem.util.system +import stem.util.tor_tools import stem.version import test.runner @@ -24,6 +26,14 @@ try: except ImportError: from mock import patch +BASIC_RELAY_TORRC = """\ +ORPort 6000 +Nickname stemIntegTest +ExitPolicy reject *:* +PublishServerDescriptor 0 # don't actually publish to the dirauths +DataDirectory %s +""" + class TestProcess(unittest.TestCase): def setUp(self): @@ -134,6 +144,44 @@ class TestProcess(unittest.TestCase): self.run_tor('--verify-config', '-f', __file__, expect_failure = True) + def test_list_fingerprint_argument(self): + """ + Exercise our 'tor --list-fingerprint' argument. + """ + + # This command should only work with a relay (which our test instance isn't). + + output = self.run_tor('--list-fingerprint', with_torrc = True, expect_failure = True) + self.assertTrue("Clients don't have long-term identity keys. Exiting." in output) + + torrc_path = os.path.join(self.data_directory, 'torrc') + + with open(torrc_path, 'w') as torrc_file: + torrc_file.write(BASIC_RELAY_TORRC % self.data_directory) + + output = self.run_tor('--list-fingerprint', '-f', torrc_path) + nickname, fingerprint_with_spaces = output.splitlines()[-1].split(' ', 1) + fingerprint = fingerprint_with_spaces.replace(' ', '') + + self.assertEqual('stemIntegTest', nickname) + self.assertEqual(49, len(fingerprint_with_spaces)) + self.assertTrue(stem.util.tor_tools.is_valid_fingerprint(fingerprint)) + + with open(os.path.join(self.data_directory, 'fingerprint')) as fingerprint_file: + expected = 'stemIntegTest %s\n' % fingerprint + self.assertEqual(expected, fingerprint_file.read()) + + def test_list_torrc_options_argument(self): + """ + Exercise our 'tor --list-torrc-options' argument. + """ + + output = self.run_tor('--list-torrc-options') + self.assertTrue(len(output.splitlines()) > 50) + self.assertTrue(output.splitlines()[0] <= 'AccountingMax') + self.assertTrue('UseBridges' in output) + self.assertTrue('SocksPort' in output) + def test_launch_tor_with_config(self): """ Exercises launch_tor_with_config.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits February 2015