- tor-commits - lists.torproject.org

[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

[arm/release] Release lock before returning in case all entries are cached.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 667039af25376132c131d999ab984dd72fa86094 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 9 18:57:49 2011 +0500 Release lock before returning in case all entries are cached. --- src/gui/connections/connPanel.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index 2c2248a..3c570c3 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -77,6 +77,7 @@ class ConnectionPanel(CliConnectionPanel): index = index + 1 if index == len(self._entryLines): + self.valsLock.release() return True # one of the entries was not found in cache, clear and repopulate the treestore

1 0

[arm/release] Use explicit counting to remove dependency on scoping rules.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit f213ff7a9ecefe197faa91b980aa8a67819bdf4b Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 9 16:55:24 2011 +0500 Use explicit counting to remove dependency on scoping rules. --- src/gui/connections/connPanel.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index ad57878..9df5142 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -44,9 +44,11 @@ class ConnectionPanel(CliConnectionPanel): 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): + 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) + cachekey = (local, foreign) if self.cache.has_key(cachekey): timeLabel = "%d s" % (time.time() - line.startTime) @@ -54,7 +56,9 @@ class ConnectionPanel(CliConnectionPanel): else: break - if index == len(self._entryLines) - 1: + index = index + 1 + + if index == len(self._entryLines): return treestore.clear()

1 0

[arm/release] Excluding tor config options if they match default
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 0c0a54387a2c6f562b65d15820a8753f244c9b7a Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 9 18:14:46 2011 -0700 Excluding tor config options if they match default When the wizard is generating a torrc it's now excluding options if they match the defaults. This'll take some more work to get right. --- src/cli/wizard.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index e2419e8..cf544a5 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -75,6 +75,10 @@ MSG_COLOR = "green" OPTION_COLOR = "yellow" DISABLED_COLOR = "cyan" +# tor's defaults for config options, used to filter unneeded options +TOR_DEFAULTS = {Options.BANDWIDTH: "5 MB", + Options.REUSE: "10 minutes"} + CONFIG = {"wizard.message.role": "", "wizard.message.relay": "", "wizard.message.exit": "", @@ -551,6 +555,11 @@ def getTorrc(relayType, config): templateOptions["BRIDGES"] = "\n".join(bridgeLines) + # removes options if they match the tor defaults + for opt in TOR_DEFAULTS: + if templateOptions[opt.upper()] == TOR_DEFAULTS[opt]: + del templateOptions[opt.upper()] + return torConfig.renderTorrc(template, templateOptions) def showConfirmationDialog(torrcContents, torrcLocation):

1 0

[arm/release] Adding menu option to start managed instance
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 30ab0618ff30c754b9a07dc25b80da4fa269e578 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 9 17:04:22 2011 -0700 Adding menu option to start managed instance If we've already made a custom torrc then providing a menu option to use it. --- src/cli/menu/actions.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/cli/menu/actions.py b/src/cli/menu/actions.py index db9d178..7f63b1b 100644 --- a/src/cli/menu/actions.py +++ b/src/cli/menu/actions.py @@ -50,6 +50,7 @@ def makeActionsMenu(): """ control = cli.controller.getController() + manager = control.getTorManager() conn = torTools.getConn() headerPanel = control.getPanel("header") actionsMenu = cli.menu.item.Submenu("Actions") @@ -58,6 +59,8 @@ def makeActionsMenu(): if conn.isAlive(): actionsMenu.add(cli.menu.item.MenuItem("Stop Tor", conn.shutdown)) + elif manager.isTorrcAvailable(): + actionsMenu.add(cli.menu.item.MenuItem("Start Tor", manager.startManagedInstance)) actionsMenu.add(cli.menu.item.MenuItem("Reset Tor", conn.reload)) actionsMenu.add(cli.menu.item.MenuItem("Setup Wizard", cli.wizard.showWizard))

1 0

