tor-commits November 2012

tor-commits@lists.torproject.org

18 participants
1508 discussions

[ooni-probe/master] Update sample report in HTTP Host test
by art＠torproject.org 20 Nov '12

20 Nov '12

commit 25d07f24ce09edeb09f6ec0573a660ead241772c Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Nov 20 17:44:00 2012 +0100 Update sample report in HTTP Host test --- docs/source/tests/http_host.rst | 58 +++++++++++++++++++------------------- 1 files changed, 29 insertions(+), 29 deletions(-) diff --git a/docs/source/tests/http_host.rst b/docs/source/tests/http_host.rst index da111b0..febdc4a 100644 --- a/docs/source/tests/http_host.rst +++ b/docs/source/tests/http_host.rst @@ -61,42 +61,42 @@ From running: ########################################### # OONI Probe Report for HTTP Host test - # Tue Nov 20 16:11:25 2012 + # Tue Nov 20 17:42:50 2012 ########################################### --- {probe_asn: null, probe_cc: null, probe_ip: 127.0.0.1, software_name: ooniprobe, software_version: 0.0.7.1-alpha, - start_time: 1353420685.0, test_name: HTTP Host, test_version: '0.2'} + start_time: 1353426170.0, test_name: HTTP Host, test_version: '0.2'} ... --- - input: null + input: torproject.org report: requests: - - body: null - headers: - Host: [null] - User-Agent: - - ['Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.5) Gecko/20060127 - Netscape/8.1', 'Netscape 8.1, Windows XP'] - method: GET - url: http://127.0.0.1:57001 - responses: - - body: '{"request_method": "GET", "request_uri": "/", "request_body": "", "request_headers": - {"Connection": "close", "Host": "None", "User-Agent": "(''Mozilla/5.0 (Windows; - U; Windows NT 5.1; en-US; rv:1.7.5) Gecko/20060127 Netscape/8.1'', ''Netscape - 8.1, Windows XP'')"}}' - code: 200 - headers: - - - Content-Length - - ['260'] - - - Etag - - ['"91a2d6055c4e0a4b42cd079acd196d10df158e0a"'] - - - Content-Type - - [text/html; charset=UTF-8] - - - Server - - [cyclone/1.0-rc13] - length: twisted.web.iweb.UNKNOWN_LENGTH - version: twisted.web.iweb.UNKNOWN_LENGTH + - request: + body: null + headers: + Host: [torproject.org] + User-Agent: + - ['Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.5) Gecko/20060127 + Netscape/8.1', 'Netscape 8.1, Windows XP'] + method: GET + url: http://127.0.0.1:57001 + response: + body: '{"request_method": "GET", "request_uri": "/", "request_body": "", "request_headers": + {"Connection": "close", "Host": "torproject.org", "User-Agent": "(''Mozilla/5.0 + (Windows; U; Windows NT 5.1; en-US; rv:1.7.5) Gecko/20060127 Netscape/8.1'', + ''Netscape 8.1, Windows XP'')"}}' + code: 200 + headers: + - - Content-Length + - ['270'] + - - Etag + - ['"83dd0f393b39d0a316b2fc61fd61dafa92c336b5"'] + - - Content-Type + - [text/html; charset=UTF-8] + - - Server + - [cyclone/1.0-rc13] trans_http_proxy: false test_name: test_send_host_header - test_started: 1353424285.050363 + test_started: 1353429770.287463 ... +

1 0

[ooni-probe/master] Add test descriptions for HTTP Host test, TCP Connect test and Traceroute.
by art＠torproject.org 20 Nov '12

20 Nov '12

