July 2012 - tor-commits - lists.torproject.org

[stem/master] Add SETCONF integration tests, SingleLineResponse unit tests and the bugfixes that come with them
by atagar＠torproject.org 08 Jul '12

08 Jul '12

commit 85c923bfc784aaf8080e08053ef6b577e8c23944 Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Thu Jun 21 22:08:30 2012 +0530 Add SETCONF integration tests, SingleLineResponse unit tests and the bugfixes that come with them --- stem/control.py | 21 +++++++++++---- test/integ/control/controller.py | 49 ++++++++++++++++++++++++++++++++++++++ test/unit/response/singleline.py | 33 +++++++++++++++++++++++++ 3 files changed, 97 insertions(+), 6 deletions(-) diff --git a/stem/control.py b/stem/control.py index 290f178..0e0d611 100644 --- a/stem/control.py +++ b/stem/control.py @@ -685,21 +685,30 @@ class Controller(BaseController): """ if len(args) == 2: - options = {args[0]: args[1]} + args = {args[0]: args[1]} elif len(args) == 1: - options = args[0] + args = args[0] else: raise TypeError("set_conf expected 1 or 2 arguments, got %d", len(args)) - response = self.msg("SETCONF %s" % " ".join(["=".join(opts) for opts in args.items()])) + options = [] + for key, value in args.iteritems(): + options.append(key + "=\"" + value + "\"") + + response = self.msg("SETCONF %s" % " ".join(options)) stem.response.convert("SINGLELINE", response) if response.is_ok(): return True - elif response.code in ("513", "552", "553"): - raise InvalidRequest(response.code, response.message) + elif response.code == "552": + if response.message.startswith("Unrecognized option: Unknown option '"): + key = response.message[37:response.message.find("\'", 37)] + raise stem.socket.InvalidArguments(response.code, response.message, [key]) + raise stem.socket.InvalidRequest(response.code, response.message) + elif response.code in ("513", "553"): + raise stem.socket.InvalidRequest(response.code, response.message) else: - raise ProtocolError("SETCONF returned unexpected status code") + raise stem.socket.ProtocolError("SETCONF returned unexpected status code") def _case_insensitive_lookup(entries, key): """ diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 55f7210..4a517dd 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -191,4 +191,53 @@ class TestController(unittest.TestCase): self.assertEqual("la-di-dah", controller.get_conf("", "la-di-dah")) self.assertEqual({}, controller.get_conf_map("", "la-di-dah")) self.assertEqual({}, controller.get_conf_map([], "la-di-dah")) + + # context-sensitive keys + + keys = { + "HiddenServiceDir": "/tmp/stemtestdir", + "HiddenServicePort": "17234 127.0.0.1:17235" + } + controller.set_conf(keys) + self.assertEqual("/tmp/stemtestdir", controller.get_conf("HiddenServiceDir")) + self.assertEqual("17234 127.0.0.1:17235", controller.get_conf("HiddenServiceDir")) + + def test_setconf(self): + """ + Exercises SETCONF with valid and invalid requests. + """ + + runner = test.runner.get_runner() + + with runner.get_tor_controller() as controller: + # Single key, valid and invalid + connlimit = int(controller.get_conf("ConnLimit")) + controller.set_conf("connlimit", str(connlimit - 1)) + self.assertEqual(connlimit - 1, int(controller.get_conf("ConnLimit"))) + try: + controller.set_conf("invalidkeyboo", "abcde") + except stem.socket.InvalidArguments, exc: + self.assertEqual(["invalidkeyboo"], exc.arguments) + + settings = { + "connlimit": str(connlimit - 2), + "contactinfo": "stem@testing" + } + controller.set_conf(settings) + self.assertEqual(connlimit - 2, int(controller.get_conf("ConnLimit"))) + self.assertEqual("stem@testing", controller.get_conf("contactinfo")) + + settings["bombay"] = "vadapav" + try: + controller.set_conf(settings) + except stem.socket.InvalidArguments, exc: + self.assertEqual(["bombay"], exc.arguments) + + settings = { + "HiddenServiceDir": "/tmp/stemtestdir", + "HiddenServicePort": "17234 127.0.0.1:17235" + } + controller.set_conf(settings) + self.assertEqual("17234 127.0.0.1:17235", controller.get_conf("hiddenserviceport")) + self.assertEqual("/tmp/stemtestdir", controller.get_conf("hiddenservicedir")) diff --git a/test/unit/response/singleline.py b/test/unit/response/singleline.py new file mode 100644 index 0000000..8781bf9 --- /dev/null +++ b/test/unit/response/singleline.py @@ -0,0 +1,33 @@ +""" +Unit tests for the stem.response.getconf.GetConfResponse class. +""" + +import unittest + +import stem.socket +import stem.response +import test.mocking as mocking + +MULTILINE_RESPONSE = """250-MULTI +250 LINE""" + +class TestSingleLineResponse(unittest.TestCase): + def test_single_line_response(self): + message = mocking.get_message("552 NOTOK") + stem.response.convert("SINGLELINE", message) + self.assertEqual(False, message.is_ok()) + message = mocking.get_message("250 KK") + stem.response.convert("SINGLELINE", message) + self.assertEqual(True, message.is_ok()) + + message = mocking.get_message("250 OK") + stem.response.convert("SINGLELINE", message) + self.assertEqual(True, message.is_ok(True)) + message = mocking.get_message("250 HMM") + stem.response.convert("SINGLELINE", message) + self.assertEqual(False, message.is_ok(True)) + + def test_multi_line_response(self): + message = mocking.get_message(MULTILINE_RESPONSE) + self.assertRaises(stem.socket.ProtocolError, stem.response.convert, "SINGLELINE", message) +

