February 2013 - tor-commits - lists.torproject.org

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 25 Feb '13

25 Feb '13

commit 60513fbf27e79e628ab922fcad97e6b00bbf08ba Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 25 12:46:53 2013 +0000 Update translations for tails-greeter --- fa/fa.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fa/fa.po b/fa/fa.po index 1533192..33ded62 100644 --- a/fa/fa.po +++ b/fa/fa.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-06-01 15:10+0200\n" -"PO-Revision-Date: 2013-02-22 15:34+0000\n" +"PO-Revision-Date: 2013-02-25 12:44+0000\n" "Last-Translator: zendegi <hamahangi(a)posteo.eu>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -109,7 +109,7 @@ msgstr "رمزهاى عبور با هم مطابقت ندارند" msgid "" "live-persist failed with return code %(returncode)s:\n" "%(stderr)s" -msgstr "live-persist ناموفق با كد %(returncode)s:\\n\n%(stderr)s" +msgstr "live-persist ناموفق با كد %(returncode)s:\n%(stderr)s" #: ../GdmGreeter/persistence.py:99 #, python-format @@ -117,7 +117,7 @@ msgid "" "cryptsetup failed with return code %(returncode)s:\n" "%(stdout)s\n" "%(stderr)s" -msgstr "«cryptsetup» ناموفق با كد %(returncode)s:\\n\n%(stdout)s\\n\n%(stderr)s" +msgstr "«cryptsetup» ناموفق با كد %(returncode)s:\n%(stdout)s\n%(stderr)s" #: ../GdmGreeter/persistence.py:124 #, python-format

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 25 Feb '13

25 Feb '13

