- tor-commits - lists.torproject.org

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

10 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/master] Moving managed tor functions into helper
by atagar＠torproject.org 10 Jul '11

10 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/master] Adding menu option to shut down tor
by atagar＠torproject.org 10 Jul '11

10 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/master] Wizard option to use the last configuration
by atagar＠torproject.org 10 Jul '11

10 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/master] fix: closing control connection on shutdown call
by atagar＠torproject.org 10 Jul '11

10 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/master] Adding menu option to start managed instance
by atagar＠torproject.org 10 Jul '11

10 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

[flashproxy/master] Don't allocate a TextField unless in debug mode.
by dcf＠torproject.org 09 Jul '11

09 Jul '11

commit 91bb22746d1364843921c87ea9fa6910ccbd080a Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jul 9 14:32:06 2011 -0700 Don't allocate a TextField unless in debug mode. --- swfcat.as | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diff --git a/swfcat.as b/swfcat.as index 38ed1ab..dbf2fb4 100644 --- a/swfcat.as +++ b/swfcat.as @@ -57,8 +57,10 @@ package public function puts(s:String):void { - output_text.appendText(s + "\n"); - output_text.scrollV = output_text.maxScrollV; + if (output_text) { + output_text.appendText(s + "\n"); + output_text.scrollV = output_text.maxScrollV; + } } public function swfcat() @@ -67,13 +69,6 @@ package stage.scaleMode = StageScaleMode.NO_SCALE; stage.align = StageAlign.TOP_LEFT; - output_text = new TextField(); - output_text.width = stage.stageWidth; - output_text.height = stage.stageHeight; - output_text.background = true; - output_text.backgroundColor = 0x001f0f; - output_text.textColor = 0x44cc44; - badge = new Badge(); if (RATE_LIMIT) @@ -81,7 +76,6 @@ package else rate_limit = new RateUnlimit(); - puts("Starting."); // Wait until the query string parameters are loaded. this.loaderInfo.addEventListener(Event.COMPLETE, loaderinfo_complete); } @@ -90,12 +84,19 @@ package { var fac_spec:String; - puts("Parameters loaded."); - - if (this.loaderInfo.parameters["debug"] || this.loaderInfo.parameters["client"]) + if (this.loaderInfo.parameters["debug"] || this.loaderInfo.parameters["client"]) { + output_text = new TextField(); + output_text.width = stage.stageWidth; + output_text.height = stage.stageHeight; + output_text.background = true; + output_text.backgroundColor = 0x001f0f; + output_text.textColor = 0x44cc44; addChild(output_text); - else + } else { addChild(badge); + } + + puts("Parameters loaded."); fac_addr = get_param_addr("facilitator", DEFAULT_FACILITATOR_ADDR); if (!fac_addr) {

1 0

r24888: {website} update the Makefile to 0.2.2.30-rc. (website/trunk)
by Andrew Lewman 09 Jul '11

09 Jul '11

Author: phobos Date: 2011-07-09 11:40:31 +0000 (Sat, 09 Jul 2011) New Revision: 24888 Modified: website/trunk/Makefile Log: update the Makefile to 0.2.2.30-rc. Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2011-07-09 10:57:46 UTC (rev 24887) +++ website/trunk/Makefile 2011-07-09 11:40:31 UTC (rev 24888) @@ -11,8 +11,8 @@ # 5. ./publish export TORGIT=/home/runa/tordev/tor/.git -export STABLETAG=tor-0.2.2.29-beta -export DEVTAG=tor-0.2.2.29-beta +export STABLETAG=tor-0.2.2.30-rc +export DEVTAG=tor-0.2.2.30-rc WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton

1 0

r24887: {website} Fix typo (website/trunk/docs/en)
by Robert Ransom 09 Jul '11

09 Jul '11

Author: rransom Date: 2011-07-09 10:57:46 +0000 (Sat, 09 Jul 2011) New Revision: 24887 Modified: website/trunk/docs/en/faq.wml Log: Fix typo Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2011-07-09 03:56:31 UTC (rev 24886) +++ website/trunk/docs/en/faq.wml 2011-07-09 10:57:46 UTC (rev 24887) @@ -31,7 +31,7 @@ funding?</a></li> <li><a href="#Metrics">How many people use Tor? How many relays or exit nodes are there?</a></li> - <li><a href="#SSLcertfingerprint">What are your SSL cerificate + <li><a href="#SSLcertfingerprint">What are your SSL certificate fingerprints?</a></li> </ul>

1 0

[flashproxy/master] Add HTML snippet to embed SWF.
by dcf＠torproject.org 09 Jul '11

09 Jul '11

commit e32a864df5584e359bc63cec957461205f9f205a Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jul 8 23:46:29 2011 -0700 Add HTML snippet to embed SWF. --- README | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/README b/README index ef2cc65..cd6b7dd 100644 --- a/README +++ b/README @@ -148,6 +148,14 @@ an HTTP respose. \r\n client=<ip-addr/rtmfp-id>&relay=<relay-ip> +== Embedding in HTML + +<object width="70" height="23"> + <param name="movie" value="swfcat.swf"> + <param name="flashvars" value=""> + <embed src="swfcat.swf" width="70" height="23" flashvars=""></embed> +</object> + == ActionScript programming A good tutorial on ActionScript programming with the Flex tools, with

1 0