- tor-commits - lists.torproject.org

[torbrowser/maint-2.2] Add missing header to intermediate cert store patch
by erinn＠torproject.org 12 Jul '11

12 Jul '11

commit 7e288fdc4bdac4e4533f2cdc09bd0a7ec47ffdac Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Jul 10 00:06:12 2011 +0200 Add missing header to intermediate cert store patch The patch omitted the changes necessary in nsNSSComponent.h and only contained the changes for nsNSSComponent.cpp. This would mean that the patch could be applied, but the build failed. Add the missing part of the patch. --- ...-Make-Intermediate-Cert-Store-memory-only.patch | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/src/current-patches/0002-Firefox5-Make-Intermediate-Cert-Store-memory-only.patch b/src/current-patches/0002-Firefox5-Make-Intermediate-Cert-Store-memory-only.patch index 17ad3a2..2bd11e8 100644 --- a/src/current-patches/0002-Firefox5-Make-Intermediate-Cert-Store-memory-only.patch +++ b/src/current-patches/0002-Firefox5-Make-Intermediate-Cert-Store-memory-only.patch @@ -278,6 +278,23 @@ index d3ae772..fa37ace 100644 } void +--- a/security/manager/ssl/src/nsNSSComponent.h ++++ b/security/manager/ssl/src/nsNSSComponent.h +@@ -321,10 +321,10 @@ + + // Methods that we use to handle the profile change notifications (and to + // synthesize a full profile change when we're just doing a profile startup): +- void DoProfileApproveChange(nsISupports* aSubject); ++ PRBool DoProfileApproveChange(nsISupports* aSubject); + void DoProfileChangeNetTeardown(); +- void DoProfileChangeTeardown(nsISupports* aSubject); +- void DoProfileBeforeChange(nsISupports* aSubject); ++ PRBool DoProfileChangeTeardown(nsISupports* aSubject); ++ PRBool DoProfileBeforeChange(nsISupports* aSubject); + void DoProfileChangeNetRestore(); + + Mutex mutex; + -- 1.7.3.4

1 0

[torbrowser/maint-2.2] update changelog and readme for osx tbb 2.2.30
by erinn＠torproject.org 12 Jul '11

12 Jul '11

commit cf28c99e8ef15655b16b2059ab2672f49778b751 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Jul 10 09:01:28 2011 -0300 update changelog and readme for osx tbb 2.2.30 --- README.OSX-2.2 | 10 +++++----- changelog.osx-2.2 | 10 ++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 949dd7e..73661e0 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.29-beta (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Tumucumaque) 4.0.1 - \_ Torbutton 1.3.3-alpha - |_ NoScript 2.1.1.1 - |_ HTTPS-Everywhere 0.9.9.development.6 +Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) +Firefox (Aurora) 5.0 + \_ Torbutton 1.4.0 + |_ NoScript 2.1.1.2 + |_ HTTPS-Everywhere 1.0.0development.4 |_ BetterPrivacy 1.51 Usage diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index b4ab673..b5452de 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.2.30-1) alpha; suite=osx + + * Update Tor to 0.2.2.30-rc + * Update Firefox to 5.0 + * Update Torbutton to 1.4.0 + * Update HTTPS Everywhere to 1.0.0development.4 + * Update NoScript to 2.1.1.2 + + -- Erinn Clark <erinn(a)torproject.org> Sun Jul 10 08:59:52 ART 2011 + Tor Browser Bundle (2.2.29-1) alpha; suite=osx * Update Tor to 0.2.2.29-beta

1 0

[torbrowser/maint-2.2] add torbutton target back to makefile now that I no longer need to change the privoxy setting
by erinn＠torproject.org 12 Jul '11

12 Jul '11

commit 350e140f1b3dbef7f2f6004961cb816013cc1089 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Jul 10 09:02:31 2011 -0300 add torbutton target back to makefile now that I no longer need to change the privoxy setting --- build-scripts/osx.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 5f00421..e8303f1 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -315,8 +315,8 @@ strip-it-stripper: ## ## Torbutton development version -#torbutton.xpi: -# $(WGET) --no-check-certificate -O $@ $(TORBUTTON) +torbutton.xpi: + $(WGET) --no-check-certificate -O $@ $(TORBUTTON) ## BetterPrivacy betterprivacy.xpi:

1 0

[torbrowser/maint-2.2] re-enable addon update checking. closes #3554.
by erinn＠torproject.org 12 Jul '11

