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

[torouter/master] Merge branch 'master' of ssh://git-rw.torproject.org/torouter
by ioerror＠torproject.org 22 Aug '11

22 Aug '11

commit fb4546cfd1ab55341508271faeb556bab9c39f14 Merge: cc9579c 6caf641 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Mon Aug 22 13:27:03 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/torouter_easy_setup.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --cc packages/torouter_easy_setup.sh index 2d65481,2d65481..f5bf6c5 --- a/packages/torouter_easy_setup.sh +++ b/packages/torouter_easy_setup.sh @@@ -30,7 -30,7 +30,7 @@@ deb http://torrouter.torproject.org/tor EOF apt-key add /tmp/torouter-repo.key --apt-get update ++apt-get update --fix-missing apt-get install -t torrouter -y torouter-prep echo "We're going to trash your system now; you have 30 seconds to bail out!"

1 0

[torouter/master] add fstab entries
by ioerror＠torproject.org 22 Aug '11

22 Aug '11

commit cc9579c8b5c91c4154802b2a8ed9e431477b0a5b Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sat Aug 20 22:44:52 2011 +0200 add fstab entries --- packages/torouter-prep/configs/fstab | 2 ++ packages/torouter-prep/src/torouter_config.sh | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/packages/torouter-prep/configs/fstab b/packages/torouter-prep/configs/fstab new file mode 100644 index 0000000..292e521 --- /dev/null +++ b/packages/torouter-prep/configs/fstab @@ -0,0 +1,2 @@ +# This is the weird boot partition (hopefully ext2/3/4 later) +/dev/sda1 /boot vfat nodev,noexec,nosuid 0 0 diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh index deaa72b..106ffc3 100644 --- a/packages/torouter-prep/src/torouter_config.sh +++ b/packages/torouter-prep/src/torouter_config.sh @@ -88,6 +88,9 @@ zcat $config_dir/armrc.sample.gz > ~$ADMINUSER/.armrc # Reconfigure /etc/inittab here cp $config_dir/inittab /etc/inittab +# Reconfigure fstab +cp $config_dir/fstab /etc/fstab + # Configure the network # eth0 is our "internet" interface with a dhcp client cp $config_dir/interfaces /etc/network/interfaces

1 0

[torouter/master] Putting the / back
by runa＠torproject.org 22 Aug '11

22 Aug '11

commit 6caf6419b710e868ed9a9a66fb93c7d384d81cfc Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Mon Aug 22 12:05:43 2011 +0100 Putting the / back --- packages/torouter-prep/src/torouter_config.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh index 791a7b2..deaa72b 100644 --- a/packages/torouter-prep/src/torouter_config.sh +++ b/packages/torouter-prep/src/torouter_config.sh @@ -6,7 +6,7 @@ echo "This program will now reconfigure your Debian system into a Torouter" # For every file we touch, move it to the temp_dir and then tar it up in the end export temp_dir="`mktemp -d`" -export config_dir="/usr/share/torouter-prep/example-configs" +export config_dir="/usr/share/torouter-prep/example-configs/" # Add a user to administrate the Torouter later export ADMINUSER="torouter"

1 0

[torspec/master] Add refs and add section about our implemented GetTor
by ioerror＠torproject.org 22 Aug '11

22 Aug '11

commit 32055650ff1d5feed7aca344fd242a24aa4dac23 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Mon Aug 22 12:36:23 2011 +0200 Add refs and add section about our implemented GetTor --- gettor-spec.txt | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/gettor-spec.txt b/gettor-spec.txt index 43b126f..0a30efc 100644 --- a/gettor-spec.txt +++ b/gettor-spec.txt @@ -30,6 +30,10 @@ Security and privacy considerations should be described on a per transport basis. +2.1 Reference implementation + + We have implemented[0] a compliant GetTor that supports SMTP as a transport. + 3. SMTP transport The SMTP transport for GetTor should allow users to send any RFC822 compliant message @@ -67,3 +71,5 @@ It is suggested that any compliant GetTor instance should be written in a so called "safe" language such as Python. +[0] https://gitweb.torproject.org/gettor.git +[1] https://metrics.torproject.org/packages.html

1 0

[torspec/master] add first stab at generic GetTor spec
by ioerror＠torproject.org 22 Aug '11

