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

[ooni-probe/master] Rename test_inputs to example_inputs
by art＠torproject.org 29 Nov '12

29 Nov '12

commit 3a6ca3d13551c04f10a1f4e3feed0921c56fcaee Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 29 13:27:00 2012 +0100 Rename test_inputs to example_inputs --- example_inputs/README | 2 ++ example_inputs/daph3_yaml_file.txt | 2 ++ example_inputs/dns_tamper_file.txt | 3 +++ example_inputs/dns_tamper_test_resolvers.txt | 2 ++ example_inputs/http_host_file.txt | 2 ++ example_inputs/keyword_filtering_file.txt | 2 ++ example_inputs/url_lists_file.txt | 2 ++ test_inputs/README | 2 -- test_inputs/daph3_yaml_file.txt | 2 -- test_inputs/dns_tamper_file.txt | 3 --- test_inputs/dns_tamper_test_resolvers.txt | 2 -- test_inputs/http_host_file.txt | 2 -- test_inputs/keyword_filtering_file.txt | 2 -- test_inputs/url_lists_file.txt | 2 -- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/example_inputs/README b/example_inputs/README new file mode 100644 index 0000000..cbf0782 --- /dev/null +++ b/example_inputs/README @@ -0,0 +1,2 @@ +These inputs are here to assist the running of before_i_commit.sh that is used to verify proper functioning of ooniprobe. + diff --git a/example_inputs/daph3_yaml_file.txt b/example_inputs/daph3_yaml_file.txt new file mode 100644 index 0000000..2412a08 --- /dev/null +++ b/example_inputs/daph3_yaml_file.txt @@ -0,0 +1,2 @@ +{client: antani, server: sblinda} + diff --git a/example_inputs/dns_tamper_file.txt b/example_inputs/dns_tamper_file.txt new file mode 100644 index 0000000..25f365c --- /dev/null +++ b/example_inputs/dns_tamper_file.txt @@ -0,0 +1,3 @@ +torproject.org +google.com +measurementlab.net diff --git a/example_inputs/dns_tamper_test_resolvers.txt b/example_inputs/dns_tamper_test_resolvers.txt new file mode 100644 index 0000000..14c77e0 --- /dev/null +++ b/example_inputs/dns_tamper_test_resolvers.txt @@ -0,0 +1,2 @@ +8.8.8.8 +8.8.4.4 diff --git a/example_inputs/http_host_file.txt b/example_inputs/http_host_file.txt new file mode 100644 index 0000000..12afb18 --- /dev/null +++ b/example_inputs/http_host_file.txt @@ -0,0 +1,2 @@ +torproject.org +ooni.nu diff --git a/example_inputs/keyword_filtering_file.txt b/example_inputs/keyword_filtering_file.txt new file mode 100644 index 0000000..4583bae --- /dev/null +++ b/example_inputs/keyword_filtering_file.txt @@ -0,0 +1,2 @@ +antani +sblinda diff --git a/example_inputs/url_lists_file.txt b/example_inputs/url_lists_file.txt new file mode 100644 index 0000000..16a4f58 --- /dev/null +++ b/example_inputs/url_lists_file.txt @@ -0,0 +1,2 @@ +http://ooni.nu/test +http://torproject.org/ diff --git a/test_inputs/README b/test_inputs/README deleted file mode 100644 index cbf0782..0000000 --- a/test_inputs/README +++ /dev/null @@ -1,2 +0,0 @@ -These inputs are here to assist the running of before_i_commit.sh that is used to verify proper functioning of ooniprobe. - diff --git a/test_inputs/daph3_yaml_file.txt b/test_inputs/daph3_yaml_file.txt deleted file mode 100644 index 2412a08..0000000 --- a/test_inputs/daph3_yaml_file.txt +++ /dev/null @@ -1,2 +0,0 @@ -{client: antani, server: sblinda} - diff --git a/test_inputs/dns_tamper_file.txt b/test_inputs/dns_tamper_file.txt deleted file mode 100644 index 25f365c..0000000 --- a/test_inputs/dns_tamper_file.txt +++ /dev/null @@ -1,3 +0,0 @@ -torproject.org -google.com -measurementlab.net diff --git a/test_inputs/dns_tamper_test_resolvers.txt b/test_inputs/dns_tamper_test_resolvers.txt deleted file mode 100644 index 14c77e0..0000000 --- a/test_inputs/dns_tamper_test_resolvers.txt +++ /dev/null @@ -1,2 +0,0 @@ -8.8.8.8 -8.8.4.4 diff --git a/test_inputs/http_host_file.txt b/test_inputs/http_host_file.txt deleted file mode 100644 index 12afb18..0000000 --- a/test_inputs/http_host_file.txt +++ /dev/null @@ -1,2 +0,0 @@ -torproject.org -ooni.nu diff --git a/test_inputs/keyword_filtering_file.txt b/test_inputs/keyword_filtering_file.txt deleted file mode 100644 index 4583bae..0000000 --- a/test_inputs/keyword_filtering_file.txt +++ /dev/null @@ -1,2 +0,0 @@ -antani -sblinda diff --git a/test_inputs/url_lists_file.txt b/test_inputs/url_lists_file.txt deleted file mode 100644 index 16a4f58..0000000 --- a/test_inputs/url_lists_file.txt +++ /dev/null @@ -1,2 +0,0 @@ -http://ooni.nu/test -http://torproject.org/

1 0

[ooni-probe/master] Update before_i_commit testdeck
by art＠torproject.org 29 Nov '12

29 Nov '12

commit 25aa38d851dae046bbeff96bc8cb9104bdad127f Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 29 13:38:49 2012 +0100 Update before_i_commit testdeck * Other misc changes --- before_i_commit.testdeck | 6 +++--- .../manipulation/http_header_field_manipulation.py | 3 ++- ooni/runner.py | 1 - ooni/utils/geodata.py | 1 - ooni/utils/hacks.py | 3 +-- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/before_i_commit.testdeck b/before_i_commit.testdeck index af420be..7877d74 100644 --- a/before_i_commit.testdeck +++ b/before_i_commit.testdeck @@ -12,7 +12,7 @@ logfile: before_i_commit.log pcapfile: null reportfile: dns_tamper_test.yamloo - subargs: [-T, test_inputs/dns_tamper_test_resolvers.txt, -f, test_inputs/dns_tamper_file.txt] + subargs: [-T, example_inputs/dns_tamper_test_resolvers.txt, -f, example_inputs/dns_tamper_file.txt] test: nettests/blocking/dnstamper.py - options: collector: null @@ -20,7 +20,7 @@ logfile: before_i_commit.log pcapfile: null reportfile: http_host.yamloo - subargs: [-b, 'http://ooni.nu/test', -f, test_inputs/http_host_file.txt] + subargs: [-b, 'http://ooni.nu/test', -f, example_inputs/http_host_file.txt] test: nettests/manipulation/http_host.py # XXX this is disabled because it requires oonib to be running #- options: @@ -29,5 +29,5 @@ # logfile: null # pcapfile: null # reportfile: null -# subargs: [-h, test_inputs/test_header_field_manipulation.txt] +# subargs: [-h, example_inputs/test_header_field_manipulation.txt] # test: nettests/core/http_header_field_manipulation.py diff --git a/nettests/manipulation/http_header_field_manipulation.py b/nettests/manipulation/http_header_field_manipulation.py index 08ee8c7..0140638 100644 --- a/nettests/manipulation/http_header_field_manipulation.py +++ b/nettests/manipulation/http_header_field_manipulation.py @@ -136,7 +136,8 @@ class HTTPHeaderFieldManipulation(httpt.HTTPTest): self.report['tampering']['request_line_capitalization'] = True request_headers = TrueHeaders(self.request_headers) - diff = request_headers.getDiff(response_headers_dict, ignore=['Connection']) + diff = request_headers.getDiff(TrueHeaders(response_headers_dict), + ignore=['Connection']) if diff: self.report['tampering']['header_field_name'] = True else: diff --git a/ooni/runner.py b/ooni/runner.py index 4f59d17..bc9b874 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -5,7 +5,6 @@ # Handles running ooni.nettests as well as # ooni.plugoo.tests.OONITests. # -# :authors: Arturo Filastò, Isis Lovecruft # :license: see included LICENSE file import os diff --git a/ooni/utils/geodata.py b/ooni/utils/geodata.py index 447d2eb..6acefd8 100644 --- a/ooni/utils/geodata.py +++ b/ooni/utils/geodata.py @@ -5,7 +5,6 @@ # In here go functions related to the understanding of # geographical information of the probe # -# :authors: Arturo Filastò # :licence: see LICENSE import re diff --git a/ooni/utils/hacks.py b/ooni/utils/hacks.py index d4e832c..18e9102 100644 --- a/ooni/utils/hacks.py +++ b/ooni/utils/hacks.py @@ -4,8 +4,7 @@ # ******** # When some software has issues and we need to fix it in a # hackish way, we put it in here. This one day will be empty. -# -# :authors: Arturo Filastò +# # :licence: see LICENSE

