- tor-commits - lists.torproject.org

[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

[arm/master] Merging trunk for release 1.3.7.
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

1 0

[arm/master] Removing dependency on python 2.6 for installation and building.
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 66b3c94952d819341fc374326ff3cc7178cbb447 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Dec 7 17:46:03 2010 +0000 Removing dependency on python 2.6 for installation and building. This was using the gzip name attribute unnecessarily which isn't available in older python versions (caught by weasel). svn:r23900 --- setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/setup.py b/setup.py index d11080f..edae307 100644 --- a/setup.py +++ b/setup.py @@ -51,7 +51,7 @@ if "install" in sys.argv: # places in tmp rather than a relative path to avoid having this copy appear # in the deb and rpm builds - manFilename = manOutputFile.name + manFilename = tmpFilename except IOError, exc: print "Unable to compress man page: %s" % exc

1 0

[arm/master] Hotfix for the graphing issue tomb spotted as a hotfix. Also updating the TODO for kicks and giggles.
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit e9d0ac02c1df9239e6dc094bbbd7e9e2b68bcf20 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Oct 8 16:39:11 2010 +0000 Hotfix for the graphing issue tomb spotted as a hotfix. Also updating the TODO for kicks and giggles. svn:r23464 --- TODO | 226 +++++++++++++++------------------ src/interface/graphing/graphPanel.py | 4 +- 2 files changed, 105 insertions(+), 125 deletions(-) diff --git a/TODO b/TODO index 3e0dbb0..6b0fe37 100644 --- a/TODO +++ b/TODO @@ -1,6 +1,6 @@ TODO -- Remaining work for next release (1.3.7) +- Roadmap and completed work for next release (1.3.8) [ ] refactor panels Currently the interface is a bit of a rat's nest (especially the controller). The goal is to use better modularization to both simplify @@ -9,50 +9,50 @@ TODO progress - /init and /util are done and /interface is partly done. Known bugs are being fixed while refactoring. - [X] log panel [ ] conf panel - move torrc validation into util - fetch text via getinfo rather than reading directly? - conn.get_info("config-text") + conn.get_info("config-text") - improve parsing failure notice to give line number - just giving "[ARM-WARN] Unable to validate torrc" isn't very - helpful... - * release prep - * ask helix about steps for getting a deb and rpm included in the tor repo - * check performance of this version vs last version (general screen refresh - times) - * stress test under debug level and debug level with large log file - * pylint --indent-string=" " --disable=C,R interface/foo.py | less - * double check __init__.py and README for changes - -- Roadmap for version 1.3.8 - [ ] refactor panels + just giving "[ARM-WARN] Unable to validate torrc" isn't very + helpful... [ ] conn panel - expand client connections and note location in circuit (entry-exit) - for clients list all connections to detect what's going through tor - and what isn't? If not then netstat calls are unnecessary. + and what isn't? If not then netstat calls are unnecessary. - check family connections to see if they're alive (VERSION cell - handshake?) + handshake?) - fallback when pid or connection querying via pid is unavailable - List all connections listed both by netstat and the consensus + List all connections listed both by netstat and the consensus - note when connection times are estimates (color?), ie connection - was established before arm + was established before arm - connection uptime to associate inbound/outbound connections? - Identify controller connections (if it's arm, vidalia, etc) with - special detail page for them + special detail page for them - provide bridge / client country statistics - Include bridge related data via GETINFO option (feature request - by waltman and ioerror). + Include bridge related data via GETINFO option (feature request + by waltman and ioerror). - 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 - [ ] controller and popup panels + per-connection bandwidth usage. Forum thread discussing it: + https://bbs.archlinux.org/viewtopic.php?pid=715906 + - give usage stats for exit port usage (popup?) - country data for client connections (requested by ioerror) + [ ] 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 improving bottlenecks + - provide measurements for startup time, and try to improve bottlenecks [ ] setup scripts for arm [ ] updater (checks for a new tarball and installs it automatically) + - attempt to verify download signature, providing a warning if unable + to do so [ ] look into CAPs to get around permission issues for connection listing sudo wrapper for arm to help arm run as the same user as tor? Irc suggestions: @@ -60,6 +60,7 @@ TODO - http://www.linuxjournal.com/article/5737 - Bugs + * path for sample armrc in man page is wrong * when in client mode and tor stops the header panel doesn't say so * util are assuming that tor is running under the default command name attempt to determine the command name at runtime (if the pid is available @@ -106,12 +107,23 @@ TODO * connection uptimes shouldn't show fractions of a second * connections aren't cleared when control port closes -- Features - * general purpose method of erroring nicely - Some errors cause portions of the display to die, but curses limps along - and overwrites the stacktrace. This has been mostly solved, but all errors - should result in a clean death, with the stacktrace saved and a nice - message for the user. +- Future Features + * 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 + * 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) * client mode use cases * not sure what sort of information would be useful in the header (to replace the orport, fingerprint, flags, etc) @@ -122,21 +134,35 @@ TODO [notice] Opening Socks listener on 127.0.0.1:9050 [notice] Opening Transparent pf/netfilter listener on 127.0.0.1:9040 [notice] Opening DNS listener on 127.0.0.1:53 - * rdns and whois lookups (to find ISP, country, and jurisdiction, etc) - To avoid disclosing connection data to third parties this needs to be - an all-or-nothing operation (ie, needs to fetch information on all - relays or none of them). Plan is something like: + * rdns and whois lookups (to find ISP, country, and jurisdiction, etc) + To avoid disclosing connection data to third parties this needs to be + an all-or-nothing operation (ie, needs to fetch information on all + relays or none of them). Plan is something like: * add resolving/caching capabilities to fetch information on all relays and distil whois entries to just what we care about (hosting provider or ISP), by default updating the cache on a daily basis * construct tarball and make this available for download rather than fetching everything at each client - * possibly make these archives downloadable from peer relays (note: - this is a no-go for clients) via torrents or some dirport like scheme - * special page for client related information, such as ips of our client - circuits at the exit + * possibly make these archives downloadable from peer relays (this is a + no-go for clients) via torrents or some dirport like scheme * look at vidalia for ideas * need to solicit for ideas on what would be most helpful to clients + * general purpose method of erroring nicely + Some errors cause portions of the display to die, but curses limps along + and overwrites the stacktrace. This has been mostly solved, but all errors + should result in a clean death, with the stacktrace saved and a nice + message for the user. + * handle mutiple tor instances + * screen style (dialog for switching between instances) + * extra window with whatever stats can be aggregated over all instances + * option to save the current settings to the config + * provide warning at startup if the armrc doesn't exist, with instructions + for generating it + * email alerts for changes to the relay's status, similar to tor-weather + * simple alert if tor shuts down + * accounting and alerts for if the bandwidth drops to zero + * daily/weekly/etc alerts for basic status (log output, bandwidth history, + etc), borrowing from the consensus tracker for some of the formatting * mac installer * Couple of options include macport and dmg... * macport (http://guide.macports.org/#development) @@ -153,91 +179,45 @@ TODO Plugin for distutils. Like most mac packaging, this can only run on a mac. It also requires setuptools: http://www.errorhelp.com/search/details/74034/importerror-no-module-named-s… - * email alerts for changes to the relay's status, similar to tor-weather - * simple alert if tor shuts down - * accounting and alerts for if the bandwidth drops to zero - * daily/weekly/etc alerts for basic status (log output, bandwidth history, - etc), borrowing from the consensus tracker for some of the formatting - * check if batch getInfo/getOption calls provide much performance benefit - * page with details on client circuits, attempting to detect details like - country, ISP, latency, exit policy for the circuit, traffic, etc - * attempt to clear controller password from memory - http://www.codexon.com/posts/clearing-passwords-in-memory-with-python + * look into additions to the used apis + * curses (python 2.6 extended?): http://docs.python.org/library/curses.html + * new control options (like "desc-annotations/id/<OR identity>")? + * look into better supporting hidden services (what could be useful here?) + * provide option for a consensus page + Shows full consensus with an interface similar to the connection panel. + For this Mike's ConsensusTracker would be helpful (though boost the + startup time by several seconds) + * show qos stats + Take a look at 'linux-tor-prio.sh' to see if any of the stats are + available and interesting. * escaping function for uiTools' formatted strings - * make update rates configurable via the ui - Also provide option for saving these settings to the config - * config option to cap resource usage - * dialog with flag descriptions and other help * switch check of ip address validity to regex? - match = re.match("(\d*)\.(\d*)\.(\d*)\.(\d*)", ip) - http://wang.yuxuan.org/blog/2009/4/2/python_script_to_convert_from_ip_range… - * audit tor connections - Provide warnings if tor misbehaves, checks possibly including: - - ensuring ExitPolicyRejectPrivate is being obeyed - - check that ExitPolicy violations don't occur (not possible yet since - not all relays aren't identified) - - check that all connections are properly related to a circuit, for - instance no outbound connections without a corresponding inbound (not - possible yet due to being unable to correlate connections to circuits) - * check file descriptors being accessed by tor to see if they're outside the - known pattern - * add page that allows raw control port access - Start with -t (or -c?) option for commandline-only access with help, - syntax highlighting, and other spiffy extras - - Piggyback on the arm connection, providing something like an interactive - prompt. In addition, provide: - - 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 populates previous entries - - warn and get confirmation if command would disrupt arm (for instance - 'SETEVENTS') - - 'guard' option that restricts to GETINFO only (start with this) - - issue sighup reset - * menu with all torrc options (making them editable/toggleable) - * Setup wizard for new relays - Setting the password and such for torrc generation (idea by ioerror) - * menus? - http://gnosis.cx/publish/programming/charming_python_6.html - * look into better supporting hidden services (what could be useful here?) - * look into providing UPnP support - This might be provided by tor itself so wait and see... + match = re.match("(\d*)\.(\d*)\.(\d*)\.(\d*)", ip) + http://wang.yuxuan.org/blog/2009/4/2/python_script_to_convert_from_ip_range… + * setup wizard for new relays + Setting the password and such for torrc generation. Maybe a netinstaller + that fetches the right package for the plagform, verifies signatures, etc? + (idea by ioerror) + * audit what tor does + * Provide warnings if tor connections misbehaves, for instance: + * ensuring ExitPolicyRejectPrivate is being obeyed + * check that ExitPolicy violations don't occur (not possible yet since + not all relays aren't identified) + * check that all connections are properly related to a circuit, for + instance no outbound connections without a corresponding inbound (not + possible yet due to being unable to correlate connections to circuits) + * check file descriptors being accessed by tor to see if they're outside a + known pattern + * script that dumps relay stats to stdout + Derived from an idea by StrangeCharm. Django has a small terminal coloring + module that could be nice for formatting. Could possibly include: + * desc / ns information for our relay + * ps / netstat stats like load, uptime, and connection counts, etc + * implement control-spec proposals: + * https://gitweb.torproject.org/tor.git/blob/HEAD:/doc/spec/proposals/172-cir… + * https://gitweb.torproject.org/tor.git/blob/HEAD:/doc/spec/proposals/173-get… * unit tests - Primarily for util, for instance 'addfstr' woudl be a good candidate. - * show qos stats - Take a look at 'linux-tor-prio.sh' to see if any of the stats are - available and interesting. - * handle mutiple tor instances - First multiple tor instances on the same system, then via remote - connections too. - * Investigations of other possible tools: - * look into additions to the used apis - - curses (python 2.6 extended?): http://docs.python.org/library/curses.html - - new control options (like "desc-annotations/id/<OR identity>")? - - look deeper into TorCtl functions (has a resolve function? hu?) - * whois lookup for relays? ISP listing? - * look into what sort of information tcpdump and iptraf provides (probably - can't use for privacy reasons) - * vnstat, nload, mrtg, and traceroute - -- Ideas (low priority) + Primarily for util, for instance 'addfstr' would be a good candidate. * python 3 compatibility - Currently blocked on TorCtl support. - * bundle script that dumps relay stats to stdout - Django has a small terminal coloring module that could be nice for - formatting. Could possibly include: - - desc / ns information for our relay - - ps / netstat stats like load, uptime, and connection counts, etc - derived from an idea by StrangeCharm - * localization - Abstract strings from code and provide on translation portal. Thus far - there hasn't been any requests for this. - * provide option for a consensus page - Shows full consensus with an interface similar to the connection panel. - For this Mike's ConsensusTracker would be helpful (though boost the - startup time by several seconds) - * follow up on control-spec proposals - Proposal and related information is available at: - https://gitweb.torproject.org/tor.git/blob/HEAD:/doc/spec/proposals/172-cir… - https://gitweb.torproject.org/tor.git/blob/HEAD:/doc/spec/proposals/173-get… + Currently blocked on TorCtl support. diff --git a/src/interface/graphing/graphPanel.py b/src/interface/graphing/graphPanel.py index 9a8e1e4..706db75 100644 --- a/src/interface/graphing/graphPanel.py +++ b/src/interface/graphing/graphPanel.py @@ -340,11 +340,11 @@ class GraphPanel(panel.Panel): # creates bar graph (both primary and secondary) for col in range(graphCol): - colCount = param.primaryCounts[self.updateInterval][col + 1] - primaryMinBound + colCount = int(param.primaryCounts[self.updateInterval][col + 1]) - primaryMinBound colHeight = min(self.graphHeight, self.graphHeight * colCount / (max(1, primaryMaxBound) - primaryMinBound)) for row in range(colHeight): self.addstr(self.graphHeight + 1 - row, col + 5, " ", curses.A_STANDOUT | primaryColor) - colCount = param.secondaryCounts[self.updateInterval][col + 1] - secondaryMinBound + colCount = int(param.secondaryCounts[self.updateInterval][col + 1]) - secondaryMinBound colHeight = min(self.graphHeight, self.graphHeight * colCount / (max(1, secondaryMaxBound) - secondaryMinBound)) for row in range(colHeight): self.addstr(self.graphHeight + 1 - row, col + graphCol + 10, " ", curses.A_STANDOUT | secondaryColor)

