- tor-commits - lists.torproject.org

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

24 Apr '11

commit 43656fe1228ecf1bdc0ffce792e32a98f14241ea Merge: d1d54c0 bcb4729 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 21 08:39:04 2011 -0700 Merge release commit 'bcb4729' Conflicts: ChangeLog setup.py src/version.py setup.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)

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

[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] 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] Putting TorCtl install prompt in its own function
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 6534807224d5f88b0c5450e996e5fa1f8c470763 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 21 08:52:36 2011 -0700 Putting TorCtl install prompt in its own function --- src/prereq.py | 41 ++++++++++++++++++++++++++--------------- 1 files changed, 26 insertions(+), 15 deletions(-) diff --git a/src/prereq.py b/src/prereq.py index ee5c768..50aaa91 100644 --- a/src/prereq.py +++ b/src/prereq.py @@ -20,6 +20,30 @@ def isTorCtlAvailable(): 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: + installTorCtl() + + if not isTorCtlAvailable(): + raise IOError("Unable to install TorCtl, sorry") + + print "TorCtl successfully installed" + return True + except IOError, exc: + print exc + return False + def installTorCtl(): """ Checks out the current git head release for TorCtl and bundles it with arm. @@ -65,19 +89,6 @@ if __name__ == '__main__': 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) + isInstalled = promptTorCtlInstall() + if not isInstalled: sys.exit(1)

1 0

[arm/master] Version bump for 1.4.2.4
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 152f8511da9db90dedbacb6697d3bc214644931c Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 21 08:20:19 2011 -0700 Version bump for 1.4.2.4 --- src/version.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/version.py b/src/version.py index 4c0bbc8..e33cb18 100644 --- a/src/version.py +++ b/src/version.py @@ -2,6 +2,6 @@ Provides arm's version and release date. """ -VERSION = '1.4.2.3' -LAST_MODIFIED = "April 13, 2011" +VERSION = '1.4.2.4' +LAST_MODIFIED = "April 21, 2011"

1 0

[arm/master] Backporting fix for parsing multi-line exit policies to current release.
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit d50aefb997137c360b4cd51d31faf83d93d9417d Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Aug 7 22:00:08 2010 +0000 Backporting fix for parsing multi-line exit policies to current release. svn:r22820 --- interface/connPanel.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/interface/connPanel.py b/interface/connPanel.py index d78c3ed..2fb1d72 100644 --- a/interface/connPanel.py +++ b/interface/connPanel.py @@ -8,7 +8,7 @@ import curses from threading import RLock from TorCtl import TorCtl -from util import log, connections, hostnames, panel, uiTools +from util import log, connections, hostnames, panel, torTools, uiTools # Scrubs private data from any connection that might belong to client or exit # traffic. This is a little overly conservative, hiding anything that isn't @@ -192,7 +192,10 @@ class ConnPanel(TorCtl.PostEventListener, panel.Panel): else: self.family = [] self.isBridge = self.conn.get_option("BridgeRelay")[0][1] == "1" - self.exitPolicy = self.conn.get_option("ExitPolicy")[0][1] + + policyEntries = torTools.getConn().getOption("ExitPolicy", multiple=True) + self.exitPolicy = ",".join(policyEntries) + self.exitPolicy = self.exitPolicy.replace("\\t", " ").replace("\"", "") if self.exitPolicy: self.exitPolicy += "," + self.conn.get_info("exit-policy/default")["exit-policy/default"] else: self.exitPolicy = self.conn.get_info("exit-policy/default")["exit-policy/default"]

1 0

