- tor-commits - lists.torproject.org

[arm/release] Use treestore and group circuit entries by header, cache the model.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 0b58312fe6b543cef4193c7f1cda36e801b5d36e Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Fri Jul 8 18:32:56 2011 +0500 Use treestore and group circuit entries by header, cache the model. The treestore is updated only if the (local, foreign) tuple for one of the entries is not found in cache. Otherwise, only the time column is updated. --- src/gui/arm.xml | 4 +- src/gui/connections/connPanel.py | 43 ++++++++++++++++++++++++++++++++----- src/starter.py | 2 +- 3 files changed, 40 insertions(+), 9 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index dca5f33..0aafb28 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -59,7 +59,7 @@ </row> </data> </object> - <object class="GtkListStore" id="liststore_conn"> + <object class="GtkTreeStore" id="treestore_conn"> <columns>  <column type="gchararray"/> @@ -432,7 +432,7 @@ <object class="GtkTreeView" id="treeview_conn"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="model">liststore_conn</property> + <property name="model">treestore_conn</property> <property name="headers_visible">False</property> <property name="headers_clickable">False</property> <property name="search_column">0</property> diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index cbabc41..ad57878 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -11,10 +11,10 @@ from collections import deque import gobject import gtk -from cli.connections import connEntry +from cli.connections import circEntry, connEntry from cli.connections.connPanel import ConnectionPanel as CliConnectionPanel from TorCtl import TorCtl -from util import connections, uiTools, torTools +from util import connections, sysTools, uiTools, torTools REFRESH_RATE = 3 @@ -23,8 +23,12 @@ class ConnectionPanel(CliConnectionPanel): CliConnectionPanel.__init__(self, None) self.builder = builder + self.cache = {} - self.resolver = connections.getResolver('tor') + conn = torTools.getConn() + torPid = conn.getMyPid() + torCmdName = sysTools.getProcessName(torPid, "tor") + connections.getResolver(torCmdName, torPid, "tor") gobject.timeout_add(3000, self._fill_entries) @@ -37,8 +41,25 @@ class ConnectionPanel(CliConnectionPanel): label = self.builder.get_object('label_conn_top') label.set_text(self._title) - liststore = self.builder.get_object('liststore_conn') - liststore.clear() + treestore = self.builder.get_object('treestore_conn') + + # first pass checks whether we have enough entries cached to not update the treeview + for (index, line) in enumerate(self._entryLines): + local = "%s:%s" % (line.local.ipAddr, line.local.port) + foreign = "%s:%s" % (line.foreign.ipAddr, line.foreign.port) + cachekey = (local, foreign) + if self.cache.has_key(cachekey): + timeLabel = "%d s" % (time.time() - line.startTime) + treestore.set_value(self.cache[cachekey], 2, timeLabel) + else: + break + + if index == len(self._entryLines) - 1: + return + + treestore.clear() + + headeriter = None for line in self._entryLines: if isinstance(line, connEntry.ConnectionLine) and line.isUnresolvedApp(): @@ -48,7 +69,17 @@ class ConnectionPanel(CliConnectionPanel): foreign = "%s:%s" % (line.foreign.ipAddr, line.foreign.port) timeLabel = "%d s" % (time.time() - line.startTime) row = (local, foreign, timeLabel, line.baseType, 'black') - liststore.append(row) + + if isinstance(line, circEntry.CircHeaderLine): + currentiter = treestore.append(None, row) + headeriter = currentiter + elif isinstance(line, circEntry.CircLine): + currentiter = treestore.append(headeriter, row) + else: + currentiter = treestore.append(None, row) + + cachekey = (local, foreign) + self.cache[cachekey] = currentiter self.valsLock.release() diff --git a/src/starter.py b/src/starter.py index 1b6049a..5518caa 100644 --- a/src/starter.py +++ b/src/starter.py @@ -30,7 +30,7 @@ import util.uiTools import TorCtl.TorCtl import TorCtl.TorUtil -INCLUDE_GUI = False +INCLUDE_GUI = True LOG_DUMP_PATH = os.path.expanduser("~/.arm/log") DEFAULT_CONFIG = os.path.expanduser("~/.arm/armrc") CONFIG = {"startup.controlPassword": None,

1 0

