- tor-commits - lists.torproject.org

[flashproxy/master] Rearrange Makefile.
by dcf＠torproject.org 13 Nov '12

13 Nov '12

commit dc85b06b491fc17a838436b38556e3768dcebffb Author: David Fifield <david(a)bamsoftware.com> Date: Mon Nov 12 20:14:41 2012 -0800 Rearrange Makefile. Put the man page target above the phony targets. --- Makefile | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 361fdf3..ce34812 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,11 @@ CLIENT_DIST_FILES = $(CLIENT_BIN) README LICENSE torrc all: : +%.1: %.1.txt + rm -f $@ + a2x --no-xmllint --xsltproc-opts "--stringparam man.th.title.max.length 23" \ + -d manpage -f manpage $< + install: mkdir -p $(BINDIR) mkdir -p $(MANDIR)/man1 @@ -44,9 +49,4 @@ sign: dist/$(DISTNAME).zip cd dist && gpg --sign --detach-sign --armor $(DISTNAME).zip cd dist && gpg --verify $(DISTNAME).zip.asc $(DISTNAME).zip -%.1: %.1.txt - rm -f $@ - a2x --no-xmllint --xsltproc-opts "--stringparam man.th.title.max.length 23" \ - -d manpage -f manpage $< - .PHONY: all install clean test dist sign

1 0

[flashproxy/master] Make "all" depends on dist files.
by dcf＠torproject.org 13 Nov '12

13 Nov '12

commit 7b37124b95153b6119a3fa3a4f72f3b8c53a2b73 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Nov 12 20:16:22 2012 -0800 Make "all" depends on dist files. --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index ce34812..a4682cd 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ CLIENT_BIN = flashproxy-client flashproxy-reg-email flashproxy-reg-http CLIENT_MAN = doc/flashproxy-client.1 doc/flashproxy-reg-email.1 doc/flashproxy-reg-http.1 CLIENT_DIST_FILES = $(CLIENT_BIN) README LICENSE torrc -all: +all: $(CLIENT_DIST_FILES) $(CLIENT_MAN) : %.1: %.1.txt

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 13 Nov '12

13 Nov '12

commit b3f7584924186605f053017ee242e044caf2928f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 13 03:45:25 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index e794588..d0aa191 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-12 18:49+0000\n" +"PO-Revision-Date: 2012-11-13 03:31+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -2615,7 +2615,7 @@ msgstr "Mi proveedor de internet (ISP) bloquea conexiones a la red Tor" msgctxt "NetworkPage" msgid "Bridge Settings" -msgstr "Configuración de Puentes" +msgstr "Configuración de Puentes (bridges)" msgctxt "NetworkPage" msgid "Add a Bridge:"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 13 Nov '12

13 Nov '12

commit 97625a32c4dc29908750dba2adb939ae7ec4a4f2 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 13 03:45:18 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index e794588..d0aa191 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-12 18:49+0000\n" +"PO-Revision-Date: 2012-11-13 03:31+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -2615,7 +2615,7 @@ msgstr "Mi proveedor de internet (ISP) bloquea conexiones a la red Tor" msgctxt "NetworkPage" msgid "Bridge Settings" -msgstr "Configuración de Puentes" +msgstr "Configuración de Puentes (bridges)" msgctxt "NetworkPage" msgid "Add a Bridge:"

1 0

r25879: {website} Correcting OPW anchor link Huh. I wonder how I screwed that (website/trunk/getinvolved/en)
by Damian Johnson 13 Nov '12

13 Nov '12

Author: atagar Date: 2012-11-13 03:20:32 +0000 (Tue, 13 Nov 2012) New Revision: 25879 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Correcting OPW anchor link Huh. I wonder how I screwed that up. Modified: website/trunk/getinvolved/en/volunteer.wml =================================================================== --- website/trunk/getinvolved/en/volunteer.wml 2012-11-13 03:10:18 UTC (rev 25878) +++ website/trunk/getinvolved/en/volunteer.wml 2012-11-13 03:20:32 UTC (rev 25879) @@ -65,7 +65,7 @@ </ol> <a id="opw"></a> - <h2><a class="anchor" href="#OPW">Outreach Program for Women</a></h2> + <h2><a class="anchor" href="#opw">Outreach Program for Women</a></h2> <p> Several organisations, including Tor, are taking part in the <a

