- tor-commits - lists.torproject.org

[arm/release] Dropping the descriptor popup stubs from the new interface. This was feature creep and its capabilities will be almost entirely redundant with raw control port access (which is coming in a couple releases).
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 72b00c7c4ab7cf82d256ebe3507649249f5d7b4a Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 12 16:03:46 2011 +0000 Dropping the descriptor popup stubs from the new interface. This was feature creep and its capabilities will be almost entirely redundant with raw control port access (which is coming in a couple releases). svn:r24593 --- ChangeLog | 2 +- src/interface/connections/connEntry.py | 15 --------------- src/interface/connections/entries.py | 19 ------------------- 3 files changed, 1 insertions(+), 35 deletions(-) diff --git a/ChangeLog b/ChangeLog index bee46bd..7baec68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,7 +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) + * fix (4/4/11, r24562): 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. diff --git a/src/interface/connections/connEntry.py b/src/interface/connections/connEntry.py index 3f4ec6b..ba171d4 100644 --- a/src/interface/connections/connEntry.py +++ b/src/interface/connections/connEntry.py @@ -332,21 +332,6 @@ class ConnectionLine(entries.ConnectionPanelLine): detailFormat = curses.A_BOLD | uiTools.getColor(CATEGORY_COLOR[self.getType()]) return [uiTools.DrawEntry(line, detailFormat) for line in self._getDetailContent(width)] - def _getDescriptors(self, width): - """ - Provides raw descriptor information for the relay. - - Arguments: - width - available space to display in - """ - - # TODO: Porting and refactoring the descriptorPopup.py functionality is - # gonna take quite a bit of work. This is a very rarely used feature and - # not worth delaying the 1.4.2 release any further, so this will be a part - # of 1.4.3. - - return [] - def resetDisplay(self): entries.ConnectionPanelLine.resetDisplay(self) self.cachedType = None diff --git a/src/interface/connections/entries.py b/src/interface/connections/entries.py index 7748f05..6b24412 100644 --- a/src/interface/connections/entries.py +++ b/src/interface/connections/entries.py @@ -154,25 +154,6 @@ class ConnectionPanelLine: # implementation of getDetails return [] - def getDescriptor(self, width): - """ - Provides a list of DrawEntry instances with descriptor information for - this connection. - - Arguments: - width - available space to display in - """ - - if self._descriptorCacheArgs != width: - self._descriptorCache = self._getDescriptor(width) - self._descriptorCacheArgs = width - - return self._descriptorCache - - def _getDescriptor(self, width): - # implementation of getDescriptor - return [] - def resetDisplay(self): """ Flushes cached display results.

1 0

[arm/release] Other version bumps for arm release.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 590cc127c1e66ec9aeb7a91c457497cee8d0844d Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 4 15:28:03 2011 +0000 Other version bumps for arm release. svn:r24556 --- ChangeLog | 2 +- src/version.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f7f0bb..eeb29cc 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: diff --git a/src/version.py b/src/version.py index f97b26d..d135944 100644 --- a/src/version.py +++ b/src/version.py @@ -2,6 +2,6 @@ Provides arm's version and release date. """ -VERSION = '1.4.2_dev' -LAST_MODIFIED = "January 7, 2011" +VERSION = '1.4.3_dev' +LAST_MODIFIED = "April 4, 2011"

1 0

[arm/release] Hidden service parsing issue when there's multiple spaces in the HiddenServicePort opition (caught by Nicolas Pouillard)
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 316bab06167165d658e1c7b58d42d154502a67ee Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 5 02:32:07 2011 +0000 Hidden service parsing issue when there's multiple spaces in the HiddenServicePort opition (caught by Nicolas Pouillard) svn:r24560 --- 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 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

1 0

[arm/release] Updating release notes to reflect bug caught by Nicolas plus hotfixes for the last release that never made it into the changelog.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 9a3b01bdab2c7cf1eff993e0d0088c11a8e6e0ae Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Apr 5 02:42:18 2011 +0000 Updating release notes to reflect bug caught by Nicolas plus hotfixes for the last release that never made it into the changelog. svn:r24561 --- ChangeLog | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index eeb29cc..bee46bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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.