1 0

[stem/master] Splitting set_conf/reset_conf back up
by atagar＠torproject.org 08 Jul '12

08 Jul '12

commit 3d1538746adad85bb7235d8bc7f4b3d93b1f3d50 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 8 12:39:29 2012 -0700 Splitting set_conf/reset_conf back up Ravi made a good point that the set_option() syntax for resetting config options is now worse, so trying a compromise of our approaches. This reintroduces set_conf() and reset_conf() methods, but also keeping my set_options() method to handle the more complicated use cases (batch setconf requests, resetconf with values, and context sensitive options). Personally I found the old set_conf() method confusingly overloaded (python does not handle overloading use cases very well). This solution lets us keep the set_conf() and reset_conf() methods simple, while also providing something that's reasonably intuitive (imho) for the complicated use cases. --- stem/control.py | 49 ++++++++++++++++++++++++-------------- test/integ/control/controller.py | 16 ++++++++---- 2 files changed, 42 insertions(+), 23 deletions(-) diff --git a/stem/control.py b/stem/control.py index ccfeb94..2c12d43 100644 --- a/stem/control.py +++ b/stem/control.py @@ -13,11 +13,12 @@ interacting at a higher level. from_socket_file - Provides a Controller based on a socket file connection. Controller - General controller class intended for direct use. - |- get_info - issues a GETINFO query - |- get_conf - issues a GETCONF query for a single parameter - |- get_conf_mapping - issues a GETCONF query for multiple parameters - |- set_conf - issues a SETCONF query - |- reset_conf - issues a RESETCONF query + |- get_info - issues a GETINFO query for a parameter + |- get_conf - gets the value of a configuration option + |- get_conf_mapping - gets the values of multiple configuration options + |- set_conf - sets the value of a configuration option + |- reset_conf - reverts configuration options to their default values + |- set_options - sets or resets the values of multiple configuration options |- get_version - convenience method to get tor version |- authenticate - convenience method to authenticate the controller +- protocolinfo - convenience method to get the protocol info @@ -664,22 +665,17 @@ class Controller(BaseController): if default != UNDEFINED: return default else: raise exc - def set_option(self, param, value, reset = False): + def set_conf(self, param, value): """ - Changes the value of a tor configuration option via either a SETCONF or - RESETCONF query. Both behave identically unless our value is None, in which - case SETCONF sets the value to 0 or NULL, and RESETCONF returns it to its - default value. - - Our value can be any of the following... + Changes the value of a tor configuration option. Our value can be any of + the following... * a string to set a single value * a list of strings to set a series of values (for instance the ExitPolicy) - * None to either set the value to 0/NULL or reset it to its default + * None to either set the value to 0/NULL :param str param: configuration option to be set :param str,list value: value to set the parameter to - :param bool reset: issues a SETCONF if False, and RESETCONF if True :raises: :class:`stem.socket.ControllerError` if the call fails @@ -687,12 +683,29 @@ class Controller(BaseController): :class:`stem.socket.InvalidRequest` if the configuration setting is impossible or if there's a syntax error in the configuration values """ - self.set_options({param: value}, reset) + self.set_options({param: value}, False) + + def reset_conf(self, *params): + """ + Reverts one or more parameters to their default values. + + :param str params: configuration option to be reset + + :raises: + :class:`stem.socket.ControllerError` if the call fails + :class:`stem.socket.InvalidArguments` if configuration options requested was invalid + :class:`stem.socket.InvalidRequest` if the configuration setting is impossible or if there's a syntax error in the configuration values + """ + + self.set_options(dict([(entry, None) for entry in params]), True) def set_options(self, params, reset = False): """ - Changes multiple tor configurations, in a similar fashion to - :func:`stem.control.Controller.set_option`. For example... + Changes multiple tor configuration options via either a SETCONF or + RESETCONF query. Both behave identically unless our value is None, in which + case SETCONF sets the value to 0 or NULL, and RESETCONF returns it to its + default value. This accepts str, list, or None values in a similar fashion + to :func:`stem.control.Controller.set_conf`. For example... :: @@ -708,7 +721,7 @@ class Controller(BaseController): configuration (those options are order dependent). :param dict,list params: mapping of configuration options to the values we're setting it to - :param bool reset: issues a SETCONF if False, and RESETCONF if True + :param bool reset: issues a RESETCONF, returning None values to their defaults if True :raises: :class:`stem.socket.ControllerError` if the call fails diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 3a15634..65dfe18 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -194,9 +194,10 @@ class TestController(unittest.TestCase): self.assertEqual({}, controller.get_conf_map("", "la-di-dah")) self.assertEqual({}, controller.get_conf_map([], "la-di-dah")) - def test_set_options(self): + def test_set_conf(self): """ - Exercises set_option() and set_options() with valid and invalid requests. + Exercises set_conf(), reset_conf(), and set_options() methods with valid + and invalid requests. """ if test.runner.require_control(self): return @@ -208,21 +209,26 @@ class TestController(unittest.TestCase): try: # successfully set a single option connlimit = int(controller.get_conf("ConnLimit")) - controller.set_option("connlimit", str(connlimit - 1)) + controller.set_conf("connlimit", str(connlimit - 1)) self.assertEqual(connlimit - 1, int(controller.get_conf("ConnLimit"))) # successfully set a single list option exit_policy = ["accept *:7777", "reject *:*"] - controller.set_option("ExitPolicy", exit_policy) + controller.set_conf("ExitPolicy", exit_policy) self.assertEqual(exit_policy, controller.get_conf("ExitPolicy", multiple = True)) # fail to set a single option try: - controller.set_option("invalidkeyboo", "abcde") + controller.set_conf("invalidkeyboo", "abcde") self.fail() except stem.socket.InvalidArguments, exc: self.assertEqual(["invalidkeyboo"], exc.arguments) + # resets configuration parameters + controller.reset_conf("ConnLimit", "ExitPolicy") + self.assertEqual(connlimit, int(controller.get_conf("ConnLimit"))) + self.assertEqual(None, controller.get_conf("ExitPolicy")) + # successfully sets multiple config options controller.set_options({ "connlimit": str(connlimit - 2),