commit d62b963b15f018186f8d6d03d155d19e31287cb0 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Nov 20 17:06:07 2012 +0100 Add test descriptions for HTTP Host test, TCP Connect test and Traceroute. * Add also a test description template --- docs/source/tests/http_host.rst | 102 ++++++++ docs/source/tests/tcpconnect.rst | 69 +++++ docs/source/tests/template.rst | 45 ++++ docs/source/tests/traceroute.rst | 506 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 722 insertions(+), 0 deletions(-) diff --git a/docs/source/tests/http_host.rst b/docs/source/tests/http_host.rst new file mode 100644 index 0000000..da111b0 --- /dev/null +++ b/docs/source/tests/http_host.rst @@ -0,0 +1,102 @@ +Details +======= + +*Test Name*: HTTP Host + +*Current version*: 0.2 + +*NetTest*: HTTP Host (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/nettests/core/http_…) + +*Test Helper*: HTTP Return JSON Headers (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/oonib/testhelpers/h…) + +*Test Type*: Traffic Manipulation, Content Blocking + +*Requires Root*: No + +Description +=========== + +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. + +*Why do content blocking?* + +Q: Why should be do content blocking measurements with this test when we have +other tests that also do this? + +A: Why not? Although you are correct that tecnically the two tests are +equivalent even though the IP layer differs in the two tests. + +Note: We may in the future remove the Content Blocking aspect of the HTTP Host +test. + +How to run the test +=================== + +`./bin/ooniprobe nettest/core/http_host.py -f <input file> -b <backend url> -c <content>` + +*input_file* is a file containing the hostnames to check for censorship one per line. + +*backend url* is the url of the backend that will be used for checking if the +site is blocked or not. + +*content* is the content of a blockpage. When a transparent HTTP proxy is +present we will do comparisons against this to verify if the requested site is +blocked or not. + + +Sample report +============= + +From running: +`./bin/ooniprobe nettests/core/http_host.py` + +:: + + ########################################### + # OONI Probe Report for HTTP Host test + # Tue Nov 20 16:11:25 2012 + ########################################### + --- + {probe_asn: null, probe_cc: null, probe_ip: 127.0.0.1, software_name: ooniprobe, software_version: 0.0.7.1-alpha, + start_time: 1353420685.0, test_name: HTTP Host, test_version: '0.2'} + ... + --- + input: null + report: + requests: + - body: null + headers: + Host: [null] + User-Agent: + - ['Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.5) Gecko/20060127 + Netscape/8.1', 'Netscape 8.1, Windows XP'] + method: GET + url: http://127.0.0.1:57001 + responses: + - body: '{"request_method": "GET", "request_uri": "/", "request_body": "", "request_headers": + {"Connection": "close", "Host": "None", "User-Agent": "(''Mozilla/5.0 (Windows; + U; Windows NT 5.1; en-US; rv:1.7.5) Gecko/20060127 Netscape/8.1'', ''Netscape + 8.1, Windows XP'')"}}' + code: 200 + headers: + - - Content-Length + - ['260'] + - - Etag + - ['"91a2d6055c4e0a4b42cd079acd196d10df158e0a"'] + - - Content-Type + - [text/html; charset=UTF-8] + - - Server + - [cyclone/1.0-rc13] + length: twisted.web.iweb.UNKNOWN_LENGTH + version: twisted.web.iweb.UNKNOWN_LENGTH + trans_http_proxy: false + test_name: test_send_host_header + test_started: 1353424285.050363 + ... diff --git a/docs/source/tests/tcpconnect.rst b/docs/source/tests/tcpconnect.rst new file mode 100644 index 0000000..7c7bd16 --- /dev/null +++ b/docs/source/tests/tcpconnect.rst @@ -0,0 +1,69 @@ +Details +======= + +*Test Name*: TCP Connect + +*Current version*: 0.1 + +*NetTest*: TCP Connect Test (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/nettests/core/tcpco…) + +*Test Helper*: None + +*Test Type*: Content Blocking + +*Requires Root*: No + +Description +=========== + +This test performs TCP connections to a set of sepecified IP:PORT pairs and +reports the reason for which it failed connecting to the target address. + +The reason for failure may be: "timeout", when the connection timed out, +"refused", when the connection was dropped because of a RST or "failure" for a +reason that is not handled. + +If the connection succeeds the test will report "success". + +How to run the test +=================== + +`./bin/ooniprobe nettests/core/tcpconnect.py -f <input file>` + +*input file* a list of IP:PORT pairs to perform TCP connections to. + +Sample report +============= + +From running: +`./bin/ooniprobe nettests/core/tcpconnect.py -f <input file>` + +:: + + ########################################### + # OONI Probe Report for TCP Connect test + # Tue Nov 20 17:00:50 2012 + ########################################### + --- + {probe_asn: null, probe_cc: null, probe_ip: 127.0.0.1, software_name: ooniprobe, software_version: 0.0.7.1-alpha, + start_time: 1353423650.0, test_name: TCP Connect, test_version: '0.1'} + ... + --- + input: 127.0.0.1:9050 + report: {connection: success} + test_name: test_connect + test_started: 1353427250.232331 + ... + --- + input: 127.0.0.1:8080 + report: {connection: failed} + test_name: test_connect + test_started: 1353427250.233206 + ... + --- + input: 127.0.0.1:1234 + report: {connection: failed} + test_name: test_connect + test_started: 1353427250.233974 + ... + diff --git a/docs/source/tests/template.rst b/docs/source/tests/template.rst new file mode 100644 index 0000000..62b3895 --- /dev/null +++ b/docs/source/tests/template.rst @@ -0,0 +1,45 @@ +Details +======= + +*Test Name*: + +*Current version*: + +*NetTest*: Name (link to source) + +*Test Helper*: Name (link to source) + +*Test Type*: Traffic Manipulation, Content Blocking + +*Requires Root*: No + +Description +=========== + + +How to run the test +=================== + +`./bin/ooniprobe nettests/core/my_test_name.py` + +Sample report +============= + +From running: +`./bin/ooniprobe nettests/core/my_test_name.py` + +:: + + ########################################### + # OONI Probe Report for My Test Name + # Tue Nov 20 17:00:50 2012 + ########################################### + --- + {probe_asn: null, probe_cc: null, probe_ip: 127.0.0.1, software_name: ooniprobe, software_version: 0.0.7.1-alpha, + start_time: 1353423650.0, test_name: My Test Name test_version: '0.1'} + ... + --- + test_name: my_test_name + test_started: 1353427250.232331 + ... + diff --git a/docs/source/tests/traceroute.rst b/docs/source/tests/traceroute.rst new file mode 100644 index 0000000..cc2f770 --- /dev/null +++ b/docs/source/tests/traceroute.rst @@ -0,0 +1,506 @@ +Details +======= + +*Test Name*: Traceroute + +*Current version*: 0.1.1 + +*NetTest*: Traceroute (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/nettests/core/trace…) + +*Test Helper*: Not yet implemented + +*Test Type*: Traffic Manipulation + +*Requires Root*: Yes + +Description +=========== + +This test performs a multi port, multiprotocol traceroute test towards a +backend. The goal of such is to determine biases in the paths based on +destination port. + +We perform a traceroute with destination port 22, 23, 80, 123, 443. + +The test report includes the RAW IP packets sent and received. If the user has +disabled to include the source IP in the report then we will remove the source +IP for sent packets and the dst IP for sent packets. + +The logged sent and received packets are only the ones that are generated and +received in userspace via the scapy super socket. + +How to run the test +=================== + +`./bin/ooniprobe nettest/core/http_host.py -b <backend ip> -t <timeout> -m <max ttl>` + +*backend ip* is the IP address of the backend to traceroute to + +*timeout* timeout in seconds after which to give up waiting for an answer + +*max ttl* maximum TTL to reach when doing a traceroute + +Sample report +============= + +From running: +`./bin/ooniprobe nettests/core/traceroute.py -b 8.8.8.8` + +:: + + + ########################################### + # OONI Probe Report for Multi Protocol Traceroute Test test + # Tue Nov 20 16:27:57 2012 + ########################################### + --- + {probe_asn: null, probe_cc: null, probe_ip: 127.0.0.1, software_name: ooniprobe, software_version: 0.0.7.1-alpha, + start_time: 1353421677.0, test_name: Multi Protocol Traceroute Test, test_version: 0.1.1} + ... + --- + input: null + report: + answered_packets: + - - raw_packet: !!binary | + RcAARHvUAABAAXiRwKgCAX8AAAELAMgUAAAAAEUAACiipAAAAQZEMsCoAkIICAgIABQBuwAAAAAA + AAAAUAIgALsZAAA= + summary: IP / ICMP 192.168.2.1 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / TCPerror + - - raw_packet: !!binary | + RQAAOAhiAAA/Ae7PwKgBAX8AAAELAPMwAAAAAEUAACg8rwAAAQaqJ8CoAkIICAgIABQBuwAAAAAA + AAAAUAIgALsZAAA= + summary: IP / ICMP 192.168.1.1 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / TCPerror + - - raw_packet: !!binary | + RcAAOCcmAAD9AVmvlxfiLX8AAAELAPMwAAAAAEUAACgfZQAAAQbHccCoAkIICAgIABQBuwAAAAAA + AAAAUAIgALsZAAA= + summary: IP / ICMP 151.23.226.45 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / TCPerror + - - raw_packet: !!binary | + RcAAOEQ9AAD8AXncCgAzAX8AAAELAPMwAAAAAEUAAChevQAAAQaIGcCoAkIICAgIABQBuwAAAAAA + AAAAUAIgALsZAAA= + summary: IP / ICMP 10.0.51.1 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / TCPerror + - - raw_packet: !!binary | + RcAAOKTfAAD7AarylwcVQX8AAAELAPMwAAAAAEUAACii4wAAAQZD88CoAkIICAgIABQBuwAAAAAA + AAAAUAIgALsZAAA= + summary: IP / ICMP 151.7.21.65 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / TCPerror + - - raw_packet: !!binary | + RQAAOBw+AAD6AUJQlwcIRX8AAAELAPMvAAAAAUUAACgBdgAAAQblYMCoAkIICAgIABQBuwAAAAAA + AAAAUAIgALsZAAA= + summary: IP / ICMP 151.7.8.69 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / TCPerror + - - raw_packet: !!binary | + RQAAOAAAAAD4AWQGlwYEzn8AAAELAPMwAAAAAEUAACjY8QAAAQYN5cCoAkIICAgIABQBuwAAAAAA + AAAAUAIgALsZAAA= + summary: IP / ICMP 151.6.4.206 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / TCPerror + - - raw_packet: !!binary | + RQAAOAAAAAD3AWhGlwYBjn8AAAELAPMwAAAAAEUAACipZAAAAQY9csCoAkIICAgIABQBuwAAAAAA + AAAAUAIgALsZAAA= + summary: IP / ICMP 151.6.1.142 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / TCPerror + hops_123: + - {address: 192.168.2.1, rtt: 0.008414983749389648, ttl: 1} + - {address: 192.168.1.1, rtt: 0.020879030227661133, ttl: 2} + - {address: 151.23.226.45, rtt: 0.037843942642211914, ttl: 3} + - {address: 10.0.51.1, rtt: 0.04594087600708008, ttl: 4} + - {address: 151.7.21.65, rtt: 0.06121087074279785, ttl: 5} + - {address: 151.7.8.69, rtt: 0.07722091674804688, ttl: 6} + - {address: 151.6.4.206, rtt: 0.10275506973266602, ttl: 7} + - {address: 151.6.1.142, rtt: 0.11046791076660156, ttl: 8} + hops_22: + - {address: 192.168.2.1, rtt: 0.04184389114379883, ttl: 1} + - {address: 192.168.1.1, rtt: 0.058888912200927734, ttl: 2} + - {address: 151.23.226.45, rtt: 0.08370399475097656, ttl: 3} + - {address: 10.0.51.1, rtt: 0.11024904251098633, ttl: 4} + - {address: 151.7.21.65, rtt: 0.13367295265197754, ttl: 5} + - {address: 151.7.8.69, rtt: 0.14918303489685059, ttl: 6} + - {address: 151.6.4.206, rtt: 0.15334486961364746, ttl: 7} + - {address: 151.6.1.142, rtt: 0.1617579460144043, ttl: 8} + hops_23: + - {address: 192.168.2.1, rtt: 0.01584005355834961, ttl: 1} + - {address: 192.168.1.1, rtt: 0.02497100830078125, ttl: 2} + - {address: 151.23.226.45, rtt: 0.04436492919921875, ttl: 3} + - {address: 10.0.51.1, rtt: 0.061604976654052734, ttl: 4} + - {address: 151.7.21.65, rtt: 0.07576203346252441, ttl: 5} + - {address: 151.7.8.69, rtt: 0.08328104019165039, ttl: 6} + - {address: 151.6.1.142, rtt: 0.10766100883483887, ttl: 7} + - {address: 151.6.4.206, rtt: 0.15076494216918945, ttl: 8} + hops_443: + - {address: 192.168.2.1, rtt: 0.012732982635498047, ttl: 1} + - {address: 192.168.1.1, rtt: 0.02148294448852539, ttl: 2} + - {address: 151.23.226.45, rtt: 0.03827404975891113, ttl: 3} + - {address: 10.0.51.1, rtt: 0.04786992073059082, ttl: 4} + - {address: 151.7.21.65, rtt: 0.07964706420898438, ttl: 5} + - {address: 151.7.8.69, rtt: 0.08100605010986328, ttl: 6} + - {address: 151.6.4.206, rtt: 0.08287692070007324, ttl: 7} + - {address: 151.6.1.142, rtt: 0.08915400505065918, ttl: 8} + hops_80: + - {address: 192.168.2.1, rtt: 0.023320913314819336, ttl: 1} + - {address: 192.168.1.1, rtt: 0.04503607749938965, ttl: 2} + - {address: 151.23.226.45, rtt: 0.05919003486633301, ttl: 3} + - {address: 10.0.51.1, rtt: 0.07173705101013184, ttl: 4} + - {address: 151.7.21.65, rtt: 0.08269405364990234, ttl: 5} + - {address: 151.7.8.69, rtt: 0.08826589584350586, ttl: 6} + - {address: 151.6.4.206, rtt: 0.09608697891235352, ttl: 7} + - {address: 151.6.1.142, rtt: 0.11581897735595703, ttl: 8} + max_ttl: 30 + sent_packets: + - - raw_packet: !!binary | + RQAAKKKkAAABBogbfwAAAQgICAgAFAG7AAAAAAAAAABQAiAA/wIAAA== + summary: IP / TCP 127.0.0.1:ftp_data > 8.8.8.8:https S + - - raw_packet: !!binary | + RQAAKDyvAAACBu0QfwAAAQgICAgAFAG7AAAAAAAAAABQAiAA/wIAAA== + summary: IP / TCP 127.0.0.1:ftp_data > 8.8.8.8:https S + - - raw_packet: !!binary | + RQAAKB9lAAADBglbfwAAAQgICAgAFAG7AAAAAAAAAABQAiAA/wIAAA== + summary: IP / TCP 127.0.0.1:ftp_data > 8.8.8.8:https S + - - raw_packet: !!binary | + RQAAKF69AAAEBskCfwAAAQgICAgAFAG7AAAAAAAAAABQAiAA/wIAAA== + summary: IP / TCP 127.0.0.1:ftp_data > 8.8.8.8:https S + - - raw_packet: !!binary | + RQAAKKLjAAAFBoPcfwAAAQgICAgAFAG7AAAAAAAAAABQAiAA/wIAAA== + summary: IP / TCP 127.0.0.1:ftp_data > 8.8.8.8:https S + - - raw_packet: !!binary | + RQAAKAF2AAAGBiRKfwAAAQgICAgAFAG7AAAAAAAAAABQAiAA/wIAAA== + summary: IP / TCP 127.0.0.1:ftp_data > 8.8.8.8:https S + - - raw_packet: !!binary | + RQAAKNjxAAAHBkvOfwAAAQgICAgAFAG7AAAAAAAAAABQAiAA/wIAAA== + summary: IP / TCP 127.0.0.1:ftp_data > 8.8.8.8:https S + - - raw_packet: !!binary | + RQAAKKlkAAAIBnpbfwAAAQgICAgAFAG7AAAAAAAAAABQAiAA/wIAAA== + summary: IP / TCP 127.0.0.1:ftp_data > 8.8.8.8:https S + timeout: 5 + test_name: test_tcp_traceroute + test_started: 1353425277.715115 + ... + --- + input: null + report: + answered_packets: + - - raw_packet: !!binary | + RcAAOHvVAABAAXicwKgCAX8AAAELAPT/AAAAAEUAABxwTAAAAQF2m8CoAkIICAgICAD3/wAAAAA= + summary: IP / ICMP 192.168.2.1 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / ICMPerror + - - raw_packet: !!binary | + RQAAOAhjQAA/Aa7OwKgBAX8AAAELAPT/AAAAAEUAABy0+wAAAQEx7MCoAkIICAgICAD3/wAAAAA= + summary: IP / ICMP 192.168.1.1 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / ICMPerror + - - raw_packet: !!binary | + RcAAOCe5AAD9AVkclxfiLX8AAAELAPT/AAAAAEUAABzKAQAAAQEc5sCoAkIICAgICAD3/wAAAAA= + summary: IP / ICMP 151.23.226.45 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / ICMPerror + - - raw_packet: !!binary | + RcAAOFScAAD8AWl9CgAzAX8AAAELAPT/AAAAAEUAABwJNAAAAQHds8CoAkIICAgICAD3/wAAAAA= + summary: IP / ICMP 10.0.51.1 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / ICMPerror + - - raw_packet: !!binary | + RcAAOKV+AAD7AapTlwcVQX8AAAELAPT/AAAAAEUAABzDBAAAAQEj48CoAkIICAgICAD3/wAAAAA= + summary: IP / ICMP 151.7.21.65 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / ICMPerror + - - raw_packet: !!binary | + RQAAOB/cAAD6AT6ylwcIRX8AAAELAPT+AAAAAUUAABwDzwAAAQHjGMCoAkIICAgICAD3/wAAAAA= + summary: IP / ICMP 151.7.8.69 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / ICMPerror + - - raw_packet: !!binary | + RQAAOAAAAAD4AWQGlwYEzn8AAAELAPT/AAAAAEUAABxKAAAAAQGc58CoAkIICAgICAD3/wAAAAA= + summary: IP / ICMP 151.6.4.206 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / ICMPerror + - - raw_packet: !!binary | + RQAAOAAAAAD3AWhKlwYBin8AAAELAPT/AAAAAEUAABxVjgAAAQGRWcCoAkIICAgICAD3/wAAAAA= + summary: IP / ICMP 151.6.1.138 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / ICMPerror + - - raw_packet: !!binary | + RQAAOAAAAAD3AWm6lwYAGn8AAAELAPT/AAAAAEUAABwtmwAAAQG5TMCoAkIICAgICAD3/wAAAAA= + summary: IP / ICMP 151.6.0.26 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / ICMPerror + - - raw_packet: !!binary | + RQAAOAAAAAD1AThO0VX5Nn8AAAELAPT/AAAAAEWAABw0YgAAAQGyBcCoAkIICAgICAD3/wAAAAA= + summary: IP / ICMP 209.85.249.54 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / ICMPerror + - - raw_packet: !!binary | + RQAAqK+LQADzAeSDSA7oTH8AAAELAPT/AAAAAEWAABwAkwAAAQHl1MCoAkIICAgICAD3/wAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIACbFAAIAQF64MkB + summary: IP / ICMP 72.14.232.76 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / ICMPerror / Padding + - - raw_packet: !!binary | + RQAAOAAAAAD0ATQQ0VX+dH8AAAELAPT/AAAAAEWAABwVTAAAAQHRG8CoAkIICAgICAD3/wAAAAA= + summary: IP / ICMP 209.85.254.116 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / ICMPerror + - - raw_packet: !!binary | + RQAAHCqxAAAtAZA2CAgICH8AAAEAAAAAAAAAAA== + summary: IP / ICMP 8.8.8.8 > 127.0.0.1 echo-reply 0 + - - raw_packet: !!binary | + RQAAHCqyAAAtAZA1CAgICH8AAAEAAAAAAAAAAA== + summary: IP / ICMP 8.8.8.8 > 127.0.0.1 echo-reply 0 + - - raw_packet: !!binary | + RQAAHCqzAAAtAZA0CAgICH8AAAEAAAAAAAAAAA== + summary: IP / ICMP 8.8.8.8 > 127.0.0.1 echo-reply 0 + - - raw_packet: !!binary | + RQAAHCq0AAAtAZAzCAgICH8AAAEAAAAAAAAAAA== + summary: IP / ICMP 8.8.8.8 > 127.0.0.1 echo-reply 0 + - - raw_packet: !!binary | + RQAAHCq1AAAtAZAyCAgICH8AAAEAAAAAAAAAAA== + summary: IP / ICMP 8.8.8.8 > 127.0.0.1 echo-reply 0 + - - raw_packet: !!binary | + RQAAHCq2AAAtAZAxCAgICH8AAAEAAAAAAAAAAA== + summary: IP / ICMP 8.8.8.8 > 127.0.0.1 echo-reply 0 + - - raw_packet: !!binary | + RQAAHCq3AAAtAZAwCAgICH8AAAEAAAAAAAAAAA== + summary: IP / ICMP 8.8.8.8 > 127.0.0.1 echo-reply 0 + - - raw_packet: !!binary | + RQAAHCq4AAAtAZAvCAgICH8AAAEAAAAAAAAAAA== + summary: IP / ICMP 8.8.8.8 > 127.0.0.1 echo-reply 0 + - - raw_packet: !!binary | + RQAAHCq5AAAtAZAuCAgICH8AAAEAAAAAAAAAAA== + summary: IP / ICMP 8.8.8.8 > 127.0.0.1 echo-reply 0 + - - raw_packet: !!binary | + RQAAHCq6AAAtAZAtCAgICH8AAAEAAAAAAAAAAA== + summary: IP / ICMP 8.8.8.8 > 127.0.0.1 echo-reply 0 + - - raw_packet: !!binary | + RQAAHCq7AAAtAZAsCAgICH8AAAEAAAAAAAAAAA== + summary: IP / ICMP 8.8.8.8 > 127.0.0.1 echo-reply 0 + - - raw_packet: !!binary | + RQAAHCq8AAAtAZArCAgICH8AAAEAAAAAAAAAAA== + summary: IP / ICMP 8.8.8.8 > 127.0.0.1 echo-reply 0 + - - raw_packet: !!binary | + RQAAHCq9AAAtAZAqCAgICH8AAAEAAAAAAAAAAA== + summary: IP / ICMP 8.8.8.8 > 127.0.0.1 echo-reply 0 + - - raw_packet: !!binary | + RQAAHCq+AAAtAZApCAgICH8AAAEAAAAAAAAAAA== + summary: IP / ICMP 8.8.8.8 > 127.0.0.1 echo-reply 0 + - - raw_packet: !!binary | + RQAAHCq/AAAtAZAoCAgICH8AAAEAAAAAAAAAAA== + summary: IP / ICMP 8.8.8.8 > 127.0.0.1 echo-reply 0 + - - raw_packet: !!binary | + RQAAHCrAAAAtAZAnCAgICH8AAAEAAAAAAAAAAA== + summary: IP / ICMP 8.8.8.8 > 127.0.0.1 echo-reply 0 + - - raw_packet: !!binary | + RQAAHCrBAAAtAZAmCAgICH8AAAEAAAAAAAAAAA== + summary: IP / ICMP 8.8.8.8 > 127.0.0.1 echo-reply 0 + hops: + - {address: 192.168.2.1, rtt: 0.02021312713623047, ttl: 1} + - {address: 192.168.1.1, rtt: 0.03769707679748535, ttl: 2} + - {address: 151.23.226.45, rtt: 0.05884099006652832, ttl: 3} + - {address: 10.0.51.1, rtt: 0.06669998168945312, ttl: 4} + - {address: 151.7.21.65, rtt: 0.08714413642883301, ttl: 5} + - {address: 151.7.8.69, rtt: 0.10510706901550293, ttl: 6} + - {address: 151.6.4.206, rtt: 0.11643505096435547, ttl: 7} + - {address: 151.6.1.138, rtt: 0.12979793548583984, ttl: 8} + - {address: 151.6.0.26, rtt: 0.16455411911010742, ttl: 9} + - {address: 209.85.249.54, rtt: 0.17022013664245605, ttl: 10} + - {address: 72.14.232.76, rtt: 0.21141505241394043, ttl: 11} + - {address: 209.85.254.116, rtt: 0.22271299362182617, ttl: 12} + - {address: 8.8.8.8, rtt: 0.2633399963378906, ttl: 13} + - {address: 8.8.8.8, rtt: 0.2839341163635254, ttl: 14} + - {address: 8.8.8.8, rtt: 0.29700398445129395, ttl: 15} + - {address: 8.8.8.8, rtt: 0.3080580234527588, ttl: 16} + - {address: 8.8.8.8, rtt: 0.31791210174560547, ttl: 17} + - {address: 8.8.8.8, rtt: 0.34924912452697754, ttl: 18} + - {address: 8.8.8.8, rtt: 0.35537195205688477, ttl: 19} + - {address: 8.8.8.8, rtt: 0.3696310520172119, ttl: 20} + - {address: 8.8.8.8, rtt: 0.3782229423522949, ttl: 21} + - {address: 8.8.8.8, rtt: 0.39800405502319336, ttl: 22} + - {address: 8.8.8.8, rtt: 0.4051640033721924, ttl: 23} + - {address: 8.8.8.8, rtt: 0.4123039245605469, ttl: 24} + - {address: 8.8.8.8, rtt: 0.42334413528442383, ttl: 25} + - {address: 8.8.8.8, rtt: 0.43251705169677734, ttl: 26} + - {address: 8.8.8.8, rtt: 0.4546849727630615, ttl: 27} + - {address: 8.8.8.8, rtt: 0.4642460346221924, ttl: 28} + - {address: 8.8.8.8, rtt: 0.47597813606262207, ttl: 29} + max_ttl: 30 + sent_packets: + - - raw_packet: !!binary | + RQAAHHBMAAABAbqEfwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHLT7AAACAXTVfwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHMoBAAADAV7PfwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHAk0AAAEAR6dfwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHMMEAAAFAWPMfwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHAPPAAAGASICfwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHEoAAAAHAdrQfwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHFWOAAAIAc5CfwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHC2bAAAJAfU1fwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHDRiAAAKAe1ufwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHACTAAALASA+fwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHBVMAAAMAQqFfwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHBWnAAANAQkqfwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHE26AAAOAdAWfwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHMFeAAAPAVtyfwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHMLoAAAQAVjofwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHGR2AAARAbZafwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHIjLAAASAZEFfwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHD+rAAATAdklfwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHNMmAAAUAUSqfwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHMW8AAAVAVEUfwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHN5MAAAWATeEfwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHE3KAAAXAccGfwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHMyzAAAYAUcdfwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHCdWAAAZAet6fwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHBguAAAaAfmifwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHHPpAAAbAZznfwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHDM1AAAcAdybfwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + - - raw_packet: !!binary | + RQAAHCPeAAAdAeryfwAAAQgICAgIAPf/AAAAAA== + summary: IP / ICMP 127.0.0.1 > 8.8.8.8 echo-request 0 + timeout: 5 + test_name: test_icmp_traceroute + test_started: 1353425284.345713 + ... + --- + input: null + report: + answered_packets: + - - raw_packet: !!binary | + RcAAOHvZAABAAXiYwKgCAX8AAAELAMgTAAAAAEUAABwx6gAAARG07cCoAkIICAgIADUAewAILDQ= + summary: IP / ICMP 192.168.2.1 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / UDPerror + - - raw_packet: !!binary | + RQAAOAhkAAA/Ae7NwKgBAX8AAAELAMgTAAAAAEUAABzc/wAAAREJ2MCoAkIICAgIADUAewAILDQ= + summary: IP / ICMP 192.168.1.1 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / UDPerror + - - raw_packet: !!binary | + RcAAOCjAAAD9AVgVlxfiLX8AAAELAMgTAAAAAEUAABwxrAAAARG1K8CoAkIICAgIADUAewAILDQ= + summary: IP / ICMP 151.23.226.45 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / UDPerror + - - raw_packet: !!binary | + RcAAOKYWAAD7Aam7lwcVQX8AAAELAMgTAAAAAEUAABwwvQAAARG2GsCoAkIICAgIADUAewAILDQ= + summary: IP / ICMP 151.7.21.65 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / UDPerror + - - raw_packet: !!binary | + RQAAOCSLAAD6AToDlwcIRX8AAAELAMgSAAAAAUUAABxthAAAARF5U8CoAkIICAgIADUAewAILDQ= + summary: IP / ICMP 151.7.8.69 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / UDPerror + - - raw_packet: !!binary | + RQAAOAAAAAD4AWQGlwYEzn8AAAELAMgTAAAAAEUAABytOgAAARE5ncCoAkIICAgIADUAewAILDQ= + summary: IP / ICMP 151.6.4.206 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / UDPerror + - - raw_packet: !!binary | + RQAAOAAAAAD3AWhGlwYBjn8AAAELAMgTAAAAAEUAABx29QAAARFv4sCoAkIICAgIADUAewAILDQ= + summary: IP / ICMP 151.6.1.142 > 127.0.0.1 time-exceeded ttl-zero-during-transit + / IPerror / UDPerror + hops_123: + - {address: 192.168.2.1, rtt: 0.005973100662231445, ttl: 1} + - {address: 192.168.1.1, rtt: 0.01427006721496582, ttl: 2} + - {address: 151.23.226.45, rtt: 0.02519512176513672, ttl: 3} + - {address: 151.7.21.65, rtt: 0.028814077377319336, ttl: 4} + - {address: 151.7.8.69, rtt: 0.03263592720031738, ttl: 5} + - {address: 151.6.4.206, rtt: 0.036956071853637695, ttl: 6} + - {address: 151.6.1.142, rtt: 0.040396928787231445, ttl: 7} + hops_22: + - {address: 192.168.2.1, rtt: 0.003320932388305664, ttl: 1} + - {address: 151.23.226.45, rtt: 0.017846107482910156, ttl: 2} + - {address: 10.0.51.1, rtt: 0.022522926330566406, ttl: 3} + - {address: 151.7.21.65, rtt: 0.02526092529296875, ttl: 4} + - {address: 151.7.8.69, rtt: 0.027420997619628906, ttl: 5} + - {address: 151.6.4.206, rtt: 0.028680086135864258, ttl: 6} + - {address: 151.6.1.142, rtt: 0.030663013458251953, ttl: 7} + hops_23: + - {address: 192.168.2.1, rtt: 0.0060520172119140625, ttl: 1} + - {address: 151.23.226.45, rtt: 0.021609067916870117, ttl: 2} + - {address: 10.0.51.1, rtt: 0.02601790428161621, ttl: 3} + - {address: 151.7.21.65, rtt: 0.03017401695251465, ttl: 4} + - {address: 151.7.8.69, rtt: 0.04059290885925293, ttl: 5} + - {address: 151.6.4.206, rtt: 0.046777963638305664, ttl: 6} + - {address: 151.6.1.142, rtt: 0.051110029220581055, ttl: 7} + hops_443: + - {address: 192.168.2.1, rtt: 0.0060040950775146484, ttl: 1} + - {address: 151.23.226.45, rtt: 0.016175031661987305, ttl: 2} + - {address: 10.0.51.1, rtt: 0.019622087478637695, ttl: 3} + - {address: 151.7.21.65, rtt: 0.024995088577270508, ttl: 4} + - {address: 151.7.8.69, rtt: 0.029528141021728516, ttl: 5} + - {address: 151.6.4.206, rtt: 0.04129600524902344, ttl: 6} + - {address: 151.6.1.142, rtt: 0.045397043228149414, ttl: 7} + hops_80: + - {address: 192.168.2.1, rtt: 0.01238107681274414, ttl: 1} + - {address: 151.23.226.45, rtt: 0.022581100463867188, ttl: 2} + - {address: 10.0.51.1, rtt: 0.024456024169921875, ttl: 3} + - {address: 151.7.21.65, rtt: 0.03365302085876465, ttl: 4} + - {address: 151.7.8.69, rtt: 0.04121208190917969, ttl: 5} + - {address: 151.6.4.206, rtt: 0.043180227279663086, ttl: 6} + - {address: 151.6.1.142, rtt: 0.05482816696166992, ttl: 7} + max_ttl: 30 + sent_packets: + - - raw_packet: !!binary | + RQAAHDHqAAABEfjWfwAAAQgICAgANQB7AAhwHQ== + summary: IP / UDP 127.0.0.1:domain > 8.8.8.8:ntp + - - raw_packet: !!binary | + RQAAHNz/AAACEUzBfwAAAQgICAgANQB7AAhwHQ== + summary: IP / UDP 127.0.0.1:domain > 8.8.8.8:ntp + - - raw_packet: !!binary | + RQAAHDGsAAADEfcUfwAAAQgICAgANQB7AAhwHQ== + summary: IP / UDP 127.0.0.1:domain > 8.8.8.8:ntp + - - raw_packet: !!binary | + RQAAHDC9AAAEEfcDfwAAAQgICAgANQB7AAhwHQ== + summary: IP / UDP 127.0.0.1:domain > 8.8.8.8:ntp + - - raw_packet: !!binary | + RQAAHG2EAAAFEbk8fwAAAQgICAgANQB7AAhwHQ== + summary: IP / UDP 127.0.0.1:domain > 8.8.8.8:ntp + - - raw_packet: !!binary | + RQAAHK06AAAGEXiGfwAAAQgICAgANQB7AAhwHQ== + summary: IP / UDP 127.0.0.1:domain > 8.8.8.8:ntp + - - raw_packet: !!binary | + RQAAHHb1AAAHEa3LfwAAAQgICAgANQB7AAhwHQ== + summary: IP / UDP 127.0.0.1:domain > 8.8.8.8:ntp + timeout: 5 + test_name: test_udp_traceroute + test_started: 1353425289.47829 + ... +

