November 2012 - tor-commits - lists.torproject.org

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 15 Nov '12

15 Nov '12

commit 29fad6eb0ffc63834f4e020fb0f6978b78ddbebf Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 15 15:45:19 2012 +0000 Update translations for vidalia_alpha --- lv/vidalia_lv.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lv/vidalia_lv.po b/lv/vidalia_lv.po index 18109d6..e273c0b 100644 --- a/lv/vidalia_lv.po +++ b/lv/vidalia_lv.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-15 15:02+0000\n" +"PO-Revision-Date: 2012-11-15 15:17+0000\n" "Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -2744,7 +2744,7 @@ msgstr "pieņemt" msgctxt "Policy" msgid "reject" -msgstr "noradīt" +msgstr "noraidīt" msgctxt "QDialogButtonBox" msgid "OK" @@ -2778,7 +2778,7 @@ msgstr "Vidalia'i neizdevās saglabāt iespējas torrc datnē." msgctxt "RouterDescriptor" msgid "Online" -msgstr "Tiešsaite" +msgstr "Tiešsaiste" msgctxt "RouterDescriptor" msgid "Hibernating"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 15 Nov '12

15 Nov '12

commit a238b852d98b4a9f43bc475831a50ffc143bf7cb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 15 15:45:14 2012 +0000 Update translations for vidalia --- lv/vidalia_lv.po | 52 ++++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lv/vidalia_lv.po b/lv/vidalia_lv.po index 18bc6c0..881a418 100644 --- a/lv/vidalia_lv.po +++ b/lv/vidalia_lv.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-11-15 15:14+0000\n" +"PO-Revision-Date: 2012-11-15 15:44+0000\n" "Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -2657,11 +2657,11 @@ msgctxt "NetworkPage" msgid "" "No new bridges are currently available. You can either wait a while and try " "again, or try another method of finding new bridges." -msgstr "" +msgstr "Šobrīd jauni tilti nav pieejami. Jūs varat vai nu nedaudz pagaidīt, vai arī mēģināt citu jaunu tiltu atrašanas metodi." msgctxt "NetworkPage" msgid "Click Help to see other methods of finding new bridges." -msgstr "" +msgstr "Noklikšķiniet Palīdzība, lai redzētu citas jaunu tiltu atrašanas metodes." msgctxt "NetworkPage" msgid "Address:" @@ -2693,31 +2693,31 @@ msgstr "" msgctxt "Policy" msgid "accept" -msgstr "" +msgstr "pieņemt" msgctxt "Policy" msgid "reject" -msgstr "" +msgstr "noraidīt" msgctxt "RouterDescriptor" msgid "Online" -msgstr "" +msgstr "Tiešsaiste" msgctxt "RouterDescriptor" msgid "Hibernating" -msgstr "" +msgstr "Miega režīmā" msgctxt "RouterDescriptor" msgid "Offline" -msgstr "" +msgstr "Bezsaiste" msgctxt "RouterDescriptorView" msgid "Location:" -msgstr "" +msgstr "Atrašanās vieta:" msgctxt "RouterDescriptorView" msgid "IP Address:" -msgstr "" +msgstr "Atrašanās vieta:" msgctxt "RouterDescriptorView" msgid "Platform:" @@ -2927,69 +2927,69 @@ msgstr "" msgctxt "ServerPage" msgid "Cable/DSL 512 Kbps" -msgstr "" +msgstr "Kabelis/DSL 512 kbps" msgctxt "ServerPage" msgid "Cable/DSL 768 Kbps" -msgstr "" +msgstr "Kabelis/DSL 768 kbps" msgctxt "ServerPage" msgid "T1/Cable/DSL 1.5 Mbps" -msgstr "" +msgstr "T1/Kabelis/DSL 1,5 Mbps" msgctxt "ServerPage" msgid "> 1.5 Mbps" -msgstr "" +msgstr "> 1.5 Mbps" msgctxt "ServerPage" msgid "Custom" -msgstr "" +msgstr "Pielāgots" msgctxt "ServerPage" msgid "Select the entry that most closely resembles your Internet connection" -msgstr "" +msgstr "Izvēlieties ierakstu, kurš vislabāk raksturo Jūsu interneta savienojuma ātrumu" msgctxt "ServerPage" msgid "Show help topic on bandwidth rate limits" -msgstr "" +msgstr "Parādīt palīdzības tematu par pārraides joslas platumu robežām" msgctxt "ServerPage" msgid "Average Rate" -msgstr "" +msgstr "Datu pārraides vidējais ātrums" msgctxt "ServerPage" msgid "Long-term average bandwidth limit" -msgstr "" +msgstr "Joslas platuma vidējā ilgtermiņa robeža" msgctxt "ServerPage" msgid "KB/s" -msgstr "" +msgstr "KB/s" msgctxt "ServerPage" msgid "Maximum Rate" -msgstr "" +msgstr "Datu pārraides maksimālais ātrums" msgctxt "ServerPage" msgid "Peak bandwidth rate limit" -msgstr "" +msgstr "Joslas platuma maksimālās robežas" msgctxt "ServerPage" msgid "" "Your maximum bandwidth rate must be greater than or equal to your average " "bandwidth rate. Both values must be at least 20 KB/s." -msgstr "" +msgstr "Jūsu joslas platuma maksimālajām robežām jābūt lielākām vai vienādām par Jūsu datu pārraides vidējo ātrumu. Abiem lielumiem ir jābūt vismaz 20 kb/s lieliem." msgctxt "ServerPage" msgid "Bandwidth Limits" -msgstr "" +msgstr "Joslas platuma robežas" msgctxt "ServerPage" msgid "Ports 6660 - 6669 and 6697" -msgstr "" +msgstr "6660. - 6669. un 6697. porti" msgctxt "ServerPage" msgid "Internet Relay Chat (IRC)" -msgstr "" +msgstr "Tērzēšanas retrlanslēšana internetā (IRC)" msgctxt "ServerPage" msgid "Ports 110, 143, 993 and 995"

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 15 Nov '12

