- tor-commits - lists.torproject.org

[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

[arm/master] Handling when tor needs root to start
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit c801be076450e0ee1c80d02c3523d91f63ef6bfa Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jul 11 12:44:37 2011 -0700 Handling when tor needs root to start When connecting to privileged ports the tor process needs root permissions to start. If the torrc needs root then I shouldn't offer to start tor with arm, and the wizard makes a startup shell script rather than making a doomed attempt to start tor. Currently the startup script is just a stub - I'll need to wait until I have a connection to fill in all the shell scripting voodoo. --- src/cli/controller.py | 59 +++++++++++++++++++++++++++++++++-------------- src/cli/headerPanel.py | 11 +++++++- src/cli/wizard.py | 37 +++++++++++++++++++---------- src/resources/startTor | 14 +++++++++++ src/util/torConfig.py | 36 +++++++++++++++++++++++++++++ 5 files changed, 124 insertions(+), 33 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index c6534b3..d4fcf2f 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -379,10 +379,10 @@ class Controller: with a slash and is created if it doesn't already exist. """ - dataDir = CONFIG["startup.dataDirectory"] + dataDir = os.path.expanduser(CONFIG["startup.dataDirectory"]) if not dataDir.endswith("/"): dataDir += "/" if not os.path.exists(dataDir): os.makedirs(dataDir) - return os.path.expanduser(dataDir) + return dataDir def getTorManager(self): """ @@ -458,10 +458,26 @@ class TorManager: def isTorrcAvailable(self): """ - True if a wizard generated torrc exists, false otherwise. + True if a wizard generated torrc exists and the user has permissions to + run it, false otherwise. """ - return os.path.exists(self.getTorrcPath()) + torrcLoc = self.getTorrcPath() + if os.path.exists(torrcLoc): + # If we aren't running as root and would be trying to bind to low ports + # then the startup will fail due to permissons. Attempts to check for + # this in the torrc. If unable to read the torrc then we probably + # wouldn't be able to use it anyway with our permissions. + + if os.getuid() != 0: + try: + return not torConfig.isRootNeeded(torrcLoc) + except IOError, exc: + log.log(log.INFO, "Failed to read torrc at '%s': %s" % (torrcLoc, exc)) + return False + else: return True + + return False def isManaged(self, conn): """ @@ -485,30 +501,37 @@ class TorManager: # attempts to connect for five seconds (tor might or might not be # immediately available) - torctlConn, authType, authValue = None, None, None - while not torctlConn and time.time() - startTime < 5: + raisedExc = None + + while time.time() - startTime < 5: try: - torctlConn, authType, authValue = TorCtl.preauth_connect(controlPort = int(CONFIG["wizard.default"]["Control"])) - except IOError: time.sleep(0.5) + self.connectManagedInstance() + return True + except IOError, exc: + raisedExc = exc + time.sleep(0.5) + + if raisedExc: log.log(log.WARN, str(raisedExc)) + return False + + def connectManagedInstance(self): + """ + Attempts to connect to a managed tor instance, raising an IOError if + unsuccessful. + """ + + torctlConn, authType, authValue = TorCtl.preauth_connect(controlPort = int(CONFIG["wizard.default"]["Control"])) if not torctlConn: msg = "Unable to start tor, try running \"tor -f %s\" to see the error output" % torrcLoc - log.log(log.WARN, msg) - return False + raise IOError(msg) if authType == TorCtl.AUTH_TYPE.COOKIE: try: torctlConn.authenticate(authValue) torTools.getConn().init(torctlConn) - return True except Exception, exc: - msg = "Unable to connect to Tor: %s" % exc - log.log(log.WARN, msg) - return False - else: - msg = "Unable to connect to Tor, unexpected authentication type '%s'" % authType - log.log(log.WARN, msg) - return False + raise IOError("Unable to connect to Tor: %s" % exc) def shutdownDaemons(): """ diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index 5a2c1bc..f80eff8 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -22,6 +22,7 @@ import threading import TorCtl.TorCtl import cli.popups +import cli.controller from util import log, panel, sysTools, torTools, uiTools @@ -144,8 +145,14 @@ class HeaderPanel(panel.Panel, threading.Thread): log.log(log.NOTICE, "Reconnected to Tor's control port") cli.popups.showMsg("Tor reconnected", 1) except Exception, exc: - # displays notice for failed connection attempt - if exc.args: cli.popups.showMsg("Unable to reconnect (%s)" % exc, 3) + # attempts to use the wizard port too + try: + cli.controller.getController().getTorManager().connectManagedInstance() + log.log(log.NOTICE, "Reconnected to Tor's control port") + cli.popups.showMsg("Tor reconnected", 1) + except: + # displays notice for the first failed connection attempt + if exc.args: cli.popups.showMsg("Unable to reconnect (%s)" % exc, 3) else: isKeystrokeConsumed = False return isKeystrokeConsumed diff --git a/src/cli/wizard.py b/src/cli/wizard.py index efb6d98..be0deb4 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -341,27 +341,38 @@ def showWizard(): torrcFile.write(generatedTorrc) torrcFile.close() + dataDir = cli.controller.getController().getDataDirectory() + + pathPrefix = os.path.dirname(sys.argv[0]) + if pathPrefix and not pathPrefix.endswith("/"): + pathPrefix = pathPrefix + "/" + # copies exit notice into data directory if it's being used if Options.NOTICE in RelayOptions[relayType] and config[Options.NOTICE].getValue() and config[Options.LOWPORTS].getValue(): - dataDir = cli.controller.getController().getDataDirectory() - - pathPrefix = os.path.dirname(sys.argv[0]) - if pathPrefix and not pathPrefix.endswith("/"): - pathPrefix = pathPrefix + "/" - src = "%sresources/exitNotice" % pathPrefix dst = "%sexitNotice" % dataDir if not os.path.exists(dst): shutil.copytree(src, dst) - # 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. - - conn = torTools.getConn() - if manager.isManaged(conn): conn.reload() - else: manager.startManagedInstance() + if manager.isTorrcAvailable(): + # 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. + + conn = torTools.getConn() + if manager.isManaged(conn): conn.reload() + else: manager.startManagedInstance() + else: + # If we don't have permissions to run the torrc we just made then + # makes a shell script they can run as root to start tor. + + src = "%sresources/startTor" % pathPrefix + dst = "%sstartTor" % dataDir + if not os.path.exists(dst): shutil.copy(src, dst) + + msg = "Tor needs root permissions to start with this configuration (it will drop itself to a 'tor-arm' user afterward). To continue...\n- open another terminal\n- run \"sudo %s\"\n- press 'r' here to tell arm to reconnect" % dst + log.log(log.NOTICE, msg) break elif confirmationSelection == CANCEL: break diff --git a/src/resources/startTor b/src/resources/startTor new file mode 100755 index 0000000..c575c23 --- /dev/null +++ b/src/resources/startTor @@ -0,0 +1,14 @@ +#!/bin/sh +# +# When binding to privilaged ports the tor process needs to start with root +# permissions, then lower the user it's running as afterward. This script +# simply makes a "tor-arm" user if it doesn't already exist then starts the +# tor process. + +# TODO: check if the user's running as root +# TODO: check if the tor-arm user exists and if not, make it +# TODO: run arm +# TODO: bonus points: double check that the torrc in this directory has a +# "User tor-arm" entry - this would be a problem if they run the wizard +# without low ports, then use this script + diff --git a/src/util/torConfig.py b/src/util/torConfig.py index 8510c7a..2eca571 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -52,6 +52,9 @@ MAN_EX_INDENT = 15 # indentation used for man page examples PERSIST_ENTRY_DIVIDER = "-" * 80 + "\n" # splits config entries when saving to a file MULTILINE_PARAM = None # cached multiline parameters (lazily loaded) +# torrc options that bind to ports +PORT_OPT = ("SocksPort", "ORPort", "DirPort", "ControlPort", "TransPort") + def loadConfig(config): config.update(CONFIG) @@ -845,6 +848,39 @@ def _testConfigDescriptions(): print "\"%s\"" % description if i != len(sortedOptions) - 1: print "-" * 80 +def isRootNeeded(torrcPath): + """ + Returns True if the given torrc needs root permissions to be ran, False + otherwise. This raises an IOError if the torrc can't be read. + + Arguments: + torrcPath - torrc to be checked + """ + + try: + torrcFile = open(torrcPath, "r") + torrcLines = torrcFile.readlines() + torrcFile.close() + + for line in torrcLines: + line = line.strip() + + isPortOpt = False + for opt in PORT_OPT: + if line.startswith(opt): + isPortOpt = True + break + + if isPortOpt and " " in line: + arg = line.split(" ")[1] + + if arg.isdigit() and int(arg) <= 1024 and int(arg) != 0: + return True + + return False + except Exception, exc: + raise IOError(exc) + def renderTorrc(template, options, commentIndent = 30): """ Uses the given template to generate a nicely formatted torrc with the given

1 0

[arm/master] Checking if PortForwarding is available
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit ed16a0491ad55e16b8ea3fab2abaca7d65bdae46 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jul 11 10:20:44 2011 -0700 Checking if PortForwarding is available The PortForwarding was added in tor 0.2.3.1-alpha, and requires that tor-fw-helper exists in the user's path to function. Checking for both of these conditions and dropping the option if they're not met. --- src/cli/wizard.py | 42 +++++++++++++++++++++++++++++++++++++----- src/util/torTools.py | 49 ++++++++++++++++++++++++++++--------------------- 2 files changed, 65 insertions(+), 26 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index f796e41..efb6d98 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -89,6 +89,9 @@ BRACKETS = ((' ', ' '), ('{', '}'), ('|', '|')) +# version requirements for options +VERSION_REQUIREMENTS = {Options.PORTFORWARD: "0.2.3.1-alpha"} + # tor's defaults for config options, used to filter unneeded options TOR_DEFAULTS = {Options.BANDWIDTH: "5 MB", Options.REUSE: "10 minutes"} @@ -232,6 +235,18 @@ def showWizard(): log.log(log.WARN, msg) return + # gets tor's version + torVersion = None + try: + versionQuery = sysTools.call("tor --version") + + for line in versionQuery: + if line.startswith("Tor version "): + torVersion = torTools.parseVersion(line.split(" ")[2]) + break + except IOError, exc: + log.log(log.INFO, "'tor --version' query failed: %s" % exc) + relayType, config = None, {} for option in Options.values(): if option == Options.DIVIDER: @@ -280,6 +295,18 @@ def showWizard(): manager = controller.getTorManager() relaySelection = RelayType.RESUME if manager.isTorrcAvailable() else RelayType.RELAY + # excludes options that are either disabled or for a future tor version + disabledOpt = list(CONFIG["wizard.disabled"]) + + for opt, optVersion in VERSION_REQUIREMENTS.items(): + if not torVersion or not torTools.isVersion(torVersion, torTools.parseVersion(optVersion)): + disabledOpt.append(opt) + + # the port forwarding option would only work if tor-fw-helper is in the path + if not Options.PORTFORWARD in disabledOpt: + if not sysTools.isAvailable("tor-fw-helper"): + disabledOpt.append(Options.PORTFORWARD) + while True: if relayType == None: selection = promptRelayType(relaySelection) @@ -292,11 +319,11 @@ def showWizard(): break else: relayType, relaySelection = selection, selection else: - selection = promptConfigOptions(relayType, config) + selection = promptConfigOptions(relayType, config, disabledOpt) if selection == BACK: relayType = None elif selection == NEXT: - generatedTorrc = getTorrc(relayType, config) + generatedTorrc = getTorrc(relayType, config, disabledOpt) torrcLocation = manager.getTorrcPath() controller.requestRedraw(True) @@ -404,14 +431,14 @@ def promptRelayType(initialSelection): finally: cli.popups.finalize() -def promptConfigOptions(relayType, config): +def promptConfigOptions(relayType, config, disabledOpt): """ Prompts the user for the configuration of an internal relay. """ topContent = _splitStr(CONFIG.get("wizard.message.%s" % relayType.lower(), ""), 54) - options = [config[opt] for opt in RelayOptions[relayType] if not opt in CONFIG["wizard.disabled"]] + options = [config[opt] for opt in RelayOptions[relayType] if not opt in disabledOpt] options.append(Options.DIVIDER) options.append(ConfigOption(BACK, "general", "(to role selection)")) options.append(ConfigOption(NEXT, "general", "(to confirm options)")) @@ -503,7 +530,7 @@ def promptConfigOptions(relayType, config): finally: cli.popups.finalize() -def getTorrc(relayType, config): +def getTorrc(relayType, config, disabledOpt): """ Provides the torrc generated for the given options. """ @@ -601,6 +628,11 @@ def getTorrc(relayType, config): templateOptions["BRIDGES"] = "\n".join(bridgeLines) + # removes disabled options + for opt in disabledOpt: + if opt.upper() in templateOptions: + del templateOptions[opt.upper()] + # removes options if they match the tor defaults for opt in TOR_DEFAULTS: if templateOptions[opt.upper()] == TOR_DEFAULTS[opt]: diff --git a/src/util/torTools.py b/src/util/torTools.py index 4a18a4f..f81e10a 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -52,9 +52,8 @@ CONTROLLER = None # singleton Controller instance CACHE_ARGS = ("version", "config-file", "exit-policy/default", "fingerprint", "config/names", "info/names", "features/names", "events/names", "nsEntry", "descEntry", "address", "bwRate", "bwBurst", - "bwObserved", "bwMeasured", "flags", "parsedVersion", "pid", - "user", "fdLimit", "pathPrefix", "startTime", "authorities", - "circuits", "hsPorts") + "bwObserved", "bwMeasured", "flags", "pid", "user", "fdLimit", + "pathPrefix", "startTime", "authorities", "circuits", "hsPorts") CACHE_GETINFO_PREFIX_ARGS = ("ip-to-country/", ) # Tor has a couple messages (in or/router.c) for when our ip address changes: @@ -301,6 +300,29 @@ def parseVersion(versionStr): return result +def isVersion(myVersion, minVersion): + """ + Checks if the given version meets a given minimum. Both arguments are + expected to be version tuples. To get this from a version string use the + parseVersion function. + + Arguments: + myVersion - tor version tuple + minVersion - version tuple to be checked against + """ + + if myVersion[:4] == minVersion[:4]: + return True # versions match + else: + # compares each of the numeric portions of the version + for i in range(4): + myVal, minVal = myVersion[i], minVersion[i] + + if myVal > minVal: return True + elif myVal < minVal: return False + + return True # versions match (should have been caught above...) + def getConn(): """ Singleton constructor for a Controller. Be aware that this starts as being @@ -890,23 +912,10 @@ class Controller(TorCtl.PostEventListener): result = False if self.isAlive(): - myVersion = self._getRelayAttr("parsedVersion", None) + myVersion = parseVersion(self.getInfo("version", "")) - if not myVersion: - result = False - elif myVersion[:4] == minVersion[:4]: - result = True # versions match - else: - # compares each of the numeric portions of the version - for i in range(4): - myVal, minVal = myVersion[i], minVersion[i] - - if myVal > minVal: - result = True - break - elif myVal < minVal: - result = False - break + if not myVersion: result = False + else: result = isVersion(myVersion, minVersion) self.connLock.release() @@ -1853,8 +1862,6 @@ class Controller(TorCtl.PostEventListener): if line.startswith("s "): result = line[2:].split() break - elif key == "parsedVersion": - result = parseVersion(self.getInfo("version", "")) elif key == "pid": result = self.getInfo("process/pid")

1 0

[arm/master] fix: exit notice file name misspelled
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit 647f7b557e1de2a6ba899267b32e5a551916d584 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jul 11 13:20:17 2011 -0700 fix: exit notice file name misspelled The tor exit notice file was misspelled. Changing it to 'index.html' instead since having 'exit notice' in the name is redundant. --- src/cli/wizard.py | 2 +- src/resources/exitNotice/exit-noice.html | 143 ------------------------------ src/resources/exitNotice/index.html | 143 ++++++++++++++++++++++++++++++ 3 files changed, 144 insertions(+), 144 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index be0deb4..b50105e 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -588,7 +588,7 @@ def getTorrc(relayType, config, disabledOpt): # exit notice will be in our data directory dataDir = cli.controller.getController().getDataDirectory() - templateOptions["NOTICE_PATH"] = dataDir + "exitNotice/exit-notice.html" + templateOptions["NOTICE_PATH"] = dataDir + "exitNotice/index.html" templateOptions["LOG_ENTRY"] = "notice file %stor_log" % dataDir policyCategories = [] diff --git a/src/resources/exitNotice/exit-noice.html b/src/resources/exitNotice/exit-noice.html deleted file mode 100644 index 7475984..0000000 --- a/src/resources/exitNotice/exit-noice.html +++ /dev/null @@ -1,143 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> -<title>This is a Tor Exit Router</title> - - - -</head> -<body> - -This is a -Tor Exit Router - - -Most likely you are accessing this website because you had some issue with -the traffic coming from this IP. This router is part of the <a -href="https://www.torproject.org/">Tor Anonymity Network</a>, which is -dedicated to <a href="https://www.torproject.org/about/overview">providing -privacy</a> to people who need it most: average computer users. This -router IP should be generating no other traffic, unless it has been -compromised. - - - -<a href="https://www.torproject.org/about/overview"> -<img src="how_tor_works_thumb.png" alt="How Tor works" style="border-style:none"/> -</a> - - -Tor sees use by <a href="https://www.torproject.org/about/torusers">many -important segments of the population</a>, including whistle blowers, -journalists, Chinese dissidents skirting the Great Firewall and oppressive -censorship, abuse victims, stalker targets, the US military, and law -enforcement, just to name a few. While Tor is not designed for malicious -computer users, it is true that they can use the network for malicious ends. -In reality however, the actual amount of <a -href="https://www.torproject.org/docs/faq-abuse">abuse</a> is quite low. This -is largely because criminals and hackers have significantly better access to -privacy and anonymity than do the regular users whom they prey upon. Criminals -can and do <a -href="http://voices.washingtonpost.com/securityfix/2008/08/web_fraud_20_tools.html">build, -sell, and trade</a> far larger and <a -href="http://voices.washingtonpost.com/securityfix/2008/08/web_fraud_20_distribut…">more -powerful networks</a> than Tor on a daily basis. Thus, in the mind of this -operator, the social need for easily accessible censorship-resistant private, -anonymous communication trumps the risk of unskilled bad actors, who are -almost always more easily uncovered by traditional police work than by -extensive monitoring and surveillance anyway. - - -In terms of applicable law, the best way to understand Tor is to consider it a -network of routers operating as common carriers, much like the Internet -backbone. However, unlike the Internet backbone routers, Tor routers -explicitly do not contain identifiable routing information about the source of -a packet, and no single Tor node can determine both the origin and destination -of a given transmission. - - -As such, there is little the operator of this router can do to help you track -the connection further. This router maintains no logs of any of the Tor -traffic, so there is little that can be done to trace either legitimate or -illegitimate traffic (or to filter one from the other). Attempts to -seize this router will accomplish nothing. - - - - -Furthermore, this machine also serves as a carrier of email, which means that -its contents are further protected under the ECPA. <a -href="http://www4.law.cornell.edu/uscode/html/uscode18/usc_sec_18_00002707----000…">18 -USC 2707</a> explicitly allows for civil remedies ($1000/account -plus legal fees) -in the event of a seizure executed without good faith or probable cause (it -should be clear at this point that traffic with this originating IP address -should not constitute probable cause to seize the machine). Similar -considerations exist for 1st amendment content on this machine. - - - - -If you are a representative of a company who feels that this router is being -used to violate the DMCA, please be aware that this machine does not host or -contain any illegal content. Also be aware that network infrastructure -maintainers are not liable for the type of content that passes over their -equipment, in accordance with <a -href="http://www4.law.cornell.edu/uscode/html/uscode17/usc_sec_17_00000512----000…">DMCA -"safe harbor" provisions</a>. In other words, you will have just as much luck -sending a takedown notice to the Internet backbone providers. Please consult -<a href="https://www.torproject.org/eff/tor-dmca-response">EFF's prepared -response</a> for more information on this matter. - -For more information, please consult the following documentation: - -<ol> -<li><a href="https://www.torproject.org/about/overview">Tor Overview</a></li> -<li><a href="https://www.torproject.org/docs/faq-abuse">Tor Abuse FAQ</a></li> -<li><a href="https://www.torproject.org/eff/tor-legal-faq">Tor Legal FAQ</a></li> -</ol> - - -That being said, if you still have a complaint about the router, you may -email the <a href="mailto:FIXME_YOUR_EMAIL_ADDRESS">maintainer</a>. If -complaints are related to a particular service that is being abused, I will -consider removing that service from my exit policy, which would prevent my -router from allowing that traffic to exit through it. I can only do this on an -IP+destination port basis, however. Common P2P ports are -already blocked. - - -You also have the option of blocking this IP address and others on -the Tor network if you so desire. The Tor project provides a <a -href="https://check.torproject.org/cgi-bin/TorBulkExitList.py">web service</a> -to fetch a list of all IP addresses of Tor exit nodes that allow exiting to a -specified IP:port combination, and an official <a -href="https://www.torproject.org/tordnsel/dist/">DNSRBL</a> is also available to -determine if a given IP address is actually a Tor exit server. Please -be considerate -when using these options. It would be unfortunate to deny all Tor users access -to your site indefinitely simply because of a few bad apples. - -</body> -</html> diff --git a/src/resources/exitNotice/index.html b/src/resources/exitNotice/index.html new file mode 100644 index 0000000..7475984 --- /dev/null +++ b/src/resources/exitNotice/index.html @@ -0,0 +1,143 @@ +<?xml version="1.0"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> +<title>This is a Tor Exit Router</title> + + + +</head> +<body> + +This is a +Tor Exit Router + + +Most likely you are accessing this website because you had some issue with +the traffic coming from this IP. This router is part of the <a +href="https://www.torproject.org/">Tor Anonymity Network</a>, which is +dedicated to <a href="https://www.torproject.org/about/overview">providing +privacy</a> to people who need it most: average computer users. This +router IP should be generating no other traffic, unless it has been +compromised. + + + +<a href="https://www.torproject.org/about/overview"> +<img src="how_tor_works_thumb.png" alt="How Tor works" style="border-style:none"/> +</a> + + +Tor sees use by <a href="https://www.torproject.org/about/torusers">many +important segments of the population</a>, including whistle blowers, +journalists, Chinese dissidents skirting the Great Firewall and oppressive +censorship, abuse victims, stalker targets, the US military, and law +enforcement, just to name a few. While Tor is not designed for malicious +computer users, it is true that they can use the network for malicious ends. +In reality however, the actual amount of <a +href="https://www.torproject.org/docs/faq-abuse">abuse</a> is quite low. This +is largely because criminals and hackers have significantly better access to +privacy and anonymity than do the regular users whom they prey upon. Criminals +can and do <a +href="http://voices.washingtonpost.com/securityfix/2008/08/web_fraud_20_tools.html">build, +sell, and trade</a> far larger and <a +href="http://voices.washingtonpost.com/securityfix/2008/08/web_fraud_20_distribut…">more +powerful networks</a> than Tor on a daily basis. Thus, in the mind of this +operator, the social need for easily accessible censorship-resistant private, +anonymous communication trumps the risk of unskilled bad actors, who are +almost always more easily uncovered by traditional police work than by +extensive monitoring and surveillance anyway. + + +In terms of applicable law, the best way to understand Tor is to consider it a +network of routers operating as common carriers, much like the Internet +backbone. However, unlike the Internet backbone routers, Tor routers +explicitly do not contain identifiable routing information about the source of +a packet, and no single Tor node can determine both the origin and destination +of a given transmission. + + +As such, there is little the operator of this router can do to help you track +the connection further. This router maintains no logs of any of the Tor +traffic, so there is little that can be done to trace either legitimate or +illegitimate traffic (or to filter one from the other). Attempts to +seize this router will accomplish nothing. + + + + +Furthermore, this machine also serves as a carrier of email, which means that +its contents are further protected under the ECPA. <a +href="http://www4.law.cornell.edu/uscode/html/uscode18/usc_sec_18_00002707----000…">18 +USC 2707</a> explicitly allows for civil remedies ($1000/account +plus legal fees) +in the event of a seizure executed without good faith or probable cause (it +should be clear at this point that traffic with this originating IP address +should not constitute probable cause to seize the machine). Similar +considerations exist for 1st amendment content on this machine. + + + + +If you are a representative of a company who feels that this router is being +used to violate the DMCA, please be aware that this machine does not host or +contain any illegal content. Also be aware that network infrastructure +maintainers are not liable for the type of content that passes over their +equipment, in accordance with <a +href="http://www4.law.cornell.edu/uscode/html/uscode17/usc_sec_17_00000512----000…">DMCA +"safe harbor" provisions</a>. In other words, you will have just as much luck +sending a takedown notice to the Internet backbone providers. Please consult +<a href="https://www.torproject.org/eff/tor-dmca-response">EFF's prepared +response</a> for more information on this matter. + +For more information, please consult the following documentation: + +<ol> +<li><a href="https://www.torproject.org/about/overview">Tor Overview</a></li> +<li><a href="https://www.torproject.org/docs/faq-abuse">Tor Abuse FAQ</a></li> +<li><a href="https://www.torproject.org/eff/tor-legal-faq">Tor Legal FAQ</a></li> +</ol> + + +That being said, if you still have a complaint about the router, you may +email the <a href="mailto:FIXME_YOUR_EMAIL_ADDRESS">maintainer</a>. If +complaints are related to a particular service that is being abused, I will +consider removing that service from my exit policy, which would prevent my +router from allowing that traffic to exit through it. I can only do this on an +IP+destination port basis, however. Common P2P ports are +already blocked. + + +You also have the option of blocking this IP address and others on +the Tor network if you so desire. The Tor project provides a <a +href="https://check.torproject.org/cgi-bin/TorBulkExitList.py">web service</a> +to fetch a list of all IP addresses of Tor exit nodes that allow exiting to a +specified IP:port combination, and an official <a +href="https://www.torproject.org/tordnsel/dist/">DNSRBL</a> is also available to +determine if a given IP address is actually a Tor exit server. Please +be considerate +when using these options. It would be unfortunate to deny all Tor users access +to your site indefinitely simply because of a few bad apples. + +</body> +</html>

1 0

[arm/master] fix: mixing up the relay and client shutdown opts
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit 2a1daaa179f0c25c15e0d71cb43d7ecbc92e129d Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jul 11 13:27:05 2011 -0700 fix: mixing up the relay and client shutdown opts There's a separate shutdown option for clients vs relays (RSHUTDOWN vs CSHUTDOWN), the reason being that they have a different default and descriptions. The template was mistakenly taking the logical or of the two options rather than picking the one for our relay type. --- src/cli/wizard.py | 7 +++++++ src/resources/torrcTemplate.txt | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index b50105e..6caf490 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -600,6 +600,13 @@ def getTorrc(relayType, config, disabledOpt): if config[Options.IM].getValue(): policyCategories.append("im") if config[Options.MISC].getValue(): policyCategories.append("misc") + # uses the CSHUTDOWN or RSHUTDOWN option based on if we're running as a + # client or not + if relayType == RelayType.CLIENT: + templateOptions["SHUTDOWN"] = templateOptions[Options.CSHUTDOWN.upper()] + else: + templateOptions["SHUTDOWN"] = templateOptions[Options.RSHUTDOWN.upper()] + if policyCategories: isEncryptedOnly = not config[Options.PLAINTEXT].getValue() diff --git a/src/resources/torrcTemplate.txt b/src/resources/torrcTemplate.txt index c31b209..d23ed0b 100644 --- a/src/resources/torrcTemplate.txt +++ b/src/resources/torrcTemplate.txt @@ -7,7 +7,7 @@ # Descriptions of all of these configuraiton attibutes (and many more) are # available in the tor man page. -[IF RSHUTDOWN | CSHUTDOWN] +[IF SHUTDOWN] [NEWLINE] # The following flag tells arm to shut down tor when it quits. # ARM_SHUTDOWN

1 0

[arm/master] fix: panel overlap if sighup toggles being a relay
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit 121d0dfc41a8f65f6fe336a10c29f6d310f99468 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jul 11 14:41:59 2011 -0700 fix: panel overlap if sighup toggles being a relay If we sighup or reconnect to a tor instance and this toggles having an ORPort then the height of the header panel can change, causing overlap with the panel below it (this causes flickering of the overlapped content). Redrawing the whole display if this happens. --- src/cli/headerPanel.py | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index f80eff8..e64a6de 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -418,10 +418,19 @@ class HeaderPanel(panel.Panel, threading.Thread): """ if eventType in (torTools.State.INIT, torTools.State.RESET): + initialHeight = self.getHeight() self._isTorConnected = True self._haltTime = None self._update(True) - self.redraw(True) + + if self.getHeight() != initialHeight: + # We're toggling between being a relay and client, causing the height + # of this panel to change. Redraw all content so we don't get + # overlapping content. + cli.controller.getController().requestRedraw(True) + else: + # just need to redraw ourselves + self.redraw(True) elif eventType == torTools.State.CLOSED: self._isTorConnected = False self._haltTime = time.time()

1 0

[arm/master] Adding option to drop connection ip addresses
by atagar＠torproject.org 12 Jul '11

12 Jul '11

commit c7a2ed2bcbf34c967832fd9c4b9b9eafcb3d675c Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 12 09:58:38 2011 -0700 Adding option to drop connection ip addresses Providing an option to scrub the ip addresses of tor relays from the connection panel, requested by ioerror. --- armrc.sample | 4 ++++ src/cli/connections/connEntry.py | 3 +++ src/cli/connections/connPanel.py | 8 +++++++- 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/armrc.sample b/armrc.sample index c893bf9..23092d7 100644 --- a/armrc.sample +++ b/armrc.sample @@ -211,6 +211,9 @@ features.graph.bw.accounting.isTimeLong false # if true, the uptime of the initial connections when we start are marked # with a '+' (these uptimes are estimates since arm can only track a # connection's duration while it runs) +# showIps +# shows ip addresses for other tor relays, dropping this information if +# false # showExitPort # shows port related information of exit connections we relay if true # showColumn.* @@ -221,6 +224,7 @@ features.connection.order 0, 2, 1 features.connection.refreshRate 5 features.connection.resolveApps true features.connection.markInitialConnections true +features.connection.showIps true features.connection.showExitPort true features.connection.showColumn.fingerprint true features.connection.showColumn.nickname true diff --git a/src/cli/connections/connEntry.py b/src/cli/connections/connEntry.py index 05e2a45..5feafdb 100644 --- a/src/cli/connections/connEntry.py +++ b/src/cli/connections/connEntry.py @@ -34,6 +34,7 @@ LABEL_MIN_PADDING = 2 # min space between listing label and following data SCRUBBED_IP_VAL = 255 ** 4 CONFIG = {"features.connection.markInitialConnections": True, + "features.connection.showIps": True, "features.connection.showExitPort": True, "features.connection.showColumn.fingerprint": True, "features.connection.showColumn.nickname": True, @@ -344,6 +345,8 @@ class ConnectionLine(entries.ConnectionPanelLine): connection or exit traffic. """ + if not CONFIG["features.connection.showIps"]: return True + # This is used to scrub private information from the interface. Relaying # etiquette (and wiretapping laws) say these are bad things to look at so # DON'T CHANGE THIS UNLESS YOU HAVE A DAMN GOOD REASON! diff --git a/src/cli/connections/connPanel.py b/src/cli/connections/connPanel.py index 161d6f6..ae50674 100644 --- a/src/cli/connections/connPanel.py +++ b/src/cli/connections/connPanel.py @@ -14,7 +14,8 @@ from util import connections, enum, panel, torTools, uiTools DEFAULT_CONFIG = {"features.connection.resolveApps": True, "features.connection.listingType": 0, - "features.connection.refreshRate": 5} + "features.connection.refreshRate": 5, + "features.connection.showIps": True} # height of the detail panel content, not counting top and bottom border DETAILS_HEIGHT = 7 @@ -43,6 +44,11 @@ class ConnectionPanel(panel.Panel, threading.Thread): "features.connection.listingType": (0, len(Listing.values()) - 1), "features.connection.refreshRate": 1}) + # defaults our listing selection to fingerprints if ip address + # displaying is disabled + if not self._config["features.connection.showIps"] and self._config["features.connection.listingType"] == 0: + self._config["features.connection.listingType"] = 2 + sortFields = entries.SortAttr.values() customOrdering = config.getIntCSV("features.connection.order", None, 3, 0, len(sortFields))

1 0