22 Aug '11

commit 9f386a18c9d437ae5e32d51f0262ac83e411ac5e Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Mon Aug 22 12:21:57 2011 +0200 add first stab at generic GetTor spec --- gettor-spec.txt | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/gettor-spec.txt b/gettor-spec.txt new file mode 100644 index 0000000..43b126f --- /dev/null +++ b/gettor-spec.txt @@ -0,0 +1,69 @@ + + GetTor specification + Jacob Appelbaum + +0. Preface + + This document describes GetTor and how to properly implementation GetTor. + +1. Overview + + GetTor was created to resolve direct and indirect censorship of Tor's software. + In many countries and networks Tor's main website is blocked and would be Tor + users are unable to download even the source code to the Tor program. Other + software hosted by the Tor Project is similarly censored. The filtering + of the possible download sites is sometimes easy to bypass by using our TLS enabled + website. In other cases the website and all of the mirrors are entirely + blocked; this is a situation where a user seems to actually need Tor to fetch + Tor. We discovered that it is feasible to use alternate transport methods such + as SMTP between a non-trusted third party or with IRC and XDCC. + +2. Implementation + + Any compliant GetTor implementation will implement at least a single transport + to meet the needs of a certain class of users. It should be i18n and l10n compliant + for all user facing interactions; users should be able to manually set their + language and this should serve as their preference for localization of any + software delivered. The implementation must be free software and it should be + freely available by request from the implementation that they interface with + to download any of the other software available from that GetTor instance. + Security and privacy considerations should be described on a per transport + basis. + +3. SMTP transport + + The SMTP transport for GetTor should allow users to send any RFC822 compliant message + in any known human language; GetTor should respond in whatever language is + detected with supplementary translations in the same email. GetTor shall offer + a list of all available software in the body of the email - it should offer the + software as a list of packages and their subsequent descriptions. + +3.1 SMTP transport security considerations + + Any GetTor instance that offers SMTP as a transport should optionally implement + the checking of DKIM signatures to ensure that email is not forged. + Optionally GetTor should take an OpenPGP key from the user and encrypt the + response with a blinded message. + +3.2 SMTP transport privacy considerations + + Any GetTor instance that offers SMTP as a transport must at least store the + requester's address for the time that it takes to process a response. This + should not be written to any permanent storage medium; GetTor should function + without any long term storage excepting a cache of files that it will send to + any user who requests it. + + GetTor may optionally collect anonymized usage statistics to better understand + how GetTor[1] is in use. This must not include any personally identifying + information about any of the requester beyond language selection. + +4. Other transports + + At this time no other transports have been specified. IRC XDCC is a likely useful + system as is XMPP/Jabber with the newest OTR file sharing transport. + +5. Implementation suggestions + + It is suggested that any compliant GetTor instance should be written in a so + called "safe" language such as Python. +

1 0

[gettor/master] update the strings based on the #3383 fix
by arma＠torproject.org 22 Aug '11

22 Aug '11

commit 093b8196f9bdb93fade943a6c94905898d363416 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Aug 21 21:53:38 2011 -0400 update the strings based on the #3383 fix --- i18n/templates/gettor.pot | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/i18n/templates/gettor.pot b/i18n/templates/gettor.pot index 4f49701..1cc52a5 100644 --- a/i18n/templates/gettor.pot +++ b/i18n/templates/gettor.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-27 00:10+0100\n" +"POT-Creation-Date: 2011-08-21 21:50-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -244,24 +244,23 @@ msgstr "" #: lib/gettor/i18n.py:536 msgid "" -"Thank you for your request. \n" "It was successfully understood. Your request is currently being processed.\n" "Your package should arrive within the next ten minutes." msgstr "" -#: lib/gettor/i18n.py:540 +#: lib/gettor/i18n.py:539 msgid "" "If it doesn't arrive, the package might be too big for your mail provider.\n" "Try resending the mail from a GMAIL.COM or YAHOO.COM account." msgstr "" -#: lib/gettor/i18n.py:543 +#: lib/gettor/i18n.py:542 msgid "" "Unfortunately we are currently experiencing problems and we can't fulfill\n" "your request right now. Please be patient as we try to resolve this issue." msgstr "" -#: lib/gettor/i18n.py:546 +#: lib/gettor/i18n.py:545 msgid "" "Unfortunately there is no split package available for the package you\n" "requested. Please send us another package name or request the same package \n"

