- tor-commits - lists.torproject.org

[gettor/master] Add a hack so we are still able to answer to users requesting
by kaner＠torproject.org 04 Sep '11

04 Sep '11

commit 64bb565ad1a7785fdd4a65f92ba26f73425c4e63 Author: Christian Fromme <kaner(a)strace.org> Date: Sun Sep 4 14:40:17 2011 +0200 Add a hack so we are still able to answer to users requesting "tor-browser-bundle" --- lib/gettor/requests.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/lib/gettor/requests.py b/lib/gettor/requests.py index 2ee275e..1a9cdac 100644 --- a/lib/gettor/requests.py +++ b/lib/gettor/requests.py @@ -96,6 +96,10 @@ class requestMail: def matchPackage(self, line): """Look up which package the user is requesting. """ + # XXX HACK ALERT: This makes it possible for users to still request + # the windows bundle by its old name + packages_hacked = self.config.PACKAGES + packages_hacked['tor-browser-bundle'] = () for p in self.config.PACKAGES.keys(): matchme = ".*" + p + ".*" match = re.match(matchme, line, re.DOTALL)

1 0

r25010: {website} Updated the package names for en, fr, pl (in website/trunk/projects: en fr pl)
by Christian Fromme 04 Sep '11

04 Sep '11

Author: kaner Date: 2011-09-04 12:05:03 +0000 (Sun, 04 Sep 2011) New Revision: 25010 Modified: website/trunk/projects/en/gettor.wml website/trunk/projects/fr/gettor.wml website/trunk/projects/pl/gettor.wml Log: Updated the package names for en, fr, pl Modified: website/trunk/projects/en/gettor.wml =================================================================== --- website/trunk/projects/en/gettor.wml 2011-09-04 11:35:15 UTC (rev 25009) +++ website/trunk/projects/en/gettor.wml 2011-09-04 12:05:03 UTC (rev 25010) @@ -42,12 +42,12 @@ I am sorry, but your request was not understood. Please select one of the following package names: - panther-bundle - source-bundle - windows-bundle - tiger-bundle - tor-browser-bundle - tor-im-browser-bundle + windows + macos-i386 + macos-ppc + linux-i386 + linux-x86_64 + source Please send me another email. It only needs a single package name anywhere in the body of your email. Modified: website/trunk/projects/fr/gettor.wml =================================================================== --- website/trunk/projects/fr/gettor.wml 2011-09-04 11:35:15 UTC (rev 25009) +++ website/trunk/projects/fr/gettor.wml 2011-09-04 12:05:03 UTC (rev 25010) @@ -48,12 +48,12 @@ I am sorry, but your request was not understood. Please select one of the following package names: - panther-bundle - source-bundle - windows-bundle - tiger-bundle - tor-browser-bundle - tor-im-browser-bundle + windows + macos-i386 + macos-ppc + linux-i386 + linux-x86_64 + source Please send me another email. It only needs a single package name anywhere in the body of your email. </pre> Modified: website/trunk/projects/pl/gettor.wml =================================================================== --- website/trunk/projects/pl/gettor.wml 2011-09-04 11:35:15 UTC (rev 25009) +++ website/trunk/projects/pl/gettor.wml 2011-09-04 12:05:03 UTC (rev 25010) @@ -48,12 +48,12 @@ I am sorry, but your request was not understood. Please select one of the following package names: - panther-bundle - source-bundle - windows-bundle - tiger-bundle - tor-browser-bundle - tor-im-browser-bundle + windows + macos-i386 + macos-ppc + linux-i386 + linux-x86_64 + source Please send me another email. It only needs a single package name anywhere in the body of your email.

1 0

r25009: {website} updated de/navigation.wmi from sacro (website/trunk/include/de)
by Runa Sandvik 04 Sep '11

04 Sep '11

