- tor-commits - lists.torproject.org

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

29 Nov '12

commit cf2828256bd1169ad07794c54fa8e2951c8cd8d3 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 29 21:15:51 2012 +0000 Update translations for https_everywhere --- he/ssl-observatory.dtd | 35 ++++++++++++++++++----------------- 1 files changed, 18 insertions(+), 17 deletions(-) diff --git a/he/ssl-observatory.dtd b/he/ssl-observatory.dtd index 1b75265..13dd87a 100644 --- a/he/ssl-observatory.dtd +++ b/he/ssl-observatory.dtd @@ -44,7 +44,8 @@ to turn it on?">--> <!ENTITY ssl-observatory.prefs.done "הושלם"> <!ENTITY ssl-observatory.prefs.explanation -""> +"HTTPS בכל מקום יכול להשתמש במצפה SSL של EFF. זה מקיים שני דברים: +(1) שולח עותקים של אישורי HTTPS למצפה, כדי לעזור לנו לגלות התקפות 'איש באמצע' ולשפר את אבטחת הרשת; ו (2) מאפשר לנו להזהיר אותך מפני חיבורים לא מאובטחים או התקפות על הדפדפן שלך.">  <!ENTITY ssl-observatory.prefs.explanation2 -""> +"לדוגמא, כאשר אתה מבקר ב https://www.something.com, האישור שהתקבל על ידי המצפה יציין שמישהו ביקר ב www.something.com, אבל לא מי ביקר באתר, או על איזה עמוד ספציפי הם הסתכלו. תעבור עם העכבר על האפשרויות בשביל פרטים נוספים:"> -<!ENTITY ssl-observatory.prefs.hide ""> +<!ENTITY ssl-observatory.prefs.hide "הסתר אפשרויות מתקדמות"> <!ENTITY ssl-observatory.prefs.nonanon -""> +"בדוק אישורים אפילו אם Tor לא זמין"> <!ENTITY ssl-observatory.prefs.nonanon_tooltip -""> +"עדיין ננסה לשמור את הנתונים אנונימיים, אבל אפשרות זאת פחות מאובטחת"> <!ENTITY ssl-observatory.prefs.priv_dns -""> +"שלח ובדוק אישורים עבור שמות DNS לא ציבוריים"> <!ENTITY ssl-observatory.prefs.priv_dns_tooltip -""> +"אלא אם כן האפשרות הזאת נבדקה, המצפה לא יתעד אישורים עבור שמות שהוא לא יכול לגלות דרך מערכת ה DNS "> -<!ENTITY ssl-observatory.prefs.show ""> +<!ENTITY ssl-observatory.prefs.show "הראה אפשרויות מתקדמות"> -<!ENTITY ssl-observatory.prefs.title ""> +<!ENTITY ssl-observatory.prefs.title "עדיפויות מצפה SSL"> -<!ENTITY ssl-observatory.prefs.use ""> -<!ENTITY ssl-observatory.warning.title ""> -<!ENTITY ssl-observatory.warning.showcert ""> -<!ENTITY ssl-observatory.warning.okay ""> -<!ENTITY ssl-observatory.warning.text ""> -<!ENTITY ssl-observatory.warning.defense ""> +<!ENTITY ssl-observatory.prefs.use "האם להשתמש במצפה?"> +<!ENTITY ssl-observatory.warning.title "אזהרה ממצפה SSL של EFF"> +<!ENTITY ssl-observatory.warning.showcert "הראה את שרשרת האישורים"> +<!ENTITY ssl-observatory.warning.okay "אני מבין"> +<!ENTITY ssl-observatory.warning.text "מצפה SSL של EFF עוסק באזהרה מפני האישור(ים) של HTTPS עבור האתר הזה:"> +<!ENTITY ssl-observatory.warning.defense "אם נרשמת לאתר הזה, כדאי לשנות את הסיסמא שלך ברגע שיש לך חיבור בטוח."> <!ENTITY ssl-observatory.prefs.self_signed -""> +"שלח ובדוק את האישורים החתומים על ידך"> <!ENTITY ssl-observatory.prefs.self_signed_tooltip -""> +"זה מומלץ; בעיות הצפנה נפוצות במיוחד בכלים משובצים חתומים עצמית">

1 0

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

29 Nov '12