1 0

[ooni-probe/master] Test and document HTTP Requests test
by art＠torproject.org 29 Nov '12

29 Nov '12

commit 4922b1ce9795b19a8e726217f45fc65ad17ea162 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 29 13:35:27 2012 +0100 Test and document HTTP Requests test * Add support reporting the modification of response headers Note: This test used to be called HTTP Body Length, but got extended to support response headers. --- docs/source/tests/http_requests.rst | 238 +++++++++++++++++++++++++++++++++ nettests/blocking/http_body_length.py | 90 ------------- nettests/blocking/http_requests.py | 120 +++++++++++++++++ 3 files changed, 358 insertions(+), 90 deletions(-) diff --git a/docs/source/tests/http_requests.rst b/docs/source/tests/http_requests.rst new file mode 100644 index 0000000..cc98882 --- /dev/null +++ b/docs/source/tests/http_requests.rst @@ -0,0 +1,238 @@ +Details +======= + +*Test Name*: HTTP Requests + +*Current version*: 0.1 + +*NetTest*: HTTP Requests (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/nettests/blocking/h…) + +*Test Helper*: None + +*Test Type*: Content Blocking + +*Requires Root*: No + +Description +=========== + +This test perform a HTTP GET request for the / resource over the test network +and over Tor. It then compares the two responses to see if the response bodies of the two requests match and if the +proportion between the expected body length (the one over Tor) and the one over +the control network match. + +If the proportion between the two body lengths is <= a certain tollerance +factor (by default set to 0.8), then we say that they do not match. + +The reason for doing so is that a lot of sites serve geolocalized content based +on the location from which the request originated from. + +How to run the test +=================== + +To test a single site run: + +`./bin/ooniprobe nettests/blocking/http_requests.py -u http://<test_site>/` + +To test a set of sites from a list containing sites to test run: + +`./bin/ooniprobe nettests/blocking/http_requests.py -f <input_file>` + + +Sample report +============= + +`./bin/ooniprobe nettests/blocking/http_requests.py -f example_inputs/url_lists_file.txt` + +:: + + ########################################### + # OONI Probe Report for HTTP Requests Test test + # Thu Nov 29 13:20:06 2012 + ########################################### + --- + options: + collector: null + help: 0 + logfile: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [-f, example_inputs/url_lists_file.txt] + test: nettests/blocking/http_requests.py + probe_asn: null + probe_cc: null + probe_ip: 127.0.0.1 + software_name: ooniprobe + software_version: 0.0.7.1-alpha + start_time: 1354188006.0 + test_name: HTTP Requests Test + test_version: '0.1' + ... + --- + input: http://ooni.nu/test + report: + agent: agent + body_length_match: false + body_proportion: 0.9732142857142857 + factor: 0.8 + requests: + - request: + body: null + headers: + - - User-Agent + - - &id001 [Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1), 'Internet + Explorer 7, Windows Vista'] + method: GET + url: http://ooni.nu/test + response: + body: "\n<html>\n <head>\n <meta http-equiv=\"refresh\" content=\"\ + 0;URL=http://ooni.nu/test/\">\n </head>\n <body bgcolor=\"#FFFFFF\"\ + \ text=\"#000000\">\n <a href=\"http://ooni.nu/test/\">click here</a>\n\ + \ </body>\n</html>\n" + code: 302 + headers: + - - Content-Length + - ['218'] + - - Server + - [TwistedWeb/10.1.0] + - - Connection + - [close] + - - Location + - ['http://ooni.nu/test/'] + - - Date + - ['Thu, 29 Nov 2012 12:20:25 GMT'] + - - Content-Type + - [text/html] + - request: + body: null + headers: + - - User-Agent + - - *id001 + method: GET + url: shttp://ooni.nu/test + response: + body: "\n<html>\n <head>\n <meta http-equiv=\"refresh\" content=\"\ + 0;URL=http://ooni.nu:80/test/\">\n </head>\n <body bgcolor=\"#FFFFFF\"\ + \ text=\"#000000\">\n <a href=\"http://ooni.nu:80/test/\">click here</a>\n\ + \ </body>\n</html>\n" + code: 302 + headers: + - - Content-Length + - ['224'] + - - Server + - [TwistedWeb/10.1.0] + - - Connection + - [close] + - - Location + - ['http://ooni.nu:80/test/'] + - - Date + - ['Thu, 29 Nov 2012 12:20:33 GMT'] + - - Content-Type + - [text/html] + socksproxy: null + test_name: test_get + test_runtime: 9.357746124267578 + test_started: 1354191606.333243 + ... + --- + input: http://torproject.org/ + report: + agent: agent + body_length_match: false + body_proportion: 1.0 + factor: 0.8 + requests: + - request: + body: null + headers: + - - User-Agent + - - &id001 [Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1), 'Internet + Explorer 7, Windows Vista'] + method: GET + url: http://torproject.org/ + response: + body: '<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN"> + + <html><head> + + <title>302 Found</title> + + </head><body> + + <h1>Found</h1> + + The document has moved <a href="https://www.torproject.org/">here</a>. + + <hr> + + <address>Apache Server at torproject.org Port 80</address> + + </body></html> + + ' + code: 302 + headers: + - - Content-Length + - ['275'] + - - Vary + - [Accept-Encoding] + - - Server + - [Apache] + - - Connection + - [close] + - - Location + - ['https://www.torproject.org/'] + - - Date + - ['Thu, 29 Nov 2012 12:20:08 GMT'] + - - Content-Type + - [text/html; charset=iso-8859-1] + - request: + body: null + headers: + - - User-Agent + - - *id001 + method: GET + url: shttp://torproject.org/ + response: + body: '<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN"> + + <html><head> + + <title>302 Found</title> + + </head><body> + + <h1>Found</h1> + + The document has moved <a href="https://www.torproject.org/">here</a>. + + <hr> + + <address>Apache Server at torproject.org Port 80</address> + + </body></html> + + ' + code: 302 + headers: + - - Content-Length + - ['275'] + - - Vary + - [Accept-Encoding] + - - Server + - [Apache] + - - Connection + - [close] + - - Location + - ['https://www.torproject.org/'] + - - Date + - ['Thu, 29 Nov 2012 12:20:16 GMT'] + - - Content-Type + - [text/html; charset=iso-8859-1] + socksproxy: null + test_name: test_get + test_runtime: 8.688138008117676 + test_started: 1354191607.287672 + ... + diff --git a/nettests/blocking/http_body_length.py b/nettests/blocking/http_body_length.py deleted file mode 100644 index 7c5b0d2..0000000 --- a/nettests/blocking/http_body_length.py +++ /dev/null @@ -1,90 +0,0 @@ -# -*- encoding: utf-8 -*- -# -# :authors: Arturo Filastò -# :licence: see LICENSE - -from twisted.internet import defer -from twisted.python import usage -from ooni.templates import httpt - -class UsageOptions(usage.Options): - optParameters = [ - ['url', 'u', None, 'Specify a single URL to test.'], - ['factor', 'f', 0.8, 'What factor should be used for triggering censorship (0.8 == 80%)'] - ] - -class HTTPBodyLength(httpt.HTTPTest): - """ - Performs a two GET requests to the set of sites to be tested for - censorship, one over a known good control channel (Tor), the other over the - test network. - We then look at the response body lengths and see if the control response - differs from the experiment response by a certain factor. - """ - name = "HTTP Body length test" - author = "Arturo Filastò" - version = "0.1" - - usageOptions = UsageOptions - - inputFile = ['file', 'f', None, - 'List of URLS to perform GET and POST requests to'] - - # These values are used for determining censorship based on response body - # lengths - control_body_length = None - experiment_body_length = None - - def setUp(self): - """ - Check for inputs. - """ - if self.input: - self.url = self.input - elif self.localOptions['url']: - self.url = self.localOptions['url'] - else: - raise Exception("No input specified") - - self.factor = self.localOptions['factor'] - - def compare_body_lengths(self): - body_length_a = self.control_body_length - body_length_b = self.experiment_body_length - - rel = float(body_length_a)/float(body_length_b) - if rel > 1: - rel = 1/rel - - self.report['body_proportion'] = rel - self.report['factor'] = self.factor - if rel < self.factor: - self.report['censorship'] = True - else: - self.report['censorship'] = False - - def test_get(self): - def errback(failure): - log.err("There was an error while testing %s" % self.url) - log.exception(failure) - - def control_body(result): - self.control_body_length = len(result) - if self.experiment_body_length: - self.compare_body_lengths() - - def experiment_body(result): - self.experiment_body_length = len(result) - if self.control_body_length: - self.compare_body_lengths() - - dl = [] - experiment_request = self.doRequest(self.url, method="GET", - body_processor=experiment_body) - control_request = self.doRequest(self.url, method="GET", - use_tor=True, body_processor=control_body) - dl.append(experiment_request) - dl.append(control_request) - d = defer.DeferredList(dl) - return d - diff --git a/nettests/blocking/http_requests.py b/nettests/blocking/http_requests.py new file mode 100644 index 0000000..bc2803b --- /dev/null +++ b/nettests/blocking/http_requests.py @@ -0,0 +1,120 @@ +# -*- encoding: utf-8 -*- +# +# :authors: Arturo Filastò +# :licence: see LICENSE + +from twisted.internet import defer +from twisted.python import usage +from ooni.templates import httpt + +class UsageOptions(usage.Options): + optParameters = [ + ['url', 'u', None, 'Specify a single URL to test.'], + ['factor', 'f', 0.8, 'What factor should be used for triggering censorship (0.8 == 80%)'] + ] + +class HTTPRequestsTest(httpt.HTTPTest): + """ + Performs a two GET requests to the set of sites to be tested for + censorship, one over a known good control channel (Tor), the other over the + test network. + + We check to see if the response headers match and if the response body + lengths match. + """ + name = "HTTP Requests Test" + author = "Arturo Filastò" + version = "0.1" + + usageOptions = UsageOptions + + inputFile = ['file', 'f', None, + 'List of URLS to perform GET and POST requests to'] + + # These values are used for determining censorship based on response body + # lengths + control_body_length = None + experiment_body_length = None + + def setUp(self): + """ + Check for inputs. + """ + if self.input: + self.url = self.input + elif self.localOptions['url']: + self.url = self.localOptions['url'] + else: + raise Exception("No input specified") + + self.factor = self.localOptions['factor'] + + def compare_body_lengths(self): + body_length_a = self.control_body_length + body_length_b = self.experiment_body_length + + rel = float(body_length_a)/float(body_length_b) + if rel > 1: + rel = 1/rel + + self.report['body_proportion'] = rel + self.report['factor'] = self.factor + if rel < self.factor: + self.report['body_length_match'] = True + else: + self.report['body_length_match'] = False + + def compare_headers(self): + diff = TrueHeaders(self.control_headers).getDiff(self.experiment_headers) + if diff: + self.report['headers_match'] = False + else: + self.report['headers_match'] = True + + def test_get(self): + def errback(failure): + log.err("There was an error while testing %s" % self.url) + log.exception(failure) + + def control_body(result): + """ + Callback for processing the control HTTP body response. + """ + self.control_body_length = len(result) + if self.experiment_body_length: + self.compare_body_lengths() + + def experiment_body(result): + """ + Callback for processing the experiment HTTP body response. + """ + self.experiment_body_length = len(result) + if self.control_body_length: + self.compare_body_lengths() + + def control_headers(headers_dict): + """ + Callback for processing the control HTTP headers response. + """ + self.control_headers = headers_dict + + def experiment_headers(headers_dict): + """ + Callback for processing the experiment HTTP headers response. + """ + self.experiment_headers = headers_dict + + dl = [] + experiment_request = self.doRequest(self.url, method="GET", + body_processor=experiment_body, + headers_processor=control_headers) + + control_request = self.doRequest(self.url, method="GET", + use_tor=True, body_processor=control_body, + headers_processor=control_headers) + + dl.append(experiment_request) + dl.append(control_request) + d = defer.DeferredList(dl) + return d +

