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

[arm/master] Fetching pid with 'GETINFO process/pid' if able
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit a1271d49f14f8d63e983043e677c92ba15fa9c9b Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 22 19:12:34 2011 -0700 Fetching pid with 'GETINFO process/pid' if able This is a new controller option added in ticket 2291 (https://trac.torproject.org/projects/tor/ticket/2291) This was tested against Tor v0.2.3.0-alpha-dev by making sure we're making the getinfo call, and not using pgrep to resolve the pid. --- src/util/torTools.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 3ef66f2..5e77f2e 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1692,7 +1692,10 @@ class Controller(TorCtl.PostEventListener): elif key == "parsedVersion": result = parseVersion(self.getInfo("version", "")) elif key == "pid": - result = getPid(int(self.getOption("ControlPort", 9051)), self.getOption("PidFile")) + result = self.getInfo("process/pid") + + if not result: + result = getPid(int(self.getOption("ControlPort", 9051)), self.getOption("PidFile")) elif key == "user": # This was added in Tor 0.2.3.x-final so it's quite likely unavailable. # Even if it is, it might fail and return an empty string.

1 0

[arm/master] Better commenting for new controller option usage
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 1ff5c3d8307a38485f850ba4936d4ab2e16bed7d Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 22 19:18:50 2011 -0700 Better commenting for new controller option usage --- src/util/torTools.py | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 5e77f2e..b5913ed 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1626,6 +1626,12 @@ class Controller(TorCtl.PostEventListener): lookups if true """ + # Several controller options were added in ticket 2291... + # https://trac.torproject.org/projects/tor/ticket/2291 + # which is only available with newer tor versions (tested them against + # Tor v0.2.3.0-alpha-dev). When using these options we need to be + # especially careful to have good fallback logic. + currentVal = self._cachedParam.get(key) if currentVal != None: if currentVal == UNKNOWN: return default @@ -1697,8 +1703,7 @@ class Controller(TorCtl.PostEventListener): if not result: result = getPid(int(self.getOption("ControlPort", 9051)), self.getOption("PidFile")) elif key == "user": - # This was added in Tor 0.2.3.x-final so it's quite likely unavailable. - # Even if it is, it might fail and return an empty string. + # provides the empty string if the query fails queriedUser = self.getInfo("process/user") if queriedUser != None and queriedUser != "": @@ -1721,9 +1726,7 @@ class Controller(TorCtl.PostEventListener): psResults = sysTools.call("ps -o user %s" % myPid) if psResults and len(psResults) >= 2: result = psResults[1].strip() elif key == "fdLimit": - # This was added in Tor 0.2.3.x-final so it's quite likely unavailable. - # Even if it is, it might fail and return -1. - + # provides -1 if the query fails queriedLimit = self.getInfo("process/descriptor-limit") if queriedLimit != None and queriedLimit != "-1":

1 0

[arm/master] Merge release commit '8b8568e'
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 8b4d9f13e50f6a420b1000c70de25bf244db393a Merge: 6534807 8b8568e Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 21 09:42:15 2011 -0700 Merge release commit '8b8568e' Conflicts: src/version.py setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[arm/master] Initializing bandwidth totals from Tor when able
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 301085e92801173d884e8a1282539282331244d8 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 23 20:24:55 2011 -0700 Initializing bandwidth totals from Tor when able Ticket 2345 (https://trac.torproject.org/projects/tor/ticket/2345) introduced GETINFO options for the total read and written bandwidth values. If these are available then they're used to populate the total values in arm. --- src/interface/graphing/bandwidthStats.py | 19 +++++++++++++++++++ src/settings.cfg | 4 ++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/src/interface/graphing/bandwidthStats.py b/src/interface/graphing/bandwidthStats.py index 1955465..3f34e3c 100644 --- a/src/interface/graphing/bandwidthStats.py +++ b/src/interface/graphing/bandwidthStats.py @@ -55,6 +55,25 @@ class BandwidthStats(graphPanel.GraphStats): self._titleStats, self.isAccounting = [], False self.resetListener(conn, torTools.State.INIT) # initializes values conn.addStatusListener(self.resetListener) + + # Initialized the bandwidth totals to the values reported by Tor. This + # uses a controller options introduced in ticket 2345: + # https://trac.torproject.org/projects/tor/ticket/2345 + # + # further updates are still handled via BW events to avoid unnecessary + # GETINFO requests. This needs to update the pause buffer too because + # instances start paused, causing the primary value to be clobbered once + # just after initalization. + + readTotal = conn.getInfo("traffic/read") + if readTotal and readTotal.isdigit(): + self.primaryTotal = int(readTotal) / 1024 # Bytes -> KB + self._pauseBuffer.primaryTotal = int(readTotal) / 1024 + + writeTotal = conn.getInfo("traffic/written") + if writeTotal and writeTotal.isdigit(): + self.secondaryTotal = int(writeTotal) / 1024 # Bytes -> KB + self._pauseBuffer.secondaryTotal = int(writeTotal) / 1024 def resetListener(self, conn, eventType): # updates title parameters and accounting status if they changed diff --git a/src/settings.cfg b/src/settings.cfg index 0e0e395..1ee63a1 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -273,6 +273,8 @@ config.summary.TestingEstimatedDescriptorPropagationTime delay before clients at # [ARM_DEBUG] recreating panel 'graph' with the dimensions of 14/124 # [ARM_DEBUG] redrawing the log panel with the corrected content height (estimat was off by 4) # [ARM_DEBUG] GETINFO accounting/bytes-left (runtime: 0.0006) +# [ARM_DEBUG] GETINFO traffic/read (runtime: 0.0004) +# [ARM_DEBUG] GETINFO traffic/written (runtime: 0.0002) # [ARM_DEBUG] GETCONF MyFamily (runtime: 0.0007) # [ARM_DEBUG] Unable to query process resource usage from ps, waiting 6.25 seconds (unrecognized output from ps: ...) @@ -311,6 +313,8 @@ msg.ARM_DEBUG GETINFO accounting/bytes msg.ARM_DEBUG GETINFO accounting/bytes-left msg.ARM_DEBUG GETINFO accounting/interval-end msg.ARM_DEBUG GETINFO accounting/hibernating +msg.ARM_DEBUG GETINFO traffic/read +msg.ARM_DEBUG GETINFO traffic/written msg.ARM_DEBUG GETCONF msg.ARM_DEBUG Unable to query process resource usage from ps

1 0

[arm/master] Triggering deb-build logic when in "release_deb"
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 8b8568eda8145f6c2ab4295a7924a63a7617ff39 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 21 09:38:03 2011 -0700 Triggering deb-build logic when in "release_deb" The deb-prep.sh script makes a release_deb directory in which the build takes place. Triggering off of tor-arm is insufficient to catch all of the calls to setup.py while making a deb, causing it to error from TorCtl being missing. --- setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/setup.py b/setup.py index 39497aa..9777da1 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ from distutils.core import setup isDebInstall = False for arg in sys.argv: - if "tor-arm" in arg: + if "tor-arm" in arg or "release_deb" in arg: isDebInstall = True break

1 0

[arm/master] fix: Capitalizing unused cfg option log message
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 9ba121e859d8c551be08e340728004fa48ec1c4d Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 22 19:05:40 2011 -0700 fix: Capitalizing unused cfg option log message --- src/interface/controller.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/interface/controller.py b/src/interface/controller.py index 558c107..b88152f 100644 --- a/src/interface/controller.py +++ b/src/interface/controller.py @@ -649,7 +649,7 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): # provides notice about any unused config keys for key in config.getUnusedKeys(): - log.log(CONFIG["log.configEntryUndefined"], "unused configuration entry: %s" % key) + log.log(CONFIG["log.configEntryUndefined"], "Unused configuration entry: %s" % key) lastPerformanceLog = 0 # ensures we don't do performance logging too frequently redrawStartTime = time.time()

1 0

[arm/master] Hotfix for the 1.4.1 release:
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 4794d9275c50f3cfb850e8bfbfde828bafe53dd4 Merge: 95e0106 9b1b7b5 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jan 12 04:56:09 2011 +0000 Hotfix for the 1.4.1 release: change: including platform, python version, and arm/tor configurations in debug dumps change: adding summaries for server config options fix: properly parse the ps field when displaying decimal seconds (patch by Fabian) fix: error when initial recource lookups fail (caught by Trystero) svn:r24064 ChangeLog | 2 +- TODO | 9 ++++--- armrc.sample | 1 + src/settings.cfg | 34 +++++++++++++++++++++++++++++ src/starter.py | 57 ++++++++++++++++++++++++++++++++++++++++++++++++- src/util/sysTools.py | 24 ++++++++++++++------- src/util/uiTools.py | 5 +++- src/version.py | 4 +- 8 files changed, 118 insertions(+), 18 deletions(-) diff --cc src/version.py index 1306ee9,f6e1269..ddd3748 --- a/src/version.py +++ b/src/version.py @@@ -2,6 -2,6 +2,6 @@@ Provides arm's version and release date. """ - VERSION = '1.4.1' - LAST_MODIFIED = "January 7, 2011" -VERSION = '1.4.1_dev' -LAST_MODIFIED = "January 7, 2011" ++VERSION = '1.4.1.1' ++LAST_MODIFIED = "January 11, 2011"

1 0

[arm/master] Offering to install TorCtl if unavailable
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit d1d54c08e245083660394d0e11b41c593099fc2f Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Apr 20 19:38:17 2011 -0700 Offering to install TorCtl if unavailable --- src/prereq.py | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/src/prereq.py b/src/prereq.py index 90cb03a..ee5c768 100644 --- a/src/prereq.py +++ b/src/prereq.py @@ -2,7 +2,50 @@ Provides a warning and error code if python version isn't compatible. """ +import os import sys +import shutil +import tempfile + +TORCTL_REPO = "git://git.torproject.org/pytorctl.git" + +def isTorCtlAvailable(): + """ + True if TorCtl is already available on the platform, false otherwise. + """ + + try: + import TorCtl + return True + except ImportError: + return False + +def installTorCtl(): + """ + Checks out the current git head release for TorCtl and bundles it with arm. + This raises an IOError if unsuccessful. + """ + + if isTorCtlAvailable(): return + + # temporary destination for TorCtl's git clone, guarenteed to be unoccupied + # (to avoid conflicting with files that are already there) + tmpFilename = tempfile.mktemp("/torctl") + + # fetches TorCtl + exitStatus = os.system("git clone %s %s > /dev/null" % (TORCTL_REPO, tmpFilename)) + if exitStatus: raise IOError("Unable to get TorCtl from %s. Is git installed?" % TORCTL_REPO) + + # the destination for TorCtl will be our directory + ourDir = os.path.dirname(os.path.realpath(__file__)) + + # exports TorCtl to our location + exitStatus = os.system("(cd %s && git archive --format=tar --prefix=TorCtl/ master) | (cd %s && tar xf - 2> /dev/null)" % (tmpFilename, ourDir)) + if exitStatus: raise IOError("Unable to install TorCtl to %s" % ourDir) + + # Clean up the temporary contents. This isn't vital so quietly fails in case + # of errors. + shutil.rmtree(tmpFilename, ignore_errors=True) if __name__ == '__main__': majorVersion = sys.version_info[0] @@ -20,4 +63,21 @@ if __name__ == '__main__': except ImportError: print("arm requires curses - try installing the python-curses package\n") sys.exit(1) + + if not isTorCtlAvailable(): + 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"): + sys.exit(1) + + # attempt to install TorCtl, printing the issue if unsuccessful + try: + installTorCtl() + + if not isTorCtlAvailable(): + raise IOError("Unable to install TorCtl, sorry") + except IOError, exc: + print exc + sys.exit(1)

1 0

[arm/master] Hotfix for r24570.
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 8b498b39a4f48e44b3addce98a239438f131361a Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 7 01:30:11 2011 +0000 Hotfix for r24570. svn:r24571 --- setup.py | 2 +- src/version.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 03caaa3..2176a1c 100644 --- a/setup.py +++ b/setup.py @@ -79,7 +79,7 @@ setup(name='arm', author='Damian Johnson', author_email='atagar(a)torproject.org', url='http://www.atagar.com/arm/', - packages=['arm', 'arm.interface', 'arm.interface.graphing', 'arm.util', 'arm.TorCtl'], + packages=['arm', 'arm.interface', 'arm.interface.graphing', 'arm.interface.connections', 'arm.util', 'arm.TorCtl'], package_dir={'arm': 'src'}, data_files=[("/usr/bin", ["arm"]), ("/usr/share/man/man1", [manFilename]), diff --git a/src/version.py b/src/version.py index ee7c493..81a5d88 100644 --- a/src/version.py +++ b/src/version.py @@ -2,6 +2,6 @@ Provides arm's version and release date. """ -VERSION = '1.4.2.1' -LAST_MODIFIED = "April 4, 2011" +VERSION = '1.4.2.2' +LAST_MODIFIED = "April 6, 2011"

1 0

[arm/master] Another hotfix from Fabian (for decimal seconds in the uptime field of ps results)
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit bb7c907e840b6e4ef6f9af671a763b4bc79df0ec Merge: 4794d92 623d26f Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 13 03:11:36 2011 +0000 Another hotfix from Fabian (for decimal seconds in the uptime field of ps results) svn:r24075 src/util/uiTools.py | 6 ++---- src/version.py | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --cc src/version.py index ddd3748,f6e1269..cf86296 --- a/src/version.py +++ b/src/version.py @@@ -2,6 -2,6 +2,6 @@@ Provides arm's version and release date. """ - VERSION = '1.4.1.1' - LAST_MODIFIED = "January 11, 2011" -VERSION = '1.4.1_dev' -LAST_MODIFIED = "January 7, 2011" ++VERSION = '1.4.1.2' ++LAST_MODIFIED = "January 12, 2011"

1 0