November 2011 - tor-commits - lists.torproject.org

[tor/maint-0.2.2] Get rid of an unused parameter warning on win
by nickm＠torproject.org 21 Nov '11

21 Nov '11

commit 3dc2a1c62cf01218f1a1afc03e54b0b2b52046e7 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Aug 9 11:00:25 2011 +0200 Get rid of an unused parameter warning on win This is a backport of bed79c47f4ec0ee72b19e2b81c54131d516d07ef which accidentally only went into master --- src/common/util.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index de1ca36..7675ede 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1698,6 +1698,8 @@ check_private_dir(const char *dirname, cpd_check_t check, struct passwd *pw = NULL; uid_t running_uid; gid_t running_gid; +#else + (void)effective_user; #endif tor_assert(dirname);

1 0

[tor/maint-0.2.2] Sockets are unsigned on windows
by nickm＠torproject.org 21 Nov '11

21 Nov '11

commit 2efa6eb652d9eb2dd6d91a5e4ef3e9eea1ac7d22 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Aug 9 10:59:03 2011 +0200 Sockets are unsigned on windows this gets rid of a warning about signed/unsigned comparison This is a backport of 0a5338e03cdf14ef80584c6ff8adeb49200b8a76 that accidentally only went into master --- src/common/compat.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/compat.h b/src/common/compat.h index 7e6058a..011b9c8 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -396,7 +396,7 @@ typedef int socklen_t; #ifdef MS_WINDOWS #define tor_socket_t intptr_t -#define SOCKET_OK(s) ((s) != INVALID_SOCKET) +#define SOCKET_OK(s) ((unsigned)(s) != INVALID_SOCKET) #else #define tor_socket_t int #define SOCKET_OK(s) ((s) >= 0)

1 0

[tor/maint-0.2.2] Changes file for bug4521 backports.
by nickm＠torproject.org 21 Nov '11

21 Nov '11

commit fbcd7c01e78c71df479c540c85a7ea94dc02a0a4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 20 20:15:13 2011 -0500 Changes file for bug4521 backports. --- changes/bug4521 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug4521 b/changes/bug4521 new file mode 100644 index 0000000..9b0bae9 --- /dev/null +++ b/changes/bug4521 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Backport fixes for a pair of compilation warnings on Windows. + Fixes bug 4521; bugfix on 0.2.2.28-beta and on 0.2.2.29-beta.

1 0

[stem/master] System test bugs caught by pylint
by atagar＠torproject.org 20 Nov '11

20 Nov '11

commit 70ab8ff1c2ccb858abe462dd1f9c3e81c1733659 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Nov 19 14:18:13 2011 -0800 System test bugs caught by pylint Couple copy-paste bugs with the system integ tests. --- run_tests.py | 1 - test/integ/util/system.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/run_tests.py b/run_tests.py index 41df4bf..2358356 100755 --- a/run_tests.py +++ b/run_tests.py @@ -4,7 +4,6 @@ Runs unit and integration tests. """ -import os import sys import time import getopt diff --git a/test/integ/util/system.py b/test/integ/util/system.py index 5d4a924..c246d55 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -184,13 +184,13 @@ class TestSystem(unittest.TestCase): self.skipTest("(pwdx unavailable)") # filter the call function to only allow this command - pwdx_prefix = GET_CWD_PWDX % "" + pwdx_prefix = stem.util.system.GET_CWD_PWDX % "" stem.util.system.CALL_MOCKING = lambda cmd: cmd.startswith(pwdx_prefix) runner_pid = test.runner.get_runner().get_pid() self.assertEquals(os.getcwd(), stem.util.system.get_cwd(runner_pid)) - def test_get_cwd_pwdx(self): + def test_get_cwd_lsof(self): """ Tests the get_pid_by_cwd function with a lsof response. """

1 0

[stem/master] Color for testing output
by atagar＠torproject.org 20 Nov '11

20 Nov '11

commit ff5895f821370fe34609388fa44ebfb6cb1ff923 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Nov 19 15:37:11 2011 -0800 Color for testing output Applying color to the unittest output: green for success, blue for skips, red for failure. Bit easier on the eyes and makes issues easier to spot (at least on my terminal). --- run_tests.py | 47 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 41 insertions(+), 6 deletions(-) diff --git a/run_tests.py b/run_tests.py index 2358356..6f67d03 100755 --- a/run_tests.py +++ b/run_tests.py @@ -9,6 +9,7 @@ import time import getopt import logging import unittest +import StringIO import test.runner import test.unit.types.control_message @@ -70,6 +71,36 @@ Runs tests for the stem library. %s """ +# TODO: add an option to disable output coloring? + +HEADER_ATTR = (term.Color.CYAN, term.Attr.BOLD) +CATEGORY_ATTR = (term.Color.GREEN, term.Attr.BOLD) +DEFAULT_TEST_ATTR = (term.Color.CYAN,) + +TEST_OUTPUT_ATTR = { + "... ok": (term.Color.GREEN,), + "... FAIL": (term.Color.RED, term.Attr.BOLD), + "... ERROR": (term.Color.RED, term.Attr.BOLD), + "... skipped": (term.Color.BLUE,), +} + +def print_divider(msg, is_header = False): + attr = HEADER_ATTR if is_header else CATEGORY_ATTR + print term.format("%s\n%s\n%s\n" % (DIVIDER, msg.center(70), DIVIDER), *attr) + +def print_test_results(test_results): + test_results.seek(0) + for line in test_results.readlines(): + line_attr = DEFAULT_TEST_ATTR + + for result in TEST_OUTPUT_ATTR: + if result in line: + line_attr = TEST_OUTPUT_ATTR[result] + break + + if line_attr: line = term.format(line, *line_attr) + sys.stdout.write(line) + if __name__ == '__main__': start_time = time.time() run_unit_tests = False @@ -120,18 +151,20 @@ if __name__ == '__main__': sys.exit() if run_unit_tests: - print "%s\n%s\n%s\n" % (DIVIDER, "UNIT TESTS".center(70), DIVIDER) + print_divider("UNIT TESTS", True) for name, test_class in UNIT_TESTS: - print "%s\n%s\n%s\n" % (DIVIDER, name, DIVIDER) + print_divider(name) suite = unittest.TestLoader().loadTestsFromTestCase(test_class) - unittest.TextTestRunner(verbosity=2).run(suite) + test_results = StringIO.StringIO() + unittest.TextTestRunner(test_results, verbosity=2).run(suite) + print_test_results(test_results) print print if run_integ_tests: - print "%s\n%s\n%s\n" % (DIVIDER, "INTEGRATION TESTS".center(70), DIVIDER) + print_divider("INTEGRATION TESTS", True) integ_runner = test.runner.get_runner() stem_logger = logging.getLogger("stem") @@ -144,10 +177,12 @@ if __name__ == '__main__': print for name, test_class in INTEG_TESTS: - print "%s\n%s\n%s\n" % (DIVIDER, name, DIVIDER) + print_divider(name) stem_logger.info("STARTING INTEGRATION TEST => %s" % name) suite = unittest.TestLoader().loadTestsFromTestCase(test_class) - unittest.TextTestRunner(verbosity=2).run(suite) + test_results = StringIO.StringIO() + unittest.TextTestRunner(test_results, verbosity=2).run(suite) + print_test_results(test_results) print except OSError: pass

1 0

[stem/master] Dropping log inference from conf util
by atagar＠torproject.org 20 Nov '11

20 Nov '11

commit 314804dfce5069a13f07b79e5640e2e1b57e924f Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Nov 19 22:05:52 2011 -0800 Dropping log inference from conf util The config's get method inference for logging runlevels no longer makes sense since the log util has been removed. Dropping this inference entirely rather than trying to make it work with logging - those config options have always been unused anyway. --- stem/util/conf.py | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/stem/util/conf.py b/stem/util/conf.py index 7ba2f11..799d81c 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -273,11 +273,6 @@ class Config(): * values are split into key/value pairs on "=>" with extra whitespace stripped - - key starts with "log." => stem.util.log.Runlevel - * values are case insensitive - * 'none' values are mapped to None - * provides the default if the value isn't a runlevel or 'none' - Arguments: key (str) - config setting to be fetched default (object) - value provided if no such key exists or fails to be @@ -324,14 +319,6 @@ class Config(): msg = "Ignoring invalid %s config entry (expected a mapping, but \"%s\" was missing \"=>\")" % (key, entry) LOGGER.info(msg) val = valMap - elif key.startswith("log."): - if val.upper() == "NONE": val = None - elif val.upper() in log.Runlevel.values(): val = val.upper() - else: - msg = "Config entry '%s' is expected to be a runlevel" % key - if default != None: msg += ", defaulting to '%s'" % default - LOGGER.info(msg) - val = default return val

1 0

[stem/master] Unit test for relative cookie expansion
by atagar＠torproject.org 20 Nov '11

20 Nov '11

commit 2c4686adcecbe73c32250b6201a3970284a1ca8a Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Nov 19 23:16:26 2011 -0800 Unit test for relative cookie expansion Now that we have system call mocking we can have a unit test for expanding relative cookie paths. It kinda bugged me that testing wasn't complaining when we had a system api change. :) --- test/unit/connection/protocolinfo_response.py | 37 +++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/test/unit/connection/protocolinfo_response.py b/test/unit/connection/protocolinfo_response.py index 0dcde95..b9dcbb8 100644 --- a/test/unit/connection/protocolinfo_response.py +++ b/test/unit/connection/protocolinfo_response.py @@ -41,6 +41,12 @@ MINIMUM_RESPONSE = """250-PROTOCOLINFO 5 250 OK """.replace("\n", "\r\n") +RELATIVE_COOKIE_PATH = r"""250-PROTOCOLINFO 1 +250-AUTH METHODS=COOKIE COOKIEFILE="./tor-browser_en-US/Data/control_auth_cookie" +250-VERSION Tor="0.2.1.30" +250 OK +""".replace("\n", "\r\n") + class TestProtocolInfoResponse(unittest.TestCase): """ Tests the parsing of ControlMessages for PROTOCOLINFO responses. @@ -141,4 +147,35 @@ class TestProtocolInfoResponse(unittest.TestCase): self.assertEquals((), control_message.unknown_auth_methods) self.assertEquals(None, control_message.cookie_file) self.assertEquals(None, control_message.socket) + + def test_relative_cookie(self): + """ + Checks an authentication cookie with a relative path where expansion both + succeeds and fails. + """ + + # we need to mock both pid and cwd lookups since the general cookie + # expanion works by... + # - resolving the pid of the "tor" process + # - using that to get tor's cwd + + def call_mocking(command): + if command == stem.util.system.GET_PID_BY_NAME_PGREP % "tor": + return ["10"] + if command == stem.util.system.GET_CWD_PWDX % 10: + return ["10: /tmp/foo"] + + stem.util.system.CALL_MOCKING = call_mocking + + control_message = stem.types.read_message(StringIO.StringIO(RELATIVE_COOKIE_PATH)) + stem.connection.ProtocolInfoResponse.convert(control_message) + self.assertEquals("/tmp/foo/tor-browser_en-US/Data/control_auth_cookie", control_message.cookie_file) + + # exercise cookie expansion where both calls fail (should work, just + # leaving the path unexpanded) + + stem.util.system.CALL_MOCKING = lambda cmd: None + control_message = stem.types.read_message(StringIO.StringIO(RELATIVE_COOKIE_PATH)) + stem.connection.ProtocolInfoResponse.convert(control_message) + self.assertEquals("./tor-browser_en-US/Data/control_auth_cookie", control_message.cookie_file)

1 0

[stem/master] Using new system api for protocolinfo queries
by atagar＠torproject.org 20 Nov '11

20 Nov '11

commit 5847301f6011df37d517041c00ff23419e107316 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Nov 19 22:25:21 2011 -0800 Using new system api for protocolinfo queries The protocolinfo uses system utils for expansion of relative cookie paths. Making it use the new api (the breakup of the get_pid_by_* functions was largely for this class). --- stem/connection.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/stem/connection.py b/stem/connection.py index 2b96899..3165fba 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -158,8 +158,12 @@ class ProtocolInfoResponse(stem.types.ControlMessage): # attempt to expand relative cookie paths if stem.util.system.is_relative_path(self.cookie_file): try: - tor_pid = stem.util.system.get_pid("tor", suppress_exc = False) - tor_cwd = stem.util.system.get_cwd(tor_pid, False) + tor_pid = stem.util.system.get_pid_by_name("tor") + if not tor_pid: raise IOError("pid lookup failed") + + tor_cwd = stem.util.system.get_cwd(tor_pid) + if not tor_cwd: raise IOError("cwd lookup failed") + self.cookie_file = stem.util.system.expand_path(self.cookie_file, tor_cwd) except IOError, exc: LOGGER.debug("unable to expand relative tor cookie path: %s" % exc)

1 0

[stem/master] Runner startup argument for tor connection type
by atagar＠torproject.org 20 Nov '11

20 Nov '11

commit a34316c59efbce56b82214bc257d8ddfa11e489c Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Nov 20 00:55:15 2011 -0800 Runner startup argument for tor connection type Integration tests are about to get an option for exercising multiple connection methods, so adding a runner initialization argument for starting with a torrc for all of the connection methods that we care about. This also includes a minor fix where we'd get a stacktrace when the torrc had an empty line. --- test/runner.py | 53 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 49 insertions(+), 4 deletions(-) diff --git a/test/runner.py b/test/runner.py index 613b3b2..80f481b 100644 --- a/test/runner.py +++ b/test/runner.py @@ -26,6 +26,7 @@ import threading import stem.process import stem.util.conf +import stem.util.enum import stem.util.term as term DEFAULT_CONFIG = { @@ -34,14 +35,19 @@ DEFAULT_CONFIG = { "test.integ.run.online": False, } +# Methods for connecting to tor. General integration tests only run with the +# DEFAULT_TOR_CONNECTION, but expanded integ tests will run with all of them. + +TorConnection = stem.util.enum.Enum("NONE", "NO_AUTH", "PASSWORD", "COOKIE", "MULTIPLE", "SOCKET") +DEFAULT_TOR_CONNECTION = TorConnection.NO_AUTH + STATUS_ATTR = (term.Color.BLUE, term.Attr.BOLD) SUBSTATUS_ATTR = (term.Color.BLUE, ) ERROR_ATTR = (term.Color.RED, term.Attr.BOLD) -BASIC_TORRC = """# configuration for stem integration tests +BASE_TORRC = """# configuration for stem integration tests DataDirectory %s SocksPort 0 -ControlPort 1111 """ # We make some paths relative to stem's base directory (the one above us) @@ -51,6 +57,16 @@ STEM_BASE = "/".join(__file__.split("/")[:-2]) # singleton Runner instance INTEG_RUNNER = None +# control authentication options and attributes +CONTROL_PASSWORD = "pw" +CONTROL_PORT = 1111 +CONTROL_SOCKET_PATH = "/tmp/stem_integ_socket" + +OPT_PORT = "ControlPort %i" % CONTROL_PORT +OPT_COOKIE = "CookieAuthentication 1" +OPT_PASSWORD = "HashedControlPassword 16:8C423A41EF4A542C6078985270AE28A4E04D056FB63F9F201505DB8E06" +OPT_SOCKET = "ControlSocket %s" % CONTROL_SOCKET_PATH + def get_runner(): """ Singleton for the runtime context of integration tests. @@ -60,6 +76,32 @@ def get_runner(): if not INTEG_RUNNER: INTEG_RUNNER = Runner() return INTEG_RUNNER +def get_torrc(connection_type = DEFAULT_TOR_CONNECTION): + """ + Provides a basic torrc with the given connection method. Hashed passwords are + for "pw". + """ + + connection_opt, torrc = [], BASE_TORRC + + if connection_type == TorConnection.NONE: + pass + elif connection_type == TorConnection.NO_AUTH: + connection_opt = [OPT_PORT] + elif connection_type == TorConnection.PASSWORD: + connection_opt = [OPT_PORT, OPT_PASSWORD] + elif connection_type == TorConnection.COOKIE: + connection_opt = [OPT_PORT, OPT_COOKIE] + elif connection_type == TorConnection.MULTIPLE: + connection_opt = [OPT_PORT, OPT_PASSWORD, OPT_COOKIE] + elif connection_type == TorConnection.SOCKET: + connection_opt = [OPT_SOCKET] + + if connection_opt: + torrc += "\n" + "\n".join(connection_opt) + + return torrc + class RunnerStopped(Exception): "Raised when we try to use a Runner that doesn't have an active tor instance" pass @@ -74,12 +116,14 @@ class Runner: self._torrc_contents = "" self._tor_process = None - def start(self, quiet = False, config_path = None): + def start(self, connection_type = DEFAULT_TOR_CONNECTION, quiet = False, config_path = None): """ Makes temporary testing resources and starts tor, blocking until it completes. Arguments: + connection_type (TorConnection) - method for controllers to authenticate + to tor quiet (bool) - if False then this prints status information as we start up to stdout config_path (str) - path to a custom test configuration @@ -109,7 +153,7 @@ class Runner: else: self._test_dir = tempfile.mktemp("-stem-integ") - self._torrc_contents = BASIC_TORRC % self._test_dir + self._torrc_contents = get_torrc(connection_type) % self._test_dir try: self._run_setup(quiet) @@ -214,6 +258,7 @@ class Runner: for line in torrc_contents.split("\n"): line_comp = line.strip().split() + if not line_comp: continue if line_comp[0] == "ControlPort": if len(line_comp) == 2 and line_comp[1].isdigit():

1 0

[stem/master] Integration test for general PROTOCOLINFO parsing
by atagar＠torproject.org 20 Nov '11

20 Nov '11

commit 7b302e2eac72d9c3b4f09b705fd6c3adcb755f84 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Nov 19 23:58:26 2011 -0800 Integration test for general PROTOCOLINFO parsing Integ test for parsing a PROTOCOLINFO reply from our general integraion test instance. We'll need a separate target for testing multiple connection methods (password auth, cookie auth, and control socket). This also includes a fix for the Version class (equality checks with non-Version instaces would raise an exception - didn't expect __cmp__ to be used for that...). --- run_tests.py | 2 + stem/types.py | 2 +- test/integ/connection/__init__.py | 6 +++ test/integ/connection/protocolinfo_response.py | 50 ++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 1 deletions(-) diff --git a/run_tests.py b/run_tests.py index 6f67d03..05aa848 100755 --- a/run_tests.py +++ b/run_tests.py @@ -21,6 +21,7 @@ import test.unit.util.system import test.integ.types.control_message import test.integ.util.conf import test.integ.util.system +import test.integ.connection.protocolinfo_response import stem.util.enum import stem.util.term as term @@ -39,6 +40,7 @@ UNIT_TESTS = (("stem.types.ControlMessage", test.unit.types.control_message.Test ) INTEG_TESTS = (("stem.types.ControlMessage", test.integ.types.control_message.TestControlMessage), + ("stem.connection.ProtocolInfoResponse", test.integ.connection.protocolinfo_response.TestProtocolInfoResponse), ("stem.util.conf", test.integ.util.conf.TestConf), ("stem.util.system", test.integ.util.system.TestSystem), ) diff --git a/stem/types.py b/stem/types.py index 78e2fd9..45b040f 100644 --- a/stem/types.py +++ b/stem/types.py @@ -521,7 +521,7 @@ class Version: """ if not isinstance(other, Version): - raise ValueError("types.Version can only be compared with other Version instances") + return 1 # this is also used for equality checks for attr in ("major", "minor", "micro", "patch"): my_version = max(0, self.__dict__[attr]) diff --git a/test/integ/connection/__init__.py b/test/integ/connection/__init__.py new file mode 100644 index 0000000..6a71f2a --- /dev/null +++ b/test/integ/connection/__init__.py @@ -0,0 +1,6 @@ +""" +Integration tests for stem.connection. +""" + +__all__ = ["protocolinfo_response"] + diff --git a/test/integ/connection/protocolinfo_response.py b/test/integ/connection/protocolinfo_response.py new file mode 100644 index 0000000..67c0582 --- /dev/null +++ b/test/integ/connection/protocolinfo_response.py @@ -0,0 +1,50 @@ +""" +Integration tests for the stem.connections.ProtocolInfoResponse class. +""" + +import socket +import unittest + +import test.runner +import stem.types +import stem.connection + +class TestProtocolInfoResponse(unittest.TestCase): + """ + Processes a ProtocolInfo query for a variety of setups. + """ + + def testProtocolInfoResponse(self): + """ + Makes a PROTOCOLINFO query and processes the response for our control + connection. + """ + + runner = test.runner.get_runner() + + control_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + control_socket.connect(("127.0.0.1", runner.get_control_port())) + control_socket_file = control_socket.makefile() + + control_socket_file.write("PROTOCOLINFO\r\n") + control_socket_file.flush() + + protocolinfo_response = stem.types.read_message(control_socket_file) + stem.connection.ProtocolInfoResponse.convert(protocolinfo_response) + + # according to the control spec the following _could_ differ or be + # undefined but if that actually happens then it's gonna make people sad + + self.assertEqual(1, protocolinfo_response.protocol_version) + self.assertNotEqual(None, protocolinfo_response.tor_version) + self.assertNotEqual(None, protocolinfo_response.auth_methods) + + # TODO: The following is for the default integ test configuration. We + # should run tests that exercise all of tor's startup configs + # (password/cookie auth and control sockets) + + self.assertEqual((stem.connection.AuthMethod.NONE,), protocolinfo_response.auth_methods) + self.assertEqual((), protocolinfo_response.unknown_auth_methods) + self.assertEqual(None, protocolinfo_response.cookie_file) + self.assertEqual(None, protocolinfo_response.socket) +

1 0