1 0

[arm/release] Missing new connection components from installations (caught by Anthony Basile)
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 1b9a34e863d5cb9e5ccdc103d193c897441fa5a9 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 7 01:28:38 2011 +0000 Missing new connection components from installations (caught by Anthony Basile) svn:r24570 --- setup.py | 2 +- 1 files changed, 1 insertions(+), 1 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]),

1 0

[arm/release] Fixing man page typo (caught by tagnaq)
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 879791eadb4eb25707067c7d29f71d0094903556 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 7 14:20:26 2011 +0000 Fixing man page typo (caught by tagnaq) svn:r24572 --- arm.1 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arm.1 b/arm.1 index dcfb827..32a03cc 100644 --- a/arm.1 +++ b/arm.1 @@ -53,7 +53,7 @@ flags for tor, arm, and torctl events to be logged (default is \fBN3\fR) 67890 torctl runlevel+ U Unknown Events .TP -\fB\-v\fR, \fB\-\-verion\fR +\fB\-v\fR, \fB\-\-version\fR provides version information .TP

1 0

[arm/master] Changelog update for the 1.4.3 release
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit dc4ce6205b49593d2f6602cf776022485d10c19a Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 16 23:00:22 2011 -0700 Changelog update for the 1.4.3 release --- ChangeLog | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c9ecde..8b1b776 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,58 @@ CHANGE LOG +7/16/11 - version 1.4.3 +This completes the codebase refactoring project that's been a year in the works and provides numerous performance and usability improvements. Most notably this includes a setup wizard for new relays, menuing interface, gui prototype, substantial performance improvements, and support for Mac OSX. + + * added: relay setup wizard for autogenerating a torrc configuration + * added: menu interface with all of arm's functionality (thanks to help from krkhan) + * added: option for reconnecting to tor if it's been shut down and restarted + * added: fetching the download and upload bandwidth totals from Tor if it's available + * added: option for requesting a new identity + * added: file descriptor usage in the header panel when running low + * added: logging a notice when file descriptor usage is high + * added: making interface components optionally excludeable + * added: reintroduced the descriptor popup for the new connection panel + * added: moved arm's codebase to git, with helper scripts to replace svn:externals and export + * added: option for overriding all displayed color + * change: renaming our process from "python src/starter.py <args>" to "arm <args>" (thanks to help from ioerror) + * change: hiding connection init latency, dropping arm's startup time from 0.84 seconds to 0.14 (83% improvement) + * change: using blank space to display the nickname for circuit connections + * change: dropping the file descriptor popup (it was both unused and inaccurate) + * change: dropping deprecated connection panel from the codebase + * change: using SAVECONF rather than writing directly when able + * change: closing all message prompts when a key is pressed + * change: using a more intuitive mode toggling for resizing the graph + * change: added summaries for new tor config options + * fix: avoiding mass memory allocation in torctl, lowering arm's perceived base memory footprint by 2.5 MB (12%) (https://trac.torproject.org/projects/tor/ticket/3406) + * fix: fixing shutdown concurrency in torctl, lowering arm's shutdown time from a second to being almost instantaneous (https://trac.torproject.org/projects/tor/ticket/2412) + * fix: sighups that caused tor to crash would also crash torctl and arm (https://trac.torproject.org/projects/tor/ticket/1329) + * fix: crash when connecting to tor's socks port rather than control port (https://trac.torproject.org/projects/tor/ticket/2580) + * fix: shutting down torctl zombie connections to the control port (https://trac.torproject.org/projects/tor/ticket/2812) + * fix: moving connection component negotiation into torctl (https://trac.torproject.org/projects/tor/ticket/3409) + * fix: all pid resolution was failing on macs, causing much of arm's functionality to fail + * fix: dropping straight to lsof on macs to avoid fallback process, which was both lengthy and raised warnings + * fix: misparsing circuit paths for Tor < 0.2.2.1 (caught by asn) + * fix: pressing enter on an empty connection page caused crash (caught by asn, https://trac.torproject.org/projects/tor/ticket/3128) + * fix: edited config entries weren't displaying their new value + * fix: ns/desc lookup failures could crash descriptor popup (caught by asn) + * fix: autogenerated Nickname field caused a torrc validation false positive + * fix: crashing issue when querying locales with an unavailable geoip file + * fix: misparsing config option types for some older tor versions + * fix: stacktrace from unjoined thread at shutdown + * fix: intermediate graphing bounds were either inaccurate or missing + * fix: man page typo (caught by tagnaq) + * fix: --debug flag broke if config-text unavailable (caught by trogdor) + * fix: man page had author's hard coded home rather than ~ (caught by kuhkatz) + * fix: dropping remaining addfstr usage from the codebase + * fix: indicating when tor's shut down in client mode + * fix: miscropping strings that broke on their first word, causing alignment issues in the config panel + * fix: cropping whitespace-only strings could crash + * fix: display was cropped by an extra cell + * fix: utilizing extra horizontal space for the configuration value field if wide + * fix: providing a more descriptive controller password prompt (suggestion by weasel) + * fix: fallback configuration descriptions weren't being installed (caught by ioerror) + * fix: daemons weren't being shut down on keyboard interrupt, causing occasional stacktrace + 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.

1 0

[arm/master] fix: couple issues spotted by pylint
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 7bd1d2af1d27ce91f179b63a6fcf0f95090b19b8 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 16 21:55:15 2011 -0700 fix: couple issues spotted by pylint --- src/util/__init__.py | 2 +- src/util/panel.py | 1 - src/util/torConfig.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/util/__init__.py b/src/util/__init__.py index 365e82a..cd5d721 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", "hostnames", "log", "panel", "procTools", "procName", "sysTools", "torConfig", "torTools", "uiTools"] +__all__ = ["conf", "connections", "enum", "gtkTools", "hostnames", "log", "panel", "procTools", "procName", "sysTools", "torConfig", "torTools", "uiTools"] diff --git a/src/util/panel.py b/src/util/panel.py index 5a96623..bb47726 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -4,7 +4,6 @@ Wrapper for safely working with curses subwindows. import copy import time -import traceback import curses import curses.ascii import curses.textpad diff --git a/src/util/torConfig.py b/src/util/torConfig.py index 2eca571..e4570ca 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -146,7 +146,7 @@ def loadOptionDescriptions(loadPath = None, checkVersion = True): category = inputFileContents.pop(0).rstrip() if not category in Category.values(): baseMsg = "invalid category in input file: '%s'" - raise IOError(baseMsg % categoryStr) + raise IOError(baseMsg % category) # gets the position in the man page indexArg, indexStr = -1, inputFileContents.pop(0).rstrip()

1 0

[arm/master] fix: including gui resources with arm install
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit de8695a17bb96fd7a461c2b49fa5f064c004f9e2 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 16 22:29:46 2011 -0700 fix: including gui resources with arm install --- install | 2 +- setup.py | 3 ++- src/gui/__init__.py | 2 +- src/gui/controller.py | 13 ++++++++++--- src/prereq.py | 6 ++++-- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/install b/install index fead85c..605f724 100755 --- a/install +++ b/install @@ -1,5 +1,5 @@ #!/bin/sh -python src/prereq.py +python src/prereq.py --both if [ $? = 0 ]; then python setup.py -q install diff --git a/setup.py b/setup.py index 6e31f44..4513dee 100644 --- a/setup.py +++ b/setup.py @@ -93,7 +93,7 @@ if "install" in sys.argv: # 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.cli', 'arm.cli.graphing', 'arm.cli.connections', 'arm.cli.menu', 'arm.util'] +installPackages = ['arm', 'arm.cli', 'arm.cli.graphing', 'arm.cli.connections', 'arm.cli.menu', 'arm.gui', 'arm.gui.connections', 'arm.gui.graphing', 'arm.util', 'arm.cagraph', 'arm.cagraph.axis', 'arm.cagraph.series'] if not isDebInstall: installPackages.append('arm.TorCtl') setup(name='arm', @@ -108,6 +108,7 @@ setup(name='arm', data_files=[("/usr/bin", ["arm"]), ("/usr/share/man/man1", [manFilename]), (docPath, ["armrc.sample"]), + ("/usr/share/arm/gui", ["src/gui/arm.xml"]), ("/usr/share/arm", ["src/settings.cfg", "src/uninstall"])] + getResources("/usr/share/arm", "resources"), ) diff --git a/src/gui/__init__.py b/src/gui/__init__.py index b700273..f274d81 100644 --- a/src/gui/__init__.py +++ b/src/gui/__init__.py @@ -2,5 +2,5 @@ Panels, popups, and handlers comprising the arm user interface. """ -__all__ = ["controller", "logPanel"] +__all__ = ["controller", "generalPanel", "logPanel"] diff --git a/src/gui/controller.py b/src/gui/controller.py index 5736def..4979ea1 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -13,10 +13,17 @@ gobject.threads_init() class GuiController: def __init__(self): - filename = 'src/gui/arm.xml' - self.builder = gtk.Builder() - self.builder.add_from_file(filename) + + try: + self.builder.add_from_file('src/gui/arm.xml') + except: + # when installed the above path doesn't work (the 'src' prefix doesn't + # exist and whichever path it's working off of doens't seem to exist), + # so using absolute path instead + + self.builder.add_from_file('/usr/share/arm/gui/arm.xml') + self.builder.connect_signals(self) self.logPanel = logPanel.LogPanel(self.builder) diff --git a/src/prereq.py b/src/prereq.py index eee9fdb..8641057 100644 --- a/src/prereq.py +++ b/src/prereq.py @@ -232,6 +232,8 @@ def guiPrereq(): if __name__ == '__main__': isGui = "-g" in sys.argv or "--gui" in sys.argv - if isGui: guiPrereq() - else: cliPrereq() + isBoth = "--both" in sys.argv + + if isGui or isBoth: guiPrereq() + if not isGui or isBoth: cliPrereq()

1 0

r24910: {website} Update Debian versions and Ubuntu warning Based on feedback (website/trunk/docs/en)
by Sebastian Hahn 17 Jul '11

17 Jul '11

Author: sebastian Date: 2011-07-16 22:34:16 +0000 (Sat, 16 Jul 2011) New Revision: 24910 Modified: website/trunk/docs/en/debian.wml Log: Update Debian versions and Ubuntu warning Based on feedback by rww from #tor. Thanks! Modified: website/trunk/docs/en/debian.wml =================================================================== --- website/trunk/docs/en/debian.wml 2011-07-15 17:24:09 UTC (rev 24909) +++ website/trunk/docs/en/debian.wml 2011-07-16 22:34:16 UTC (rev 24910) @@ -11,12 +11,12 @@ </div> <div id="maincol"> <a id="debian"></a> -<h2><a class="anchor" href="#debian">Option one: Tor on Debian lenny, +<h2><a class="anchor" href="#debian">Option one: Tor on Debian squeeze, lenny, Debian sid, or Debian testing</a></h2> <br /> <p> -If you're using Debian just run<br /> +If you're using Debian, just run<br /> <tt>apt-get install tor tor-geoipdb</tt> as root. </p> @@ -42,9 +42,9 @@ <br /> <p> -<b>Do not use the packages in Ubuntu's universe.</b> They are unmaintained -and out of date. That means you'll be missing stability and security -fixes. +<b>Do not use the packages in Ubuntu's universe.</b> In the past they have +not reliably been updated. That means you could be missing stability +and security fixes. </p> <p>

1 0