July 2011 - tor-commits - lists.torproject.org

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

17 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/release] Adding wizard option to shutdown tor with arm
by atagar＠torproject.org 17 Jul '11

17 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/release] fix: mixing up the relay and client shutdown opts
by atagar＠torproject.org 17 Jul '11

17 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/release] Obscuring contact email addresses
by atagar＠torproject.org 17 Jul '11

17 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/release] Checking if PortForwarding is available
by atagar＠torproject.org 17 Jul '11

17 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/release] Adding tor check for setup wizard
by atagar＠torproject.org 17 Jul '11

17 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/release] Starting Tor instance at wizard completion
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 95cd487cc30c86d62f6ae44cc41cf44129d917ad Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 8 16:30:17 2011 -0700 Starting Tor instance at wizard completion This starts (or attempts to start) a Tor instance when the wizard finishes. Currently this just works for the basic use case where we have the permissions necessary to start Tor. --- src/cli/controller.py | 13 ++++++++++ src/cli/wizard.py | 51 +++++++++++++++++++++++++++----------- src/resources/torrcTemplate.txt | 1 + src/util/torConfig.py | 2 +- 4 files changed, 51 insertions(+), 16 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index c9ab6e7..633296e 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -3,6 +3,7 @@ Main interface loop for arm, periodically redrawing the screen and issuing user input to the proper panels. """ +import os import time import curses import threading @@ -25,6 +26,7 @@ from util import connections, conf, enum, log, panel, sysTools, torConfig, torTo ARM_CONTROLLER = None CONFIG = {"startup.events": "N3", + "startup.dataDirectory": "~/.arm", "startup.blindModeEnabled": False, "features.panels.show.graph": True, "features.panels.show.log": True, @@ -366,6 +368,17 @@ class Controller: if redraw: controlPanel.redraw(True) else: self._forceRedraw = True + def getDataDirectory(self): + """ + Provides the path where arm's resources are being placed. The path ends + with a slash and is created if it doesn't already exist. + """ + + dataDir = CONFIG["startup.dataDirectory"] + if not dataDir.endswith("/"): dataDir += "/" + if not os.path.exists(dataDir): os.makedirs(dataDir) + return os.path.expanduser(dataDir) + def isDone(self): """ True if arm should be terminated, false otherwise. diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 946ecd1..3ab3b9d 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -5,13 +5,16 @@ that's used by arm to run its own tor instance. import os import sys +import shutil import functools import curses import cli.popups import cli.controller -from util import connections, enum, log, torConfig, uiTools +from TorCtl import TorCtl + +from util import connections, enum, log, torConfig, torTools, uiTools # template used to generate the torrc TORRC_TEMPLATE = "resources/torrcTemplate.txt" @@ -72,8 +75,7 @@ MSG_COLOR = "green" OPTION_COLOR = "yellow" DISABLED_COLOR = "cyan" -CONFIG = {"startup.dataDirectory": "~/.arm", - "wizard.message.role": "", +CONFIG = {"wizard.message.role": "", "wizard.message.relay": "", "wizard.message.exit": "", "wizard.message.bridge": "", @@ -251,6 +253,7 @@ def showWizard(): # remembers the last selection made on the type prompt page relaySelection = RelayType.RELAY + controller = cli.controller.getController() while True: if relayType == None: @@ -265,18 +268,36 @@ def showWizard(): elif selection == NEXT: generatedTorrc = getTorrc(relayType, config) - dataDir = CONFIG["startup.dataDirectory"] - if not dataDir.endswith("/"): dataDir += "/" - torrcLocation = os.path.expanduser(dataDir) + "torrc" - - cli.controller.getController().requestRedraw(True) + torrcLocation = controller.getDataDirectory() + "torrc" + controller.requestRedraw(True) confirmationSelection = showConfirmationDialog(generatedTorrc, torrcLocation) if confirmationSelection == NEXT: - log.log(log.NOTICE, "Resulting torrc:\n%s" % generatedTorrc) - break # TODO: implement next screen - elif confirmationSelection == CANCEL: + log.log(log.INFO, "Writing torrc to '%s':\n%s" % (torrcLocation, generatedTorrc)) + + # if the torrc already exists then save it to a _bak file + if os.path.exists(torrcLocation): + shutil.copy(torrcLocation, torrcLocation + "_bak") + + # writes the torrc contents + torrcFile = open(torrcLocation, "w") + torrcFile.write(generatedTorrc) + torrcFile.close() + + try: + os.system("tor --quiet -f %s&" % torrcLocation) + torctlConn, authType, authValue = TorCtl.preauth_connect(controlPort = 9052) + + if authType == TorCtl.AUTH_TYPE.COOKIE: + torctlConn.authenticate(authValue) + torTools.getConn().init(torctlConn) + else: + raise IOError("unexpected authentication type '%s'" % authType) + except IOError, exc: + log.log(log.WARN, "Unable to start tor: %s" % exc) + break + elif confirmationSelection == CANCEL: break # redraws screen to clear away the dialog we just showed cli.controller.getController().requestRedraw(True) @@ -464,9 +485,9 @@ def getTorrc(relayType, config): templateOptions["BURST"] = "%i %s" % (int(relayRateComp[0]) * 2, " ".join(relayRateComp[1:])) # exit notice will be in our data directory - dataDir = CONFIG["startup.dataDirectory"] - if not dataDir.endswith("/"): dataDir += "/" - templateOptions["NOTICE_PATH"] = os.path.expanduser(dataDir) + "exit-notice.html" + dataDir = cli.controller.getController().getDataDirectory() + templateOptions["NOTICE_PATH"] = dataDir + "exit-notice.html" + templateOptions["LOG_ENTRY"] = "notice file %stor-log" % dataDir policyCategories = [] if not config[Options.POLICY].getValue(): @@ -564,7 +585,7 @@ def showConfirmationDialog(torrcContents, torrcLocation): div = option.find("#") if div != -1: option, comment = option[:div], option[div:] - div = option.find(" ") + div = option.strip().find(" ") if div != -1: option, arg = option[:div], option[div:] drawX = 2 + xOffset diff --git a/src/resources/torrcTemplate.txt b/src/resources/torrcTemplate.txt index abedd7f..072f847 100644 --- a/src/resources/torrcTemplate.txt +++ b/src/resources/torrcTemplate.txt @@ -9,6 +9,7 @@ [NEWLINE] ControlPort 9052 # port controllers can connect to CookieAuthentication 1 # method for controller authentication +Log [LOG_ENTRY] # location to log notices, warnings, and errors [IF RELAY | EXIT | BRIDGE] RunAsDaemon 1 # runs as a background process diff --git a/src/util/torConfig.py b/src/util/torConfig.py index e5f1cb2..8510c7a 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -930,7 +930,7 @@ def renderTorrc(template, options, commentIndent = 30): comment = "# %s" % comment.strip() # parses the argument from the option - if " " in parsedLine: + if " " in parsedLine.strip(): option, arg = parsedLine.split(" ", 1) option = option.strip() else:

1 0

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

17 Jul '11

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

1 0

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

17 Jul '11

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

1 0

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

17 Jul '11

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

1 0