tor-commits November 2012

tor-commits@lists.torproject.org

18 participants
1508 discussions

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 22 Nov '12

22 Nov '12

commit 0b83951c6822058c122f855d7f4152c39f04ea06 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 22 16:15:58 2012 +0000 Update translations for tails-greeter --- bg/bg.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bg/bg.po b/bg/bg.po index ed101b8..9b68936 100644 --- a/bg/bg.po +++ b/bg/bg.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: 2012-11-22 15:43+0000\n" +"PO-Revision-Date: 2012-11-22 15:46+0000\n" "Last-Translator: kirilvel <kirilvelinov(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -50,7 +50,7 @@ msgstr "Само за четене?" #: ../glade/persistencewindow.glade.h:8 ../glade/optionswindow.glade.h:8 #: ../glade/langpanel.glade.h:1 msgid " " -msgstr "" +msgstr "-" #: ../glade/persistencewindow.glade.h:9 msgid "More options?"

1 0

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

22 Nov '12

commit 14fed673732ddf9551b622d6c38e70e45c8e1819 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 22 16:15:56 2012 +0000 Update translations for tails-persistence-setup --- bg/bg.po | 319 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 319 insertions(+), 0 deletions(-) diff --git a/bg/bg.po b/bg/bg.po new file mode 100644 index 0000000..817f032 --- /dev/null +++ b/bg/bg.po @@ -0,0 +1,319 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <kirilvelinov(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-10-29 19:33+0100\n" +"PO-Revision-Date: 2012-11-22 16:15+0000\n" +"Last-Translator: kirilvel <kirilvelinov(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: bg\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\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 "Съхранявайте файловете в \"Постоянна\"(Persistent) директория" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:58 +msgid "GnuPG" +msgstr "GnuPG" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:60 +msgid "GnuPG keyrings and configuration" +msgstr "GnuPG ключодържатели и конфигурация" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:68 +msgid "SSH Client" +msgstr "SSH Програма" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:70 +msgid "SSH keys, configuration and known hosts" +msgstr "SSH ключове, конфигурация и познатите хостове" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:78 +msgid "Pidgin" +msgstr "Pidgin" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:80 +msgid "Pidgin profiles and OTR keyring" +msgstr "Pidgin профили и OTR ключодържател" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:88 +msgid "Claws Mail" +msgstr "Claws Mail" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:90 +msgid "Claws Mail profiles and locally stored email" +msgstr "Claws Mail профили и локално съхранени имейл" + +#: ../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 "Тайните, съхранявани от GNOME ключодържател" + +#: ../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 "APT Packages" +msgstr "APT Пакети" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +msgid "Packages downloaded by APT" +msgstr "Пакети свален от APT" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 +msgid "APT Lists" +msgstr "APT списъци" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 +msgid "Lists downloaded by APT" +msgstr "Списъци свалени с APT" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +msgid "Dotfiles" +msgstr "Dotfiles" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +msgid "" +"Symlink into $HOME every file or directory found in the `dotfiles' directory" +msgstr "Символична връзка в $ 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 "Устройствата от което Tails работи не може да бъде намерено. Може би сте използвали опцията \"toram\"?" + +#: ../lib/Tails/Persistence/Setup.pm:284 +msgid "'Unparseable partition path.'" +msgstr "'Не перефразирам пътен дял.'" + +#: ../lib/Tails/Persistence/Setup.pm:298 +msgid "Setup Tails persistent volume" +msgstr "Настройка Tails устойчиви обем" + +#: ../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 "Не можете да изтриете упорит обем по време на използване. Трябва да рестартирате Tails без постоянство." + +#: ../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 "" + +#: ../lib/Tails/Persistence/Setup.pm:513 +#, perl-format +msgid "Device %s is optical." +msgstr "" + +#: ../lib/Tails/Persistence/Setup.pm:520 +#, perl-format +msgid "Device %s was not created using Tails USB installer." +msgstr "" + +#: ../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 "" + +#: ../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 device will be stored in an encrypted form protected by a passphrase." +msgstr "" + +#: ../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 "" + +#: ../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 "" + +#: ../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 "" + +#: ../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-greeter] Update translations for tails-greeter
by translation＠torproject.org 22 Nov '12

22 Nov '12

commit 1664355127822ff940a3efcc5e7a5c3e188a8fd4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 22 15:45:56 2012 +0000 Update translations for tails-greeter --- bg/bg.po | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 137 insertions(+), 0 deletions(-) diff --git a/bg/bg.po b/bg/bg.po new file mode 100644 index 0000000..ed101b8 --- /dev/null +++ b/bg/bg.po @@ -0,0 +1,137 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <kirilvelinov(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-06-01 15:10+0200\n" +"PO-Revision-Date: 2012-11-22 15:43+0000\n" +"Last-Translator: kirilvel <kirilvelinov(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: bg\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../glade/persistencewindow.glade.h:1 ../glade/optionswindow.glade.h:1 +#: ../GdmGreeter/persistencewindow.py:128 +msgid "Login" +msgstr "Влез" + +#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:2 +msgid "Welcome to Tails" +msgstr "Добре дошли в Tails" + +#: ../glade/persistencewindow.glade.h:3 +msgid "Use persistence?" +msgstr "Използвайте постоянство?" + +#: ../glade/persistencewindow.glade.h:4 +msgid "Yes" +msgstr "Да" + +#: ../glade/persistencewindow.glade.h:5 +msgid "No" +msgstr "Не" + +#: ../glade/persistencewindow.glade.h:6 +msgid "Passphrase:" +msgstr "Тайна фраза:" + +#: ../glade/persistencewindow.glade.h:7 +msgid "Read-Only?" +msgstr "Само за четене?" + +#: ../glade/persistencewindow.glade.h:8 ../glade/optionswindow.glade.h:8 +#: ../glade/langpanel.glade.h:1 +msgid " " +msgstr "" + +#: ../glade/persistencewindow.glade.h:9 +msgid "More options?" +msgstr "Повече възможности?" + +#: ../glade/optionswindow.glade.h:3 +msgid "Administration password" +msgstr "Администраторската парола" + +#: ../glade/optionswindow.glade.h:4 +msgid "" +"Enter an administration password in case you need to perform administration tasks.\n" +"Otherwise it will be disabled for better security." +msgstr "Въведете Администраторска парола, в случай, че е необходимо за изпълнение на административни задачи. ⏎ В противен случай ще бъде забранено за по-голяма сигурност." + +#: ../glade/optionswindow.glade.h:6 +msgid "Password:" +msgstr "Парола:" + +#: ../glade/optionswindow.glade.h:7 +msgid "Verify Password:" +msgstr "Потвърди Паролата:" + +#: ../glade/optionswindow.glade.h:9 +msgid "Windows Camouflage" +msgstr "Windows Камуфлаж" + +#: ../glade/optionswindow.glade.h:10 +msgid "" +"This option makes Tails look more like Microsoft Windows XP. This may be " +"useful in public places in order to avoid attracting suspicion." +msgstr "Тази опция прави Tails изглежда повече като Microsoft Windows XP. Това може да бъде полезно на обществени места, за да се избегне привличането подозрение." + +#: ../glade/optionswindow.glade.h:11 +msgid "Activate Microsoft Windows XP Camouflage" +msgstr "Активиране на Microsoft Windows XP камуфлаж" + +#: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 +msgid "Language" +msgstr "Език" + +#: ../glade/langpanel.glade.h:3 +msgid "Locale" +msgstr "Локал" + +#: ../glade/langpanel.glade.h:4 +msgid "Layout" +msgstr "Оформление" + +#: ../GdmGreeter/optionswindow.py:68 +msgid "Passwords do not match" +msgstr "Паролите не съвпадат" + +#: ../GdmGreeter/persistence.py:59 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stderr)s" +msgstr "live-persist failed with return code %(returncode)s:⏎ %(stderr)s" + +#: ../GdmGreeter/persistence.py:99 +#, python-format +msgid "" +"cryptsetup failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "cryptsetup failed with return code %(returncode)s:⏎ %(stdout)s⏎ %(stderr)s" + +#: ../GdmGreeter/persistence.py:124 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "live-persist failed with return code %(returncode)s:⏎ %(stdout)s⏎ %(stderr)s" + +#: ../GdmGreeter/persistencewindow.py:94 +msgid "Wrong passphrase. Please try again." +msgstr "Грешна Тайна фраза. Моля, опитайте отново." + +#: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 +#: ../GdmGreeter/langpanel.py:181 +msgid "Other..." +msgstr "Други..."

1 0

[ooni-probe/master] Break once it detects that the lengths don't match
by art＠torproject.org 22 Nov '12

22 Nov '12

commit 6843fafaeeef924a28255b1566fb8cecc3faef7a Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 22 15:57:14 2012 +0100 Break once it detects that the lengths don't match --- nettests/core/http_url_list.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/nettests/core/http_url_list.py b/nettests/core/http_url_list.py index eeaaa35..0accaae 100644 --- a/nettests/core/http_url_list.py +++ b/nettests/core/http_url_list.py @@ -74,6 +74,7 @@ class HTTPURLList(httpt.HTTPTest): # The censored page and the response we got do not match in # length. self.report['censored'] = False + break censorship_line = censorship_line.replace("\n", "") if response_line != censorship_line: self.report['censored'] = False

1 0

[ooni-probe/master] Update HTTP URL list test to start comparison once it encounters an HTML tag
by art＠torproject.org 22 Nov '12

22 Nov '12

commit 057cd86af90815696b115d93a96a8b720c49e4bf Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 22 15:49:27 2012 +0100 Update HTTP URL list test to start comparison once it encounters an HTML tag --- nettests/core/http_url_list.py | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/nettests/core/http_url_list.py b/nettests/core/http_url_list.py index 358ab20..eeaaa35 100644 --- a/nettests/core/http_url_list.py +++ b/nettests/core/http_url_list.py @@ -53,10 +53,21 @@ class HTTPURLList(httpt.HTTPTest): """ self.report['censored'] = True - censorship_page = open(self.localOptions['content']) + censorship_page = open(self.localOptions['content']).xreadlines() response_page = iter(body.split("\n")) - for censorship_line in censorship_page.xreadlines(): + # We first allign the two pages to the first HTML tag (something + # starting with <). This is useful so that we can give as input to this + # test something that comes from the output of curl -kis + # http://the_page/ + for line in censorship_page: + if line.strip().startswith("<"): + break + for line in response_page: + if line.strip().startswith("<"): + break + + for censorship_line in censorship_page: try: response_line = response_page.next() except StopIteration:

1 0

[ooni-probe/master] Fine tune http url list test
by art＠torproject.org 22 Nov '12

22 Nov '12

commit df509b6ac8e090ee2f5d53e28bcdc59e645e7cb6 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 22 15:34:25 2012 +0100 Fine tune http url list test --- nettests/core/http_url_list.py | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/nettests/core/http_url_list.py b/nettests/core/http_url_list.py index c0e2fc8..358ab20 100644 --- a/nettests/core/http_url_list.py +++ b/nettests/core/http_url_list.py @@ -6,6 +6,7 @@ from twisted.internet import defer from twisted.python import usage from ooni.templates import httpt +from ooni.utils import log class UsageOptions(usage.Options): optParameters = [['content', 'c', None, @@ -56,14 +57,21 @@ class HTTPURLList(httpt.HTTPTest): response_page = iter(body.split("\n")) for censorship_line in censorship_page.xreadlines(): - response_line = response_page.next() + try: + response_line = response_page.next() + except StopIteration: + # The censored page and the response we got do not match in + # length. + self.report['censored'] = False + censorship_line = censorship_line.replace("\n", "") if response_line != censorship_line: self.report['censored'] = False - break + censorship_page.close() def processResponseBody(self, body): if self.localOptions['content']: + log.msg("Checking for censorship in response body") self.check_for_content_censorship(body) def test_get(self):

1 0

[ooni-probe/master] Implement a quick and dirty parasitic TCP traceroute
by art＠torproject.org 22 Nov '12

22 Nov '12

commit c4aa242795d8d612bf51cf822b7ef73d8cff17ed Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 22 15:19:10 2012 +0100 Implement a quick and dirty parasitic TCP traceroute --- nettests/core/parasitictraceroute.py | 124 ++++++++++++++++++++++++++++++++++ 1 files changed, 124 insertions(+), 0 deletions(-) diff --git a/nettests/core/parasitictraceroute.py b/nettests/core/parasitictraceroute.py new file mode 100644 index 0000000..9d8de16 --- /dev/null +++ b/nettests/core/parasitictraceroute.py @@ -0,0 +1,124 @@ +# -*- encoding: utf-8 -*- +# +# :authors: Arturo Filastò +# :licence: see LICENSE + +from twisted.python import usage +from twisted.internet import defer + +from ooni.templates import scapyt + +from scapy.all import * + +from ooni.utils import log + +class UsageOptions(usage.Options): + optParameters = [['backend', 'b', '8.8.8.8', 'Test backend to use'], + ['timeout', 't', 5, 'The timeout for the traceroute test'], + ['maxttl', 'm', 30, 'The maximum value of ttl to set on packets'], + ['dstport', 'd', 80, 'Set the destination port of the traceroute test'], + ['srcport', 'p', None, 'Set the source port to a specific value']] + + optFlags = [['randomize','r', 'Randomize the source port']] + +class TracerouteTest(scapyt.BaseScapyTest): + name = "Parasitic TCP Traceroute Test" + author = "Arturo Filastò" + version = "0.1" + + usageOptions = UsageOptions + + def setUp(self): + def get_sport(): + if self.localOptions['srcport']: + return int(self.localOptions['srcport']) + elif self.localOptions['randomize']: + return random.randint(1024, 65535) + else: + return 80 + + self.get_sport = get_sport + self.dport = int(self.localOptions['dstport']) + + def max_ttl_and_timeout(self): + max_ttl = int(self.localOptions['maxttl']) + timeout = int(self.localOptions['timeout']) + self.report['max_ttl'] = max_ttl + self.report['timeout'] = timeout + return max_ttl, timeout + + @defer.inlineCallbacks + def test_parasitic_tcp_traceroute(self): + """ + Establishes a TCP stream and send the packets inside of such stream. + Requires the backend to respond with an ACK to our SYN packet. + """ + max_ttl, timeout = self.max_ttl_and_timeout() + + sport = self.get_sport() + dport = self.dport + ipid = int(RandShort()) + + packet = IP(dst=self.localOptions['backend'], ttl=max_ttl, + id=ipid)/TCP(sport=sport, dport=dport, + flags="S", seq=0) + + log.msg("Sending SYN towards %s" % dport) + + try: + answered, unanswered = yield self.sr(packet, timeout=timeout) + except Exception, e: + log.exception(e) + except: + log.exception() + + try: + snd, rcv = answered[0] + synack = rcv[0] + + except IndexError: + print answered, unanswered + log.err("Got no response. Try increasing max_ttl") + return + + except Exception, e: + log.exception(e) + + if synack[TCP].flags == 11: + log.msg("Got back a FIN ACK. The destination port is closed") + return + + elif synack[TCP].flags == 18: + log.msg("Got a SYN ACK. All is well.") + else: + log.err("Got an unexpected result") + + self.report['hops'] = [] + for ttl in range(1, max_ttl): + log.msg("Sending ACK with ttl %s" % ttl) + # We generate an ack for the syn-ack we got with increasing ttl + packet = IP(dst=self.localOptions['backend'], + ttl=ttl, id=ipid)/TCP(sport=synack.dport, + dport=dport, flags="A", + seq=synack.ack, ack=synack.seq + 1) + + answered, unanswered = yield self.sr(packet, timeout=timeout) + try: + snd, rcv = answered[0] + except IndexError: + log.err("Got no response.") + + try: + icmp = rcv[ICMP] + + except IndexError: + report = {'ttl': snd.ttl, + 'address': rcv.src, + 'rtt': rcv.time - snd.time + } + log.debug("%s: %s" % (dport, report)) + self.report['hops'].append(report) + if rcv.src == self.localOptions['backend']: + log.msg("Reached the destination. We have finished the traceroute") + return +

1 0

[ooni-probe/master] Avoid the sent and received reports being overwritten when calling multiple times self.sr
by art＠torproject.org 22 Nov '12

22 Nov '12

commit 9af97ffe45ffe06766877ad1342efbc7c36a48b6 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 22 15:19:53 2012 +0100 Avoid the sent and received reports being overwritten when calling multiple times self.sr --- ooni/templates/scapyt.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ooni/templates/scapyt.py b/ooni/templates/scapyt.py index 8d9ea8f..af90260 100644 --- a/ooni/templates/scapyt.py +++ b/ooni/templates/scapyt.py @@ -81,8 +81,11 @@ class BaseScapyTest(NetTestCase): """ def finished(packets): answered, unanswered = packets - self.report['answered_packets'] = [] - self.report['sent_packets'] = [] + if 'answered_packets' not in self.report: + self.report['answered_packets'] = [] + if 'sent_packets' not in self.report: + self.report['sent_packets'] = [] + for snd, rcv in answered: log.debug("Writing report for scapy test") sent_packet = snd

1 0

[ooni-probe/master] Merge branch 'parasitetraceroute'
by art＠torproject.org 22 Nov '12

22 Nov '12

commit 65117a12816a306ac263cfde760ba0f108d807a8 Merge: 104fd67 c4aa242 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 22 15:21:18 2012 +0100 Merge branch 'parasitetraceroute' * parasitetraceroute: Implement a quick and dirty parasitic TCP traceroute nettests/core/parasitictraceroute.py | 124 ++++++++++++++++++++++++++++++++++ 1 files changed, 124 insertions(+), 0 deletions(-)

1 0

[ooni-probe/master] Avoid that scapy's log function overrides the import of ooni.log
by art＠torproject.org 22 Nov '12

22 Nov '12

commit 104fd67545d559286d4823ccfd14be41378c6b4c Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 22 15:20:47 2012 +0100 Avoid that scapy's log function overrides the import of ooni.log --- nettests/core/traceroute.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/nettests/core/traceroute.py b/nettests/core/traceroute.py index bbbe14e..a6fc9f1 100644 --- a/nettests/core/traceroute.py +++ b/nettests/core/traceroute.py @@ -6,11 +6,12 @@ from twisted.python import usage from twisted.internet import defer -from ooni.utils import log from ooni.templates import scapyt from scapy.all import * +from ooni.utils import log + class UsageOptions(usage.Options): optParameters = [ ['backend', 'b', '8.8.8.8', 'Test backend to use'], @@ -48,6 +49,7 @@ class TracerouteTest(scapyt.BaseScapyTest): self.report['timeout'] = timeout return max_ttl, timeout + def test_tcp_traceroute(self): """ Does a traceroute to the destination by sending TCP SYN packets

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2012