[arm/master] Rewrite of the first third of the interface, providing vastly improved performance, maintainability, and a few very nice features.
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit c4e034f4789fe2ef65b6d3bed78d59ed308087cb Merge: e3b7f0e 426c879 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 7 16:48:51 2010 +0000 Rewrite of the first third of the interface, providing vastly improved performance, maintainability, and a few very nice features. added: settings are fetched from an optional armrc (update rates, controller password, caching, runlevels, etc) added: system tools util providing simplified usage, suppression of leaks to stdout, logging, and optional caching added: wrapper for accessing TorCtl providing: - client side caching for commonly fetched relay information (fingerprint, descriptor, etc) - singleton accessor and convenience functions, simplifying interface code - wrapper allowing reattachment to new controllers (ie, arm still works if tor's stopped then restarted - still in the works) change: full rewrite of the header panel, providing: - notice for when tor's disconnected (with time-stamp) - lightweight redrawing (smarter caching and moved updating into a daemon thread) - more graceful handling of tiny displays change: rewrite of graph panel and related stats, providing: - prepopulation of bandwidth information from the state file if possible - observed and measured bandwidth stats (requested by arma) - graph can be configured to display any numeric ps stat - third option for graphing bounds (restricting to both local minima and maxima) - substantially reduced redraw rate and making use of cached ps parameters (reducing call volume) fix: preventing 'command unavailable' error messages from going to stdout, which disrupts the display (caught by sid77) fix: removed -p option due to being a gaping security problem (caught by ioerror and nickm) fix: crashing issue if TorCtl reports TorCtlClosed before the first refresh (caught by Tas) fix: preventing the connection panel from initiating or resetting while in blind mode (caught by micah) fix: ss resolution wasn't specifying the use of numeric ports (caught by data) fix: parsing error when ExitPolicy is undefined (caught by Paul Menzel) fix: revised sleep pattern used for threads, greatly reducing the time it takes to quit fix: bug in defaulting the connection resolver to something predetermined to be available fix: stopping connection resolution (and related failover message) when tor's stopped fix: crashing issue when trying to resolve addresses without network connectivity fix: forgot to join on connection resolver when quitting fix: revised calculation for effective bandwidth rate to take MaxAdvertisedBandwidth into account svn:r22617 ChangeLog | 32 ++ README | 30 +- TODO | 301 +++++++----- armrc.sample | 82 ++++ init/project113.py | 192 ++++++++ init/starter.py | 188 ++++---- interface/__init__.py | 2 +- interface/bandwidthMonitor.py | 185 ------- interface/confPanel.py | 4 +- interface/connCountMonitor.py | 57 --- interface/connPanel.py | 11 +- interface/controller.py | 377 +++++++-------- interface/cpuMemMonitor.py | 54 -- interface/fileDescriptorPopup.py | 21 +- interface/graphPanel.py | 279 ----------- interface/graphing/__init__.py | 6 + interface/graphing/bandwidthStats.py | 348 ++++++++++++++ interface/graphing/connStats.py | 51 ++ interface/graphing/graphPanel.py | 363 ++++++++++++++ interface/graphing/psStats.py | 129 +++++ interface/headerPanel.py | 485 +++++++++++-------- interface/logPanel.py | 30 +- util/__init__.py | 2 +- util/conf.py | 246 ++++++++++ util/connections.py | 142 ++++-- util/hostnames.py | 75 ++- util/log.py | 59 ++- util/panel.py | 62 ++- util/sysTools.py | 172 +++++++ util/torTools.py | 877 ++++++++++++++++++++++++++++++++++ util/uiTools.py | 78 +++- 31 files changed, 3593 insertions(+), 1347 deletions(-) diff --cc init/starter.py index d95672e,a58b687..8ce8315 --- a/init/starter.py +++ b/init/starter.py @@@ -14,18 -13,30 +13,30 @@@ import getop # includes parent directory rather than init in path (so sibling modules are included) sys.path[0] = sys.path[0][:-5] - from TorCtl import TorCtl, TorUtil - from interface import controller, logPanel + import interface.controller + import interface.logPanel + import util.conf + import util.connections + import util.hostnames + import util.log + import util.panel + import util.sysTools + import util.torTools + import util.uiTools + import TorCtl.TorUtil - VERSION = "1.3.5" - LAST_MODIFIED = "Apr 8, 2010" -VERSION = "1.3.6_dev" ++VERSION = "1.3.6" + LAST_MODIFIED = "July 7, 2010" - DEFAULT_CONTROL_ADDR = "127.0.0.1" - DEFAULT_CONTROL_PORT = 9051 - DEFAULT_LOGGED_EVENTS = "N3" # tor and arm NOTICE, WARN, and ERR events + DEFAULT_CONFIG = os.path.expanduser("~/.armrc") + DEFAULTS = {"startup.controlPassword": None, + "startup.interface.ipAddress": "127.0.0.1", + "startup.interface.port": 9051, + "startup.blindModeEnabled": False, + "startup.events": "N3"} - OPT = "i:p:be:vh" - OPT_EXPANDED = ["interface=", "password=", "blind", "event=", "version", "help"] + OPT = "i:c:be:vh" + OPT_EXPANDED = ["interface=", "config=", "blind", "event=", "version", "help"] HELP_MSG = """Usage arm [OPTION] Terminal status monitor for Tor relays.

1 0

[arm/master] Revisions for the deb release build.
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 9da2275af16d586dcfc30582765dcfc6b1d898d0 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Oct 7 06:08:47 2010 +0000 Revisions for the deb release build. svn:r23441 --- debian/changelog | 10 ++++++++-- debian/control | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5464df0..9dd15fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,11 @@ -tor-arm (0.3.6) unstable; urgency=low +tor-arm (1.3.7) unstable; urgency=low + + * see http://www.atagar.com/arm/log.php + + -- Damian Johnson (www.atagar.com) <atagar1(a)gmail.com> Wed, 6 Oct 2010 22:30:43 -0700 + +tor-arm (1.3.6) unstable; urgency=low * Initial release. - -- Damian Johnson <atagar(a)torproject.org> Mon, 30 Aug 2010 08:13:43 -0700 + -- Damian Johnson (www.atagar.com) <atagar1(a)gmail.com> Mon, 30 Aug 2010 08:13:43 -0700 diff --git a/debian/control b/debian/control index 9d019cc..7bd04fa 100644 --- a/debian/control +++ b/debian/control @@ -1,9 +1,9 @@ Source: tor-arm Section: comm Priority: extra -Maintainer: Damian Johnson <atagar1(a)gmail.com> +Maintainer: Damian Johnson (www.atagar.com) <atagar1(a)gmail.com> Build-Depends: debhelper (>= 5), python-support (>= 0.6), cdbs (>= 0.4.49), python -Standards-Version: 3.8.3 +Standards-Version: 3.8.0 Homepage: http://www.atagar.com/arm Package: tor-arm

1 0

[arm/master] Upping the release version to reflect the previous hotfix.
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 36fae04fe74e06fe18851b723c2a3fb535344c10 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Aug 10 03:24:23 2010 +0000 Upping the release version to reflect the previous hotfix. svn:r22850 --- init/starter.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/init/starter.py b/init/starter.py index 8ce8315..05c5b59 100644 --- a/init/starter.py +++ b/init/starter.py @@ -25,7 +25,7 @@ import util.torTools import util.uiTools import TorCtl.TorUtil -VERSION = "1.3.6" +VERSION = "1.3.6b" LAST_MODIFIED = "July 7, 2010" DEFAULT_CONFIG = os.path.expanduser("~/.armrc")

1 0