Author: runa Date: 2011-09-04 11:35:15 +0000 (Sun, 04 Sep 2011) New Revision: 25009 Modified: website/trunk/include/de/navigation.wmi Log: updated de/navigation.wmi from sacro Modified: website/trunk/include/de/navigation.wmi =================================================================== --- website/trunk/include/de/navigation.wmi 2011-09-03 22:35:29 UTC (rev 25008) +++ website/trunk/include/de/navigation.wmi 2011-09-04 11:35:15 UTC (rev 25009) @@ -1,4 +1,4 @@ -#!/usr/bin/wml +#!/usr/bin/wml ## translation metadata # Revision: $Revision$ @@ -18,7 +18,7 @@ my @calltoaction = ( 'download/download' , 'Download', 'donate/donate' , 'Spenden', - 'getinvolved/volunteer' , 'Engagiere Dich', + 'getinvolved/volunteer' , 'Engagement', ); :>

1 0

[gettor/master] Add a note about the large size of the macosx-i386 browser bundle.
by kaner＠torproject.org 04 Sep '11

04 Sep '11

commit 707dc6db95b53486c4082f0605f7ab222d291de8 Author: Christian Fromme <kaner(a)strace.org> Date: Sun Sep 4 11:20:45 2011 +0200 Add a note about the large size of the macosx-i386 browser bundle. --- lib/gettor/responses.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/lib/gettor/responses.py b/lib/gettor/responses.py index d293b23..d8bcae3 100644 --- a/lib/gettor/responses.py +++ b/lib/gettor/responses.py @@ -27,7 +27,8 @@ def getPackageHelpText(t): return t.gettext(i18n.GETTOR_TEXT[6]) + "\n\n" \ + t.gettext(i18n.GETTOR_TEXT[46]) + "\n\n" \ + t.gettext(i18n.GETTOR_TEXT[47]) + "\n\n" \ - + t.gettext(i18n.GETTOR_TEXT[48]) + "\n\n" \ + + t.gettext(i18n.GETTOR_TEXT[48]) + "\n" \ + + t.gettext(i18n.GETTOR_TEXT[51]) + "\n\n" \ + t.gettext(i18n.GETTOR_TEXT[49]) + "\n\n" \ + t.gettext(i18n.GETTOR_TEXT[50]) + "\n" \ + t.gettext(i18n.GETTOR_TEXT[51]) + "\n\n" \

1 0

[torbel/master] Allow users to enter a port
by sebastian＠torproject.org 04 Sep '11

04 Sep '11

commit b16ed8464acb8eb0463cde10c00066fc9e5ec322 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Sep 4 10:05:14 2011 +0200 Allow users to enter a port --- bulklist.fcgi | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/bulklist.fcgi b/bulklist.fcgi index 1e28f01..ccd96b4 100755 --- a/bulklist.fcgi +++ b/bulklist.fcgi @@ -44,14 +44,13 @@ def app(environ, start_response): q = parse_qs(environ['QUERY_STRING']) - ip = escape(q.get('ip', [''])[0]) + orig_ip = escape(q.get('ip', [''])[0]) port = escape(q.get('port', [''])[0]) - if ip != "": - try: - ip = query.ip_from_string(ip) - except socket.error: - ip = 0 + try: + ip = query.ip_from_string(orig_ip) + except socket.error: + ip = 0 if ip != 0: try: @@ -71,7 +70,7 @@ def app(environ, start_response): for i in exits: yield '%s\n' % IPAddress(i) else: - start_response('200 OK', [('Content-Type', 'text/plain')]) + start_response('200 OK', [('Content-Type', 'text/html')]) yield '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" ' yield '"http://www.w3.org/TR/REC-html40/loose.dtd">\n' yield '<html>\n' @@ -102,6 +101,8 @@ def app(environ, start_response): yield 'Please enter an IP address:<br>\n' yield '<form action="/cgi-bin/TorBulkExitList.py" name="ip">\n' yield '<input type="text" name="ip"><br>\n' + yield 'and optionally a Port:<br>\n' + yield '<input type="text" name="port"><br>\n' yield '<input type="submit" value="Submit">' yield '</form>'