[arm/release] Seperate cache entries for header and circ lines.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 16358dd0ab9c413c989adfe7b35dbae5c4b1abc4 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 9 17:09:49 2011 +0500 Seperate cache entries for header and circ lines. --- src/gui/connections/connPanel.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index 4f89b30..29f18b7 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -49,7 +49,7 @@ class ConnectionPanel(CliConnectionPanel): local = "%s:%s" % (line.local.ipAddr, line.local.port) foreign = "%s:%s" % (line.foreign.ipAddr, line.foreign.port) - cachekey = (local, foreign) + cachekey = (local, foreign, isinstance(line, circEntry.CircHeaderLine)) if self.cache.has_key(cachekey): timeLabel = "%d s" % (time.time() - line.startTime) treestore.set_value(self.cache[cachekey], 2, timeLabel) @@ -82,7 +82,7 @@ class ConnectionPanel(CliConnectionPanel): else: currentiter = treestore.append(None, row) - cachekey = (local, foreign) + cachekey = (local, foreign, isinstance(line, circEntry.CircHeaderLine)) self.cache[cachekey] = currentiter self.valsLock.release()

1 0

[arm/release] Attempting to connect to the wizard port
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit d76a91e07e59b885096e07cdbdbaca1f8349b932 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 8 18:16:00 2011 -0700 Attempting to connect to the wizard port If the initial connection fails then also tries the port the relay setup wizard uses. This is a non-standard port to avoid conflicts with TBB instances. --- src/cli/wizard.py | 4 ++-- src/settings.cfg | 1 + src/starter.py | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 3ab3b9d..7e0907e 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -23,7 +23,7 @@ TORRC_TEMPLATE = "resources/torrcTemplate.txt" RelayType = enum.Enum("RELAY", "EXIT", "BRIDGE", "CLIENT") # all options that can be configured -Options = enum.Enum("DIVIDER", "NICKNAME", "CONTACT", "NOTIFY", "BANDWIDTH", "LIMIT", "CLIENT", "LOWPORTS", "PORTFORWARD", "STARTUP", "NOTICE", "POLICY", "WEBSITES", "EMAIL", "IM", "MISC", "PLAINTEXT", "DISTRIBUTE", "BRIDGED", "BRIDGE1", "BRIDGE2", "BRIDGE3", "REUSE") +Options = enum.Enum("DIVIDER", "CONTROL", "NICKNAME", "CONTACT", "NOTIFY", "BANDWIDTH", "LIMIT", "CLIENT", "LOWPORTS", "PORTFORWARD", "STARTUP", "NOTICE", "POLICY", "WEBSITES", "EMAIL", "IM", "MISC", "PLAINTEXT", "DISTRIBUTE", "BRIDGED", "BRIDGE1", "BRIDGE2", "BRIDGE3", "REUSE") RelayOptions = {RelayType.RELAY: (Options.NICKNAME, Options.CONTACT, Options.NOTIFY, @@ -286,7 +286,7 @@ def showWizard(): try: os.system("tor --quiet -f %s&" % torrcLocation) - torctlConn, authType, authValue = TorCtl.preauth_connect(controlPort = 9052) + torctlConn, authType, authValue = TorCtl.preauth_connect(controlPort = int(CONFIG["wizard.default"][Options.CONTROL])) if authType == TorCtl.AUTH_TYPE.COOKIE: torctlConn.authenticate(authValue) diff --git a/src/settings.cfg b/src/settings.cfg index 162327b..f15aa49 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -371,6 +371,7 @@ wizard.suboptions Bridge1 wizard.suboptions Bridge2 wizard.suboptions Bridge3 +wizard.default Control => 9052 wizard.default Notify => true wizard.default Bandwidth => 5 MB/s wizard.default Startup => true diff --git a/src/starter.py b/src/starter.py index 234bf16..58bc6b1 100644 --- a/src/starter.py +++ b/src/starter.py @@ -39,6 +39,7 @@ CONFIG = {"startup.controlPassword": None, "startup.blindModeEnabled": False, "startup.events": "N3", "startup.dataDirectory": "~/.arm", + "wizard.default": {}, "features.allowDetachedStartup": False, "features.config.descriptions.enabled": True, "features.config.descriptions.persist": True, @@ -211,6 +212,21 @@ def _torCtlConnect(controlAddr="127.0.0.1", controlPort=9051, passphrase=None, i except Exception, exc: if conn: conn.close() + # attempts to connect with the default wizard address too + wizardPort = CONFIG["wizard.default"].get("Control") + + if wizardPort and wizardPort.isdigit(): + wizardPort = int(wizardPort) + + # Attempt to connect to the wizard port. If the connection fails then + # don't print anything and continue with the error case for the initial + # connection failure. Otherwise, return the connection result. + + if controlPort != wizardPort: + connResult = _torCtlConnect(controlAddr, wizardPort) + if connResult != None: return connResult + else: return None # wizard connection attempt, don't print anything + if passphrase and str(exc) == "Unable to authenticate: password incorrect": # provide a warning that the provided password didn't work, then try # again prompting for the user to enter it