1 0

[ooni-probe/master] Improve report of TCP Connect test
by art＠torproject.org 20 Nov '12

20 Nov '12

commit ab198019f18b66d18b7e1ddc944127d992918ce1 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Nov 20 17:07:33 2012 +0100 Improve report of TCP Connect test --- nettests/core/tcpconnect.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/nettests/core/tcpconnect.py b/nettests/core/tcpconnect.py index 4d1e0fc..b763bf8 100644 --- a/nettests/core/tcpconnect.py +++ b/nettests/core/tcpconnect.py @@ -35,7 +35,12 @@ class TCPConnectTest(nettest.NetTestCase): def connectionFailed(failure): failure.trap(ConnectionRefusedError, TCPTimedOutError) log.debug("Unable to connect to %s" % self.input) - self.report["connection"] = str(failure.value) + if isinstance(failure, ConnectionRefusedError): + self.report["connection"] = 'refused' + elif isinstance(failure, TCPTimedOutError): + self.report["connection"] = 'timeout' + else: + self.report["connection"] = 'failed' from twisted.internet import reactor point = TCP4ClientEndpoint(reactor, host, int(port))

1 0

[ooni-probe/master] Remove dead code
by art＠torproject.org 20 Nov '12

20 Nov '12

commit 57d4ef80285d28d8e59169f0d4e773f7997f09d1 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Nov 20 17:16:55 2012 +0100 Remove dead code --- ooni/lib/txtraceroute.py | 752 ---------------------------------------------- 1 files changed, 0 insertions(+), 752 deletions(-) diff --git a/ooni/lib/txtraceroute.py b/ooni/lib/txtraceroute.py deleted file mode 100644 index 8182b34..0000000 --- a/ooni/lib/txtraceroute.py +++ /dev/null @@ -1,752 +0,0 @@ -#!/usr/bin/env python -# coding: utf-8 -# -# Copyright (c) 2012 Alexandre Fiori -# Arturo Filastò -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject to -# the following conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -import json -import operator -import os -import socket -import struct -import sys -import time -import random -import itertools -from pprint import pprint - -from twisted.internet import defer -from twisted.internet import reactor -from twisted.internet import threads -from twisted.python import usage -from twisted.web.client import getPage - -class iphdr(object): - """ - This represents an IP packet header. - - XXX enable IP_TIMESTAMP in setsockopt - to get the timestamp of when the router says it has gotten an ICMP - timeout. - - @assemble packages the packet - @disassemble disassembles the packet - """ - def __init__(self, proto=socket.IPPROTO_ICMP, src="0.0.0.0", dst=None): - self.version = 4 - self.hlen = 5 - self.tos = 0 - self.length = 20 - self.id = os.getpid() - self.frag = 0 - self.ttl = 255 - self.proto = proto - self.cksum = 0 - self.src = src - self.saddr = socket.inet_aton(src) - self.dst = dst or "0.0.0.0" - self.daddr = socket.inet_aton(self.dst) - self.data = "" - - def assemble(self): - header = struct.pack('BBHHHBB', - (self.version & 0x0f) << 4 | (self.hlen & 0x0f), - self.tos, self.length + len(self.data), - socket.htons(self.id), self.frag, - self.ttl, self.proto) - self._raw = header + "\x00\x00" + self.saddr + self.daddr + self.data - return self._raw - - @classmethod - def disassemble(self, data): - self._raw = data - ip = iphdr() - pkt = struct.unpack('!BBHHHBBH', data[:12]) - ip.version = (pkt[0] >> 4 & 0x0f) - ip.hlen = (pkt[0] & 0x0f) - ip.tos, ip.length, ip.id, ip.frag, ip.ttl, ip.proto, ip.cksum = pkt[1:] - ip.saddr = data[12:16] - ip.daddr = data[16:20] - ip.src = socket.inet_ntoa(ip.saddr) - ip.dst = socket.inet_ntoa(ip.daddr) - return ip - - def __repr__(self): - return "IP (tos %s, ttl %s, id %s, frag %s, proto %s, length %s) " \ - "%s -> %s" % \ - (self.tos, self.ttl, self.id, self.frag, self.proto, - self.length, self.src, self.dst) - -class tcphdr(object): - def __init__(self, data="", sport=4242, dport=4242): - self.seq = 0 - self.hlen = 44 - self.flags = 2 - self.wsize = 200 - self.cksum = 123 - self.options = 0 - self.mss = 1460 - self.dport = dport - self.sport = sport - - def assemble(self): - header = struct.pack("!HHL", self.sport, self.dport, self.seq) - header += '\x00\x00\x00\x00' - header += struct.pack("!HHH", (self.hlen & 0xff) << 10 | (self.flags & - 0xff), self.wsize, self.cksum) - header += "\x00\x00" - options = '\x02\x04\x05\xb4\x01\x03\x03\x01\x01\x01\x08\x0a' - options += '\x4d\xcf\x52\x33\x00\x00\x00\x00\x04\x02\x00\x00' - # XXX There is something wrong here fixme - # options = struct.pack("!LBBBBBB", self.mss, 1, 3, 3, 1, 1, 1) - # options += struct.pack("!BBL", 8, 10, 1209452188) - # options += '\00'*4 - # options += struct.pack("!BB", 4, 2) - # options += '\00' - self._raw = header+options - return self._raw - - @classmethod - def checksum(self, data): - pass - - def __repr__(self): - return "<TCPPacket (sport: %s dport: %s seq: %s) " %\ - (self.sport, self.dport, self.seq) - - @classmethod - def disassemble(self, data): - self._raw = data - tcp = tcphdr() - pkt = struct.unpack("!HHL", data[:8]) - tcp.sport, tcp.dport, tcp.seq = pkt - if len(data) > 10: - pkt = struct.unpack("!H", data[8:10]) - tcp.hlen = (pkt[0] >> 10 ) & 0xff - tcp.flags = pkt[0] & 0xff - tcp.wsize, tcp.cksum = struct.unpack("!HH", data[20:24]) - return tcp - -class udphdr(object): - def __init__(self, data="", sport=4242, dport=4242): - self.dport = dport - self.sport = sport - self.cksum = 0 - self.length = 0 - self.data = data - - def assemble(self): - self.length = len(self.data) + 8 - part1 = struct.pack("!HHH", self.sport, self.dport, self.length) - cksum = self.checksum(self.data) - cksum = struct.pack("!H", cksum) - - self._raw = part1 + cksum + self.data - return self._raw - - @classmethod - def checksum(self, data): - # XXX implement proper checksum - cksum = 0 - return cksum - - def __repr__(self): - return "<UDPPacket (sport %s, dport %s, length %s, data %s)>" % \ - (self.sport, self.dport, self.length, self.data) - - @classmethod - def disassemble(self, data): - self._raw = data - udp = udphdr() - pkt = struct.unpack("!HHHH", data[:8]) - udp.sport, udp.dport, udp.length, udp.cksum = pkt - udp.data = data[8:] - return udp - -class icmphdr(object): - def __init__(self, data=""): - self.type = 8 - self.code = 0 - self.cksum = 0 - self.id = os.getpid() - self.sequence = 0 - self.data = data - - def assemble(self): - part1 = struct.pack("BB", self.type, self.code) - part2 = struct.pack("!HH", self.id, self.sequence) - cksum = self.checksum(part1 + "\x00\x00" + part2 + self.data) - cksum = struct.pack("!H", cksum) - self._raw = part1 + cksum + part2 + self.data - return self._raw - - @classmethod - def checksum(self, data): - if len(data) & 1: - data += "\x00" - cksum = reduce(operator.add, - struct.unpack('!%dH' % (len(data) >> 1), data)) - cksum = (cksum >> 16) + (cksum & 0xffff) - cksum += (cksum >> 16) - cksum = (cksum & 0xffff) ^ 0xffff - return cksum - - @classmethod - def disassemble(self, data): - self._raw = data - icmp = icmphdr() - pkt = struct.unpack("!BBHHH", data) - icmp.type, icmp.code, icmp.cksum, icmp.id, icmp.sequence = pkt - return icmp - - def __repr__(self): - return "ICMP (type %s, code %s, id %s, sequence %s)" % \ - (self.type, self.code, self.id, self.sequence) - - -def pprintp(packet): - """ - Used to pretty print packets. - """ - lines = [] - line = [] - for i, byte in enumerate(packet): - line.append(("%.2x" % ord(byte), byte)) - if (i + 1) % 8 == 0: - lines.append(line) - line = [] - - lines.append(line) - - for row in lines: - left = "" - right = " " * (8 - len(row)) - for y in row: - left += "%s " % y[0] - right += "%s" % y[1] - - print left + " " + right - -(a)defer.inlineCallbacks -def geoip_lookup(ip): - try: - r = yield getPage("http://freegeoip.net/json/%s" % ip) - d = json.loads(r) - items = [d["country_name"], d["region_name"], d["city"]] - text = ", ".join([s for s in items if s]) - defer.returnValue(text.encode("utf-8")) - except Exception: - defer.returnValue("Unknown location") - - -(a)defer.inlineCallbacks -def reverse_lookup(ip): - try: - r = yield threads.deferToThread(socket.gethostbyaddr, ip) - defer.returnValue(r[0]) - except Exception: - defer.returnValue(None) - - -class Hop(object): - def __init__(self, target, ttl, proto, sport=None, dport=None): - self.proto = proto - self.dport = dport - self.sport = sport - - self.found = False - self.tries = 0 - self.last_try = 0 - self.remote_ip = None - self.remote_icmp = None - self.remote_host = None - self.location = "" - - self.ttl = ttl - self.ip = iphdr(dst=target) - self.ip.ttl = ttl - self.ip.id += ttl - if self.proto == "icmp": - self.icmp = icmphdr('\x00'*20) - self.icmp.id = self.ip.id - self.ip.data = self.icmp.assemble() - elif self.proto == "udp": - self.udp = udphdr('\x00'*20, self.sport, self.dport) - self.ip.data = self.udp.assemble() - self.ip.proto = socket.IPPROTO_UDP - else: - self.tcp = tcphdr('\x42'*20, self.sport, self.dport) - self.ip.data = self.tcp.assemble() - self.ip.proto = socket.IPPROTO_TCP - - self._pkt = self.ip.assemble() - - @property - def pkt(self): - self.tries += 1 - self.last_try = time.time() - return self._pkt - - def get(self): - if self.found: - if self.remote_host: - ip = self.remote_host - else: - ip = self.remote_ip.src - ping = self.found - self.last_try - else: - ip = None - ping = None - - location = self.location if self.location else None - return {'ttl': self.ttl, 'ping': ping, 'ip': ip, 'location': location, - 'proto': self.proto, 'dport': self.dport, 'sport': self.sport} - - def __repr__(self): - if self.found: - if self.remote_host: - ip = ":: %s" % self.remote_host - else: - ip = ":: %s" % self.remote_ip.src - ping = "%0.3fs" % (self.found - self.last_try) - else: - ip = "??" - ping = "-" - - location = ":: %s" % self.location if self.location else "" - return "%02d. %s %s %s (%s, sport: %s dport: %s)" % (self.ttl, ping, ip, location, self.proto, self.sport, self.dport) - -class TracerouteResult(object): - """ - Used to store the results of a Traceroute. - """ - #src_ports = [0, 9090] - #dst_ports = [0, 21, 123, 80, 443] - src_ports = [0, 80] - dst_ports = [0, 80] - hops = [] - done = False - - def __init__(self, protocol): - self.protocol = protocol - self.probes = {} - - if protocol == "icmp": - self.current = None - else: - self.current = {} - for src, dst in itertools.product(self.src_ports, - self.dst_ports): - if src not in self.probes: - self.probes[src] = {} - self.probes[src][dst] = [] - - if src not in self.current: - self.current[src] = {} - self.current[src][dst] = None - - def get_current_probes(self): - if self.protocol == "icmp": - return self.current - - def add_to_current_probes(self, probe): - if self.protocol == "icmp": - self.current = probe - else: - self.current[probe.sport][probe.dport] = probe - - def is_in_progress(self): - if self.protocol == "icmp": - progress = self.current - else: - progress = None - for x in self.current: - for y in self.current[x]: - if self.current[x][y] != None: - progress = True - if progress is None: - return False - else: - return True - - def get(self, src=None, dst=None): - if self.protocol == "icmp": - return self.probes - else: - return self.probes[src][dst] - - def append(self, probe, src=None, dst=None): - if self.protocol == "icmp": - self.probes.append(hop) - else: - self.probes[src][dst].append(probe) - - def pop(self, src=None, dst=None): - if self.protocol == "icmp": - hop = self.current - self.current = None - return hop - - elif (dst != None) and (src != None): - hop = self.current[src][dst] - self.current[src][dst] = None - return hop - - else: - raise Exception("Did not specify dst and src ports") - - @classmethod - def hops(self, target, ttl): - """ - Generates a set of ooni probes for traceroute based network tampering - detection. - - We send in one round a set of packets with same TTL but on all protocols - and with all possible source and destination ports. - """ - hops = [] - for src, dst in itertools.product(self.src_ports, self.dst_ports): - hops.append(Hop(target, ttl, - "tcp", src, dst)) - hops.append(Hop(target, ttl, - "udp", src, dst)) - hops.append(Hop(target, ttl, "icmp", 0, 0)) - return hops - -class TracerouteProtocol(object): - def __init__(self, target, **settings): - - self.target = target - self.settings = settings - self.verbose = settings.get("verbose") - self.proto = settings.get("proto") - self.rfd = socket.socket(socket.AF_INET, socket.SOCK_RAW, - socket.IPPROTO_ICMP) - self.sfd = {} - - # Create the data structures to contain the test results - self.traceroute = {} - self.traceroute["tcp"] = TracerouteResult("tcp") - self.traceroute["udp"] = TracerouteResult("udp") - self.traceroute["icmp"] = TracerouteResult("icmp") - - if self.settings.get("ooni"): - self.sfd["tcp"] = socket.socket(socket.AF_INET, socket.SOCK_RAW, - socket.IPPROTO_TCP) - self.sfd["icmp"] = socket.socket(socket.AF_INET, socket.SOCK_RAW, - socket.IPPROTO_ICMP) - self.sfd["udp"] = socket.socket(socket.AF_INET, socket.SOCK_RAW, - socket.IPPROTO_UDP) - elif self.proto == "icmp": - self.sfd["icmp"] = socket.socket(socket.AF_INET, socket.SOCK_RAW, - socket.IPPROTO_ICMP) - elif self.proto == "udp": - self.sfd["udp"] = socket.socket(socket.AF_INET, socket.SOCK_RAW, - socket.IPPROTO_UDP) - elif self.proto == "tcp": - self.sfd["tcp"] = socket.socket(socket.AF_INET, socket.SOCK_RAW, - socket.IPPROTO_TCP) - - # Let me add IP Headers myself, just give me a socket! - self.rfd.setsockopt(socket.IPPROTO_IP, socket.IP_HDRINCL, 1) - for fd in self.sfd: - self.sfd[fd].setsockopt(socket.IPPROTO_IP, socket.IP_HDRINCL, 1) - - self.out_queue = [] - self.waiting = True - self.deferred = defer.Deferred() - - reactor.addReader(self) - reactor.addWriter(self) - - # send 1st probe packet(s) - if self.settings.get("ooni"): - hops = list(TracerouteResult.hops(self.target, 1)) - else: - hops = [Hop(self.target, 1, - settings.get("proto"), - self.settings.get("sport"), - self.settings.get("dport"))] - for hop in hops: - # Store the to be completed items inside of a dictionary - self.traceroute[hop.proto].add_to_current_probes(hop) - self.out_queue.append(hop) - - def logPrefix(self): - return "TracerouteProtocol(%s)" % self.target - - def fileno(self): - return self.rfd.fileno() - - @defer.inlineCallbacks - def hopFound(self, hop, ip, icmp, ref, subref): - hop.remote_ip = ip - hop.remote_icmp = icmp - - if (ip and icmp): - hop.found = time.time() - if self.settings.get("geoip_lookup") is True: - hop.location = yield geoip_lookup(ip.src) - - if self.settings.get("reverse_lookup") is True: - hop.remote_host = yield reverse_lookup(ip.src) - - ttl = hop.ttl + 1 - - if (ttl > (self.settings.get("max_hops", 30) + 1)): - done = True - else: - done = False - - if not done: - cb = self.settings.get("hop_callback") - if callable(cb): - yield defer.maybeDeferred(cb, hop) - - if not self.waiting: - if self.deferred: - self.deferred.callback(self.hops) - self.deferred = None - else: - hops = [] - if self.settings.get("ooni"): - if not (self.traceroute["icmp"].is_in_progress() or - self.traceroute["tcp"].is_in_progress() or - self.traceroute["udp"].is_in_progress()): - # Add hops only if we are not in progress - hops = list(TracerouteResult.hops(self.target, ttl)) - else: - hops = [Hop(self.target, ttl, - settings.get("proto"), - self.settings.get("sport"), - self.settings.get("dport"))] - - for hop in hops: - # Store the to be completed items inside of a dictionary - self.traceroute[hop.proto].add_to_current_probes(hop) - self.out_queue.append(hop) - - def doRead(self): - if not self.waiting: - return - - pkt = self.rfd.recv(4096) - # disassemble ip header - ip = iphdr.disassemble(pkt[:20]) - - if self.verbose: - print "Got this packet:" - print "src %s" % ip.src - pprintp(pkt) - - # Not interested in non ICMP packets. - if ip.proto != socket.IPPROTO_ICMP: - return - - found = False - foundHop = None - - # disassemble icmp header - icmp = icmphdr.disassemble(pkt[20:28]) - - if self.verbose: - print icmp - - # If it's an ICMP Echo reply then our ICMP probe has hit destination - if icmp.type == 0 and icmp.id == self.current_hop["icmp"][1].icmp.id: - foundHop = self.traceroute["icmp"].pop() - found = True - - elif icmp.type == 11: - # disassemble referenced ip header - ref = iphdr.disassemble(pkt[28:48]) - subref = None - - if self.verbose: - print ref - - if ref.dst == self.target: - found = True - - if ref.proto == socket.IPPROTO_UDP: - subref = udphdr.disassemble(pkt[48:]) - proto = "udp" - - elif ref.proto == socket.IPPROTO_TCP: - subref = tcphdr.disassemble(pkt[48:]) - proto = "tcp" - - else: - proto = "icmp" - - if subref: - sport = subref.sport - dport = subref.dport - else: - sport = None - dport = None - # Remove completed hops - foundHop = self.traceroute[proto].pop(sport, - dport) - - if ip.src == self.target: - self.waiting = False - - if found: - self.hopFound(foundHop, ip, icmp, ref, subref) - elif foundHop: - self.hopFound(foundHop, ip, icmp, ref, subref) - - def hopTimeout(self, hop): - if not hop.found: - if hop.tries < self.settings.get("max_tries", 3): - # retry - hop.tries += 1 - self.out_queue.append(hop) - else: - # give up and move forward - self.traceroute[hop.proto].pop(hop.dport, - hop.sport) - self.hopFound(hop, None, None, None, None) - - def doWrite(self): - if self.waiting and self.out_queue: - hop = self.out_queue.pop(0) - pkt = hop.pkt - if self.verbose: - print "Sending this packet:" - pprintp(pkt) - print hop - - self.sfd[hop.proto].sendto(pkt, (hop.ip.dst, 0)) - - self.traceroute[hop.proto].add_to_current_probes(hop) - - timeout = self.settings.get("timeout", 1) - reactor.callLater(timeout, self.hopTimeout, hop) - - def connectionLost(self, why): - pass - - -def traceroute(target, **settings): - tr = TracerouteProtocol(target, **settings) - return tr.deferred - - -(a)defer.inlineCallbacks -def start_trace(target, **settings): - hops = yield traceroute(target, **settings) - if settings["hop_callback"] is None: - for hop in hops: - print hop - reactor.stop() - -class Options(usage.Options): - optFlags = [ - ["quiet", "q", "Only print results at the end."], - ["no-dns", "n", "Show numeric IPs only, not their host names."], - ["no-geoip", "g", "Do not collect and show GeoIP information"], - ["verbose", "v", "Be more verbose"], - ["ooni", "o", "Run the ooni common port multiprotocol traceroute"], - ["help", "h", "Show this help"], - ] - optParameters = [ - ["timeout", "t", 2, "Timeout for probe packets"], - ["tries", "r", 3, "How many tries before give up probing a hop"], - ["proto", "p", "icmp", "What protocol to use (tcp, udp, icmp)"], - ["dport", "d", random.randint(2**10, 2**16), "Destination port (TCP and UDP only)"], - ["sport", "s", random.randint(2**10, 2**16), "Source port (TCP and UDP only)"], - ["max_hops", "m", 30, "Max number of hops to probe"] - ] - -def main(): - def show(hop): - print hop - - defaults = dict(hop_callback=show, - reverse_lookup=True, - geoip_lookup=True, - timeout=2, - proto="icmp", - dport=None, - sport=None, - verbose=False, - ooni=False, - max_tries=3, - max_hops=30) - - if len(sys.argv) < 2: - print("Usage: %s [options] host" % (sys.argv[0])) - print("%s: Try --help for usage details." % (sys.argv[0])) - sys.exit(1) - - target = sys.argv.pop(-1) if sys.argv[-1][0] != "-" else "" - config = Options() - try: - config.parseOptions() - if not target: - raise - except usage.UsageError, e: - print("%s: %s" % (sys.argv[0], e)) - print("%s: Try --help for usage details." % (sys.argv[0])) - sys.exit(1) - - settings = defaults.copy() - if config.get("silent"): - settings["hop_callback"] = None - if config.get("no-dns"): - settings["reverse_lookup"] = False - if config.get("no-geoip"): - settings["geoip_lookup"] = False - if config.get("verbose"): - settings["verbose"] = True - if config.get("ooni"): - settings["ooni"] = True - if "timeout" in config: - settings["timeout"] = config["timeout"] - if "tries" in config: - settings["max_tries"] = config["tries"] - if "proto" in config: - settings["proto"] = config["proto"] - if "max_hops" in config: - settings["max_hops"] = config["max_hops"] - if "dport" in config: - settings["dport"] = int(config["dport"]) - if "sport" in config: - settings["sport"] = int(config["sport"]) - - if os.getuid() != 0: - print("traceroute needs root privileges for the raw socket") - sys.exit(1) - try: - target = socket.gethostbyname(target) - except Exception, e: - print("could not resolve '%s': %s" % (target, str(e))) - sys.exit(1) - - reactor.callWhenRunning(start_trace, target, **settings) - reactor.run() - -if __name__ == "__main__": - main() -