[arm/release] fix: closing control connection on shutdown call
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 22e2e98adcd07c27510c7c21ac602f6f26b0d62a Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 9 17:23:38 2011 -0700 fix: closing control connection on shutdown call Making the shutdown function close the control connection right away if the signal should be shutting down tor right away. Without this it was taking around five seconds for the connection closure to be reflected in the interface. --- src/util/torTools.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 0fb71a8..4a18a4f 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1480,8 +1480,12 @@ class Controller(TorCtl.PostEventListener): raisedException = None if self.isAlive(): try: + isRelay = self.getOption("ORPort") != None signal = "HALT" if force else "SHUTDOWN" self.conn.send_signal(signal) + + # shuts down control connection if we aren't making a delayed shutdown + if force or not isRelay: self.close() except Exception, exc: raisedException = IOError(str(exc))

1 0

[arm/release] Wizard option to use the last configuration
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 8e74e50a7adaec6d1f786248f2600658328292da Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 9 18:03:14 2011 -0700 Wizard option to use the last configuration --- src/cli/wizard.py | 23 ++++++++++++++++++----- src/settings.cfg | 2 ++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 8a5a138..e2419e8 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -20,7 +20,7 @@ from util import connections, enum, log, torConfig, torTools, uiTools TORRC_TEMPLATE = "resources/torrcTemplate.txt" # basic configuration types we can run as -RelayType = enum.Enum("RELAY", "EXIT", "BRIDGE", "CLIENT") +RelayType = enum.Enum("RESUME", "RELAY", "EXIT", "BRIDGE", "CLIENT") # all options that can be configured 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") @@ -252,15 +252,20 @@ def showWizard(): _toggleEnabledAction(bridgeEntries, useBridgeOpt, useBridgeOpt.getValue()) # remembers the last selection made on the type prompt page - relaySelection = RelayType.RELAY controller = cli.controller.getController() manager = controller.getTorManager() + relaySelection = RelayType.RESUME if manager.isTorrcAvailable() else RelayType.RELAY while True: if relayType == None: selection = promptRelayType(relaySelection) if selection == CANCEL: break + elif selection == RelayType.RESUME: + if not manager.isManaged(torTools.getConn()): + manager.startManagedInstance() + + break else: relayType, relaySelection = selection, selection else: selection = promptConfigOptions(relayType, config) @@ -310,12 +315,20 @@ def promptRelayType(initialSelection): dialog was canceled. """ - popup, _, _ = cli.popups.init(25, 58) - if not popup: return - control = cli.controller.getController() options = [ConfigOption(opt, "role", opt) for opt in RelayType.values()] options.append(ConfigOption(CANCEL, "general", CANCEL)) selection = RelayType.indexOf(initialSelection) + height = 28 + + # drops the resume option if it isn't applicable + control = cli.controller.getController() + if not control.getTorManager().isTorrcAvailable(): + options.pop(0) + height -= 3 + selection -= 1 + + popup, _, _ = cli.popups.init(height, 58) + if not popup: return try: popup.win.box() diff --git a/src/settings.cfg b/src/settings.cfg index f15aa49..4551b43 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -397,6 +397,7 @@ wizard.blankValue Bridge3 => <ip address>:<port> wizard.label.general Cancel => Cancel wizard.label.general Back => Previous wizard.label.general Next => Next +wizard.label.role Resume => Use Last Configuration wizard.label.role Relay => Internal Relay wizard.label.role Exit => Exit Relay wizard.label.role Bridge => Bridge @@ -425,6 +426,7 @@ wizard.label.opt Bridge3 => Third Bridge wizard.label.opt Reuse => Circuit Duration wizard.description.general Cancel => Close without starting Tor. +wizard.description.role Resume => Start Tor with the last configuration you made. wizard.description.role Relay => Provides interconnections with other Tor relays. This is a safe and easy of making the network better. wizard.description.role Exit => Connects between Tor network and the outside Internet. This is a vital role, but can lead to abuse complaints. wizard.description.role Bridge => Non-public relay specifically for helping censored users.

1 0