1 0

[ooni-probe/master] Add ooniprobe.conf to gitignore
by art＠torproject.org 29 Nov '12

29 Nov '12

commit 7135d896dfe4b8674fcb5b4c63bd42c1c3309e9b Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 29 13:42:03 2012 +0100 Add ooniprobe.conf to gitignore * Don't seem to be able to get this right --- .gitignore | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index 2dada89..4cb0775 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,4 @@ pcaps/ report*.yaml docs/build/* data/*.dat -./ooniprobe.conf +ooniprobe.conf

1 0

[ooni-probe/master] Iterate on HTTP Invalid Request Line test
by art＠torproject.org 29 Nov '12

29 Nov '12

commit 1de07f659f1393d969a1b3766baffeecb111355d Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 29 15:41:01 2012 +0100 Iterate on HTTP Invalid Request Line test * Rename it to HTTP Invalid Request Line * Extend it's fuzzing capabilities to support some more specific tests * Improve TCPT test template --- nettests/blocking/http_invalid_requests.py | 63 ------------ nettests/manipulation/http_invalid_request_line.py | 106 ++++++++++++++++++++ ooni/nettest.py | 38 +++++++- ooni/templates/httpt.py | 21 +---- ooni/templates/tcpt.py | 48 ++++++---- 5 files changed, 174 insertions(+), 102 deletions(-) diff --git a/nettests/blocking/http_invalid_requests.py b/nettests/blocking/http_invalid_requests.py deleted file mode 100644 index 7e6f47f..0000000 --- a/nettests/blocking/http_invalid_requests.py +++ /dev/null @@ -1,63 +0,0 @@ -# -*- encoding: utf-8 -*- -from twisted.python import usage - -from ooni.utils import randomStr -from ooni.templates import tcpt - -class UsageOptions(usage.Options): - optParameters = [['backend', 'b', '127.0.0.1:57002', - 'The OONI backend that runs a TCP echo server (must be on port 80)']] - - optFlags = [['nopayloadmatch', 'n', - "Don't match the payload of the response. This option is used when you don't have a TCP echo server running"]] - -class HTTPInvalidRequests(tcpt.TCPTest): - name = "HTTP Invalid Requests" - version = "0.1.1" - authors = "Arturo Filastò" - - inputFile = ['file', 'f', None, - 'Input file of list of hostnames to attempt to resolve'] - - usageOptions = UsageOptions - requiredOptions = ['backend'] - - def setUp(self): - try: - self.address, self.port = self.localOptions['backend'].split(":") - self.port = int(self.port) - except: - raise usage.UsageError("Invalid backend address specified (must be address:port)") - - def test_random_invalid_request(self): - """ - We test sending data to a TCP echo server, if what we get back is not - what we have sent then there is tampering going on. - This is for example what squid will return when performing such - request: - - HTTP/1.0 400 Bad Request - Server: squid/2.6.STABLE21 - Date: Sat, 23 Jul 2011 02:22:44 GMT - Content-Type: text/html - Content-Length: 1178 - Expires: Sat, 23 Jul 2011 02:22:44 GMT - X-Squid-Error: ERR_INVALID_REQ 0 - X-Cache: MISS from cache_server - X-Cache-Lookup: NONE from cache_server:3128 - Via: 1.0 cache_server:3128 (squid/2.6.STABLE21) - Proxy-Connection: close - - """ - payload = randomStr(10) + "\n\r" - def got_all_data(received_array): - if not self.localOptions['nopayloadmatch']: - first = received_array[0] - if first != payload: - self.report['tampering'] = True - else: - self.report['tampering'] = 'unknown' - - d = self.sendPayload(payload) - d.addCallback(got_all_data) - return d diff --git a/nettests/manipulation/http_invalid_request_line.py b/nettests/manipulation/http_invalid_request_line.py new file mode 100644 index 0000000..00ab24d --- /dev/null +++ b/nettests/manipulation/http_invalid_request_line.py @@ -0,0 +1,106 @@ +# -*- encoding: utf-8 -*- +from twisted.python import usage + +from ooni.utils import randomStr +from ooni.templates import tcpt + +class UsageOptions(usage.Options): + optParameters = [['backend', 'b', '127.0.0.1', + 'The OONI backend that runs a TCP echo server']] + +class HTTPInvalidRequestLine(tcpt.TCPTest): + """ + The goal of this test is to do some very basic and not very noisy fuzzing + on the HTTP request line. We generate a series of requests that are not + valid HTTP requests. + + Unless elsewhere stated 'Xx'*N refers to N*2 random upper or lowercase ascii + letters or numbers ('XxXx' will be 4). + """ + name = "HTTP Invalid Requests" + version = "0.1.3" + authors = "Arturo Filastò" + + inputFile = ['file', 'f', None, + 'Input file of list of hostnames to attempt to resolve'] + + usageOptions = UsageOptions + requiredOptions = ['backend'] + + def setUp(self): + self.port = 80 + self.address = self.localOptions['backend'] + + def check_for_manipulation(self, response, payload): + if response != payload: + self.report['tampering'] = True + else: + self.report['tampering'] = 'unknown' + + def test_random_invalid_method(self): + """ + We test sending data to a TCP echo server listening on port 80, if what + we get back is not what we have sent then there is tampering going on. + This is for example what squid will return when performing such + request: + + HTTP/1.0 400 Bad Request + Server: squid/2.6.STABLE21 + Date: Sat, 23 Jul 2011 02:22:44 GMT + Content-Type: text/html + Content-Length: 1178 + Expires: Sat, 23 Jul 2011 02:22:44 GMT + X-Squid-Error: ERR_INVALID_REQ 0 + X-Cache: MISS from cache_server + X-Cache-Lookup: NONE from cache_server:3128 + Via: 1.0 cache_server:3128 (squid/2.6.STABLE21) + Proxy-Connection: close + + """ + payload = randomStr(10) + " / HTTP/1.1\n\r" + + d = self.sendPayload(payload) + d.addCallback(self.check_for_manipulation, payload) + return d + + def test_random_invalid_field_count(self): + """ + This generates a request that looks like this: + + XxXxX XxXxX XxXxX XxXxX + + This may trigger some bugs in the HTTP parsers of transparent HTTP + proxies. + """ + payload = ' '.join(randomStr(5) for x in range(4)) + payload += "\n\r" + + d = self.sendPayload(payload) + d.addCallback(self.check_for_manipulation, payload) + return d + + def test_random_big_request_method(self): + """ + This generates a request that looks like this: + + Xx*512 / HTTP/1.1 + """ + payload = randomStr(1024) + ' / HTTP/1.1\n\r' + + d = self.sendPayload(payload) + d.addCallback(self.check_for_manipulation, payload) + return d + + def test_random_invalid_version_number(self): + """ + This generates a request that looks like this: + + GET / HTTP/XxX + """ + payload = 'GET / HTTP/' + randomStr(3) + payload += '\n\r' + + d = self.sendPayload(payload) + d.addCallback(self.check_for_manipulation, payload) + return d + diff --git a/ooni/nettest.py b/ooni/nettest.py index e0393e7..4a54414 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -5,7 +5,6 @@ # In here is the NetTest API definition. This is how people # interested in writing ooniprobe tests will be specifying them # -# :authors: Arturo Filastò, Isis Lovecruft # :license: see included LICENSE file import sys @@ -17,12 +16,47 @@ from twisted.trial import unittest, itrial, util from twisted.internet import defer, utils from twisted.python import usage +from twisted.internet.error import ConnectionRefusedError, DNSLookupError, TCPTimedOutError + from ooni.utils import log +def failureToString(failure): + """ + Given a failure instance return a string representing the kind of error + that occurred. + + Args: + + failure: a :class:twisted.internet.error instance + + Returns: + + A string representing the HTTP response error message. + """ + if isinstance(failure.value, ConnectionRefusedError): + log.err("Connection refused. The backend may be down") + string = 'connection_refused_error' + + elif isinstance(failure.value, SOCKSError): + log.err("Sock error. The SOCKS proxy may be down") + string = 'socks_error' + + elif isinstance(failure.value, DNSLookupError): + log.err("DNS lookup failure") + string = 'dns_lookup_error' + + elif isinstance(failure.value, TCPTimedOutError): + log.err("TCP Timed Out Error") + string = 'tcp_timed_out_error' + + elif isinstance(failure.value, ResponseNeverReceived): + log.err("Response Never Received") + string = 'response_never_received' + return string + class NoPostProcessor(Exception): pass - class NetTestCase(object): """ This is the base of the OONI nettest universe. When you write a nettest diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py index 804a3e4..01853f3 100644 --- a/ooni/templates/httpt.py +++ b/ooni/templates/httpt.py @@ -23,6 +23,8 @@ from ooni import config from ooni.utils.net import BodyReceiver, StringProducer, userAgents from ooni.utils.txagentwithsocks import Agent, SOCKSError, TrueHeaders +from ooni.nettest import failureToString + class InvalidSocksProxyOption(Exception): pass @@ -131,25 +133,8 @@ class HTTPTest(NetTestCase): 'code': response.code } if failure: - if isinstance(failure.value, ConnectionRefusedError): - log.err("Connection refused. The backend may be down") - request_response['failure'] = 'connection_refused_error' - - elif isinstance(failure.value, SOCKSError): - log.err("Sock error. The SOCKS proxy may be down") - request_response['failure'] = 'socks_error' - - elif isinstance(failure.value, DNSLookupError): - log.err("DNS lookup failure") - request_response['failure'] = 'dns_lookup_error' - - elif isinstance(failure.value, TCPTimedOutError): - log.err("TCP Timed Out Error") - request_response['failure'] = 'tcp_timed_out_error' + request_response['failure'] = failureToString(failure) - elif isinstance(failure.value, ResponseNeverReceived): - log.err("Response Never Received") - request_response['failure'] = 'response_never_received' self.report['requests'].append(request_response) def _processResponseBody(self, response_body, request, response, body_processor): diff --git a/ooni/templates/tcpt.py b/ooni/templates/tcpt.py index 77ffe3e..26f38ed 100644 --- a/ooni/templates/tcpt.py +++ b/ooni/templates/tcpt.py @@ -2,13 +2,14 @@ from twisted.internet import protocol, defer, reactor from twisted.internet.error import ConnectionDone from twisted.internet.endpoints import TCP4ClientEndpoint -from ooni.nettest import NetTestCase +from ooni.nettest import NetTestCase, failureToString from ooni.utils import log class TCPSender(protocol.Protocol): - report = None - payload_len = None - received_data = '' + def __init__(self): + self.received_data = '' + self.sent_data = '' + def dataReceived(self, data): """ We receive data until the total amount of data received reaches that @@ -27,18 +28,19 @@ class TCPSender(protocol.Protocol): """ if self.payload_len: self.received_data += data - if len(self.received_data) >= self.payload_len: - self.transport.loseConnection() - self.report['received'].append(data) - self.deferred.callback(self.report['received']) def sendPayload(self, payload): """ Write the payload to the wire and set the expected size of the payload we are to receive. + + Args: + + payload: the data to be sent on the wire. + """ self.payload_len = len(payload) - self.report['sent'].append(payload) + self.sent_data = payload self.transport.write(payload) class TCPSenderFactory(protocol.Factory): @@ -50,7 +52,7 @@ class TCPTest(NetTestCase): version = "0.1" requiresRoot = False - timeout = 2 + timeout = 5 address = None port = None @@ -61,26 +63,34 @@ class TCPTest(NetTestCase): def sendPayload(self, payload): d1 = defer.Deferred() - def closeConnection(p): - p.transport.loseConnection() + def closeConnection(proto): + self.report['sent'].append(proto.sent_data) + self.report['received'].append(proto.received_data) + proto.transport.loseConnection() log.debug("Closing connection") d1.callback(self.report['received']) + def timedOut(proto): + self.report['failure'] = 'tcp_timed_out_error' + proto.transport.loseConnection() + def errback(failure): - self.report['error'] = str(failure) + self.report['failure'] = failureToString(failure) d1.errback(failure) - def connected(p): + def connected(proto): log.debug("Connected to %s:%s" % (self.address, self.port)) - p.report = self.report - p.deferred = d1 - p.sendPayload(payload) - reactor.callLater(self.timeout, closeConnection, p) + proto.report = self.report + proto.deferred = d1 + proto.sendPayload(payload) + if self.timeout: + # XXX-Twisted this logic should probably go inside of the protocol + reactor.callLater(self.timeout, closeConnection, proto) point = TCP4ClientEndpoint(reactor, self.address, self.port) + log.debug("Connecting to %s:%s" % (self.address, self.port)) d2 = point.connect(TCPSenderFactory()) d2.addCallback(connected) d2.addErrback(errback) return d1 -