1 0

[arm/release] Return True to keep timeout going.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 9e020cb8e12d682ca74368bda582655bd19957b2 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 9 17:00:51 2011 +0500 Return True to keep timeout going. --- src/gui/connections/connPanel.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index 9df5142..4f89b30 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -59,7 +59,7 @@ class ConnectionPanel(CliConnectionPanel): index = index + 1 if index == len(self._entryLines): - return + return True treestore.clear()

1 0

[arm/release] Use distinguishing colors for entry lines.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 50940a058d0481fc8edb8300e998a8e8f05a4274 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 9 18:51:06 2011 +0500 Use distinguishing colors for entry lines. --- src/gui/connections/circEntry.py | 2 +- src/gui/connections/connEntry.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/connections/circEntry.py b/src/gui/connections/circEntry.py index cb79a9b..036fbab 100644 --- a/src/gui/connections/circEntry.py +++ b/src/gui/connections/circEntry.py @@ -21,7 +21,7 @@ class CircHeaderLine(circEntry.CircHeaderLine): foreign = "%s:%s" % (self.foreign.ipAddr, self.foreign.port) timeLabel = "%d s" % (time.time() - self.startTime) - return (local, foreign, timeLabel, self.baseType, 'black') + return (local, foreign, timeLabel, self.baseType, 'blue') class CircLine(circEntry.CircLine): @classmethod diff --git a/src/gui/connections/connEntry.py b/src/gui/connections/connEntry.py index bc4ec53..5888532 100644 --- a/src/gui/connections/connEntry.py +++ b/src/gui/connections/connEntry.py @@ -22,5 +22,5 @@ class ConnectionLine(connEntry.ConnectionLine): foreign = "%s:%s" % (self.foreign.ipAddr, self.foreign.port) timeLabel = "%d s" % (time.time() - self.startTime) - return (local, foreign, timeLabel, self.baseType, 'black') + return (local, foreign, timeLabel, self.baseType, 'red')

1 0

[arm/release] Add getListingRow() methods to GUI entry lines.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit e17fa925a2369c4b65fc91a60e53cd29cc62e688 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 9 18:46:56 2011 +0500 Add getListingRow() methods to GUI entry lines. This delegates the row construction to entry line classes instead of connection panel, making the effort of having derived GUI entry classes worthwhile :) . --- src/gui/connections/circEntry.py | 16 ++++++++++++++++ src/gui/connections/connEntry.py | 9 +++++++++ src/gui/connections/connPanel.py | 5 +---- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/gui/connections/circEntry.py b/src/gui/connections/circEntry.py index 63436cf..cb79a9b 100644 --- a/src/gui/connections/circEntry.py +++ b/src/gui/connections/circEntry.py @@ -2,6 +2,8 @@ Connection panel entries for client circuits. """ +import time + from cli.connections import circEntry class CircEntry(circEntry.CircEntry): @@ -14,8 +16,22 @@ class CircHeaderLine(circEntry.CircHeaderLine): def convertToGui(self, instance): instance.__class__ = self + def getListingRow(self): + local = "%s:%s" % (self.local.ipAddr, self.local.port) + foreign = "%s:%s" % (self.foreign.ipAddr, self.foreign.port) + timeLabel = "%d s" % (time.time() - self.startTime) + + return (local, foreign, timeLabel, self.baseType, 'black') + class CircLine(circEntry.CircLine): @classmethod def convertToGui(self, instance): instance.__class__ = self + def getListingRow(self): + local = "%s:%s" % (self.local.ipAddr, self.local.port) + foreign = "%s:%s" % (self.foreign.ipAddr, self.foreign.port) + timeLabel = "%d s" % (time.time() - self.startTime) + + return (local, foreign, timeLabel, self.baseType, 'black') + diff --git a/src/gui/connections/connEntry.py b/src/gui/connections/connEntry.py index 4db0a10..bc4ec53 100644 --- a/src/gui/connections/connEntry.py +++ b/src/gui/connections/connEntry.py @@ -3,6 +3,8 @@ Connection panel entries related to actual connections to or from the system (ie, results seen by netstat, lsof, etc). """ +import time + from cli.connections import connEntry class ConnectionEntry(connEntry.ConnectionEntry): @@ -15,3 +17,10 @@ class ConnectionLine(connEntry.ConnectionLine): def convertToGui(self, instance): instance.__class__ = self + def getListingRow(self): + local = "%s:%s" % (self.local.ipAddr, self.local.port) + foreign = "%s:%s" % (self.foreign.ipAddr, self.foreign.port) + timeLabel = "%d s" % (time.time() - self.startTime) + + return (local, foreign, timeLabel, self.baseType, 'black') + diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index d8d987a..2c2248a 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -89,10 +89,7 @@ class ConnectionPanel(CliConnectionPanel): if isinstance(line, connEntry.ConnectionLine) and line.isUnresolvedApp(): self._resolveApps() - local = "%s:%s" % (line.local.ipAddr, line.local.port) - foreign = "%s:%s" % (line.foreign.ipAddr, line.foreign.port) - timeLabel = "%d s" % (time.time() - line.startTime) - row = (local, foreign, timeLabel, line.baseType, 'black') + row = line.getListingRow() if isinstance(line, circEntry.CircHeaderLine): currentiter = treestore.append(None, row)

