tor-commits April 2011

tor-commits@lists.torproject.org

18 participants
883 discussions

[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 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

[arm/master] Making git ignore TorCtl and python bytecode (pyc)
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit e8f3e8ce98faf315dfe2f40dac978c4066894211 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Apr 20 19:30:08 2011 -0700 Making git ignore TorCtl and python bytecode (pyc) --- .gitignore | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9b955dd --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.pyc +src/TorCtl/ +

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] Hotfix to pick up r24560 (crashing issue when there's extra spacing in the HiddenServicePort config option)
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit e11b597f2f9e10c5ddc173a32c9c080d1d886179 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 5 02:44:58 2011 +0000 Hotfix to pick up r24560 (crashing issue when there's extra spacing in the HiddenServicePort config option) svn:r24562 --- ChangeLog | 8 +++++++- src/util/torTools.py | 2 +- src/version.py | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f7f0bb..bee46bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ CHANGE LOG -4/4/11 - version 1.4.2 +4/4/11 - version 1.4.2 (r24555) This release chiefly consists of a fully reimplemented connection panel. Besides being a sane, maintainable implementation this includes numerous new features and improvements like full circuit paths, applications involved for local connections, and better type identification. * added: full rewrite of the connection panel, providing: @@ -47,6 +47,7 @@ This release chiefly consists of a fully reimplemented connection panel. Besides * fix: the 'startup.dataDirectory' config option was being ignored * fix: recognizing the proper private ip ranges of the 172.* block * fix: missing 'is default' option from config sort ordering + * fix (4/4/11): hidden service parsing issue when there's multiple spaces in the HiddenServicePort opition (caught by Nicolas Pouillard) 1/7/11 - version 1.4.1 (r24054) Platform specific enhancements including BSD compatibility and vastly improved performance on Linux. @@ -89,6 +90,11 @@ Platform specific enhancements including BSD compatibility and vastly improved p * fix: connection resolution wasn't finding results if tor was running under a different name * fix: brought all Linux connection resolvers into parity (established tcp connections only) * fix: commands with quoted pipes were being mis-parsed by the sysTools' call function + * fix (1/11/11, r24064): including platform, python version, and arm/tor configurations in debug dumps + * fix (1/11/11, r24064): properly parse the ps field when displaying decimal seconds (patch by Fabian) + * fix (1/11/11, r24064): error when initial resource lookups fail (caught by Trystero) + * fix (1/12/11, r24075): decimal seconds in the ps uptime field were being misparsed (patch by Fabian) + * fix (1/15/11, r24092): adding a --docPath argument to help Gentoo ebuilds (https://bugs.gentoo.org/349792) 11/27/10 - version 1.4.0 (r23873) Introducing a new page for managing tor's configuration, along with several other improvements. diff --git a/src/util/torTools.py b/src/util/torTools.py index cbdf900..696e712 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1750,7 +1750,7 @@ class Controller(TorCtl.PostEventListener): if " " in hsEntry: # parses the target, checking if it's a port or IP:Port combination - hsTarget = hsEntry.split(" ")[1] + hsTarget = hsEntry.split()[1] if ":" in hsTarget: hsPort = hsTarget.split(":")[1] # target is the IP:Port diff --git a/src/version.py b/src/version.py index a86b0bb..ee7c493 100644 --- a/src/version.py +++ b/src/version.py @@ -2,6 +2,6 @@ Provides arm's version and release date. """ -VERSION = '1.4.2' +VERSION = '1.4.2.1' LAST_MODIFIED = "April 4, 2011"

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] 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] Arm version 1.4.2 release.
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit d0bb81a4518525860666f7ad19315d8164c74697 Merge: 5fe915d d2204b4 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 4 15:22:31 2011 +0000 Arm version 1.4.2 release. svn:r24555 ChangeLog | 48 ++ README | 27 +- TODO | 281 --------- armrc.sample | 70 ++- src/interface/configPanel.py | 260 +++++---- src/interface/connPanel.py | 6 +- src/interface/connections/__init__.py | 6 + src/interface/connections/circEntry.py | 216 +++++++ src/interface/connections/connEntry.py | 864 ++++++++++++++++++++++++++++ src/interface/connections/connPanel.py | 398 +++++++++++++ src/interface/connections/entries.py | 183 ++++++ src/interface/controller.py | 236 ++++++--- src/interface/descriptorPopup.py | 2 +- src/interface/graphing/__init__.py | 2 +- src/interface/graphing/bandwidthStats.py | 26 +- src/interface/graphing/connStats.py | 4 +- src/interface/graphing/graphPanel.py | 21 +- src/interface/headerPanel.py | 27 +- src/interface/logPanel.py | 75 ++-- src/interface/torrcPanel.py | 16 +- src/settings.cfg | 365 ++++++++++++ src/starter.py | 44 +-- src/test.py | 46 ++- src/util/__init__.py | 2 +- src/util/conf.py | 23 +- src/util/connections.py | 341 ++++++++++-- src/util/enum.py | 116 ++++ src/util/log.py | 50 +-- src/util/panel.py | 92 +++- src/util/procTools.py | 20 +- src/util/sysTools.py | 4 +- src/util/torConfig.py | 138 +++-- src/util/torTools.py | 904 ++++++++++++++++++++++++++++-- src/util/uiTools.py | 135 ++++- src/version.py | 4 +- 35 files changed, 4249 insertions(+), 803 deletions(-) diff --cc src/version.py index a851658,f97b26d..a86b0bb --- 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.3' - LAST_MODIFIED = "January 15, 2011" -VERSION = '1.4.2_dev' -LAST_MODIFIED = "January 7, 2011" ++VERSION = '1.4.2' ++LAST_MODIFIED = "April 4, 2011"

1 0

[arm/master] Excluding TorCtl from install when building deb
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit bcb4729c2238e5520e158905b8ba242d2d00722b Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Apr 20 18:44:21 2011 -0700 Excluding TorCtl from install when building deb Dererk is maintaining a deb for TorCtl (python-torctl, http://packages.debian.org/unstable/main/python-torctl) which will be a requirement for arm. Hence, there's no reason to continue bundling TorCtl for that platform. --- setup.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/setup.py b/setup.py index 2176a1c..39497aa 100644 --- a/setup.py +++ b/setup.py @@ -72,6 +72,12 @@ 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.interface', 'arm.interface.graphing', 'arm.interface.connections', 'arm.util'] +if not isDebInstall: installPackages.append('arm.TorCtl') + setup(name='arm', version=VERSION, description='Terminal tor status monitor', @@ -79,7 +85,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.interface.connections', 'arm.util', 'arm.TorCtl'], + packages=installPackages, package_dir={'arm': 'src'}, data_files=[("/usr/bin", ["arm"]), ("/usr/share/man/man1", [manFilename]),

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

← Newer
1
...
37
38
39
40
41
42
43
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2011