15 Nov '12

commit 2b5df4700c418bf471b30ed0e9325a33fcd65db9 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 15 15:15:25 2012 +0000 Update translations for vidalia_alpha_completed --- lv/vidalia_lv.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lv/vidalia_lv.po b/lv/vidalia_lv.po index a82778d..18109d6 100644 --- a/lv/vidalia_lv.po +++ b/lv/vidalia_lv.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-11 23:45+0000\n" +"PO-Revision-Date: 2012-11-15 15:02+0000\n" "Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -2416,11 +2416,11 @@ msgstr "Palīdzība" msgctxt "NetViewer" msgid "Show the network map help" -msgstr "Rādīt šī tīkla kartes palīdzību" +msgstr "Radīt palīdzības tematu par šī tīkla karti" msgctxt "NetViewer" msgid "Show network map help" -msgstr "Rādīt tīkla kartes palīdzību" +msgstr "Rādīt palīdzības tematu par tīkla karti" msgctxt "NetViewer" msgid "F1"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 15 Nov '12

15 Nov '12

commit 576c4a862f5b0bdbb6031c673d23ad303e1f1acc Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 15 15:15:22 2012 +0000 Update translations for vidalia_alpha --- lv/vidalia_lv.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lv/vidalia_lv.po b/lv/vidalia_lv.po index a82778d..18109d6 100644 --- a/lv/vidalia_lv.po +++ b/lv/vidalia_lv.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-11 23:45+0000\n" +"PO-Revision-Date: 2012-11-15 15:02+0000\n" "Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -2416,11 +2416,11 @@ msgstr "Palīdzība" msgctxt "NetViewer" msgid "Show the network map help" -msgstr "Rādīt šī tīkla kartes palīdzību" +msgstr "Radīt palīdzības tematu par šī tīkla karti" msgctxt "NetViewer" msgid "Show network map help" -msgstr "Rādīt tīkla kartes palīdzību" +msgstr "Rādīt palīdzības tematu par tīkla karti" msgctxt "NetViewer" msgid "F1"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 15 Nov '12

15 Nov '12

