March 2014 - tor-commits - lists.torproject.org

[metrics-tasks/master] Drop summary document fetch (#9889)
by karsten＠torproject.org 31 Mar '14

31 Mar '14

commit 0440949ce276eb29d9913cab33f9b5ca1ff612c1 Author: Sreenatha Bhatlapenumarthi <sreenatha.dev(a)gmail.com> Date: Thu Mar 20 02:51:35 2014 +0530 Drop summary document fetch (#9889) --- task-9889/tshirt.py | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/task-9889/tshirt.py b/task-9889/tshirt.py index 1262323..feba0ad 100755 --- a/task-9889/tshirt.py +++ b/task-9889/tshirt.py @@ -43,7 +43,8 @@ def print_debug_info(fingerprint, exit_port_check, uptime_percent, avg_bandwidth if exit_port_check is False: if avg_bandwidth >= 500: print("Elligible for T-shirt") - print("Reason : Average bandwidth greater than 500KBytes/s") + print("Reason : Average bandwidth greater than 500KBytes/s and " + "relay uptime greater than 95%") else: print("Not elligible for T-shirt") print("Reason : Average bandwidth less than 500KBytes/s and port 80 blocked") @@ -54,7 +55,7 @@ def print_debug_info(fingerprint, exit_port_check, uptime_percent, avg_bandwidth else: print("Elligible for T-shirt") print("Reason : Average bandwidth greater than 100KBytes/s," - "relay uptime greater than 95% and port 80 unblocked") + "relay uptime greater than 95% and port 80 unblocked") print("") @@ -155,20 +156,10 @@ def check_tshirt(search_query): global bandwidth_data global thread_lock - # Fetch matching relays from summary document + # Fetch the required documents from onionoo params = { - 'type' : 'relay', 'search' : search_query } - matched_relays = fetch_data('summary', params) - print "Fetched summary document" - fingerprints = [i['f'] for i in matched_relays['relays']] - if fingerprints == []: - print 'No results found' - exit() - - # Fetch the required documents from onionoo - params.pop('type') bandwidth_data = fetch_data('bandwidth', params)['relays'] print "Fetched bandwidth document" uptime_data = fetch_data('uptime', params)['relays'] @@ -179,7 +170,7 @@ def check_tshirt(search_query): # Create and start the threads threads = [] - for i in range(len(fingerprints)): + for i in range(len(exit_policies)): threads.append(relay_thread(i)) threads[-1].start() # Wait for the threads to finish

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] Refactored ooni.templates.dnst
by art＠torproject.org 31 Mar '14

31 Mar '14

commit 2177585daf3f930a5b6438ce1f2a46e3ad7c5ddc Author: Arun Pandian G <arunpandianp(a)gmail.com> Date: Wed Mar 26 08:00:05 2014 +0530 Refactored ooni.templates.dnst --- ooni/templates/dnst.py | 43 +++++++++++-------------------------------- 1 file changed, 11 insertions(+), 32 deletions(-) diff --git a/ooni/templates/dnst.py b/ooni/templates/dnst.py index 7f076ed..4ebc439 100644 --- a/ooni/templates/dnst.py +++ b/ooni/templates/dnst.py @@ -34,7 +34,7 @@ class DNSTest(NetTestCase): self.report['queries'] = [] - def performPTRLookup(self, address, dns_server): + def performPTRLookup(self, address, dns_server = None): """ Does a reverse DNS lookup on the input ip address @@ -42,36 +42,11 @@ 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 """ ptr = '.'.join(address.split('.')[::-1]) + '.in-addr.arpa' - query = [dns.Query(ptr, dns.PTR, dns.IN)] - def gotResponse(message): - log.debug("Lookup successful") - log.debug(message) - answers = [] - name = '' - for answer in message.answers: - if answer.type is 12: - name = str(answer.payload.name) - answers.append(representAnswer(answer)) - - DNSTest.addToReport(self, query, resolver=dns_server, - query_type = 'PTR', answers=answers, name=name) - return name - - def gotError(failure): - log.err("Failed to perform lookup") - log.exception(failure) - failure.trap(gaierror, TimeoutError) - DNSTest.addToReport(self, query, resolver=dns_server, - query_type = 'PTR', failure=failure) - return None - - resolver = Resolver(servers=[dns_server]) - d = resolver.queryUDP(query, timeout=self.queryTimeout) - d.addCallback(gotResponse) - d.addErrback(gotError) - return d + return self.dnsLookup(ptr, 'PTR', dns_server) def performALookup(self, hostname, dns_server = None): """ @@ -122,10 +97,12 @@ 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)) """ - types={'NS':dns.NS,'A':dns.A,'SOA':dns.SOA} + types={'NS':dns.NS,'A':dns.A,'SOA':dns.SOA,'PTR':dns.PTR} dnsType=types[dns_type] query = [dns.Query(hostname, dnsType, dns.IN)] def gotResponse(message): + log.debug(dns_type+" Lookup successful") + log.debug(message) addrs = [] answers = [] if dns_server: @@ -136,7 +113,7 @@ class DNSTest(NetTestCase): if answer.type is dnsType: if dnsType is dns.SOA: addr = (answer.name.name,answer.payload.serial) - elif dnsType is dns.NS: + elif dnsType in [dns.NS,dns.PTR]: addr = answer.payload.name.name elif dnsType is dns.A: addr = answer.payload.dottedQuad() @@ -150,6 +127,8 @@ class DNSTest(NetTestCase): return addrs def gotError(failure): + log.err("Failed to perform "+dns_type+" lookup") + log.exception(failure) failure.trap(gaierror, TimeoutError) DNSTest.addToReport(self, query, resolver=dns_server, query_type=dns_type, failure=failure) @@ -159,7 +138,7 @@ class DNSTest(NetTestCase): resolver = Resolver(servers=[dns_server]) d = resolver.queryUDP(query, timeout=self.queryTimeout) else: - lookupFunction={'NS':client.lookupNameservers, 'SOA':client.lookupAuthority, 'A':client.lookupAddress} + lookupFunction={'NS':client.lookupNameservers, 'SOA':client.lookupAuthority, 'A':client.lookupAddress, 'PTR':client.lookupPointer} d = lookupFunction[dns_type](hostname) d.addCallback(gotResponse)

1 0

[ooni-probe/master] Override some of the twisted.names methods to disable logging.
by art＠torproject.org 31 Mar '14

31 Mar '14

commit 2e2bd541d76983bf14d22e3da632e5591292de39 Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Mar 31 11:30:59 2014 +0200 Override some of the twisted.names methods to disable logging. --- ooni/templates/dnst.py | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/ooni/templates/dnst.py b/ooni/templates/dnst.py index 4ebc439..70c9c8e 100644 --- a/ooni/templates/dnst.py +++ b/ooni/templates/dnst.py @@ -3,7 +3,7 @@ # :authors: Arturo Filastò # :licence: see LICENSE -from twisted.internet import defer +from twisted.internet import defer, udp, error, base from twisted.internet.defer import TimeoutError from twisted.names import client, dns from twisted.names.client import Resolver @@ -14,8 +14,50 @@ from ooni.utils import log from ooni.nettest import NetTestCase from ooni.errors import failureToString +import socket from socket import gaierror +dns.DNSDatagramProtocol.noisy = False + +def _bindSocket(self): + """ + _bindSocket taken from Twisted 13.1.0 to suppress logging. + """ + try: + skt = self.createInternetSocket() + skt.bind((self.interface, self.port)) + except socket.error as le: + raise error.CannotListenError(self.interface, self.port, le) + + # Make sure that if we listened on port 0, we update that to + # reflect what the OS actually assigned us. + self._realPortNumber = skt.getsockname()[1] + + # Here we remove the logging. + # log.msg("%s starting on %s" % ( + # self._getLogPrefix(self.protocol), self._realPortNumber)) + + self.connected = 1 + self.socket = skt + self.fileno = self.socket.fileno +udp.Port._bindSocket = _bindSocket + +def connectionLost(self, reason=None): + """ + Taken from Twisted 13.1.0 to suppress log.msg printing. + """ + # Here we remove the logging. + # log.msg('(UDP Port %s Closed)' % self._realPortNumber) + self._realPortNumber = None + base.BasePort.connectionLost(self, reason) + self.protocol.doStop() + self.socket.close() + del self.socket + del self.fileno + if hasattr(self, "d"): + self.d.callback(None) + del self.d +udp.Port.connectionLost = connectionLost def representAnswer(answer): # We store the resource record and the answer payload in a @@ -127,8 +169,6 @@ class DNSTest(NetTestCase): return addrs def gotError(failure): - log.err("Failed to perform "+dns_type+" lookup") - log.exception(failure) failure.trap(gaierror, TimeoutError) DNSTest.addToReport(self, query, resolver=dns_server, query_type=dns_type, failure=failure)

1 0

[ooni-probe/master] Dependency dnspython removed
by art＠torproject.org 31 Mar '14

31 Mar '14

commit a4b2792f94094e3780a06395a8b789aef149bfcc Author: Arun Pandian G <arunpandianp(a)gmail.com> Date: Wed Mar 26 07:16:01 2014 +0530 Dependency dnspython removed --- debian/control | 1 - requirements.txt | 1 - setup-dependencies.sh | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/debian/control b/debian/control index ba7281b..9bdf641 100644 --- a/debian/control +++ b/debian/control @@ -29,7 +29,6 @@ Depends: ${misc:Depends}, ${python:Depends}, tcpdump, tor, python-all (>= 2.6.6-3~), - python-dnspython, python-dumbnet, python-geoip (>= 0.2.5), python-ipaddr (>= 2.1.10), diff --git a/requirements.txt b/requirements.txt index 53709ba..3fb0142 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,5 @@ geoip txtorcon>=0.7 txsocksx>=0.0.2 parsley>=1.1 -dnspython>=1.10.0 scapy-real>=2.2.0-dev pypcap>=1.1 diff --git a/setup-dependencies.sh b/setup-dependencies.sh index a6867c7..2aac715 100755 --- a/setup-dependencies.sh +++ b/setup-dependencies.sh @@ -896,7 +896,7 @@ case $DISTRO_VERSION in echo "[+] Updating OS package list..."; sudo sudo apt-get update 2>&1 > /dev/null; echo "[+] Installing packages for your system..."; - DO "sudo apt-get -y install curl git-core python python-dev python-setuptools build-essential libdumbnet1 python-dumbnet python-libpcap python-dnspython tor tor-geoipdb libgeoip-dev libpcap0.8-dev" "0" + DO "sudo apt-get -y install curl git-core python python-dev python-setuptools build-essential libdumbnet1 python-dumbnet python-libpcap tor tor-geoipdb libgeoip-dev libpcap0.8-dev" "0" if [ "$PRIV_MODE" -eq "0" ]; then echo "[+] Using virtualenvironment..."

1 0

[ooni-probe/master] Removed unnecessary import
by art＠torproject.org 31 Mar '14

31 Mar '14

commit 86318636124cefb9c133018bfc6ed79d4d9ff07d Author: Arun Pandian G <arunpandianp(a)gmail.com> Date: Sun Mar 23 09:20:53 2014 +0530 Removed unnecessary import --- ooni/nettests/manipulation/captiveportal.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ooni/nettests/manipulation/captiveportal.py b/ooni/nettests/manipulation/captiveportal.py index afaeee8..717bb10 100644 --- a/ooni/nettests/manipulation/captiveportal.py +++ b/ooni/nettests/manipulation/captiveportal.py @@ -44,13 +44,6 @@ from ooni.templates import httpt,dnst from ooni.utils import net from ooni.utils import log -try: - from dns import resolver -except ImportError: - print "The dnspython module was not found:" - print "See https://crate.io/packages/dnspython/" - resolver = None - __plugoo__ = "captiveportal" __desc__ = "Captive portal detection test"

1 0

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

31 Mar '14

commit 68e777d4a3c374a842f7cd149129361620c74e5c Author: Arun Pandian G <arunpandianp(a)gmail.com> Date: Wed Mar 26 01:30:00 2014 +0530 Refactoring ooni.templates.DNST --- ooni/templates/dnst.py | 190 +++++++++++++----------------------------------- 1 file changed, 50 insertions(+), 140 deletions(-) diff --git a/ooni/templates/dnst.py b/ooni/templates/dnst.py index 38da177..7f076ed 100644 --- a/ooni/templates/dnst.py +++ b/ooni/templates/dnst.py @@ -85,56 +85,7 @@ class DNSTest(NetTestCase): if None, system dns settings will be used """ - query = [dns.Query(hostname, dns.A, dns.IN)] - 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 - - 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) - - return d + return self.dnsLookup(hostname, 'A', dns_server) def performNSLookup(self, hostname, dns_server = None): """ @@ -145,118 +96,77 @@ 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)) - """ - query = [dns.Query(hostname, dns.NS, dns.IN)] - if dns_server: - def gotResponse(message): - addrs = [] - answers = [] - for answer in message.answers: - if answer.type is dns.NS: - addr = answer.payload.name.name - addrs.append(addr) - answers.append(representAnswer(answer)) - - DNSTest.addToReport(self, query, resolver=dns_server, query_type='NS', - answers=answers, addrs=addrs) - return addrs - - def gotError(failure): - failure.trap(gaierror, TimeoutError) - DNSTest.addToReport(self, query, resolver=dns_server, query_type='NS', - 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.NS: - addr = answer.payload.name.name - addrs.append(addr) - answers.append(representAnswer(answer)) - - DNSTest.addToReport(self, query, resolver=dns_server, query_type='NS', - answers=answers, addrs=addrs) - return addrs - def gotError(failure): - failure.trap(gaierror, TimeoutError) - DNSTest.addToReport(self, query, resolver=dns_server, query_type='NS', - failure=failure) - return failure - - d = client.lookupNameservers(hostname) - d.addCallback(gotResponse) - d.addErrback(gotError) - - return d + if None, system dns settings will be used + """ + return self.dnsLookup(hostname, 'NS', dns_server) 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 + :hostname: is the hostname to perform the SOA 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)) + + if None, system dns settings will be used + """ + return self.dnsLookup(hostname,'SOA',dns_server) + def dnsLookup(self, hostname, dns_type, dns_server = None): + """ + Performs a DNS lookup and returns the response. + + :hostname: is the hostname to perform the DNS lookup on + :dns_type: type of lookup 'NS'/'A'/'SOA' :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: + types={'NS':dns.NS,'A':dns.A,'SOA':dns.SOA} + dnsType=types[dns_type] + query = [dns.Query(hostname, dnsType, dns.IN)] + def gotResponse(message): + addrs = [] + answers = [] + if dns_server: + msg = message.answers + else: + msg = message[0] + for answer in msg: + if answer.type is dnsType: + if dnsType is dns.SOA: addr = (answer.name.name,answer.payload.serial) - addrs.append(addr) - answers.append(representAnswer(answer)) + elif dnsType is dns.NS: + addr = answer.payload.name.name + elif dnsType is dns.A: + addr = answer.payload.dottedQuad() + else: + addr = None + addrs.append(addr) + answers.append(representAnswer(answer)) - DNSTest.addToReport(self, query, resolver=dns_server, query_type='SOA', + DNSTest.addToReport(self, query, resolver=dns_server, query_type=dns_type, answers=answers, addrs=addrs) - return addrs + return addrs - def gotError(failure): - failure.trap(gaierror, TimeoutError) - DNSTest.addToReport(self, query, resolver=dns_server, query_type='SOA', + def gotError(failure): + failure.trap(gaierror, TimeoutError) + DNSTest.addToReport(self, query, resolver=dns_server, query_type=dns_type, failure=failure) - return failure + return failure + if dns_server: 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) + lookupFunction={'NS':client.lookupNameservers, 'SOA':client.lookupAuthority, 'A':client.lookupAddress} + d = lookupFunction[dns_type](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