[arm/release] Initial commit for GUI connection listing.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 05a369b15000e76fbc4cc03bc102786ac0247225 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue Jul 5 15:25:27 2011 +0500 Initial commit for GUI connection listing. Currently derives from the CLI conn panel and lists rudimentary (unstructured) information about circuits for debugging. --- src/gui/arm.xml | 25 +---------------- src/gui/connections/__init__.py | 6 ++++ src/gui/connections/connPanel.py | 56 ++++++++++++++++++++++++++++++++++++++ src/gui/controller.py | 5 +++ 4 files changed, 68 insertions(+), 24 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index 1e3681c..dca5f33 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -72,29 +72,6 @@  <column type="gchararray"/> </columns> - <data> - <row> - <col id="0" translatable="yes">115.167.31.237:56835</col> - <col id="1" translatable="yes">188.120.245.249:9001 (ru)</col> - <col id="2" translatable="yes">10.7m</col> - <col id="3" translatable="yes">CLIENT</col> - <col id="4" translatable="yes">blue</col> - </row> - <row> - <col id="0" translatable="yes">115.167.31.237:44940</col> - <col id="1" translatable="yes">206.217.215.183:53 (us)</col> - <col id="2" translatable="yes">28.3m</col> - <col id="3" translatable="yes">CLIENT</col> - <col id="4" translatable="yes">blue</col> - </row> - <row> - <col id="0" translatable="yes">127.0.0.1:9051</col> - <col id="1" translatable="yes">127.0.0.1:51665</col> - <col id="2" translatable="yes">30.0m</col> - <col id="3" translatable="yes">CONTROL</col> - <col id="4" translatable="yes">red</col> - </row> - </data> </object> <object class="GtkListStore" id="liststore_config"> <columns> @@ -437,7 +414,7 @@ <child> <object class="GtkLabel" id="label_conn_top"> <property name="visible">True</property> - <property name="label" translatable="yes">2 Clients, 1 Control</property> + <property name="label" translatable="yes">Connections:</property> </object> <packing> <property name="expand">False</property> diff --git a/src/gui/connections/__init__.py b/src/gui/connections/__init__.py new file mode 100644 index 0000000..3102ead --- /dev/null +++ b/src/gui/connections/__init__.py @@ -0,0 +1,6 @@ +""" +Connections. +""" + +__all__ = ["connPanel"] + diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py new file mode 100644 index 0000000..cbabc41 --- /dev/null +++ b/src/gui/connections/connPanel.py @@ -0,0 +1,56 @@ +""" +Connections panel. +""" + +import random +import sys +import time + +from collections import deque + +import gobject +import gtk + +from cli.connections import connEntry +from cli.connections.connPanel import ConnectionPanel as CliConnectionPanel +from TorCtl import TorCtl +from util import connections, uiTools, torTools + +REFRESH_RATE = 3 + +class ConnectionPanel(CliConnectionPanel): + def __init__(self, builder): + CliConnectionPanel.__init__(self, None) + + self.builder = builder + + self.resolver = connections.getResolver('tor') + + gobject.timeout_add(3000, self._fill_entries) + + def pack_widgets(self): + pass + + def _fill_entries(self): + self.valsLock.acquire() + + label = self.builder.get_object('label_conn_top') + label.set_text(self._title) + + liststore = self.builder.get_object('liststore_conn') + liststore.clear() + + for line in self._entryLines: + 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') + liststore.append(row) + + self.valsLock.release() + + return True + diff --git a/src/gui/controller.py b/src/gui/controller.py index 5f1712c..a69fdef 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -5,6 +5,7 @@ import thread import time from util import log, torTools +from connections import connPanel from gui import logPanel from gui.graphing import bandwidthStats @@ -24,6 +25,10 @@ class GuiController: self.bwStats = bandwidthStats.BandwidthStats(self.builder) self.bwStats.pack_widgets() + self.connPanel = connPanel.ConnectionPanel(self.builder) + self.connPanel.pack_widgets() + self.connPanel.start() + def run(self): window = self.builder.get_object('window_main')

1 0