commit 0390066071d64f4ce050f733baca7a7218178543 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 15 15:15:16 2012 +0000 Update translations for vidalia --- lv/vidalia_lv.po | 84 +++++++++++++++++++++++++++--------------------------- 1 files changed, 42 insertions(+), 42 deletions(-) diff --git a/lv/vidalia_lv.po b/lv/vidalia_lv.po index edef03d..18bc6c0 100644 --- a/lv/vidalia_lv.po +++ b/lv/vidalia_lv.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-11-11 23:49+0000\n" +"PO-Revision-Date: 2012-11-15 15:14+0000\n" "Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -2412,13 +2412,13 @@ msgctxt "MessageLog" msgid "" "Messages that appear when something has \n" "gone very wrong and Tor cannot proceed." -msgstr "" +msgstr "Ziņojumi, kuri tiek parādīti, kas kaut ir sagājis \ntiešām greizi, un Tor nevar turpināt darbu." msgctxt "MessageLog" msgid "" "Messages that only appear when \n" "something has gone wrong with Tor." -msgstr "" +msgstr "Ziņojumi, kuri tiek parādīti vienīgi tad \nkad kaut kas Tor'am ir misējies." msgctxt "MessageLog" msgid "" @@ -2426,170 +2426,170 @@ msgid "" "during normal Tor operation and are \n" "not considered errors, but you may \n" "care about." -msgstr "" +msgstr "Ziņojumi, kuri tiek parādīti salīdzinoši reti \nparastas Tor'a darbības laikā, un netiek \nuzskatīti par tādiem, kas ir saisti ar kļūdām, tomēr \nJūs varētu vēlēties tiem pievērst uzmanību." msgctxt "MessageLog" msgid "" "Messages that appear frequently \n" "during normal Tor operation." -msgstr "" +msgstr "Ziņojumi, kuri parādās bieži, \nparastas Tor'a darbības laikā." msgctxt "MessageLog" msgid "" "Hyper-verbose messages primarily of \n" "interest to Tor developers." -msgstr "" +msgstr "Ziņojumi ar plašu izteiksmi jeb tādi, kuri galvenokārt \ninteresē Tor izstrādātājus." msgctxt "MessageLog" msgid "" "Cannot write file %1\n" "\n" "%2." -msgstr "" +msgstr "Nevar rakstīt datni %1\n\n%2." msgctxt "NetViewer" msgid "Tor Network Map" -msgstr "" +msgstr "Tīkla Tor karte" msgctxt "NetViewer" msgid "Refresh" -msgstr "" +msgstr "Atsvaidzināt" msgctxt "NetViewer" msgid "Refresh the list of Tor relays and connections" -msgstr "" +msgstr "Atsvaidzināt Tor'a retranslatoru un savienojumu sarakstu" msgctxt "NetViewer" msgid "Ctrl+R" -msgstr "" +msgstr "Ctrl+R" msgctxt "NetViewer" msgid "Help" -msgstr "" +msgstr "Palīdzība" msgctxt "NetViewer" msgid "Show the network map help" -msgstr "" +msgstr "Radīt palīdzības tematu par šī tīkla karti" msgctxt "NetViewer" msgid "Show network map help" -msgstr "" +msgstr "Radīt palīdzības tematu par tīkla karti" msgctxt "NetViewer" msgid "F1" -msgstr "" +msgstr "F1" msgctxt "NetViewer" msgid "Close" -msgstr "" +msgstr "Aizvērt" msgctxt "NetViewer" msgid "Close the network map" -msgstr "" +msgstr "Aizvērt tīkla karti" msgctxt "NetViewer" msgid "Esc" -msgstr "" +msgstr "Esc" msgctxt "NetViewer" msgid "Zoom In" -msgstr "" +msgstr "Tuvināt" msgctxt "NetViewer" msgid "Zoom in on the network map" -msgstr "" +msgstr "Tuvināt tīkla karti" msgctxt "NetViewer" msgid "+" -msgstr "" +msgstr "+" msgctxt "NetViewer" msgid "Zoom Out" -msgstr "" +msgstr "Tālināt" msgctxt "NetViewer" msgid "Zoom out on the network map" -msgstr "" +msgstr "Tālināt tīkla karti" msgctxt "NetViewer" msgid "-" -msgstr "" +msgstr "-" msgctxt "NetViewer" msgid "Zoom To Fit" -msgstr "" +msgstr "Tālummainīt, lai ietilpinātu" msgctxt "NetViewer" msgid "Zooms to fit all currently displayed circuits" -msgstr "" +msgstr "Tālummaina visus pašreiz rādītos maršrutus, lai ietilpinātu" msgctxt "NetViewer" msgid "Ctrl+Z" -msgstr "" +msgstr "Ctrl+Z" msgctxt "NetViewer" msgid "Relay Not Found" -msgstr "" +msgstr "Retranslators netika atrasts" msgctxt "NetViewer" msgid "No details on the selected relay are available." -msgstr "" +msgstr "Par izvēlēto retranslatoru nav pieejama detalizēta informācija." msgctxt "NetViewer" msgid "Unknown" -msgstr "" +msgstr "Nezināms" msgctxt "NetViewer" msgid "Full Screen" -msgstr "" +msgstr "Pilnekrāna režīms" msgctxt "NetViewer" msgid "View the network map as a full screen window" -msgstr "" +msgstr "Skatīt tīkla karti kā pilnekrāna logu" msgctxt "NetViewer" msgid "Ctrl+F" -msgstr "" +msgstr "Ctrl+F" msgctxt "NetworkPage" msgid "Copy (Ctrl+C)" -msgstr "" +msgstr "Kopēt (Ctrl+C)" msgctxt "NetworkPage" msgid "" "You must specify both an IP address or hostname and a port number to " "configure Tor to use a proxy to access the Internet." -msgstr "" +msgstr "Lai konfigurētu Tor'u tā, ka tas interneta piekļuvei lietotu starpnieku, ir jānorāda gan IP adrese vai viesotāja nosaukums, gan porta numurs. " msgctxt "NetworkPage" msgid "" "You must specify one or more ports to which your firewall allows you to " "connect." -msgstr "" +msgstr "Jums jānorāda viens vai vairāki porti, caur kuriem Jūsu ugunsmūris ļauj veidot savienojumus. " msgctxt "NetworkPage" msgid "'%1' is not a valid port number." -msgstr "" +msgstr "'%1' nav derīgs porta numurs." msgctxt "NetworkPage" msgid "Check if your local network requires a proxy to access the Internet" -msgstr "" +msgstr "Atzīmēt, ja vietējam tīklam ir vajadzīgs starpnieks, lai piekļūtu internetam" msgctxt "NetworkPage" msgid "I use a proxy to access the Internet" -msgstr "" +msgstr "Lai piekļūtu internetam es lietoju starpnieku" msgctxt "NetworkPage" msgid "Proxy Settings" -msgstr "" +msgstr "Starpnieka iestatījumi" msgctxt "NetworkPage" msgid "Username:" -msgstr "" +msgstr "Lietotājvārds:" msgctxt "NetworkPage" msgid "Password:" -msgstr "" +msgstr "Parole:" msgctxt "NetworkPage" msgid "Port:"