commit ff7b41543287eb73b769e44b12aad2bac495d54e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 25 12:46:51 2013 +0000 Update translations for tails-persistence-setup_completed --- fa/fa.po | 327 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 327 insertions(+), 0 deletions(-) diff --git a/fa/fa.po b/fa/fa.po new file mode 100644 index 0000000..3b66a69 --- /dev/null +++ b/fa/fa.po @@ -0,0 +1,327 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <hamahangi(a)posteo.eu>, 2013. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-11-27 21:00+0100\n" +"PO-Revision-Date: 2013-02-25 12:41+0000\n" +"Last-Translator: zendegi <hamahangi(a)posteo.eu>\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: fa\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:48 +msgid "Personal Data" +msgstr "داده‌هاى شخصى" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:50 +msgid "Keep files stored in the `Persistent' directory" +msgstr "ذخيره‌كردن فايل‌ها در پوشه مداوم" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:58 +msgid "GnuPG" +msgstr "گنو پرايوسى گارد (GnuPG)" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:60 +msgid "GnuPG keyrings and configuration" +msgstr "پيكربندى و جاكليدى گنو پرايوسى گارد" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:68 +msgid "SSH Client" +msgstr "مخدوم پوشته امن (SSH Client)" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:70 +msgid "SSH keys, configuration and known hosts" +msgstr "كليدها، پىكربندى و ميزبان‌هاى پوشته امن" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:78 +msgid "Pidgin" +msgstr "پيام‌رسان پيجين (Pidgin)" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:80 +msgid "Pidgin profiles and OTR keyring" +msgstr "نمايه‌ها و جاكليدى پيجين" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:88 +msgid "Claws Mail" +msgstr "كلوز ميل (Claws Mail)" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:90 +msgid "Claws Mail profiles and locally stored email" +msgstr "نمايه‌ها و اى‌ميل‌هاى ذخيره‌شده كلوز ميل" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:98 +msgid "GNOME Keyring" +msgstr "جاكليدى گنوم (GNOME)" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:100 +msgid "Secrets stored by GNOME Keyring" +msgstr "رازهائى كه توسط جاكليدى گنوم حفظ شده است" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:108 +msgid "Network Connections" +msgstr "ارتباطات شبكه" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:110 +msgid "Configuration of network devices and connections" +msgstr "پيكربندى دستگاه‌ها و ارتباطات شبكه" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:118 +msgid "Browser bookmarks" +msgstr "نشانک‌هاى مرورگر" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +msgid "Bookmarks saved in Iceweasel browser" +msgstr "نشانک‌هاى ذخيره‌شده در مرورگر آيس‌ويزل" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 +msgid "APT Packages" +msgstr "بسته‌هاى اى‌پى‌تى (APT)" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 +msgid "Packages downloaded by APT" +msgstr "بسته‌هائى كه APT دانلود كرده‌است" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +msgid "APT Lists" +msgstr "فهرست‌هاى اى‌پى‌تى (APT)" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +msgid "Lists downloaded by APT" +msgstr "فهرست‌هائى كه APT دانلود كرده‌است" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 +msgid "Dotfiles" +msgstr "فايل‌هاى پنهان (Dotfiles)" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 +msgid "" +"Symlink into $HOME every file or directory found in the `dotfiles' directory" +msgstr "ساختن روابط نمادين (symlink) بين $HOME و هر فايل يا پوشه در پوشه فايل‌هاى پنهان (dotfiles)" + +#: ../lib/Tails/Persistence/Setup.pm:259 +msgid "" +"The device Tails is running from cannot be found. Maybe you used the `toram'" +" option?" +msgstr "دستگاهى كه از آن تيلز اجرا مى‌شود يافت نشد. ممكن است از گزينه 'toram' استفاده كرديد؟" + +#: ../lib/Tails/Persistence/Setup.pm:284 +msgid "'Unparseable partition path.'" +msgstr "'مسير سكتور قابل تجزيه‌كردن نيست'" + +#: ../lib/Tails/Persistence/Setup.pm:298 +msgid "Setup Tails persistent volume" +msgstr "ساختن ذخيره‌سازى مداوم تيلز" + +#: ../lib/Tails/Persistence/Setup.pm:442 +#, perl-format +msgid "Device %s already has a persistent volume." +msgstr "دستگاه %s از قبل حجم ذخيره‌سازى مداومى دارد" + +#: ../lib/Tails/Persistence/Setup.pm:450 +#, perl-format +msgid "Device %s has not enough unallocated space." +msgstr "دستگاه %s فضاى خالى كافى ندارد" + +#: ../lib/Tails/Persistence/Setup.pm:458 ../lib/Tails/Persistence/Setup.pm:472 +#, perl-format +msgid "Device %s has no persistent volume." +msgstr "دستگاه %s هيچ ذخيره‌سازى مداومى ندارد." + +#: ../lib/Tails/Persistence/Setup.pm:464 +msgid "" +"Cannot delete the persistent volume while in use. You should restart Tails " +"without persistence." +msgstr "نمى‌توان ذخيره‌سازى مداوم در حال بكار بردن حذف كرد. بايد تيلزرا بدون تداوم دوباره شروع كنيد." + +#: ../lib/Tails/Persistence/Setup.pm:483 +msgid "Persistence volume is not unlocked." +msgstr "ذخيره‌سازى مداوم قفل است." + +#: ../lib/Tails/Persistence/Setup.pm:488 +msgid "Persistence volume is not mounted." +msgstr "ذخيره‌سازى مداوم سوار نيست." + +#: ../lib/Tails/Persistence/Setup.pm:493 +msgid "Persistence volume is not readable. Permissions or ownership problems?" +msgstr "ذخيره‌سازى مداوم قابل خواندن نيست. مشكلات با مجوزها يا مالكيت؟" + +#: ../lib/Tails/Persistence/Setup.pm:498 +msgid "Persistence volume is not writable. Maybe it was mounted read-only?" +msgstr "ذخيره‌سازى مداوم قابل نوشتن نيست. شايد به صورت فقط خواندنى سوار شده‌است؟" + +#: ../lib/Tails/Persistence/Setup.pm:507 +#, perl-format +msgid "Tails is running from non-USB device %s." +msgstr "تيلز از دستگاه %s كه وسيله يواس‌بى نيست اجرا مى‌شود." + +#: ../lib/Tails/Persistence/Setup.pm:513 +#, perl-format +msgid "Device %s is optical." +msgstr "دستگاه %s نورى است." + +#: ../lib/Tails/Persistence/Setup.pm:520 +#, perl-format +msgid "Device %s was not created using Tails USB installer." +msgstr "دستگاه %s توسط «برنامه نصب‌كننده يواس‌بي تيلز» ساخته نبود." + +#: ../lib/Tails/Persistence/Setup.pm:554 +msgid "Error" +msgstr "خطا" + +#: ../lib/Tails/Persistence/Setup.pm:861 +msgid "Persistence wizard - Finished" +msgstr "معاون تداوم - تمام‌شده" + +#: ../lib/Tails/Persistence/Setup.pm:864 +msgid "" +"Any changes you have made will only take effect after restarting Tails.\n" +"\n" +"You may now close this application." +msgstr "تغييرات فقط بعد از بازآغازى تيلز فعال خواهد شد.\\n\nحالا مى‌توانيد اين برنامه‌را ببنديد." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 +msgid "Persistence wizard - Persistent volume creation" +msgstr "معاون تداوم - ساختن حجم ذخيره‌سازى مداوم" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:57 +msgid "Choose a passphrase to protect the persistent volume" +msgstr "لطفاً عبارت عبورى براى محافظت‌كردن ذخيره‌سازى مداوم انتخاب كنيد" + +#. TRANSLATORS: size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:61 +#, perl-format +msgid "" +"A %s persistent volume will be created on the %s %s device. Data on " +"this volume will be stored in an encrypted form protected by a passphrase." +msgstr "حجم ذخيره‌سازى %s در دستگاه %s %s ساخته خواهد شد. داده‌ها در اين حجم به صورت رمزشده‌است و با عبارت عبور محافظت مى‌شود." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 +msgid "Create" +msgstr "ساختن" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:110 +msgid "" +"Beware! Using persistence has consequences that must be well " +"understood. Tails can't help you if you use it wrong! See <a " +"href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails" +" documentation about persistence</a> to learn more." +msgstr "مواظب باشيد! بكار بردن تداوم داده‌ها نتايجى دارد كه بايد آنهارا كاملاً بفهميد. اگر اشتباه كنيد، تيلز نمى‌تواند به شما كمک كند! <a href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>مستندات تيلز راجع به تداوم داده‌ها</a> تا بيشتر بخوانيد." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 +msgid "Passphrase:" +msgstr "عبارت عبور:" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:154 +msgid "Verify Passphrase:" +msgstr "تاييد عبارت عبور:" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:167 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:231 +msgid "Passphrase can't be empty" +msgstr "بايد عبارت عبورى انتخاب كرد" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:222 +msgid "Passphrases do not match" +msgstr "عبارات عبور با هم مطابقت ندارند" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Configure.pm:189 +msgid "Failed" +msgstr "ناموفق" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:269 +#: ../lib/Tails/Persistence/Step/Delete.pm:84 +msgid "Correcting attributes on Tails system partition." +msgstr "در حال درست‌كردن صفت‌ها در سكتور سيستم تيلز" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:272 +#: ../lib/Tails/Persistence/Step/Delete.pm:87 +msgid "The attributes of the Tails system partition will be corrected." +msgstr "صفت‌هاى سكتور سيستم تيلز درست خواهد شد." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:280 +msgid "Mounting Tails persistence partition." +msgstr "در حال سواركردن ذخيره‌سازى مداوم تيلز..." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +msgid "The Tails persistence partition will be mounted." +msgstr "ذخيره‌سازى مداوم تيلز سوار خواهيم كرد." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:304 +msgid "Creating..." +msgstr "در حال ساختن..." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:307 +msgid "Creating the persistent volume..." +msgstr "در حال ساختن ذخيره‌سازى مداوم..." + +#: ../lib/Tails/Persistence/Step/Configure.pm:60 +msgid "Persistence wizard - Persistent volume configuration" +msgstr "معاون تداوم - پيكربندى ذخيره‌سازى مداوم" + +#: ../lib/Tails/Persistence/Step/Configure.pm:63 +msgid "Specify the files that will be saved in the persistent volume" +msgstr "فايل‌هائى‌ كه در ذخيره‌سازى مداوم ذخيره خواهد شد را مشخص كنيد." + +#. TRANSLATORS: partition, size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Configure.pm:67 +#, perl-format +msgid "" +"The selected files will be stored in the encrypted partition %s (%s), on the" +" %s %s device." +msgstr "فايل‌هاى مشخص در ذخيره‌سازى رمزشده %s (%s) در دستگاه %s %s ذخيره خواهد شد" + +#: ../lib/Tails/Persistence/Step/Configure.pm:73 +msgid "Save" +msgstr "ذخيره‌كردن" + +#: ../lib/Tails/Persistence/Step/Configure.pm:135 +msgid "Make custom directory persistent (absolute path):" +msgstr "مداوم كردن پوشه سفارشى («مسير مطلق»)" + +#: ../lib/Tails/Persistence/Step/Configure.pm:141 +msgid "Destination:" +msgstr "مقصد:" + +#: ../lib/Tails/Persistence/Step/Configure.pm:204 +msgid "Saving..." +msgstr "در حال ذخيره‌كردن..." + +#: ../lib/Tails/Persistence/Step/Configure.pm:207 +msgid "Saving persistence configuration..." +msgstr "در حال ذخيره‌كردن پىكربندى تداوم..." + +#: ../lib/Tails/Persistence/Step/Delete.pm:41 +msgid "Persistence wizard - Persistent volume deletion" +msgstr "معاون تداوم - حذف‌كردن ذخيره‌سازى مداوم." + +#: ../lib/Tails/Persistence/Step/Delete.pm:44 +msgid "Your persistent data will be deleted." +msgstr "داده‌هاى مداومتان حذف خواهد شد." + +#: ../lib/Tails/Persistence/Step/Delete.pm:48 +#, perl-format +msgid "" +"The persistent volume %s (%s), on the %s %s device, will be deleted." +msgstr "فايل‌هاى مشخص در ذخيره‌سازى رمزشده %s (%s) در دستگاه %s %s حذف خواهند شد" + +#: ../lib/Tails/Persistence/Step/Delete.pm:54 +msgid "Delete" +msgstr "حذف‌كردن" + +#: ../lib/Tails/Persistence/Step/Delete.pm:99 +msgid "Deleting..." +msgstr "در حال حذف‌كردن..." + +#: ../lib/Tails/Persistence/Step/Delete.pm:102 +msgid "Deleting the persistent volume..." +msgstr "در حال حذف‌كردن ذخيره‌سازى مداوم..."

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 25 Feb '13

25 Feb '13