1 0

[torbel/master] Fix bulklist error when no ip is given
by sebastian＠torproject.org 04 Sep '11

04 Sep '11

commit 1097384c848d4fbfc2539df4b15df1bc7c7d98d6 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Sep 4 09:56:44 2011 +0200 Fix bulklist error when no ip is given --- bulklist.fcgi | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bulklist.fcgi b/bulklist.fcgi index 5b1913a..1e28f01 100755 --- a/bulklist.fcgi +++ b/bulklist.fcgi @@ -49,7 +49,7 @@ def app(environ, start_response): if ip != "": try: - ip = query.ip_from_string(ip) + ip = query.ip_from_string(ip) except socket.error: ip = 0 @@ -85,7 +85,7 @@ def app(environ, start_response): yield '<body>\n' yield '<center>\n' yield '\n' - yield '<br>\n'); + yield '<br>\n' yield '\n'

1 0

[torbel/master] Steal most of the bulklist text from the old script
by sebastian＠torproject.org 04 Sep '11

04 Sep '11

commit 2de22deb9d76f99bd15c239957b6b538251044fc Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Sep 4 09:52:35 2011 +0200 Steal most of the bulklist text from the old script --- bulklist.fcgi | 38 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 36 insertions(+), 2 deletions(-) diff --git a/bulklist.fcgi b/bulklist.fcgi index 92dfcff..5b1913a 100755 --- a/bulklist.fcgi +++ b/bulklist.fcgi @@ -72,8 +72,42 @@ def app(environ, start_response): yield '%s\n' % IPAddress(i) else: start_response('200 OK', [('Content-Type', 'text/plain')]) - yield 'bai' - + yield '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" ' + yield '"http://www.w3.org/TR/REC-html40/loose.dtd">\n' + yield '<html>\n' + yield '<head>\n' + yield '<meta http-equiv="content-type" content="text/html; ' + yield 'charset=utf-8">\n' + yield '<title>Bulk Tor Exit Exporter</title>\n' + yield '<link rel="shortcut icon" type="image/x-icon" ' + yield 'href="./favicon.ico">\n' + yield '</head>\n' + yield '<body>\n' + yield '<center>\n' + yield '\n' + yield '<br>\n'); + + yield '\n' + + yield 'Welcome to the Tor Bulk Exit List exporting tool.<br><br>\n' + yield 'If you are a service provider and you wish to build a list ' + yield 'of possible Tor nodes that might contact one of your servers, ' + yield 'enter that single server address below. Giving you the whole ' + yield 'list means you can query the list privately, rather than ' + yield 'telling us your users\' IP addresses.\n' + yield 'This list allows you to have a nearly real time authoritative ' + yield 'source for Tor exits that allow contacting your server on ' + yield 'port 80 or the given port.<br><br>\n' + + yield 'Please enter an IP address:<br>\n' + yield '<form action="/cgi-bin/TorBulkExitList.py" name="ip">\n' + yield '<input type="text" name="ip"><br>\n' + yield '<input type="submit" value="Submit">' + yield '</form>' + + yield '</center>\n' + yield '</body>' + yield '</html>' if __name__ == "__main__": WSGIServer(app).run()

1 0

[torbel/master] Implement narrow port test and recording.
by sebastian＠torproject.org 04 Sep '11

04 Sep '11