1 0

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

20 Nov '12

commit 9b72d13fc37cec0fdb0764898080411bb0c75f9d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 20 16:15:21 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 4d04bfc..1cf6402 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-20 02:39+0000\n" +"PO-Revision-Date: 2012-11-20 16:11+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" @@ -3384,7 +3384,7 @@ msgid "" "One of your applications tried to establish a connection through Tor using a" " protocol that Tor does not understand. Please ensure you configure your " "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution." -msgstr "Una de sus aplicaciones trató de establecer una conexión a través de Tor usando un protocolo que Tor no entiende. Asegúrese de que configura sus aplicaciones para uso exclusivo con SOCKS4a o SOCKS5 con resolución de nombres de equipos remotos." +msgstr "Una de sus aplicaciones trató de establecer una conexión a través de Tor usando un protocolo que Tor no entiende. Asegúrese de que configura sus aplicaciones para sólo usar SOCKS4a o SOCKS5 con resolución de nombres de equipos remotos." msgctxt "StatusEventWidget" msgid "Invalid Destination Hostname" @@ -3395,22 +3395,22 @@ msgid "" "One of your applications tried to establish a connection through Tor to " "\"%1\", which Tor does not recognize as a valid hostname. Please check your " "application's configuration." -msgstr "Una de sus aplicaciones trató de establecer una conexión a través de Tor para \"%1\", Tor no reconoce como válido el nombre de servidor, proporcionado. Por favor, revise la configuración de la aplicación." +msgstr "Una de sus aplicaciones trató de establecer una conexión a través de Tor hacia \"%1\", que Tor no reconoce como un nombre válido de equipo. Revise la configuración de su aplicación." msgctxt "StatusEventWidget" msgid "External IP Address Changed" -msgstr "Dirección IP externa cambiada" +msgstr "La dirección IP externa ha cambiado" msgctxt "StatusEventWidget" msgid "" "Tor has determined your relay's public IP address is currently %1%2. If that" " is not correct, please consider setting the 'Address' option in your " "relay's configuration." -msgstr "Tor ha determinado que su dirección IP pública, de nodo es actualmente%1%2. Si esto no es correcto, por favor configure la opción 'Dirección' en la configuración de retransmision (configuracion de relay)." +msgstr "Tor ha determinado que la dirección IP pública de su repetidor (relay) actualmente es %1%2. Si esto no es correcto, configure la opción 'Dirección' en las preferencias de su repetidor." msgctxt "StatusEventWidget" msgid "DNS Hijacking Detected" -msgstr "Secuestro de DNS detectado" +msgstr "Se ha detectado secuestro de DNS." msgctxt "StatusEventWidget" msgid ""

