- tor-commits - lists.torproject.org

[arm/master] fix: renaming prompt and format to avoid ambiguity
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit e2e3091c1af2741e046831fdecd73677b3c1652b Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 24 17:29:05 2011 -0700 fix: renaming prompt and format to avoid ambiguity Renaming the prompt function and format variable to avoid a naming conflict with other uses of that name in the module. Not actually an error, but could lead to headaches if it did cause a bug. Caught by pylint. --- src/starter.py | 2 +- src/util/torInterpretor.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/starter.py b/src/starter.py index b184330..625000c 100644 --- a/src/starter.py +++ b/src/starter.py @@ -538,7 +538,7 @@ if __name__ == '__main__': import gui.controller gui.controller.start_gui() elif launchPrompt: - util.torInterpretor.prompt() + util.torInterpretor.showPrompt() else: cli.controller.startTorMonitor(time.time() - initTime) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index cb2dcb7..1ff3b84 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -960,7 +960,7 @@ class ControlInterpretor: return (inputLines, outputLines) -def prompt(): +def showPrompt(): # For Python 2.6 and earlier cycling history via the readline module with # up/down is buggy with a color prompt. For more information see: # http://bugs.python.org/issue12972 @@ -1041,17 +1041,17 @@ def _splitOnNewlines(entry): entry = list(entry) # shallow copy while entry: - msg, format = entry.pop(0) + msg, msgFormat = entry.pop(0) if "\n" in msg: msg, remainder = msg.split("\n", 1) - entry.insert(0, (remainder, format)) + entry.insert(0, (remainder, msgFormat)) - tmpLine.append((msg, format)) + tmpLine.append((msg, msgFormat)) results.append(tmpLine) tmpLine = [] else: - tmpLine.append((msg, format)) + tmpLine.append((msg, msgFormat)) if tmpLine: results.append(tmpLine) return results

1 0

[arm/master] Minor fixes spotted while prepping for release
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit d84dc4dba0c3143337ba6ebbf50f75df33ae6e15 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 24 17:53:25 2011 -0700 Minor fixes spotted while prepping for release --- README | 1 + src/cli/interpretorPanel.py | 2 +- src/util/__init__.py | 2 +- src/util/torTools.py | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index cbaf2f7..87a6141 100644 --- a/README +++ b/README @@ -208,6 +208,7 @@ Layout: sysTools.py - helper for system calls, providing client side caching 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 uiTools.py - helper functions for presenting the user interface diff --git a/src/cli/interpretorPanel.py b/src/cli/interpretorPanel.py index 283c371..37b9e58 100644 --- a/src/cli/interpretorPanel.py +++ b/src/cli/interpretorPanel.py @@ -77,7 +77,7 @@ class InterpretorPanel(panel.Panel): isDone = True else: try: - inputEntry, outputEntry = self.interpretor.handleQuery(input) + self.interpretor.handleQuery(input) except torInterpretor.InterpretorClosed: # Makes our control connection check if its been closed or not torTools.getConn().isAlive() diff --git a/src/util/__init__.py b/src/util/__init__.py index 973527e..2b8f928 100644 --- a/src/util/__init__.py +++ b/src/util/__init__.py @@ -4,5 +4,5 @@ application's status, making cross platform system calls, parsing tor data, and safely working with curses (hiding some of the gory details). """ -__all__ = ["conf", "connections", "enum", "gtkTools", "hostnames", "log", "panel", "procTools", "procName", "sysTools", "textInput", "torConfig", "torTools", "uiTools"] +__all__ = ["conf", "connections", "enum", "gtkTools", "hostnames", "log", "panel", "procTools", "procName", "sysTools", "textInput", "torConfig", "torInterpretor", "torTools", "uiTools"] diff --git a/src/util/torTools.py b/src/util/torTools.py index 9f06a61..8e2d6d5 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -123,7 +123,6 @@ def connect_socket(socketPath="/var/run/tor/control", ConnClass=TorCtl.Connectio ConnClass - connection type to instantiate """ - import socket try: s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) s.connect(socketPath)

1 0