12 Jul '11

commit 726d52ef79a8c2d49ebca70d66c7731d5a0568dc Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Jul 10 09:35:19 2011 -0300 re-enable addon update checking. closes #3554. --- build-scripts/config/no-polipo-4.0.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/config/no-polipo-4.0.js b/build-scripts/config/no-polipo-4.0.js index 06a8f4d..2437752 100644 --- a/build-scripts/config/no-polipo-4.0.js +++ b/build-scripts/config/no-polipo-4.0.js @@ -61,7 +61,7 @@ user_pref("extensions.bprivacy.donotaskforfolder", true); user_pref("extensions.bprivacy.donotaskonexit", true); user_pref("extensions.bprivacy.initiated", true); user_pref("extensions.checkCompatibility.4.*", false); -user_pref("extensions.checkUpdateSecurity", false); +user_pref("extensions.checkUpdateSecurity", true); user_pref("extensions.databaseSchema", 3); user_pref("extensions.enabledAddons", "https-everywhere@eff.org:0.9.9.development.4,{73a6fe31-595d-460b-a920-fcc0f8843232}:2.1.0.3,{d40f5e7b-d2cf-4856-b441-cc613eeffbe3}:1.50,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.3.3-alpha"); user_pref("extensions.enabledItems", "langpack-en-US@firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8"); @@ -80,7 +80,7 @@ user_pref("extensions.torbutton.socks_port", 9050); user_pref("extensions.torbutton.tor_enabled", true); user_pref("extensions.torbutton.tor_memory_jar", true); user_pref("extensions.torbutton.tz_string", "UTC+00:00"); -user_pref("extensions.update.enabled", false); +user_pref("extensions.update.enabled", true); user_pref("extensions.update.notifyUser", false); user_pref("general.appname.override", "Netscape"); user_pref("general.appversion.override", "5.0 (Windows; en-US)");

1 0

[torbrowser/maint-2.2] remove unnecessary file extension from https-everywhere version string
by erinn＠torproject.org 12 Jul '11

12 Jul '11

commit a89d9b1919f621918a874762fc9d57da50e768d5 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Jul 10 09:04:06 2011 -0300 remove unnecessary file extension from https-everywhere version string --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index e7d092a..4dc8589 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -2,7 +2,7 @@ RELEASE_VER=2.2.30 -HTTPSEVERY_VER=1.0.0development.4.xpi +HTTPSEVERY_VER=1.0.0development.4 FIREFOX_VER=5.0 LIBEVENT_VER=2.0.12-stable LIBPNG_VER=1.4.3

1 0

[torbrowser/maint-2.2] update changelog and readme for tbb linux 2.2.30-1
by erinn＠torproject.org 12 Jul '11

12 Jul '11

commit bfcebf3f6e1bdfe3950bab680bec72396ad16960 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jul 12 19:29:44 2011 -0300 update changelog and readme for tbb linux 2.2.30-1 --- README.LINUX-2.2 | 10 +++++----- changelog.linux-2.2 | 10 ++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 8455d06..ffb5a3a 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.29-beta (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Tumucumaque) 4.0.1 - \_ Torbutton 1.3.3-alpha - |_ NoScript 2.1.1.1 - |_ HTTPS-Everywhere 0.9.9.development.6 +Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) +Firefox (Aurora) 5.0 + \_ Torbutton 1.4.0 + |_ NoScript 2.1.1.2 + |_ HTTPS-Everywhere 1.0.0development.4 |_ BetterPrivacy 1.51 Usage diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index e87f008..ab000f5 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.2.30-1) alpha; suite=linux + + * Update Tor to 0.2.2.30-rc + * Update Firefox to 5.0 + * Update Torbutton to 1.4.0 + * Update HTTPS Everywhere to 1.0.0development.4 + * Update NoScript to 2.1.1.2 + + -- Erinn Clark <erinn(a)torproject.org> Tue Jul 12 19:26:17 ART 2011 + Tor Browser Bundle (2.2.29-1) alpha; suite=linux * Update Tor to 0.2.2.29-beta

1 0

[torbrowser/maint-2.2] update changelog and readme for tbb windows 2.2.30-1
by erinn＠torproject.org 12 Jul '11

12 Jul '11