1 0

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

20 Nov '12

commit 0ccdc7df5c3a1bcc7dfb4542b590d3c35553ddec Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 20 16:15:18 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 4d04bfc..1cf6402 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-20 02:39+0000\n" +"PO-Revision-Date: 2012-11-20 16:11+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" @@ -3384,7 +3384,7 @@ msgid "" "One of your applications tried to establish a connection through Tor using a" " protocol that Tor does not understand. Please ensure you configure your " "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution." -msgstr "Una de sus aplicaciones trató de establecer una conexión a través de Tor usando un protocolo que Tor no entiende. Asegúrese de que configura sus aplicaciones para uso exclusivo con SOCKS4a o SOCKS5 con resolución de nombres de equipos remotos." +msgstr "Una de sus aplicaciones trató de establecer una conexión a través de Tor usando un protocolo que Tor no entiende. Asegúrese de que configura sus aplicaciones para sólo usar SOCKS4a o SOCKS5 con resolución de nombres de equipos remotos." msgctxt "StatusEventWidget" msgid "Invalid Destination Hostname" @@ -3395,22 +3395,22 @@ msgid "" "One of your applications tried to establish a connection through Tor to " "\"%1\", which Tor does not recognize as a valid hostname. Please check your " "application's configuration." -msgstr "Una de sus aplicaciones trató de establecer una conexión a través de Tor para \"%1\", Tor no reconoce como válido el nombre de servidor, proporcionado. Por favor, revise la configuración de la aplicación." +msgstr "Una de sus aplicaciones trató de establecer una conexión a través de Tor hacia \"%1\", que Tor no reconoce como un nombre válido de equipo. Revise la configuración de su aplicación." msgctxt "StatusEventWidget" msgid "External IP Address Changed" -msgstr "Dirección IP externa cambiada" +msgstr "La dirección IP externa ha cambiado" msgctxt "StatusEventWidget" msgid "" "Tor has determined your relay's public IP address is currently %1%2. If that" " is not correct, please consider setting the 'Address' option in your " "relay's configuration." -msgstr "Tor ha determinado que su dirección IP pública, de nodo es actualmente%1%2. Si esto no es correcto, por favor configure la opción 'Dirección' en la configuración de retransmision (configuracion de relay)." +msgstr "Tor ha determinado que la dirección IP pública de su repetidor (relay) actualmente es %1%2. Si esto no es correcto, configure la opción 'Dirección' en las preferencias de su repetidor." msgctxt "StatusEventWidget" msgid "DNS Hijacking Detected" -msgstr "Secuestro de DNS detectado" +msgstr "Se ha detectado secuestro de DNS." msgctxt "StatusEventWidget" msgid ""

