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

r24861: {website} add headings and our identi.ca account. (website/trunk/about/en)
by Andrew Lewman 05 Jul '11

05 Jul '11

Author: phobos Date: 2011-07-05 14:54:49 +0000 (Tue, 05 Jul 2011) New Revision: 24861 Modified: website/trunk/about/en/contact.wml Log: add headings and our identi.ca account. Modified: website/trunk/about/en/contact.wml =================================================================== --- website/trunk/about/en/contact.wml 2011-07-05 08:14:09 UTC (rev 24860) +++ website/trunk/about/en/contact.wml 2011-07-05 14:54:49 UTC (rev 24861) @@ -13,6 +13,7 @@ <div id="maincol"> <h2>Tor: Contact</h2> + <h3>Email</h3> <a id="email"></a> <i>tor-assistants at torproject.org</i> is the catch-all address for everything. It can be used for reaching people working on Tor. @@ -36,6 +37,12 @@ certification, etc.</li> </ul> + <h3>Identi.ca</h3> + <a id="identica"></a> + Contact us via our microblogging Identi.ca account at <a + href="https://identi.ca/torproject">torproject</a>. + + <h3>IRC</h3> <a id="irc"></a> Tor users and developers can also be found in the following channels on <a href="http://www.oftc.net/oftc/">OFTC</a>: @@ -51,6 +58,7 @@ stuff that is not related to Tor.</li> </ul> + <h3>Telephone</h3> <a id="phone"></a> If none of the above appeal to you, calling +1-781-352-0568 will reach the Tor office. Should there be no answer, please leave a message.

1 0

r24860: {website} Fix minor typos (website/trunk/about/en)
by Robert Ransom 05 Jul '11

05 Jul '11

Author: rransom Date: 2011-07-05 08:14:09 +0000 (Tue, 05 Jul 2011) New Revision: 24860 Modified: website/trunk/about/en/contact.wml Log: Fix minor typos Modified: website/trunk/about/en/contact.wml =================================================================== --- website/trunk/about/en/contact.wml 2011-07-05 02:30:53 UTC (rev 24859) +++ website/trunk/about/en/contact.wml 2011-07-05 08:14:09 UTC (rev 24860) @@ -38,14 +38,14 @@ <a id="irc"></a> Tor users and developers can also be found in the following channels on <a - href="http://www.oftc.net/oftc/">oftc</a>: + href="http://www.oftc.net/oftc/">OFTC</a>: <ul> <li><i>#tor</i> - User and relay operation discussions. Having trouble running Tor or a question for other Tor users? Then this is the spot for you.</li> <li><i>#tor-dev</i> - Channel for people who want to do development. - Discussions about Tor related coding, protocols, and <a href="<page + Discussions about Tor-related coding, protocols, and <a href="<page getinvolved/volunteer>">project ideas</a> are all welcome.</li> <li><i>#nottor</i> - This is where Tor people hang out to talk about stuff that is not related to Tor.</li>

1 0

r24859: {website} add in an email id, add the official tor phone number. (website/trunk/about/en)
by Andrew Lewman 04 Jul '11

04 Jul '11

Author: phobos Date: 2011-07-05 02:30:53 +0000 (Tue, 05 Jul 2011) New Revision: 24859 Modified: website/trunk/about/en/contact.wml Log: add in an email id, add the official tor phone number. Modified: website/trunk/about/en/contact.wml =================================================================== --- website/trunk/about/en/contact.wml 2011-07-05 02:26:13 UTC (rev 24858) +++ website/trunk/about/en/contact.wml 2011-07-05 02:30:53 UTC (rev 24859) @@ -13,6 +13,7 @@ <div id="maincol"> <h2>Tor: Contact</h2> + <a id="email"></a> <i>tor-assistants at torproject.org</i> is the catch-all address for everything. It can be used for reaching people working on Tor. @@ -49,6 +50,10 @@ <li><i>#nottor</i> - This is where Tor people hang out to talk about stuff that is not related to Tor.</li> </ul> + + <a id="phone"></a> + If none of the above appeal to you, calling +1-781-352-0568 will reach + the Tor office. Should there be no answer, please leave a message. </div>

1 0

r24858: {website} clean up the contact page to how people want to use it. (website/trunk/about/en)
by Andrew Lewman 04 Jul '11