1 0

r24960: {website} change our "should i be a relay or a bridge" answer, and lin (website/trunk/docs/en)
by Roger Dingledine 22 Aug '11

22 Aug '11

Author: arma Date: 2011-08-22 01:36:47 +0000 (Mon, 22 Aug 2011) New Revision: 24960 Modified: website/trunk/docs/en/bridges.wml website/trunk/docs/en/faq.wml Log: change our "should i be a relay or a bridge" answer, and link to it from the bridge page Modified: website/trunk/docs/en/bridges.wml =================================================================== --- website/trunk/docs/en/bridges.wml 2011-08-20 20:29:55 UTC (rev 24959) +++ website/trunk/docs/en/bridges.wml 2011-08-22 01:36:47 UTC (rev 24960) @@ -149,11 +149,12 @@ <hr> - If you want to help out and you can't run a <a href="<page - docs/tor-doc-relay>">normal Tor relay</a>, you should - run a bridge relay. You can configure it either way: + If you want to help out, you should <a href="<page + docs/faq>#RelayOrBridge">decide whether you want to run a normal Tor + relay or a bridge relay</a>. You can configure your bridge either + manually or graphically: <ul> - <li> manually <a href="<page docs/faq>#torrc">edit + <li>manually <a href="<page docs/faq>#torrc">edit your torrc file</a> to be just these four lines: <pre><code> SocksPort 0 Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2011-08-20 20:29:55 UTC (rev 24959) +++ website/trunk/docs/en/faq.wml 2011-08-22 01:36:47 UTC (rev 24960) @@ -1255,20 +1255,21 @@ publically or not. - Right now, there are a small number of places in the world that filter - connections to the Tor network. So getting a lot of bridges running - right now is mostly a backup measure, a) in case the Tor network does - get blocked in more places, and b) for people who want an extra layer of - security because they're worried somebody will recognize that it's a - public Tor relay IP address they're contacting. + Right now, China is the main place in the world that filters + connections to the Tor network. So bridges are useful a) for users in + China, b) as a backup measure in case the Tor network gets blocked in + more places, and c) for people who want an extra layer of security + because they're worried somebody will recognize that it's a public + Tor relay IP address they're contacting. - So should you run a normal relay or bridge relay? If you have - lots of bandwidth, you should definitely run a normal relay — - bridge relays see very little use these days. If you're willing to - <a href="#ExitPolicies">be an exit</a>, you should definitely run a normal - relay, since we need more exits. If you can't be an exit and only have - a little bit of bandwidth, then flip a coin. Thanks for volunteering! + So should you run a normal relay or bridge relay? If you have lots + of bandwidth, you should definitely run a normal relay — the + average bridge doesn't see much load these days. If you're willing + to <a href="#ExitPolicies">be an exit</a>, you should definitely + run a normal relay, since we need more exits. If you can't be an + exit and only have a little bit of bandwidth, be a bridge. Thanks + for volunteering! <hr>

1 0

[torouter/master] Fixing minor typo while hunting down another bug
by runa＠torproject.org 21 Aug '11

21 Aug '11

commit d26ec7d068a3dc30a6464c5ea250d32d365bf699 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sun Aug 21 22:05:38 2011 +0100 Fixing minor typo while hunting down another bug --- packages/torouter-prep/src/torouter_config.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh index deaa72b..791a7b2 100644 --- a/packages/torouter-prep/src/torouter_config.sh +++ b/packages/torouter-prep/src/torouter_config.sh @@ -6,7 +6,7 @@ echo "This program will now reconfigure your Debian system into a Torouter" # For every file we touch, move it to the temp_dir and then tar it up in the end export temp_dir="`mktemp -d`" -export config_dir="/usr/share/torouter-prep/example-configs/" +export config_dir="/usr/share/torouter-prep/example-configs" # Add a user to administrate the Torouter later export ADMINUSER="torouter"

1 0

[gettor/master] Add a hack for the 'torfarsi1@torproject.org' email address.
by kaner＠torproject.org 21 Aug '11

21 Aug '11