1 0

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

29 Nov '12

commit 5c15ed0bdfd275317837bde6c4308e8947bd9393 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 29 09:46:15 2012 +0000 Update translations for tails-persistence-setup_completed --- eu/eu.po | 328 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 328 insertions(+), 0 deletions(-) diff --git a/eu/eu.po b/eu/eu.po new file mode 100644 index 0000000..31c8726 --- /dev/null +++ b/eu/eu.po @@ -0,0 +1,328 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Antxon Baldarra <baldarra(a)euskalerria.org>, 2012. +# <totorika93(a)gmail.com>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-11-27 21:00+0100\n" +"PO-Revision-Date: 2012-11-29 09:16+0000\n" +"Last-Translator: Antxon Baldarra <baldarra(a)euskalerria.org>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: eu\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:48 +msgid "Personal Data" +msgstr "Datu pertsonalak" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:50 +msgid "Keep files stored in the `Persistent' directory" +msgstr "Mantendu fitxategiak `Iraunkorra' direktorioan" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:58 +msgid "GnuPG" +msgstr "GnuPG" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:60 +msgid "GnuPG keyrings and configuration" +msgstr "GnuPG gako sorta eta konfigurazioa" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:68 +msgid "SSH Client" +msgstr "SSH Bezeroa" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:70 +msgid "SSH keys, configuration and known hosts" +msgstr "SSh gakoak, konfigurazioa eta ostalari ezagunak" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:78 +msgid "Pidgin" +msgstr "Pidgin" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:80 +msgid "Pidgin profiles and OTR keyring" +msgstr "Pidgin profilak eta OTR gako sorta" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:88 +msgid "Claws Mail" +msgstr "Claws Mail" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:90 +msgid "Claws Mail profiles and locally stored email" +msgstr "Claws Mail profilak eta bertan gordteako eposta" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:98 +msgid "GNOME Keyring" +msgstr "GNOME gako sorta" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:100 +msgid "Secrets stored by GNOME Keyring" +msgstr "GNOME gako sortan gordetako sekretuak" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:108 +msgid "Network Connections" +msgstr "Sare konexioak" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:110 +msgid "Configuration of network devices and connections" +msgstr "Sare gailu eta konexioen konfigurazioa" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:118 +msgid "Browser bookmarks" +msgstr "Nabigatzaile laster-markak" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +msgid "Bookmarks saved in Iceweasel browser" +msgstr "Iceweasel nabigatzailean gordetako lastermarkak" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 +msgid "APT Packages" +msgstr "APT paketeak" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 +msgid "Packages downloaded by APT" +msgstr "APT bidez deskargatutako paketeak" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +msgid "APT Lists" +msgstr "APT zerrendak" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +msgid "Lists downloaded by APT" +msgstr "APT bidez deskargatutako zerrendak" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 +msgid "Dotfiles" +msgstr "Dot fitxategiak" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 +msgid "" +"Symlink into $HOME every file or directory found in the `dotfiles' directory" +msgstr "`dotfiles' direktorioan aurkitutako edozein fitxategi edo direktorio $HOME era esteka sinbolikoa egin." + +#: ../lib/Tails/Persistence/Setup.pm:259 +msgid "" +"The device Tails is running from cannot be found. Maybe you used the `toram'" +" option?" +msgstr "Tails gailua nondik exekutatzen ari den ezin da aurkitu. Agian `toram' aukera erabili duzu?" + +#: ../lib/Tails/Persistence/Setup.pm:284 +msgid "'Unparseable partition path.'" +msgstr "\"Ezin da partizio bidea analizatu\"" + +#: ../lib/Tails/Persistence/Setup.pm:298 +msgid "Setup Tails persistent volume" +msgstr "Konfiguratu Tailsen bolumen iraunkorra" + +#: ../lib/Tails/Persistence/Setup.pm:442 +#, perl-format +msgid "Device %s already has a persistent volume." +msgstr "%s gailuak dagoeneko bolumen iraunkor bat dauka." + +#: ../lib/Tails/Persistence/Setup.pm:450 +#, perl-format +msgid "Device %s has not enough unallocated space." +msgstr "%s gailuak ez dauka esleitu gabeko nahiko espaziorik." + +#: ../lib/Tails/Persistence/Setup.pm:458 ../lib/Tails/Persistence/Setup.pm:472 +#, perl-format +msgid "Device %s has no persistent volume." +msgstr "%s gailuak ez dauka bolumen iraunkorrik." + +#: ../lib/Tails/Persistence/Setup.pm:464 +msgid "" +"Cannot delete the persistent volume while in use. You should restart Tails " +"without persistence." +msgstr "Ezin da bolumen iraunkorra ezabatu erabilia izaten ari den bitartean. Tails iraunkortasunik gabe berrabiarazi beharko zenuke." + +#: ../lib/Tails/Persistence/Setup.pm:483 +msgid "Persistence volume is not unlocked." +msgstr "Bolumen iraunkorra desblokeatuta dago." + +#: ../lib/Tails/Persistence/Setup.pm:488 +msgid "Persistence volume is not mounted." +msgstr "Bolumen iraunkorra ez dago muntatuta." + +#: ../lib/Tails/Persistence/Setup.pm:493 +msgid "Persistence volume is not readable. Permissions or ownership problems?" +msgstr "Bolumen iraunkorra ezin da irakurri. Baimen edo jabetza arazoak?" + +#: ../lib/Tails/Persistence/Setup.pm:498 +msgid "Persistence volume is not writable. Maybe it was mounted read-only?" +msgstr "Bolumen iraunkorrean ezin da idatzi. Irakurtzeko soilik muntatu al zen agian?" + +#: ../lib/Tails/Persistence/Setup.pm:507 +#, perl-format +msgid "Tails is running from non-USB device %s." +msgstr "Tails USB ez den gailu %s batetik exekutatzen ari da." + +#: ../lib/Tails/Persistence/Setup.pm:513 +#, perl-format +msgid "Device %s is optical." +msgstr "%s gailua optikoa da." + +#: ../lib/Tails/Persistence/Setup.pm:520 +#, perl-format +msgid "Device %s was not created using Tails USB installer." +msgstr "%s gailua ez zen Tails USB instalatzailea erabiliz sortu." + +#: ../lib/Tails/Persistence/Setup.pm:554 +msgid "Error" +msgstr "Akatsa" + +#: ../lib/Tails/Persistence/Setup.pm:861 +msgid "Persistence wizard - Finished" +msgstr "Iraunkortasun morroia - Amaituta" + +#: ../lib/Tails/Persistence/Setup.pm:864 +msgid "" +"Any changes you have made will only take effect after restarting Tails.\n" +"\n" +"You may now close this application." +msgstr "Egindako edozein aldaketa Tails berrabiarazi ostean bakarrik izango dute efektua.\n\nAplikazio hau itxi dezakezu orain." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 +msgid "Persistence wizard - Persistent volume creation" +msgstr "Iraunkortasun morroia - Euskarri iraunkorren sorkuntza" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:57 +msgid "Choose a passphrase to protect the persistent volume" +msgstr "Aukeratu euskarri iraunkorra babesteko pasahitz bat" + +#. TRANSLATORS: size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:61 +#, perl-format +msgid "" +"A %s persistent volume will be created on the %s %s device. Data on " +"this volume will be stored in an encrypted form protected by a passphrase." +msgstr "%s bolumen iraunkor bat %s %s gailuan sortuko da. Bolumen honen datuak pasahitz batez babestutako enkriptatutako modu batean gordeko dira." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 +msgid "Create" +msgstr "Sortu" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:110 +msgid "" +"Beware! Using persistence has consequences that must be well " +"understood. Tails can't help you if you use it wrong! See <a " +"href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails" +" documentation about persistence</a> to learn more." +msgstr "Kontuz! Iraunkortasuna erabiltzeak ondo ulertu behar diren ondoriak ditu. Tailsek ezin zaitu lagundu oker erabiltzen baduzu! Ikusi <a href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>iraunkortasunari buruzko Tails dokumentazioa</a> gehiago ikasteko." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 +msgid "Passphrase:" +msgstr "Pasahitza" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:154 +msgid "Verify Passphrase:" +msgstr "Pasahitza egiaztatu:" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:167 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:231 +msgid "Passphrase can't be empty" +msgstr "Pasahitza ezin da hutsik egon" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:222 +msgid "Passphrases do not match" +msgstr "Pasahitzek ez dute bat egiten" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Configure.pm:189 +msgid "Failed" +msgstr "Huts egin du" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:269 +#: ../lib/Tails/Persistence/Step/Delete.pm:84 +msgid "Correcting attributes on Tails system partition." +msgstr "Tailsen sistema partizioaren atributuak zuzentzen." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:272 +#: ../lib/Tails/Persistence/Step/Delete.pm:87 +msgid "The attributes of the Tails system partition will be corrected." +msgstr "Tailsen sistema partizioaren atributuak zuzenduak izango dira." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:280 +msgid "Mounting Tails persistence partition." +msgstr "Tailsen partizio iraunkorra montatzen." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +msgid "The Tails persistence partition will be mounted." +msgstr "Tailsen partizio iraunkorra muntatu egingo da." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:304 +msgid "Creating..." +msgstr "Sortzen..." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:307 +msgid "Creating the persistent volume..." +msgstr "Euskarri iraunkorra sortzen..." + +#: ../lib/Tails/Persistence/Step/Configure.pm:60 +msgid "Persistence wizard - Persistent volume configuration" +msgstr "Iraunkortasun morroia - Euskarri iraunkorren konfigurazioa" + +#: ../lib/Tails/Persistence/Step/Configure.pm:63 +msgid "Specify the files that will be saved in the persistent volume" +msgstr " Bolumen iraunkorra gorde izango den fitxategia zehaztu" + +#. TRANSLATORS: partition, size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Configure.pm:67 +#, perl-format +msgid "" +"The selected files will be stored in the encrypted partition %s (%s), on the" +" %s %s device." +msgstr "Hautatutako fitxategiak %s (%s) enkriptatutako partizioan gordeko dira, %s %s gailuan." + +#: ../lib/Tails/Persistence/Step/Configure.pm:73 +msgid "Save" +msgstr "Gorde" + +#: ../lib/Tails/Persistence/Step/Configure.pm:135 +msgid "Make custom directory persistent (absolute path):" +msgstr "Aukeratutako direktorioa iraunkor bihurtu (bide absolutua):" + +#: ../lib/Tails/Persistence/Step/Configure.pm:141 +msgid "Destination:" +msgstr "Helburua:" + +#: ../lib/Tails/Persistence/Step/Configure.pm:204 +msgid "Saving..." +msgstr "Gordetzen..." + +#: ../lib/Tails/Persistence/Step/Configure.pm:207 +msgid "Saving persistence configuration..." +msgstr "Iraunkortasun konfigurazioa gordetzen..." + +#: ../lib/Tails/Persistence/Step/Delete.pm:41 +msgid "Persistence wizard - Persistent volume deletion" +msgstr "Iraunkortasun morroia - Euskarri iraunkorren ezabatzea" + +#: ../lib/Tails/Persistence/Step/Delete.pm:44 +msgid "Your persistent data will be deleted." +msgstr "Zure datu iraunkorrak ezabatuko dira." + +#: ../lib/Tails/Persistence/Step/Delete.pm:48 +#, perl-format +msgid "" +"The persistent volume %s (%s), on the %s %s device, will be deleted." +msgstr "Bolumen iraunkorra %s (%s), %s %s gailuan, ezabatua izango da." + +#: ../lib/Tails/Persistence/Step/Delete.pm:54 +msgid "Delete" +msgstr "Ezabatu" + +#: ../lib/Tails/Persistence/Step/Delete.pm:99 +msgid "Deleting..." +msgstr "Ezabatzen..." + +#: ../lib/Tails/Persistence/Step/Delete.pm:102 +msgid "Deleting the persistent volume..." +msgstr "Euskarri iraunkorra ezabatzen..."