1 0

[stem/master] Controller methods for GETCONF and RESETCONF
by atagar＠torproject.org 08 Jul '12

08 Jul '12

commit 6a91cda3db2a1ab1c4bf485fad03fd5cea24657a Merge: a325a40 3d15387 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 8 13:13:17 2012 -0700 Controller methods for GETCONF and RESETCONF Feature addition by Ravi, addressing... https://trac.torproject.org/6239 run_tests.py | 2 + stem/control.py | 123 +++++++++++++++++++++++++++++++++---- stem/response/__init__.py | 41 +++++++++++++ test/integ/control/controller.py | 76 +++++++++++++++++++++++ test/unit/response/__init__.py | 10 +++- test/unit/response/singleline.py | 35 +++++++++++ 6 files changed, 272 insertions(+), 15 deletions(-)

1 0

[stem/master] Add a generic SingleLineResponse class
by atagar＠torproject.org 08 Jul '12

08 Jul '12

commit ba53da1772007aca88bc75f1fed60d49170eb964 Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Fri Jun 15 18:21:47 2012 +0530 Add a generic SingleLineResponse class --- stem/response/__init__.py | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/stem/response/__init__.py b/stem/response/__init__.py index 155f262..e9b1c96 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -52,6 +52,7 @@ def convert(response_type, message, **kwargs): * **\*** GETCONF * PROTOCOLINFO * AUTHCHALLENGE + * SINGLELINE **\*** can raise a :class:`stem.socket.InvalidArguments` exception @@ -77,6 +78,8 @@ def convert(response_type, message, **kwargs): response_class = stem.response.getinfo.GetInfoResponse elif response_type == "GETCONF": response_class = stem.response.getconf.GetConfResponse + elif response_type == "SINGLELINE": + response_class = SingleLineResponse elif response_type == "PROTOCOLINFO": response_class = stem.response.protocolinfo.ProtocolInfoResponse elif response_type == "AUTHCHALLENGE": @@ -414,3 +417,38 @@ def _get_quote_indeces(line, escaped): return tuple(indices) +class SingleLineResponse(ControlMessage): + """ + A reply that contains only a single line + + :var dict entries: + mapping between the queried options (string) and their values (string/list + of strings) + """ + + def is_ok(self, strict = False): + """ + Checks if the response code is "250". If strict is True, checks if the + response is "250 OK" + + :param bool strict: If True, check if the message is "250 OK" + + :returns: + * If strict is False: True if the response code is "250", False otherwise + * If strict is True: True if the response is "250 OK", False otherwise + """ + + if strict: + return self.content()[0] == ("250", " ", "OK") + return self.content()[0][0] == "250" + + def _parse_message(self): + content = self.content() + + if len(content) > 1: + raise ProtocolError("Received multiline response") + elif len(content) == 0: + raise ProtocolError("Received empty response") + else: + self.code, self.delimiter, self.message = content[0] +