commit 826dedc767282d599e073a0af19f5176aa329624 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 25 12:46:49 2013 +0000 Update translations for tails-persistence-setup --- fa/fa.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fa/fa.po b/fa/fa.po index 965446d..3b66a69 100644 --- a/fa/fa.po +++ b/fa/fa.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-11-27 21:00+0100\n" -"PO-Revision-Date: 2013-02-23 03:33+0000\n" +"PO-Revision-Date: 2013-02-25 12:41+0000\n" "Last-Translator: zendegi <hamahangi(a)posteo.eu>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -286,7 +286,7 @@ msgstr "ذخيره‌كردن" #: ../lib/Tails/Persistence/Step/Configure.pm:135 msgid "Make custom directory persistent (absolute path):" -msgstr "" +msgstr "مداوم كردن پوشه سفارشى («مسير مطلق»)" #: ../lib/Tails/Persistence/Step/Configure.pm:141 msgid "Destination:"

1 0

[tor/master] Fix a comment in tor_main.c
by nickm＠torproject.org 25 Feb '13

25 Feb '13

commit 68799103344e41e6b5301d2699af5d12a3744f5d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 25 03:24:53 2013 -0500 Fix a comment in tor_main.c We don't use subversion or src/*/makefile.am any longer --- src/or/tor_main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/tor_main.c b/src/or/tor_main.c index 806b5eb..05dc0bf 100644 --- a/src/or/tor_main.c +++ b/src/or/tor_main.c @@ -3,9 +3,9 @@ * Copyright (c) 2007-2013, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -/** String describing which Tor subversion repository version the source was - * built from. This string is generated by a bit of shell kludging int - * src/or/Makefile.am, and is usually right. +/** String describing which Tor Git repository version the source was + * built from. This string is generated by a bit of shell kludging in + * src/or/include.am, and is usually right. */ const char tor_git_revision[] = #ifndef _MSC_VER

1 0

[ooni-probe/master] Rename DNS Tamper Test to DNS Consistency Test
by isis＠torproject.org 24 Feb '13

24 Feb '13