commit 941430c279674d8c8a02d93b618a1ab95d3003a5 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Jul 12 19:30:32 2011 -0300 update changelog and readme for tbb windows 2.2.30-1 --- README.WIN-2.2 | 13 ++++++------- changelog.win-2.2 | 10 ++++++++++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/README.WIN-2.2 b/README.WIN-2.2 index cf382c8..0c16957 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,13 +5,12 @@ Included applications --------------------- Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.29-beta (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) -Polipo 1.0.4.1 -FirefoxPortable 4.0.1 - \_ Firefox 4.0.1 - \_ Torbutton 1.3.3-alpha - |_ NoScript 2.1.1.1 - |_ HTTPS-Everywhere 0.9.9.development.6 +Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-1.0.0d) +FirefoxPortable 5.0 + \_ Firefox (Aurora) 5.0 + \_ Torbutton 1.4.0 + |_ NoScript 2.1.1.2 + |_ HTTPS-Everywhere 1.0.0development.4 |_ BetterPrivacy 1.51 Usage diff --git a/changelog.win-2.2 b/changelog.win-2.2 index 19c2e12..ba6ce71 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.2.30-1) alpha; suite=windows + + * Update Tor to 0.2.2.30-rc + * Update Firefox to 5.0 + * Update Torbutton to 1.4.0 + * Update HTTPS Everywhere to 1.0.0development.4 + * Update NoScript to 2.1.1.2 + + -- Erinn Clark <erinn(a)torproject.org> Tue Jul 12 19:26:17 ART 2011 + Tor Browser Bundle (2.2.29-1) alpha; suite=windows * Update Tor to 0.2.2.29-beta

1 0