1 0

r25878: {website} Updating MAT url MAT has a new subdomain on tail's site. Cor (website/trunk/about/en)
by Damian Johnson 13 Nov '12

13 Nov '12

Author: atagar Date: 2012-11-13 03:10:18 +0000 (Tue, 13 Nov 2012) New Revision: 25878 Modified: website/trunk/about/en/volunteers.wml Log: Updating MAT url MAT has a new subdomain on tail's site. Correction by Griffin Boyce. Modified: website/trunk/about/en/volunteers.wml =================================================================== --- website/trunk/about/en/volunteers.wml 2012-11-13 02:03:01 UTC (rev 25877) +++ website/trunk/about/en/volunteers.wml 2012-11-13 03:10:18 UTC (rev 25878) @@ -22,7 +22,7 @@ <dt>Google Summer of Code, 2011</dt><dd> Brandon Wiley - <a href="http://stepthreeprivacy.org/">Blocking-resistant Transport Evaluation Framework</a><br /> George Kadianakis - <a href="https://gitorious.org/obfsproxy/pages/Home">Pluggable transports</a><br /> -Julien Voisin - <a href="http://mat-tor.blogspot.com/">Metadata Anonymisation Toolkit</a><br /> +Julien Voisin - <a href="https://mat.boum.org/">Metadata Anonymisation Toolkit</a><br /> Kamran Khan - <a href="http://code.inspirated.com/">GTK+ Frontend and Client Mode Improvements for arm</a><br /> Max - <a href="https://tails.boum.org/todo/TailsGreeter/blog/">Custom GDM3 startup menu, aka. tails-greeter</a><br /> Sathyanarayanan Gunasekaran - <a href="http://gsathya.in/blog/">GSoC : Orbot + ORLib</a></dd>

1 0

r25877: {website} make tpo/torbrowser rewrite to torbrowser.html.en. (website/trunk)
by Andrew Lewman 13 Nov '12

13 Nov '12

Author: phobos Date: 2012-11-13 02:03:01 +0000 (Tue, 13 Nov 2012) New Revision: 25877 Modified: website/trunk/.htaccess Log: make tpo/torbrowser rewrite to torbrowser.html.en. Modified: website/trunk/.htaccess =================================================================== --- website/trunk/.htaccess 2012-11-12 17:08:02 UTC (rev 25876) +++ website/trunk/.htaccess 2012-11-13 02:03:01 UTC (rev 25877) @@ -13,7 +13,7 @@ # Tor Browser RewriteRule ^torbrowser/dist/(.*) /dist/torbrowser/$1 [R=301,L] -RewriteRule ^torbrowser/$ /projects/torbrowser [R=301,L] +RewriteRule ^torbrowser/$ /projects/torbrowser.html.en [R=301,L] RewriteRule ^torbrowser(.*) /projects/torbrowser$1 [R=301,L] # Overview

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 12 Nov '12

12 Nov '12

commit 0948e769db44267d0066a17cb7dea1a1022c5681 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 12 23:15:53 2012 +0000 Update translations for tails-persistence-setup --- el/el.po | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/el/el.po b/el/el.po index 21bb20c..029f9ba 100644 --- a/el/el.po +++ b/el/el.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <dpdt1(a)espiv.net>, 2012. # <jcbgr(a)yahoo.co.uk>, 2012. # <soldizach(a)gmail.com>, 2012. msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-10-29 19:33+0100\n" -"PO-Revision-Date: 2012-11-03 14:28+0000\n" -"Last-Translator: jcbgr <jcbgr(a)yahoo.co.uk>\n" +"PO-Revision-Date: 2012-11-12 22:53+0000\n" +"Last-Translator: dpdt1 <dpdt1(a)espiv.net>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,7 +46,7 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:78 msgid "Pidgin" -msgstr "" +msgstr "Pidgin" #: ../lib/Tails/Persistence/Configuration/Presets.pm:80 msgid "Pidgin profiles and OTR keyring" @@ -69,7 +70,7 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:108 msgid "Network Connections" -msgstr "" +msgstr "Συνδέσεις Δικτύου" #: ../lib/Tails/Persistence/Configuration/Presets.pm:110 msgid "Configuration of network devices and connections" @@ -168,7 +169,7 @@ msgstr "" #: ../lib/Tails/Persistence/Setup.pm:554 msgid "Error" -msgstr "" +msgstr "Σφάλμα" #: ../lib/Tails/Persistence/Setup.pm:861 msgid "Persistence wizard - Finished"

