July 2011 - tor-commits - lists.torproject.org

[arm/release] Added minimum width/height requirements for paned childs.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit a3c427e1203d056f7c647ed679bbc54ced47aba8 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue Jun 14 02:48:30 2011 +0500 Added minimum width/height requirements for paned childs. --- src/gui/arm.xml | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index e58279b..23230b6 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -288,10 +288,12 @@ <property name="orientation">vertical</property> <child> <object class="GtkHPaned" id="hpaned_main"> + <property name="height_request">300</property> <property name="visible">True</property> <property name="can_focus">True</property> <child> <object class="GtkNotebook" id="notebook_main"> + <property name="width_request">300</property> <property name="visible">True</property> <property name="can_focus">True</property> <child> @@ -607,8 +609,8 @@ each direction. (Default: 0) </span></property> </child> </object> <packing> - <property name="resize">False</property> - <property name="shrink">True</property> + <property name="resize">True</property> + <property name="shrink">False</property> </packing> </child> <child> @@ -653,17 +655,18 @@ each direction. (Default: 0) </span></property> </object> <packing> <property name="resize">True</property> - <property name="shrink">True</property> + <property name="shrink">False</property> </packing> </child> </object> <packing> - <property name="resize">False</property> - <property name="shrink">True</property> + <property name="resize">True</property> + <property name="shrink">False</property> </packing> </child> <child> <object class="GtkScrolledWindow" id="scrolledwindow_log"> + <property name="height_request">100</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">automatic</property> @@ -678,7 +681,7 @@ each direction. (Default: 0) </span></property> </object> <packing> <property name="resize">True</property> - <property name="shrink">True</property> + <property name="shrink">False</property> </packing> </child> </object>

1 0