[arm/master] Adding wizard option to shutdown tor with arm
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit c29f5fdf9b2da2c097b8b2be8148f6b3dc45d26f Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 10 18:56:04 2011 -0700 Adding wizard option to shutdown tor with arm This option adds a comment flag to the torrc that tells arm to shut down tor when it quits. This will also take advantage of Robert's 'ownership' feature when it's available. --- src/cli/controller.py | 23 +++++++++++++++++++++++ src/cli/wizard.py | 15 +++++++++++---- src/resources/torrcTemplate.txt | 7 +++++++ src/settings.cfg | 8 ++++++++ 4 files changed, 49 insertions(+), 4 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index e30af3f..c6534b3 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -407,6 +407,22 @@ class Controller: self._isDone = True + # check if the torrc has a "ARM_SHUTDOWN" comment flag, if so then shut + # down the instance + + isShutdownFlagPresent = False + torrcContents = torConfig.getTorrc().getContents() + + if torrcContents: + for line in torrcContents: + if "# ARM_SHUTDOWN" in line: + isShutdownFlagPresent = True + break + + if isShutdownFlagPresent: + try: torTools.getConn().shutdown() + except IOError, exc: cli.popups.showMsg(str(exc), 3, curses.A_BOLD) + if CONFIG["features.offerTorShutdownOnQuit"]: conn = torTools.getConn() @@ -551,6 +567,13 @@ def connResetListener(conn, eventType): resolver.setPaused(eventType == torTools.State.CLOSED) if eventType in (torTools.State.INIT, torTools.State.RESET): + # Reload the torrc contents. If the torrc panel is present then it will + # do this instead since it wants to do validation and redraw _after_ the + # new contents are loaded. + + if getController().getPanel("torrc") == None: + torConfig.getTorrc().load(True) + torPid = conn.getMyPid() if torPid and torPid != resolver.getPid(): diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 9b8c1d7..e5d6257 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -23,7 +23,7 @@ TORRC_TEMPLATE = "resources/torrcTemplate.txt" 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") +Options = enum.Enum("DIVIDER", "CONTROL", "NICKNAME", "CONTACT", "NOTIFY", "BANDWIDTH", "LIMIT", "CLIENT", "LOWPORTS", "PORTFORWARD", "STARTUP", "RSHUTDOWN", "CSHUTDOWN", "NOTICE", "POLICY", "WEBSITES", "EMAIL", "IM", "MISC", "PLAINTEXT", "DISTRIBUTE", "BRIDGED", "BRIDGE1", "BRIDGE2", "BRIDGE3", "REUSE") RelayOptions = {RelayType.RELAY: (Options.NICKNAME, Options.CONTACT, Options.NOTIFY, @@ -32,7 +32,8 @@ RelayOptions = {RelayType.RELAY: (Options.NICKNAME, Options.CLIENT, Options.LOWPORTS, Options.PORTFORWARD, - Options.STARTUP), + Options.STARTUP, + Options.RSHUTDOWN), RelayType.EXIT: (Options.NICKNAME, Options.CONTACT, Options.NOTIFY, @@ -42,6 +43,7 @@ RelayOptions = {RelayType.RELAY: (Options.NICKNAME, Options.LOWPORTS, Options.PORTFORWARD, Options.STARTUP, + Options.RSHUTDOWN, Options.DIVIDER, Options.NOTICE, Options.POLICY, @@ -56,12 +58,14 @@ RelayOptions = {RelayType.RELAY: (Options.NICKNAME, Options.CLIENT, Options.LOWPORTS, Options.PORTFORWARD, - Options.STARTUP), + Options.STARTUP, + Options.RSHUTDOWN), RelayType.CLIENT: (Options.BRIDGED, Options.BRIDGE1, Options.BRIDGE2, Options.BRIDGE3, - Options.REUSE)} + Options.REUSE, + Options.CSHUTDOWN)} # option sets CUSTOM_POLICIES = (Options.WEBSITES, Options.EMAIL, Options.IM, Options.MISC, Options.PLAINTEXT) @@ -489,6 +493,9 @@ def getTorrc(relayType, config): Provides the torrc generated for the given options. """ + # TODO: When Robert's 'ownership' feature is available take advantage of it + # for the RSHUTDOWN and CSHUTDOWN options. + pathPrefix = os.path.dirname(sys.argv[0]) if pathPrefix and not pathPrefix.endswith("/"): pathPrefix = pathPrefix + "/" diff --git a/src/resources/torrcTemplate.txt b/src/resources/torrcTemplate.txt index 072f847..c31b209 100644 --- a/src/resources/torrcTemplate.txt +++ b/src/resources/torrcTemplate.txt @@ -6,6 +6,13 @@ # # Descriptions of all of these configuraiton attibutes (and many more) are # available in the tor man page. + +[IF RSHUTDOWN | CSHUTDOWN] + [NEWLINE] + # The following flag tells arm to shut down tor when it quits. + # ARM_SHUTDOWN +[END IF] + [NEWLINE] ControlPort 9052 # port controllers can connect to CookieAuthentication 1 # method for controller authentication diff --git a/src/settings.cfg b/src/settings.cfg index 2734c4a..c6d483d 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -352,6 +352,8 @@ wizard.toggle Client => Enabled, Disabled wizard.toggle Lowports => Yes, No wizard.toggle Portforward => Enabled, Disabled wizard.toggle Startup => Yes, No +wizard.toggle Rshutdown => Yes, No +wizard.toggle Cshutdown => Yes, No wizard.toggle Notice => Yes, No wizard.toggle Policy => Custom, Default wizard.toggle Websites => Allow, Block @@ -379,6 +381,8 @@ wizard.default Control => 9052 wizard.default Notify => true wizard.default Bandwidth => 5 MB/s wizard.default Startup => true +wizard.default Rshutdown => false +wizard.default Cshutdown => true wizard.default Client => false wizard.default Lowports => true wizard.default Portforward => true @@ -415,6 +419,8 @@ wizard.label.opt Client => Client Usage wizard.label.opt Lowports => Low Relaying Ports wizard.label.opt Portforward => Port Forwarding wizard.label.opt Startup => Run At Startup +wizard.label.opt Rshutdown => Shutdown With Arm +wizard.label.opt Cshutdown => Shutdown With Arm wizard.label.opt Notice => Disclaimer Notice wizard.label.opt Policy => Exit Policy wizard.label.opt Websites => Web Browsing @@ -444,6 +450,8 @@ wizard.description.opt Client => Enable this if you would like to use Tor yourse wizard.description.opt Lowports => Relays using port 443 rather than 9001. This helps some users that would otherwise be blocked, but requires that tor is started with root permissions (after that it lowers itself to those of a 'tor-arm' user). wizard.description.opt Portforward => If needed, attempts NAT traversal using UPnP and NAT-PMP. This allows for automatic port forwarding on most home routers. wizard.description.opt Startup => Runs Tor in the background when the system starts. +wizard.description.opt Rshutdown => When you quit arm the Tor process is stopped thirty seconds later. This delay is so people using you can gracefully switch their circuits. +wizard.description.opt Cshutdown => Stops the Tor process when you quit arm. wizard.description.opt Notice => Provides a disclaimer that this is an exit on port 80 (http://www.atagar.com/exitNotice) wizard.description.opt Policy => Ports allowed to exit from your relay. The default policy allows for common services while limiting the chance of getting a DMCA takedown for torrent traffic (http://www.atagar.com/exitPolicy) wizard.description.opt Websites => General Internet browsing including HTTP (80), HTTPS (443), common alternatives (81, 8008), and proxies (3128, 8080)