commit aeceff3a57652d6e93d80291ce679828beae3eb6 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 29 21:15:44 2012 +0000 Update translations for whisperback --- he/he.po | 247 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 247 insertions(+), 0 deletions(-) diff --git a/he/he.po b/he/he.po new file mode 100644 index 0000000..9fb8175 --- /dev/null +++ b/he/he.po @@ -0,0 +1,247 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <yaelgogol(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-02-16 22:33+0100\n" +"PO-Revision-Date: 2012-11-29 21:12+0000\n" +"Last-Translator: blackbird <yaelgogol(a)gmail.com>\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: he\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. XXX use a better exception +#: ../whisperBack/whisperback.py:63 +#, python-format +msgid "Invalid contact email: %s" +msgstr "איש קשר של אימייל לא תקין: %s" + +#: ../whisperBack/whisperback.py:80 +#, python-format +msgid "Invalid contact OpenPGP key: %s" +msgstr "מפתח OpenPGP לא תקין של איש קשר: %s" + +#: ../whisperBack/whisperback.py:82 +msgid "Invalid contact OpenPGP public key block" +msgstr "מפתח ציבורי OpenPGP לא תקין של איש קשר" + +#: ../whisperBack/encryption.py:126 +msgid "No keys found." +msgstr "לא נמצאו מפתחות." + +#: ../whisperBack/exceptions.py:41 +#, python-format +msgid "" +"The variable %s was not found in any of the configuation " +"files/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" +msgstr "המשתנה %s לא נמצא באף אחד מקבמי ההגדרות /etc/whisperback/config.py,\n.whisperback/config.py, ./config.py." + +#: ../whisperBack/gui.py:114 +msgid "Name of the affected software" +msgstr "שם של התוכנה המושפעת" + +#: ../whisperBack/gui.py:115 +msgid "Exact steps to reproduce the problem" +msgstr "צעדים מדויקים לייצר מחדש את הבעיה" + +#: ../whisperBack/gui.py:116 +msgid "Actual result / the problem" +msgstr "תוצאה ממשית \\ הבעיה" + +#: ../whisperBack/gui.py:117 +msgid "Desired result" +msgstr "תוצאה רצויה" + +#: ../whisperBack/gui.py:155 +msgid "Unable to load a valid configuration." +msgstr "לא מתאפשר לטעון הגדרה לא תקינה." + +#: ../whisperBack/gui.py:177 +#, python-format +msgid "" +"<h1>Help us fix your bug!</h1>\n" +"<p>Read <a href=\"%s\">our bug reporting instructions</a>.</p>\n" +"<p><strong>Do not include more personal information than\n" +"needed!</strong></p>\n" +"<h2>About giving us an email address</h2>\n" +"<p>If you don't mind disclosing some bits of your identity\n" +"to Tails developers, you can provide an email address to\n" +"let us ask more details about the bug. Additionally entering\n" +"a public PGP key enables us to encrypt such future\n" +"communication.</p>\n" +"<p>Anyone who can see this reply will probably infer you are\n" +"a Tails user. Time to wonder how much you trust your\n" +"Internet and mailbox providers?</p>\n" +msgstr "" + +#: ../whisperBack/gui.py:229 +msgid "Sending mail..." +msgstr "" + +#: ../whisperBack/gui.py:230 +msgid "Sending mail" +msgstr "" + +#. pylint: disable=C0301 +#: ../whisperBack/gui.py:232 +msgid "This could take a while..." +msgstr "" + +#: ../whisperBack/gui.py:246 +msgid "The contact email adress doesn't seem valid." +msgstr "" + +#: ../whisperBack/gui.py:263 +msgid "Unable to send the mail: SMTP error." +msgstr "" + +#: ../whisperBack/gui.py:265 +msgid "Unable to connect to the server." +msgstr "" + +#: ../whisperBack/gui.py:267 +msgid "Unable to create or to send the mail." +msgstr "" + +#: ../whisperBack/gui.py:270 +msgid "" +"\n" +"\n" +"The bug report could not be sent, likely due to network problems. Please try to reconnect to the network and click send again.\n" +"\n" +"If it does not work, you will be offered to save the bug report." +msgstr "" + +#: ../whisperBack/gui.py:283 +msgid "Your message has been sent." +msgstr "" + +#: ../whisperBack/gui.py:289 +msgid "Unable to find encryption key." +msgstr "" + +#: ../whisperBack/gui.py:293 +msgid "An error occured during encryption." +msgstr "" + +#: ../whisperBack/gui.py:313 +#, python-format +msgid "Unable to save %s." +msgstr "" + +#. XXX: fix string +#: ../whisperBack/gui.py:337 +#, python-format +msgid "" +"The bug report could not be sent, likely due to network problems.\n" +"\n" +"As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" +"\n" +"Do you want to save the bug report to a file?" +msgstr "" + +#: ../whisperBack/gui.py:401 ../data/whisperback.ui.h:11 +msgid "WhisperBack" +msgstr "" + +#: ../whisperBack/gui.py:402 ../data/whisperback.ui.h:8 +msgid "Send feedback in an encrypted mail." +msgstr "" + +#: ../whisperBack/gui.py:405 +msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)" +msgstr "" + +#: ../whisperBack/gui.py:406 +msgid "Tails developers <tails(a)boum.org>" +msgstr "" + +#: ../whisperBack/gui.py:407 +msgid "translator-credits" +msgstr "" + +#: ../whisperBack/gui.py:434 +msgid "This doesn's seem to be a valid URL or OpenPGP key." +msgstr "" + +#: ../data/whisperback.ui.h:1 +msgid "" +"Add a PGP key if you want us to encrypt messages when we respond to you." +msgstr "" + +#: ../data/whisperback.ui.h:2 +msgid "Bug description" +msgstr "" + +#: ../data/whisperback.ui.h:3 +msgid "Copyright © 2009-2012 tails(a)boum.org" +msgstr "" + +#: ../data/whisperback.ui.h:4 +msgid "Help" +msgstr "" + +#: ../data/whisperback.ui.h:5 +msgid "" +"If you want us to encrypt messages when we respond to you, add your key ID, " +"a link to your key, or the key as a public key block:" +msgstr "" + +#: ../data/whisperback.ui.h:6 +msgid "Optional email address to contact you" +msgstr "" + +#: ../data/whisperback.ui.h:7 +msgid "Send" +msgstr "" + +#: ../data/whisperback.ui.h:9 +msgid "Summary" +msgstr "" + +#: ../data/whisperback.ui.h:10 +msgid "Technical details to include" +msgstr "" + +#: ../data/whisperback.ui.h:12 +msgid "" +"WhisperBack - Send feedback in an encrypted mail\n" +"Copyright (C) 2009-2012 Tails developers <tails(a)boum.org>\n" +"\n" +"This program is free software; you can redistribute it and/or modify\n" +"it under the terms of the GNU General Public License as published by\n" +"the Free Software Foundation; either version 3 of the License, or (at\n" +"your option) any later version.\n" +"\n" +"This program is distributed in the hope that it will be useful, but\n" +"WITHOUT ANY WARRANTY; without even the implied warranty of\n" +"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" +"General Public License for more details.\n" +"\n" +"You should have received a copy of the GNU General Public License\n" +"along with this program. If not, see <http://www.gnu.org/licenses/>.\n" +msgstr "" + +#: ../data/whisperback.ui.h:28 +msgid "debugging info" +msgstr "" + +#: ../data/whisperback.ui.h:29 +msgid "headers" +msgstr "" + +#: ../data/whisperback.ui.h:30 +msgid "https://tails.boum.org/" +msgstr "" + +#: ../data/whisperback.ui.h:31 +msgid "optional PGP key" +msgstr ""

1 0

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

29 Nov '12

commit 482ce5ba25027b2eaa60fa5e71f820aa205390c1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 29 20:45:46 2012 +0000 Update translations for https_everywhere --- he/ssl-observatory.dtd | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/he/ssl-observatory.dtd b/he/ssl-observatory.dtd index 6c7cb1e..1b75265 100644 --- a/he/ssl-observatory.dtd +++ b/he/ssl-observatory.dtd @@ -3,7 +3,7 @@ <!ENTITY ssl-observatory.popup.later "שאל אותי אחר כך"> <!ENTITY ssl-observatory.popup.no "לא"> -<!ENTITY ssl-observatory.popup.text ""> +<!ENTITY ssl-observatory.popup.text " ">  <!ENTITY ssl-observatory.popup.title -""> +"האם כדאי ש- HTTPS בכל מקום ישתמש בתצפית SSL?"> -<!ENTITY ssl-observatory.popup.yes ""> +<!ENTITY ssl-observatory.popup.yes "כן">  <!ENTITY ssl-observatory.prefs.adv_priv_opts1 -""> +"בטוח לאפשר זאת, אלא אם כן אתה משתמש ברשת תאגידית פולשנית מאוד:"> <!ENTITY ssl-observatory.prefs.adv_priv_opts2 -""> +"בטוח, אלא אם כן אתה משתמש ברשת תאגידית עם שמות שרתים סודיים ברשת זמנית:"> <!ENTITY ssl-observatory.prefs.alt_roots -""> +"שלח ובדוק אישורים החתומים על ידי רשויות האישורים העליונות הלא רגילות"> <!ENTITY ssl-observatory.prefs.alt_roots_tooltip -""> +"זה בטוח (ורעיון טוב) לאפשר אפשרות זאת, אלא אם כן אתה משתמש ברשת תאגידית פולשנית או תוכנת אנטיוירוס קספרסקי שמנטרת את הגלישה שלך עם פרוקסי TLS ורשות אישורים עליונה אישית. אם מאופשרת רשת כזאת, אפשרות זאת יכולה לפרסם עדות של אילו כתובות שמתחילות ב https:// בוקרו דרך הפרוקסי הזה, בשל האישור המיוחד שהוא מייצר. לכן נשאיר זאת כבוי כברירת מחדל."> -<!ENTITY ssl-observatory.prefs.anonymous ""> +<!ENTITY ssl-observatory.prefs.anonymous "בדוק אישורים לשימוש ב TOR באנונימיות"> <!ENTITY ssl-observatory.prefs.anonymous_unavailable -""> +"בדוק אישורים לשימוש ב Tor באנונימיות (דורש Tor )"> <!ENTITY ssl-observatory.prefs.anonymous_tooltip -""> +"אפשרות זאת דורשת ש Tor יותקן וירוץ "> <!ENTITY ssl-observatory.prefs.asn -""> +"כאשר אתה רואה אישור חדש, תגיד למצפה לאיזה ספק אתה מחובר"> <!ENTITY ssl-observatory.prefs.asn_tooltip -""> +"זה מביא ושולח את "מספר המערכת האנונימי" של הרשת שלך. זה יעזור לנו למקם התקפות נגד HTTPS, ולקבוע האם יש לנו תצפיות מרשתות במקומות כמו איראן וסוריה שבהם התקפות נפוצות באופן השוואתי."> -<!ENTITY ssl-observatory.prefs.done ""> +<!ENTITY ssl-observatory.prefs.done "הושלם"> <!ENTITY ssl-observatory.prefs.explanation "">

1 0

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

29 Nov '12

commit 420c982a6bdda773786e839cf935f7c1a783f51c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 29 20:15:51 2012 +0000 Update translations for https_everywhere --- he/ssl-observatory.dtd | 86 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 86 insertions(+), 0 deletions(-) diff --git a/he/ssl-observatory.dtd b/he/ssl-observatory.dtd new file mode 100644 index 0000000..6c7cb1e --- /dev/null +++ b/he/ssl-observatory.dtd @@ -0,0 +1,86 @@ + +<!ENTITY ssl-observatory.popup.details "פרטים ומידע אישי"> +<!ENTITY ssl-observatory.popup.later "שאל אותי אחר כך"> +<!ENTITY ssl-observatory.popup.no "לא"> + +<!ENTITY ssl-observatory.popup.text ""> + + + +<!ENTITY ssl-observatory.popup.title +""> + +<!ENTITY ssl-observatory.popup.yes ""> + + + +<!ENTITY ssl-observatory.prefs.adv_priv_opts1 +""> + +<!ENTITY ssl-observatory.prefs.adv_priv_opts2 +""> + +<!ENTITY ssl-observatory.prefs.alt_roots +""> + +<!ENTITY ssl-observatory.prefs.alt_roots_tooltip +""> + +<!ENTITY ssl-observatory.prefs.anonymous ""> +<!ENTITY ssl-observatory.prefs.anonymous_unavailable +""> +<!ENTITY ssl-observatory.prefs.anonymous_tooltip +""> + +<!ENTITY ssl-observatory.prefs.asn +""> + +<!ENTITY ssl-observatory.prefs.asn_tooltip +""> + +<!ENTITY ssl-observatory.prefs.done ""> + +<!ENTITY ssl-observatory.prefs.explanation +""> + + + +<!ENTITY ssl-observatory.prefs.explanation2 + +""> + +<!ENTITY ssl-observatory.prefs.hide ""> + +<!ENTITY ssl-observatory.prefs.nonanon +""> + +<!ENTITY ssl-observatory.prefs.nonanon_tooltip +""> + +<!ENTITY ssl-observatory.prefs.priv_dns +""> + +<!ENTITY ssl-observatory.prefs.priv_dns_tooltip +""> + +<!ENTITY ssl-observatory.prefs.show ""> + +<!ENTITY ssl-observatory.prefs.title ""> + +<!ENTITY ssl-observatory.prefs.use ""> +<!ENTITY ssl-observatory.warning.title ""> +<!ENTITY ssl-observatory.warning.showcert ""> +<!ENTITY ssl-observatory.warning.okay ""> +<!ENTITY ssl-observatory.warning.text ""> +<!ENTITY ssl-observatory.warning.defense ""> + +<!ENTITY ssl-observatory.prefs.self_signed +""> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +"">

1 0

[ooni-probe/master] Update traceroute test documentation
by art＠torproject.org 29 Nov '12

29 Nov '12

commit 0a37312ea6c9c18dadaedb8ac4dbd101e3529cf7 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 29 21:01:05 2012 +0100 Update traceroute test documentation * Fix links in index page --- docs/source/conf.py | 5 - docs/source/index.rst | 26 +- docs/source/tests/traceroute.rst | 485 ++++++----------------------------- nettests/manipulation/traceroute.py | 8 +- 4 files changed, 94 insertions(+), 430 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 71a97a7..570e4e6 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -96,11 +96,6 @@ pygments_style = 'sphinx' # a list of builtin themes. html_theme = 'default' -html_theme_options = {'textcolor': "#222222", - 'headingcolor': "#555", - 'linkcolor': "#4183C4", - 'visitedlinkcolor': "#888", - 'hoverlinkcolor': "#888"} # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the # documentation. diff --git a/docs/source/index.rst b/docs/source/index.rst index 31a7f6e..a6687d9 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -60,15 +60,15 @@ Traffic Manipulation Tests * `HTTP Invalid Request Line: <tests/http_invalid_request_line.html>`_ - * `DNS Spoof: <tests/dnsspoof.html>`_ + * `DNS Spoof <tests/dnsspoof.html>`_ - * `HTTP Header Field Manipulation: <tests/http_header_field_manipulation>`_ + * `HTTP Header Field Manipulation <tests/http_header_field_manipulation>`_ - * `Traceroute: <tests/traceroute.html>`_ + * `Traceroute <tests/traceroute.html>`_ - * `HTTP Host: <tests/http_host.html>`_ + * `HTTP Host <tests/http_host.html>`_ - * `Daphne: <tests/daphne.html>`_ + * `Daphne <tests/daphne.html>`_ Other tests ........... @@ -99,17 +99,17 @@ Test Helpers The currently implemented test helpers are the following: - * ::`SSL Test Helpers: - https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/oonib/testhelpers/s…. + * `SSL Test Helpers + <https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/oonib/testhelpers/s…>`_ - * ::`HTTP Test Helpers: - https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/oonib/testhelpers/h…. + * `HTTP Test Helpers + <https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/oonib/testhelpers/h…>`_ - * ::`TCP Test Helpers: - https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/oonib/testhelpers/t…. + * `TCP Test Helpers + <https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/oonib/testhelpers/t…>`_ - * ::`DNS Test Helpers: - https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/oonib/testhelpers/d…. + * `DNS Test Helpers + <https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/oonib/testhelpers/d…>`_ More developer documentation ***************************** diff --git a/docs/source/tests/traceroute.rst b/docs/source/tests/traceroute.rst index 70dea0c..898fc30 100644 --- a/docs/source/tests/traceroute.rst +++ b/docs/source/tests/traceroute.rst @@ -27,484 +27,147 @@ 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. +received in userspace via the scapy super socket that relies on libpcap and +libdnet. + +Notes: + +If the user states their privacy settings that they do not wish to include +their IP address in the report then the src IP address of sent packets and the +dst address of received packets is replaced with 127.0.0.1 (This feature is +of the scapy test template). In this case, though, user data is leaked through +other means that are not the src and destination IP address. + +In particular the ICMP TTL expired citations will contain the IP headers. + +We could theorically strip these though even if that were the case there would +still be at least a reduction of the anonymity set given by the fact that we +received a TTL expired from a router in a certain network range. How to run the test =================== -`./bin/ooniprobe nettest/core/http_host.py -b <backend ip> -t <timeout> -m <max ttl>` +`./bin/ooniprobe nettests/manipulation/traceroute.py -b <backend ip>`` *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 + # Thu Nov 29 20:07:00 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} + options: + collector: null + help: 0 + logfile: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [-b, 8.8.8.8] + test: nettests/manipulation/traceroute.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: 1354212420.0 + test_name: Multi Protocol Traceroute Test + test_version: 0.1.1 ... --- input: null report: + answer_flags: [ipsrc] 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 + RQAAOAOrAABAAdNUwKgRAX8AAAELAC9XAAAAAEUAACgbGgAAAQa8isCoEXQICAgIxZIAFgAAAAAA + AAAAUAIgAOgNAAA= + summary: IP / ICMP 192.168.17.1 > 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} + - {address: 192.168.17.1, rtt: 0.6290309429168701, sport: 1234, ttl: 1} 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} + - {address: 192.168.17.1, rtt: 0.5726521015167236, sport: 1234, ttl: 1} 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} + - {address: 192.168.17.1, rtt: 0.5733599662780762, sport: 1234, ttl: 1} 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} + - {address: 192.168.17.1, rtt: 0.6443209648132324, sport: 1234, ttl: 1} + hops_53: + - {address: 192.168.17.1, rtt: 0.5956859588623047, sport: 1234, ttl: 1} 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} + - {address: 192.168.17.1, rtt: 0.615354061126709, sport: 1234, ttl: 1} 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 + RQAAKBsaAAABBg+mfwAAAQgICAjFkgAWAAAAAAAAAABQAiAAOykAAA== + summary: IP / TCP 127.0.0.1:50578 > 8.8.8.8:ssh S + timeout: 5 test_name: test_tcp_traceroute - test_started: 1353425277.715115 + test_runtime: 5.283383131027222 + test_started: 1354216020.235762 ... --- input: null report: + answer_flags: [ipsrc] 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 + RQAAOAOxQABAAZNOwKgRAX8AAAELAPT/AAAAAEUAAByhTwAAAQE2ZsCoEXQICAgICAD3/wAAAAA= + summary: IP / ICMP 192.168.17.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} + - {address: 192.168.17.1, rtt: 0.6631519794464111, ttl: 1} 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== + RQAAHKFPAAABAYmBfwAAAQgICAgIAPf/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 + test_runtime: 5.753404140472412 + test_started: 1354216020.515606 ... --- input: null report: + answer_flags: [ipsrc] 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 + RQAAOAOyAABAAdNNwKgRAX8AAAELANdFAAAAAEUAABzRVQAAAREGUMCoEXQICAgItO4AFgAIaK0= + summary: IP / ICMP 192.168.17.1 > 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} + - {address: 192.168.17.1, rtt: 1.471999168395996, sport: 22958, ttl: 1} 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} + - {address: 192.168.17.1, rtt: 0.698897123336792, sport: 46318, ttl: 1} 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} + - {address: 192.168.17.1, rtt: 0.9357340335845947, sport: 10580, ttl: 1} 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} + - {address: 192.168.17.1, rtt: 1.6294240951538086, sport: 50104, ttl: 1} + hops_53: + - {address: 192.168.17.1, rtt: 1.1403398513793945, sport: 62061, ttl: 1} 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} + - {address: 192.168.17.1, rtt: 1.328758955001831, sport: 23760, ttl: 1} 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 + RQAAHNFVAAABEVlrfwAAAQgICAi07gAWAAi7yA== + summary: IP / UDP 127.0.0.1:46318 > 8.8.8.8:ssh + timeout: 5 test_name: test_udp_traceroute - test_started: 1353425289.47829 + test_runtime: 6.669445991516113 + test_started: 1354216020.561038 ... - TODO ==== diff --git a/nettests/manipulation/traceroute.py b/nettests/manipulation/traceroute.py index f8311fd..6f39065 100644 --- a/nettests/manipulation/traceroute.py +++ b/nettests/manipulation/traceroute.py @@ -61,10 +61,16 @@ class TracerouteTest(scapyt.BaseScapyTest): answered, unanswered = packets self.report['hops_'+str(port)] = [] for snd, rcv in answered: + try: + sport = snd[UDP].sport + except IndexError: + log.err("Source port for this traceroute was not found. This is probably a bug") + sport = -1 + report = {'ttl': snd.ttl, 'address': rcv.src, 'rtt': rcv.time - snd.time, - 'sport': snd[UDP].sport + 'sport': sport } log.debug("%s: %s" % (port, report)) self.report['hops_'+str(port)].append(report)

1 0

[ooni-probe/master] Fix links to test description pages
by art＠torproject.org 29 Nov '12

29 Nov '12

commit c64ae8d3c657f553e343d1a351a2d7f3b67bdfa3 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 29 19:22:27 2012 +0100 Fix links to test description pages --- docs/source/index.rst | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index 7803782..31a7f6e 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -48,27 +48,27 @@ respectively. Content Blocking Tests ...................... - * ::`DNSTamper tests/dnstamper` + * `DNSTamper <tests/dnstamper.html>`_ - * ::`HTTP Requests tests/http_requests` + * `HTTP Requests <tests/http_requests.html>`_ - * ::`TCP Connect tests/tcpconnect` + * `TCP Connect <tests/tcpconnect.html>`_ Traffic Manipulation Tests .......................... - * ::`HTTP Invalid Request Line: tests/http_invalid_request_line` + * `HTTP Invalid Request Line: <tests/http_invalid_request_line.html>`_ - * ::`DNS Spoof: tests/dnsspoof` + * `DNS Spoof: <tests/dnsspoof.html>`_ - * ::`HTTP Header Field Manipulation: tests/http_header_field_manipulation` + * `HTTP Header Field Manipulation: <tests/http_header_field_manipulation>`_ - * ::`Traceroute: tests/traceroute` + * `Traceroute: <tests/traceroute.html>`_ - * ::`HTTP Host: tests/http_host` + * `HTTP Host: <tests/http_host.html>`_ - * ::`Daphne: tests/daphne` + * `Daphne: <tests/daphne.html>`_ Other tests ...........

1 0

[ooni-probe/master] Rename documentation for HTTP Invalid Request Line
by art＠torproject.org 29 Nov '12

29 Nov '12

commit a8872467a8a38e445db19548fb9d89cb8b576d66 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 29 17:19:13 2012 +0100 Rename documentation for HTTP Invalid Request Line --- docs/source/tests/http_invalid_request_line.rst | 164 +++++++++++++++++++++++ docs/source/tests/http_invalid_requests.rst | 164 ----------------------- 2 files changed, 164 insertions(+), 164 deletions(-) diff --git a/docs/source/tests/http_invalid_request_line.rst b/docs/source/tests/http_invalid_request_line.rst new file mode 100644 index 0000000..f14a18d --- /dev/null +++ b/docs/source/tests/http_invalid_request_line.rst @@ -0,0 +1,164 @@ +Details +======= + +*Test Name*: HTTP Invalid Request Line + +*Current version*: 0.1.3 + +*NetTest*: HTTP Invalid Request Line (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/nettests/manipulati…) + +*Test Helper*: TCPEchoHelper (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/oonib/testhelpers/t…) + +*Test Type*: Traffic Manipulation + +*Requires Root*: No + +*WARNING*: This test is more dangerous to run than any other one and you +should do it only if you know what you are doing. + +Description +=========== + +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. + +The remote backend runs a TCP echo server. If the response from the backend +does not match with what we have sent then we say that tampering is occuring. + +The idea behind this is that certain transparent HTTP proxies may not be +properly parsing the HTTP request line. + +Unless elsewhere stated 'Xx'\*N refers to N\*2 random upper or lowercase ascii +letters or numbers ('XxXx' will be 4). + +What we fuzz is the following: + +test random invalid method +************************** + +This sends random 4 letter HTTP request method. + +The request on the wire will look like this: + +:: + XxXxX / HTTP/1.1\n\r + + +test random invalid field count +****************************** + +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. + + +test random big request method +****************************** + +This generates a request that looks like this: + +:: + + Xx*512 / HTTP/1.1 + + +test random invalid version number +********************************** + +This generates a request that looks like this: + +:: + GET / HTTP/XxX + +This attemps to trigger bugs in the parsing of the HTTP version number, that +is usually being split on the `.`. + +How to run the test +=================== + +`./bin/ooniprobe nettests/manipulation/http_invalid_request_line.py -b <address of backend>` + +*address of the backend* is the hostname or IP address of a backend that runs +a TCP echo server on port 80. + +Sample report +============= + +From running: + +`./bin/ooniprobe nettests/manipulation/http_invalid_request_line.py -b 127.0.0.1 -p 57002` + +:: + + ########################################### + # OONI Probe Report for HTTP Invalid Request Line test + # Thu Nov 29 16:41:15 2012 + ########################################### + --- + options: + collector: null + help: 0 + logfile: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [-b, 127.0.0.1, -p, '57002'] + test: nettests/manipulation/http_invalid_request_line.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: 1354200075.0 + test_name: HTTP Invalid Request Line + test_version: 0.1.3 + ... + --- + input: null + report: + received: ["L3F6 / HTTP/1.1\n\r"] + sent: ["L3F6 / HTTP/1.1\n\r"] + tampering: false + test_name: test_random_invalid_method + test_runtime: 5.011919021606445 + test_started: 1354203675.481258 + ... + --- + input: null + report: + received: ["GET / HTTP/Ayo\n\r"] + sent: ["GET / HTTP/Ayo\n\r"] + tampering: false + test_name: test_random_invalid_version_number + test_runtime: 5.019288063049316 + test_started: 1354203675.48221 + ... + --- + input: null + report: + received: ["RZRcu OyLtu Jtu2T cs0ER\n\r"] + sent: ["RZRcu OyLtu Jtu2T cs0ER\n\r"] + tampering: false + test_name: test_random_invalid_field_count + test_runtime: 5.022854804992676 + test_started: 1354203675.483127 + ... + --- + input: null + report: + received: ["iB2HrwJeB512y5CrAAaIpETZ5RMprmGO4RCex24Kmqkjguc2XsOrGXR3qJIERw1IX13uGWVs1kOd96Y0zsR4ufcktGFnP0gYakTq7GA63rNNOmlG9tNXABnBEHfkHYhrwdrewAKdqZ2lGls66NBY7fbL9xkOsHBjXq7TkvS8MOeTb74wcxKymp1NLOa8u7C8XP9qpafQtWBrC4dkEVjppjlFyetg1tu8zomDUCBx9y2tB411d8lw7WOSMfDiQWG327aVanxaOj9WgZ2u2eu0595UiJxZxMk1LYa96vHvmB1DrX0DoJUkUg2fcEOlia3pVoFfcpbd3TQ0GwEoewU3F48Qvpf2AuOIcPgrYa1XszLCyUoToygc5J6WgIH7f1phsEpmmZ6my9KChZdnazc7mNbCwLB3Z1wMwcoFW1XuDvAhTr8OYoY17360SYkAqEBhYh8uiD4xdIq0T0KJzsJW5wghjCMjRjFyfk3wyDXaPLp7vkeeqbA3FNFatFQlUCTIkqqqM3EjAojynvCDVyrThGlmsauS9Ejhc9TaDojeT3s8HZY3KIDHwCRvpGgpwFie2NyhzmwY2y4YFMcnGXT2jlwsVE1K2fZZ7yGbKqbciuh5Q32JNvQBdGy3N63PWyZIxWhfythHOVBE9GXAr99DqEXUeiRkfNer5aVRt87rDBuLx13IrbCE6runHdoZEq0iXs7IySfw5qqt00fExbaN9UlSDyxyYIrIymrSTSUWWprTqiezn1toQZpxEl53pv4ZnLx00CSMYxWTzMDNSHLpovdAI9A27ugY2uHmPETKHbaLsTzNRtNiZAS9WidDi0oAxdICB47dnJA2CXvBaXeq2nsRasgQ9qqNl0RbTC8vhXgIq8nZZQn0iehXsP5mPXshpALyfAhoLwiChRif8FODkKdAgciLviTvyadpecb6HqRVfM8rLzMPkuXT2I21yB7NVQQLraJOeDO TvmtsV2gw2I2ON8xKtHO78VQfo357yBryndTQTRTk9FPnijwcwusn\ + \ / HTTP/1.1\n\r"] + sent: ["iB2HrwJeB512y5CrAAaIpETZ5RMprmGO4RCex24Kmqkjguc2XsOrGXR3qJIERw1IX13uGWVs1kOd96Y0zsR4ufcktGFnP0gYakTq7GA63rNNOmlG9tNXABnBEHfkHYhrwdrewAKdqZ2lGls66NBY7fbL9xkOsHBjXq7TkvS8MOeTb74wcxKymp1NLOa8u7C8XP9qpafQtWBrC4dkEVjppjlFyetg1tu8zomDUCBx9y2tB411d8lw7WOSMfDiQWG327aVanxaOj9WgZ2u2eu0595UiJxZxMk1LYa96vHvmB1DrX0DoJUkUg2fcEOlia3pVoFfcpbd3TQ0GwEoewU3F48Qvpf2AuOIcPgrYa1XszLCyUoToygc5J6WgIH7f1phsEpmmZ6my9KChZdnazc7mNbCwLB3Z1wMwcoFW1XuDvAhTr8OYoY17360SYkAqEBhYh8uiD4xdIq0T0KJzsJW5wghjCMjRjFyfk3wyDXaPLp7vkeeqbA3FNFatFQlUCTIkqqqM3EjAojynvCDVyrThGlmsauS9Ejhc9TaDojeT3s8HZY3KIDHwCRvpGgpwFie2NyhzmwY2y4YFMcnGXT2jlwsVE1K2fZZ7yGbKqbciuh5Q32JNvQBdGy3N63PWyZIxWhfythHOVBE9GXAr99DqEXUeiRkfNer5aVRt87rDBuLx13IrbCE6runHdoZEq0iXs7IySfw5qqt00fExbaN9UlSDyxyYIrIymrSTSUWWprTqiezn1toQZpxEl53pv4ZnLx00CSMYxWTzMDNSHLpovdAI9A27ugY2uHmPETKHbaLsTzNRtNiZAS9WidDi0oAxdICB47dnJA2CXvBaXeq2nsRasgQ9qqNl0RbTC8vhXgIq8nZZQn0iehXsP5mPXshpALyfAhoLwiChRif8FODkKdAgciLviTvyadpecb6HqRVfM8rLzMPkuXT2I21yB7NVQQLraJOeDOTvmt sV2gw2I2ON8xKtHO78VQfo357yBryndTQTRTk9FPnijwcwusn\ + \ / HTTP/1.1\n\r"] + tampering: false + test_name: test_random_big_request_method + test_runtime: 5.026142120361328 + test_started: 1354203675.484211 + ... + + diff --git a/docs/source/tests/http_invalid_requests.rst b/docs/source/tests/http_invalid_requests.rst deleted file mode 100644 index f14a18d..0000000 --- a/docs/source/tests/http_invalid_requests.rst +++ /dev/null @@ -1,164 +0,0 @@ -Details -======= - -*Test Name*: HTTP Invalid Request Line - -*Current version*: 0.1.3 - -*NetTest*: HTTP Invalid Request Line (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/nettests/manipulati…) - -*Test Helper*: TCPEchoHelper (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/oonib/testhelpers/t…) - -*Test Type*: Traffic Manipulation - -*Requires Root*: No - -*WARNING*: This test is more dangerous to run than any other one and you -should do it only if you know what you are doing. - -Description -=========== - -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. - -The remote backend runs a TCP echo server. If the response from the backend -does not match with what we have sent then we say that tampering is occuring. - -The idea behind this is that certain transparent HTTP proxies may not be -properly parsing the HTTP request line. - -Unless elsewhere stated 'Xx'\*N refers to N\*2 random upper or lowercase ascii -letters or numbers ('XxXx' will be 4). - -What we fuzz is the following: - -test random invalid method -************************** - -This sends random 4 letter HTTP request method. - -The request on the wire will look like this: - -:: - XxXxX / HTTP/1.1\n\r - - -test random invalid field count -****************************** - -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. - - -test random big request method -****************************** - -This generates a request that looks like this: - -:: - - Xx*512 / HTTP/1.1 - - -test random invalid version number -********************************** - -This generates a request that looks like this: - -:: - GET / HTTP/XxX - -This attemps to trigger bugs in the parsing of the HTTP version number, that -is usually being split on the `.`. - -How to run the test -=================== - -`./bin/ooniprobe nettests/manipulation/http_invalid_request_line.py -b <address of backend>` - -*address of the backend* is the hostname or IP address of a backend that runs -a TCP echo server on port 80. - -Sample report -============= - -From running: - -`./bin/ooniprobe nettests/manipulation/http_invalid_request_line.py -b 127.0.0.1 -p 57002` - -:: - - ########################################### - # OONI Probe Report for HTTP Invalid Request Line test - # Thu Nov 29 16:41:15 2012 - ########################################### - --- - options: - collector: null - help: 0 - logfile: null - pcapfile: null - reportfile: null - resume: 0 - subargs: [-b, 127.0.0.1, -p, '57002'] - test: nettests/manipulation/http_invalid_request_line.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: 1354200075.0 - test_name: HTTP Invalid Request Line - test_version: 0.1.3 - ... - --- - input: null - report: - received: ["L3F6 / HTTP/1.1\n\r"] - sent: ["L3F6 / HTTP/1.1\n\r"] - tampering: false - test_name: test_random_invalid_method - test_runtime: 5.011919021606445 - test_started: 1354203675.481258 - ... - --- - input: null - report: - received: ["GET / HTTP/Ayo\n\r"] - sent: ["GET / HTTP/Ayo\n\r"] - tampering: false - test_name: test_random_invalid_version_number - test_runtime: 5.019288063049316 - test_started: 1354203675.48221 - ... - --- - input: null - report: - received: ["RZRcu OyLtu Jtu2T cs0ER\n\r"] - sent: ["RZRcu OyLtu Jtu2T cs0ER\n\r"] - tampering: false - test_name: test_random_invalid_field_count - test_runtime: 5.022854804992676 - test_started: 1354203675.483127 - ... - --- - input: null - report: - received: ["iB2HrwJeB512y5CrAAaIpETZ5RMprmGO4RCex24Kmqkjguc2XsOrGXR3qJIERw1IX13uGWVs1kOd96Y0zsR4ufcktGFnP0gYakTq7GA63rNNOmlG9tNXABnBEHfkHYhrwdrewAKdqZ2lGls66NBY7fbL9xkOsHBjXq7TkvS8MOeTb74wcxKymp1NLOa8u7C8XP9qpafQtWBrC4dkEVjppjlFyetg1tu8zomDUCBx9y2tB411d8lw7WOSMfDiQWG327aVanxaOj9WgZ2u2eu0595UiJxZxMk1LYa96vHvmB1DrX0DoJUkUg2fcEOlia3pVoFfcpbd3TQ0GwEoewU3F48Qvpf2AuOIcPgrYa1XszLCyUoToygc5J6WgIH7f1phsEpmmZ6my9KChZdnazc7mNbCwLB3Z1wMwcoFW1XuDvAhTr8OYoY17360SYkAqEBhYh8uiD4xdIq0T0KJzsJW5wghjCMjRjFyfk3wyDXaPLp7vkeeqbA3FNFatFQlUCTIkqqqM3EjAojynvCDVyrThGlmsauS9Ejhc9TaDojeT3s8HZY3KIDHwCRvpGgpwFie2NyhzmwY2y4YFMcnGXT2jlwsVE1K2fZZ7yGbKqbciuh5Q32JNvQBdGy3N63PWyZIxWhfythHOVBE9GXAr99DqEXUeiRkfNer5aVRt87rDBuLx13IrbCE6runHdoZEq0iXs7IySfw5qqt00fExbaN9UlSDyxyYIrIymrSTSUWWprTqiezn1toQZpxEl53pv4ZnLx00CSMYxWTzMDNSHLpovdAI9A27ugY2uHmPETKHbaLsTzNRtNiZAS9WidDi0oAxdICB47dnJA2CXvBaXeq2nsRasgQ9qqNl0RbTC8vhXgIq8nZZQn0iehXsP5mPXshpALyfAhoLwiChRif8FODkKdAgciLviTvyadpecb6HqRVfM8rLzMPkuXT2I21yB7NVQQLraJOeDO TvmtsV2gw2I2ON8xKtHO78VQfo357yBryndTQTRTk9FPnijwcwusn\ - \ / HTTP/1.1\n\r"] - sent: ["iB2HrwJeB512y5CrAAaIpETZ5RMprmGO4RCex24Kmqkjguc2XsOrGXR3qJIERw1IX13uGWVs1kOd96Y0zsR4ufcktGFnP0gYakTq7GA63rNNOmlG9tNXABnBEHfkHYhrwdrewAKdqZ2lGls66NBY7fbL9xkOsHBjXq7TkvS8MOeTb74wcxKymp1NLOa8u7C8XP9qpafQtWBrC4dkEVjppjlFyetg1tu8zomDUCBx9y2tB411d8lw7WOSMfDiQWG327aVanxaOj9WgZ2u2eu0595UiJxZxMk1LYa96vHvmB1DrX0DoJUkUg2fcEOlia3pVoFfcpbd3TQ0GwEoewU3F48Qvpf2AuOIcPgrYa1XszLCyUoToygc5J6WgIH7f1phsEpmmZ6my9KChZdnazc7mNbCwLB3Z1wMwcoFW1XuDvAhTr8OYoY17360SYkAqEBhYh8uiD4xdIq0T0KJzsJW5wghjCMjRjFyfk3wyDXaPLp7vkeeqbA3FNFatFQlUCTIkqqqM3EjAojynvCDVyrThGlmsauS9Ejhc9TaDojeT3s8HZY3KIDHwCRvpGgpwFie2NyhzmwY2y4YFMcnGXT2jlwsVE1K2fZZ7yGbKqbciuh5Q32JNvQBdGy3N63PWyZIxWhfythHOVBE9GXAr99DqEXUeiRkfNer5aVRt87rDBuLx13IrbCE6runHdoZEq0iXs7IySfw5qqt00fExbaN9UlSDyxyYIrIymrSTSUWWprTqiezn1toQZpxEl53pv4ZnLx00CSMYxWTzMDNSHLpovdAI9A27ugY2uHmPETKHbaLsTzNRtNiZAS9WidDi0oAxdICB47dnJA2CXvBaXeq2nsRasgQ9qqNl0RbTC8vhXgIq8nZZQn0iehXsP5mPXshpALyfAhoLwiChRif8FODkKdAgciLviTvyadpecb6HqRVfM8rLzMPkuXT2I21yB7NVQQLraJOeDOTvmt sV2gw2I2ON8xKtHO78VQfo357yBryndTQTRTk9FPnijwcwusn\ - \ / HTTP/1.1\n\r"] - tampering: false - test_name: test_random_big_request_method - test_runtime: 5.026142120361328 - test_started: 1354203675.484211 - ... - -

1 0

[ooni-probe/master] Log to error log file when we get malformed Headers sent to the backend
by art＠torproject.org 29 Nov '12

29 Nov '12

commit 27286ce77673ae99b7e7acc52e42e39fdb97b240 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 29 17:51:11 2012 +0100 Log to error log file when we get malformed Headers sent to the backend * Python's typesafe, but it's still good practice --- oonib/testhelpers/http_helpers.py | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/oonib/testhelpers/http_helpers.py b/oonib/testhelpers/http_helpers.py index 1fa0ccb..6415291 100644 --- a/oonib/testhelpers/http_helpers.py +++ b/oonib/testhelpers/http_helpers.py @@ -71,8 +71,12 @@ class SimpleHTTPChannel(basic.LineReceiver, policies.TimeoutMixin): self.__header = line def headerReceived(self, line): - header, data = line.split(':', 1) - self.headers.append((header, data.strip())) + try: + header, data = line.split(':', 1) + self.headers.append((header, data.strip())) + except: + log.err("Got malformed HTTP Header request field") + log.err("%s" % line) def allHeadersReceived(self): headers_dict = {} @@ -85,8 +89,9 @@ class SimpleHTTPChannel(basic.LineReceiver, policies.TimeoutMixin): 'request_line': self.requestLine, 'headers_dict': headers_dict } + json_response = json.dumps(response) self.transport.write('HTTP/1.1 200 OK\r\n\r\n') - self.transport.write(json.dumps(response)) + self.transport.write('%s' % json_response) self.transport.loseConnection()