[arm/master] fix: fetching relay address could ignored default
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 0b9d52bc7c33aa722cca219882832bc4d2ed44a6 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 24 16:43:47 2011 -0700 fix: fetching relay address could ignored default The getRelayAddress function would ignore its default argument if tor is shut down, causing it to return None and make arm crash. This is probably a timing issue which is why it went undiscovered so long. --- src/util/torTools.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 3d18fcb..9f06a61 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1546,7 +1546,7 @@ class Controller(TorCtl.PostEventListener): self.connLock.acquire() - result = None + result = default if self.isAlive(): # query the address if it isn't yet cached if not relayFingerprint in self._addressLookupCache:

1 0

[arm/master] Toning down arm's notice when resolvers fail
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 019ee06a104b796bee4398efc7b6dff4c368fc09 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 24 15:27:38 2011 -0700 Toning down arm's notice when resolvers fail When arm failed to query tor's connections it would give a short warning saying so. This often spooked users so lowering this to be a NOTICE and giving more information on both what happened and how to fix it (99% of the time this is a simple permissions issue). Change requested by Sebastian --- armrc.sample | 2 +- src/cli/controller.py | 2 +- src/util/connections.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/armrc.sample b/armrc.sample index 8f65fbc..7daba30 100644 --- a/armrc.sample +++ b/armrc.sample @@ -303,7 +303,7 @@ log.configDescriptions.persistance.saveFailed NOTICE log.connResolverOptions INFO log.connLookupFailed INFO log.connLookupFailover NOTICE -log.connLookupAbandon WARN +log.connLookupAbandon NOTICE log.connLookupRateGrowing NONE log.hostnameCacheTrimmed INFO log.cursesColorSupport INFO diff --git a/src/cli/controller.py b/src/cli/controller.py index a841492..4e6dc82 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -670,7 +670,7 @@ def startTorMonitor(startTime): connections.getResolver("tor").setPaused(not conn.isAlive()) # hack to display a better (arm specific) notice if all resolvers fail - connections.RESOLVER_FINAL_FAILURE_MSG += " (connection related portions of the monitor won't function)" + connections.RESOLVER_FINAL_FAILURE_MSG = "We were unable to use any of your system's resolvers to get tor's connections. This is fine, but means that the connections page will be empty. This is usually permissions related so if you would like to fix this then run arm with the same user as tor (ie, \"sudo -u <tor user> arm\")." # provides a notice about any event types tor supports but arm doesn't missingEventTypes = cli.logPanel.getMissingEventTypes() diff --git a/src/util/connections.py b/src/util/connections.py index 97de3ea..9350cb8 100644 --- a/src/util/connections.py +++ b/src/util/connections.py @@ -72,13 +72,13 @@ RUN_BSD_PROCSTAT = "procstat -f %s | grep TCP | grep -v 0.0.0.0:0" RESOLVERS = [] # connection resolvers available via the singleton constructor RESOLVER_FAILURE_TOLERANCE = 3 # number of subsequent failures before moving on to another resolver -RESOLVER_SERIAL_FAILURE_MSG = "Querying connections with %s failed, trying %s" +RESOLVER_SERIAL_FAILURE_MSG = "Unable to query connections with %s, trying %s" RESOLVER_FINAL_FAILURE_MSG = "All connection resolvers failed" CONFIG = {"queries.connections.minRate": 5, "log.connResolverOptions": log.INFO, "log.connLookupFailed": log.INFO, "log.connLookupFailover": log.NOTICE, - "log.connLookupAbandon": log.WARN, + "log.connLookupAbandon": log.NOTICE, "log.connLookupRateGrowing": None, "log.configEntryTypeError": log.NOTICE}

1 0