1 0

[arm/master] Obscuring contact email addresses
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit 0a0bf4a2cde102bfaef5ea7ad3575156dccf39f9 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 10 23:35:36 2011 -0700 Obscuring contact email addresses Trying to make address scraping a tiny bit harder. --- src/cli/wizard.py | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index e5d6257..0f35247 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -3,8 +3,10 @@ Provides user prompts for setting up a new relay. This autogenerates a torrc that's used by arm to run its own tor instance. """ +import re import os import sys +import random import shutil import functools import curses @@ -79,6 +81,14 @@ MSG_COLOR = "green" OPTION_COLOR = "yellow" DISABLED_COLOR = "cyan" +# bracketing pairs used in email address obscuring +BRACKETS = ((' ', ' '), + ('<', '>'), + ('[', ']'), + ('(', ')'), + ('{', '}'), + ('|', '|')) + # tor's defaults for config options, used to filter unneeded options TOR_DEFAULTS = {Options.BANDWIDTH: "5 MB", Options.REUSE: "10 minutes"} @@ -517,6 +527,9 @@ def getTorrc(relayType, config): elif key == Options.NOTICE: # notice option is only applied if using low ports value &= config[Options.LOWPORTS].getValue() + elif key == Options.CONTACT and _isEmailAddress(value): + # obscures the email address + value = _obscureEmailAddress(value) templateOptions[key.upper()] = value @@ -702,6 +715,64 @@ def _splitStr(msg, width): return results +def _isEmailAddress(address): + """ + True if the input is an email address, false otherwise. + """ + + # just checks if there's an '@' and '.' in the input w/o whitespace + emailMatcher = re.compile("\S*(a)\S*\.\S*") + return emailMatcher.match(address) + +def _obscureEmailAddress(address): + """ + Makes some effort to obscure an email address while keeping it readable. + + Arguments: + address - actual email address + """ + + address = _obscureChar(address, '@', (_randomCase("at"), )) + address = _obscureChar(address, '.', (_randomCase("dot"), )) + return address + +def _randomCase(word): + """ + Provides a word back with the case of its letters randomized. + + Arguments: + word - word for which to randomize the case + """ + + result = [] + for letter in word: + result.append(random.choice((letter.lower(), letter.upper()))) + + return "".join(result) + +def _obscureChar(inputText, target, options): + """ + Obscures the given character from the input, replacing it with something + from a set of options and bracketing the selection. + + Arguments: + inputText - text to be obscured + target - character to be replaced + options - replacement options for the character + """ + + leftSpace = random.randint(0, 3) + leftFill = random.choice((' ', '_', '-', '=', '<')) + + rightSpace = random.randint(0, 3) + rightFill = random.choice((' ', '_', '-', '=', '>')) + + bracketLeft, bracketRight = random.choice(BRACKETS) + optSelection = random.choice(options) + replacement = "".join((bracketLeft, leftFill * leftSpace, optSelection, rightFill * rightSpace, bracketRight)) + + return inputText.replace(target, replacement) + def _toggleEnabledAction(toggleOptions, option, value): """ Enables or disables custom exit policy options based on our selection.

1 0

[arm/master] Adding tor check for setup wizard
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit 5b60d326a68b28f925c4c1f7b2789f179ea9e582 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 10 23:56:18 2011 -0700 Adding tor check for setup wizard If tor isn't available in the PATH then gives a warning. --- src/cli/wizard.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 0f35247..f796e41 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -16,7 +16,7 @@ import cli.controller from TorCtl import TorCtl -from util import connections, enum, log, torConfig, torTools, uiTools +from util import connections, enum, log, sysTools, torConfig, torTools, uiTools # template used to generate the torrc TORRC_TEMPLATE = "resources/torrcTemplate.txt" @@ -227,6 +227,11 @@ def showWizard(): instance. """ + if not sysTools.isAvailable("tor"): + msg = "Unable to run the setup wizard. Is tor installed?" + log.log(log.WARN, msg) + return + relayType, config = None, {} for option in Options.values(): if option == Options.DIVIDER:

1 0