1 0

[ooni-probe/master] Port the test page to the index of the documentation
by art＠torproject.org 29 Nov '12

29 Nov '12

commit c195aa60653ed1ebfd9623525148ed9177e80af1 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 29 19:13:24 2012 +0100 Port the test page to the index of the documentation * Only include the tests that we plan supporting in the first release --- docs/source/index.rst | 110 ++++++++++++++++++++++++++++- nettests/experimental/daphn3.py | 119 -------------------------------- nettests/manipulation/captiveportal.py | 57 ++++++++-------- nettests/manipulation/daphne.py | 119 ++++++++++++++++++++++++++++++++ oonib/testhelpers/http_helpers.py | 2 +- 5 files changed, 254 insertions(+), 153 deletions(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index 389df2a..7803782 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -3,19 +3,121 @@ Welcome to the OONI developer documentation =========================================== -If you are looking for how to start running the ooniprobe tool see: +ooniprobe is tool for performing internet censorship measurements. Our goal is +to achieve a command data format and set of methodologies for conducting +censorship related research. + +If you are a user interesting in running the ooniprobe command line tool see: https://github.com/hellais/ooni-probe#getting-started +The two main software components of ooniprobe are ooniprobe and oonib. + +ooniprobe +********* + +Is the tool that volunteers and researches interested in contributing data to +the project should be running. + +ooniprobe allows the user to select what test should be run and what backend +should be used for storing the test report and/or assisting them in the running +of the test. + +ooniprobe tests are divided into two categories: **Traffic Manipulation** and +**Content Blocking**. + +**Traffic Manipulation** tests aim to detect the presence of some sort of +tampering with the internet traffic between the probe and a remote test helper +backend. As such they usually require the selection of a oonib backend +component for running the test. + +**Content Blocking** are aimed at enumerating the kind of content that is +blocked from the probes network point of view. As such they usually require to +have specified an input list for running the test. + +Core ooniprobe Tests +-------------------- + +The source for `Content blocking tests +<https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/nettests/blocking>`_ +and `Traffic Manipulation tests +<https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/nettests/blocking>`_ +can be found in the nettests/blocking and nettests/manipulation directories +respectively. + +Content Blocking Tests +...................... + + * ::`DNSTamper tests/dnstamper` + + * ::`HTTP Requests tests/http_requests` + + * ::`TCP Connect tests/tcpconnect` + + +Traffic Manipulation Tests +.......................... + + * ::`HTTP Invalid Request Line: tests/http_invalid_request_line` + + * ::`DNS Spoof: tests/dnsspoof` + + * ::`HTTP Header Field Manipulation: tests/http_header_field_manipulation` + + * ::`Traceroute: tests/traceroute` + + * ::`HTTP Host: tests/http_host` + + * ::`Daphne: tests/daphne` + +Other tests +........... + +We also have some other tests that are currently not fully supported or still +being experimented with. + +You can find these in ::`nettests/experimental: +https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/nettests/experimental`. + +Tests that don't do a measurement but are useful for scanning can be found in +::`nettests/scanning: +https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/nettests/scanning`. + +Tests that involve running third party tools may be found in +::`nettests/third_party: +https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/nettests/third_party`. + +oonib +***** + +This is the server side component of ooniprobe. It will store that data +collected from ooniprobes and it will run a series of Test Helpers that assist +`Traffic Manipulation`_ in performing their measurements. + +Test Helpers +............ + +The currently implemented test helpers are the following: + + * ::`SSL Test Helpers: + https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/oonib/testhelpers/s…. + + * ::`HTTP Test Helpers: + https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/oonib/testhelpers/h…. + + * ::`TCP Test Helpers: + https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/oonib/testhelpers/t…. + + * ::`DNS Test Helpers: + https://gitweb.torproject.org/ooni-probe.git/tree/HEAD:/oonib/testhelpers/d…. -Contents -******** +More developer documentation +***************************** .. toctree:: :maxdepth: 2 :glob: - tests/* oonib install writing_tests diff --git a/nettests/experimental/daphn3.py b/nettests/experimental/daphn3.py deleted file mode 100644 index 09279fa..0000000 --- a/nettests/experimental/daphn3.py +++ /dev/null @@ -1,119 +0,0 @@ -# -*- encoding: utf-8 -*- -from twisted.python import usage -from twisted.internet import protocol, endpoints, reactor - -from ooni import nettest -from ooni.kit import daphn3 -from ooni.utils import log - -class Daphn3ClientProtocol(daphn3.Daphn3Protocol): - def nextStep(self): - log.debug("Moving on to next step in the state walk") - self.current_data_received = 0 - if self.current_step >= (len(self.steps) - 1): - log.msg("Reached the end of the state machine") - log.msg("Censorship fingerpint bisected!") - step_idx, mutation_idx = self.factory.mutation - log.msg("step_idx: %s | mutation_id: %s" % (step_idx, mutation_idx)) - #self.transport.loseConnection() - if self.report: - self.report['mutation_idx'] = mutation_idx - self.report['step_idx'] = step_idx - self.d.callback(None) - return - else: - self.current_step += 1 - if self._current_step_role() == self.role: - # We need to send more data because we are again responsible for - # doing so. - self.sendPayload() - - -class Daphn3ClientFactory(protocol.ClientFactory): - protocol = daphn3.Daphn3Protocol - mutation = [0,0] - steps = None - - def buildProtocol(self, addr): - p = self.protocol() - p.steps = self.steps - p.factory = self - return p - - def startedConnecting(self, connector): - log.msg("Started connecting %s" % connector) - - def clientConnectionFailed(self, reason, connector): - log.err("We failed connecting the the OONIB") - log.err("Cannot perform test. Perhaps it got blocked?") - log.err("Please report this to tor-assistants(a)torproject.org") - - def clientConnectionLost(self, reason, connector): - log.err("Daphn3 client connection lost") - print reason - -class daphn3Args(usage.Options): - optParameters = [ - ['host', 'h', '127.0.0.1', 'Target Hostname'], - ['port', 'p', 57003, 'Target port number']] - - optFlags = [['pcap', 'c', 'Specify that the input file is a pcap file'], - ['yaml', 'y', 'Specify that the input file is a YAML file (default)']] - -class daphn3Test(nettest.NetTestCase): - - name = "Daphn3" - usageOptions = daphn3Args - inputFile = ['file', 'f', None, - 'Specify the pcap or YAML file to be used as input to the test'] - - #requiredOptions = ['file'] - - steps = None - - def inputProcessor(self, filename): - """ - step_idx is the step in the packet exchange - ex. - [.X.] are packets sent by a client or a server - - client: [.1.] [.3.] [.4.] - server: [.2.] [.5.] - - mutation_idx: is the sub index of the packet as in the byte of the - packet at the step_idx that is to be mutated - - """ - if self.localOptions['pcap']: - daphn3Steps = daphn3.read_pcap(filename) - else: - daphn3Steps = daphn3.read_yaml(filename) - log.debug("Loaded these steps %s" % daphn3Steps) - yield daphn3Steps - - def test_daphn3(self): - host = self.localOptions['host'] - port = int(self.localOptions['port']) - - def failure(failure): - log.msg("Failed to connect") - self.report['censored'] = True - self.report['mutation'] = 0 - raise Exception("Error in connection, perhaps the backend is censored") - return - - def success(protocol): - log.msg("Successfully connected") - protocol.sendPayload() - return protocol.d - - log.msg("Connecting to %s:%s" % (host, port)) - endpoint = endpoints.TCP4ClientEndpoint(reactor, host, port) - daphn3_factory = Daphn3ClientFactory() - daphn3_factory.steps = self.input - daphn3_factory.report = self.report - d = endpoint.connect(daphn3_factory) - d.addErrback(failure) - d.addCallback(success) - return d - diff --git a/nettests/manipulation/captiveportal.py b/nettests/manipulation/captiveportal.py index be8da27..082960e 100644 --- a/nettests/manipulation/captiveportal.py +++ b/nettests/manipulation/captiveportal.py @@ -1,34 +1,33 @@ # -*- coding: utf-8 -*- -""" - captiveportal - ************* - - This test is a collection of tests to detect the presence of a - captive portal. Code is taken, in part, from the old ooni-probe, - which was written by Jacob Appelbaum and Arturo Filastò. - - This module performs multiple tests that match specific vendor captive - portal tests. This is a basic internet captive portal filter tester written - for RECon 2011. - - Read the following URLs to understand the captive portal detection process - for various vendors: - - http://technet.microsoft.com/en-us/library/cc766017%28WS.10%29.aspx - http://blog.superuser.com/2011/05/16/windows-7-network-awareness/ - http://isc.sans.org/diary.html?storyid=10312& - http://src.chromium.org/viewvc/chrome?view=rev&revision=74608 - http://code.google.com/p/chromium-os/issues/detail?3281ttp, - http://crbug.com/52489 - http://crbug.com/71736 - https://bugzilla.mozilla.org/show_bug.cgi?id=562917 - https://bugzilla.mozilla.org/show_bug.cgi?id=603505 - http://lists.w3.org/Archives/Public/ietf-http-wg/2011JanMar/0086.html - http://tools.ietf.org/html/draft-nottingham-http-portal-02 - - :copyright: (c) 2012 Isis Lovecruft - :license: see LICENSE for more details -""" +# captiveportal +# ************* +# +# This test is a collection of tests to detect the presence of a +# captive portal. Code is taken, in part, from the old ooni-probe, +# which was written by Jacob Appelbaum and Arturo Filastò. +# +# This module performs multiple tests that match specific vendor captive +# portal tests. This is a basic internet captive portal filter tester written +# for RECon 2011. +# +# Read the following URLs to understand the captive portal detection process +# for various vendors: +# +# http://technet.microsoft.com/en-us/library/cc766017%28WS.10%29.aspx +# http://blog.superuser.com/2011/05/16/windows-7-network-awareness/ +# http://isc.sans.org/diary.html?storyid=10312& +# http://src.chromium.org/viewvc/chrome?view=rev&revision=74608 +# http://code.google.com/p/chromium-os/issues/detail?3281ttp, +# http://crbug.com/52489 +# http://crbug.com/71736 +# https://bugzilla.mozilla.org/show_bug.cgi?id=562917 +# https://bugzilla.mozilla.org/show_bug.cgi?id=603505 +# http://lists.w3.org/Archives/Public/ietf-http-wg/2011JanMar/0086.html +# http://tools.ietf.org/html/draft-nottingham-http-portal-02 +# +# :authors: Jacob Appelbaum, Arturo Filastò, Isis Lovecruft +# :license: see LICENSE for more details + import base64 import os import random diff --git a/nettests/manipulation/daphne.py b/nettests/manipulation/daphne.py new file mode 100644 index 0000000..09279fa --- /dev/null +++ b/nettests/manipulation/daphne.py @@ -0,0 +1,119 @@ +# -*- encoding: utf-8 -*- +from twisted.python import usage +from twisted.internet import protocol, endpoints, reactor + +from ooni import nettest +from ooni.kit import daphn3 +from ooni.utils import log + +class Daphn3ClientProtocol(daphn3.Daphn3Protocol): + def nextStep(self): + log.debug("Moving on to next step in the state walk") + self.current_data_received = 0 + if self.current_step >= (len(self.steps) - 1): + log.msg("Reached the end of the state machine") + log.msg("Censorship fingerpint bisected!") + step_idx, mutation_idx = self.factory.mutation + log.msg("step_idx: %s | mutation_id: %s" % (step_idx, mutation_idx)) + #self.transport.loseConnection() + if self.report: + self.report['mutation_idx'] = mutation_idx + self.report['step_idx'] = step_idx + self.d.callback(None) + return + else: + self.current_step += 1 + if self._current_step_role() == self.role: + # We need to send more data because we are again responsible for + # doing so. + self.sendPayload() + + +class Daphn3ClientFactory(protocol.ClientFactory): + protocol = daphn3.Daphn3Protocol + mutation = [0,0] + steps = None + + def buildProtocol(self, addr): + p = self.protocol() + p.steps = self.steps + p.factory = self + return p + + def startedConnecting(self, connector): + log.msg("Started connecting %s" % connector) + + def clientConnectionFailed(self, reason, connector): + log.err("We failed connecting the the OONIB") + log.err("Cannot perform test. Perhaps it got blocked?") + log.err("Please report this to tor-assistants(a)torproject.org") + + def clientConnectionLost(self, reason, connector): + log.err("Daphn3 client connection lost") + print reason + +class daphn3Args(usage.Options): + optParameters = [ + ['host', 'h', '127.0.0.1', 'Target Hostname'], + ['port', 'p', 57003, 'Target port number']] + + optFlags = [['pcap', 'c', 'Specify that the input file is a pcap file'], + ['yaml', 'y', 'Specify that the input file is a YAML file (default)']] + +class daphn3Test(nettest.NetTestCase): + + name = "Daphn3" + usageOptions = daphn3Args + inputFile = ['file', 'f', None, + 'Specify the pcap or YAML file to be used as input to the test'] + + #requiredOptions = ['file'] + + steps = None + + def inputProcessor(self, filename): + """ + step_idx is the step in the packet exchange + ex. + [.X.] are packets sent by a client or a server + + client: [.1.] [.3.] [.4.] + server: [.2.] [.5.] + + mutation_idx: is the sub index of the packet as in the byte of the + packet at the step_idx that is to be mutated + + """ + if self.localOptions['pcap']: + daphn3Steps = daphn3.read_pcap(filename) + else: + daphn3Steps = daphn3.read_yaml(filename) + log.debug("Loaded these steps %s" % daphn3Steps) + yield daphn3Steps + + def test_daphn3(self): + host = self.localOptions['host'] + port = int(self.localOptions['port']) + + def failure(failure): + log.msg("Failed to connect") + self.report['censored'] = True + self.report['mutation'] = 0 + raise Exception("Error in connection, perhaps the backend is censored") + return + + def success(protocol): + log.msg("Successfully connected") + protocol.sendPayload() + return protocol.d + + log.msg("Connecting to %s:%s" % (host, port)) + endpoint = endpoints.TCP4ClientEndpoint(reactor, host, port) + daphn3_factory = Daphn3ClientFactory() + daphn3_factory.steps = self.input + daphn3_factory.report = self.report + d = endpoint.connect(daphn3_factory) + d.addErrback(failure) + d.addCallback(success) + return d + diff --git a/oonib/testhelpers/http_helpers.py b/oonib/testhelpers/http_helpers.py index 6415291..3a76b9a 100644 --- a/oonib/testhelpers/http_helpers.py +++ b/oonib/testhelpers/http_helpers.py @@ -26,7 +26,7 @@ class SimpleHTTPChannel(basic.LineReceiver, policies.TimeoutMixin): The returned JSON dict looks like so: { - 'request_headers': + 'request_headers': [['User-Agent', 'IE6'], ['Content-Length', 200]] 'request_line': 'GET / HTTP/1.1'

1 0

r25923: {website} link to the overall projects page. (website/trunk/en)
by Andrew Lewman 29 Nov '12

29 Nov '12

Author: phobos Date: 2012-11-29 16:25:02 +0000 (Thu, 29 Nov 2012) New Revision: 25923 Modified: website/trunk/en/index.wml Log: link to the overall projects page. Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2012-11-29 16:21:07 UTC (rev 25922) +++ website/trunk/en/index.wml 2012-11-29 16:25:02 UTC (rev 25923) @@ -147,6 +147,7 @@ </td> </tr> </table> + <span class="continue"><a href="<page projects/projects>">Learn more about our projects »</a></span> </div>  </div>

1 0