1 0

[torbrowser/maint-2.3] bump all stable TBBs to 2.2.39-6
by erinn＠torproject.org 20 Nov '12

20 Nov '12

commit 2b4266a1642070656fad35629e8e707a59558b26 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Nov 20 14:21:44 2012 +0000 bump all stable TBBs to 2.2.39-6 --- README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 6 +++--- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 8 ++++++++ changelog.osx-2.2 | 8 ++++++++ changelog.windows-2.2 | 8 ++++++++ 9 files changed, 36 insertions(+), 12 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index c02223d..52a9ef3 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -6,10 +6,10 @@ Included applications Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.10esr +Firefox 10.0.11esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.5.9 - |_ HTTPS-Everywhere 3.0.2 + |_ NoScript 2.6.1 + |_ HTTPS-Everywhere 3.0.4 Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 index d62db2b..a1bf21b 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -6,10 +6,10 @@ Included applications Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.10esr +Firefox 10.0.11esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.5.9 - |_ HTTPS-Everywhere 3.0.2 + |_ NoScript 2.6.1 + |_ HTTPS-Everywhere 3.0.4 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index ab0369f..b6731f5 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -6,10 +6,10 @@ Included applications Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.10esr +Firefox 10.0.11esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.5.9 - |_ HTTPS-Everywhere 3.0.2 + |_ NoScript 2.6.1 + |_ HTTPS-Everywhere 3.0.4 Usage ----- diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 40c0a03..db1e3b0 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=5 +BUILD_NUM=6 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 4cab2df..4146f96 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=5 +BUILD_NUM=6 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 1ea710e..e21be14 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=5 +BUILD_NUM=6 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 13795e5..f8f5e19 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.39-6); suite=linux + + * Update Firefox 10.0.11esr + * Update NoScript to 2.6.1 + * Update HTTPS Everywhere to 3.0.4 + + -- Erinn Clark <erinn(a)torproject.org> Tue Nov 20 14:19:38 GMT 2012 + Tor Browser Bundle (2.2.39-5); suite=linux * Update Firefox to 10.0.10esr diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 8bc305b..f3d84da 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.39-6); suite=osx + + * Update Firefox 10.0.11esr + * Update NoScript to 2.6.1 + * Update HTTPS Everywhere to 3.0.4 + + -- Erinn Clark <erinn(a)torproject.org> Tue Nov 20 14:19:32 GMT 2012 + Tor Browser Bundle (2.2.39-5); suite=osx * Update Firefox to 10.0.10esr diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 2fa96df..7c0dd35 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.39-6); suite=windows + + * Update Firefox 10.0.11esr + * Update NoScript to 2.6.1 + * Update HTTPS Everywhere to 3.0.4 + + -- Erinn Clark <erinn(a)torproject.org> Tue Nov 20 14:19:34 GMT 2012 + Tor Browser Bundle (2.2.39-5); suite=windows * Update Firefox to 10.0.10esr

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 20 Nov '12