1 0

[stem/master] Add set_conf wrapper method
by atagar＠torproject.org 08 Jul '12

08 Jul '12

commit 4ed9a1fba65257ccd0caba41da79ac6b879737f2 Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Thu Jun 21 13:58:23 2012 +0530 Add set_conf wrapper method --- stem/control.py | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/stem/control.py b/stem/control.py index 5e88ef5..e5ed132 100644 --- a/stem/control.py +++ b/stem/control.py @@ -661,6 +661,45 @@ class Controller(BaseController): except stem.socket.ControllerError, exc: if default != UNDEFINED: return default else: raise exc + + def set_conf(self, *args): + """ + Changes the configuration of one or more configuration variables using the + control socket. + + :param dict options: a dictionary containing a mapping of configuration keys (string) + to the corresponding values (string or list of strings) + + Or + + :param str key: configuration key + :param str value: configuration value + + :returns: True on successfully setting the values + + :raises: + :class:`stem.socket.ControllerError` if the call fails + :class:`stem.socket.InvalidArguments` if configuration options requested was invalid + :class:`stem.socket.InvalidRequest` if the configuration setting is + impossible or if there's a syntax error in the configuration values + """ + + if len(args) == 2: + options = {args[0]: args[1]} + elif len(args) == 1: + options = args[0] + else: + raise TypeError("set_conf expected 1 or 2 arguments, got %d", len(args)) + + response = self.msg("SETCONF %s" % " ".join(["=".join(opts) for opts in args.items()])) + stem.response.convert("SINGLELINE", response) + + if response.is_ok(): + return True + elif response.code in ("513", "552", "553"): + raise InvalidRequest(response.code, response.message) + else: + raise ProtocolError("SETCONF returned unexpected status code") def _case_insensitive_lookup(entries, key): """

1 0

[stem/master] Fix Controller.get_conf_map's documentation formatting
by atagar＠torproject.org 08 Jul '12

08 Jul '12

commit 0bfa815f85337cbd216d0fbb2965b6ab305d3874 Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Mon Jul 2 22:48:09 2012 +0530 Fix Controller.get_conf_map's documentation formatting --- stem/control.py | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/stem/control.py b/stem/control.py index 5fce8c8..5e88ef5 100644 --- a/stem/control.py +++ b/stem/control.py @@ -591,11 +591,9 @@ class Controller(BaseController): only whitespace are ignored. There's three use cases for GETCONF: - - a single value is provided - - multiple values are provided for the option queried - - a set of options that weren't necessarily requested are returned (for - instance querying HiddenServiceOptions gives HiddenServiceDir, - HiddenServicePort, etc) + 1. a single value is provided + 2. multiple values are provided for the option queried + 3. a set of options that weren't necessarily requested are returned (for instance querying HiddenServiceOptions gives HiddenServiceDir, HiddenServicePort, etc) The vast majority of the options fall into the first two categories, in which case calling get_conf() is sufficient. However, for batch queries or

1 0

[stem/master] Add Controller.reset_conf and fix Controller.set_conf
by atagar＠torproject.org 08 Jul '12

08 Jul '12

commit ea57e936e08400d63a423c669311643afd4dd84d Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Tue Jun 26 10:04:52 2012 +0530 Add Controller.reset_conf and fix Controller.set_conf --- stem/control.py | 96 +++++++++++++++++++++++++++++--------- test/integ/control/controller.py | 65 ++++++++++++++++++++++---- 2 files changed, 128 insertions(+), 33 deletions(-) diff --git a/stem/control.py b/stem/control.py index 0e0d611..dfa79c7 100644 --- a/stem/control.py +++ b/stem/control.py @@ -14,6 +14,10 @@ interacting at a higher level. Controller - General controller class intended for direct use. |- get_info - issues a GETINFO query + |- get_conf - issues a GETCONF query for a single parameter + |- get_conf_mapping - issues a GETCONF query for multiple parameters + |- set_conf - issues a SETCONF query + |- reset_conf - issues a RESETCONF query |- get_version - convenience method to get tor version |- authenticate - convenience method to authenticate the controller +- protocolinfo - convenience method to get the protocol info @@ -560,7 +564,7 @@ class Controller(BaseController): Response depends upon how we were called as follows... * str with the response if multiple was False - * list with the response strings multiple was True + * list with the response strings if multiple was True * default if one was provided and our call failed :raises: @@ -662,13 +666,40 @@ class Controller(BaseController): if default != UNDEFINED: return default else: raise exc - def set_conf(self, *args): + def _set_conf(self, params, command="SETCONF"): + controlitems = [command] + + for key, value in params: + if type(value) in (list, tuple): + controlitems.extend(["%s=\"%s\"" % (key, val.strip()) for val in value]) + elif value: + controlitems.append("%s=\"%s\"" % (key, value.strip())) + else: + controlitems.append(key) + + response = self.msg(" ".join(controlitems)) + stem.response.convert("SINGLELINE", response) + + if response.is_ok(): + return True + elif response.code == "552": + if response.message.startswith("Unrecognized option: Unknown option '"): + key = response.message[37:response.message.find("\'", 37)] + raise stem.socket.InvalidArguments(response.code, response.message, [key]) + raise stem.socket.InvalidRequest(response.code, response.message) + elif response.code in ("513", "553"): + raise stem.socket.InvalidRequest(response.code, response.message) + else: + raise stem.socket.ProtocolError("%s returned unexpected status code" % command) + + def set_conf(self, *params): """ Changes the configuration of one or more configuration variables using the control socket. - :param dict options: a dictionary containing a mapping of configuration keys (string) - to the corresponding values (string or list of strings) + :param list,dict params: a list containing tuples of configuration keys (string) + and their corresponding values (string or list of strings) or a dict + containing config-key: config-value pairs. Or @@ -684,31 +715,50 @@ class Controller(BaseController): impossible or if there's a syntax error in the configuration values """ - if len(args) == 2: - args = {args[0]: args[1]} - elif len(args) == 1: - args = args[0] + if len(params) == 2: + arg = [params] + elif len(params) == 1: + if type(params[0]) == dict: + arg = params[0].items() + else: + arg = params[0] else: raise TypeError("set_conf expected 1 or 2 arguments, got %d", len(args)) - options = [] - for key, value in args.iteritems(): - options.append(key + "=\"" + value + "\"") + self._set_conf(arg, "SETCONF") + + def reset_conf(self, params): + """ + Resets the configuration of one or more configuration variables using the + control socket. + + :param str,list,dict params: + This could be... - response = self.msg("SETCONF %s" % " ".join(options)) - stem.response.convert("SINGLELINE", response) + * a single configuration key (str) + * a list of configuration keys to be reset and/or tuples of configuration + keys (string) and their corresponding values (string or list of strings) + * a dict containing configuration key/value pairs. - if response.is_ok(): - return True - elif response.code == "552": - if response.message.startswith("Unrecognized option: Unknown option '"): - key = response.message[37:response.message.find("\'", 37)] - raise stem.socket.InvalidArguments(response.code, response.message, [key]) - raise stem.socket.InvalidRequest(response.code, response.message) - elif response.code in ("513", "553"): - raise stem.socket.InvalidRequest(response.code, response.message) + :param list params: a list of configuration keys to be reset + + :returns: True on successfully resetting the values + + :raises: + :class:`stem.socket.ControllerError` if the call fails + :class:`stem.socket.InvalidArguments` if configuration options requested was invalid + :class:`stem.socket.InvalidRequest` if the configuration setting is + impossible or if there's a syntax error in the configuration values + """ + + if type(params) == str: + arg = [(params, None)] + elif type(params) == dict: + arg = params.items() else: - raise stem.socket.ProtocolError("SETCONF returned unexpected status code") + arg = map(lambda item: (item, None) if type(item) == str else item, params) + + self._set_conf(arg, "RESETCONF") def _case_insensitive_lookup(entries, key): """ diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 4a517dd..a407904 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -193,18 +193,17 @@ class TestController(unittest.TestCase): self.assertEqual({}, controller.get_conf_map([], "la-di-dah")) # context-sensitive keys - - keys = { - "HiddenServiceDir": "/tmp/stemtestdir", - "HiddenServicePort": "17234 127.0.0.1:17235" - } + keys = [ + ("HiddenServiceDir", "/tmp/stemtestdir"), + ("HiddenServicePort", "17234 127.0.0.1:17235") + ] controller.set_conf(keys) self.assertEqual("/tmp/stemtestdir", controller.get_conf("HiddenServiceDir")) - self.assertEqual("17234 127.0.0.1:17235", controller.get_conf("HiddenServiceDir")) + self.assertEqual("17234 127.0.0.1:17235", controller.get_conf("HiddenServicePort")) def test_setconf(self): """ - Exercises SETCONF with valid and invalid requests. + Exercises Controller.set_conf with valid and invalid requests. """ runner = test.runner.get_runner() @@ -233,11 +232,57 @@ class TestController(unittest.TestCase): except stem.socket.InvalidArguments, exc: self.assertEqual(["bombay"], exc.arguments) + settings = [ + ("HiddenServiceDir", "/tmp/stemtestdir"), + ("HiddenServicePort", "17234 127.0.0.1:17235") + ] + controller.set_conf(settings) + self.assertEqual("17234 127.0.0.1:17235", controller.get_conf("hiddenserviceport")) + self.assertEqual("/tmp/stemtestdir", controller.get_conf("hiddenservicedir")) + + def test_resetconf(self): + """ + Exercises Controller.reset_conf with valid and invalid requests. + """ + + runner = test.runner.get_runner() + + with runner.get_tor_controller() as controller: + # Single valid key + controller.set_conf("contactinfo", "stem@testing") + self.assertEqual("stem@testing", controller.get_conf("contactinfo")) + controller.reset_conf("contactinfo") + self.assertEqual(None, controller.get_conf("contactinfo")) + + # Invalid key + try: + controller.reset_conf(("invalidkeyboo", "abcde")) + except stem.socket.InvalidArguments, exc: + self.assertEqual(["invalidkeyboo"], exc.arguments) + + # Multiple keys, list & dict settings = { - "HiddenServiceDir": "/tmp/stemtestdir", - "HiddenServicePort": "17234 127.0.0.1:17235" + "connlimit": "314", + "contactinfo": "stem@testing" } - controller.set_conf(settings) + controller.reset_conf(settings) + self.assertEqual("314", controller.get_conf("ConnLimit")) + self.assertEqual("stem@testing", controller.get_conf("contactinfo")) + + settings = [ + ("connlimit", "786"), + ("contactinfo", "stem testing") + ] + controller.reset_conf(settings) + self.assertEqual("786", controller.get_conf("ConnLimit")) + self.assertEqual("stem testing", controller.get_conf("contactinfo")) + + # context-sensitive keys + settings = [ + ("HiddenServiceDir", "/tmp/stemtestdir"), + ("HiddenServicePort", "17234 127.0.0.1:17235") + ] + controller.reset_conf(settings) self.assertEqual("17234 127.0.0.1:17235", controller.get_conf("hiddenserviceport")) self.assertEqual("/tmp/stemtestdir", controller.get_conf("hiddenservicedir"))