1 0

[arm/release] Adding menu option to shut down tor
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 2b5602ac329c6e0d45ba9d2cdfb5d7b4eb11c061 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 9 16:21:07 2011 -0700 Adding menu option to shut down tor --- src/cli/menu/actions.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/cli/menu/actions.py b/src/cli/menu/actions.py index 3c90b10..db9d178 100644 --- a/src/cli/menu/actions.py +++ b/src/cli/menu/actions.py @@ -50,17 +50,22 @@ def makeActionsMenu(): """ control = cli.controller.getController() + conn = torTools.getConn() 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 conn.isAlive(): + actionsMenu.add(cli.menu.item.MenuItem("Stop Tor", conn.shutdown)) + + actionsMenu.add(cli.menu.item.MenuItem("Reset Tor", conn.reload)) actionsMenu.add(cli.menu.item.MenuItem("Setup Wizard", cli.wizard.showWizard)) if control.isPaused(): label, arg = "Unpause", False else: label, arg = "Pause", True actionsMenu.add(cli.menu.item.MenuItem(label, functools.partial(control.setPaused, arg))) - actionsMenu.add(cli.menu.item.MenuItem("Reset Tor", torTools.getConn().reload)) actionsMenu.add(cli.menu.item.MenuItem("Exit", control.quit)) return actionsMenu

1 0

[arm/release] Config option to shut down tor when quiting
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 2ce33556601d2c4a1d0b177d7cbb075a3e8bec7e Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 9 16:08:39 2011 -0700 Config option to shut down tor when quiting If attached to an arm made tor instance and the config option is set then offers to shut down tor gracefully when quitting. --- armrc.sample | 4 ++++ src/cli/controller.py | 25 ++++++++++++++++++++++++- src/util/torTools.py | 24 ++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 1 deletions(-) diff --git a/armrc.sample b/armrc.sample index bfe8976..c893bf9 100644 --- a/armrc.sample +++ b/armrc.sample @@ -31,6 +31,10 @@ features.colorInterface true # none, red, green, yellow, blue, cyan, magenta, black, white features.colorOverride none +# If arm is attached to an arm started tor instance when it shuts down then +# offers to shut down tor too if true, otherwise skips this prompt. +features.offerTorShutdownOnQuit false + # Includes unicode characters in the interface. features.printUnicode true diff --git a/src/cli/controller.py b/src/cli/controller.py index 633296e..ae1a59b 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -28,6 +28,7 @@ ARM_CONTROLLER = None CONFIG = {"startup.events": "N3", "startup.dataDirectory": "~/.arm", "startup.blindModeEnabled": False, + "features.offerTorShutdownOnQuit": False, "features.panels.show.graph": True, "features.panels.show.log": True, "features.panels.show.connection": True, @@ -388,10 +389,32 @@ class Controller: def quit(self): """ - Terminates arm after the input is processed. + Terminates arm after the input is processed. Optionally if we're connected + to a arm generated tor instance then this may check if that should be shut + down too. """ self._isDone = True + + if CONFIG["features.offerTorShutdownOnQuit"]: + conn = torTools.getConn() + torrcLoc = conn.getInfo("config-file") + wizardTorrcLoc = self.getDataDirectory() + "torrc" + + if torrcLoc == wizardTorrcLoc: + while True: + msg = "Shut down the Tor instance arm started (y/n)?" + confirmationKey = cli.popups.showMsg(msg, attr = curses.A_BOLD) + + if confirmationKey in (ord('y'), ord('Y')): + # attempts a graceful shutdown of tor, showing the issue if + # unsuccessful then continuing the shutdown + try: conn.shutdown() + except IOError, exc: cli.popups.showMsg(str(exc), 3, curses.A_BOLD) + + break + elif confirmationKey in (ord('n'), ord('N')): + break def shutdownDaemons(): """ diff --git a/src/util/torTools.py b/src/util/torTools.py index 7e9fa37..0fb71a8 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1465,6 +1465,30 @@ class Controller(TorCtl.PostEventListener): if raisedException: raise raisedException + def shutdown(self, force = False): + """ + Sends a shutdown signal to the attached tor instance. For relays the + actual shutdown is delayed for thirty seconds unless the force flag is + given. This raises an IOError if a signal is sent but fails. + + Arguments: + force - triggers an immediate shutdown for relays if True + """ + + self.connLock.acquire() + + raisedException = None + if self.isAlive(): + try: + signal = "HALT" if force else "SHUTDOWN" + self.conn.send_signal(signal) + except Exception, exc: + raisedException = IOError(str(exc)) + + self.connLock.release() + + if raisedException: raise raisedException + def msg_event(self, event): """ Listens for reload signal (hup), which is either produced by:

