- tor-commits - lists.torproject.org

[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] 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] 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] 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] Ignoring vim temporary swap files
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit b38cd993ee6d717372f479329236a7ab0a019f79 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 23 20:22:17 2011 -0700 Ignoring vim temporary swap files --- .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 9b955dd..6377435 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.pyc src/TorCtl/ +*.swp

1 0

[arm/master] Dropping optional total prepopulation state file
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 4f3f7cfd957bc55f956e21e8af82888a24ec7ff4 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 23 20:30:41 2011 -0700 Dropping optional total prepopulation state file The total value provided by the 'features.graph.bw.prepopulateTotal' config option was confusing, pointless, and conflicted with the new functionality we have to fetch the true totals from Tor. --- src/interface/graphing/bandwidthStats.py | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/src/interface/graphing/bandwidthStats.py b/src/interface/graphing/bandwidthStats.py index 3f34e3c..70a1e16 100644 --- a/src/interface/graphing/bandwidthStats.py +++ b/src/interface/graphing/bandwidthStats.py @@ -20,8 +20,7 @@ ACCOUNTING_ARGS = ("status", "resetTime", "read", "written", "readLimit", "writt PREPOPULATE_SUCCESS_MSG = "Read the last day of bandwidth history from the state file" PREPOPULATE_FAILURE_MSG = "Unable to prepopulate bandwidth information (%s)" -DEFAULT_CONFIG = {"features.graph.bw.prepopulateTotal": False, - "features.graph.bw.transferInBytes": False, +DEFAULT_CONFIG = {"features.graph.bw.transferInBytes": False, "features.graph.bw.accounting.show": True, "features.graph.bw.accounting.rate": 10, "features.graph.bw.accounting.isTimeLong": False, @@ -347,10 +346,6 @@ class BandwidthStats(graphPanel.GraphStats): def _getTotalLabel(self, isPrimary): total = self.primaryTotal if isPrimary else self.secondaryTotal - - if self._config["features.graph.bw.prepopulateTotal"]: - total += self.prepopulatePrimaryTotal if isPrimary else self.prepopulateSecondaryTotal - return "total: %s" % uiTools.getSizeLabel(total * 1024, 1) def _updateAccountingInfo(self):

1 0

[arm/master] Separating inital BW totals into separate params
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit b4ea3bd612d54ff1e33c4b52d4982ccfc207d9fb Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 23 20:34:31 2011 -0700 Separating inital BW totals into separate params Mixing the bandwidth totals fetched from Tor with the GraphStats param caused the average measurement to be skewed. Separating this total into a parameter just used for the total label. --- armrc.sample | 4 ---- src/interface/graphing/bandwidthStats.py | 14 +++++++------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/armrc.sample b/armrc.sample index 11b62ea..4cda197 100644 --- a/armrc.sample +++ b/armrc.sample @@ -140,9 +140,6 @@ features.graph.showIntermediateBounds true # prepopulate # attempts to use tor's state file to prepopulate the bandwidth graph at the # 15-minute interval (this requires the minimum of a day's worth of uptime) -# prepopulateTotal -# populates the total stat from the state file if true (this only contains -# the last day's worth of information, so this metric isn't the true total) # transferInBystes # shows rate measurments in bytes if true, bits otherwise # accounting.show @@ -153,7 +150,6 @@ features.graph.showIntermediateBounds true # provides verbose measurements of time if true features.graph.bw.prepopulate true -features.graph.bw.prepopulateTotal false features.graph.bw.transferInBytes false features.graph.bw.accounting.show true features.graph.bw.accounting.rate 10 diff --git a/src/interface/graphing/bandwidthStats.py b/src/interface/graphing/bandwidthStats.py index 70a1e16..f8e3020 100644 --- a/src/interface/graphing/bandwidthStats.py +++ b/src/interface/graphing/bandwidthStats.py @@ -60,19 +60,18 @@ class BandwidthStats(graphPanel.GraphStats): # 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. + # GETINFO requests. + + self.initialPrimaryTotal = 0 + self.initialSecondaryTotal = 0 readTotal = conn.getInfo("traffic/read") if readTotal and readTotal.isdigit(): - self.primaryTotal = int(readTotal) / 1024 # Bytes -> KB - self._pauseBuffer.primaryTotal = int(readTotal) / 1024 + self.initialPrimaryTotal = int(readTotal) / 1024 # Bytes -> KB writeTotal = conn.getInfo("traffic/written") if writeTotal and writeTotal.isdigit(): - self.secondaryTotal = int(writeTotal) / 1024 # Bytes -> KB - self._pauseBuffer.secondaryTotal = int(writeTotal) / 1024 + self.initialSecondaryTotal = int(writeTotal) / 1024 # Bytes -> KB def resetListener(self, conn, eventType): # updates title parameters and accounting status if they changed @@ -346,6 +345,7 @@ class BandwidthStats(graphPanel.GraphStats): def _getTotalLabel(self, isPrimary): total = self.primaryTotal if isPrimary else self.secondaryTotal + total += self.initialPrimaryTotal if isPrimary else self.initialSecondaryTotal return "total: %s" % uiTools.getSizeLabel(total * 1024, 1) def _updateAccountingInfo(self):

1 0

[arm/master] Arm release 1.4.1
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 95e0106a445f82aececb92d201838454dd5e982e Merge: a40075d 984052d Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 8 06:35:08 2011 +0000 Arm release 1.4.1 svn:r24054 ChangeLog | 46 ++- README | 39 +- TODO | 140 +++-- arm.1 | 4 + armrc.sample | 39 +- src/__init__.py | 2 +- src/interface/configPanel.py | 16 +- src/interface/connPanel.py | 68 ++- src/interface/controller.py | 98 ++- src/interface/graphing/__init__.py | 2 +- src/interface/graphing/bandwidthStats.py | 2 +- src/interface/graphing/psStats.py | 141 ---- src/interface/graphing/resourceStats.py | 47 ++ src/interface/headerPanel.py | 185 +++-- src/interface/logPanel.py | 4 +- src/settings.cfg | 123 ++++ src/starter.py | 112 +++- src/test.py | 106 +++ src/torConfigDesc.txt | 1123 ++++++++++++++++++++++++++++++ src/uninstall | 2 +- src/util/__init__.py | 2 +- src/util/connections.py | 230 +++++-- src/util/log.py | 34 + src/util/panel.py | 13 +- src/util/procTools.py | 273 ++++++++ src/util/sysTools.py | 376 ++++++++++- src/util/torConfig.py | 79 ++- src/util/torTools.py | 171 ++++- src/util/uiTools.py | 63 ++- src/version.py | 4 +- 30 files changed, 3040 insertions(+), 504 deletions(-) diff --cc TODO index fa9d6ad,a360e1b..2605d91 --- a/TODO +++ b/TODO @@@ -28,44 -30,49 +30,58 @@@ TOD - pick apart applications like iftop and pktstat to see how they get per-connection bandwidth usage. Forum thread discussing it: https://bbs.archlinux.org/viewtopic.php?pid=715906 - [ ] control port interpreter (interactive prompt) - Panel and startup option (-t maybe?) for providing raw control port - access along with usability improvements (piggybacking on the arm - connection): - - irc like help (ex "/help GETINFO" could provide a summary of - getinfo commands, partly using the results from - "GETINFO info/names") - - tab completion and up/down for previous commands - - warn and get confirmation if command would disrupt arm (for - instance 'SETEVENTS') - - 'safe' option that restricts to read-only access (start with this) - - issue sighup reset - [ ] low hanging fruit from the "client mode use cases" below + - include an option to show both the internal and external ips for the + local connection, ie: + myInternal --> myExternal --> foreign + idea and initial patch by Fabian Keil + * expand dump (--debug) information + - os and python versions + - arm and tor configs (scrubbing private attributes) + * classify config options as useful (defaultly shown), standard, and + deprecated (configured to be hidden by default) + * check tor source for deprecated options like 'group' (are they + ignored? idea is thanks to NightMonkey) * release prep * pylint --indent-string=" " --disable=C,R interface/foo.py | less - * double check __init__.py and README for changes + * double check __init__.py and README for added or removed files + * wait a week, then bump package versions + * Debian + Contact: weasel (Peter Palfrader) + Initial Release: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=603056 + Update Instructions: + * TBD + + * Gentoo + Contact: NightMonkey (Jesse Adelman) + Initial Release: https://bugs.gentoo.org/show_bug.cgi?id=341731 + Update Instructions: + * go to https://bugs.gentoo.org + * make a generic bug with "net-misc/arm-X.X.X version bump, please" + + * ArchLinux + Contact: Spider.007 + Initial Release: http://aur.archlinux.org/packages.php?ID=44172 + Update Instructions: + * go to aur.archlinux.org + * select "Out-of-date" for the package - - Roadmap for version 1.4.2 + - Roadmap for version 1.4.3 [ ] refactor panels [ ] controller and popup panels + [ ] attempt to clear controller password from memory + - http://www.codexon.com/posts/clearing-passwords-in-memory-with-python + * release prep + * pylint --indent-string=" " --disable=C,R interface/foo.py | less + * double check __init__.py and README for changes + +- Roadmap for version 1.3.9 + [ ] refactor panels + [ ] controller and popup panels - allow arm to resume after restarting tor This requires a full move to the torTools controller. - - provide measurements for startup time, and try to improve bottlenecks - [ ] menus - - http://gnosis.cx/publish/programming/charming_python_6.html ? - - additional options: - - make update rates configurable via the ui - - dialog with flag descriptions and other help - - menu with all torrc options (making them editable/toggleable) + - improve on performance bottlenecks for startup time and cpu usage + - intermittent concurrency bugs during shutdown, one possible source: + https://trac.torproject.org/projects/tor/ticket/2144 [ ] setup scripts for arm [ ] updater (checks for a new tarball and installs it automatically) - attempt to verify download signature, providing a warning if unable

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] Hotfix to help gentoo ebuilds (https://bugs.gentoo.org/349792)
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 5fe915d46d01906215676e64765abb2d9b4064f5 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 16 02:18:44 2011 +0000 Hotfix to help gentoo ebuilds (https://bugs.gentoo.org/349792) svn:r24092 --- setup.py | 20 ++++++++++++++++++-- src/version.py | 4 ++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index edae307..03caaa3 100644 --- a/setup.py +++ b/setup.py @@ -17,6 +17,23 @@ for arg in sys.argv: docPath = "/usr/share/doc/%s" % ("tor-arm" if isDebInstall else "arm") +# Allow the docPath to be overridden via a '--docPath' argument. This is to +# support custom documentation locations on Gentoo, as discussed in: +# https://bugs.gentoo.org/349792 + +try: + docPathFlagIndex = sys.argv.index("--docPath") + if docPathFlagIndex < len(sys.argv) - 1: + docPath = sys.argv[docPathFlagIndex + 1] + + # remove the custom --docPath argument (otherwise the setup call will + # complain about them) + del sys.argv[docPathFlagIndex:docPathFlagIndex + 3] + else: + print "No path provided for --docPath" + sys.exit(1) +except ValueError: pass # --docPath flag not found + # Provides the configuration option to install to "/usr/share" rather than as a # python module. Alternatives are to either provide this as an input argument # (not an option for deb/rpm builds) or add a setup.cfg with: @@ -77,8 +94,7 @@ if manFilename != 'arm.1' and os.path.isfile(manFilename): # Removes the egg_info file. Apparently it is not optional during setup # (hardcoded in distutils/command/install.py), nor are there any arguments to -# bypass its creation. -# TODO: not sure how to remove this from the deb build too... +# bypass its creation. The deb build removes this as part of its rules script. eggPath = '/usr/share/arm-%s.egg-info' % VERSION if not isDebInstall and os.path.isfile(eggPath): diff --git a/src/version.py b/src/version.py index cf86296..a851658 100644 --- a/src/version.py +++ b/src/version.py @@ -2,6 +2,6 @@ Provides arm's version and release date. """ -VERSION = '1.4.1.2' -LAST_MODIFIED = "January 12, 2011" +VERSION = '1.4.1.3' +LAST_MODIFIED = "January 15, 2011"

1 0