1 0

[arm/master] Hotfixes for a couple issues discovered in the release and repairing the rpm build (not quite working yet, though).
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 79b7e13a0d6050f924b56ea8e62ecbf826917dbd Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Dec 1 03:55:25 2010 +0000 Hotfixes for a couple issues discovered in the release and repairing the rpm build (not quite working yet, though). fix: install script was failing to make the temporary directory for the compressed man page fix: a torrc validation log entries had a typo svn:r23882 --- setup.py | 8 +++++++- src/interface/controller.py | 4 ++-- src/version.py | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 57a71da..d11080f 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,13 @@ if "install" in sys.argv: # temporary destination for the man page guarenteed to be unoccupied (to # avoid conflicting with files that are already there) - manOutputFile = gzip.open(tempfile.mktemp("/arm.1.gz"), 'wb') + tmpFilename = tempfile.mktemp("/arm.1.gz") + + # make dir if the path doesn't already exist + baseDir = os.path.dirname(tmpFilename) + if not os.path.exists(baseDir): os.makedirs(baseDir) + + manOutputFile = gzip.open(tmpFilename, 'wb') manOutputFile.write(manContents) manOutputFile.close() diff --git a/src/interface/controller.py b/src/interface/controller.py index a90bd85..d3fe1d6 100644 --- a/src/interface/controller.py +++ b/src/interface/controller.py @@ -492,9 +492,9 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): if defaultOptions: if len(defaultOptions) > 1: - msg += "\n- entries match their default values" + msg += "\n- entries match their default values: " else: - msg += "\n- entry matches its default value" + msg += "\n- entry matches its default value: " defaultOptions.sort() msg += ", ".join(defaultOptions) diff --git a/src/version.py b/src/version.py index a35c4ee..fc30f0b 100644 --- a/src/version.py +++ b/src/version.py @@ -2,6 +2,6 @@ Provides arm's version and release date. """ -VERSION = '1.4.0' -LAST_MODIFIED = "November 27, 2010" +VERSION = '1.4.0-2' +LAST_MODIFIED = "November 30, 2010"