1 0

[ooni-probe/master] Fix running of http_keyword_filtering test in before_i_commit script
by art＠torproject.org 15 Nov '12

15 Nov '12

commit 82f72cf1ecf50021fdb347ec18b30d40c363c050 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 15 11:38:46 2012 +0100 Fix running of http_keyword_filtering test in before_i_commit script --- before_i_commit.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/before_i_commit.sh b/before_i_commit.sh index f76672a..06af677 100755 --- a/before_i_commit.sh +++ b/before_i_commit.sh @@ -22,7 +22,7 @@ find . -type f -name "*.py[co]" -delete ./bin/ooniprobe -l before_i_commit.log -o http_host.yamloo nettests/core/http_host.py -b http://ooni.nu/test -f test_inputs/http_host_file.txt -./bin/ooniprobe -l before_i_commit.log -o http_keyword_filtering.yamloo nettests/core/http_keyword_filtering.py -b http://ooni.nu/test/ -f test_inputs/http_keyword_filtering_file.txt +./bin/ooniprobe -l before_i_commit.log -o http_keyword_filtering.yamloo nettests/core/http_keyword_filtering.py -b http://ooni.nu/test/ -f test_inputs/keyword_filtering_file.txt ./bin/ooniprobe -l before_i_commit.log -o url_lists.yamloo nettests/core/url_list.py -f test_inputs/url_lists_file.txt

1 0

[ooni-probe/master] Clean up inputProcessor hook
by art＠torproject.org 15 Nov '12

15 Nov '12

