November 2012 - tor-commits - lists.torproject.org

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

12 Nov '12

commit 4a741904d1697bca328b9c2d0fe16d9e710d4b33 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 12 12:46:00 2012 +0000 Update translations for torbirdy_completed --- lv/torbirdy.properties | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/lv/torbirdy.properties b/lv/torbirdy.properties new file mode 100644 index 0000000..101d1f8 --- /dev/null +++ b/lv/torbirdy.properties @@ -0,0 +1,13 @@ +torbirdy.name=TorBirdy + +torbirdy.enabled.tor=TorBirdy Iespējots: Tor +torbirdy.enabled.jondo=TorBirdy Iespējots: JonDo +torbirdy.enabled.custom=TorBirdy Iespējots: Custom Proxy +torbirdy.enabled.torification=TorBirdy Iespējots: Caurspīdīgā torifikācija +torbirdy.disabled=TorBirdy: Atspējots! + +torbirdy.email.prompt=TorBirdy atspējojā Thunderbird auto-konfigurācijas vedni, lai aizsargātu jūsu anonimitāti.⏎ ⏎ ieteiktie drošības uzstādījumi tika uzstādīti priekš %S have been set.⏎ ⏎ Tagad jūs varat manuāli konfigurēt citus konta uzstādījumus. + +torbirdy.email.advanced=Lūdzu ņemt vērā, ka mainīt lietpratīgos uzstādījumus TorBirdy NAV ieteicams.⏎ ⏎ Jums vajadzētu turpināt tikai tad, ja jūs zināt, ko darāt. +torbirdy.email.advanced.nextwarning=Rādīt šo brīdinājumu nākošreiz +torbirdy.email.advanced.title=TorBirdy Lietpratīgie uzstādījumi

1 0

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

12 Nov '12

commit 58d9d8b929ad64f1b87532abbff6cdacdd49a5f4 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 12 12:45:58 2012 +0000 Update translations for torbirdy --- lv/torbirdy.dtd | 40 ++++++++++++++++++++++++++++++++++++++++ lv/torbirdy.properties | 13 +++++++++++++ 2 files changed, 53 insertions(+), 0 deletions(-) diff --git a/lv/torbirdy.dtd b/lv/torbirdy.dtd new file mode 100644 index 0000000..8a7a9a5 --- /dev/null +++ b/lv/torbirdy.dtd @@ -0,0 +1,40 @@ +<!ENTITY torbirdy.accountprefs.title "Konta konfigurēšana"> +<!ENTITY torbirdy.accountprefs.startup.label ""> +<!ENTITY torbirdy.accountprefs.startup.key ""> +<!ENTITY torbirdy.accountprefs.minutes.label ""> +<!ENTITY torbirdy.accountprefs.minutes.key ""> +<!ENTITY torbirdy.accountprefs.minutes.trail.label ""> +<!ENTITY torbirdy.accountprefs.cancel.button ""> +<!ENTITY torbirdy.accountprefs.save.button ""> +<!ENTITY torbirdy.accountprefs.save.key ""> + +<!ENTITY torbirdy.prefs.title ""> +<!ENTITY torbirdy.prefs.save.button ""> +<!ENTITY torbirdy.prefs.save.key ""> +<!ENTITY torbirdy.prefs.cancel.button ""> +<!ENTITY torbirdy.prefs.extra2.button ""> +<!ENTITY torbirdy.prefs.extra2.key ""> +<!ENTITY torbirdy.prefs.proxy.label ""> +<!ENTITY torbirdy.prefs.privacy.label ""> +<!ENTITY torbirdy.prefs.recommended.text ""> +<!ENTITY torbirdy.prefs.recommended.key ""> +<!ENTITY torbirdy.prefs.anonservice.text ""> +<!ENTITY torbirdy.prefs.anonservice.key ""> +<!ENTITY torbirdy.prefs.customsettings.text ""> +<!ENTITY torbirdy.prefs.customsettings.key ""> +<!ENTITY torbirdy.prefs.socks_host.label ""> +<!ENTITY torbirdy.prefs.socks_host.key ""> +<!ENTITY torbirdy.prefs.socks_port.label ""> +<!ENTITY torbirdy.prefs.socks_port.key ""> +<!ENTITY torbirdy.prefs.torification.label ""> +<!ENTITY torbirdy.prefs.torification.key ""> +<!ENTITY torbirdy.prefs.global ""> +<!ENTITY torbirdy.prefs.imap.label ""> +<!ENTITY torbirdy.prefs.imap.key ""> +<!ENTITY torbirdy.prefs.startup_folder.label ""> +<!ENTITY torbirdy.prefs.startup_folder.key ""> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key ""> +<!ENTITY torbirdy.prefs.account_specific ""> +<!ENTITY torbirdy.prefs.select_account.key ""> +<!ENTITY torbirdy.prefs.select_account.label ""> diff --git a/lv/torbirdy.properties b/lv/torbirdy.properties new file mode 100644 index 0000000..101d1f8 --- /dev/null +++ b/lv/torbirdy.properties @@ -0,0 +1,13 @@ +torbirdy.name=TorBirdy + +torbirdy.enabled.tor=TorBirdy Iespējots: Tor +torbirdy.enabled.jondo=TorBirdy Iespējots: JonDo +torbirdy.enabled.custom=TorBirdy Iespējots: Custom Proxy +torbirdy.enabled.torification=TorBirdy Iespējots: Caurspīdīgā torifikācija +torbirdy.disabled=TorBirdy: Atspējots! + +torbirdy.email.prompt=TorBirdy atspējojā Thunderbird auto-konfigurācijas vedni, lai aizsargātu jūsu anonimitāti.⏎ ⏎ ieteiktie drošības uzstādījumi tika uzstādīti priekš %S have been set.⏎ ⏎ Tagad jūs varat manuāli konfigurēt citus konta uzstādījumus. + +torbirdy.email.advanced=Lūdzu ņemt vērā, ka mainīt lietpratīgos uzstādījumus TorBirdy NAV ieteicams.⏎ ⏎ Jums vajadzētu turpināt tikai tad, ja jūs zināt, ko darāt. +torbirdy.email.advanced.nextwarning=Rādīt šo brīdinājumu nākošreiz +torbirdy.email.advanced.title=TorBirdy Lietpratīgie uzstādījumi