1 0

[arm/master] Merging to release for version 1.4.0
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit f403cccb5119e4290c5dce370249f2cade3b7617 Merge: 76dcdd2 c43410c Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Nov 28 10:58:57 2010 +0000 Merging to release for version 1.4.0 svn:r23873 ChangeLog | 46 ++- README | 19 +- TODO | 103 +++--- arm | 4 +- arm.1 | 73 ++++ armrc.sample | 228 ++++++++++- debian/MANIFEST | 40 -- debian/arm.1.gz | Bin 1115 -> 0 bytes debian/changelog | 17 - debian/compat | 1 - debian/control | 28 -- debian/copyright | 27 -- debian/make-deb | 21 - debian/make-rpm | 21 - debian/manpages | 1 - debian/pycompat | 1 - debian/rules | 23 - debian/setup.cfg | 3 - debian/source/format | 1 - install | 4 +- setup.py | 60 +++- src/armrc.defaults | 229 ----------- src/interface/__init__.py | 2 +- src/interface/confPanel.py | 292 ------------- src/interface/configPanel.py | 312 ++++++++++++++ src/interface/connPanel.py | 3 +- src/interface/controller.py | 657 +++++++++++++++++++++++------- src/interface/graphing/bandwidthStats.py | 3 +- src/interface/graphing/graphPanel.py | 10 +- src/interface/graphing/psStats.py | 2 +- src/interface/headerPanel.py | 3 +- src/interface/logPanel.py | 126 ++++-- src/interface/torrcPanel.py | 221 ++++++++++ src/settings.cfg | 130 ++++++ src/starter.py | 162 ++++++-- src/uninstall | 2 +- src/util/__init__.py | 2 +- src/util/conf.py | 222 +++++++---- src/util/connections.py | 2 +- src/util/hostnames.py | 10 +- src/util/log.py | 8 +- src/util/panel.py | 96 ++++- src/util/sysTools.py | 20 + src/util/torConfig.py | 659 ++++++++++++++++++++++++++++++ src/util/torTools.py | 170 +++++++- src/util/uiTools.py | 181 ++++++++- src/version.py | 4 +- 47 files changed, 3091 insertions(+), 1158 deletions(-) diff --cc TODO index 6b0fe37,c5fe109..fa9d6ad --- a/TODO +++ b/TODO @@@ -35,17 -28,26 +28,35 @@@ 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 - - give usage stats for exit port usage (popup?) - - country data for client connections (requested by ioerror) + [ ] 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 + * release prep + * pylint --indent-string=" " --disable=C,R interface/foo.py | less + * double check __init__.py and README for changes + + - Roadmap for version 1.4.2 + [ ] 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 diff --cc src/version.py index 08989e3,0b32fbf..a35c4ee --- a/src/version.py +++ b/src/version.py @@@ -2,6 -2,6 +2,6 @@@ Provides arm's version and release date. """ - VERSION = '1.3.7-1' - LAST_MODIFIED = "October 7, 2010" -VERSION = '1.4.0_dev' ++VERSION = '1.4.0' + LAST_MODIFIED = "November 27, 2010"

1 0