commit 3b7eb46407e934ffb6f5d7a77304815017fb0ed4 Author: Harry Bock <hbock(a)ele.uri.edu> Date: Tue Sep 7 17:42:32 2010 -0400 Implement narrow port test and recording. --- controller.py | 42 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 34 insertions(+), 8 deletions(-) diff --git a/controller.py b/controller.py index 3a1258e..29beaff 100644 --- a/controller.py +++ b/controller.py @@ -16,7 +16,7 @@ from datetime import datetime, timedelta if sys.version_info >= (2,6): import json - + # TODO: Choose the best reactor for the platform. from twisted.internet import epollreactor epollreactor.install() @@ -233,6 +233,9 @@ class Controller(TorCtl.EventHandler): if not config.test_host: config.test_host = conn.get_info("address")["address"] + # Resolve config.test_host for later use. + self.test_ip = socket.gethostbyname(config.test_host) + log.notice("Our external test IP address should be %s.", config.test_host) # Build a list of Guard routers, so we have a list of reliable @@ -259,7 +262,7 @@ class Controller(TorCtl.EventHandler): router, controller = self) reactor.connectTCP(config.tor_host, config.tor_port, f) return f.connectDeferred - + for port in router.current_test.test_ports: # Initiate bookkeeping for this stream, tracking it # by source port, useful when we only have a socket as reference. @@ -278,7 +281,7 @@ class Controller(TorCtl.EventHandler): def closeCallback(sport): self.stream_remove(source_port = sport) - + connect = socksConnect(router, port) connect.addCallback(connectCallback) @@ -344,6 +347,14 @@ class Controller(TorCtl.EventHandler): if router.current_test.is_complete(): self.end_test(router) + def narrow(self, router, port): + """ Mark port as working for router's current test, and end the test if + it is complete. """ + if router.current_test: + router.current_test.narrow(port) + if router.current_test.is_complete(): + self.end_test(router) + def failed(self, router, port): """ Mark port as failed for router's current test, and end the test if it is complete. """ @@ -788,10 +799,22 @@ class Controller(TorCtl.EventHandler): router = stream.router if event.reason == "END": - fail = True + fail = True + narrow = False # The router is not allowing traffic to this port currently. if event.remote_reason == "EXITPOLICY": - fail = True + # If this is due to it being a narrow exit, mark it as + # such. + if router.is_narrow_exit(self.test_ip, event.target_port): + fail = False + narrow = True + log.debug("Narrow exit: %s %s", + router.nickname, + router.exit_policy_string()) + # Otherwise, this is a general exit policy failure. + else: + fail = True + # This router is hibernating and will not allow traffic. elif event.remote_reason == "HIBERNATING": # TODO: Mark as inaccessible. @@ -831,10 +854,13 @@ class Controller(TorCtl.EventHandler): # Bail if we closed. return - if fail: - self.failed(stream.router, event.target_port) + if narrow: + self.narrow(stream.router, event.target_port) else: - self.passed(stream.router, event.target_port) + if fail: + self.failed(stream.router, event.target_port) + else: + self.passed(stream.router, event.target_port) return

1 0

[torbel/master] query.ExitList expects filename argument
by sebastian＠torproject.org 04 Sep '11

04 Sep '11

commit 1b61735a60a2e23e84609accac2931c48b5775cd Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Sep 2 05:26:03 2011 +0200 query.ExitList expects filename argument --- checkweb.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checkweb.py b/checkweb.py index c3d90ab..1d7d799 100755 --- a/checkweb.py +++ b/checkweb.py @@ -5,7 +5,7 @@ from cgi import escape from logger import * from flup.server.fcgi import WSGIServer -elist = query.ExitList(csv_file = "bel_export.csv") +elist = query.ExitList(filename = "bel_export.csv") port = 8000 log = get_logger("WSGITest")

1 0

[torbel/master] Fix bug in torbel.query gzip import support.
by sebastian＠torproject.org 04 Sep '11

04 Sep '11

commit 2989b4f608c029523944fa3697c302f56547b642 Author: Harry Bock <hbock(a)ele.uri.edu> Date: Sat Sep 18 21:14:50 2010 -0400 Fix bug in torbel.query gzip import support. Missing a negative sign in the index. --- query.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/query.py b/query.py index f1d0046..69e9ec9 100644 --- a/query.py +++ b/query.py @@ -265,7 +265,7 @@ class ExitList: gzipped. """ if filename.endswith(".gz"): infile = gzip.open(filename, "rb") - filename = filename[:3] + filename = filename[:-3] else: infile = open(filename, "rb")

1 0