commit e896a09ce20bcf8c59cd0118c903b72e1133d79a Author: Christian Fromme <kaner(a)strace.org> Date: Sun Aug 21 12:24:23 2011 +0200 Add a hack for the 'torfarsi1(a)torproject.org' email address. --- lib/gettor/filters.py | 11 +++++++++++ lib/gettor/requests.py | 5 ++++- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/lib/gettor/filters.py b/lib/gettor/filters.py index 558e945..4deacb0 100644 --- a/lib/gettor/filters.py +++ b/lib/gettor/filters.py @@ -43,3 +43,14 @@ def checkAddressHack(userAddress): # User address looks good. return True + +def doToAddressHack(toAddress): + """Large HACK alert: If we received an email to the address + 'torfarsi1(a)torproject.org', we understand it to reply in Farsi to that + email. + """ + if re.compile(".*torfarsi1(a)torproject.org.*").match(toAddress): + return "<gettor+fa(a)torproject.org>" + else: + return toAddress + diff --git a/lib/gettor/requests.py b/lib/gettor/requests.py index a61ac14..9cadef5 100644 --- a/lib/gettor/requests.py +++ b/lib/gettor/requests.py @@ -9,6 +9,7 @@ import logging import gettor.utils import gettor.packages +import gettor.filters class requestMail: def __init__(self, config): @@ -33,7 +34,9 @@ class requestMail: in our reply should reflect that. So, use the `To:' field from the incoming mail, but filter out everything except the gettor@ address. """ - regexGettor = '.*(<)?(gettor.*(a)torproject.org)+(?(1)>).*' + regexGettor = '.*(<)?(gettor.*@.*torproject.org)+(?(1)>).*' + toField = gettor.filters.doToAddressHack(toField) + logging.debug("toField: %s" % toField) match = re.match(regexGettor, toField) if match: return match.group(2)

1 0

[flashproxy/master] Make facilitator requests block until a reg is available.
by dcf＠torproject.org 21 Aug '11

21 Aug '11

commit 90510d7bf565f0cc9876665aa6e85b55c8e5a3c1 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Aug 21 01:20:22 2011 -0700 Make facilitator requests block until a reg is available. When a GET request happens, no longer return an empty string when there are no registrations to hand out. Instead, let the HTTP connection hang until there is something, then return. It can happen that the HTTP client (a flash proxy) disconnects before receiving its response; if we fail to send the reg that has just become available, add it back to the front of the queue to be handed out again. --- facilitator.py | 36 +++++++++++++++++++++++------------- 1 files changed, 23 insertions(+), 13 deletions(-) diff --git a/facilitator.py b/facilitator.py index b2f8304..4e14408 100755 --- a/facilitator.py +++ b/facilitator.py @@ -183,11 +183,23 @@ class RegSet(object): finally: self.cv.release() + def add_front(self, reg): + self.cv.acquire() + try: + if reg not in list(self.set): + self.set.append(reg) + self.cv.notify() + return True + else: + return False + finally: + self.cv.release() + def fetch(self): self.cv.acquire() try: - if not self.set: - return None + while not self.set: + self.cv.wait() return self.set.pop(0) finally: self.cv.release() @@ -212,13 +224,16 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): return reg = REGS.fetch() - if reg: + + try: + self.send_client(reg) log(u"proxy %s gets %s, relay %s (now %d)" % (proxy_addr_s, unicode(reg), options.relay_spec, len(REGS))) - self.send_client(reg) - else: + except socket.error: + # Something went wrong; likely the proxy disconnected without + # receiving a reg. Restore the reg to the front of the queue. + REGS.add_front(reg) log(u"proxy %s gets none" % proxy_addr_s) - self.send_client(None) def do_POST(self): client_addr_s = format_addr(self.client_address) @@ -286,13 +301,8 @@ class Handler(BaseHTTPServer.BaseHTTPRequestHandler): % (format_addr(self.client_address), repr(msg))) def send_client(self, reg): - if reg: - client_str = str(reg) - else: - # Send an empty string rather than a 404 or similar because Flash - # Player's URLLoader can't always distinguish a 404 from, say, - # "server not found." - client_str = "" + client_str = str(reg) + self.send_response(200) self.send_header("Content-Type", "x-www-form-urlencoded") self.send_header("Cache-Control", "no-cache")

1 0