1 0

[stem/master] Make tests cross-platform & fix things that broke during a rebase
by atagar＠torproject.org 08 Jul '12

08 Jul '12

commit 7d8b1fdef6e6b2cd38a7c2f3aa09a957b03af1a5 Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Wed Jun 27 01:28:39 2012 +0530 Make tests cross-platform & fix things that broke during a rebase --- test/integ/control/controller.py | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index a407904..eb2386c 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -5,6 +5,8 @@ Integration tests for the stem.control.Controller class. from __future__ import with_statement import unittest +import tempfile +import shutil import stem.control import stem.socket @@ -193,13 +195,15 @@ class TestController(unittest.TestCase): self.assertEqual({}, controller.get_conf_map([], "la-di-dah")) # context-sensitive keys + tmpdir = tempfile.mkdtemp() keys = [ - ("HiddenServiceDir", "/tmp/stemtestdir"), + ("HiddenServiceDir", tmpdir), ("HiddenServicePort", "17234 127.0.0.1:17235") ] controller.set_conf(keys) - self.assertEqual("/tmp/stemtestdir", controller.get_conf("HiddenServiceDir")) + self.assertEqual(tmpdir, controller.get_conf("HiddenServiceDir")) self.assertEqual("17234 127.0.0.1:17235", controller.get_conf("HiddenServicePort")) + shutil.rmtree(tmpdir) def test_setconf(self): """ @@ -232,13 +236,15 @@ class TestController(unittest.TestCase): except stem.socket.InvalidArguments, exc: self.assertEqual(["bombay"], exc.arguments) + tmpdir = tempfile.mkdtemp() settings = [ - ("HiddenServiceDir", "/tmp/stemtestdir"), + ("HiddenServiceDir", tmpdir), ("HiddenServicePort", "17234 127.0.0.1:17235") ] controller.set_conf(settings) self.assertEqual("17234 127.0.0.1:17235", controller.get_conf("hiddenserviceport")) - self.assertEqual("/tmp/stemtestdir", controller.get_conf("hiddenservicedir")) + self.assertEqual(tmpdir, controller.get_conf("hiddenservicedir")) + shutil.rmtree(tmpdir) def test_resetconf(self): """ @@ -278,11 +284,13 @@ class TestController(unittest.TestCase): self.assertEqual("stem testing", controller.get_conf("contactinfo")) # context-sensitive keys + tmpdir = tempfile.mkdtemp() settings = [ - ("HiddenServiceDir", "/tmp/stemtestdir"), + ("HiddenServiceDir", tmpdir), ("HiddenServicePort", "17234 127.0.0.1:17235") ] controller.reset_conf(settings) self.assertEqual("17234 127.0.0.1:17235", controller.get_conf("hiddenserviceport")) - self.assertEqual("/tmp/stemtestdir", controller.get_conf("hiddenservicedir")) + self.assertEqual(tmpdir, controller.get_conf("hiddenservicedir")) + shutil.rmtree(tmpdir)

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 08 Jul '12