20 Nov '12

commit 4d3205d38fa13fa05354e17e2b134a0f8dedbac1 Merge: 1939421 2b4266a Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Nov 20 14:22:02 2012 +0000 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 6 +++--- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 8 ++++++++ changelog.osx-2.2 | 8 ++++++++ changelog.windows-2.2 | 8 ++++++++ 9 files changed, 36 insertions(+), 12 deletions(-)

1 0

[torbrowser/maint-2.2] bump all stable TBBs to 2.2.39-6
by erinn＠torproject.org 20 Nov '12

20 Nov '12

1 0

[torbrowser/maint-2.3] bump all alpha TBBs to 2.3.25-alpha-1
by erinn＠torproject.org 20 Nov '12

20 Nov '12

commit 250915fa7477bc273c2bc14da2b390811bcf3556 Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Nov 20 14:25:34 2012 +0000 bump all alpha TBBs to 2.3.25-alpha-1 --- README.LINUX-2.3 | 6 +++--- README.OSX-2.3 | 6 +++--- README.WIN-2.3 | 6 +++--- build-scripts/versions-alpha.mk | 4 ++-- changelog.linux-2.3 | 8 ++++++++ changelog.osx-2.3 | 8 ++++++++ changelog.windows-2.3 | 8 ++++++++ 7 files changed, 35 insertions(+), 11 deletions(-) diff --git a/README.LINUX-2.3 b/README.LINUX-2.3 index 5a8f9c9..d414141 100644 --- a/README.LINUX-2.3 +++ b/README.LINUX-2.3 @@ -5,10 +5,10 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.3.23-rc (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.10esr +Tor 0.2.3.25-rc (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Firefox 10.0.11esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.5.9 + |_ NoScript 2.6.1 |_ HTTPS-Everywhere 4.0development.2 Usage diff --git a/README.OSX-2.3 b/README.OSX-2.3 index b873b00..3153c24 100644 --- a/README.OSX-2.3 +++ b/README.OSX-2.3 @@ -5,10 +5,10 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.3.23-rc (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.10esr +Tor 0.2.3.25-rc (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Firefox 10.0.11esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.5.9 + |_ NoScript 2.6.1 |_ HTTPS-Everywhere 4.0development.2 Usage diff --git a/README.WIN-2.3 b/README.WIN-2.3 index 8dcb8af..384a1fb 100644 --- a/README.WIN-2.3 +++ b/README.WIN-2.3 @@ -5,10 +5,10 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.3.23-rc (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.10esr +Tor 0.2.3.25-rc (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Firefox 10.0.11esr \_ Torbutton 1.4.6.3 - |_ NoScript 2.5.9 + |_ NoScript 2.6.1 |_ HTTPS-Everywhere 4.0development.2 Usage diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 4d64291..5f3c168 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -RELEASE_VER=2.3.24-alpha +RELEASE_VER=2.3.25-alpha ZLIB_VER=1.2.7 OPENSSL_VER=1.0.1c @@ -8,7 +8,7 @@ LIBPNG_VER=1.5.13 QT_VER=4.8.1 VIDALIA_VER=0.2.20 LIBEVENT_VER=2.0.20-stable -TOR_VER=0.2.3.24-rc +TOR_VER=0.2.3.25-rc PIDGIN_VER=2.6.4 FIREFOX_VER=10.0.11esr MOZBUILD_VER=1.5.1 diff --git a/changelog.linux-2.3 b/changelog.linux-2.3 index 66cf34c..71f37bb 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.3.25-alpha-1); suite=linux + + * Update Tor to 0.2.3.25-rc + * Update Firefox 10.0.11esr + * Update NoScript to 2.6.1 + + -- Erinn Clark <erinn(a)torproject.org> Tue Nov 20 14:22:59 GMT 2012 + Tor Browser Bundle (2.3.24-alpha-1); suite=linux * Update Tor to 0.2.3.24-rc diff --git a/changelog.osx-2.3 b/changelog.osx-2.3 index d9570e4..e5583a9 100644 --- a/changelog.osx-2.3 +++ b/changelog.osx-2.3 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.3.25-alpha-1); suite=osx + + * Update Tor to 0.2.3.25-rc + * Update Firefox 10.0.11esr + * Update NoScript to 2.6.1 + + -- Erinn Clark <erinn(a)torproject.org> Tue Nov 20 14:22:54 GMT 2012 + Tor Browser Bundle (2.3.24-alpha-1); suite=osx * Update Tor to 0.2.3.24-rc diff --git a/changelog.windows-2.3 b/changelog.windows-2.3 index 5ed32e1..bc6b09c 100644 --- a/changelog.windows-2.3 +++ b/changelog.windows-2.3 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.3.25-alpha-1); suite=windows + + * Update Tor to 0.2.3.25-rc + * Update Firefox 10.0.11esr + * Update NoScript to 2.6.1 + + -- Erinn Clark <erinn(a)torproject.org> Tue Nov 20 14:22:56 GMT 2012 + Tor Browser Bundle (2.3.24-alpha-1); suite=windows * Update Tor to 0.2.3.24-rc

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2012