tor-commits December 2012

tor-commits@lists.torproject.org

17 participants
1600 discussions

[arm/master] Removing the last hints of TorCtl
by atagar＠torproject.org 17 Dec '12

17 Dec '12

commit 37f7e9597126392b326287bd6685d00d6627682b Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 16 20:06:04 2012 -0800 Removing the last hints of TorCtl Dropping our TorCtl dependency and removing its last bits from the codebase. There is definitely a lot of cleanup left to do, but we now no longer have that dependency. --- README | 6 +++--- armrc.sample | 2 +- setup.py | 6 +----- src/cli/controller.py | 3 +-- src/cli/headerPanel.py | 1 - src/prereq.py | 44 +++----------------------------------------- src/test.py | 2 +- src/util/torConfig.py | 2 -- src/util/torTools.py | 36 +++++++++++------------------------- 9 files changed, 21 insertions(+), 81 deletions(-) diff --git a/README b/README index 05f18cb..e5676f7 100644 --- a/README +++ b/README @@ -20,7 +20,7 @@ An interview by Brenno Winter discussing the project is available at: Requirements: Python 2.5 -TorCtl (this is included with arm) +Stem (this is included with arm) Tor is running with an available control port. This means either... ... starting Tor with '--controlport <PORT>' ... or including 'ControlPort <PORT>' in your torrc @@ -203,7 +203,7 @@ Layout: popups.py - toolkit providing display popups wizard.py - provides the relay setup wizard - logPanel.py - (page 1) displays tor, arm, and torctl events + logPanel.py - (page 1) displays tor, arm, and stem events configPanel.py - (page 3) editor panel for the tor configuration torrcPanel.py - (page 4) displays torrc and validation interpretorPanel.py - (page 5) interpretor for control port access @@ -222,6 +222,6 @@ Layout: textInput.py - expands the capabilities of text input fields torConfig.py - functions for working with the torrc and config options torInterpretor.py - provides a shell around raw control port access - torTools.py - TorCtl wrapper, providing caching and derived information + torTools.py - Stem wrapper, providing caching and derived information uiTools.py - helper functions for presenting the user interface diff --git a/armrc.sample b/armrc.sample index 1b264f7..5fb9564 100644 --- a/armrc.sample +++ b/armrc.sample @@ -271,7 +271,7 @@ log.startTime INFO log.configEntryNotFound NONE log.configEntryUndefined NOTICE log.configEntryTypeError NOTICE -log.torCtlPortClosed NOTICE +log.stemPortClosed NOTICE log.torEventTypeUnrecognized INFO log.torPrefixPathInvalid NOTICE log.procCallMade DEBUG diff --git a/setup.py b/setup.py index c94ac1f..7d035ed 100644 --- a/setup.py +++ b/setup.py @@ -90,11 +90,7 @@ if "install" in sys.argv: except IOError, exc: print "Unable to compress man page: %s" % exc -# When installing we include a bundled copy of TorCtl. However, when creating -# a deb we have a dependency on the python-torctl package instead: -# http://packages.debian.org/unstable/main/python-torctl -installPackages = ['arm', 'arm.cli', 'arm.cli.graphing', 'arm.cli.connections', 'arm.cli.menu', 'arm.util', 'arm.TorCtl', 'arm.stem'] -if isDebInstall: installPackages.remove('arm.TorCtl') +installPackages = ['arm', 'arm.cli', 'arm.cli.graphing', 'arm.cli.connections', 'arm.cli.menu', 'arm.util', 'arm.stem'] setup(name='arm', version=VERSION, diff --git a/src/cli/controller.py b/src/cli/controller.py index f01ef8a..de77e5a 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -22,7 +22,6 @@ import cli.graphing.connStats import cli.graphing.resourceStats import cli.connections.connPanel -from TorCtl import TorCtl from stem.control import Controller from util import connections, conf, enum, hostnames, log, panel, sysTools, torConfig, torTools @@ -564,7 +563,7 @@ def shutdownDaemons(): for panelImpl in control.getDaemonPanels(): panelImpl.stop() for panelImpl in control.getDaemonPanels(): panelImpl.join() - # joins on TorCtl event thread + # joins on stem threads torTools.getConn().close() # joins on utility daemon threads - this might take a moment since the diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index ce43e06..cf37ac1 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -19,7 +19,6 @@ import time import curses import threading -import TorCtl.TorCtl import stem import stem.connection diff --git a/src/prereq.py b/src/prereq.py index f8ab73d..c01dfbd 100644 --- a/src/prereq.py +++ b/src/prereq.py @@ -12,23 +12,12 @@ import tempfile # Library dependencies can be fetched on request. By default this is via # the following mirrors with their sha256 signatures checked. -TORCTL_ARCHIVE = "http://www.atagar.com/arm/resources/deps/11-06-16/torctl.tar.gz" -TORCTL_SIG = "5460adb1394c368ba492cc33d6681618b3d3062b3f5f70b2a87520fc291701c3" +#STEM_ARCHIVE = "http://www.atagar.com/arm/resources/deps/11-06-16/torctl.tar.gz" +#STEM_SIG = "5460adb1394c368ba492cc33d6681618b3d3062b3f5f70b2a87520fc291701c3" # optionally we can do an unverified fetch from the library's sources STEM_REPO = "git://git.torproject.org/stem.git" -def isTorCtlAvailable(): - """ - True if TorCtl is already available on the platform, false otherwise. - """ - - try: - import TorCtl - return True - except ImportError: - return False - def isStemAvailable(): """ True if stem is already available on the platform, false otherwise. @@ -40,30 +29,6 @@ def isStemAvailable(): except ImportError: return False -def promptTorCtlInstall(): - """ - Asks the user to install TorCtl. This returns True if it was installed and - False otherwise (if it was either declined or failed to be fetched). - """ - - userInput = raw_input("Arm requires TorCtl to run, but it's unavailable. Would you like to install it? (y/n): ") - - # if user says no then terminate - if not userInput.lower() in ("y", "yes"): return False - - # attempt to install TorCtl, printing the issue if unsuccessful - try: - fetchLibrary(TORCTL_ARCHIVE, TORCTL_SIG) - - if not isTorCtlAvailable(): - raise IOError("Unable to install TorCtl, sorry") - - print "TorCtl successfully installed" - return True - except IOError, exc: - print exc - return False - def promptStemInstall(): """ Asks the user to install stem. This returns True if it was installed and @@ -77,6 +42,7 @@ def promptStemInstall(): # attempt to install stem, printing the issue if unsuccessful try: + #fetchLibrary(STEM_ARCHIVE, STEM_SIG) installStem() if not isStemAvailable(): @@ -163,10 +129,6 @@ if __name__ == '__main__': print("arm requires python version 2.5 or greater\n") sys.exit(1) - if not isTorCtlAvailable(): - isInstalled = promptTorCtlInstall() - if not isInstalled: sys.exit(1) - if not isStemAvailable(): isInstalled = promptStemInstall() if not isInstalled: sys.exit(1) diff --git a/src/test.py b/src/test.py index af80879..7129120 100644 --- a/src/test.py +++ b/src/test.py @@ -23,7 +23,7 @@ conn = None while True: userInput = raw_input(MENU) - # initiate the TorCtl connection if the test needs it + # initiate the stem connection if the test needs it if userInput in ("1", "2", "4") and not conn: conn = torTools.getConn() conn.init() diff --git a/src/util/torConfig.py b/src/util/torConfig.py index c9ae6ef..0f6452d 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -471,8 +471,6 @@ def saveConf(destination = None, contents = None): log.log(log.DEBUG, logMsg % ("SAVECONF", time.time() - startTime)) return # if successful then we're done except: - # example error: - # TorCtl.TorCtl.ErrorReply: 551 Unable to write configuration to disk. pass # if the SAVECONF fails or this is a custom save then write contents directly diff --git a/src/util/torTools.py b/src/util/torTools.py index d2f1b0c..a5add1a 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -14,7 +14,7 @@ import Queue import stem import stem.control -from TorCtl import TorCtl +import stem.descriptor from util import connections, enum, log, procTools, sysTools, uiTools @@ -45,7 +45,7 @@ UNDEFINED = "<Undefined_ >" UNKNOWN = "UNKNOWN" # value used by cached information if undefined CONFIG = {"features.pathPrefix": "", - "log.torCtlPortClosed": log.NOTICE, + "log.stemPortClosed": log.NOTICE, "log.torPrefixPathInvalid": log.NOTICE, "log.bsdJailFound": log.INFO, "log.unknownBsdJailId": log.WARN} @@ -265,22 +265,21 @@ def isTorRunning(): def getConn(): """ Singleton constructor for a Controller. Be aware that this starts as being - uninitialized, needing a TorCtl instance before it's fully functional. + uninitialized, needing a stem Controller before it's fully functional. """ global CONTROLLER if CONTROLLER == None: CONTROLLER = Controller() return CONTROLLER -class Controller(TorCtl.PostEventListener): +class Controller: """ - TorCtl wrapper providing convenience functions, listener functionality for - tor's state, and the capability for controller connections to be restarted - if closed. + Stem wrapper providing convenience functions (mostly from the days of using + TorCtl), listener functionality for tor's state, and the capability for + controller connections to be restarted if closed. """ def __init__(self): - TorCtl.PostEventListener.__init__(self) self.controller = None self.connLock = threading.RLock() self.statusListeners = [] # callback functions for tor's state changes @@ -321,7 +320,7 @@ class Controller(TorCtl.PostEventListener): def init(self, controller): """ - Uses the given TorCtl instance for future operations, notifying listeners + Uses the given stem instance for future operations, notifying listeners about the change. Arguments: @@ -373,7 +372,7 @@ class Controller(TorCtl.PostEventListener): def close(self): """ - Closes the current TorCtl instance and notifies listeners. + Closes the current stem instance and notifies listeners. """ self.connLock.acquire() @@ -394,7 +393,7 @@ class Controller(TorCtl.PostEventListener): def isAlive(self): """ - Returns True if this has been initialized with a working TorCtl instance, + Returns True if this has been initialized with a working stem instance, False otherwise. """ @@ -1252,8 +1251,6 @@ class Controller(TorCtl.PostEventListener): self._cachedParam = {} except Exception, exc: # new torrc parameters caused an error (tor's likely shut down) - # BUG: this doesn't work - torrc errors still cause TorCtl to crash... :( - # http://bugs.noreply.org/flyspray/index.php?do=details&id=1329 raisedException = IOError(str(exc)) else: try: @@ -1532,17 +1529,6 @@ class Controller(TorCtl.PostEventListener): if len(attachedMatches) == 1: return attachedMatches[0] - # Highly unlikely, but still haven't found it. Last we'll use some - # tricks from Mike's ConsensusTracker, excluding possiblities that - # have... - # - lost their Running flag - # - list a bandwidth of 0 - # - have 'opt hibernating' set - # - # This involves constructing a TorCtl Router and checking its 'down' - # flag (which is set by the three conditions above). This is the last - # resort since it involves a couple GETINFO queries. - for entryPort, entryFingerprint in list(potentialMatches): try: nsEntry = self.controller.get_network_status(entryFingerprint) @@ -1884,7 +1870,7 @@ class Controller(TorCtl.PostEventListener): # gives a notice that the control port has closed if eventType == State.CLOSED: - log.log(CONFIG["log.torCtlPortClosed"], "Tor control port closed") + log.log(CONFIG["log.stemPortClosed"], "Tor control port closed") for callback in self.statusListeners: callback(self, eventType)