1 0

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

12 Nov '12

commit 24afca5f11791dd582b1b0c6441ed2b73cd3f1f2 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 12 11:15:23 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index f5077ce..07fce40 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 04:54+0000\n" +"PO-Revision-Date: 2012-11-12 11:09+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"

1 0

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

12 Nov '12

commit 6194d37c7462b35d4193da42c28c14a317e9cfd6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 12 11:15:19 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index f5077ce..07fce40 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 04:54+0000\n" +"PO-Revision-Date: 2012-11-12 11:09+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"

1 0

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

12 Nov '12

commit d5520e331a610a206614677440002cde18b2fe21 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 12 10:15:15 2012 +0000 Update translations for vidalia --- sv/vidalia_sv.po | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sv/vidalia_sv.po b/sv/vidalia_sv.po index f358032..84de785 100644 --- a/sv/vidalia_sv.po +++ b/sv/vidalia_sv.po @@ -1,6 +1,7 @@ # # Translators: # <bik1230(a)gmail.com>, 2012. +# <bjorn.schrammel(a)gmail.com>, 2012. # Daniel West <danwesthq(a)gmail.com>, 2012. # <lars.edman(a)bredband.net>, 2012. # <marta.leffler(a)gmail.com>, 2011. @@ -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-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-11-03 03:47+0000\n" -"Last-Translator: Daniel West <danwesthq(a)gmail.com>\n" +"PO-Revision-Date: 2012-11-12 10:00+0000\n" +"Last-Translator: i3iorn <bjorn.schrammel(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3252,11 +3253,11 @@ msgid "" "longer work with the current Tor network. Please upgrade to the most recent " "version of the software, which may contain important security, reliability " "and performance fixes." -msgstr "" +msgstr "Du kör för närvarande version \"%1\" av Tor, det är inte säkert att den är kompatibel med nuvarande Tor nätverk. Var god uppgradera till den senaste versionen av programmet, som kan innehålla viktiga säkerhets, stabilitets och prestanda fixar." msgctxt "StatusEventWidget" msgid "Your Tor Software is Out-of-date" -msgstr "" +msgstr "Din Tor mjukvara är utdaterad" msgctxt "StatusEventWidget" msgid "Connected to the Tor Network" @@ -3270,13 +3271,13 @@ msgstr "Vi lyckades upprätta en anslutning till Tor-nätverket. Nu kan du konfi msgctxt "StatusEventWidget" msgid "Tor Software Error" -msgstr "" +msgstr "Tor programfel" msgctxt "StatusEventWidget" msgid "" "The Tor software encountered an internal bug. Please report the following " "error message to the Tor developers at bugs.torproject.org: \"%1\"" -msgstr "" +msgstr "Tor stötte på en intern bug. Var vänlig och rapportera följande meddelande till Tor utvecklarna på bugs.torproject.org: \"%1\"" msgctxt "StatusEventWidget" msgid ""

1 0

[ooni-probe/master] Fix import errors in captive portal and url list tests
by art＠torproject.org 12 Nov '12

12 Nov '12