commit 9dbe9841b16e8d678c5e32222a83cda4e4f5d40c Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Feb 5 00:50:26 2013 +0100 Rename DNS Tamper Test to DNS Consistency Test --- decks/before_i_commit.testdeck | 2 +- docs/source/index.rst | 2 +- docs/source/nettests/nettests.blocking.rst | 4 +- docs/source/tests/dnsconsistency.rst | 180 ++++++++++++++++++++++++++++ docs/source/tests/dnstamper.rst | 180 ---------------------------- docs/source/writing_tests.rst | 2 +- inputs/README | 2 +- nettests/blocking/dnsconsistency.py | 166 +++++++++++++++++++++++++ nettests/blocking/dnstamper.py | 166 ------------------------- 9 files changed, 352 insertions(+), 352 deletions(-) diff --git a/decks/before_i_commit.testdeck b/decks/before_i_commit.testdeck index 7877d74..525204d 100644 --- a/decks/before_i_commit.testdeck +++ b/decks/before_i_commit.testdeck @@ -13,7 +13,7 @@ pcapfile: null reportfile: dns_tamper_test.yamloo subargs: [-T, example_inputs/dns_tamper_test_resolvers.txt, -f, example_inputs/dns_tamper_file.txt] - test: nettests/blocking/dnstamper.py + test: nettests/blocking/dnsconsistency.py - options: collector: null help: 0 diff --git a/docs/source/index.rst b/docs/source/index.rst index ca74809..43ad1fe 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -48,7 +48,7 @@ respectively. Content Blocking Tests ...................... - * `DNSTamper <tests/dnstamper.html>`_ + * `DNSConsistency <tests/dnsconsistency.html>`_ * `HTTP Requests <tests/http_requests.html>`_ diff --git a/docs/source/nettests/nettests.blocking.rst b/docs/source/nettests/nettests.blocking.rst index 03a08b6..eaec0e8 100644 --- a/docs/source/nettests/nettests.blocking.rst +++ b/docs/source/nettests/nettests.blocking.rst @@ -1,10 +1,10 @@ nettests blocking Package ========================= -:mod:`nettests.blocking.dnstamper` Module +:mod:`nettests.blocking.dnsconsistency` Module ----------------------------------------- -.. automodule:: nettests.blocking.dnstamper +.. automodule:: nettests.blocking.dnsconsistency :members: :undoc-members: :show-inheritance: diff --git a/docs/source/tests/dnsconsistency.rst b/docs/source/tests/dnsconsistency.rst new file mode 100644 index 0000000..8a413bf --- /dev/null +++ b/docs/source/tests/dnsconsistency.rst @@ -0,0 +1,180 @@ +Details +======= + +*Test Name*: DNS Consistency (Ex DNS Tamper) + +*Current version*: 0.4 + +*NetTest*: DNS Consistency Test (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/nettests/blocking/d…) + +*Test Helper*: DNS Test Helper (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/oonib/testhelpers/d…) + +*Test Type*: Content Blocking + +*Requires Root*: No + +Description +=========== + +This test performs A queries to a set of test resolvers and a known good +control resolver. If the two results do not match it will perform a reverse DNS +lookup on the first A record address of both sets and check if they both +resolve to the same name. + +NOTE: This test frequently results in false positives due to GeoIP-based +load balancing on major global sites such as Google, Facebook, and +Youtube, etc. + +How to run the test +=================== + +`./bin/ooniprobe nettests/core/dnsconsistency.py [-t <test resolvers>|-T <test resolver file>-f <input file> -b IP:PORT` + +*test resolvers* is a single test resolver (IP address) + +*test resolvers file* is a file containing the IP addresses of the resolvers to test for censorship, one per line. + +*input file* is a file containing hostnames or urls to check for tampering. + +*IP:PORT* is the address of the known good "control" resolver. + +Sample report +============= + +From running: +`./bin/ooniprobe nettests/core/dnsconsistency.py -t test_inputs/dns_tamper_test_resolvers.txt -f test_inputs/http_host_file.txt` + +:: + + ########################################### + # OONI Probe Report for DNS tamper test + # Thu Nov 29 12:17:19 2012 + ########################################### + --- + options: + collector: null + help: 0 + logfile: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [-t, 8.8.8.8, -f, test_inputs/dns_tamper_file.txt] + test: nettests/blocking/dnsconsistency.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: 1354184239.0 + test_name: DNS tamper + test_version: '0.4' + ... + --- + input: torproject.org + report: + control_resolver: &id001 [8.8.8.8, 53] + queries: + - addrs: [86.59.30.40, 38.229.72.14, 38.229.72.16, 82.195.75.101] + answers: + - [<RR name=torproject.org type=A class=IN ttl=91s auth=False>, <A address=86.59.30.40 + ttl=91>] + - [<RR name=torproject.org type=A class=IN ttl=91s auth=False>, <A address=38.229.72.14 + ttl=91>] + - [<RR name=torproject.org type=A class=IN ttl=91s auth=False>, <A address=38.229.72.16 + ttl=91>] + - [<RR name=torproject.org type=A class=IN ttl=91s auth=False>, <A address=82.195.75.101 + ttl=91>] + query: '[Query(''torproject.org'', 1, 1)]' + query_type: A + resolver: *id001 + - addrs: [86.59.30.40, 38.229.72.14, 38.229.72.16, 82.195.75.101] + answers: + - [<RR name=torproject.org type=A class=IN ttl=91s auth=False>, <A address=86.59.30.40 + ttl=91>] + - [<RR name=torproject.org type=A class=IN ttl=91s auth=False>, <A address=38.229.72.14 + ttl=91>] + - [<RR name=torproject.org type=A class=IN ttl=91s auth=False>, <A address=38.229.72.16 + ttl=91>] + - [<RR name=torproject.org type=A class=IN ttl=91s auth=False>, <A address=82.195.75.101 + ttl=91>] + query: '[Query(''torproject.org'', 1, 1)]' + query_type: A + resolver: [8.8.8.8, 53] + tampering: {8.8.8.8: false} + test_name: test_a_lookup + test_runtime: 0.0733950138092041 + test_started: 1354187839.508863 + ... + --- + input: google.com + report: + control_resolver: &id001 [8.8.8.8, 53] + queries: + - addrs: [173.194.69.100, 173.194.69.139, 173.194.69.113, 173.194.69.101, 173.194.69.138, + 173.194.69.102] + answers: + - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.100 + ttl=54>] + - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.139 + ttl=54>] + - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.113 + ttl=54>] + - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.101 + ttl=54>] + - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.138 + ttl=54>] + - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.102 + ttl=54>] + query: '[Query(''google.com'', 1, 1)]' + query_type: A + resolver: *id001 + - addrs: [173.194.69.100, 173.194.69.139, 173.194.69.113, 173.194.69.101, 173.194.69.138, + 173.194.69.102] + answers: + - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.100 + ttl=54>] + - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.139 + ttl=54>] + - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.113 + ttl=54>] + - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.101 + ttl=54>] + - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.138 + ttl=54>] + - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.102 + ttl=54>] + query: '[Query(''google.com'', 1, 1)]' + query_type: A + resolver: [8.8.8.8, 53] + tampering: {8.8.8.8: false} + test_name: test_a_lookup + test_runtime: 0.08325004577636719 + test_started: 1354187839.51091 + ... + --- + input: measurementlab.net + report: + control_resolver: &id001 [8.8.8.8, 53] + queries: + - addrs: [72.249.86.184] + answers: + - [<RR name=measurementlab.net type=A class=IN ttl=600s auth=False>, <A address=72.249.86.184 + ttl=600>] + query: '[Query(''measurementlab.net'', 1, 1)]' + query_type: A + resolver: *id001 + - addrs: [72.249.86.184] + answers: + - [<RR name=measurementlab.net type=A class=IN ttl=600s auth=False>, <A address=72.249.86.184 + ttl=600>] + query: '[Query(''measurementlab.net'', 1, 1)]' + query_type: A + resolver: [8.8.8.8, 53] + tampering: {8.8.8.8: false} + test_name: test_a_lookup + test_runtime: 0.2565779685974121 + test_started: 1354187839.512434 + ... + +Notes: Query is the string representation of :class:twisted.names.dns.Query + diff --git a/docs/source/tests/dnstamper.rst b/docs/source/tests/dnstamper.rst deleted file mode 100644 index 8fdb572..0000000 --- a/docs/source/tests/dnstamper.rst +++ /dev/null @@ -1,180 +0,0 @@ -Details -======= - -*Test Name*: DNS Tamper - -*Current version*: 0.4 - -*NetTest*: DNS Tamper Test (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/nettests/blocking/d…) - -*Test Helper*: DNS Test Helper (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/oonib/testhelpers/d…) - -*Test Type*: Content Blocking - -*Requires Root*: No - -Description -=========== - -This test performs A queries to a set of test resolvers and a known good -control resolver. If the two results do not match it will perform a reverse DNS -lookup on the first A record address of both sets and check if they both -resolve to the same name. - -NOTE: This test frequently results in false positives due to GeoIP-based -load balancing on major global sites such as Google, Facebook, and -Youtube, etc. - -How to run the test -=================== - -`./bin/ooniprobe nettests/core/dnstamper.py [-t <test resolvers>|-T <test resolver file>-f <input file> -b IP:PORT` - -*test resolvers* is a single test resolver (IP address) - -*test resolvers file* is a file containing the IP addresses of the resolvers to test for censorship, one per line. - -*input file* is a file containing hostnames or urls to check for tampering. - -*IP:PORT* is the address of the known good "control" resolver. - -Sample report -============= - -From running: -`./bin/ooniprobe nettests/core/dnstamper.py -t test_inputs/dns_tamper_test_resolvers.txt -f test_inputs/http_host_file.txt` - -:: - - ########################################### - # OONI Probe Report for DNS tamper test - # Thu Nov 29 12:17:19 2012 - ########################################### - --- - options: - collector: null - help: 0 - logfile: null - pcapfile: null - reportfile: null - resume: 0 - subargs: [-t, 8.8.8.8, -f, test_inputs/dns_tamper_file.txt] - test: nettests/blocking/dnstamper.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: 1354184239.0 - test_name: DNS tamper - test_version: '0.4' - ... - --- - input: torproject.org - report: - control_resolver: &id001 [8.8.8.8, 53] - queries: - - addrs: [86.59.30.40, 38.229.72.14, 38.229.72.16, 82.195.75.101] - answers: - - [<RR name=torproject.org type=A class=IN ttl=91s auth=False>, <A address=86.59.30.40 - ttl=91>] - - [<RR name=torproject.org type=A class=IN ttl=91s auth=False>, <A address=38.229.72.14 - ttl=91>] - - [<RR name=torproject.org type=A class=IN ttl=91s auth=False>, <A address=38.229.72.16 - ttl=91>] - - [<RR name=torproject.org type=A class=IN ttl=91s auth=False>, <A address=82.195.75.101 - ttl=91>] - query: '[Query(''torproject.org'', 1, 1)]' - query_type: A - resolver: *id001 - - addrs: [86.59.30.40, 38.229.72.14, 38.229.72.16, 82.195.75.101] - answers: - - [<RR name=torproject.org type=A class=IN ttl=91s auth=False>, <A address=86.59.30.40 - ttl=91>] - - [<RR name=torproject.org type=A class=IN ttl=91s auth=False>, <A address=38.229.72.14 - ttl=91>] - - [<RR name=torproject.org type=A class=IN ttl=91s auth=False>, <A address=38.229.72.16 - ttl=91>] - - [<RR name=torproject.org type=A class=IN ttl=91s auth=False>, <A address=82.195.75.101 - ttl=91>] - query: '[Query(''torproject.org'', 1, 1)]' - query_type: A - resolver: [8.8.8.8, 53] - tampering: {8.8.8.8: false} - test_name: test_a_lookup - test_runtime: 0.0733950138092041 - test_started: 1354187839.508863 - ... - --- - input: google.com - report: - control_resolver: &id001 [8.8.8.8, 53] - queries: - - addrs: [173.194.69.100, 173.194.69.139, 173.194.69.113, 173.194.69.101, 173.194.69.138, - 173.194.69.102] - answers: - - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.100 - ttl=54>] - - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.139 - ttl=54>] - - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.113 - ttl=54>] - - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.101 - ttl=54>] - - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.138 - ttl=54>] - - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.102 - ttl=54>] - query: '[Query(''google.com'', 1, 1)]' - query_type: A - resolver: *id001 - - addrs: [173.194.69.100, 173.194.69.139, 173.194.69.113, 173.194.69.101, 173.194.69.138, - 173.194.69.102] - answers: - - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.100 - ttl=54>] - - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.139 - ttl=54>] - - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.113 - ttl=54>] - - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.101 - ttl=54>] - - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.138 - ttl=54>] - - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.102 - ttl=54>] - query: '[Query(''google.com'', 1, 1)]' - query_type: A - resolver: [8.8.8.8, 53] - tampering: {8.8.8.8: false} - test_name: test_a_lookup - test_runtime: 0.08325004577636719 - test_started: 1354187839.51091 - ... - --- - input: measurementlab.net - report: - control_resolver: &id001 [8.8.8.8, 53] - queries: - - addrs: [72.249.86.184] - answers: - - [<RR name=measurementlab.net type=A class=IN ttl=600s auth=False>, <A address=72.249.86.184 - ttl=600>] - query: '[Query(''measurementlab.net'', 1, 1)]' - query_type: A - resolver: *id001 - - addrs: [72.249.86.184] - answers: - - [<RR name=measurementlab.net type=A class=IN ttl=600s auth=False>, <A address=72.249.86.184 - ttl=600>] - query: '[Query(''measurementlab.net'', 1, 1)]' - query_type: A - resolver: [8.8.8.8, 53] - tampering: {8.8.8.8: false} - test_name: test_a_lookup - test_runtime: 0.2565779685974121 - test_started: 1354187839.512434 - ... - -Notes: Query is the string representation of :class:twisted.names.dns.Query - diff --git a/docs/source/writing_tests.rst b/docs/source/writing_tests.rst index ccc529a..8f431d6 100644 --- a/docs/source/writing_tests.rst +++ b/docs/source/writing_tests.rst @@ -508,4 +508,4 @@ Report format test_started: 1354801371.980114 ... -For a more complex example, see: :mod:`nettests.blocking.dnstamper` +For a more complex example, see: :mod:`nettests.blocking.dnsconsistency` diff --git a/inputs/README b/inputs/README index 9a4f9b7..2bbc11e 100644 --- a/inputs/README +++ b/inputs/README @@ -3,7 +3,7 @@ the correct functionality of the various OONIProbe tests. # DNS Tamper -./bin/ooniprobe -o dns_tamper_test.yamloo nettests/blocking/dnstamper.py -t +./bin/ooniprobe -o dns_tamper_test.yamloo nettests/blocking/dnsconsistency.py -t example_inputs/dns_tamper_test_resolvers.txt -f example_inputs/dns_tamper_file.txt less dns_tamper_test.yamloo diff --git a/nettests/blocking/dnsconsistency.py b/nettests/blocking/dnsconsistency.py new file mode 100644 index 0000000..6703478 --- /dev/null +++ b/nettests/blocking/dnsconsistency.py @@ -0,0 +1,166 @@ +# -*- encoding: utf-8 -*- +# +# dnsconsistency +# ************** +# +# The test reports censorship if the cardinality of the intersection of +# the query result set from the control server and the query result set +# from the experimental server is zero, which is to say, if the two sets +# have no matching results whatsoever. +# +# NOTE: This test frequently results in false positives due to GeoIP-based +# load balancing on major global sites such as google, facebook, and +# youtube, etc. +# +# :authors: Arturo Filastò, Isis Lovecruft +# :licence: see LICENSE + +import pdb + +from twisted.python import usage +from twisted.internet import defer + +from ooni.templates import dnst + +from ooni import nettest +from ooni.utils import log + +class UsageOptions(usage.Options): + optParameters = [['backend', 'b', '8.8.8.8:53', + 'The OONI backend that runs the DNS resolver'], + ['testresolvers', 'T', None, + 'File containing list of DNS resolvers to test against'], + ['testresolver', 't', None, + 'Specify a single test resolver to use for testing'] + ] + +class DNSConsistencyTest(dnst.DNSTest): + + name = "DNS Consistency" + description = "DNS censorship detection test" + version = "0.5" + authors = "Arturo Filastò, Isis Lovecruft" + requirements = None + + inputFile = ['file', 'f', None, + 'Input file of list of hostnames to attempt to resolve'] + + usageOptions = UsageOptions + requiredOptions = ['backend', 'file'] + + def setUp(self): + if (not self.localOptions['testresolvers'] and \ + not self.localOptions['testresolver']): + raise usage.UsageError("You did not specify a testresolver") + + elif self.localOptions['testresolvers']: + test_resolvers_file = self.localOptions['testresolvers'] + + elif self.localOptions['testresolver']: + self.test_resolvers = [self.localOptions['testresolver']] + + try: + with open(test_resolvers_file) as f: + self.test_resolvers = [x.split('#')[0].strip() for x in f.readlines()] + self.report['test_resolvers'] = self.test_resolvers + f.close() + + except IOError, e: + log.exception(e) + raise usage.UsageError("Invalid test resolvers file") + + except NameError: + log.debug("No test resolver file configured") + + dns_ip, dns_port = self.localOptions['backend'].split(':') + self.control_dns_server = (dns_ip, int(dns_port)) + + self.report['control_resolver'] = self.control_dns_server + + @defer.inlineCallbacks + def test_a_lookup(self): + """ + We perform an A lookup on the DNS test servers for the domains to be + tested and an A lookup on the known good DNS server. + + We then compare the results from test_resolvers and that from + control_resolver and see if the match up. + If they match up then no censorship is happening (tampering: false). + + If they do not we do a reverse lookup (PTR) on the test_resolvers and + the control resolver for every IP address we got back and check to see + if anyone of them matches the control ones. + + If they do then we take not of the fact that censorship is probably not + happening (tampering: reverse-match). + + If they do not match then censorship is probably going on (tampering: + true). + """ + log.msg("Doing the test lookups on %s" % self.input) + list_of_ds = [] + hostname = self.input + + self.report['tampering'] = {} + + control_answers = yield self.performALookup(hostname, self.control_dns_server) + if not control_answers: + log.err("Got no response from control DNS server %s," \ + " perhaps the DNS resolver is down?" % self.control_dns_server[0]) + self.report['tampering'][self.control_dns_server] = 'no_answer' + return + + for test_resolver in self.test_resolvers: + log.msg("Testing resolver: %s" % test_resolver) + test_dns_server = (test_resolver, 53) + + experiment_answers = yield self.performALookup(hostname, test_dns_server) + if not experiment_answers: + log.err("Got no response, perhaps the DNS resolver is down?") + self.report['tampering'][test_resolver] = 'no_answer' + continue + else: + log.debug("Got the following A lookup answers %s from %s" % (experiment_answers, test_resolver)) + + def lookup_details(): + """ + A closure useful for printing test details. + """ + log.msg("test resolver: %s" % test_resolver) + log.msg("experiment answers: %s" % experiment_answers) + log.msg("control answers: %s" % control_answers) + + log.debug("Comparing %s with %s" % (experiment_answers, control_answers)) + if set(experiment_answers) & set(control_answers): + lookup_details() + log.msg("tampering: false") + self.report['tampering'][test_resolver] = False + else: + log.msg("Trying to do reverse lookup") + + experiment_reverse = yield self.performPTRLookup(experiment_answers[0], test_dns_server) + control_reverse = yield self.performPTRLookup(control_answers[0], self.control_dns_server) + + if experiment_reverse == control_reverse: + log.msg("Further testing has eliminated false positives") + lookup_details() + log.msg("tampering: reverse_match") + self.report['tampering'][test_resolver] = 'reverse_match' + else: + log.msg("Reverse lookups do not match") + lookup_details() + log.msg("tampering: true") + self.report['tampering'][test_resolver] = True + + def inputProcessor(self, filename=None): + """ + This inputProcessor extracts domain names from urls + """ + log.debug("Running dnsconsistency default processor") + if filename: + fp = open(filename) + for x in fp.readlines(): + yield x.strip().split('//')[-1].split('/')[0] + fp.close() + else: + pass diff --git a/nettests/blocking/dnstamper.py b/nettests/blocking/dnstamper.py deleted file mode 100644 index 1ef2c89..0000000 --- a/nettests/blocking/dnstamper.py +++ /dev/null @@ -1,166 +0,0 @@ -# -*- encoding: utf-8 -*- -# -# dnstamper -# ********* -# -# The test reports censorship if the cardinality of the intersection of -# the query result set from the control server and the query result set -# from the experimental server is zero, which is to say, if the two sets -# have no matching results whatsoever. -# -# NOTE: This test frequently results in false positives due to GeoIP-based -# load balancing on major global sites such as google, facebook, and -# youtube, etc. -# -# :authors: Arturo Filastò, Isis Lovecruft -# :licence: see LICENSE - -import pdb - -from twisted.python import usage -from twisted.internet import defer - -from ooni.templates import dnst - -from ooni import nettest -from ooni.utils import log - -class UsageOptions(usage.Options): - optParameters = [['backend', 'b', '8.8.8.8:53', - 'The OONI backend that runs the DNS resolver'], - ['testresolvers', 'T', None, - 'File containing list of DNS resolvers to test against'], - ['testresolver', 't', None, - 'Specify a single test resolver to use for testing'] - ] - -class DNSTamperTest(dnst.DNSTest): - - name = "DNS tamper" - description = "DNS censorship detection test" - version = "0.4" - authors = "Arturo Filastò, Isis Lovecruft" - requirements = None - - inputFile = ['file', 'f', None, - 'Input file of list of hostnames to attempt to resolve'] - - usageOptions = UsageOptions - requiredOptions = ['backend', 'file'] - - def setUp(self): - if (not self.localOptions['testresolvers'] and \ - not self.localOptions['testresolver']): - raise usage.UsageError("You did not specify a testresolver") - - elif self.localOptions['testresolvers']: - test_resolvers_file = self.localOptions['testresolvers'] - - elif self.localOptions['testresolver']: - self.test_resolvers = [self.localOptions['testresolver']] - - try: - with open(test_resolvers_file) as f: - self.test_resolvers = [x.split('#')[0].strip() for x in f.readlines()] - self.report['test_resolvers'] = self.test_resolvers - f.close() - - except IOError, e: - log.exception(e) - raise usage.UsageError("Invalid test resolvers file") - - except NameError: - log.debug("No test resolver file configured") - - dns_ip, dns_port = self.localOptions['backend'].split(':') - self.control_dns_server = (dns_ip, int(dns_port)) - - self.report['control_resolver'] = self.control_dns_server - - @defer.inlineCallbacks - def test_a_lookup(self): - """ - We perform an A lookup on the DNS test servers for the domains to be - tested and an A lookup on the known good DNS server. - - We then compare the results from test_resolvers and that from - control_resolver and see if the match up. - If they match up then no censorship is happening (tampering: false). - - If they do not we do a reverse lookup (PTR) on the test_resolvers and - the control resolver for every IP address we got back and check to see - if anyone of them matches the control ones. - - If they do then we take not of the fact that censorship is probably not - happening (tampering: reverse-match). - - If they do not match then censorship is probably going on (tampering: - true). - """ - log.msg("Doing the test lookups on %s" % self.input) - list_of_ds = [] - hostname = self.input - - self.report['tampering'] = {} - - control_answers = yield self.performALookup(hostname, self.control_dns_server) - if not control_answers: - log.err("Got no response from control DNS server %s," \ - " perhaps the DNS resolver is down?" % self.control_dns_server[0]) - self.report['tampering'][self.control_dns_server] = 'no_answer' - return - - for test_resolver in self.test_resolvers: - log.msg("Testing resolver: %s" % test_resolver) - test_dns_server = (test_resolver, 53) - - experiment_answers = yield self.performALookup(hostname, test_dns_server) - if not experiment_answers: - log.err("Got no response, perhaps the DNS resolver is down?") - self.report['tampering'][test_resolver] = 'no_answer' - continue - else: - log.debug("Got the following A lookup answers %s from %s" % (experiment_answers, test_resolver)) - - def lookup_details(): - """ - A closure useful for printing test details. - """ - log.msg("test resolver: %s" % test_resolver) - log.msg("experiment answers: %s" % experiment_answers) - log.msg("control answers: %s" % control_answers) - - log.debug("Comparing %s with %s" % (experiment_answers, control_answers)) - if set(experiment_answers) & set(control_answers): - lookup_details() - log.msg("tampering: false") - self.report['tampering'][test_resolver] = False - else: - log.msg("Trying to do reverse lookup") - - experiment_reverse = yield self.performPTRLookup(experiment_answers[0], test_dns_server) - control_reverse = yield self.performPTRLookup(control_answers[0], self.control_dns_server) - - if experiment_reverse == control_reverse: - log.msg("Further testing has eliminated false positives") - lookup_details() - log.msg("tampering: reverse_match") - self.report['tampering'][test_resolver] = 'reverse_match' - else: - log.msg("Reverse lookups do not match") - lookup_details() - log.msg("tampering: true") - self.report['tampering'][test_resolver] = True - - def inputProcessor(self, filename=None): - """ - This inputProcessor extracts domain names from urls - """ - log.debug("Running dnstamper default processor") - if filename: - fp = open(filename) - for x in fp.readlines(): - yield x.strip().split('//')[-1].split('/')[0] - fp.close() - else: - pass