08 Jul '12

commit 723f3562831a83178c370e8e19b83b56ddbeefb8 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 8 17:45:28 2012 +0000 Update translations for torcheck_completed --- ru/torcheck.po | 55 +++++++++++++++++++++++-------------------------------- 1 files changed, 23 insertions(+), 32 deletions(-) diff --git a/ru/torcheck.po b/ru/torcheck.po index 42ba828..295fc8d 100644 --- a/ru/torcheck.po +++ b/ru/torcheck.po @@ -1,16 +1,18 @@ # TorCheck gettext template -# Copyright (C) 2008 Jacob Appelbaum +# Copyright (C) 2008-2012 The Tor Project, Inc # # Translators: +# Den Arefyev <>, 2012. +# <pavel.zinovkin(a)gmail.com>, 2012. # RK2 <nord115(a)mail.ru>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2008-04-24 20:28+PDT\n" -"PO-Revision-Date: 2012-02-14 10:00+0000\n" -"Last-Translator: RK2 <nord115(a)mail.ru>\n" -"Language-Team: Russian (http://www.transifex.net/projects/p/torproject/language/ru/)\n" +"POT-Creation-Date: 2012-02-16 20:28+PDT\n" +"PO-Revision-Date: 2012-07-08 17:24+0000\n" +"Last-Translator: Den Arefyev <>\n" +"Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -23,8 +25,17 @@ msgstr "Поздравляем. Ваш браузер использует Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " -"for further information about using Tor safely." -msgstr "Пожалуйста прочитайте документацию на <a href=\"https://www.torproject.org/\">официальном вебсайте Tor</a> чтобы получить дополнительную информацию по безопасному использованию Tor." +"for further information about using Tor safely. You are now free to browse " +"the Internet anonymously." +msgstr "dsd" + +msgid "There is a security update available for the Tor Browser Bundle." +msgstr "Доступно обновление безопасности для Tor Browser Bundle." + +msgid "" +"<a href=\"https://www.torproject.org/download/download-easy.html\">Click " +"here to go to the download page</a>" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Нажмите здесь, чтобы сказать страницу</a>" msgid "Sorry. You are not using Tor." msgstr "Увы. В данный момент вы не используете Tor." @@ -32,37 +43,17 @@ msgstr "Увы. В данный момент вы не используете To msgid "" "If you are attempting to use a Tor client, please refer to the <a " "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" -" " -"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">instructions" -" for configuring your Tor client</a>." -msgstr "Если вы пытаетесь настроить клиент Tor, пожалуйста прочитайте документацию на <a href=\"https://www.torproject.org/\">официальном вебсайте Tor</a> и особенно <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">инструкции по настройке</a>." +" href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " +"configuring your Tor client</a>." +msgstr "Если вы собираетесь использовать Tor клиент, пожалуйста, зайдите на <a href=\"https://www.torproject.org/\">Tor сайт</a> и, в частности <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">инструкции по настройке клиента Tor</a>." msgid "Sorry, your query failed or an unexpected response was received." msgstr "Увы, не удалось обработать ваш запрос, или был получен неожиданный ответ сервера." msgid "" "A temporary service outage prevents us from determining if your source IP " -"address is a <a href=\"https://www.torproject.org/\">Tor</a> node. For " -"other ways to test whether you are using Tor, please visit <a " -"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPri…">this" -" FAQ entry</a>." -msgstr "Временная недоступность службы не даёт возможности определить, принадлежит ли ваш IP адрес узлу <a href=\"https://www.torproject.org/\">Tor</a>. Другие способы определить, что вы успешно используете Tor, описаны в <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPri…">FAQ</a>." - -msgid "Additional information: " -msgstr "Дополнительная информация: " +"address is a <a href=\"https://www.torproject.org/\">Tor</a> node." +msgstr "Временное отключение услуг предотвращает обнаружение, если Вашим исходным IP адресом является <a href=\"https://www.torproject.org/\">Tor</a> узел." msgid "Your IP address appears to be: " msgstr "Ваш IP адрес: " - -msgid "" -"This small script is powered by <a " -"href=\"http://exitlist.torproject.org/\">tordnsel</a>" -msgstr "Этот небольшой скрипт использует <a href=\"http://exitlist.torproject.org/\">tordnsel</a>" - -msgid "" -"You may also be interested in the <a href=\"/cgi-" -"bin/TorBulkExitList.py\">Tor Bulk Exit List Exporter</a>" -msgstr "Вас может также заинтересовать <a href=\"/cgi-bin/TorBulkExitList.py\">Tor Bulk Exit List Exporter</a>" - -msgid "This server does not log <i>any</i> information about visitors." -msgstr "Этот сервер не сохраняет <i>никакой</i> информации о посетителях."

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 08 Jul '12