1 0

[stem/master] Adding get_latest_heartbeat()
by atagar＠torproject.org 17 Dec '12

17 Dec '12

commit 6bc92816dc4356a204fdde0f160ee344875143a3 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 16 18:50:46 2012 -0800 Adding get_latest_heartbeat() Adding a method to the BaseController to get the time that we last heard from tor. This is useful to figure out if our controller connection has stalled, but only works if we're continually using our controller (such as by listening for BW events). --- stem/control.py | 14 ++++++++++++++ test/integ/control/base_controller.py | 11 +++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/stem/control.py b/stem/control.py index a1100c1..1e5250a 100644 --- a/stem/control.py +++ b/stem/control.py @@ -49,6 +49,7 @@ providing its own for interacting at a higher level. |- connect - connects or reconnects to tor |- close - shuts down our connection to the tor process |- get_socket - provides the socket used for control communication + |- get_latest_heartbeat - timestamp for when we last heard from tor |- add_status_listener - notifies a callback of changes in our status |- remove_status_listener - prevents further notification of status changes +- __enter__ / __exit__ - manages socket connection @@ -237,6 +238,8 @@ class BaseController(object): self._socket._connect = self._connect self._socket._close = self._close + self._last_heartbeat = 0.0 # timestamp for when we last heard from tor + if self._socket.is_alive(): self._launch_threads() @@ -357,6 +360,16 @@ class BaseController(object): return self._socket + def get_latest_heartbeat(self): + """ + Provides the unix timestamp for when we last heard from tor. This is zero + if we've never received a message. + + :returns: float for the unix timestamp of when we last heard from tor + """ + + return self._last_heartbeat + def add_status_listener(self, callback, spawn = True): """ Notifies a given function when the state of our socket changes. Functions @@ -523,6 +536,7 @@ class BaseController(object): while self.is_alive(): try: control_message = self._socket.recv() + self._last_heartbeat = time.time() if control_message.content()[-1][0] == "650": # asynchronous message, adds to the event queue and wakes up its handler diff --git a/test/integ/control/base_controller.py b/test/integ/control/base_controller.py index b4bb354..8709469 100644 --- a/test/integ/control/base_controller.py +++ b/test/integ/control/base_controller.py @@ -183,6 +183,17 @@ class TestBaseController(unittest.TestCase): self.assertTrue(re.match("650 BW [0-9]+ [0-9]+\r\n", bw_event.raw_content())) self.assertEquals(("650", " "), bw_event.content()[0][:2]) + def test_get_latest_heartbeat(self): + """ + Basic check for get_latest_heartbeat(). + """ + + # makes a getinfo query, then checks that the heartbeat is close to now + with test.runner.get_runner().get_tor_socket() as control_socket: + controller = stem.control.BaseController(control_socket) + controller.msg("GETINFO version") + self.assertTrue((time.time() - controller.get_latest_heartbeat()) < 5) + def test_status_notifications(self): """ Checks basic functionality of the add_status_listener() and