commit e35b39d35e9f2a6144090d936a093c550d7b67d6 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 15 11:37:25 2012 +0100 Clean up inputProcessor hook * Fixes a bug noticed by isis --- ooni/nettest.py | 25 +++++++++---------------- ooni/runner.py | 2 +- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index fbc5c42..a2f98c4 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -115,7 +115,7 @@ class NetTestCase(object): """ pass - def inputProcessor(self, filename): + def inputProcessor(self, filename=None): """ You may replace this with your own custom input processor. It takes as input a file descriptor so remember to close it when you are done. @@ -137,10 +137,13 @@ class NetTestCase(object): Other fun stuff is also possible. """ log.debug("Running default input processor") - fp = open(filename) - for x in fp.xreadlines(): - yield x.strip() - fp.close() + if filename: + fp = open(filename) + for x in fp.xreadlines(): + yield x.strip() + fp.close() + else: + pass def _checkRequiredOptions(self): for required_option in self.requiredOptions: @@ -150,17 +153,7 @@ class NetTestCase(object): def _processOptions(self, options=None): if self.inputFile: - try: - assert isinstance(self.inputFile, str) - except AssertionError, ae: - log.err(ae) - else: - if os.path.isfile(self.inputFile): - self.inputs = self.inputProcessor(self.inputFile) - elif not self.inputs[0]: - pass - elif self.inputFile: - raise usage.UsageError("No input file specified!") + self.inputs = self.inputProcessor(self.inputFile) self._checkRequiredOptions() diff --git a/ooni/runner.py b/ooni/runner.py index 2b9089a..f7fa5dc 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -159,7 +159,7 @@ def runTestWithInput(test_class, test_method, test_input, oreporter): return oreporter.testDone(test_instance, test_name) def test_error(error, test_instance, test_name): - log.err("%s\n" % error) + log.exception(error) test_instance = test_class() test_instance.input = test_input

1 0

[ooni-probe/master] Remove old traceroute implementation
by art＠torproject.org 15 Nov '12

15 Nov '12

commit 4242d2a9642ecd68727898cf2b71b93d84d9a40f Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Nov 12 23:17:41 2012 +0100 Remove old traceroute implementation * Add whatheaders download to Makefile * Add script to be run in before_i_commit --- before_i_commit.sh | 2 +- inputs/Makefile | 8 +++ to-be-ported/very-old/traceroute.py | 108 ----------------------------------- 3 files changed, 9 insertions(+), 109 deletions(-) diff --git a/before_i_commit.sh b/before_i_commit.sh index 4a37686..f76672a 100755 --- a/before_i_commit.sh +++ b/before_i_commit.sh @@ -18,7 +18,7 @@ find . -type f -name "*.py[co]" -delete ./bin/ooniprobe -l before_i_commit.log -o dns_tamper_test.yamloo nettests/core/dnstamper.py -t test_inputs/dns_tamper_test_resolvers.txt -f test_inputs/dns_tamper_file.txt -#./bin/ooniprobe -l before_i_commit.log -o captive_portal_test.yamloo nettests/core/captiveportal.py +./bin/ooniprobe -l before_i_commit.log -o captive_portal_test.yamloo nettests/core/captiveportal.py ./bin/ooniprobe -l before_i_commit.log -o http_host.yamloo nettests/core/http_host.py -b http://ooni.nu/test -f test_inputs/http_host_file.txt diff --git a/inputs/Makefile b/inputs/Makefile index c70ce59..42ae1f6 100644 --- a/inputs/Makefile +++ b/inputs/Makefile @@ -1,3 +1,11 @@ # This file will fetch a set of inputs that are of use to ooni-probe +all: whatheaders lists + lists: git clone https://github.com/hellais/ooni-inputs.git ooni-inputs + +whatheaders: + wget http://s3.amazonaws.com/data.whatheaders.com/whatheaders-latest.xml.zip + unzip whatheaders-latest.xml.zip + mv whatheaders*.xml whatheaders.xml + rm whatheaders-latest.xml.zip diff --git a/to-be-ported/very-old/traceroute.py b/to-be-ported/very-old/traceroute.py deleted file mode 100644 index e8252c1..0000000 --- a/to-be-ported/very-old/traceroute.py +++ /dev/null @@ -1,108 +0,0 @@ -try: - from dns import resolver -except: - print "Error: dnspython is not installed (http://www.dnspython.org/)" -import gevent -import os -import plugoo - -try: - import scapy -except: - print "Error: traceroute plugin requires scapy to be installed (http://www.secdev.org/projects/scapy)" - -from plugoo.assets import Asset -from plugoo.tests import Test - -import socket - -__plugoo__ = "Traceroute" -__desc__ = "Performs TTL walking tests" - -class TracerouteAsset(Asset): - def __init__(self, file=None): - self = Asset.__init__(self, file) - - -class Traceroute(Test): - """A *very* quick and dirty traceroute implementation, UDP and TCP - """ - def traceroute(self, dst, dst_port=3880, src_port=3000, proto="tcp", max_hops=30): - dest_addr = socket.gethostbyname(dst) - print "Doing traceroute on %s" % dst - - recv = socket.getprotobyname('icmp') - send = socket.getprotobyname(proto) - ttl = 1 - while True: - recv_sock = socket.socket(socket.AF_INET, socket.SOCK_RAW, recv) - if proto == "tcp": - send_sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, send) - else: - send_sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, send) - recv_sock.settimeout(10) - send_sock.settimeout(10) - - send_sock.setsockopt(socket.SOL_IP, socket.IP_TTL, ttl) - recv_sock.bind(("", src_port)) - if proto == "tcp": - try: - send_sock.settimeout(2) - send_sock.connect((dst, dst_port)) - except socket.timeout: - pass - - except Exception, e: - print "Error doing connect %s" % e - else: - send_sock.sendto("", (dst, dst_port)) - - curr_addr = None - try: - print "receiving data..." - _, curr_addr = recv_sock.recvfrom(512) - curr_addr = curr_addr[0] - - except socket.error, e: - print "SOCKET ERROR: %s" % e - - except Exception, e: - print "ERROR: %s" % e - - finally: - send_sock.close() - recv_sock.close() - - if curr_addr is not None: - curr_host = "%s" % curr_addr - else: - curr_host = "*" - - print "%d\t%s" % (ttl, curr_host) - - if curr_addr == dest_addr or ttl > max_hops: - break - - ttl += 1 - - - def experiment(self, *a, **kw): - # this is just a dirty hack - address = kw['data'][0] - - self.traceroute(address) - -def run(ooni): - """Run the test""" - config = ooni.config - urls = [] - - traceroute_experiment = TracerouteAsset(os.path.join(config.main.assetdir, \ - config.tests.traceroute)) - - assets = [traceroute_experiment] - - traceroute = Traceroute(ooni) - ooni.logger.info("starting traceroute test") - traceroute.run(assets) - ooni.logger.info("finished")

1 0

[ooni-probe/master] Fix logic of daphn3 for loading inputs via inputProcessor
by art＠torproject.org 15 Nov '12

15 Nov '12

commit 2b54d130b280c4f937ac2a0c2dd09f84a1a8025e Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 15 11:38:02 2012 +0100 Fix logic of daphn3 for loading inputs via inputProcessor --- nettests/core/daphn3.py | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/nettests/core/daphn3.py b/nettests/core/daphn3.py index b40d38a..09279fa 100644 --- a/nettests/core/daphn3.py +++ b/nettests/core/daphn3.py @@ -71,7 +71,7 @@ class daphn3Test(nettest.NetTestCase): steps = None - def inputProcessor(self, fp): + def inputProcessor(self, filename): """ step_idx is the step in the packet exchange ex. @@ -84,11 +84,11 @@ class daphn3Test(nettest.NetTestCase): packet at the step_idx that is to be mutated """ - if self.localOptions['yaml']: - daphn3Steps = daphn3.read_yaml(self.localOptions['yaml']) + if self.localOptions['pcap']: + daphn3Steps = daphn3.read_pcap(filename) else: - daphn3Steps = daphn3.read_pcap(self.localOptions['pcap']) - + daphn3Steps = daphn3.read_yaml(filename) + log.debug("Loaded these steps %s" % daphn3Steps) yield daphn3Steps def test_daphn3(self): @@ -99,6 +99,8 @@ class daphn3Test(nettest.NetTestCase): log.msg("Failed to connect") self.report['censored'] = True self.report['mutation'] = 0 + raise Exception("Error in connection, perhaps the backend is censored") + return def success(protocol): log.msg("Successfully connected")

1 0

[ooni-probe/master] Add daphn3 test yaml file
by art＠torproject.org 15 Nov '12

15 Nov '12

commit 180cfd7d1008fec4e490249d206fc73bd32df54e Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Nov 15 11:38:28 2012 +0100 Add daphn3 test yaml file --- test_inputs/daph3_yaml_file.txt | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/test_inputs/daph3_yaml_file.txt b/test_inputs/daph3_yaml_file.txt new file mode 100644 index 0000000..2412a08 --- /dev/null +++ b/test_inputs/daph3_yaml_file.txt @@ -0,0 +1,2 @@ +{client: antani, server: sblinda} +

1 0