[arm/release] Dropping join on torctl's internal thread
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 290eaa974ee4d36a99981109bc8a89fbcd392e01 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jun 13 20:47:46 2011 -0700 Dropping join on torctl's internal thread A fix for the root cause this addressed has been sent to Mike in... https://trac.torproject.org/projects/tor/ticket/2412 --- src/util/torTools.py | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index a4c0b5d..5a47175 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -457,20 +457,6 @@ class Controller(TorCtl.PostEventListener): self.connLock.acquire() if self.conn: self.conn.close() - - # If we're closing due to an event from TorCtl (for instance, tor was - # stopped) then TorCtl is shutting itself down and there's no need to - # join on its thread (actually, this *is* the TorCtl thread in that - # case so joining on it causes deadlock). - # - # This poses a slight possability of shutting down with a live orphaned - # thread if Tor is shut down, then arm shuts down before TorCtl has a - # chance to terminate. However, I've never seen that occure so leaving - # that alone for now. - - if not threading.currentThread() == self.conn._thread: - self.conn._thread.join() - self.conn = None self.connLock.release()

1 0

[arm/release] fix: loop from closing conn based on torctl event
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit e272d05973abcc3b92acecb4e944c8861ed58903 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jun 13 20:35:56 2011 -0700 fix: loop from closing conn based on torctl event Attempting to close our control connection when TorCtl logged a message saying that it was done caused us to attempt to join our own thread within torctl (which causes an exception). I'm not really recalling why I ever did this, but fixes for concurrency issues in TorCtl are triggering this so removing the check. --- src/util/torTools.py | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index f17ed0b..a4c0b5d 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -67,7 +67,6 @@ CACHE_GETINFO_PREFIX_ARGS = ("ip-to-country/", ) # so erring on the side of inclusiveness by using the notice event instead. ADDR_CHANGED_MSG_PREFIX = ("Our IP Address has changed from", "Guessed our IP address as") -TOR_CTL_CLOSE_MSG = "Tor closed control connection. Exiting event thread." UNKNOWN = "UNKNOWN" # value used by cached information if undefined CONFIG = {"torrc.map": {}, "features.pathPrefix": "", @@ -1605,9 +1604,6 @@ class Controller(TorCtl.PostEventListener): # notifies listeners of TorCtl events for callback in self.torctlListeners: callback(TORCTL_RUNLEVELS[level], msg) - # checks if TorCtl is providing a notice that control port is closed - if TOR_CTL_CLOSE_MSG in msg: self.close() - # if the message is informing us of our ip address changing then clear # its cached value for prefix in ADDR_CHANGED_MSG_PREFIX:

1 0

[arm/release] Toggling the INCLUDE_GUI flag back to being off
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit a5af27f67a0c07b190997f36ed829b6a05b83a91 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jun 13 19:46:57 2011 -0700 Toggling the INCLUDE_GUI flag back to being off It isn't ready yet for users so toggling the gui back to being disabled. --- src/starter.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/starter.py b/src/starter.py index 50feceb..d2ac910 100644 --- a/src/starter.py +++ b/src/starter.py @@ -30,7 +30,7 @@ import util.uiTools import TorCtl.TorCtl import TorCtl.TorUtil -INCLUDE_GUI = True +INCLUDE_GUI = False LOG_DUMP_PATH = os.path.expanduser("~/.arm/log") DEFAULT_CONFIG = os.path.expanduser("~/.arm/armrc") CONFIG = {"startup.controlPassword": None,

1 0

[arm/release] fix: race condition for multiple status changes
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 56d0105a50809f7e272f3d0d1f3d2b25eca2d498 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jun 14 09:13:20 2011 -0700 fix: race condition for multiple status changes When an event caused multiple changes in Tor's status we'd run into a race condition and often pick the wrong final state. For instance, if a sighup caused Tor to crash (for instance via a bad torrc) then we'd trigger both a reset and closed event. This enqueues events to keep the order in which they occured, expands locks to include them, and introduces a small delay to coles events if they occure in quick succession like this. --- src/util/torTools.py | 77 +++++++++++++++++++++++++++++++++++++------------ 1 files changed, 58 insertions(+), 19 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 5a47175..8c18a9d 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -9,6 +9,7 @@ import time import socket import thread import threading +import Queue from TorCtl import TorCtl, TorUtil @@ -373,6 +374,15 @@ class Controller(TorCtl.PostEventListener): self._statusTime = 0 # unix time-stamp for the duration of the status self.lastHeartbeat = 0 # time of the last tor event + # Status signaling for when tor starts, stops, or is reset is done via + # enquing the signal then spawning a handler thread. This is to provide + # safety in race conditions, for instance if we sighup with a torrc that + # causes tor to crash then we'll get both an INIT and CLOSED signal. It's + # important in those cases that listeners get the correct signal last (in + # that case CLOSED) so they aren't confused about what tor's current state + # is. + self._notificationQueue = Queue.Queue() + self._exitPolicyChecker = None self._isExitingAllowed = False self._exitPolicyLookupCache = {} # mappings of ip/port tuples to if they were accepted by the policy or not @@ -440,14 +450,15 @@ class Controller(TorCtl.PostEventListener): # are dropped with a logged warning) self.setControllerEvents(self.controllerEvents) - self.connLock.release() - self._status = State.INIT self._statusTime = time.time() # notifies listeners that a new controller is available if not NO_SPAWN: - thread.start_new_thread(self._notifyStatusListeners, (State.INIT,)) + self._notificationQueue.put(State.INIT) + thread.start_new_thread(self._notifyStatusListeners, ()) + + self.connLock.release() def close(self): """ @@ -458,14 +469,16 @@ class Controller(TorCtl.PostEventListener): if self.conn: self.conn.close() self.conn = None - self.connLock.release() self._status = State.CLOSED self._statusTime = time.time() # notifies listeners that the controller's been shut down if not NO_SPAWN: - thread.start_new_thread(self._notifyStatusListeners, (State.CLOSED,)) + self._notificationQueue.put(State.CLOSED) + thread.start_new_thread(self._notifyStatusListeners, ()) + + self.connLock.release() else: self.connLock.release() def isAlive(self): @@ -1459,13 +1472,19 @@ class Controller(TorCtl.PostEventListener): """ if event.level == "NOTICE" and event.msg.startswith("Received reload signal (hup)"): - self._isReset = True + self.connLock.acquire() - self._status = State.INIT - self._statusTime = time.time() + if self.isAlive(): + self._isReset = True + + self._status = State.INIT + self._statusTime = time.time() + + if not NO_SPAWN: + self._notificationQueue.put(State.INIT) + thread.start_new_thread(self._notifyStatusListeners, ()) - if not NO_SPAWN: - thread.start_new_thread(self._notifyStatusListeners, (State.INIT,)) + self.connLock.release() def ns_event(self, event): self._updateHeartbeat() @@ -2006,7 +2025,7 @@ class Controller(TorCtl.PostEventListener): if result == None or result == UNKNOWN: return default else: return result - def _notifyStatusListeners(self, eventType): + def _notifyStatusListeners(self): """ Sends a notice to all current listeners that a given change in tor's controller status has occurred. @@ -2015,16 +2034,36 @@ class Controller(TorCtl.PostEventListener): eventType - enum representing tor's new status """ - # resets cached GETINFO and GETCONF parameters - self._cachedParam = {} - self._cachedConf = {} + # If there's a quick race state (for instance a sighup causing both an init + # and close event) then give them a moment to enqueue. This way we can + # coles the events and discard the inaccurate one. + + time.sleep(0.2) + + self.connLock.acquire() - # gives a notice that the control port has closed - if eventType == State.CLOSED: - log.log(CONFIG["log.torCtlPortClosed"], "Tor control port closed") + try: + eventType = self._notificationQueue.get(timeout=0) + + # checks that the notice is accurate for our current state + if self.isAlive() != (eventType == State.INIT): + eventType = None + except Queue.Empty: + eventType = None + + if eventType: + # resets cached GETINFO and GETCONF parameters + self._cachedParam = {} + self._cachedConf = {} + + # gives a notice that the control port has closed + if eventType == State.CLOSED: + log.log(CONFIG["log.torCtlPortClosed"], "Tor control port closed") + + for callback in self.statusListeners: + callback(self, eventType) - for callback in self.statusListeners: - callback(self, eventType) + self.connLock.release() class ExitPolicy: """

1 0

[arm/release] fix: disabling resource usage checks if zero
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit cb5e1d40c1fe60dbb980a70efc9bf252a53f2597 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 15 08:20:46 2011 -0700 fix: disabling resource usage checks if zero When the "queries.resourceUsage.rate" is set to zero I'm disabling system resource usage queries rather than peging the cpu. --- src/util/sysTools.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/util/sysTools.py b/src/util/sysTools.py index 2775194..98361e5 100644 --- a/src/util/sysTools.py +++ b/src/util/sysTools.py @@ -380,7 +380,8 @@ class ResourceTracker(threading.Thread): Arguments: processPid - pid of the process being tracked - resolveRate - time between resolving resource usage + resolveRate - time between resolving resource usage, resolution is + disabled if zero """ threading.Thread.__init__(self) @@ -443,7 +444,13 @@ class ResourceTracker(threading.Thread): while not self._halt: timeSinceReset = time.time() - self.lastLookup - if timeSinceReset < self.resolveRate: + if self.resolveRate == 0: + self._cond.acquire() + if not self._halt: self._cond.wait(0.2) + self._cond.release() + + continue + elif timeSinceReset < self.resolveRate: sleepTime = max(0.2, self.resolveRate - timeSinceReset) self._cond.acquire()

1 0

[arm/release] Making interface panels optional
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit b9e004d7b2fff8ecfcf0fbf12bdb4e0e1982764f Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 15 08:23:30 2011 -0700 Making interface panels optional Adding "features.panels.show.*" configuration options for including or excluding individual portions of the interface. --- armrc.sample | 7 +++++ src/cli/controller.py | 69 +++++++++++++++++++++++++++++------------------- 2 files changed, 49 insertions(+), 27 deletions(-) diff --git a/armrc.sample b/armrc.sample index 1eafe77..a81c9d8 100644 --- a/armrc.sample +++ b/armrc.sample @@ -11,6 +11,13 @@ queries.resourceUsage.rate 5 queries.connections.minRate 5 queries.refreshRate.rate 5 +# allows individual panels to be included/excluded +features.panels.show.graph true +features.panels.show.log true +features.panels.show.connection true +features.panels.show.config true +features.panels.show.torrc true + # Read the proc contents directly instead of calling ps, netstat, and other # resolvers. This provides very sizable performance benefits (around 90% # faster lookups) but this is only available on Linux. diff --git a/src/cli/controller.py b/src/cli/controller.py index b019f8e..feb7cf0 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -25,6 +25,11 @@ ARM_CONTROLLER = None CONFIG = {"startup.events": "N3", "startup.blindModeEnabled": False, + "features.panels.show.graph": True, + "features.panels.show.log": True, + "features.panels.show.connection": True, + "features.panels.show.config": True, + "features.panels.show.torrc": True, "features.redrawRate": 5, "features.confirmQuit": True, "features.graph.type": 1, @@ -60,22 +65,29 @@ def initController(stdscr, startTime): # initializes the panels stickyPanels = [cli.headerPanel.HeaderPanel(stdscr, startTime, config), LabelPanel(stdscr)] - pagePanels = [] + pagePanels, firstPagePanels = [], [] # first page: graph and log - expandedEvents = cli.logPanel.expandEvents(CONFIG["startup.events"]) - pagePanels.append([cli.graphing.graphPanel.GraphPanel(stdscr), - cli.logPanel.LogPanel(stdscr, expandedEvents, config)]) + if CONFIG["features.panels.show.graph"]: + firstPagePanels.append(cli.graphing.graphPanel.GraphPanel(stdscr)) + + if CONFIG["features.panels.show.log"]: + expandedEvents = cli.logPanel.expandEvents(CONFIG["startup.events"]) + firstPagePanels.append(cli.logPanel.LogPanel(stdscr, expandedEvents, config)) + + if firstPagePanels: pagePanels.append(firstPagePanels) # second page: connections - if not CONFIG["startup.blindModeEnabled"]: + if not CONFIG["startup.blindModeEnabled"] and CONFIG["features.panels.show.connection"]: pagePanels.append([cli.connections.connPanel.ConnectionPanel(stdscr, config)]) # third page: config - pagePanels.append([cli.configPanel.ConfigPanel(stdscr, cli.configPanel.State.TOR, config)]) + if CONFIG["features.panels.show.config"]: + pagePanels.append([cli.configPanel.ConfigPanel(stdscr, cli.configPanel.State.TOR, config)]) # fourth page: torrc - pagePanels.append([cli.torrcPanel.TorrcPanel(stdscr, cli.torrcPanel.Config.TORRC, config)]) + if CONFIG["features.panels.show.torrc"]: + pagePanels.append([cli.torrcPanel.TorrcPanel(stdscr, cli.torrcPanel.Config.TORRC, config)]) # initializes the controller ARM_CONTROLLER = Controller(stdscr, stickyPanels, pagePanels) @@ -83,23 +95,24 @@ def initController(stdscr, startTime): # additional configuration for the graph panel graphPanel = ARM_CONTROLLER.getPanel("graph") - # statistical monitors for graph - bwStats = cli.graphing.bandwidthStats.BandwidthStats(config) - graphPanel.addStats(GraphStat.BANDWIDTH, bwStats) - graphPanel.addStats(GraphStat.SYSTEM_RESOURCES, cli.graphing.resourceStats.ResourceStats()) - if not CONFIG["startup.blindModeEnabled"]: - graphPanel.addStats(GraphStat.CONNECTIONS, cli.graphing.connStats.ConnStats()) - - # sets graph based on config parameter - try: - initialStats = GRAPH_INIT_STATS.get(CONFIG["features.graph.type"]) - graphPanel.setStats(initialStats) - except ValueError: pass # invalid stats, maybe connections when in blind mode - - # prepopulates bandwidth values from state file - if CONFIG["features.graph.bw.prepopulate"]: - isSuccessful = bwStats.prepopulateFromState() - if isSuccessful: graphPanel.updateInterval = 4 + if graphPanel: + # statistical monitors for graph + bwStats = cli.graphing.bandwidthStats.BandwidthStats(config) + graphPanel.addStats(GraphStat.BANDWIDTH, bwStats) + graphPanel.addStats(GraphStat.SYSTEM_RESOURCES, cli.graphing.resourceStats.ResourceStats()) + if not CONFIG["startup.blindModeEnabled"]: + graphPanel.addStats(GraphStat.CONNECTIONS, cli.graphing.connStats.ConnStats()) + + # sets graph based on config parameter + try: + initialStats = GRAPH_INIT_STATS.get(CONFIG["features.graph.type"]) + graphPanel.setStats(initialStats) + except ValueError: pass # invalid stats, maybe connections when in blind mode + + # prepopulates bandwidth values from state file + if CONFIG["features.graph.bw.prepopulate"]: + isSuccessful = bwStats.prepopulateFromState() + if isSuccessful: graphPanel.updateInterval = 4 class LabelPanel(panel.Panel): """ @@ -259,9 +272,11 @@ class Controller: returnPage = self._page if pageNumber == None else pageNumber - if includeSticky: - return self._stickyPanels + self._pagePanels[returnPage] - else: return list(self._pagePanels[returnPage]) + if self._pagePanels: + if includeSticky: + return self._stickyPanels + self._pagePanels[returnPage] + else: return list(self._pagePanels[returnPage]) + else: return self._stickyPanels if includeSticky else [] def getDaemonPanels(self): """

1 0

[arm/release] Moving connection component fetching to TorCtl
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 26231dd6ccddc0659acb295a68b972d2ad979bab Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 16 07:58:00 2011 -0700 Moving connection component fetching to TorCtl The TorCtl.connect method is highly inflexable... https://trac.torproject.org/projects/tor/ticket/3409 so I've been using a custom implementation that duplicated most of the work that TorCtl was already doing. I've moved this higher visability version into TorCtl to negate the need for this hack. This relies on the following TorCtl change: https://gitweb.torproject.org/atagar/pytorctl.git/commit/565e18a6ff6189dd11… --- src/cli/headerPanel.py | 6 ++++-- src/starter.py | 4 ++-- src/util/torTools.py | 42 ------------------------------------------ 3 files changed, 6 insertions(+), 46 deletions(-) diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index decf975..93930b1 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -19,6 +19,8 @@ import time import curses import threading +import TorCtl.TorCtl + import cli.popups from util import log, panel, sysTools, torTools, uiTools @@ -117,9 +119,9 @@ class HeaderPanel(panel.Panel, threading.Thread): if key in (ord('r'), ord('R')) and not self._isTorConnected: try: ctlAddr, ctlPort = self._config["startup.interface.ipAddress"], self._config["startup.interface.port"] - tmpConn, authType, authValue = torTools.getConnectionComponents(ctlAddr, ctlPort) + tmpConn, authType, authValue = TorCtl.TorCtl.connectionComp(ctlAddr, ctlPort) - if authType == torTools.AUTH_TYPE.PASSWORD: + if authType == TorCtl.TorCtl.AUTH_TYPE.PASSWORD: authValue = cli.popups.inputPrompt("Controller Password: ") if not authValue: raise IOError() # cancel reconnection diff --git a/src/starter.py b/src/starter.py index d2ac910..94bb30b 100644 --- a/src/starter.py +++ b/src/starter.py @@ -358,9 +358,9 @@ if __name__ == '__main__': # making this a much bigger hack). try: - tmpConn, authType, cookiePath = util.torTools.getConnectionComponents(controlAddr, controlPort) + tmpConn, authType, cookiePath = TorCtl.TorCtl.connectionComp(controlAddr, controlPort) - if authType == util.torTools.AUTH_TYPE.COOKIE: + if authType == TorCtl.TorCtl.AUTH_TYPE.COOKIE: torPid = util.torTools.getPid(controlPort) if torPid and cookiePath[0] != "/": diff --git a/src/util/torTools.py b/src/util/torTools.py index 14f24a0..d0d658a 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -20,9 +20,6 @@ from util import enum, log, procTools, sysTools, uiTools # CLOSED - control port closed State = enum.Enum("INIT", "CLOSED") -# enums for authentication on the tor control port -AUTH_TYPE = enum.Enum("NONE", "COOKIE", "PASSWORD") - # Addresses of the default directory authorities for tor version 0.2.3.0-alpha # (this comes from the dirservers array in src/or/config.c). DIR_SERVERS = [("86.59.21.38", "80"), # tor26 @@ -298,45 +295,6 @@ def parseVersion(versionStr): return result -def getConnectionComponents(controlAddr="127.0.0.1", controlPort=9051): - """ - Provides an uninitiated torctl connection for the control port. This returns - a tuple with the... - (torctl connection, authType, authValue) - - The authValue corresponds to the cookie path if using an authentication - cookie. Otherwise this is the empty string. This raises an IOError if unable - to connect. - - Arguments: - controlAddr - ip address belonging to the controller - controlPort - port belonging to the controller - """ - - try: - s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - s.connect((controlAddr, controlPort)) - conn = TorCtl.Connection(s) - authType, authValue = conn.get_auth_type(), "" - - if authType == TorCtl.AUTH_TYPE.COOKIE: - authValue = conn.get_auth_cookie_path() - - # converts to our enum type - if authType == TorCtl.AUTH_TYPE.NONE: - authType = AUTH_TYPE.NONE - elif authType == TorCtl.AUTH_TYPE.COOKIE: - authType = AUTH_TYPE.COOKIE - elif authType == TorCtl.AUTH_TYPE.PASSWORD: - authType = AUTH_TYPE.PASSWORD - - return (conn, authType, authValue) - except socket.error, exc: - if "Connection refused" in exc.args: - raise IOError("Connection refused. Is the ControlPort enabled?") - else: raise IOError("Failed to establish socket: %s" % exc) - except Exception, exc: raise IOError(exc) - def getConn(): """ Singleton constructor for a Controller. Be aware that this starts as being

1 0

[arm/release] Adding a "New Identity" option
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 1a31910080c81f01bf07aeccbaed8ff3d861ec49 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 16 20:53:45 2011 -0700 Adding a "New Identity" option Providing an option for sending newnym signals to tor. This is both provided via a menu option and a 'n' hotkey. There's also an indicator in the header panel if we're both on a wide screen and running as a non-relay. This was requested on 'https://trac.torproject.org/projects/tor/ticket/3394'. --- src/cli/headerPanel.py | 30 ++++++++++++++++++++++++++---- src/cli/menu/actions.py | 3 +++ src/util/torTools.py | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 4 deletions(-) diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index d367b98..b5b3826 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -113,10 +113,24 @@ class HeaderPanel(panel.Panel, threading.Thread): if self.vals["tor/orPort"]: return 4 if isWide else 6 else: return 3 if isWide else 4 + def sendNewnym(self): + """ + Requests a new identity and provides a visual queue. + """ + + torTools.getConn().sendNewnym() + + # If we're wide then the newnym label in this panel will give an + # indication that the signal was sent. Otherwise use a msg. + isWide = self.getParent().getmaxyx()[1] >= MIN_DUAL_COL_WIDTH + if not isWide: cli.popups.showMsg("Requesting a new identity", 1) + def handleKey(self, key): isKeystrokeConsumed = True - if key in (ord('r'), ord('R')) and not self._isTorConnected: + if key in (ord('n'), ord('N')) and torTools.getConn().isNewnymAvailable(): + self.sendNewnym() + elif key in (ord('r'), ord('R')) and not self._isTorConnected: try: ctlAddr, ctlPort = self._config["startup.interface.ipAddress"], self._config["startup.interface.port"] tmpConn, authType, authValue = TorCtl.TorCtl.connectionComp(ctlAddr, ctlPort) @@ -309,9 +323,17 @@ class HeaderPanel(panel.Panel, threading.Thread): self.addstr(2, x, ", ") x += 2 else: - # Client only - # TODO: not sure what information to provide here... - pass + # (Client only) Undisplayed / Line 2 Right (new identity option) + if isWide: + conn = torTools.getConn() + newnymWait = conn.getNewnymWait() + + msg = "press 'n' for a new identity" + if newnymWait > 0: + pluralLabel = "s" if newnymWait > 1 else "" + msg = "building circuits, available again in %i second%s" % (newnymWait, pluralLabel) + + self.addstr(1, leftWidth, msg) self.valsLock.release() diff --git a/src/cli/menu/actions.py b/src/cli/menu/actions.py index b8b59e1..c571bd8 100644 --- a/src/cli/menu/actions.py +++ b/src/cli/menu/actions.py @@ -42,14 +42,17 @@ def makeActionsMenu(): """ Submenu consisting of... Close Menu + New Identity Pause / Unpause Reset Tor Exit """ control = cli.controller.getController() + headerPanel = control.getPanel("header") actionsMenu = cli.menu.item.Submenu("Actions") actionsMenu.add(cli.menu.item.MenuItem("Close Menu", None)) + actionsMenu.add(cli.menu.item.MenuItem("New Identity", headerPanel.sendNewnym)) if control.isPaused(): label, arg = "Unpause", False else: label, arg = "Pause", True diff --git a/src/util/torTools.py b/src/util/torTools.py index d0d658a..17c54f0 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -6,6 +6,7 @@ accessing TorCtl and notifications of state changes to subscribers. import os import pwd import time +import math import socket import thread import threading @@ -411,6 +412,9 @@ class Controller(TorCtl.PostEventListener): self._status = State.INIT self._statusTime = time.time() + # time that we sent our last newnym signal + self._lastNewnym = 0 + # notifies listeners that a new controller is available if not NO_SPAWN: self._notificationQueue.put(State.INIT) @@ -714,6 +718,36 @@ class Controller(TorCtl.PostEventListener): if raisedExc: raise raisedExc + def sendNewnym(self): + """ + Sends a newnym request to Tor. These are rate limited so if it occures + more than once within a ten second window then the second is delayed. + """ + + self.connLock.acquire() + + if self.isAlive(): + self._lastNewnym = time.time() + self.conn.send_signal("NEWNYM") + + self.connLock.release() + + def isNewnymAvailable(self): + """ + True if Tor will immediately respect a newnym request, false otherwise. + """ + + return self.getNewnymWait() == 0 + + def getNewnymWait(self): + """ + Provides the number of seconds until a newnym signal would be respected. + """ + + # newnym signals can occure at the rate of one every ten seconds + # TODO: this can't take other controllers into account :( + return max(0, math.ceil(self._lastNewnym + 10 - time.time())) + def getCircuits(self, default = []): """ This provides a list with tuples of the form:

1 0

[arm/release] fix: Lowering get_network_status call memory usage
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 40580190efde4a645481da72571f2722c7aa8c8b Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 16 07:35:14 2011 -0700 fix: Lowering get_network_status call memory usage When generating the IP -> fingerprint mappings I call the TorCtl get_network_status function which generates a TorCtl.NetworkStatus instance for every relay that exists. Since all of the memory is allocated at once this increases the preceived memory footprint of arm by 3.5 MB. This is because even after the memory's freed the python allocator doesn't actually give the memory back: http://effbot.org/pyfaq/why-doesnt-python-release-the-memory-when-i-delete-… This uses (and relies) on a change in TorCtl to use an iterator instead to avoid this mass allocation: https://gitweb.torproject.org/atagar/pytorctl.git/commit/45d7753b7c947b1412… In practice this lowers arm's baseline memory usage by 2.5 MB (12%). --- 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 8c18a9d..14f24a0 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1637,7 +1637,7 @@ class Controller(TorCtl.PostEventListener): if self.isAlive(): # fetch the current network status if not provided if not nsList: - try: nsList = self.conn.get_network_status() + try: nsList = self.conn.get_network_status(getIterator=True) except (socket.error, TorCtl.TorCtlClosed, TorCtl.ErrorReply): nsList = [] # construct mappings of ips to relay data

1 0