commit 86f591da89eae501d43c7d05488d9cd71bf7ab2b Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Nov 12 10:47:27 2012 +0100 Fix import errors in captive portal and url list tests (cherry picked from commit 3c4f147b7fc3b626344b4168ca35c06d5c15bdd1) --- nettests/core/captiveportal.py | 3 ++- nettests/core/url_list.py | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/nettests/core/captiveportal.py b/nettests/core/captiveportal.py index 6641985..66779bb 100644 --- a/nettests/core/captiveportal.py +++ b/nettests/core/captiveportal.py @@ -39,6 +39,7 @@ from urlparse import urlparse from ooni import nettest from ooni.templates import httpt +from ooni.utils import net from ooni.utils import log try: @@ -53,7 +54,7 @@ __desc__ = "Captive portal detection test" optParameters = [['asset', 'a', None, 'Asset file'], ['experiment-url', 'e', 'http://google.com/', 'Experiment URL'], - ['user-agent', 'u', random.choice(httpt.useragents), + ['user-agent', 'u', random.choice(net.userAgents), 'User agent for HTTP requests'] ] diff --git a/nettests/core/url_list.py b/nettests/core/url_list.py index b6f2d43..06a5147 100644 --- a/nettests/core/url_list.py +++ b/nettests/core/url_list.py @@ -3,6 +3,7 @@ # :authors: Arturo Filastò # :licence: see LICENSE +from twisted.python import usage from ooni.templates import httpt class UsageOptions(usage.Options):

1 0

[ooni-probe/master] Trap exceptions that get raised when running tests
by art＠torproject.org 12 Nov '12

12 Nov '12

commit 4fb3dc69477fae8ec6136700c90f2cb54cd14373 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Nov 12 09:39:38 2012 +0100 Trap exceptions that get raised when running tests (cherry picked from commit 5e46ee69b9039d03b7726772aff2bf27fc347851) --- ooni/runner.py | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-) diff --git a/ooni/runner.py b/ooni/runner.py index 1aac145..b27ed63 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -170,6 +170,7 @@ def runTestWithInput(test_class, test_method, test_input, oreporter): # call setup on the test test_instance.setUp() test = getattr(test_instance, test_method) + d = defer.maybeDeferred(test) d.addCallback(test_done, test_instance, test_method) d.addErrback(test_error, test_instance, test_method) @@ -195,11 +196,8 @@ def runTestWithInputUnit(test_class, log.debug("input unit %s" % input_unit) for test_input in input_unit: log.debug("running with input: %s" % test_input) - try: - d = runTestWithInput(test_class, - test_method, test_input, oreporter) - except Exception, e: - print e + d = runTestWithInput(test_class, + test_method, test_input, oreporter) dl.append(d) return defer.DeferredList(dl) @@ -241,15 +239,20 @@ def runTestCases(test_cases, options, # This deferred list is a deferred list of deferred lists # it is used to store all the deferreds of the tests that # are run - for input_unit in input_unit_factory: - # We do this because generators can't we rewound. - input_list = list(input_unit) - for test_case in test_cases: - log.debug("Processing %s" % test_case[1]) - test_class = test_case[0] - test_method = test_case[1] - yield runTestWithInputUnit(test_class, - test_method, input_list, - oreporter) + try: + for input_unit in input_unit_factory: + log.debug("Running this input unit %s" % input_unit) + # We do this because generators can't we rewound. + input_list = list(input_unit) + for test_case in test_cases: + log.debug("Processing %s" % test_case[1]) + test_class = test_case[0] + test_method = test_case[1] + yield runTestWithInputUnit(test_class, + test_method, input_list, + oreporter) + except Exception: + log.exception("Problem in running test") + reactor.stop() oreporter.allDone()

1 0

[ooni-probe/master] Make nettest take a filename instead of a file
by art＠torproject.org 12 Nov '12

12 Nov '12