1 0

[ooni-probe/master] Port UK Mobile Network test to new API
by art＠torproject.org 12 Nov '12

12 Nov '12

commit e115d4d0e6c063422fc35cbe1a63dcf0f5917a77 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Nov 12 23:05:21 2012 +0100 Port UK Mobile Network test to new API --- nettests/core/http_uk_mobile_networks.py | 85 +++++++++++++++++++++++++++ to-be-ported/old-api/httpt.py | 94 ------------------------------ 2 files changed, 85 insertions(+), 94 deletions(-) diff --git a/nettests/core/http_uk_mobile_networks.py b/nettests/core/http_uk_mobile_networks.py new file mode 100644 index 0000000..784a9e9 --- /dev/null +++ b/nettests/core/http_uk_mobile_networks.py @@ -0,0 +1,85 @@ +# -*- encoding: utf-8 -*- +import yaml + +from twisted.python import usage +from twisted.plugin import IPlugin + +from ooni.templates import httpt +from ooni.utils import log + +class UsageOptions(usage.Options): + """ + See https://github.com/hellais/ooni-inputs/processed/uk_mobile_networks_redirec… + to see how the rules file should look like. + """ + optParameters = [ + ['rules', 'y', None, + 'Specify the redirect rules file '] + ] + +class HTTPUKMobileNetworksTest(httpt.HTTPTest): + """ + This test was thought of by Open Rights Group and implemented with the + purpose of detecting censorship in the UK. + For more details on this test see: + https://trac.torproject.org/projects/tor/ticket/6437 + XXX port the knowledge from the trac ticket into this test docstring + """ + name = "HTTP UK mobile network redirect test" + + usageOptions = UsageOptions + + followRedirects = True + + inputFile = ['urls', 'f', None, 'List of urls one per line to test for censorship'] + requiredOptions = ['urls'] + + def testPattern(self, value, pattern, type): + if type == 'eq': + return value == pattern + elif type == 're': + import re + if re.match(pattern, value): + return True + else: + return False + else: + return None + + def testPatterns(self, patterns, location): + test_result = False + + if type(patterns) == list: + for pattern in patterns: + test_result |= self.testPattern(location, pattern['value'], pattern['type']) + rules_file = self.localOptions['rules'] + + return test_result + + def testRules(self, rules, location): + result = {} + blocked = False + for rule, value in rules.items(): + current_rule = {} + current_rule['name'] = value['name'] + current_rule['patterns'] = value['patterns'] + current_rule['test'] = self.testPatterns(value['patterns'], location) + blocked |= current_rule['test'] + result[rule] = current_rule + result['blocked'] = blocked + return result + + def processRedirect(self, location): + self.report['redirect'] = None + rules_file = self.localOptions['rules'] + + fp = open(rules_file) + rules = yaml.safe_load(fp) + fp.close() + + log.msg("Testing rules %s" % rules) + redirect = self.testRules(rules, location) + self.report['redirect'] = redirect + + + diff --git a/to-be-ported/old-api/httpt.py b/to-be-ported/old-api/httpt.py deleted file mode 100644 index 358f1ea..0000000 --- a/to-be-ported/old-api/httpt.py +++ /dev/null @@ -1,94 +0,0 @@ -""" -This is a self genrated test created by scaffolding.py. -you will need to fill it up with all your necessities. -Safe hacking :). -""" -from zope.interface import implements -from twisted.python import usage -from twisted.plugin import IPlugin -from ooni.plugoo.tests import ITest, OONITest -from ooni.plugoo.assets import Asset -from ooni.protocols import http -from ooni.utils import log - -class httptArgs(usage.Options): - optParameters = [['urls', 'f', None, 'Urls file'], - ['url', 'u', 'http://torproject.org/', 'Test single site'], - ['resume', 'r', 0, 'Resume at this index'], - ['rules', 'y', None, 'Specify the redirect rules file']] - -class httptTest(http.HTTPTest): - implements(IPlugin, ITest) - - shortName = "httpt" - description = "httpt" - requirements = None - options = httptArgs - blocking = False - - - def testPattern(self, value, pattern, type): - if type == 'eq': - return value == pattern - elif type == 're': - import re - if re.match(pattern, value): - return True - else: - return False - else: - return None - - def testPatterns(self, patterns, location): - test_result = False - - if type(patterns) == list: - for pattern in patterns: - test_result |= self.testPattern(location, pattern['value'], pattern['type']) - else: - test_result |= self.testPattern(location, patterns['value'], patterns['type']) - - return test_result - - def testRules(self, rules, location): - result = {} - blocked = False - for rule, value in rules.items(): - current_rule = {} - current_rule['name'] = value['name'] - current_rule['patterns'] = value['patterns'] - current_rule['test'] = self.testPatterns(value['patterns'], location) - blocked |= current_rule['test'] - result[rule] = current_rule - result['blocked'] = blocked - return result - - def processRedirect(self, location): - self.result['redirect'] = None - try: - rules_file = self.local_options['rules'] - import yaml - rules = yaml.load(open(rules_file)) - log.msg("Testing rules %s" % rules) - redirect = self.testRules(rules, location) - self.result['redirect'] = redirect - except TypeError: - log.msg("No rules file. Got a redirect, but nothing to do.") - - - def control(self, experiment_result, args): - print self.response - print self.request - # What you return here ends up inside of the report. - log.msg("Running control") - return {} - - def load_assets(self): - if self.local_options and self.local_options['urls']: - return {'url': Asset(self.local_options['urls'])} - else: - return {} - -# We need to instantiate it otherwise getPlugins does not detect it -# XXX Find a way to load plugins without instantiating them. -#httpt = httptTest(None, None, None)