08 Jul '12

commit efa5b5fb30b0907175853340d93dc48f6e979823 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 8 17:45:26 2012 +0000 Update translations for torcheck --- ru/torcheck.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ru/torcheck.po b/ru/torcheck.po index 9992bf9..295fc8d 100644 --- a/ru/torcheck.po +++ b/ru/torcheck.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2012-07-08 17:00+0000\n" +"PO-Revision-Date: 2012-07-08 17:24+0000\n" "Last-Translator: Den Arefyev <>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" @@ -35,7 +35,7 @@ msgstr "Доступно обновление безопасности для To msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Нажмите здесь, чтобы сказать страницу</a>" msgid "Sorry. You are not using Tor." msgstr "Увы. В данный момент вы не используете Tor." @@ -45,7 +45,7 @@ msgid "" "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " "configuring your Tor client</a>." -msgstr "" +msgstr "Если вы собираетесь использовать Tor клиент, пожалуйста, зайдите на <a href=\"https://www.torproject.org/\">Tor сайт</a> и, в частности <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">инструкции по настройке клиента Tor</a>." msgid "Sorry, your query failed or an unexpected response was received." msgstr "Увы, не удалось обработать ваш запрос, или был получен неожиданный ответ сервера." @@ -53,7 +53,7 @@ msgstr "Увы, не удалось обработать ваш запрос, и msgid "" "A temporary service outage prevents us from determining if your source IP " "address is a <a href=\"https://www.torproject.org/\">Tor</a> node." -msgstr "" +msgstr "Временное отключение услуг предотвращает обнаружение, если Вашим исходным IP адресом является <a href=\"https://www.torproject.org/\">Tor</a> узел." msgid "Your IP address appears to be: " msgstr "Ваш IP адрес: "

1 0