[arm/master] Cautioning users against running tor as root
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit b1a5794c26d02b31a32762a4ef357878f4742fb7 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 24 16:14:22 2011 -0700 Cautioning users against running tor as root Notice level message at startup that cautions the user against running tor as root. --- src/starter.py | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/src/starter.py b/src/starter.py index 2347f7b..6ed516e 100644 --- a/src/starter.py +++ b/src/starter.py @@ -99,6 +99,9 @@ STANDARD_CFG_NOT_FOUND_MSG = "No armrc loaded, using defaults. You can customize # torrc entries that are scrubbed when dumping PRIVATE_TORRC_ENTRIES = ["HashedControlPassword", "Bridge", "HiddenServiceDir"] +# notices given if the user is running arm or tor as root +TOR_ROOT_NOTICE = "Tor is currently running with root permissions. This is not a good idea and shouldn't be necessary. See the 'User UID' option from Tor's man page for an easy method of reducing its permissions after startup." + def allowConnectionTypes(): """ This provides a tuple with booleans indicating if we should or shouldn't @@ -489,7 +492,14 @@ if __name__ == '__main__': # skewing the startup time results so this isn't counted initTime = time.time() - startTime controller = util.torTools.getConn() - if conn: controller.init(conn) + + if conn: + controller.init(conn) + + # give a notice if tor is running with root + if controller.getMyUser() == "root": + util.log.log(util.log.NOTICE, TOR_ROOT_NOTICE) + # fetches descriptions for tor's configuration options _loadConfigurationDescriptions(pathPrefix)

1 0