1 0

[ooni-probe/master] Do some refactoring of the NetTest class
by art＠torproject.org 12 Nov '12

12 Nov '12

commit b33ada65d3b8ddd652b1df8e89e4d14906f06004 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Nov 12 23:04:21 2012 +0100 Do some refactoring of the NetTest class * Use _setUp for setting up of test templates. --- ooni/nettest.py | 6 ++++++ ooni/runner.py | 3 ++- ooni/templates/httpt.py | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index 8d911eb..fbc5c42 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -103,6 +103,12 @@ class NetTestCase(object): requiresRoot = False localOptions = {} + def _setUp(self): + """ + This is the internal setup method to be overwritten by templates. + """ + pass + def setUp(self): """ Place here your logic to be executed when the test is being setup. diff --git a/ooni/runner.py b/ooni/runner.py index b27ed63..2b9089a 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -167,7 +167,8 @@ def runTestWithInput(test_class, test_method, test_input, oreporter): log.debug("Processing %s" % test_instance.name) # use this to keep track of the test runtime test_instance._start_time = time.time() - # call setup on the test + # call setups on the test + test_instance._setUp() test_instance.setUp() test = getattr(test_instance, test_method) diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py index 8360d7d..ee6af90 100644 --- a/ooni/templates/httpt.py +++ b/ooni/templates/httpt.py @@ -39,7 +39,7 @@ class HTTPTest(NetTestCase): randomizeUA = True followRedirects = False - def setUp(self): + def _setUp(self): log.debug("Setting up HTTPTest") try: import OpenSSL

1 0