1 0

[stem/master] Adding the requirement for 'PortForwarding'
by atagar＠torproject.org 17 Dec '12

17 Dec '12

commit 844073f3813d496fe4d5037283413d837d1ae325 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 16 13:42:10 2012 -0800 Adding the requirement for 'PortForwarding' Adding in the version requirement for the 'PortForwarding' torrc option. This was hardcoded in arm. --- stem/version.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/stem/version.py b/stem/version.py index 243fc50..7bcd289 100644 --- a/stem/version.py +++ b/stem/version.py @@ -40,6 +40,7 @@ easily parsed and compared, for instance... **LOADCONF** 'LOADCONF' requests **TAKEOWNERSHIP** 'TAKEOWNERSHIP' requests **TORRC_CONTROL_SOCKET** 'ControlSocket <path>' config option + **TORRC_PORT_FORWARDING** 'PortForwarding' config option **TORRC_DISABLE_DEBUGGER_ATTACHMENT** 'DisableDebuggerAttachment' config option **FEATURE_VERBOSE_NAMES** 'VERBOSE_NAMES' optional feature **FEATURE_EXTENDED_EVENTS** 'EXTENDED_EVENTS' optional feature @@ -255,11 +256,12 @@ safecookie_req.greater_than(Version("0.2.3.13")) Requirement = stem.util.enum.Enum( ("AUTH_SAFECOOKIE", safecookie_req), - ("GETINFO_CONFIG_TEXT", Version("0.2.2.7")), + ("GETINFO_CONFIG_TEXT", Version("0.2.2.7-alpha")), ("EXTENDCIRCUIT_PATH_OPTIONAL", Version("0.2.2.9")), ("LOADCONF", Version("0.2.1.1")), ("TAKEOWNERSHIP", Version("0.2.2.28-beta")), ("TORRC_CONTROL_SOCKET", Version("0.2.0.30")), + ("TORRC_PORT_FORWARDING", Version("0.2.3.1-alpha")), ("TORRC_DISABLE_DEBUGGER_ATTACHMENT", Version("0.2.3.9")), ("FEATURE_VERBOSE_NAMES", Version("0.2.2.1-alpha")), ("FEATURE_EXTENDED_EVENTS", Version("0.2.2.1-alpha")),

1 0

[stem/master] Revising error handling for get_conf()
by atagar＠torproject.org 17 Dec '12

17 Dec '12

commit 5b45d3125c811067d7c3ba0a11e324423c88d925 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 16 11:03:07 2012 -0800 Revising error handling for get_conf() The Controller's get_conf() function was buggy if the configuration value was unset. It's documented as returning the default, but instead it returned None or [None] depending on if 'multiple' was set. On reflection the pydocs for these functions were pretty unfriendly, so giving them an overhaul. Functionally this changes two things... 1. When you query for an unset value it will... * provide the default value if you gave it one * provide None if multiple was False, and [] if it was True 2. The get_conf_map()'s 'default' argument is now the defaultly *mapped value* rather than the default *response*. For instance... # old behavior get_conf_map('NoOption', 'Blarg') => 'Blarg' # new behavior get_conf_map('NoOption', 'Blarg') => {'NoOption': 'Blarg'} This means that the get_conf_map() pydocs can now assure the caller that they'll always get a dict, and it also better matches the get_conf() handling for default. --- stem/control.py | 117 ++++++++++++++++++++++---------------- stem/response/getconf.py | 6 ++- test/integ/control/controller.py | 10 +++- test/unit/response/getconf.py | 2 +- 4 files changed, 81 insertions(+), 54 deletions(-) diff --git a/stem/control.py b/stem/control.py index b8bbf15..a12609f 100644 --- a/stem/control.py +++ b/stem/control.py @@ -978,24 +978,32 @@ class Controller(BaseController): def get_conf(self, param, default = UNDEFINED, multiple = False): """ - Queries the control socket for the value of a given configuration option. If - provided a default then that's returned as if the GETCONF option is undefined - or if the call fails for any reason (invalid configuration option, error - response, control port closed, initiated, etc). If the configuration key - consists of whitespace only, **None** is returned unless a default value is - given. + Queries the current value for a configuration option. Some configuration + options (like the ExitPolicy) can have multiple values. This provides a + **list** with all of the values if **multiple** is **True**. Otherwise this + will be a **str** with the first value. + + If provided with a **default** then that is provided if the configuration + option was unset or the query fails (invalid configuration option, error + response, control port closed, initiated, etc). + + If the configuration value is unset and no **default** was given then this + provides **None** if **multiple** was **False** and an empty list if it was + **True**. :param str param: configuration option to be queried - :param object default: response if the query fails - :param bool multiple: if **True**, the value(s) provided are lists of all - returned values, otherwise this just provides the first value + :param object default: response if the option is unset or the query fails + :param bool multiple: if **True** then provides a list with all of the + present values (this is an empty list if the config option is unset) :returns: Response depends upon how we were called as follows... - * **str** with the response if multiple was **False** + * **str** with the configuration value if **multiple** was **False**, + **None** if it was unset * **list** with the response strings if multiple was **True** - * default if one was provided and our call failed + * default if one was provided and the configuration option was either + unset or our call failed :raises: * :class:`stem.ControllerError` if the call fails and we weren't @@ -1017,49 +1025,45 @@ class Controller(BaseController): def get_conf_map(self, params, default = UNDEFINED, multiple = True): """ - Queries the control socket for the values of given configuration options - and provides a mapping of the keys to the values. If provided a default - then that's returned if the GETCONF option is undefined or if the call - fails for any reason (invalid configuration option, error response, control - port closed, initiated, etc). Configuration keys that are empty or contain - only whitespace are ignored. + Similar to :func:`~stem.control.Controller.get_conf` but queries multiple + configuration options, providing back a mapping of those options to their + values. - There's three use cases for GETCONF: + There are three use cases for GETCONF: - 1. a single value is provided - 2. multiple values are provided for the option queried + 1. a single value is provided (ex. **ControlPort**) + 2. multiple values are provided for the option (ex. **ExitPolicy**) 3. a set of options that weren't necessarily requested are returned (for - instance querying HiddenServiceOptions gives HiddenServiceDir, - HiddenServicePort, etc) + instance querying **HiddenServiceOptions** gives **HiddenServiceDir**, + **HiddenServicePort**, etc) The vast majority of the options fall into the first two categories, in which case calling :func:`~stem.control.Controller.get_conf` is sufficient. However, for batch queries or the special options that give a set of values this provides back the full response. As of tor version 0.2.1.25 - HiddenServiceOptions was the only option like this. - - The :func:`~stem.control.Controller.get_conf` and - :func:`~stem.control.Controller.get_conf_map` functions both try to account - for these special mappings, so queried like get_conf("HiddenServicePort") - should behave as you'd expect. This method, however, simply returns - whatever Tor provides so get_conf_map("HiddenServicePort") will give the - same response as get_conf_map("HiddenServiceOptions"). + **HiddenServiceOptions** was the only option that falls into the third + category. :param str,list params: configuration option(s) to be queried - :param object default: response if the query fails - :param bool multiple: if **True**, the value(s) provided are lists of all - returned values,otherwise this just provides the first value + :param object default: value for the mappings if the configuration option + is either undefined or the query fails + :param bool multiple: if **True** then the provided are lists with all of + the present values :returns: - Response depends upon how we were called as follows... + **dict** of the 'config key => value' mappings. The value is a... - * **dict** of 'config key => value' mappings, the value is a list if - 'multiple' is **True** and a **str** of just the first value otherwise - * default if one was provided and our call failed + * **str** if **multiple** is **False**, **None** if the configuration + option is unset + * **list** if **multiple** is **True** + * the **default** if it was set and the value was either undefined or our + lookup failed :raises: - * :class:`stem.ControllerError` if the call fails and we weren't provided a default response - * :class:`stem.InvalidArguments` if the configuration option requested was invalid + * :class:`stem.ControllerError` if the call fails and we weren't provided + a default response + * :class:`stem.InvalidArguments` if the configuration option requested + was invalid """ start_time = time.time() @@ -1086,11 +1090,7 @@ class Controller(BaseController): # if everything was cached then short circuit making the query if not lookup_params: log.trace("GETCONF %s (cache fetch)" % " ".join(reply.keys())) - - if multiple: - return reply - else: - return dict([(entry[0], entry[1][0]) for entry in reply.items()]) + return self._get_conf_dict_to_response(reply, default, multiple) try: response = self.msg("GETCONF %s" % ' '.join(lookup_params)) @@ -1120,17 +1120,34 @@ class Controller(BaseController): del reply[key] log.debug("GETCONF %s (runtime: %0.4f)" % (" ".join(lookup_params), time.time() - start_time)) - - if multiple: - return reply - else: - return dict([(entry[0], entry[1][0]) for entry in reply.items()]) + return self._get_conf_dict_to_response(reply, default, multiple) except stem.ControllerError, exc: log.debug("GETCONF %s (failed: %s)" % (" ".join(lookup_params), exc)) - if default != UNDEFINED: return default + if default != UNDEFINED: return dict((param, default) for param in params) else: raise exc + def _get_conf_dict_to_response(self, config_dict, default, multiple): + """ + Translates a dictionary of 'config key => [value1, value2...]' into the + return value of :func:`~stem.control.Controller.get_conf_map`, taking into + account what the caller requested. + """ + + return_dict = {} + + for key, values in config_dict.items(): + if values == []: + # config option was unset + if default != UNDEFINED: + return_dict[key] = default + else: + return_dict[key] = [] if multiple else None + else: + return_dict[key] = values if multiple else values[0] + + return return_dict + def set_conf(self, param, value): """ Changes the value of a tor configuration option. Our value can be any of diff --git a/stem/response/getconf.py b/stem/response/getconf.py index df1a71f..879c5c0 100644 --- a/stem/response/getconf.py +++ b/stem/response/getconf.py @@ -49,5 +49,9 @@ class GetConfResponse(stem.response.ControlMessage): else: key, value = (line.pop(), None) - self.entries.setdefault(key, []).append(value) + if not key in self.entries: + self.entries[key] = [] + + if value is not None: + self.entries[key].append(value) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 9af3cae..9efeb00 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -263,14 +263,20 @@ class TestController(unittest.TestCase): reply_params = controller.get_conf_map(request_params, multiple=False).keys() self.assertEqual(set(request_params), set(reply_params)) + # queries an option that is unset + + self.assertEqual(None, controller.get_conf("HTTPSProxy")) + self.assertEqual("la-di-dah", controller.get_conf("HTTPSProxy", "la-di-dah")) + self.assertEqual([], controller.get_conf("HTTPSProxy", [], multiple = True)) + # non-existant option(s) self.assertRaises(stem.InvalidArguments, controller.get_conf, "blarg") self.assertEqual("la-di-dah", controller.get_conf("blarg", "la-di-dah")) self.assertRaises(stem.InvalidArguments, controller.get_conf_map, "blarg") - self.assertEqual("la-di-dah", controller.get_conf_map("blarg", "la-di-dah")) + self.assertEqual({"blarg": "la-di-dah"}, controller.get_conf_map("blarg", "la-di-dah")) self.assertRaises(stem.InvalidRequest, controller.get_conf_map, ["blarg", "huadf"], multiple = True) - self.assertEqual("la-di-dah", controller.get_conf_map(["erfusdj", "afiafj"], "la-di-dah", multiple = True)) + self.assertEqual({"erfusdj": "la-di-dah", "afiafj": "la-di-dah"}, controller.get_conf_map(["erfusdj", "afiafj"], "la-di-dah", multiple = True)) # multivalue configuration keys nodefamilies = [("abc", "xyz", "pqrs"), ("mno", "tuv", "wxyz")] diff --git a/test/unit/response/getconf.py b/test/unit/response/getconf.py index 14ef974..8a3aedb 100644 --- a/test/unit/response/getconf.py +++ b/test/unit/response/getconf.py @@ -71,7 +71,7 @@ class TestGetConfResponse(unittest.TestCase): "CookieAuthentication": ["0"], "ControlPort": ["9100"], "DataDirectory": ["/tmp/fake dir"], - "DirPort": [None], + "DirPort": [], } self.assertEqual(expected, control_message.entries)

1 0

[stem/master] Making the Controller's enabled_features private
by atagar＠torproject.org 17 Dec '12

17 Dec '12

commit 229a6319109372dc529106516a9fcb65f5c2eb73 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Dec 16 18:35:41 2012 -0800 Making the Controller's enabled_features private The Controller's 'enabled_features' attribute wasn't documented so it was probably meant to be private. Changing its name to reflect that. --- stem/control.py | 10 +++++----- test/integ/control/controller.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/stem/control.py b/stem/control.py index a12609f..a1100c1 100644 --- a/stem/control.py +++ b/stem/control.py @@ -622,7 +622,7 @@ class Controller(BaseController): # number of sequential 'GETINFO ip-to-country/*' lookups that have failed self._geoip_failure_count = 0 - self.enabled_features = [] + self._enabled_features = [] def connect(self): super(Controller, self).connect() @@ -1318,7 +1318,7 @@ class Controller(BaseController): feature = feature.upper() - if feature in self.enabled_features: + if feature in self._enabled_features: return True else: # check if this feature is on by default @@ -1330,9 +1330,9 @@ class Controller(BaseController): defaulted_version = stem.version.Requirement.FEATURE_VERBOSE_NAMES if defaulted_version and self.get_version().meets_requirements(defaulted_version): - self.enabled_features.append(feature) + self._enabled_features.append(feature) - return feature in self.enabled_features + return feature in self._enabled_features def enable_feature(self, features): """ @@ -1366,7 +1366,7 @@ class Controller(BaseController): raise stem.ProtocolError("USEFEATURE provided an invalid response code: %s" % response.code) - self.enabled_features += [entry.upper() for entry in features] + self._enabled_features += [entry.upper() for entry in features] def signal(self, signal): """ diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 9efeb00..2672f5f 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -438,7 +438,7 @@ class TestController(unittest.TestCase): if orconn_output == '': if test.runner.require_online(self): return - self.assertTrue("VERBOSE_NAMES" in controller.enabled_features) + self.assertTrue("VERBOSE_NAMES" in controller._enabled_features) self.assertRaises(stem.InvalidArguments, controller.enable_feature, ["NOT", "A", "FEATURE"]) try: controller.enable_feature(["NOT", "A", "FEATURE"])

1 0

[flashproxy/master] Explicitly log to /dev/null to disable a Debian default.
by dcf＠torproject.org 16 Dec '12

16 Dec '12

commit e4a70cf8516fc2140a2fe36e9dcbe7b0f0353c7f Author: David Fifield <david(a)bamsoftware.com> Date: Sun Dec 16 10:35:45 2012 -0800 Explicitly log to /dev/null to disable a Debian default. I thought that omitting a CustomLog line would prevent logging of requests. But Debian has a default configuration file /etc/apache2/conf.d/other-vhosts-access-log with a default log if you don't give your own: # Define an access log for VirtualHosts that don't define their own logfile CustomLog ${APACHE_LOG_DIR}/other_vhosts_access.log vhost_combined --- doc/facilitator-howto.txt | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/doc/facilitator-howto.txt b/doc/facilitator-howto.txt index 1defc9c..9ea5c1f 100644 --- a/doc/facilitator-howto.txt +++ b/doc/facilitator-howto.txt @@ -126,6 +126,7 @@ these contents: ServerName tor-facilitator.bamsoftware.com DocumentRoot /dev/null ScriptAliasMatch ^(.*) /usr/local/bin/facilitator.cgi$1 + CustomLog /dev/null common ErrorLog ${APACHE_LOG_DIR}/error.log LogLevel warn SSLEngine on @@ -136,9 +137,6 @@ intermediate.pem is a possible intermediate certificate file provided by the CA; if you did not get one, then leave off the SSLCertificateChainFile line. -We purposely do not include a CustomLog directive so as to not to log -client and proxy IP addresses. - === HTTPS setup The HTTP server should serve only over HTTPS and not unencrypted HTTP.

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 16 Dec '12

16 Dec '12

commit 586ea6647459d371de8b727d13a7ca6b1943b146 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 16 10:46:03 2012 +0000 Update translations for torbirdy_completed --- pl/torbirdy.properties | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/pl/torbirdy.properties b/pl/torbirdy.properties index 54c1c97..286ecfa 100644 --- a/pl/torbirdy.properties +++ b/pl/torbirdy.properties @@ -11,3 +11,5 @@ torbirdy.email.prompt=TorBirdy wyłączył kreatora auto-konfiguracji Thunderbir torbirdy.email.advanced=Zmiana ustawień zaawansowanych TorBirdy NIE jest zalecana.\n\nKontynuuj tylko jeśli wiesz, co robisz. torbirdy.email.advanced.nextwarning=Pokaż to ostrzeżenie następnym razem torbirdy.email.advanced.title=Zaawansowane Ustawienia TorBirdy + +torbirdy.restart=Aby ustawienie strefy czasowej odniosło skutek, proszę zamknąć Thunderbirda i ponownie go uruchomić.

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 16 Dec '12

16 Dec '12

commit 24ba2d56ac8b617b4e85b3ea354aa8f4e748c84f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 16 10:46:00 2012 +0000 Update translations for torbirdy --- pl/torbirdy.properties | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pl/torbirdy.properties b/pl/torbirdy.properties index 0077b36..286ecfa 100644 --- a/pl/torbirdy.properties +++ b/pl/torbirdy.properties @@ -12,4 +12,4 @@ torbirdy.email.advanced=Zmiana ustawień zaawansowanych TorBirdy NIE jest zaleca torbirdy.email.advanced.nextwarning=Pokaż to ostrzeżenie następnym razem torbirdy.email.advanced.title=Zaawansowane Ustawienia TorBirdy -# torbirdy.restart=For the time zone preference to take effect, please close Thunderbird and start it again. +torbirdy.restart=Aby ustawienie strefy czasowej odniosło skutek, proszę zamknąć Thunderbirda i ponownie go uruchomić.

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 16 Dec '12

16 Dec '12

commit f63d992126e3b4da290f33c8afa136e0cc350106 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 16 10:16:12 2012 +0000 Update translations for torbirdy_completed --- pl/torbirdy.dtd | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/pl/torbirdy.dtd b/pl/torbirdy.dtd index 7e0d560..5e978c2 100644 --- a/pl/torbirdy.dtd +++ b/pl/torbirdy.dtd @@ -33,6 +33,8 @@ <!ENTITY torbirdy.prefs.imap.key "e"> <!ENTITY torbirdy.prefs.startup_folder.label "Przejdź do ostatniego folderu pocztowego przy uruchomieniu [domyślne: wyłączone, wybierze Foldery Lokalne]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label "Nie ustawiaj strefy czasowej Thunderbirda na UTC [domyślne: ustaw na UTC]"> +<!ENTITY torbirdy.prefs.timezone.key "s"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Wyłącz GPG '--throw-keyids' [domyślne: włączone]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.account_specific "Specyficzne dla konta">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 16 Dec '12

16 Dec '12

commit 71947551e783025d6921a77ab6b18f72319f3fb5 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 16 10:16:08 2012 +0000 Update translations for torbirdy --- pl/torbirdy.dtd | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pl/torbirdy.dtd b/pl/torbirdy.dtd index 6c58ac5..5e978c2 100644 --- a/pl/torbirdy.dtd +++ b/pl/torbirdy.dtd @@ -33,8 +33,8 @@ <!ENTITY torbirdy.prefs.imap.key "e"> <!ENTITY torbirdy.prefs.startup_folder.label "Przejdź do ostatniego folderu pocztowego przy uruchomieniu [domyślne: wyłączone, wybierze Foldery Lokalne]"> <!ENTITY torbirdy.prefs.startup_folder.key "l"> -<!ENTITY torbirdy.prefs.timezone.label ""> -<!ENTITY torbirdy.prefs.timezone.key ""> +<!ENTITY torbirdy.prefs.timezone.label "Nie ustawiaj strefy czasowej Thunderbirda na UTC [domyślne: ustaw na UTC]"> +<!ENTITY torbirdy.prefs.timezone.key "s"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Wyłącz GPG '--throw-keyids' [domyślne: włączone]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> <!ENTITY torbirdy.prefs.account_specific "Specyficzne dla konta">

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits December 2012