[arm/master] fix: dropping os check for startup wizard option
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 7a187c482f306fbfbe83552cc2a618e393e357e3 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 24 14:43:35 2011 -0700 fix: dropping os check for startup wizard option The startup wizard option is currently unimplemented and disabled in the setting.cfg. However, there was an os compatability check left over from when I was gonna implement it. That and its comment were confusing since the option's not implemented so commenting it out with a more up to date expanation. --- src/cli/wizard.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index da4e645..86522d1 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -331,10 +331,15 @@ def showWizard(): if not os.path.exists(os.path.dirname(SYSTEM_DROP_PATH)) or not os.path.exists(OVERRIDE_SCRIPT): disabledOpt.append(Options.SYSTEM) + # TODO: The STARTUP option is currently disabled in the 'settings.cfg', and I + # don't currently have plans to implement it (it would be a big pita, and the + # tor deb already handles it). *If* it is implemented then I'd limit support + # for the option to Debian and Ubuntu to start with, via the following... + # Running at startup is currently only supported for Debian and Ubuntu. # Patches welcome for supporting other platforms. - if not platform.dist()[0] in ("debian", "Ubuntu"): - disabledOpt.append(Options.STARTUP) + #if not platform.dist()[0] in ("debian", "Ubuntu"): + # disabledOpt.append(Options.STARTUP) while True: if relayType == None:

1 0

[arm/master] Cautioning users against running arm as root
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit e0248705018a57c55d7c99295a66857b617a06f1 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 24 16:56:26 2011 -0700 Cautioning users against running arm as root Notice level message at startup that cautions the user against running arm as root. --- src/starter.py | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/starter.py b/src/starter.py index 6ed516e..b184330 100644 --- a/src/starter.py +++ b/src/starter.py @@ -101,6 +101,7 @@ PRIVATE_TORRC_ENTRIES = ["HashedControlPassword", "Bridge", "HiddenServiceDir"] # notices given if the user is running arm or tor as root TOR_ROOT_NOTICE = "Tor is currently running with root permissions. This is not a good idea and shouldn't be necessary. See the 'User UID' option from Tor's man page for an easy method of reducing its permissions after startup." +ARM_ROOT_NOTICE = "Arm is currently running with root permissions. This is not a good idea, and will still work perfectly well if it's run with the same user as Tor (ie, starting with \"sudo -u %s arm\")." def allowConnectionTypes(): """ @@ -493,13 +494,23 @@ if __name__ == '__main__': initTime = time.time() - startTime controller = util.torTools.getConn() + torUser = None if conn: controller.init(conn) # give a notice if tor is running with root - if controller.getMyUser() == "root": + torUser = controller.getMyUser() + if torUser == "root": util.log.log(util.log.NOTICE, TOR_ROOT_NOTICE) - + + # Give a notice if arm is running with root. Querying connections usually + # requires us to have the same permissions as tor so if tor is running as + # root then drop this notice (they're already then being warned about tor + # being root, anyway). + + if torUser != "root" and os.getuid() == 0: + torUserLabel = torUser if torUser else "<tor user>" + util.log.log(util.log.NOTICE, ARM_ROOT_NOTICE % torUserLabel) # fetches descriptions for tor's configuration options _loadConfigurationDescriptions(pathPrefix)

1 0

[arm/master] fix: wizard showed wrong torrc path for sys torrc
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 458073c58d103b8dc633b36f56d77602865911e7 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 24 14:33:25 2011 -0700 fix: wizard showed wrong torrc path for sys torrc When the user opts for the generated torrc to be for the system instance the wizard shows the wrong path in the confirmation panel. --- src/cli/wizard.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 4cb65ad..da4e645 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -356,15 +356,15 @@ def showWizard(): generatedTorrc = getTorrc(relayType, config, disabledOpt) torrcLocation = manager.getTorrcPath() + isSystemReplace = not Options.SYSTEM in disabledOpt and config[Options.SYSTEM].getValue() + if isSystemReplace: torrcLocation = SYSTEM_DROP_PATH + controller.redraw() confirmationSelection = showConfirmationDialog(generatedTorrc, torrcLocation) if confirmationSelection == NEXT: log.log(log.INFO, "Writing torrc to '%s':\n%s" % (torrcLocation, generatedTorrc)) - isSystemReplace = not Options.SYSTEM in disabledOpt and config[Options.SYSTEM].getValue() - if isSystemReplace: torrcLocation = SYSTEM_DROP_PATH - # if the torrc already exists then save it to a _bak file isBackedUp = False if os.path.exists(torrcLocation) and not isSystemReplace:

1 0

[arm/master] fix: concurrency issue could crash from CIRC event
by atagar＠torproject.org 24 Sep '11

24 Sep '11

commit e884fcbd894c9e764c60e6b40c5bd3e14583352e Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 24 13:03:20 2011 -0700 fix: concurrency issue could crash from CIRC event If we got a CIRC event while populating the cache of relays that we're attached to we could reset _fingerprintsAttachedCache to None while we were in the middle of populating it. Manipulation of this cache is supposed to be governed by the connection lock, so fixing that for the CIRC event's reset. --- src/util/torTools.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index e59b35e..3d18fcb 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -2004,7 +2004,9 @@ class Controller(TorCtl.PostEventListener): # CIRC events aren't required, but if one's received then flush this cache # since it uses circuit-status results. + self.connLock.acquire() self._fingerprintsAttachedCache = None + self.connLock.release() self._cachedParam["circuits"] = None @@ -2085,6 +2087,10 @@ class Controller(TorCtl.PostEventListener): relayPort - orport of relay (to further narrow the results) """ + # Events can reset _fingerprintsAttachedCache to None, so all uses of this + # function need to be under the connection lock (skipping that might also + # scew with the conn usage of this function...) + # If we were provided with a string port then convert to an int (so # lookups won't mismatch based on type). if isinstance(relayPort, str): relayPort = int(relayPort)

1 0

[arm/master] fix: clarifying missing armrc message
by atagar＠torproject.org 24 Sep '11

24 Sep '11

commit 73de20de4a69bc055cf23d5852e0ac8b007af1a9 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Sep 24 12:54:39 2011 -0700 fix: clarifying missing armrc message Occasionally people are confused by the notice that no armrc was loaded, thinking that it's a problem. Trying to clarify the message (it's just supposed to inform users that they can customize arm's behavior). --- src/starter.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/starter.py b/src/starter.py index 4315f06..2347f7b 100644 --- a/src/starter.py +++ b/src/starter.py @@ -94,7 +94,7 @@ DESC_SAVE_FAILED_MSG = "Unable to save configuration descriptions (%s)" NO_INTERNAL_CFG_MSG = "Failed to load the parsing configuration. This will be problematic for a few things like torrc validation and log duplication detection (%s)" STANDARD_CFG_LOAD_FAILED_MSG = "Failed to load configuration (using defaults): \"%s\"" -STANDARD_CFG_NOT_FOUND_MSG = "No configuration found at '%s', using defaults" +STANDARD_CFG_NOT_FOUND_MSG = "No armrc loaded, using defaults. You can customize arm by placing a configuration file at '%s' (see the armrc.sample for its options)." # torrc entries that are scrubbed when dumping PRIVATE_TORRC_ENTRIES = ["HashedControlPassword", "Bridge", "HiddenServiceDir"]

1 0