04 Jul '11

Author: phobos Date: 2011-07-05 02:26:13 +0000 (Tue, 05 Jul 2011) New Revision: 24858 Modified: website/trunk/about/en/contact.wml Log: clean up the contact page to how people want to use it. Modified: website/trunk/about/en/contact.wml =================================================================== --- website/trunk/about/en/contact.wml 2011-07-03 09:34:34 UTC (rev 24857) +++ website/trunk/about/en/contact.wml 2011-07-05 02:26:13 UTC (rev 24858) @@ -13,32 +13,9 @@ <div id="maincol"> <h2>Tor: Contact</h2> - <p>First, if you have a problem or question about using Tor, go look at the <a href="<page docs/documentation>#Support">Support section</a> for how to proceed. The Tor developers spend most of their time developing Tor, and there are no people devoted to user support, so try to help yourself before <a href="<page docs/faq>#SupportMail">politely trying to find a volunteer</a>.</p> - - <p>If you really do need to reach us, here are some approaches. Please be patient and <a href="http://www.catb.org/~esr/faqs/smart-questions.html">helpful</a>, - and please make sure to write your mail in English.</p> - <i>tor-assistants at torproject.org</i> is the catch-all address for everything. It can be - used for: + used for reaching people working on Tor. - <ul> - <li>Contacting the people who manage the directory authorities. Use - this if you run a Tor relay and have a question or problem with - your relay.</li> - <li>So we can fix typos on the website, change wrong statements or - directions on the website, and add new sections and paragraphs that - you send us. You might want to make a draft of your new sections - on <a href="<wiki>">the Tor wiki</a> first.</li> - <li>Hearing about your documents, patches, testing, experiences - with supporting applications, and so forth inspired by our <a - href="<page getinvolved/volunteer>">volunteer page</a> (or other - problems you've fixed or documented about using Tor). There's no - need to mail us before you start working on something -- like all - volunteer Internet projects, we hear from a lot of excited people - who vanish soon after, so we are most interested in hearing about - actual progress.</li> - </ul> - A few other addresses are more specific: <ul>

1 0

[arm/master] Merging krkhan's master branch
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit 7ec67a35b780fe48ed64b552a9e210a9a9662d18 Merge: ca124f1 a110aeb Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jul 4 08:38:02 2011 -0700 Merging krkhan's master branch src/gui/__init__.py | 2 +- src/gui/arm.xml | 74 ++++++++++++++++++---- src/gui/controller.py | 57 +++-------------- src/gui/graphing/bandwidthStats.py | 37 ++++++++++-- src/gui/graphing/graphStats.py | 102 ++++++++++++++++++++++++++---- src/gui/logPanel.py | 119 ++++++++++++++++++++++++++++++++++++ 6 files changed, 309 insertions(+), 82 deletions(-)

1 0

[arm/master] Wizard option for relaying over low ports
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit ca124f16b2eee34624f61a54a763562019fc8aa8 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 3 20:06:26 2011 -0700 Wizard option for relaying over low ports Option to use port 443 for relaying and 80 for directory mirroring rather than the more conventional 9001/9030. This will make a 'tor-arm' user if it doesn't already exist and use that for the torrc User entry. --- src/cli/wizard.py | 15 +++++++++++---- src/settings.cfg | 4 ++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 80d2fd1..8239487 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -9,19 +9,20 @@ import curses import cli.popups import cli.controller -from util import enum, connections, uiTools +from util import connections, enum, uiTools # basic configuration types we can run as 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", "DISTRIBUTE", "BRIDGED", "BRIDGE1", "BRIDGE2", "BRIDGE3", "REUSE") +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") RelayOptions = {RelayType.RELAY: (Options.NICKNAME, Options.CONTACT, Options.NOTIFY, Options.BANDWIDTH, Options.LIMIT, Options.CLIENT, + Options.LOWPORTS, Options.PORTFORWARD, Options.STARTUP), RelayType.EXIT: (Options.NICKNAME, @@ -30,6 +31,7 @@ RelayOptions = {RelayType.RELAY: (Options.NICKNAME, Options.BANDWIDTH, Options.LIMIT, Options.CLIENT, + Options.LOWPORTS, Options.PORTFORWARD, Options.STARTUP, Options.DIVIDER, @@ -44,9 +46,9 @@ RelayOptions = {RelayType.RELAY: (Options.NICKNAME, Options.BANDWIDTH, Options.LIMIT, Options.CLIENT, + Options.LOWPORTS, Options.PORTFORWARD, - Options.STARTUP - ), + Options.STARTUP), RelayType.CLIENT: (Options.BRIDGED, Options.BRIDGE1, Options.BRIDGE2, @@ -218,6 +220,11 @@ def showWizard(): config[Options.REUSE].setValidator(_circDurationValidator) # enables custom policies when 'custom' is selected and disables otherwise + lowPortsOpt = config[Options.LOWPORTS] + disclaimerNotice = [config[Options.NOTICE]] + lowPortsOpt.setValidator(functools.partial(_toggleEnabledAction, disclaimerNotice)) + _toggleEnabledAction(disclaimerNotice, lowPortsOpt, lowPortsOpt.getValue()) + policyOpt = config[Options.POLICY] customPolicies = [config[opt] for opt in CUSTOM_POLICIES] policyOpt.setValidator(functools.partial(_toggleEnabledAction, customPolicies)) diff --git a/src/settings.cfg b/src/settings.cfg index 7f2953f..53da315 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -349,6 +349,7 @@ wizard.message.client This will make use of the Tor network without contributing wizard.toggle Notify => Yes, No wizard.toggle Client => Enabled, Disabled +wizard.toggle Lowports => Yes, No wizard.toggle Portforward => Enabled, Disabled wizard.toggle Startup => Yes, No wizard.toggle Notice => Yes, No @@ -374,6 +375,7 @@ wizard.default Notify => true wizard.default Bandwidth => 5 MB/s wizard.default Startup => true wizard.default Client => false +wizard.default Lowports => true wizard.default Portforward => true wizard.default Notice => true wizard.default Policy => false @@ -404,6 +406,7 @@ wizard.label.opt Notify => Issue Notification wizard.label.opt Bandwidth => Relay Speed wizard.label.opt Limit => Monthly Limit 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 Notice => Disclaimer Notice @@ -431,6 +434,7 @@ wizard.description.opt Notify => Sends automated email notifications to the abov wizard.description.opt Bandwidth => Limit for the average rate at which you relay traffic. wizard.description.opt Limit => Maximum amount of traffic to relay each month. Some ISPs, like Comcast, cap their customer's Internet usage so this is an easy way of staying below that limit. wizard.description.opt Client => Enable this if you would like to use Tor yourself. This opens or closes the SOCKS port used by applications for connecting to Tor. +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 Notice => Provides a disclaimer that this is an exit on port 80 (http://www.atagar.com/exitNotice)

1 0

[arm/master] Input field validation for monthly limit
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit 5625ac4baf6f333e024ce4537031ef434416a0ec Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 3 17:51:49 2011 -0700 Input field validation for monthly limit --- src/cli/wizard.py | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 43d107b..16752e7 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -211,6 +211,7 @@ def showWizard(): # sets input validators config[Options.BANDWIDTH].setValidator(_relayRateValidator) + config[Options.LIMIT].setValidator(_monthlyLimitValidator) config[Options.BRIDGE1].setValidator(_bridgeDestinationValidator) config[Options.BRIDGE2].setValidator(_bridgeDestinationValidator) config[Options.BRIDGE3].setValidator(_bridgeDestinationValidator) @@ -444,6 +445,19 @@ def _relayRateValidator(option, value): elif (int(rate) < 20 and units == "KB/s") or int(rate) < 1: raise ValueError("To be usable as a relay the rate must be at least 20 KB/s") +def _monthlyLimitValidator(option, value): + if value.count(" ") != 1: + msg = "This should be a measurement followed by the units (for instance, \"5 MB\")" + raise ValueError(msg) + + rate, units = value.split(" ", 1) + acceptedUnits = ("MB", "GB", "TB") + if not rate.isdigit(): + raise ValueError("'%s' isn't an integer" % rate) + elif not units in acceptedUnits: + msg = "'%s' is an invalid unit, options include \"%s\"" % (units, "\", \"".join(acceptedUnits)) + raise ValueError(msg) + def _bridgeDestinationValidator(option, value): if value.count(":") != 1: raise ValueError("Bridges are of the form '<ip address>:<port>'")

1 0

[arm/master] fix: workaround for textpad insert mode issues
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit dd81736d16d638343b3954f2def575378b5ea309 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 3 16:54:53 2011 -0700 fix: workaround for textpad insert mode issues The insert mode of the textpad class has a couple issues: - it's only available in Python 2.6+ - if the text doens't have the default formatting then it doens't work (input is replacement mode instead) This drops usage for the insert mode flag, instead doing it ourselves via arm's textpad validator. This is kinda vital for the wizard since that text has attibutes and not having insert mode there was pretty painful. --- src/util/panel.py | 29 +++++++++++++++++++---------- src/util/uiTools.py | 8 +++++--- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/util/panel.py b/src/util/panel.py index 59d2b13..1be2306 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -2,11 +2,11 @@ Wrapper for safely working with curses subwindows. """ -import sys import copy import time import traceback import curses +import curses.ascii import curses.textpad from threading import RLock @@ -613,15 +613,9 @@ class Panel(): # Displays the text field, blocking until the user's done. This closes the # text panel and returns userInput to the initial text if the user presses - # escape. Insert mode is available in Python 2.6+, before that the - # constructor only accepted a subwindow argument as per: - # https://trac.torproject.org/projects/tor/ticket/2354 + # escape. - majorVersion, minorVersion = sys.version_info[:2] - if majorVersion == 2 and minorVersion >= 6: - textbox = curses.textpad.Textbox(inputSubwindow, True) - else: - textbox = curses.textpad.Textbox(inputSubwindow) + textbox = curses.textpad.Textbox(inputSubwindow) textbox.win.attron(format) userInput = textbox.edit(lambda key: _textboxValidate(textbox, key)).strip() @@ -738,7 +732,22 @@ def _textboxValidate(textbox, key): """ y, x = textbox.win.getyx() - if key == 27: + + if curses.ascii.isprint(key) and x < textbox.maxx: + # Shifts the existing text forward so input is an insert method rather + # than replacement. The curses.textpad accepts an insert mode flag but + # this has a couple issues... + # - The flag is only available for Python 2.6+, before that the + # constructor only accepted a subwindow argument as per: + # https://trac.torproject.org/projects/tor/ticket/2354 + # - The textpad doesn't shift text that has text attributes. This is + # because keycodes read by textbox.win.inch() includes formatting, + # causing the curses.ascii.isprint() check it does to fail. + + currentInput = textbox.gather() + textbox.win.addstr(y, x + 1, currentInput[x:textbox.maxx - 1]) + textbox.win.move(y, x) # reverts cursor movement during gather call + elif key == 27: # curses.ascii.BEL is a character codes that causes textpad to terminate return curses.ascii.BEL elif key == curses.KEY_HOME: diff --git a/src/util/uiTools.py b/src/util/uiTools.py index 52885de..68b93af 100644 --- a/src/util/uiTools.py +++ b/src/util/uiTools.py @@ -282,15 +282,17 @@ def cropStr(msg, size, minWordLen = 4, minCrop = 0, endType = Ending.ELLIPSE, ge if getRemainder: return (returnMsg, remainder) else: return returnMsg -def padStr(msg, size): +def padStr(msg, size, cropExtra = False): """ Provides the string padded with whitespace to the given length. Arguments: - msg - string to be padded - size - length to be padded to + msg - string to be padded + size - length to be padded to + cropExtra - crops string if it's longer than the size if true """ + if cropExtra: msg = msg[:size] return ("%%-%is" % size) % msg def camelCase(label, divider = "_", joiner = " "):

1 0

[arm/master] Input field validation for bandwith rates
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit 90fba07ce66de9e811aa762b835b769a254c438b Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 3 10:39:51 2011 -0700 Input field validation for bandwith rates --- src/cli/wizard.py | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 219c6b6..43d107b 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -210,6 +210,7 @@ def showWizard(): else: config[option] = ConfigOption(option, "opt", default) # sets input validators + config[Options.BANDWIDTH].setValidator(_relayRateValidator) config[Options.BRIDGE1].setValidator(_bridgeDestinationValidator) config[Options.BRIDGE2].setValidator(_bridgeDestinationValidator) config[Options.BRIDGE3].setValidator(_bridgeDestinationValidator) @@ -391,7 +392,7 @@ def promptConfigOptions(relayType, config): if newValue: try: options[selection].setValue(newValue.strip()) except ValueError, exc: - cli.popups.showMsg(str(exc), 2) + cli.popups.showMsg(str(exc), 3) cli.controller.getController().requestRedraw(True) elif key == 27: selection, key = -1, curses.KEY_ENTER # esc - cancel finally: @@ -428,6 +429,21 @@ def _toggleEnabledAction(toggleOptions, option, value): for opt in toggleOptions: opt.setEnabled(value) +def _relayRateValidator(option, value): + if value.count(" ") != 1: + msg = "This should be a measurement followed by the rate (for instance, \"5 MB/s\")" + raise ValueError(msg) + + rate, units = value.split(" ", 1) + acceptedUnits = ("KB/s", "MB/s", "GB/s") + if not rate.isdigit(): + raise ValueError("'%s' isn't an integer" % rate) + elif not units in acceptedUnits: + msg = "'%s' is an invalid rate, options include \"%s\"" % (units, "\", \"".join(acceptedUnits)) + raise ValueError(msg) + elif (int(rate) < 20 and units == "KB/s") or int(rate) < 1: + raise ValueError("To be usable as a relay the rate must be at least 20 KB/s") + def _bridgeDestinationValidator(option, value): if value.count(":") != 1: raise ValueError("Bridges are of the form '<ip address>:<port>'")

1 0

[arm/master] Input field validation for circ reuse durations
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit 5e0178152ddf08b4c1a8011dc74667c65c9a750a Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 3 18:08:36 2011 -0700 Input field validation for circ reuse durations --- src/cli/wizard.py | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 16752e7..80d2fd1 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -215,6 +215,7 @@ def showWizard(): config[Options.BRIDGE1].setValidator(_bridgeDestinationValidator) config[Options.BRIDGE2].setValidator(_bridgeDestinationValidator) config[Options.BRIDGE3].setValidator(_bridgeDestinationValidator) + config[Options.REUSE].setValidator(_circDurationValidator) # enables custom policies when 'custom' is selected and disables otherwise policyOpt = config[Options.POLICY] @@ -432,7 +433,7 @@ def _toggleEnabledAction(toggleOptions, option, value): def _relayRateValidator(option, value): if value.count(" ") != 1: - msg = "This should be a measurement followed by the rate (for instance, \"5 MB/s\")" + msg = "This should be a rate measurement (for instance, \"5 MB/s\")" raise ValueError(msg) rate, units = value.split(" ", 1) @@ -447,7 +448,7 @@ def _relayRateValidator(option, value): def _monthlyLimitValidator(option, value): if value.count(" ") != 1: - msg = "This should be a measurement followed by the units (for instance, \"5 MB\")" + msg = "This should be a traffic size (for instance, \"5 MB\")" raise ValueError(msg) rate, units = value.split(" ", 1) @@ -457,6 +458,8 @@ def _monthlyLimitValidator(option, value): elif not units in acceptedUnits: msg = "'%s' is an invalid unit, options include \"%s\"" % (units, "\", \"".join(acceptedUnits)) raise ValueError(msg) + elif (int(rate) < 50 and units == "MB") or int(rate) < 1: + raise ValueError("To be usable as a relay's monthly limit should be at least 50 MB") def _bridgeDestinationValidator(option, value): if value.count(":") != 1: @@ -468,3 +471,18 @@ def _bridgeDestinationValidator(option, value): elif not port.isdigit() or int(port) < 0 or int(port) > 65535: raise ValueError("'%s' isn't a valid port number" % port) +def _circDurationValidator(option, value): + if value.count(" ") != 1: + msg = "This should be a time measurement (for instance, \"10 minutes\")" + raise ValueError(msg) + + rate, units = value.split(" ", 1) + acceptedUnits = ("minute", "minutes", "hour", "hours") + if not rate.isdigit(): + raise ValueError("'%s' isn't an integer" % rate) + elif not units in acceptedUnits: + msg = "'%s' is an invalid rate, options include \"minutes\" or \"hours\"" + raise ValueError(msg) + elif (int(rate) < 5 and units in ("minute", "minutes")) or int(rate) < 1: + raise ValueError("This would cause high network load, don't set this to less than five minutes") +

1 0