commit bfb7140ca05ebb32a2194d844879805639907445 Author: Damian Johnson atagar@torproject.org Date: Wed Jun 29 10:02:15 2011 -0700
Bridge configuration options for the wizard --- src/cli/wizard.py | 58 ++++++++++++++++++++++++++++++---------------------- src/settings.cfg | 5 ++++ 2 files changed, 38 insertions(+), 25 deletions(-)
diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 7a9eaa0..c6186e5 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -15,31 +15,38 @@ from util import enum, uiTools RelayType = enum.Enum("RELAY", "EXIT", "BRIDGE", "CLIENT")
# all options that can be configured -Options = enum.Enum("DIVIDER", "NICKNAME", "CONTACT", "NOTIFY", "BANDWIDTH", "LIMIT", "CLIENT", "PORTFORWARD", "STARTUP", "NOTICE", "POLICY", "WEBSITES", "EMAIL", "IM", "MISC", "PLAINTEXT") -RelayOptions = {RelayType.RELAY: (Options.NICKNAME, - Options.CONTACT, - Options.NOTIFY, - Options.BANDWIDTH, - Options.LIMIT, - Options.CLIENT, - Options.PORTFORWARD, - Options.STARTUP), - RelayType.EXIT: (Options.NICKNAME, - Options.CONTACT, - Options.NOTIFY, - Options.BANDWIDTH, - Options.LIMIT, - Options.CLIENT, - Options.PORTFORWARD, - Options.STARTUP, - Options.DIVIDER, - Options.NOTICE, - Options.POLICY, - Options.WEBSITES, - Options.EMAIL, - Options.IM, - Options.MISC, - Options.PLAINTEXT)} +Options = enum.Enum("DIVIDER", "NICKNAME", "CONTACT", "NOTIFY", "BANDWIDTH", "LIMIT", "CLIENT", "PORTFORWARD", "STARTUP", "NOTICE", "POLICY", "WEBSITES", "EMAIL", "IM", "MISC", "PLAINTEXT", "DISTRIBUTE") +RelayOptions = {RelayType.RELAY: (Options.NICKNAME, + Options.CONTACT, + Options.NOTIFY, + Options.BANDWIDTH, + Options.LIMIT, + Options.CLIENT, + Options.PORTFORWARD, + Options.STARTUP), + RelayType.EXIT: (Options.NICKNAME, + Options.CONTACT, + Options.NOTIFY, + Options.BANDWIDTH, + Options.LIMIT, + Options.CLIENT, + Options.PORTFORWARD, + Options.STARTUP, + Options.DIVIDER, + Options.NOTICE, + Options.POLICY, + Options.WEBSITES, + Options.EMAIL, + Options.IM, + Options.MISC, + Options.PLAINTEXT), + RelayType.BRIDGE: (Options.DISTRIBUTE, + Options.BANDWIDTH, + Options.LIMIT, + Options.CLIENT, + Options.PORTFORWARD, + Options.STARTUP + )}
# custom exit policy options CUSTOM_POLICIES = (Options.WEBSITES, Options.EMAIL, Options.IM, Options.MISC, Options.PLAINTEXT) @@ -54,6 +61,7 @@ DISABLED_COLOR = "cyan"
CONFIG = {"wizard.message.role": "", "wizard.message.relay": "", + "wizard.message.bridge": "", "wizard.message.exit": "", "wizard.toggle": {}, "wizard.suboptions": [], diff --git a/src/settings.cfg b/src/settings.cfg index c945a34..f05dd71 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -344,6 +344,7 @@ msg.ARM_DEBUG Unable to query process resource usage from ps wizard.message.role Welcome to the Tor network! This will step you through the configuration process for becoming a part of it. To start with, what role would you like to have? wizard.message.relay Internal relays provide connections within the Tor network. Since you will only be connecting to Tor users and relays this is an easy, hassle free way of helping to make the network better. wizard.message.exit Exits connect between the Tor network and the outside Internet. This is the most vitally important role you can take, but it also needs some forethought. Please read 'http://www.atagar.com/torExitTips/' before proceeding further to avoid any nasty surprises! +wizard.message.bridge Bridges are non-public relays used as stepping stones for censored users for accessing the Tor network.
wizard.toggle Notify => Yes, No wizard.toggle Client => Enabled, Disabled @@ -356,6 +357,7 @@ wizard.toggle Email => Allow, Block wizard.toggle Im => Allow, Block wizard.toggle Misc => Allow, Block wizard.toggle Plaintext => Allow, Block +wizard.toggle Distribute => Automated, Manual
wizard.suboptions Websites wizard.suboptions Email @@ -376,6 +378,7 @@ wizard.default Email => true wizard.default Im => true wizard.default Misc => true wizard.default Plaintext => true +wizard.default Distribute => true
wizard.label.general Cancel => Cancel wizard.label.general Back => Previous @@ -399,6 +402,7 @@ wizard.label.opt Email => Receiving Email wizard.label.opt Im => Instant Messaging wizard.label.opt Misc => Other Services wizard.label.opt Plaintext => Unencrypted Traffic +wizard.label.opt Distribute => Distribution
wizard.description.general Cancel => Close without starting Tor. wizard.description.role Relay => Provides interconnections with other Tor relays. This is a safe and easy of making the network better. @@ -420,6 +424,7 @@ wizard.description.opt Email => Protocols for receiving, but not sending email. wizard.description.opt Im => Common instant messaging protocols including Jabber, IRC, ICQ, AIM, Yahoo, MSN, SILC, GroupWise, Gadu-Gadu, Sametime, and Zephyr. wizard.description.opt Misc => Protocols from the default policy that aren't among the above. wizard.description.opt Plaintext => When blocked the policy will exclude ports that aren't commonly encrypted. +wizard.description.opt Distribute => If automated then we'll attempt to get your bridge to censored users (email auto-responders, activist networks, etc). Otherwise it'll be up to you to distribute the bridge address to people who need it.
# some config options are fetched via special values torrc.map HiddenServiceDir => HiddenServiceOptions