1 0

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

29 Nov '12

commit d9de1cfc1acce1775bd49d5abbd2bb3963588b19 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 29 09:45:16 2012 +0000 Update translations for tsum --- vi/short-user-manual_vi_noimg.xhtml | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vi/short-user-manual_vi_noimg.xhtml b/vi/short-user-manual_vi_noimg.xhtml index 9295ef1..83bb2bc 100644 --- a/vi/short-user-manual_vi_noimg.xhtml +++ b/vi/short-user-manual_vi_noimg.xhtml @@ -117,11 +117,11 @@ sub 2048R/EB399FD7 2003-10-16 Bạn không nên nhập mật khẩu khi khởi động Vidalia. Nếu bạn lỡ làm, bạn sẽ gặp một trong những vấn đề sau: Bạn đang sử dụng Vidalia và Tor: như ví dụ sau, có thể xảy ra trường hợp là bạn đã cài gói ứng dụng Viadalia và bây giờ bạn chạy Tor Browser Bundle. Trong tình huốn này, bạn phải đóng hết ứng dụng Vidalia và Tor mở trước đó rồi mới dùng cái khác. Vidalia crashed, but left Tor running: If the dialog that prompts you for a control password has a Reset button, you can click the button and Vidalia will restart Tor with a new random control password. If you do not see a Reset button, or if Vidalia is unable to restart Tor for you; go into your process or task manager, and terminate the Tor process. Then use Vidalia to restart Tor. - For more information, see the <a href="https://torproject.org/docs/faq.html#VidaliaPassword">FAQ</a> on the Tor Project website. - <h3 id="flash-does-not-work">Flash does not work</h3> - For security reasons, Flash, Java, and other plugins are currently disabled for Tor. Plugins operate independently from Firefox and can perform activity on your computer that ruins your anonymity. - Most YouTube videos work with HTML5, and it is possible to view these videos over Tor. You need to join the <a href="https://www.youtube.com/html5">HTML5 trial</a> on the YouTube website before you can use the HTML5 player. - Note that the browser will not remember that you joined the trial once you close it, so you will need to re-join the trial the next time you run the Tor Browser Bundle. + Cần thêm thông tin hảy vào trang <a href="https://torproject.org/docs/faq.html#VidaliaPassword">FAQ</a> của Tor Project. + <h3 id="flash-does-not-work">Flash không hoạt động</h3> + Vì những lý do an toàn, Flash, java, và những ứng dụng mở rộng khác hiện tại được vô hiệu hóa vì Tor. Những ứng dụng mở rộng vận hành một cách độc lập từ Firefox và có thể tác động lên máy tính của bạn làm danh tính của bạn không được bảo vệ. + Hầu hết các video trên Youtube có thể xem bằng HTML5, và có thể xem những video này thông qua Tor. Bạn cần tham gia <a href="https://www.youtube.com/html5">Phiên bản thử nghiệm HTML5</a> trên trang Youtube trước khi bạn sử dụng HTML5. + Chú ý rằng trình duyệt sẽ không ghi nhớ bạn đã tham gia vào bản thử nghiệm nếu bạn đóng nó, vì vậy bạn cần tham gia lại bản thử nghiệm vào lần kế tiếp khi bạn cho chạy gói trình duyệt Tor. Hảy xem qua <a href="https://www.torproject.org/torbutton/torbutton-faq.html#noflash">Torbutton FAQ</a> để tìm hiểu thêm. <h3 id="i-want-to-use-another-browser">Tôi muốn sử dụng trình duyệt khác</h3> Vì lý do an ninh, chúng tôi đề nghị bạn duyệt web thông qua Tor sử dụng Tor Browser Bundle. Về mặt kỹ thuật vẫn có thể sử dụng Tor với trình duyệt khác, nhưng làm vậy bạn có thể tự biến mình thành mụctiêu bị tấn công trong tương lai.