1 0

[ooni-probe/master] Merge branch 'master' into dnstamper-dnsconsistency
by isis＠torproject.org 24 Feb '13

24 Feb '13

commit 70ecad5372fabadb5ca3d66c5c4a2b4835542921 Merge: 9dbe984 bcb2794 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Feb 7 14:18:54 2013 +0100 Merge branch 'master' into dnstamper-dnsconsistency * master: Fix typo in dnstamper test example docs Properly handle errors when DNS lookups Fix typo in test writing documentation Conflicts: docs/source/tests/dnsconsistency.rst docs/source/tests/dnsconsistency.rst | 2 +- docs/source/writing_tests.rst | 4 ++-- nettests/blocking/dnsconsistency.py | 9 ++++++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --cc docs/source/tests/dnsconsistency.rst index 8a413bf,0000000..673661c mode 100644,000000..100644 --- a/docs/source/tests/dnsconsistency.rst +++ b/docs/source/tests/dnsconsistency.rst @@@ -1,180 -1,0 +1,180 @@@ +Details +======= + +*Test Name*: DNS Consistency (Ex DNS Tamper) + +*Current version*: 0.4 + +*NetTest*: DNS Consistency Test (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/nettests/blocking/d…) + +*Test Helper*: DNS Test Helper (https://gitweb.torproject.org/ooni-probe.git/blob/HEAD:/oonib/testhelpers/d…) + +*Test Type*: Content Blocking + +*Requires Root*: No + +Description +=========== + +This test performs A queries to a set of test resolvers and a known good +control resolver. If the two results do not match it will perform a reverse DNS +lookup on the first A record address of both sets and check if they both +resolve to the same name. + +NOTE: This test frequently results in false positives due to GeoIP-based +load balancing on major global sites such as Google, Facebook, and +Youtube, etc. + +How to run the test +=================== + +`./bin/ooniprobe nettests/core/dnsconsistency.py [-t <test resolvers>|-T <test resolver file>-f <input file> -b IP:PORT` + +*test resolvers* is a single test resolver (IP address) + +*test resolvers file* is a file containing the IP addresses of the resolvers to test for censorship, one per line. + +*input file* is a file containing hostnames or urls to check for tampering. + +*IP:PORT* is the address of the known good "control" resolver. + +Sample report +============= + +From running: - `./bin/ooniprobe nettests/core/dnsconsistency.py -t test_inputs/dns_tamper_test_resolvers.txt -f test_inputs/http_host_file.txt` ++`./bin/ooniprobe nettests/core/dnsconsistency.py -T test_inputs/dns_tamper_test_resolvers.txt -f test_inputs/http_host_file.txt` + +:: + + ########################################### + # OONI Probe Report for DNS tamper test + # Thu Nov 29 12:17:19 2012 + ########################################### + --- + options: + collector: null + help: 0 + logfile: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [-t, 8.8.8.8, -f, test_inputs/dns_tamper_file.txt] + test: nettests/blocking/dnsconsistency.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: 1354184239.0 + test_name: DNS tamper + test_version: '0.4' + ... + --- + input: torproject.org + report: + control_resolver: &id001 [8.8.8.8, 53] + queries: + - addrs: [86.59.30.40, 38.229.72.14, 38.229.72.16, 82.195.75.101] + answers: + - [<RR name=torproject.org type=A class=IN ttl=91s auth=False>, <A address=86.59.30.40 + ttl=91>] + - [<RR name=torproject.org type=A class=IN ttl=91s auth=False>, <A address=38.229.72.14 + ttl=91>] + - [<RR name=torproject.org type=A class=IN ttl=91s auth=False>, <A address=38.229.72.16 + ttl=91>] + - [<RR name=torproject.org type=A class=IN ttl=91s auth=False>, <A address=82.195.75.101 + ttl=91>] + query: '[Query(''torproject.org'', 1, 1)]' + query_type: A + resolver: *id001 + - addrs: [86.59.30.40, 38.229.72.14, 38.229.72.16, 82.195.75.101] + answers: + - [<RR name=torproject.org type=A class=IN ttl=91s auth=False>, <A address=86.59.30.40 + ttl=91>] + - [<RR name=torproject.org type=A class=IN ttl=91s auth=False>, <A address=38.229.72.14 + ttl=91>] + - [<RR name=torproject.org type=A class=IN ttl=91s auth=False>, <A address=38.229.72.16 + ttl=91>] + - [<RR name=torproject.org type=A class=IN ttl=91s auth=False>, <A address=82.195.75.101 + ttl=91>] + query: '[Query(''torproject.org'', 1, 1)]' + query_type: A + resolver: [8.8.8.8, 53] + tampering: {8.8.8.8: false} + test_name: test_a_lookup + test_runtime: 0.0733950138092041 + test_started: 1354187839.508863 + ... + --- + input: google.com + report: + control_resolver: &id001 [8.8.8.8, 53] + queries: + - addrs: [173.194.69.100, 173.194.69.139, 173.194.69.113, 173.194.69.101, 173.194.69.138, + 173.194.69.102] + answers: + - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.100 + ttl=54>] + - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.139 + ttl=54>] + - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.113 + ttl=54>] + - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.101 + ttl=54>] + - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.138 + ttl=54>] + - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.102 + ttl=54>] + query: '[Query(''google.com'', 1, 1)]' + query_type: A + resolver: *id001 + - addrs: [173.194.69.100, 173.194.69.139, 173.194.69.113, 173.194.69.101, 173.194.69.138, + 173.194.69.102] + answers: + - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.100 + ttl=54>] + - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.139 + ttl=54>] + - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.113 + ttl=54>] + - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.101 + ttl=54>] + - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.138 + ttl=54>] + - [<RR name=google.com type=A class=IN ttl=54s auth=False>, <A address=173.194.69.102 + ttl=54>] + query: '[Query(''google.com'', 1, 1)]' + query_type: A + resolver: [8.8.8.8, 53] + tampering: {8.8.8.8: false} + test_name: test_a_lookup + test_runtime: 0.08325004577636719 + test_started: 1354187839.51091 + ... + --- + input: measurementlab.net + report: + control_resolver: &id001 [8.8.8.8, 53] + queries: + - addrs: [72.249.86.184] + answers: + - [<RR name=measurementlab.net type=A class=IN ttl=600s auth=False>, <A address=72.249.86.184 + ttl=600>] + query: '[Query(''measurementlab.net'', 1, 1)]' + query_type: A + resolver: *id001 + - addrs: [72.249.86.184] + answers: + - [<RR name=measurementlab.net type=A class=IN ttl=600s auth=False>, <A address=72.249.86.184 + ttl=600>] + query: '[Query(''measurementlab.net'', 1, 1)]' + query_type: A + resolver: [8.8.8.8, 53] + tampering: {8.8.8.8: false} + test_name: test_a_lookup + test_runtime: 0.2565779685974121 + test_started: 1354187839.512434 + ... + +Notes: Query is the string representation of :class:twisted.names.dns.Query + diff --cc nettests/blocking/dnsconsistency.py index 6703478,0000000..7b6e7b9 mode 100644,000000..100644 --- a/nettests/blocking/dnsconsistency.py +++ b/nettests/blocking/dnsconsistency.py @@@ -1,166 -1,0 +1,173 @@@ +# -*- encoding: utf-8 -*- +# +# dnsconsistency +# ************** +# +# The test reports censorship if the cardinality of the intersection of +# the query result set from the control server and the query result set +# from the experimental server is zero, which is to say, if the two sets +# have no matching results whatsoever. +# +# NOTE: This test frequently results in false positives due to GeoIP-based +# load balancing on major global sites such as google, facebook, and +# youtube, etc. +# +# :authors: Arturo Filastò, Isis Lovecruft +# :licence: see LICENSE + +import pdb + +from twisted.python import usage +from twisted.internet import defer + +from ooni.templates import dnst + +from ooni import nettest +from ooni.utils import log + +class UsageOptions(usage.Options): + optParameters = [['backend', 'b', '8.8.8.8:53', + 'The OONI backend that runs the DNS resolver'], + ['testresolvers', 'T', None, + 'File containing list of DNS resolvers to test against'], + ['testresolver', 't', None, + 'Specify a single test resolver to use for testing'] + ] + +class DNSConsistencyTest(dnst.DNSTest): + + name = "DNS Consistency" + description = "DNS censorship detection test" + version = "0.5" + authors = "Arturo Filastò, Isis Lovecruft" + requirements = None + + inputFile = ['file', 'f', None, + 'Input file of list of hostnames to attempt to resolve'] + + usageOptions = UsageOptions + requiredOptions = ['backend', 'file'] + + def setUp(self): + if (not self.localOptions['testresolvers'] and \ + not self.localOptions['testresolver']): + raise usage.UsageError("You did not specify a testresolver") + + elif self.localOptions['testresolvers']: + test_resolvers_file = self.localOptions['testresolvers'] + + elif self.localOptions['testresolver']: + self.test_resolvers = [self.localOptions['testresolver']] + + try: + with open(test_resolvers_file) as f: + self.test_resolvers = [x.split('#')[0].strip() for x in f.readlines()] + self.report['test_resolvers'] = self.test_resolvers + f.close() + + except IOError, e: + log.exception(e) + raise usage.UsageError("Invalid test resolvers file") + + except NameError: + log.debug("No test resolver file configured") + + dns_ip, dns_port = self.localOptions['backend'].split(':') + self.control_dns_server = (dns_ip, int(dns_port)) + + self.report['control_resolver'] = self.control_dns_server + + @defer.inlineCallbacks + def test_a_lookup(self): + """ + We perform an A lookup on the DNS test servers for the domains to be + tested and an A lookup on the known good DNS server. + + We then compare the results from test_resolvers and that from + control_resolver and see if the match up. + If they match up then no censorship is happening (tampering: false). + + If they do not we do a reverse lookup (PTR) on the test_resolvers and + the control resolver for every IP address we got back and check to see + if anyone of them matches the control ones. + + If they do then we take not of the fact that censorship is probably not + happening (tampering: reverse-match). + + If they do not match then censorship is probably going on (tampering: + true). + """ + log.msg("Doing the test lookups on %s" % self.input) + list_of_ds = [] + hostname = self.input + + self.report['tampering'] = {} + + control_answers = yield self.performALookup(hostname, self.control_dns_server) + if not control_answers: + log.err("Got no response from control DNS server %s," \ + " perhaps the DNS resolver is down?" % self.control_dns_server[0]) + self.report['tampering'][self.control_dns_server] = 'no_answer' + return + + for test_resolver in self.test_resolvers: + log.msg("Testing resolver: %s" % test_resolver) + test_dns_server = (test_resolver, 53) + - experiment_answers = yield self.performALookup(hostname, test_dns_server) ++ try: ++ experiment_answers = yield self.performALookup(hostname, test_dns_server) ++ except Exception, e: ++ log.err("Problem performing the DNS lookup") ++ log.exception(e) ++ self.report['tampering'][test_resolver] = 'dns_lookup_error' ++ continue ++ + if not experiment_answers: + log.err("Got no response, perhaps the DNS resolver is down?") + self.report['tampering'][test_resolver] = 'no_answer' + continue + else: + log.debug("Got the following A lookup answers %s from %s" % (experiment_answers, test_resolver)) + + def lookup_details(): + """ + A closure useful for printing test details. + """ + log.msg("test resolver: %s" % test_resolver) + log.msg("experiment answers: %s" % experiment_answers) + log.msg("control answers: %s" % control_answers) + + log.debug("Comparing %s with %s" % (experiment_answers, control_answers)) + if set(experiment_answers) & set(control_answers): + lookup_details() + log.msg("tampering: false") + self.report['tampering'][test_resolver] = False + else: + log.msg("Trying to do reverse lookup") + + experiment_reverse = yield self.performPTRLookup(experiment_answers[0], test_dns_server) + control_reverse = yield self.performPTRLookup(control_answers[0], self.control_dns_server) + + if experiment_reverse == control_reverse: + log.msg("Further testing has eliminated false positives") + lookup_details() + log.msg("tampering: reverse_match") + self.report['tampering'][test_resolver] = 'reverse_match' + else: + log.msg("Reverse lookups do not match") + lookup_details() + log.msg("tampering: true") + self.report['tampering'][test_resolver] = True + + def inputProcessor(self, filename=None): + """ + This inputProcessor extracts domain names from urls + """ + log.debug("Running dnsconsistency default processor") + if filename: + fp = open(filename) + for x in fp.readlines(): + yield x.strip().split('//')[-1].split('/')[0] + fp.close() + else: + pass

1 0

[ooni-probe/master] Make sure to import Gen, SetGen and MTU even when pypcap is and libdnet are not installed
by isis＠torproject.org 24 Feb '13

24 Feb '13

commit 56f038eea8cf63bcb7f984e4d075665f4d670d3d Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Feb 8 17:44:09 2013 +0100 Make sure to import Gen, SetGen and MTU even when pypcap is and libdnet are not installed --- ooni/utils/txscapy.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ooni/utils/txscapy.py b/ooni/utils/txscapy.py index 62bde94..0e805e7 100644 --- a/ooni/utils/txscapy.py +++ b/ooni/utils/txscapy.py @@ -41,7 +41,7 @@ except ImportError, e: PcapWriter = DummyPcapWriter - + from scapy.all import Gen, SetGen, MTU def getNetworksFromRoutes(): """ Return a list of networks from the routing table """

1 0

[ooni-probe/master] Remove some superfluous requirements from the requirements.txt
by isis＠torproject.org 24 Feb '13

24 Feb '13

commit 7f6fd2784e798ca97b49c0abf833f6ca83c20a89 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Feb 8 17:44:53 2013 +0100 Remove some superfluous requirements from the requirements.txt --- requirements.txt | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 2b8aabf..f614185 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ PyYAML>=3.10 -Pygments>=1.5 Twisted==12.2.0 argparse>=1.2.1 distribute>=0.6.24 @@ -8,13 +7,10 @@ docutils>=0.9.1 ipaddr>=2.1.10 pyOpenSSL>=0.13 pygeoip>=0.2.5 -repoze.sphinx.autointerface>=0.7.1 https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy https://github.com/hellais/txsocksx/archive/master.zip -storm>=0.19 transaction>=1.3.0 txtorcon>=0.7 -wsgiref>=0.1.2 zope.component>=4.0.0 zope.event>=4.0.0 zope.interface>=4.0.1

1 0

[ooni-probe/master] Remove dependency on _WrappingFactory
by isis＠torproject.org 24 Feb '13

24 Feb '13

commit e42ccc321774f502355888ca15c24a638957d01d Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Feb 8 17:48:51 2013 +0100 Remove dependency on _WrappingFactory This closes issue #28 --- ooni/utils/txagentwithsocks.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ooni/utils/txagentwithsocks.py b/ooni/utils/txagentwithsocks.py index 830734e..a6fa276 100644 --- a/ooni/utils/txagentwithsocks.py +++ b/ooni/utils/txagentwithsocks.py @@ -12,7 +12,7 @@ from twisted.web import client, _newclient, http_headers from twisted.web._newclient import Request, RequestNotSent, RequestGenerationFailed, TransportProxyProducer, STATUS from twisted.internet import protocol from twisted.internet.protocol import ClientFactory, Protocol -from twisted.internet.endpoints import TCP4ClientEndpoint, SSL4ClientEndpoint, _WrappingProtocol, _WrappingFactory +from twisted.internet.endpoints import TCP4ClientEndpoint, SSL4ClientEndpoint from twisted.internet import interfaces, defer from twisted.internet.defer import Deferred, succeed, fail, maybeDeferred

1 0

[ooni-probe/master] Merge pull request #39 from aagbsn/captive_portal_fixes
by isis＠torproject.org 24 Feb '13

24 Feb '13

commit 5ff0b8e952615860f819477ad9a2f649eda0fffd Merge: 8a5b055 2777766 Author: Isis Agora Lovecruft <isis(a)torproject.org> Date: Tue Feb 19 21:16:34 2013 -0800 Merge pull request #39 from aagbsn/captive_portal_fixes Catch 302 redirect loops and log.err not log.warn nettests/manipulation/captiveportal.py | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-)

1 0