1 0

[arm/release] Derive entry classes from CLI and support conversion.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 27ff1d8672e09c38571dd79bce4fc911d61ee6d2 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 9 18:35:08 2011 +0500 Derive entry classes from CLI and support conversion. Connection panel entry classes are derived from the CLI counterparts. The CLI instances are "converted" to GUI via class introspection while traversing the entry lines in connection panel. This will facilitate overloading getListingEntry() for returning rows for GTK+ treestore instead of lines for curses rendering. Cache keys now use __class__ attribute since that refers to the GUI entry classes. --- src/gui/connections/__init__.py | 2 +- src/gui/connections/circEntry.py | 21 +++++++++++++++++++++ src/gui/connections/connEntry.py | 17 +++++++++++++++++ src/gui/connections/connPanel.py | 38 +++++++++++++++++++++++++++++--------- 4 files changed, 68 insertions(+), 10 deletions(-) diff --git a/src/gui/connections/__init__.py b/src/gui/connections/__init__.py index 3102ead..e573074 100644 --- a/src/gui/connections/__init__.py +++ b/src/gui/connections/__init__.py @@ -2,5 +2,5 @@ Connections. """ -__all__ = ["connPanel"] +__all__ = ["connPanel", "circEntry", "connEntry"] diff --git a/src/gui/connections/circEntry.py b/src/gui/connections/circEntry.py new file mode 100644 index 0000000..63436cf --- /dev/null +++ b/src/gui/connections/circEntry.py @@ -0,0 +1,21 @@ +""" +Connection panel entries for client circuits. +""" + +from cli.connections import circEntry + +class CircEntry(circEntry.CircEntry): + @classmethod + def convertToGui(self, instance): + instance.__class__ = self + +class CircHeaderLine(circEntry.CircHeaderLine): + @classmethod + def convertToGui(self, instance): + instance.__class__ = self + +class CircLine(circEntry.CircLine): + @classmethod + def convertToGui(self, instance): + instance.__class__ = self + diff --git a/src/gui/connections/connEntry.py b/src/gui/connections/connEntry.py new file mode 100644 index 0000000..4db0a10 --- /dev/null +++ b/src/gui/connections/connEntry.py @@ -0,0 +1,17 @@ +""" +Connection panel entries related to actual connections to or from the system +(ie, results seen by netstat, lsof, etc). +""" + +from cli.connections import connEntry + +class ConnectionEntry(connEntry.ConnectionEntry): + @classmethod + def convertToGui(self, instance): + instance.__class__ = self + +class ConnectionLine(connEntry.ConnectionLine): + @classmethod + def convertToGui(self, instance): + instance.__class__ = self + diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index 29f18b7..d8d987a 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -11,13 +11,32 @@ from collections import deque import gobject import gtk -from cli.connections import circEntry, connEntry +from cli.connections import (circEntry as cliCircEntry, connEntry as cliConnEntry) from cli.connections.connPanel import ConnectionPanel as CliConnectionPanel +from gui.connections import circEntry, connEntry from TorCtl import TorCtl from util import connections, sysTools, uiTools, torTools REFRESH_RATE = 3 +def convertToGui(instance): + cliToGuiMap = [ (cliCircEntry.CircEntry, circEntry.CircEntry), + (cliCircEntry.CircHeaderLine, circEntry.CircHeaderLine), + (cliCircEntry.CircLine, circEntry.CircLine), + (cliConnEntry.ConnectionEntry, connEntry.ConnectionEntry), + (cliConnEntry.ConnectionLine, connEntry.ConnectionLine)] + + for (cliClass, guiClass) in cliToGuiMap: + if isinstance(instance, cliClass): + guiClass.convertToGui(instance) + break + +def calculateCacheKey(entryLine): + local = (entryLine.local.ipAddr, entryLine.local.port) + foreign = (entryLine.foreign.ipAddr, entryLine.foreign.port) + + return (entryLine.__class__, local, foreign) + class ConnectionPanel(CliConnectionPanel): def __init__(self, builder): CliConnectionPanel.__init__(self, None) @@ -46,13 +65,12 @@ class ConnectionPanel(CliConnectionPanel): # first pass checks whether we have enough entries cached to not update the treeview index = 0 for line in self._entryLines: - local = "%s:%s" % (line.local.ipAddr, line.local.port) - foreign = "%s:%s" % (line.foreign.ipAddr, line.foreign.port) + convertToGui(line) + cacheKey = calculateCacheKey(line) - cachekey = (local, foreign, isinstance(line, circEntry.CircHeaderLine)) - if self.cache.has_key(cachekey): + if self.cache.has_key(cacheKey): timeLabel = "%d s" % (time.time() - line.startTime) - treestore.set_value(self.cache[cachekey], 2, timeLabel) + treestore.set_value(self.cache[cacheKey], 2, timeLabel) else: break @@ -61,11 +79,13 @@ class ConnectionPanel(CliConnectionPanel): if index == len(self._entryLines): return True + # one of the entries was not found in cache, clear and repopulate the treestore treestore.clear() - headeriter = None for line in self._entryLines: + convertToGui(line) + if isinstance(line, connEntry.ConnectionLine) and line.isUnresolvedApp(): self._resolveApps() @@ -82,8 +102,8 @@ class ConnectionPanel(CliConnectionPanel): else: currentiter = treestore.append(None, row) - cachekey = (local, foreign, isinstance(line, circEntry.CircHeaderLine)) - self.cache[cachekey] = currentiter + cacheKey = calculateCacheKey(line) + self.cache[cacheKey] = currentiter self.valsLock.release()

1 0

[arm/release] Moving managed tor functions into helper
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 057637013e32ebf8db9e4b762077add45b4c92d7 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 9 16:53:08 2011 -0700 Moving managed tor functions into helper Putting the util functions for managing a wizard generated tor instance into a helper instance accessable from the controller. I'm also fixing a couple important bugs along the way: - Race condition between arm and tor starting its control port, so half the time a managed tor instance reported that it couldn't connect to the control port. Now waiting for up to five seconds instead. - If we're already connected to a managed instance then the wizard should modify that instance rather than starting an new one. --- src/cli/controller.py | 73 +++++++++++++++++++++++++++++++++++++++++++++++-- src/cli/wizard.py | 17 ++++++----- 2 files changed, 79 insertions(+), 11 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index ae1a59b..5ba7f42 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -21,6 +21,8 @@ import cli.graphing.connStats import cli.graphing.resourceStats import cli.connections.connPanel +from TorCtl import TorCtl + from util import connections, conf, enum, log, panel, sysTools, torConfig, torTools ARM_CONTROLLER = None @@ -38,6 +40,7 @@ CONFIG = {"startup.events": "N3", "features.confirmQuit": True, "features.graph.type": 1, "features.graph.bw.prepopulate": True, + "wizard.default": {}, "log.startTime": log.INFO, "log.torEventTypeUnrecognized": log.NOTICE, "log.configEntryUndefined": log.NOTICE, @@ -167,6 +170,7 @@ class Controller: self._isPaused = False self._forceRedraw = False self._isDone = False + self._torManager = TorManager(self) self.setMsg() # initializes our control message def getScreen(self): @@ -380,6 +384,13 @@ class Controller: if not os.path.exists(dataDir): os.makedirs(dataDir) return os.path.expanduser(dataDir) + def getTorManager(self): + """ + Provides management utils for an arm managed tor instance. + """ + + return self._torManager + def isDone(self): """ True if arm should be terminated, false otherwise. @@ -398,10 +409,8 @@ class Controller: if CONFIG["features.offerTorShutdownOnQuit"]: conn = torTools.getConn() - torrcLoc = conn.getInfo("config-file") - wizardTorrcLoc = self.getDataDirectory() + "torrc" - if torrcLoc == wizardTorrcLoc: + if self.getTorManager().isManaged(conn): while True: msg = "Shut down the Tor instance arm started (y/n)?" confirmationKey = cli.popups.showMsg(msg, attr = curses.A_BOLD) @@ -416,6 +425,64 @@ class Controller: elif confirmationKey in (ord('n'), ord('N')): break +class TorManager: + """ + Bundle of utils for starting and manipulating an arm generated tor instance. + """ + + def __init__(self, controller): + self._controller = controller + + def getTorrcPath(self): + """ + Provides the path to a wizard generated torrc. + """ + + return self._controller.getDataDirectory() + "torrc" + + def isTorrcAvailable(self): + """ + True if a wizard generated torrc exists, false otherwise. + """ + + return os.path.exists(self.getTorrcPath()) + + def isManaged(self, conn): + """ + Returns true if the given tor instance is managed by us, false otherwise. + + Arguments: + conn - controller instance to be checked + """ + + return conn.getInfo("config-file") == self.getTorrcPath() + + def startManagedInstance(self): + """ + Starts a managed instance of tor, raising an IOError if unsuccessful. + """ + + os.system("tor --quiet -f %s&" % self.getTorrcPath()) + startTime = time.time() + + # attempts to connect for five seconds (tor might or might not be + # immediately available) + torctlConn, authType, authValue, raisedExc = None, None, None, None + while not torctlConn and time.time() - startTime < 5: + try: + torctlConn, authType, authValue = TorCtl.preauth_connect(controlPort = int(CONFIG["wizard.default"]["Control"])) + except IOError, exc: + raisedExc == exc + time.sleep(0.5) + + if not torctlConn: raise raisedExc + + if authType == TorCtl.AUTH_TYPE.COOKIE: + torctlConn.authenticate(authValue) + torTools.getConn().init(torctlConn) + else: + raise IOError("unexpected authentication type '%s'" % authType) + def shutdownDaemons(): """ Stops and joins on worker threads. diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 7e0907e..8a5a138 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -254,6 +254,7 @@ def showWizard(): # remembers the last selection made on the type prompt page relaySelection = RelayType.RELAY controller = cli.controller.getController() + manager = controller.getTorManager() while True: if relayType == None: @@ -268,7 +269,7 @@ def showWizard(): elif selection == NEXT: generatedTorrc = getTorrc(relayType, config) - torrcLocation = controller.getDataDirectory() + "torrc" + torrcLocation = manager.getTorrcPath() controller.requestRedraw(True) confirmationSelection = showConfirmationDialog(generatedTorrc, torrcLocation) @@ -285,14 +286,14 @@ def showWizard(): torrcFile.close() try: - os.system("tor --quiet -f %s&" % torrcLocation) - torctlConn, authType, authValue = TorCtl.preauth_connect(controlPort = int(CONFIG["wizard.default"][Options.CONTROL])) + conn = torTools.getConn() - if authType == TorCtl.AUTH_TYPE.COOKIE: - torctlConn.authenticate(authValue) - torTools.getConn().init(torctlConn) - else: - raise IOError("unexpected authentication type '%s'" % authType) + # If we're connected to a managed instance then just need to + # issue a sighup to pick up the new settings. Otherwise starts + # a new tor instance. + + if manager.isManaged(conn): conn.reset() + else: manager.startManagedInstance() except IOError, exc: log.log(log.WARN, "Unable to start tor: %s" % exc)

1 0