1 0

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

29 Nov '12

commit 189796f544140bf181633caf0ed40917a42e5d87 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 29 09:16:19 2012 +0000 Update translations for tails-persistence-setup --- eu/eu.po | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eu/eu.po b/eu/eu.po index a485582..6c93763 100644 --- a/eu/eu.po +++ b/eu/eu.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-11-27 21:00+0100\n" -"PO-Revision-Date: 2012-11-28 16:05+0000\n" +"PO-Revision-Date: 2012-11-29 09:14+0000\n" "Last-Translator: Antxon Baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -77,11 +77,11 @@ msgstr "Sare gailu eta konexioen konfigurazioa" #: ../lib/Tails/Persistence/Configuration/Presets.pm:118 msgid "Browser bookmarks" -msgstr "" +msgstr "Nabigatzaile laster-markak" #: ../lib/Tails/Persistence/Configuration/Presets.pm:120 msgid "Bookmarks saved in Iceweasel browser" -msgstr "" +msgstr "Iceweasel nabigatzailean gordetako lastermarkak" #: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "APT Packages" @@ -112,7 +112,7 @@ msgstr "" msgid "" "The device Tails is running from cannot be found. Maybe you used the `toram'" " option?" -msgstr "" +msgstr "Tails gailua nondik exekutatzen ari den ezin da aurkitu. Agian `toram' aukera erabili duzu?" #: ../lib/Tails/Persistence/Setup.pm:284 msgid "'Unparseable partition path.'" @@ -187,7 +187,7 @@ msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" "You may now close this application." -msgstr "" +msgstr "Egindako edozein aldaketa Tails berrabiarazi ostean bakarrik izango dute efektua.\n\nAplikazio hau itxi dezakezu orain." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 msgid "Persistence wizard - Persistent volume creation" @@ -203,7 +203,7 @@ msgstr "Aukeratu euskarri iraunkorra babesteko pasahitz bat" msgid "" "A %s persistent volume will be created on the %s %s device. Data on " "this volume will be stored in an encrypted form protected by a passphrase." -msgstr "" +msgstr "%s bolumen iraunkor bat %s %s gailuan sortuko da. Bolumen honen datuak pasahitz batez babestutako enkriptatutako modu batean gordeko dira." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 msgid "Create" @@ -279,7 +279,7 @@ msgstr " Bolumen iraunkorra gorde izango den fitxategia zehaztu" msgid "" "The selected files will be stored in the encrypted partition %s (%s), on the" " %s %s device." -msgstr "" +msgstr "Hautatutako fitxategiak %s (%s) enkriptatutako partizioan gordeko dira, %s %s gailuan." #: ../lib/Tails/Persistence/Step/Configure.pm:73 msgid "Save"

