tor-commits March 2014

tor-commits@lists.torproject.org

22 participants
2036 discussions

[metrics-tasks/master] Fix typo (#9889).
by karsten＠torproject.org 31 Mar '14

31 Mar '14

commit 789691395a9c59211c62c1c5cd8bbdb50abd69c0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Mar 26 12:42:42 2014 +0100 Fix typo (#9889). --- task-9889/tshirt.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/task-9889/tshirt.py b/task-9889/tshirt.py index afee3da..d9f5962 100755 --- a/task-9889/tshirt.py +++ b/task-9889/tshirt.py @@ -28,30 +28,30 @@ def print_debug_info(fingerprint, first_seen_check, exit_port_check, uptime_perc else: print("Average bandwidth in past 2 months : " + str(avg_bandwidth) + "KBytes/s") - print("\nElligibility") + print("\nEligibility") print("------------") if not first_seen_check: - print("Not elligible for T-shirt") + print("Not eligible for T-shirt") print("Reason : Relay first appeared in past 2 months") elif uptime_percent < 95: - print("Not elligible for T-shirt") + print("Not eligible for T-shirt") print("Reason : Insufficient relay uptime percentage") else: if exit_port_check is False: if avg_bandwidth >= 500: - print("Elligible for T-shirt") + print("Eligible for T-shirt") print("Reason : Average bandwidth greater than 500KBytes/s and " "relay uptime greater than 95%") else: - print("Not elligible for T-shirt") + print("Not eligible for T-shirt") print("Reason : Average bandwidth less than 500KBytes/s and port 80 blocked") else: if avg_bandwidth < 100: - print("Not elligible for T-shirt") + print("Not eligible for T-shirt") print("Reason : Average bandwidth less than 100KBytes/s") else: - print("Elligible for T-shirt") + print("Eligible for T-shirt") print("Reason : Average bandwidth greater than 100KBytes/s," "relay uptime greater than 95% and port 80 unblocked") print("")

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 31 Mar '14

31 Mar '14

commit 1ed08f8839f7d7234e1daa746595ff9795c38693 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 31 12:45:20 2014 +0000 Update translations for liveusb-creator --- ko/ko.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ko/ko.po b/ko/ko.po index 2e13168..337ee08 100644 --- a/ko/ko.po +++ b/ko/ko.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-17 22:01+0100\n" -"PO-Revision-Date: 2014-03-31 12:15+0000\n" +"PO-Revision-Date: 2014-03-31 12:30+0000\n" "Last-Translator: Dr.what <javrick6(a)naver.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n" @@ -69,7 +69,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">켜져 있는 모든 Tails를 미리 설치된 Tails 장치로 복사해 옮기세요. 메모리 상의 모든 파티션은 보존됩니다.</span></p></body></html>" #: ../liveusb/launcher_ui.py:164 msgid "" @@ -78,7 +78,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Upgrade an already installed Tails device from a new ISO image.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">새 ISO 이미지 파일로 미리 설치된 Tails 장치를 업그레이드 하세요.</span></p></body></html>" #: ../liveusb/dialog.py:163 msgid "Alt+B" @@ -179,7 +179,7 @@ msgstr "오류: Live CD의 SHA1이 잘못되어 있습니다. 이러한 프로 #: ../liveusb/creator.py:145 msgid "Extracting live image to the target device..." -msgstr "" +msgstr "대상 장치에 라이브 이미지를 추출 중..." #: ../liveusb/creator.py:1063 #, python-format @@ -277,7 +277,7 @@ msgstr "" #: ../liveusb/gui.py:702 ../liveusb/gui.py:731 msgid "Please confirm your device selection" -msgstr "" +msgstr "장치를 확인하시기 바랍니다." #: ../liveusb/gui.py:467 msgid "Refreshing releases..."

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 31 Mar '14

31 Mar '14

commit 6cc8846d7926012e3ea5a5b3fac7ab1e49292d75 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 31 12:15:43 2014 +0000 Update translations for liveusb-creator --- ko/ko.po | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/ko/ko.po b/ko/ko.po index f8f8c08..2e13168 100644 --- a/ko/ko.po +++ b/ko/ko.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-17 22:01+0100\n" -"PO-Revision-Date: 2014-03-27 13:00+0000\n" +"PO-Revision-Date: 2014-03-31 12:15+0000\n" "Last-Translator: Dr.what <javrick6(a)naver.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n" @@ -27,12 +27,12 @@ msgstr "%(distribution)s 설치" #: ../liveusb/gui.py:808 #, python-format msgid "%(filename)s selected" -msgstr "" +msgstr "%(filename)s 선택됨" #: ../liveusb/gui.py:439 #, python-format msgid "%(size)s %(label)s" -msgstr "" +msgstr "%(size)s %(label)s" #: ../liveusb/gui.py:445 #, python-format @@ -51,7 +51,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">도움이 필요하신가요? </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">문서</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>를 읽어보세요." #: ../liveusb/launcher_ui.py:160 msgid "" @@ -60,7 +60,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">켜져 있는 모든 Tails를 SD 카드나 USB에 복사하세요. 지정된 장치의 모든 데이터가 곧 날아갑니다.</span></p></body></html>" #: ../liveusb/launcher_ui.py:162 msgid "" @@ -333,7 +333,7 @@ msgstr "" msgid "" "The Master Boot Record on your device is blank. Pressing 'Install Tails' " "again will reset the MBR on this device." -msgstr "" +msgstr "장치의 마스터 부트 레코더가 비었습니다. 'Tails 설치' 를 다시 누르면 장치의 MBR이 다시 실행됩니다." #: ../liveusb/gui.py:796 msgid "" @@ -381,7 +381,7 @@ msgstr "" #: ../liveusb/creator.py:879 msgid "Trying to continue anyway." -msgstr "" +msgstr "어쨌든간에 계속하기." #: ../liveusb/creator.py:911 #, python-format @@ -417,7 +417,7 @@ msgstr "" #: ../liveusb/gui.py:695 msgid "Unable to mount device" -msgstr "" +msgstr "장치를 구성할 수 없습니다." #: ../liveusb/creator.py:790 #, python-format @@ -443,7 +443,7 @@ msgstr "" msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" -msgstr "" +msgstr "지정된 파일을 사용할 수 없으니 루트 디렉토리에 ISO 파일을 이동시키십시오. (예 : C:\\)" #: ../liveusb/creator.py:697 #, python-format @@ -536,7 +536,7 @@ msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " "liveusb-creator with the --reset-mbr option." -msgstr "" +msgstr "경고 : 장치의 마스터 부트 레코드가 시스템 syslinux MBR에 일치하지 않습니다. 이 스틱을 부팅하는데 문제를 안고 있는 경우,-reset-mbroption으로 liveusb-creator를 실행하십시오." #: ../liveusb/gui.py:392 msgid "" @@ -555,7 +555,7 @@ msgstr "" msgid "" "You are going to install Tails on the %(size)s %(vendor)s %(model)s device " "(%(device)s). All data on the selected device will be lost. Continue?" -msgstr "" +msgstr "%(size)s%(vendor)s%(model)s장치(%(device)s)에 Tails를 설치합니다. 선택된 장치 안의 모든 데이터가 없어집니다. 계속하시겠습니까?" #: ../liveusb/gui.py:719 #, python-format @@ -563,7 +563,7 @@ msgid "" "You are going to upgrade Tails on the %(parent_size)s %(vendor)s %(model)s " "device (%(device)s). Any persistent volume on this device will remain " "unchanged. Continue?" -msgstr "" +msgstr "%(parent_size)s %(vendor)s %(model)s 장치 (%(device)s) Tails를 업그레이드 합니다. 볼륨 안의 영구 저장 장치는 변경되지 않은 채 유지됩니다. 계속 하시겠습니까?" #: ../liveusb/creator.py:604 msgid "" @@ -577,7 +577,7 @@ msgstr "다운로드를 다시 시작할 수 있습니다 " #: ../liveusb/creator.py:92 msgid "You must run this application as root" -msgstr "" +msgstr "루트에서 이 응용프로그램을 실행해야 합니다." #: ../liveusb/dialog.py:164 msgid "or"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 31 Mar '14

31 Mar '14

commit aac4ba0c56f33d3fbc8a2e84ab87c344baa44d11 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 31 10:45:39 2014 +0000 Update translations for tails-misc_completed --- lv.po | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/lv.po b/lv.po index 8a59fcb..9d47847 100644 --- a/lv.po +++ b/lv.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-06 14:52+0100\n" -"PO-Revision-Date: 2014-03-13 09:31+0000\n" +"POT-Creation-Date: 2014-03-23 08:55+0100\n" +"PO-Revision-Date: 2014-03-31 10:30+0000\n" "Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/torproject/language/lv/)\n" "MIME-Version: 1.0\n" @@ -18,11 +18,11 @@ msgstr "" "Language: lv\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:31 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43 msgid "Tor is ready" msgstr "Tor ir sagatavots" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:32 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:44 msgid "You can now access the Internet." msgstr "Jūs tagad varat piekļūt internetam." @@ -348,6 +348,29 @@ msgid "" "following directory for more information:" msgstr "Kaut kas nogāja greizi, kad I2P startēja. Lai uzzinātu vairāk informāciju, skatieties žurnālos, kuri atrodas turpmāk norādītajā direktorijā:" +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 +msgid "error:" +msgstr "kļūda:" + +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 +msgid "Error" +msgstr "Kļūda" + +#: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:40 +msgid "" +"<b>Not enough memory available to check for upgrades.</b>\n" +"\n" +"Make sure this system satisfies the requirements for running Tails.\n" +"See file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n" +"\n" +"Try to restart Tails to check for upgrades again.\n" +"\n" +"Or do a manual upgrade.\n" +"See https://tails.boum.org/doc/first_steps/upgrade#manual" +msgstr "<b>Nav pieejams pietiekami liels atmiņas daudzums, lai pārbaudītu jauninājumu pieejamību.</b>\n\nPārbaudiet vai šī sistēma nodrošina Tails izpildes prasības.\nSkatiet datni:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nMeģiniet pārstratēt Tails, lai vēlreiz pārbaudītu jauninājumu pieejamību.\n\nVai veiciet manuālu jaunināšanu.\nSkatiet https://tails.boum.org/doc/first_steps/upgrade#manual" + #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53 msgid "Warning: virtual machine detected!" msgstr "Brīdinājums: konstatēta virtuāla mašīna!" @@ -365,14 +388,6 @@ msgid "" " more...</a>" msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>Uzziniet vairāk...</a>" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 -msgid "error:" -msgstr "kļūda:" - -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 -msgid "Error" -msgstr "Kļūda" - #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:68 msgid "Do you really want to launch the Unsafe Browser?" msgstr "Vai tiešām vēlaties palaist Nedrošu pārlūku?"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 31 Mar '14

31 Mar '14

commit 71fc12a1e49ec15895dc4bdfcf6dbac214c8cfb5 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 31 10:45:35 2014 +0000 Update translations for tails-misc --- lv.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lv.po b/lv.po index d2879a9..9d47847 100644 --- a/lv.po +++ b/lv.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-23 08:55+0100\n" -"PO-Revision-Date: 2014-03-23 08:50+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-31 10:30+0000\n" +"Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: Latvian (http://www.transifex.com/projects/p/torproject/language/lv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -369,7 +369,7 @@ msgid "" "\n" "Or do a manual upgrade.\n" "See https://tails.boum.org/doc/first_steps/upgrade#manual" -msgstr "" +msgstr "<b>Nav pieejams pietiekami liels atmiņas daudzums, lai pārbaudītu jauninājumu pieejamību.</b>\n\nPārbaudiet vai šī sistēma nodrošina Tails izpildes prasības.\nSkatiet datni:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nMeģiniet pārstratēt Tails, lai vēlreiz pārbaudītu jauninājumu pieejamību.\n\nVai veiciet manuālu jaunināšanu.\nSkatiet https://tails.boum.org/doc/first_steps/upgrade#manual" #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53 msgid "Warning: virtual machine detected!"

1 0

[ooni-probe/master] Make get_auth_nameservers use ooni.templates.DNST
by art＠torproject.org 31 Mar '14

31 Mar '14

commit 26eb9400f4fa762ddfff3c0bcbc9a717dfb20fa6 Author: Arun Pandian G <arunpandianp(a)gmail.com> Date: Fri Mar 21 04:08:25 2014 +0530 Make get_auth_nameservers use ooni.templates.DNST --- ooni/nettests/manipulation/captiveportal.py | 31 +++++++++++---------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/ooni/nettests/manipulation/captiveportal.py b/ooni/nettests/manipulation/captiveportal.py index 90b972c..6862177 100644 --- a/ooni/nettests/manipulation/captiveportal.py +++ b/ooni/nettests/manipulation/captiveportal.py @@ -39,7 +39,7 @@ from twisted.python import usage from twisted.internet import defer, threads from ooni import nettest -from ooni.templates import httpt +from ooni.templates import httpt,dnst from ooni.utils import net from ooni.utils import log @@ -60,7 +60,7 @@ class UsageOptions(usage.Options): 'User agent for HTTP requests'] ] -class CaptivePortal(httpt.HTTPTest): +class CaptivePortal(httpt.HTTPTest,dnst.DNSTest): """ Compares content and status codes of HTTP responses, and attempts to determine if content has been altered. @@ -215,7 +215,7 @@ class CaptivePortal(httpt.HTTPTest): log.msg("DNS comparison of control '%s' does not" % control_address) log.msg("match experiment response '%s'" % experiment_address) return False, experiment_address - + @defer.inlineCallbacks def get_auth_nameservers(self, hostname): """ Many CPs set a nameserver to be used. Let's query that @@ -224,17 +224,9 @@ class CaptivePortal(httpt.HTTPTest): The equivalent of: $ dig +short NS ooni.nu """ - if not resolver: - log.msg("dnspython not installed.") - log.msg("Cannot perform test.") - return [] - - res = resolver.Resolver() - answer = res.query(hostname, 'NS') - auth_nameservers = [] - for auth in answer: - auth_nameservers.append(auth.to_text()) - return auth_nameservers + auth_nameservers = yield self.performNSLookup(hostname) + print auth_nameservers + defer.returnValue(auth_nameservers) def hostname_to_0x20(self, hostname): """ @@ -253,6 +245,7 @@ class CaptivePortal(httpt.HTTPTest): hostname_0x20 += char.lower() return hostname_0x20 + @defer.inlineCallbacks def check_0x20_to_auth_ns(self, hostname, sample_size=None): """ Resolve a 0x20 DNS request for hostname over hostname's @@ -269,7 +262,7 @@ class CaptivePortal(httpt.HTTPTest): log.msg("Testing random capitalization of DNS queries...") log.msg("Testing that Start of Authority serial numbers match...") - auth_nameservers = self.get_auth_nameservers(hostname) + auth_nameservers = yield self.get_auth_nameservers(hostname) if sample_size is None: sample_size = 5 @@ -317,13 +310,13 @@ class CaptivePortal(httpt.HTTPTest): if name_match and serial_match: log.msg("Your DNS queries do not appear to be tampered.") - return ret + defer.returnValue(ret) elif name_match or serial_match: log.msg("Something is tampering with your DNS queries.") - return ret + defer.returnValue(ret) elif not name_match and not serial_match: log.msg("Your DNS queries are definitely being tampered with.") - return ret + defer.returnValue(ret) def get_random_url_safe_string(self, length): """ @@ -651,7 +644,7 @@ class CaptivePortal(httpt.HTTPTest): log.msg("") log.msg("Checking that DNS requests are not being tampered...") - self.report['check0x20'] = yield threads.deferToThread(self.check_0x20_to_auth_ns, 'ooni.nu') + self.report['check0x20'] = yield self.check_0x20_to_auth_ns('ooni.nu') log.msg("") log.msg("Captive portal test finished!")

1 0

[ooni-probe/master] Support for using system dns setting for performALookup in
by art＠torproject.org 31 Mar '14

31 Mar '14

commit d0230379077272fa8aacf3bad2bbfe01880aeaeb Author: Arun Pandian G <arunpandianp(a)gmail.com> Date: Sat Mar 22 03:52:39 2014 +0530 Support for using system dns setting for performALookup in ooni.templates.DNST --- ooni/templates/dnst.py | 69 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 21 deletions(-) diff --git a/ooni/templates/dnst.py b/ooni/templates/dnst.py index ff5afc3..66a6d17 100644 --- a/ooni/templates/dnst.py +++ b/ooni/templates/dnst.py @@ -73,7 +73,7 @@ class DNSTest(NetTestCase): d.addErrback(gotError) return d - def performALookup(self, hostname, dns_server): + def performALookup(self, hostname, dns_server = None): """ Performs an A lookup and returns an array containg all the dotted quad IP addresses in the response. @@ -82,31 +82,58 @@ class DNSTest(NetTestCase): :dns_server: is the dns_server that should be used for the lookup as a tuple of ip port (ex. ("127.0.0.1", 53)) + + if None, system dns settings will be used """ query = [dns.Query(hostname, dns.A, dns.IN)] - def gotResponse(message): - addrs = [] - answers = [] - for answer in message.answers: - if answer.type is 1: - addr = answer.payload.dottedQuad() - addrs.append(addr) - answers.append(representAnswer(answer)) + if dns_server: + def gotResponse(message): + addrs = [] + answers = [] + for answer in message.answers: + if answer.type is dns.A: + addr = answer.payload.dottedQuad() + addrs.append(addr) + answers.append(representAnswer(answer)) - DNSTest.addToReport(self, query, resolver=dns_server, query_type='A', - answers=answers, addrs=addrs) - return addrs + DNSTest.addToReport(self, query, resolver=dns_server, query_type='A', + answers=answers, addrs=addrs) + return addrs - def gotError(failure): - failure.trap(gaierror, TimeoutError) - DNSTest.addToReport(self, query, resolver=dns_server, query_type='A', - failure=failure) - return failure + def gotError(failure): + failure.trap(gaierror, TimeoutError) + DNSTest.addToReport(self, query, resolver=dns_server, query_type='A', + failure=failure) + return failure + + resolver = Resolver(servers=[dns_server]) + d = resolver.queryUDP(query, timeout=self.queryTimeout) + d.addCallback(gotResponse) + d.addErrback(gotError) + else: + def gotResponse(message): + addrs = [] + answers = [] + for answer in message[0]: + if answer.type is dns.A: + addr = answer.payload.dottedQuad() + addrs.append(addr) + answers.append(representAnswer(answer)) + + DNSTest.addToReport(self, query, resolver=dns_server, query_type='A', + answers=answers, addrs=addrs) + return addrs + + def gotError(failure): + failure.trap(gaierror, TimeoutError) + DNSTest.addToReport(self, query, resolver=dns_server, query_type='A', + failure=failure) + return failure + + d = client.lookupAddress(hostname) + d.addCallback(gotResponse) + d.addErrback(gotError) - resolver = Resolver(servers=[dns_server]) - d = resolver.queryUDP(query, timeout=self.queryTimeout) - d.addCallback(gotResponse) - d.addErrback(gotError) return d def performNSLookup(self, hostname, dns_server = None):

1 0

[ooni-probe/master] Support for performing SOA Lookup in ooni.templates.DNST
by art＠torproject.org 31 Mar '14

31 Mar '14

commit 6083688f28b65f3aeffbb73171ec0cb6790d7c45 Author: Arun Pandian G <arunpandianp(a)gmail.com> Date: Sun Mar 23 09:01:18 2014 +0530 Support for performing SOA Lookup in ooni.templates.DNST --- ooni/templates/dnst.py | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/ooni/templates/dnst.py b/ooni/templates/dnst.py index 66a6d17..38da177 100644 --- a/ooni/templates/dnst.py +++ b/ooni/templates/dnst.py @@ -197,6 +197,66 @@ class DNSTest(NetTestCase): return d + def performSOALookup(self, hostname, dns_server = None): + """ + Performs a SOA lookup and returns the response (name,serial). + + :hostname: is the hostname to perform the NS lookup on + + :dns_server: is the dns_server that should be used for the lookup as a + tuple of ip port (ex. ("127.0.0.1", 53)) + """ + query = [dns.Query(hostname, dns.SOA, dns.IN)] + if dns_server: + def gotResponse(message): + addrs = [] + answers = [] + for answer in message.answers: + if answer.type is dns.SOA: + addr = (answer.name.name,answer.payload.serial) + addrs.append(addr) + answers.append(representAnswer(answer)) + + DNSTest.addToReport(self, query, resolver=dns_server, query_type='SOA', + answers=answers, addrs=addrs) + return addrs + + def gotError(failure): + failure.trap(gaierror, TimeoutError) + DNSTest.addToReport(self, query, resolver=dns_server, query_type='SOA', + failure=failure) + return failure + + resolver = Resolver(servers=[dns_server]) + d = resolver.queryUDP(query, timeout=self.queryTimeout) + d.addCallback(gotResponse) + d.addErrback(gotError) + else: + def gotResponse(message): + addrs = [] + answers = [] + for answer in message[0]: + if answer.type is dns.SOA: + addr = (answer.name.name,answer.payload.serial) + addrs.append(addr) + answers.append(representAnswer(answer)) + + DNSTest.addToReport(self, query, resolver=dns_server, query_type='SOA', + answers=answers, addrs=addrs) + return addrs + + def gotError(failure): + failure.trap(gaierror, TimeoutError) + DNSTest.addToReport(self, query, resolver=dns_server, query_type='SOA', + failure=failure) + return failure + + d = client.lookupAuthority(hostname) + d.addCallback(gotResponse) + d.addErrback(gotError) + + return d + def addToReport(self, query, resolver=None, query_type=None, answers=None, name=None, addrs=None, failure=None): log.debug("Adding %s to report)" % query)

1 0

[ooni-probe/master] Replaced dnspython with ooni.templates.dnst for performing SOA Lookup in
by art＠torproject.org 31 Mar '14

31 Mar '14

commit e93b1aaf1b13747bfc9b1761febe36552b862196 Author: Arun Pandian G <arunpandianp(a)gmail.com> Date: Sun Mar 23 09:18:47 2014 +0530 Replaced dnspython with ooni.templates.dnst for performing SOA Lookup in Captiveportal test --- ooni/nettests/manipulation/captiveportal.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/ooni/nettests/manipulation/captiveportal.py b/ooni/nettests/manipulation/captiveportal.py index 443b2ed..afaeee8 100644 --- a/ooni/nettests/manipulation/captiveportal.py +++ b/ooni/nettests/manipulation/captiveportal.py @@ -270,16 +270,14 @@ class CaptivePortal(httpt.HTTPTest,dnst.DNSTest): hostname = self.hostname_to_0x20(hostname) for auth_ns in resolved_auth_ns: - res = resolver.Resolver(configure=False) - res.nameservers = [auth_ns] try: - answer = res.query(hostname, 'SOA') - except resolver.Timeout: + answer = yield self.performSOALookup(hostname,(auth_ns,53)) + except Exception: continue - querynames.append(answer.qname.to_text()) - answernames.append(answer.rrset.name.to_text()) + querynames.append(hostname) for soa in answer: - serials.append(str(soa.serial)) + answernames.append(soa[0]) + serials.append(str(soa[1])) if len(set(querynames).intersection(answernames)) == 1: log.msg("Capitalization in DNS queries and responses match.")

1 0

[ooni-probe/master] Replaced dnspython with ooni.templates.dnst for performing A Lookups in
by art＠torproject.org 31 Mar '14

31 Mar '14

commit b4643e05efb4c75315b0893f0a7748948caf7c45 Author: Arun Pandian G <arunpandianp(a)gmail.com> Date: Sun Mar 23 07:29:39 2014 +0530 Replaced dnspython with ooni.templates.dnst for performing A Lookups in Captiveportal test --- ooni/nettests/manipulation/captiveportal.py | 89 ++++++++++++++------------- 1 file changed, 45 insertions(+), 44 deletions(-) diff --git a/ooni/nettests/manipulation/captiveportal.py b/ooni/nettests/manipulation/captiveportal.py index 6862177..49d5b8d 100644 --- a/ooni/nettests/manipulation/captiveportal.py +++ b/ooni/nettests/manipulation/captiveportal.py @@ -35,6 +35,7 @@ import re import string from urlparse import urlparse +from twisted.names import error from twisted.python import usage from twisted.internet import defer, threads @@ -154,6 +155,7 @@ class CaptivePortal(httpt.HTTPTest,dnst.DNSTest): """ return int(experiment_code) != int(control_code) + @defer.inlineCallbacks def dns_resolve(self, hostname, nameserver=None): """ Resolves hostname(s) though nameserver to corresponding @@ -161,42 +163,29 @@ class CaptivePortal(httpt.HTTPTest,dnst.DNSTest): or a list of strings. If nameserver is not given, use local DNS resolver, and if that fails try using 8.8.8.8. """ - if not resolver: - log.msg("dnspython is not installed.\ - Cannot perform DNS Resolve test") - return [] if isinstance(hostname, str): hostname = [hostname] - if nameserver is not None: - res = resolver.Resolver(configure=False) - res.nameservers = [nameserver] - else: - res = resolver.Resolver() - response = [] answer = None - for hn in hostname: try: - answer = res.query(hn) - except resolver.NoNameservers: - res.nameservers = ['8.8.8.8'] - try: - answer = res.query(hn) - except resolver.NXDOMAIN: + answer = yield self.performALookup(hn) + if not answer: + answer = yield self.performALookup(hn, ('8.8.8.8',53)) + except error.DNSNameError: log.msg("DNS resolution for %s returned NXDOMAIN" % hn) response.append('NXDOMAIN') - except resolver.NXDOMAIN: - log.msg("DNS resolution for %s returned NXDOMAIN" % hn) - response.append('NXDOMAIN') + except Exception: + log.err("DNS Resolution failed") finally: if not answer: - return response + defer.returnValue(response) for addr in answer: - response.append(addr.address) - return response + response.append(addr) + defer.returnValue(response) + @defer.inlineCallbacks def dns_resolve_match(self, experiment_hostname, control_address): """ Resolve experiment_hostname, and check to see that it returns @@ -204,17 +193,21 @@ class CaptivePortal(httpt.HTTPTest,dnst.DNSTest): they match, returns True and experiment_address; otherwise returns False and experiment_address. """ - experiment_address = self.dns_resolve(experiment_hostname) + experiment_address = yield self.dns_resolve(experiment_hostname) if not experiment_address: log.debug("dns_resolve() for %s failed" % experiment_hostname) - return None, experiment_address + ret = None, experiment_address + defer.returnValue(ret) if len(set(experiment_address) & set([control_address])) > 0: - return True, experiment_address + ret = True, experiment_address + defer.returnValue(ret) else: log.msg("DNS comparison of control '%s' does not" % control_address) log.msg("match experiment response '%s'" % experiment_address) - return False, experiment_address + ret = False, experiment_address + defer.returnValue(ret) + @defer.inlineCallbacks def get_auth_nameservers(self, hostname): """ @@ -266,8 +259,8 @@ class CaptivePortal(httpt.HTTPTest,dnst.DNSTest): if sample_size is None: sample_size = 5 - resolved_auth_ns = random.sample(self.dns_resolve(auth_nameservers), - sample_size) + res = yield self.dns_resolve(auth_nameservers) + resolved_auth_ns = random.sample(res,sample_size) querynames = [] answernames = [] @@ -361,6 +354,7 @@ class CaptivePortal(httpt.HTTPTest,dnst.DNSTest): random_hostname = random_sld + random_tld return random_hostname + @defer.inlineCallbacks def compare_random_hostnames(self, hostname_count=None, hostname_length=None): """ Get hostname_count number of random hostnames with SLD length @@ -390,7 +384,7 @@ class CaptivePortal(httpt.HTTPTest,dnst.DNSTest): for x in range(hostname_count): random_hostname = self.get_random_hostname(hostname_length) - response_match, response_address = self.dns_resolve_match(random_hostname, + response_match, response_address = yield self.dns_resolve_match(random_hostname, control[0]) for address in response_address: if response_match is False: @@ -408,16 +402,19 @@ class CaptivePortal(httpt.HTTPTest,dnst.DNSTest): if len(intersection) == 1: log.msg("All %d random hostnames properly resolved to NXDOMAIN." % hostname_count) - return True, relative_complement + ret = True, relative_complement + defer.returnValue(ret) elif (len(intersection) == 1) and (len(r) > 1): log.msg("Something odd happened. Some random hostnames correctly") log.msg("resolved to NXDOMAIN, but several others resolved to") log.msg("to the following addresses: %s" % relative_complement) - return False, relative_complement + ret = False, relative_complement + defer.returnValue(ret) elif (len(intersection) == 0) and (len(r) == 1): log.msg("All random hostnames resolved to the IP address ") log.msg("'%s', which is indicative of a captive portal." % r) - return False, relative_complement + ret = False, relative_complement + defer.returnValue(ret) else: log.debug("Apparently, pigs are flying on your network, 'cause a") log.debug("bunch of hostnames made from 32-byte random strings") @@ -428,8 +425,10 @@ class CaptivePortal(httpt.HTTPTest,dnst.DNSTest): log.debug("it nearly twice as unlikely as an MD5 hash collision.") log.debug("Either someone is seriously messing with your network,") log.debug("or else you are witnessing the impossible. %s" % r) - return False, relative_complement + ret = False, relative_complement + defer.returnValue(ret) + @defer.inlineCallbacks def google_dns_cp_test(self): """ Google Chrome resolves three 10-byte random hostnames. @@ -437,18 +436,19 @@ class CaptivePortal(httpt.HTTPTest,dnst.DNSTest): subtest = "Google Chrome DNS-based" log.msg("Running the Google Chrome DNS-based captive portal test...") - gmatch, google_dns_result = self.compare_random_hostnames(3, 10) + gmatch, google_dns_result = yield self.compare_random_hostnames(3, 10) if gmatch: log.msg("Google Chrome DNS-based captive portal test did not") log.msg("detect a captive portal.") - return google_dns_result + defer.returnValue(google_dns_result) else: log.msg("Google Chrome DNS-based captive portal test believes") log.msg("you are in a captive portal, or else something very") log.msg("odd is happening with your DNS.") - return google_dns_result + defer.returnValue(google_dns_result) + @defer.inlineCallbacks def ms_dns_cp_test(self): """ Microsoft "phones home" to a server which will always resolve @@ -460,26 +460,27 @@ class CaptivePortal(httpt.HTTPTest,dnst.DNSTest): log.msg("Running the Microsoft NCSI DNS-based captive portal") log.msg("test...") - msmatch, ms_dns_result = self.dns_resolve_match("dns.msftncsi.com", + msmatch, ms_dns_result = yield self.dns_resolve_match("dns.msftncsi.com", "131.107.255.255") if msmatch: log.msg("Microsoft NCSI DNS-based captive portal test did not") log.msg("detect a captive portal.") - return ms_dns_result + defer.returnValue(ms_dns_result) else: log.msg("Microsoft NCSI DNS-based captive portal test ") log.msg("believes you are in a captive portal.") - return ms_dns_result + defer.returnValue(ms_dns_result) + @defer.inlineCallbacks def run_vendor_dns_tests(self): """ Run the vendor DNS tests. """ report = {} - report['google_dns_cp'] = self.google_dns_cp_test() - report['ms_dns_cp'] = self.ms_dns_cp_test() + report['google_dns_cp'] = yield self.google_dns_cp_test() + report['ms_dns_cp'] = yield self.ms_dns_cp_test() + defer.returnValue(report) - return report @defer.inlineCallbacks def run_vendor_tests(self, *a, **kw): """ @@ -640,7 +641,7 @@ class CaptivePortal(httpt.HTTPTest,dnst.DNSTest): log.msg("") log.msg("Running vendor DNS-based tests...") - self.report['vendor_dns_tests'] = yield threads.deferToThread(self.run_vendor_dns_tests) + self.report['vendor_dns_tests'] = yield self.run_vendor_dns_tests() log.msg("") log.msg("Checking that DNS requests are not being tampered...")

1 0

← Newer
1
2
3
4
5
6
7
...
204
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2014