commit ba54af4f7b6f02e074164aafa00f26454a16dfad Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Nov 12 09:42:39 2012 +0100 Make nettest take a filename instead of a file (cherry picked from commit 7ba9d50a5195aa8310c30445fd3e10ca02592e0b) --- ooni/nettest.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index 62b3657..8d911eb 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -109,7 +109,7 @@ class NetTestCase(object): """ pass - def inputProcessor(self, fp): + def inputProcessor(self, filename): """ You may replace this with your own custom input processor. It takes as input a file descriptor so remember to close it when you are done. @@ -121,6 +121,7 @@ class NetTestCase(object): For example you may wish to have an input processor that will allow you to ignore comments in files. This can be easily achieved like so: + fp = open(filename) for x in fp.xreadlines(): if x.startswith("#"): continue @@ -130,6 +131,7 @@ class NetTestCase(object): Other fun stuff is also possible. """ log.debug("Running default input processor") + fp = open(filename) for x in fp.xreadlines(): yield x.strip() fp.close() @@ -148,8 +150,7 @@ class NetTestCase(object): log.err(ae) else: if os.path.isfile(self.inputFile): - fp = open(self.inputFile) - self.inputs = self.inputProcessor(fp) + self.inputs = self.inputProcessor(self.inputFile) elif not self.inputs[0]: pass elif self.inputFile:

1 0

[ooni-probe/master] Add better documentation to HTTP Host and url list tests
by art＠torproject.org 12 Nov '12

12 Nov '12

commit 04363333313869883c172aa0c4be18c7b776c52b Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Nov 12 10:12:43 2012 +0100 Add better documentation to HTTP Host and url list tests --- nettests/core/http_host.py | 12 ++++++++---- nettests/core/url_list.py | 44 +++++++++++++++++++++++++++++++++++++------- 2 files changed, 45 insertions(+), 11 deletions(-) diff --git a/nettests/core/http_host.py b/nettests/core/http_host.py index 662cc40..252561b 100644 --- a/nettests/core/http_host.py +++ b/nettests/core/http_host.py @@ -3,9 +3,6 @@ # HTTP Host Test # ************** # -# for more details see: -# https://trac.torproject.org/projects/tor/wiki/doc/OONI/Tests/HTTPHost -# # :authors: Arturo Filastò # :licence: see LICENSE @@ -25,6 +22,12 @@ class HTTPHost(httpt.HTTPTest): """ This test is aimed at detecting the presence of a transparent HTTP proxy and enumerating the sites that are being censored by it. + + It places inside of the Host header field the hostname of the site that is + to be tested for censorship and then determines if the probe is behind a + transparent HTTP proxy (because the response from the backend server does + not match) and if the site is censorsed, by checking if the page that it + got back matches the input block page. """ name = "HTTP Host" author = "Arturo Filastò" @@ -32,7 +35,8 @@ class HTTPHost(httpt.HTTPTest): usageOptions = UsageOptions - inputFile = ['file', 'f', None, 'List of hostnames to test for censorship'] + inputFile = ['file', 'f', None, + 'List of hostnames to test for censorship'] requiredOptions = ['backend'] diff --git a/nettests/core/url_list.py b/nettests/core/url_list.py index fe678be..b6f2d43 100644 --- a/nettests/core/url_list.py +++ b/nettests/core/url_list.py @@ -5,20 +5,52 @@ from ooni.templates import httpt +class UsageOptions(usage.Options): + optParameters = [['content', 'c', None, + 'The file to read from containing the content of a block page']] + class URLList(httpt.HTTPTest): + """ + Performs GET, POST and PUT requests to a list of URLs specified as + input and checks if the page that we get back as a result matches that + which we expect. + """ name = "URL List" author = "Arturo Filastò" - version = 0.1 + version = "0.1.1" + + inputFile = ['file', 'f', None, + 'List of URLS to perform GET and POST requests to'] - inputFile = ['file', 'f', None, 'List of URLS to perform GET and POST requests to'] - requiredOptions = ['file'] + + def check_for_censorship(self, body): + """ + If we have specified what a censorship page looks like here we will + check if the page we are looking at matches it. + + XXX this is not tested, though it is basically what was used to detect + censorship in the palestine case. + """ + if self.localOptions['content']: + self.report['censored'] = True + + censorship_page = open(self.localOptions['content']) + response_page = iter(body.split("\n")) + + for censorship_line in censorship_page.xreadlines(): + response_line = response_page.next() + if response_line != censorship_line: + self.report['censored'] = False + break + + censorship_page.close() + def test_get(self): if self.input: self.url = self.input else: raise Exception("No input specified") - return self.doRequest(self.url, method="GET") def test_post(self): @@ -26,15 +58,13 @@ class URLList(httpt.HTTPTest): self.url = self.input else: raise Exception("No input specified") - return self.doRequest(self.url, method="POST") - + def test_put(self): if self.input: self.url = self.input else: raise Exception("No input specified") - return self.doRequest(self.url, method="PUT")

1 0

[ooni-probe/master] Trap exceptions properly in input unit
by art＠torproject.org 12 Nov '12

12 Nov '12

commit 826ca122875d36ee2fea362473cedafd289fd739 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Nov 12 09:37:29 2012 +0100 Trap exceptions properly in input unit (cherry picked from commit bd410ffc7bca234d8d6a3bc53bbfa93d21f76c47) --- ooni/inputunit.py | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ooni/inputunit.py b/ooni/inputunit.py index 65f6d91..65d578c 100644 --- a/ooni/inputunit.py +++ b/ooni/inputunit.py @@ -37,7 +37,7 @@ class InputUnitFactory(object): for i in xrange(self._idx, self._idx + self.inputUnitSize): try: input_unit_elements.append(self._inputs.next()) - except: + except StopIteration: self._ended = True break self._idx += self.inputUnitSize @@ -66,10 +66,7 @@ class InputUnit(object): return self def next(self): - try: - return self._inputs.next() - except: - raise StopIteration + return self._inputs.next() def append(self, input): self._inputs.append(input)

1 0