1 0

[stem/master] Checking when EXTENDCIRCUIT is/isn't provided
by atagar＠torproject.org 29 Nov '12

29 Nov '12

commit 6f2c1c33931b6fda738468d03ee0f835f0caca6b Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Nov 25 13:50:04 2012 -0800 Checking when EXTENDCIRCUIT is/isn't provided The EXTENDCIRCUIT's path argument is optional unless... * the ciruit id is non-zero * we're prior to tor version 0.2.2.9 where it was made optional: https://gitweb.torproject.org/tor.git/commitdiff/ac68704f07c2b703 Pointed out by robinson and integrates his suggestions on... https://trac.torproject.org/6666 --- stem/control.py | 11 +++++++++-- stem/version.py | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/stem/control.py b/stem/control.py index cd990d8..1476598 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1240,7 +1240,8 @@ class Controller(BaseController): path isn't provided, one is automatically selected. :param int circuit: id of a circuit to be extended - :param list,str path: one or more relays to make a circuit through + :param list,str path: one or more relays to make a circuit through, this is + required if the circuit id is non-zero :param str purpose: "general" or "controller" :returns: int of the circuit id of the created or extended circuit @@ -1248,6 +1249,12 @@ class Controller(BaseController): :raises: :class:`stem.InvalidRequest` if one of the parameters were invalid """ + if path is None and circuit == 0: + path_opt_version = stem.version.Requirement.EXTENDCIRCUIT_PATH_OPTIONAL + + if not self.get_version().meets_requirements(path_opt_version): + raise stem.InvalidRequest(512, "EXTENDCIRCUIT requires the path prior to version %s" % path_opt_version) + args = [str(circuit)] if type(path) == str: path = [path] if path: args.append(",".join(path)) @@ -1262,7 +1269,7 @@ class Controller(BaseController): assert extended == "EXTENDED" except: raise stem.ProtocolError("EXTENDCIRCUIT response invalid:\n%s", str(response)) - elif response.code == '552': + elif response.code == ('512', '552'): raise stem.InvalidRequest(response.code, response.message) else: raise stem.ProtocolError("EXTENDCIRCUIT returned unexpected response code: %s" % response.code) diff --git a/stem/version.py b/stem/version.py index 522c9f2..a7f31c3 100644 --- a/stem/version.py +++ b/stem/version.py @@ -36,6 +36,7 @@ easily parsed and compared, for instance... ===================================== =========== **AUTH_SAFECOOKIE** 'SAFECOOKIE' authentication method **GETINFO_CONFIG_TEXT** 'GETINFO config-text' query + **EXTENDCIRCUIT_PATH_OPTIONAL** 'EXTENDCIRCUIT' queries can omit the path if the circuit is zero **LOADCONF** 'LOADCONF' query **TORRC_CONTROL_SOCKET** 'ControlSocket <path>' config option **TORRC_DISABLE_DEBUGGER_ATTACHMENT** 'DisableDebuggerAttachment' config option @@ -254,6 +255,7 @@ safecookie_req.greater_than(Version("0.2.3.13")) Requirement = stem.util.enum.Enum( ("AUTH_SAFECOOKIE", safecookie_req), ("GETINFO_CONFIG_TEXT", Version("0.2.2.7")), + ("EXTENDCIRCUIT_PATH_OPTIONAL", Version("0.2.2.9")), ("LOADCONF", Version("0.2.1.1")), ("TORRC_CONTROL_SOCKET", Version("0.2.0.30")), ("TORRC_DISABLE_DEBUGGER_ATTACHMENT", Version("0.2.3.9")),

1 0

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

29 Nov '12

commit 8e6fc9c3a706bd9d43a98e66fdb5dc5f7e65b965 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 29 06:46:00 2012 +0000 Update translations for tails-persistence-setup_completed --- es/es.po | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/es/es.po b/es/es.po index 00804bc..1e9efe7 100644 --- a/es/es.po +++ b/es/es.po @@ -8,8 +8,8 @@ msgid "" 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-01 19:42+0000\n" +"POT-Creation-Date: 2012-11-27 21:00+0100\n" +"PO-Revision-Date: 2012-11-29 06:18+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" @@ -75,26 +75,34 @@ msgid "Configuration of network devices and connections" msgstr "Configuración de dispositivos de red y conexiones" #: ../lib/Tails/Persistence/Configuration/Presets.pm:118 +msgid "Browser bookmarks" +msgstr "Marcadores del navegador" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +msgid "Bookmarks saved in Iceweasel browser" +msgstr "Marcadores guardados en el navegador Iceweasel" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "APT Packages" msgstr "Paquetes APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 msgid "Packages downloaded by APT" msgstr "Paquetes descargados por APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "APT Lists" msgstr "Listas APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "Lists downloaded by APT" msgstr "Listas descargadas por APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "Dotfiles" msgstr "Dotfiles (archivos de configuraciones .archivo)" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "Crear enlaces simbólicos (symlinks) en $HOME para todos los archivos o carpetas que se encuentren en la carpeta `dotfiles'" @@ -193,8 +201,8 @@ msgstr "Elija una frase clave para proteger el volumen persistente" #, perl-format msgid "" "A %s persistent volume will be created on the %s %s device. Data on " -"this device will be stored in an encrypted form protected by a passphrase." -msgstr "Un volumen persistente %s será creado sobre el dispositivo %s %s. Los datos en este volumen serán guardados de forma cifrada, protegidos por una frase clave." +"this volume will be stored in an encrypted form protected by a passphrase." +msgstr "Un volumen persistente %s será creado sobre el dispositivo %s %s. Los datos en este volumen se guardaran cifrados protegidos con frase clave." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 msgid "Create"

1 0