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

[ooni-probe/master] Start working on HTTP Requests
by art＠torproject.org 10 Nov '12

10 Nov '12

commit 4a7d32225a6173d18dfa3df3b953e15841c02d62 Author: Arturo Filastò <arturo(a)filasto.net> Date: Wed Nov 7 18:00:10 2012 +0100 Start working on HTTP Requests --- nettests/core/http_requests.py | 56 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/nettests/core/http_requests.py b/nettests/core/http_requests.py new file mode 100644 index 0000000..f1a16e0 --- /dev/null +++ b/nettests/core/http_requests.py @@ -0,0 +1,56 @@ +# -*- encoding: utf-8 -*- +# +# :authors: Arturo Filastò +# :licence: see LICENSE + +import random +from ooni.templates import httpt + +def random_capitalization(string): + output = "" + string = string.swapcase() + for i in range(len(string)): + if random.randint(0, 1): + output += string[i].swapcase() + else: + output += string[i] + return output + +class HTTPRequests(httpt.HTTPTest): + """ + This test is also known as Header Field manipulation. It performes HTTP + requests with variations in capitalization towards the backend. + """ + name = "HTTPRequests" + author = "Arturo Filastò" + version = 0.1 + + optParameters = [['backend', 'b', None, 'URL of the backend to use for sending the requests']] + + def processInputs(self): + if self.localOptions['backend']: + self.url = self.localOptions['backend'] + else: + raise Exception("No backend specified") + + def test_get(self): + return self.doRequest(self.url, "GET") + + def test_get_random_capitalization(self): + method = random_capitalization("GET") + return self.doRequest(self.url, method) + + def test_post(self): + return self.doRequest(self.url, "POST") + + def test_post_random_capitalization(self): + method = random_capitalization("POST") + return self.doRequest(self.url, method) + + def test_put(self): + return self.doRequest(self.url, "PUT") + + def test_put_random_capitalization(self): + method = random_capitalization("PUT") + return self.doRequest(self.url, method) +

1 0

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

10 Nov '12

commit 6f7e0b23e4d7a769d748e28eb63d6907fa33b49f Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 10 17:15:23 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index b4cc85a..3c0ee7c 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-10 14:03+0000\n" +"PO-Revision-Date: 2012-11-10 17:15+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -372,7 +372,7 @@ msgstr "Nº. de Clientes " msgctxt "BridgeUsageDialog" msgid "Clients from the following countries have used your relay since %1" -msgstr "Clientes desde los siguientes países han usado su repetidor bridge desde %1 " +msgstr "Clientes de los siguientes países han usado su repetidor bridge desde %1 " msgctxt "BridgeUsageDialog" msgid "Bridge Usage Summary" @@ -384,43 +384,43 @@ msgstr "Resumen del Cliente " msgctxt "Circuit" msgid "New" -msgstr "Nuevo" +msgstr "Nuevo " msgctxt "Circuit" msgid "Open" -msgstr "Abierto" +msgstr "Abierto " msgctxt "Circuit" msgid "Building" -msgstr "Construyendo" +msgstr "Construyendo " msgctxt "Circuit" msgid "Failed" -msgstr "Falló" +msgstr "Fallido" msgctxt "Circuit" msgid "Closed" -msgstr "Cerrado" +msgstr "Cerrado " msgctxt "Circuit" msgid "Unknown" -msgstr "Desconocido" +msgstr "Desconocido " msgctxt "CircuitItem" msgid "<Path Empty>" -msgstr "<Ruta Vacía>" +msgstr "<Ruta Vacía> " msgctxt "CircuitListWidget" msgid "Connection" -msgstr "Conexión" +msgstr "Conexión " msgctxt "CircuitListWidget" msgid "Status" -msgstr "Estado" +msgstr "Estado " msgctxt "CircuitListWidget" msgid "Zoom to Circuit" -msgstr "Acercamiento al circuito" +msgstr "Zoom al circuito " msgctxt "CircuitListWidget" msgid "Close Circuit (Del)"

1 0

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

10 Nov '12

commit e78f6d4bbc93fda5feacbae73af7436703ce6a46 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 10 17:15:19 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 22 ++++++++++---------- lv/vidalia_lv.po | 56 +++++++++++++++++++++++++++--------------------------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index b4cc85a..3471a5f 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-10 14:03+0000\n" +"PO-Revision-Date: 2012-11-10 17:15+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -372,7 +372,7 @@ msgstr "Nº. de Clientes " msgctxt "BridgeUsageDialog" msgid "Clients from the following countries have used your relay since %1" -msgstr "Clientes desde los siguientes países han usado su repetidor bridge desde %1 " +msgstr "Clientes de los siguientes países han usado su repetidor bridge desde %1 " msgctxt "BridgeUsageDialog" msgid "Bridge Usage Summary" @@ -384,35 +384,35 @@ msgstr "Resumen del Cliente " msgctxt "Circuit" msgid "New" -msgstr "Nuevo" +msgstr "Nuevo " msgctxt "Circuit" msgid "Open" -msgstr "Abierto" +msgstr "Abierto " msgctxt "Circuit" msgid "Building" -msgstr "Construyendo" +msgstr "Construyendo " msgctxt "Circuit" msgid "Failed" -msgstr "Falló" +msgstr "Fallido" msgctxt "Circuit" msgid "Closed" -msgstr "Cerrado" +msgstr "Cerrado " msgctxt "Circuit" msgid "Unknown" -msgstr "Desconocido" +msgstr "Desconocido " msgctxt "CircuitItem" msgid "<Path Empty>" -msgstr "<Ruta Vacía>" +msgstr "<Ruta Vacía> " msgctxt "CircuitListWidget" msgid "Connection" -msgstr "Conexión" +msgstr "Conexión " msgctxt "CircuitListWidget" msgid "Status" @@ -420,7 +420,7 @@ msgstr "Estado" msgctxt "CircuitListWidget" msgid "Zoom to Circuit" -msgstr "Acercamiento al circuito" +msgstr "Zoom al circuito" msgctxt "CircuitListWidget" msgid "Close Circuit (Del)" diff --git a/lv/vidalia_lv.po b/lv/vidalia_lv.po index 54ea5b7..4994252 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-10 16:45+0000\n" +"PO-Revision-Date: 2012-11-10 17:15+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" @@ -3425,26 +3425,26 @@ msgstr "Tor konstatēja, ka Jūsu DNS sniedzējs sniedz aplamas atbildes par lab msgctxt "StatusEventWidget" msgid "Checking Server Port Reachability" -msgstr "" +msgstr "Pārbauda servera porta sasniedzamību." msgctxt "StatusEventWidget" msgid "" "Tor is trying to determine if your relay's server port is reachable from the" " Tor network by connecting to itself at %1:%2. This test could take several " "minutes." -msgstr "" +msgstr "Tor cenšas noteikt vai Jūsu retranslatora servera ports ir sasniedzams no Tor tīkla, veidojot savienojumu ar sevi %1:%2. Šī pārbaude var ilgt vairākas minūtes." msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Successful!" -msgstr "" +msgstr "Servera porta sasniedzamības pārbaudes rezultāti ir sekmīgi!" msgctxt "StatusEventWidget" msgid "Your relay's server port is reachable from the Tor network!" -msgstr "" +msgstr "Jūsu retranslatora servera ports is sasniedzams no Tor tīkla!" msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Failed" -msgstr "" +msgstr "Servera porta sasniedzamības pārbaudes rezultāti ir nesekmīgi!" msgctxt "StatusEventWidget" msgid "" @@ -3452,30 +3452,30 @@ msgid "" "happen if you are behind a router or firewall that requires you to set up " "port forwarding. If %1:%2 is not your correct IP address and server port, " "please check your relay's configuration." -msgstr "" +msgstr "Jūsu retranslatora servera ports nav sasniedzams citiem Tor klientiem. Tā tas var notikt, ja atrodaties aiz maršrutētāja vai ugunsmūra, kuri pieprasa iestatīt portu pāradresāciju. Ja %1:%2 nav Jūsu pareizā IP adrese un servera ports, lūdzu pārbaudiet sava retranslatora konfigurāciju." msgctxt "StatusEventWidget" msgid "Checking Directory Port Reachability" -msgstr "" +msgstr "Pārbauda direktorija portu sasniedzamību." msgctxt "StatusEventWidget" msgid "" "Tor is trying to determine if your relay's directory port is reachable from " "the Tor network by connecting to itself at %1:%2. This test could take " "several minutes." -msgstr "" +msgstr "Tor cenšas noteikt vai Jūsu retranslatora direktorija ports ir sasniedzams no Tor tīkla, veidojot savienojumu ar sevi %1:%2. Šī pārbaude var ilgt vairākas minūtes." msgctxt "StatusEventWidget" msgid "Directory Port Reachability Test Successful!" -msgstr "" +msgstr "Direktorija porta sasniedzamības pārbaudes rezultāti ir sekmīgi!" msgctxt "StatusEventWidget" msgid "Your relay's directory port is reachable from the Tor network!" -msgstr "" +msgstr "Jūsu retranslatora direktorija ports is sasniedzams no Tor tīkla!" msgctxt "StatusEventWidget" msgid "Directory Port Reachability Test Failed" -msgstr "" +msgstr "Direktorija porta sasniedzamības pārbaudes rezultāti ir nesekmīgi!" msgctxt "StatusEventWidget" msgid "" @@ -3483,17 +3483,17 @@ msgid "" "happen if you are behind a router or firewall that requires you to set up " "port forwarding. If %1:%2 is not your correct IP address and directory port," " please check your relay's configuration." -msgstr "" +msgstr "Jūsu retranslatora direktorija ports nav sasniedzams citiem Tor klientiem. Tā tas var notikt, ja atrodaties aiz maršrutētāja vai ugunsmūra, kuri pieprasa iestatīt portu pāradresāciju. Ja %1:%2 nav Jūsu pareizā IP adrese un direktorija ports, lūdzu pārbaudiet sava retranslatora konfigurāciju." msgctxt "StatusEventWidget" msgid "Relay Descriptor Rejected" -msgstr "" +msgstr "Retranslatora deskriptors tika noraidīts" msgctxt "StatusEventWidget" msgid "" "Your relay's descriptor, which enables clients to connect to your relay, was" " rejected by the directory server at %1:%2. The reason given was: %3" -msgstr "" +msgstr "Jūsu retranslatora deskriptoru, kurš iespējo klientu piekļuvi Jūsu retranslatoram, noraidīja direktorija serveris %1:%2. Nosauktais iemesls bija: %3" msgctxt "StatusEventWidget" msgid "Your Relay is Online" @@ -3505,7 +3505,7 @@ msgid "" "see an increase in network traffic shown by the Bandwidth Graph within a few" " hours as more clients learn about your relay. Thank you for contributing to" " the Tor network!" -msgstr "" +msgstr "Tagad Jūsu retranslators ir tiešsaistē un pieejams Tor klientu izmantošanai. Pēc pāris stundām, vairāk klientiem uzzinot par Jūsu retranslatoru, Jums vajadzētu novērot tīkla datplūsmas palielināšanos, kuru rāda joslas platuma grafiks. Pateicamies Jums par ieguldījumu Tor tīkla darbībā! " msgctxt "StatusTab" msgid "Status" @@ -3553,7 +3553,7 @@ msgstr "Mēģina vēlreiz" msgctxt "Stream" msgid "Remapped" -msgstr "" +msgstr "Atkārtoti kartēts" msgctxt "Stream" msgid "Unknown" @@ -3563,7 +3563,7 @@ msgctxt "TorControl" msgid "" "Vidalia has not started Tor. You need to stop Tor through the interface you " "started it." -msgstr "" +msgstr "Vidalia neuzsāka Tor'u. Jums jāaptur Tor izmantojot saskarni ar kuru palaidāt Tor'u." msgctxt "TorControl" msgid "Start failed: %1" @@ -3663,11 +3663,11 @@ msgstr "Veiksmīgi" msgctxt "UPNPControl" msgid "No UPnP-enabled devices found" -msgstr "" +msgstr "Netika atrastas UPnP iespējotas ierīces" msgctxt "UPNPControl" msgid "No valid UPnP-enabled Internet gateway devices found" -msgstr "" +msgstr "Netika atrastas UPnP iespējotas derīgas interneta vārtejas ierīces" msgctxt "UPNPControl" msgid "WSAStartup failed" @@ -3675,15 +3675,15 @@ msgstr "WSAStartup neizdevās" msgctxt "UPNPControl" msgid "Failed to add a port mapping" -msgstr "" +msgstr "Neizdevās pievienot porta kartējumu" msgctxt "UPNPControl" msgid "Failed to retrieve a port mapping" -msgstr "" +msgstr "Neizdevās izgūt porta kartējumu" msgctxt "UPNPControl" msgid "Failed to remove a port mapping" -msgstr "" +msgstr "Neizdevās noņemt porta kartējumu" msgctxt "UPNPControl" msgid "Unknown error" @@ -3691,19 +3691,19 @@ msgstr "Nezināma kļūda" msgctxt "UPNPTestDialog" msgid "Discovering UPnP-enabled devices" -msgstr "" +msgstr "Notiek UPnP iespējotu ierīču atklāšana" msgctxt "UPNPTestDialog" msgid "Updating directory port mapping" -msgstr "" +msgstr "Atjaunina direktorija porta kartējumu" msgctxt "UPNPTestDialog" msgid "Updating relay port mapping" -msgstr "" +msgstr "Atjaunina retranslatora porta kartējumu" msgctxt "UPNPTestDialog" msgid "Test completed successfully!" -msgstr "" +msgstr "Pārbaude sekmīgi pabeigta!" msgctxt "UPNPTestDialog" msgid "Testing UPnP Support" @@ -3711,7 +3711,7 @@ msgstr "Pārbauda UPnP atbalstu" msgctxt "UPNPTestDialog" msgid "Testing Universal Plug & Play Support" -msgstr "" +msgstr "Pārbauda standarta Universal Plug & Play atbalstu" msgctxt "UpdateProcess" msgid ""

1 0

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

10 Nov '12

commit f8717cc414ab151d339f5088c3334c3d4854ca91 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 10 16:45:19 2012 +0000 Update translations for vidalia_alpha --- lv/vidalia_lv.po | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lv/vidalia_lv.po b/lv/vidalia_lv.po index 085dd4a..54ea5b7 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-10 16:12+0000\n" +"PO-Revision-Date: 2012-11-10 16:45+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" @@ -3331,7 +3331,7 @@ msgid "" "the past compared to the source \"%2\". If your clock is not correct, Tor " "will not be able to function. Please verify your computer displays the " "correct time." -msgstr "" +msgstr "Tor konstatēja, ka Jūsu datora pulkstenis ir, iespējams, iestatīts %1 sekundes atpaliekot no avota \"%2\". Ja Jūsu sistēmlaiks nav precīzs, Tor nespēs strādāt. Lūdzu verificējiet, ka Jūsu dators rāda pareizu sistēmlaiku." msgctxt "StatusEventWidget" msgid "" @@ -3339,11 +3339,11 @@ msgid "" "the future compared to the source \"%2\". If your clock is not correct, Tor " "will not be able to function. Please verify your computer displays the " "correct time." -msgstr "" +msgstr "Tor konstatēja, ka Jūsu datora pulkstenis ir, iespējams, iestatīts %1 sekundes apsteidzot avotu \"%2\". Ja Jūsu sistēmlaiks nav precīzs, Tor nespēs strādāt. Lūdzu verificējiet, ka Jūsu dators rāda pareizu sistēmlaiku." msgctxt "StatusEventWidget" msgid "Your Computer's Clock is Potentially Incorrect" -msgstr "" +msgstr "Jūsu datora pulkstenis rāda, iespējams, nepareizi." msgctxt "StatusEventWidget" msgid "" @@ -3351,14 +3351,14 @@ msgid "" "unencrypted connection through Tor to port %1. Sending unencrypted " "information over the Tor network is dangerous and not recommended. For your " "protection, Tor has automatically closed this connection." -msgstr "" +msgstr "Kāda no Jūsu datora lietotnēm, iespējams, mēģināja izveidot nešifrētu savienojumu ar Tor uz %1 portu. Nešifrētas informācijas sūtīšana Tor tīklā ir bīstama, un to nav ieteicams darīt. Jūsu aizsardzības dēļ, Tor automātiski aizvēra šo savienojumu." msgctxt "StatusEventWidget" msgid "" "One of the applications on your computer may have attempted to make an " "unencrypted connection through Tor to port %1. Sending unencrypted " "information over the Tor network is dangerous and not recommended." -msgstr "" +msgstr "Kāda no Jūsu datora lietotnēm, iespējams, mēģināja izveidot nešifrētu savienojumu ar Tor uz %1 portu. Nešifrētas informācijas sūtīšana Tor tīklā ir bīstama, un to nav ieteicams darīt." msgctxt "StatusEventWidget" msgid "Potentially Dangerous Connection!" @@ -3370,7 +3370,7 @@ msgid "" "using a protocol that may leak information about your destination. Please " "ensure you configure your applications to use only SOCKS4a or SOCKS5 with " "remote hostname resolution." -msgstr "" +msgstr "Kāda no Jūsu lietotnēm izveidoja savienojumu caur Tor uz \"%1\" , izmantojot protokolu, kurš var atklāt informāciju par Jūsu atrašanās vietu. Lūdzu pārliecinieties, ka konfigurējat savas lietotnes tā, lai tās izmantotu vienīgi SOCKS4a vai SOCKS5, atpazīstot attālu resursdatora nosaukumu." msgctxt "StatusEventWidget" msgid "Unknown SOCKS Protocol" @@ -3381,18 +3381,18 @@ msgid "" "One of your applications tried to establish a connection through Tor using a" " protocol that Tor does not understand. Please ensure you configure your " "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution." -msgstr "" +msgstr "Kāda no Jūsu datora lietotnēm, iespējams, mēģināja izveidot savienojumu ar Tor, izmantojot protokolu, kuru Tor nesaprot. Lūdzu pārliecinieties, ka konfigurējat savas lietotnes tā, lai tās izmantotu vienīgi SOCKS4a vai SOCKS5, atpazīstot attālu resursdatora nosaukumu." msgctxt "StatusEventWidget" msgid "Invalid Destination Hostname" -msgstr "" +msgstr "Nederīgs adresāta resursdatora nosaukums" msgctxt "StatusEventWidget" msgid "" "One of your applications tried to establish a connection through Tor to " "\"%1\", which Tor does not recognize as a valid hostname. Please check your " "application's configuration." -msgstr "" +msgstr "Kāda no Jūsu lietotnēm centās izveidot savienojumu caur Tor'u uz \"%1\" , bet to Tor neuzskata par derīgu resursdatora nosaukumu. Lūdzu pārbaudiet savu lietotņu konfigurāciju. " msgctxt "StatusEventWidget" msgid "External IP Address Changed" @@ -3403,25 +3403,25 @@ msgid "" "Tor has determined your relay's public IP address is currently %1%2. If that" " is not correct, please consider setting the 'Address' option in your " "relay's configuration." -msgstr "" +msgstr "Tor konstatēja, ka Jūsu retranslatora publiskā IP adrese patreiz ir %1%2. Ja tas tā nav, lūdzu sava retranslatora konfigurācijā izvērtējiet izvēli 'Adrese'." msgctxt "StatusEventWidget" msgid "DNS Hijacking Detected" -msgstr "" +msgstr "Konstatēta DNS pāradresācija" msgctxt "StatusEventWidget" msgid "" "Tor detected that your DNS provider is providing false responses for domains" " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are " "known to do this in order to display their own search or advertising pages." -msgstr "" +msgstr "Tor konstatēja, ka Jūsu DNS sniedzējs sniedz aplamas atbildes par neeksistējošiem domēniem. Ir zināms, ka daži IPS un citi DNS sniedzēji, tostarp OpenDNS, to dara, lai parādītu savus meklēšanas rezultātus vai reklāmas lapas." msgctxt "StatusEventWidget" msgid "" "Tor detected that your DNS provider is providing false responses for well " "known domains. Since clients rely on Tor network relays to provide accurate " "DNS repsonses, your relay will not be configured as an exit relay." -msgstr "" +msgstr "Tor konstatēja, ka Jūsu DNS sniedzējs sniedz aplamas atbildes par labi zināmiem domēniem. Ievērojot, ka klienti paļaujas uz to, ka Tor tīkla retranslatori sniedz precīzas DNS atbildes, Jūsu retranslators nevar tikt konfigurēts par izejas retranslatoru." msgctxt "StatusEventWidget" msgid "Checking Server Port Reachability"

1 0

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

10 Nov '12

commit 20a0af74f3316a7516001e0fe22639d3bcc96d53 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 10 16:15:19 2012 +0000 Update translations for vidalia_alpha --- lv/vidalia_lv.po | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lv/vidalia_lv.po b/lv/vidalia_lv.po index 21e2c4d..085dd4a 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-10 15:44+0000\n" +"PO-Revision-Date: 2012-11-10 16:12+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" @@ -3160,13 +3160,13 @@ msgstr "Tilta vēsture" msgctxt "ServerPage" msgid "Vidalia was unable to retrieve your bridge's usage history." -msgstr "" +msgstr "Vidalia neizdevās izgūt Jūsu tilta izmantošanas vēsturi." msgctxt "ServerPage" msgid "" "Tor returned an improperly formatted response when Vidalia requested your " "bridge's usage history." -msgstr "" +msgstr "Tor sniedza nepareizi formulētu atbildi, Vidalia'i pieprasot Jūsu tilta izmantošanas vēsturi." msgctxt "ServerPage" msgid "The returned response was: %1" @@ -3174,7 +3174,7 @@ msgstr "Saņemtā atbilde bija šāda: %1" msgctxt "ServerPage" msgid "Help censored users reach the Tor network" -msgstr "" +msgstr "Palīdzības cenzētu lietotāju Tor tīkla sasniegšana" msgctxt "ServerPage" msgid "<a href=\"#bridgeUsage\">Who has used my bridge?</a>" @@ -3190,11 +3190,11 @@ msgstr "Automātiski izplatīt manu tilta adresi" msgctxt "ServerPage" msgid "Relay traffic inside the Tor network (non-exit relay)" -msgstr "" +msgstr "Retranslatora datplūsma Tor tīkla iekšpusē (retralanslācija neizejot)" msgctxt "ServerPage" msgid "Relay traffic for the Tor network (exit relay)" -msgstr "" +msgstr "Retranslatora datplūsma Tor tīklam (retranslācija izejot)" msgctxt "ServerPage" msgid "Mirror the Relay Directory" @@ -3204,7 +3204,7 @@ msgctxt "ServerPage" msgid "" "Email address at which you may be reached if there is a\n" "problem with your relay. You might also include your PGP or GPG fingerprint." -msgstr "" +msgstr "E-pasta adrese, uz kuru raksot esat sasniedzams, ja būtu\ntraucējumi Jūsu retranslatora darbībā. Iespējams,ka vēlaties arī norādīt savu PGP vai GPG ciparvirkni." msgctxt "ServerPage" msgid "day" @@ -3264,26 +3264,26 @@ msgstr "laiks" msgctxt "StatusEventWidget" msgid "Copy to Clipboard" -msgstr "" +msgstr "Kopēt starpliktuvē" msgctxt "StatusEventWidget" msgid "The Tor Software is Running" -msgstr "" +msgstr "Programmatūra Tor darbojas" msgctxt "StatusEventWidget" msgid "You are currently running version \"%1\" of the Tor software." -msgstr "" +msgstr "Patreiz Jūs izmantojat programmatūras Tor versiju \"%1\"." msgctxt "StatusEventWidget" msgid "The Tor Software is not Running" -msgstr "" +msgstr "Programmatūra Tor nedarbojas" msgctxt "StatusEventWidget" msgid "" "Click \"Start Tor\" in the Vidalia Control Panel to restart the Tor " "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for " "details about any errors encountered." -msgstr "" +msgstr "Lai pārstartētu Tor, Vidalia's vadības panelī noklikšķiniet uz \"Startēt Tor\". Gadījumā, ja Tor negaidīti beidza darbu, izvēlieties augstāk esošo cilni \"Lietpratīgs\", lai uzzinātu vairāk par konstatētajām kļūdām." msgctxt "StatusEventWidget" msgid "" @@ -3291,7 +3291,7 @@ msgid "" "longer recommended. Please upgrade to the most recent version of the " "software, which may contain important security, reliability and performance " "fixes." -msgstr "" +msgstr "Patreiz Jūs izmantojat programmatūras Tor versiju \"%1\", bet tā vairs netiek ieteikta. Lūdzu jauniniet, pārejot uz jaunāko programmatūras versiju, kurai var būt būtiski drošības, uzticamības vai veiktspējas labojumi." msgctxt "StatusEventWidget" msgid "" @@ -3299,11 +3299,11 @@ msgid "" "longer work with the current Tor network. Please upgrade to the most recent " "version of the software, which may contain important security, reliability " "and performance fixes." -msgstr "" +msgstr "Patreiz Jūs izmantojat programmatūras Tor versiju \"%1\", bet tā vairs var nebūt saderīga ar Tor tīklu. Lūdzu jauniniet, pārejot uz jaunāko programmatūras versiju, kurai var būt būtiski drošības, uzticamības vai veiktspējas labojumi." msgctxt "StatusEventWidget" msgid "Your Tor Software is Out-of-date" -msgstr "" +msgstr "Jūsu Tor programmatūra ir novecojusi." msgctxt "StatusEventWidget" msgid "Connected to the Tor Network" @@ -3313,7 +3313,7 @@ msgctxt "StatusEventWidget" msgid "" "We were able to successfully establish a connection to the Tor network. You " "can now configure your applications to use the Internet anonymously." -msgstr "" +msgstr "Mums izdevās sekmīgi izveidot savienojumu ar Tor tīklu. Jūs tagad varat konfigurēt lietotnes, lai anonīmi lietotu internetu." msgctxt "StatusEventWidget" msgid "Tor Software Error" @@ -3323,7 +3323,7 @@ msgctxt "StatusEventWidget" msgid "" "The Tor software encountered an internal bug. Please report the following " "error message to the Tor developers at bugs.torproject.org: \"%1\"" -msgstr "" +msgstr "Programmatūra Tor saskarās ar iekšēju kļūdu. Lūdzu, rakstot uz bugs.torproject.org , ziņojiet Tor izstrādātājiem par turpmāk norādīto kļūdas ziņojumu: \"%1\"" msgctxt "StatusEventWidget" msgid ""

1 0

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

10 Nov '12

commit 0a4603b20474eb2de018636454bd66889676aa0f Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 10 15:45:18 2012 +0000 Update translations for vidalia_alpha --- lv/vidalia_lv.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lv/vidalia_lv.po b/lv/vidalia_lv.po index 8c76d30..21e2c4d 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-08 18:32+0000\n" +"PO-Revision-Date: 2012-11-10 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" @@ -3138,21 +3138,21 @@ msgstr "Šī ir Jūsu tilta retranslatora identitāte, kuru Jūs varat dot citie msgctxt "ServerPage" msgid "Copy your bridge relay's identity to the clipboard" -msgstr "" +msgstr "Kopēt Jūsu tilta retranslatora identitāti starpliktuvē" msgctxt "ServerPage" msgid "No Recent Usage" -msgstr "" +msgstr "Nav pēdējā laikā lietots" msgctxt "ServerPage" msgid "No clients have used your relay recently." -msgstr "" +msgstr "Pēdējā laikā neviens klients nav lietojis Jūsu retranslatoru." msgctxt "ServerPage" msgid "" "Leave your relay running so clients have a better chance of finding and " "using it." -msgstr "" +msgstr "Neizslēdziet Jūsu retranslatoru, lai klientiem ir vairāk iespēju to atrast un izmantot." msgctxt "ServerPage" msgid "Bridge History"

1 0

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

10 Nov '12

commit cf2d1f1bfb30d891be309fb52821328373a94b9d Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 10 14:15:20 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 25638d3..b4cc85a 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-10 13:43+0000\n" +"PO-Revision-Date: 2012-11-10 14:03+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -336,7 +336,7 @@ msgstr "Gráfico de Ancho de Banda " msgctxt "BridgeDownloader" msgid "Starting HTTPS bridge request..." -msgstr "Iniciando solicitud HTTPS de bridge (puente a Tor no propagado)... " +msgstr "Iniciando solicitud de bridge (puente a Tor no propagado) por HTTPS... " msgctxt "BridgeDownloader" msgid "Connecting to %1:%2..." @@ -356,7 +356,7 @@ msgstr "Descargando Bridges (puentes a Tor no propagados) " msgctxt "BridgeDownloaderProgressDialog" msgid "Unable to download bridges: %1" -msgstr "No se pudo descargar bridges: %1" +msgstr "No se pudo descargar bridges: %1 " msgctxt "BridgeDownloaderProgressDialog" msgid "Retrying bridge request..." @@ -364,23 +364,23 @@ msgstr "Reintentando la solicitud de bridge... " msgctxt "BridgeUsageDialog" msgid "Country" -msgstr "País" +msgstr "País " msgctxt "BridgeUsageDialog" msgid "# Clients" -msgstr "Nº. de Clientes" +msgstr "Nº. de Clientes " msgctxt "BridgeUsageDialog" msgid "Clients from the following countries have used your relay since %1" -msgstr "Clientes de los siguientes países han usado su repetidor (relay) desde %1" +msgstr "Clientes desde los siguientes países han usado su repetidor bridge desde %1 " msgctxt "BridgeUsageDialog" msgid "Bridge Usage Summary" -msgstr "Resumen de utilización del bridge (puente a Tor no propagado)" +msgstr "Resumen de Uso del Bridge (puente a Tor no propagado) " msgctxt "BridgeUsageDialog" msgid "Client Summary" -msgstr "Resumen del cliente" +msgstr "Resumen del Cliente " msgctxt "Circuit" msgid "New"

1 0

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

10 Nov '12

commit 5fce42458b41758cbcb136cd95fc3cd70f17e621 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 10 14:15:18 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 25638d3..b4cc85a 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-11-10 13:43+0000\n" +"PO-Revision-Date: 2012-11-10 14:03+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -336,7 +336,7 @@ msgstr "Gráfico de Ancho de Banda " msgctxt "BridgeDownloader" msgid "Starting HTTPS bridge request..." -msgstr "Iniciando solicitud HTTPS de bridge (puente a Tor no propagado)... " +msgstr "Iniciando solicitud de bridge (puente a Tor no propagado) por HTTPS... " msgctxt "BridgeDownloader" msgid "Connecting to %1:%2..." @@ -356,7 +356,7 @@ msgstr "Descargando Bridges (puentes a Tor no propagados) " msgctxt "BridgeDownloaderProgressDialog" msgid "Unable to download bridges: %1" -msgstr "No se pudo descargar bridges: %1" +msgstr "No se pudo descargar bridges: %1 " msgctxt "BridgeDownloaderProgressDialog" msgid "Retrying bridge request..." @@ -364,23 +364,23 @@ msgstr "Reintentando la solicitud de bridge... " msgctxt "BridgeUsageDialog" msgid "Country" -msgstr "País" +msgstr "País " msgctxt "BridgeUsageDialog" msgid "# Clients" -msgstr "Nº. de Clientes" +msgstr "Nº. de Clientes " msgctxt "BridgeUsageDialog" msgid "Clients from the following countries have used your relay since %1" -msgstr "Clientes de los siguientes países han usado su repetidor (relay) desde %1" +msgstr "Clientes desde los siguientes países han usado su repetidor bridge desde %1 " msgctxt "BridgeUsageDialog" msgid "Bridge Usage Summary" -msgstr "Resumen de utilización del bridge (puente a Tor no propagado)" +msgstr "Resumen de Uso del Bridge (puente a Tor no propagado) " msgctxt "BridgeUsageDialog" msgid "Client Summary" -msgstr "Resumen del cliente" +msgstr "Resumen del Cliente " msgctxt "Circuit" msgid "New"

1 0

[ooni-probe/master] Start defining the models of OONIB
by art＠torproject.org 10 Nov '12

10 Nov '12

commit 939973f15d39804bc3d62360a622436faf41430f Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Nov 6 19:06:13 2012 +0100 Start defining the models of OONIB * Create runner for OONIB --- oonib/report/models.py | 122 ++++++++++++++++++++++++++++++++++++++++++++++++ oonib/runner.py | 25 ++++++++++ 2 files changed, 147 insertions(+), 0 deletions(-) diff --git a/oonib/report/models.py b/oonib/report/models.py new file mode 100644 index 0000000..ddf79a3 --- /dev/null +++ b/oonib/report/models.py @@ -0,0 +1,122 @@ +__all__ = ['Report', 'TestHelperTMP'] +from storm.twisted.transact import transact +from storm.locals import * + +from oonib.report.db import getStore, transactor + +def generateReportID(): + size = 100 + report_id = ''.join(random.choice(string.ascii_letters) for x in range(size)) + return report_id + +class OModel(object): + + transactor = transactor + + def getStore(self): + return Store(database) + + @transact + def create(self, query): + store = Store(database) + store.execute(query) + store.commit() + + @transact + def save(self): + store = getStore() + store.add(self) + store.commit() + +class Report(OModel): + """ + This represents an OONI Report as stored in the database. + + report_id: this is generated by the backend and is used by the client to + reference a previous report and append to it. It should be + treated as a shared secret between the probe and backend. + + software_name: this indicates the name of the software performing the test + (this will default to ooniprobe) + + software_version: this is the version number of the software running the + test. + + test_name: the name of the test on which the report is being created. + + test_version: indicates the version of the test + + progress: what is the current progress of the report. This allows clients + to report event partial reports up to a certain percentage of + progress. Once the report is complete progress will be 100. + + content: what is the content of the report. If the current progress is less + than 100 we should append to the YAML data structure that is + currently stored in such field. + """ + __storm_table__ = 'reports' + + createQuery = "CREATE TABLE " + __storm_table__ +\ + "(id INTEGER PRIMARY KEY, report_id VARCHAR, software_name VARCHAR,"\ + "software_version VARCHAR, test_name VARCHAR, test_version VARCHAR,"\ + "progress VARCHAR, content VARCHAR)" + + + id = Int(primary=True) + + report_id = Unicode() + + software_name = Unicode() + software_version = Unicode() + test_name = Unicode() + test_version = Unicode() + progress = Int() + + content = Unicode() + + @transact + def new(report): + store = self.getStore() + + print "Creating new report %s" % report + + report_id = generateReportID() + new_report = models.Report() + new_report.report_id = unicode(report_id) + + new_report.software_name = report['software_name'] + new_report.software_version = report['software_version'] + new_report.test_name = report['test_name'] + new_report.test_version = report['test_version'] + new_report.progress = report['progress'] + + if 'content' in report: + new_report.content = report['content'] + + print "Report: %s" % report + + store.add(new_report) + try: + store.commit() + except: + store.close() + + defer.returnValue({'backend_version': backend_version, 'report_id': + report_id}) + + +class TestHelperTMP(OModel): + __storm_table__ = 'testhelpertmp' + + createQuery = "CREATE TABLE " + __storm_table__ +\ + "(id INTEGER PRIMARY KEY, report_id VARCHAR, test_helper VARCHAR,"\ + " client_ip VARCHAR, creation_time VARCHAR)" + + id = Int(primary=True) + + report_id = Unicode() + + test_helper = Unicode() + client_ip = Unicode() + + creation_time = Date() diff --git a/oonib/runner.py b/oonib/runner.py new file mode 100644 index 0000000..febef46 --- /dev/null +++ b/oonib/runner.py @@ -0,0 +1,25 @@ +""" +In here we define a runner for the oonib backend system. +We are just extending the + +""" + +from twisted.application import service, internet, app +from twisted.python.runtime import platformType + +from ooni.utils import log + +class OBaseRunner(): + pass + +if platformType == "win32": + from twisted.scripts._twistw import ServerOptions, \ + WindowsApplicationRunner + + OBaseRunner = WindowsApplicationRunner +else: + from twisted.scripts._twistd_unix import ServerOptions, \ + UnixApplicationRunner + OBaseRunner = UnixApplicationRunner + +OBaseRunner.loggerFactory = log.LoggerFactory

1 0

[ooni-probe/master] Fully switch to using only cyclone for HTTP related test helpers
by art＠torproject.org 10 Nov '12

10 Nov '12

commit 93bcc2f5f9d90b1548968807cf3404e19559b362 Author: Arturo Filastò <art(a)fuffa.org> Date: Sat Nov 10 14:16:02 2012 +0100 Fully switch to using only cyclone for HTTP related test helpers * Implement HTTP Request handler backend * Fix the startup script of OONIB * Disable daphn3 test helper script * Various cleanups --- bin/oonib | 41 ++++++++++++++++-- ooni/utils/log.py | 18 +++++++- oonib/lib/__init__.py | 7 --- oonib/lib/ssl.py | 2 +- oonib/oonibackend.py | 29 +++++-------- oonib/report/db/__init__.py | 4 +- oonib/testhelpers/daphn3.py | 4 +- oonib/testhelpers/httph.py | 100 +++++++++++++++++-------------------------- 8 files changed, 107 insertions(+), 98 deletions(-) diff --git a/bin/oonib b/bin/oonib index df7c62f..0808743 100755 --- a/bin/oonib +++ b/bin/oonib @@ -1,4 +1,37 @@ -#!/bin/sh -ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )" -export PYTHONPATH=$PYTHONPATH:$ROOT -twistd -ny $ROOT/oonib/oonibackend.py +#!/usr/bin/env python +# -*- encoding: utf-8 -*- +# +# :authors: Arturo Filastò +# :licence: see LICENSE + +import sys +import os +# Avoid the export PYTHONPATH insanity +sys.path[:] = map(os.path.abspath, sys.path) +this_directory = os.path.dirname(__file__) +root = os.path.abspath(os.path.join(this_directory, '..')) +sys.path.insert(0, root) + +backend_script = os.path.join(root, 'oonib', 'oonibackend.py') + +from twisted.python import log, usage +from twisted.internet import reactor +from twisted.application import app + +from oonib import runner +from oonib.oonibackend import application + +sys.argv[1:] = ['-ny', backend_script] + +def runApp(config): + runner.OBaseRunner(config).run() + +config = runner.ServerOptions() +try: + config.parseOptions() +except usage.error, ue: + print config + print "%s: %s" % (sys.argv[0], ue) +else: + runApp(config) + diff --git a/ooni/utils/log.py b/ooni/utils/log.py index 0cb62ac..c05c776 100644 --- a/ooni/utils/log.py +++ b/ooni/utils/log.py @@ -13,7 +13,7 @@ from twisted.python.logfile import DailyLogFile from ooni.utils import otime from ooni import config -def start(logfile=None): +def start(logfile=None, application_name="OONI"): daily_logfile = None if not logfile: @@ -24,7 +24,7 @@ def start(logfile=None): daily_logfile = DailyLogFile(log_filename, log_folder) - txlog.msg("Starting OONI on %s (%s UTC)" % (otime.prettyDateNow(), + txlog.msg("Starting %s on %s (%s UTC)" % (application_name, otime.prettyDateNow(), otime.utcPrettyDateNow())) logging.basicConfig() python_logging = txlog.PythonLoggingObserver() @@ -53,3 +53,17 @@ def err(msg, *arg, **kw): def exception(*msg): logging.exception(msg) +class LoggerFactory(object): + """ + This is a logger factory to be used by oonib + """ + def __init__(self, options): + pass + + def start(self, application): + # XXX parametrize this + start('/tmp/oonib.log', "OONIB") + + def stop(self): + txlog.msg("Stopping OONIB") + diff --git a/oonib/lib/__init__.py b/oonib/lib/__init__.py index 5b4380a..8b13789 100644 --- a/oonib/lib/__init__.py +++ b/oonib/lib/__init__.py @@ -1,8 +1 @@ -from ooni.utils import Storage -from ooni.utils.config import Config -import os -root = os.path.normpath(os.path.join(os.path.realpath(__file__), '../../')) -config = Storage() -config.main = Config('main', os.path.join(root, 'oonibackend.conf')) -config.daphn3 = Config('daphn3', os.path.join(root, 'oonibackend.conf')) diff --git a/oonib/lib/ssl.py b/oonib/lib/ssl.py index 094bdc9..20e99e8 100644 --- a/oonib/lib/ssl.py +++ b/oonib/lib/ssl.py @@ -1,5 +1,5 @@ from twisted.internet import ssl -from oonib.lib import config +from oonib import config class SSLContext(ssl.DefaultOpenSSLContextFactory): def __init__(self, *args, **kw): diff --git a/oonib/oonibackend.py b/oonib/oonibackend.py index eaa52f9..9964854 100644 --- a/oonib/oonibackend.py +++ b/oonib/oonibackend.py @@ -24,36 +24,26 @@ from ooni.utils import log from oonib.report.api import reportingBackend from oonib.lib.ssl import SSLContext -from oonib.lib import config +from oonib import config -from oonib.testhelpers.httph import HTTPBackend, DebugHTTPServer +from oonib.testhelpers.httph import HTTPReturnJSONHeadersHelper from oonib.testhelpers.dns import ProxyDNSServer -from oonib.testhelpers.daphn3 import Daphn3Server +#from oonib.testhelpers.daphn3 import Daphn3Server from cyclone import web -log.start('/tmp/oonib.log') - # This tells twisted to set the server.version = config.main.server_version application = service.Application('oonibackend') serviceCollection = service.IServiceCollection(application) -if config.main.http_port: - internet.TCPServer(int(config.main.http_port), - server.Site(HTTPBackend()) - ).setServiceParent(serviceCollection) - if config.main.ssl_port: internet.SSLServer(int(config.main.ssl_port), server.Site(HTTPBackend()), SSLContext(config), ).setServiceParent(serviceCollection) -debugHTTPServer = DebugHTTPServer() -internet.TCPServer(8090, debugHTTPServer).setServiceParent(serviceCollection) - # Start the DNS Server related services if config.main.dns_tcp_port: TCPDNSServer = ProxyDNSServer() @@ -65,15 +55,18 @@ if config.main.dns_udp_port: internet.UDPServer(int(config.main.dns_udp_port), UDPFactory).setServiceParent(serviceCollection) +# XXX this needs to be ported # Start the OONI daphn3 backend -if config.main.daphn3_port: - daphn3 = Daphn3Server() - internet.TCPServer(int(config.main.daphn3_port), - daphn3).setServiceParent(serviceCollection) +#if config.main.daphn3_port: +# daphn3 = Daphn3Server() +# internet.TCPServer(int(config.main.daphn3_port), +# daphn3).setServiceParent(serviceCollection) if config.main.reporting_port: internet.TCPServer(int(config.main.reporting_port), reportingBackend).setServiceParent(serviceCollection) -reactor.addSystemEventTrigger('after', 'shutdown', db_threadpool.stop) +if config.helpers.http_return_request_port: + internet.TCPServer(int(config.helpers.http_return_request_port), + HTTPReturnJSONHeadersHelper).setServiceParent(serviceCollection) diff --git a/oonib/report/db/__init__.py b/oonib/report/db/__init__.py index 178abe9..383b24b 100644 --- a/oonib/report/db/__init__.py +++ b/oonib/report/db/__init__.py @@ -1,5 +1,3 @@ -__all__ = ['models'] - from twisted.python import log from twisted.python.threadpool import ThreadPool from twisted.internet.defer import inlineCallbacks @@ -21,7 +19,7 @@ def getStore(): @inlineCallbacks def create_tables(): - from oonib.report.db import models + from oonib.report.models import models for x in models.__all__: query = getattr(models.__getattribute__(x), 'createQuery') diff --git a/oonib/testhelpers/daphn3.py b/oonib/testhelpers/daphn3.py index facd11f..3b59f93 100644 --- a/oonib/testhelpers/daphn3.py +++ b/oonib/testhelpers/daphn3.py @@ -1,9 +1,9 @@ +# XXX this is currently broken and needs to be ported from twisted.internet import protocol from twisted.internet.error import ConnectionDone -from oonib.lib import config +from oonib import config -from ooni.plugoo import reports from ooni.protocols.daphn3 import Mutator, Daphn3Protocol from ooni.protocols.daphn3 import read_pcap, read_yaml diff --git a/oonib/testhelpers/httph.py b/oonib/testhelpers/httph.py index 217dbd5..b793852 100644 --- a/oonib/testhelpers/httph.py +++ b/oonib/testhelpers/httph.py @@ -8,14 +8,42 @@ from twisted.protocols import basic from twisted.web import resource, server, static, http from twisted.web.microdom import escape -server.version = "Apache" +from cyclone.web import RequestHandler, Application -class HTTPRandomPage(resource.Resource): +class HTTPTrapAll(RequestHandler): + """ + Master class to be used to trap all the HTTP methods + """ + def get(self, *arg, **kw): + self.all(*arg, **kw) + + def post(self, *arg, **kw): + self.all(*arg, **kw) + + def put(self, *arg, **kw): + self.all(*arg, **kw) + +class HTTPReturnJSONHeaders(HTTPTrapAll): + def all(self): + # XXX make sure that the request headers are in the correct order + submitted_data = {'request_body': self.request.body, + 'request_headers': self.request.headers, + 'request_uri': self.request.uri, + 'request_method': self.request.method} + response = json.dumps(submitted_data) + self.write(response) + +HTTPReturnJSONHeadersHelper = Application([ + (r"/*", HTTPReturnJSONHeaders) +]) + + +class HTTPRandomPage(HTTPTrapAll): """ This generates a random page of arbitrary length and containing the string selected by the user. - The format is the following: - /random/<length>/<keyword> + /<length>/<keyword> + XXX this is currently disabled as it is not of use to any test. """ isLeaf = True def _gen_random_string(self, length): @@ -29,64 +57,14 @@ class HTTPRandomPage(resource.Resource): data += '\n' return data - def render(self, request): + def all(self, length, keyword): length = 100 - keyword = None - path_parts = request.path.split('/') - if len(path_parts) > 2: - length = int(path_parts[2]) - if length > 100000: - length = 100000 - - if len(path_parts) > 3: - keyword = escape(path_parts[3]) - + if length > 100000: + length = 100000 return self.genRandomPage(length, keyword) -class HTTPReturnHeaders(resource.Resource): - """ - This returns the headers being sent by the client in JSON format. - """ - isLeaf = True - def render(self, request): - req_headers = request.getAllHeaders() - return json.dumps(req_headers) - -class HTTPSendHeaders(resource.Resource): - """ - This sends to the client the headers that they send inside of the POST - request encoded in json. - """ - isLeaf = True - def render_POST(self, request): - headers = json.loads(request.content.read()) - for header, value in headers.items(): - request.setHeader(str(header), str(value)) - return '' - -class HTTPBackend(resource.Resource): - def __init__(self): - resource.Resource.__init__(self) - self.putChild('random', HTTPRandomPage()) - self.putChild('returnheaders', HTTPReturnHeaders()) - self.putChild('sendheaders', HTTPSendHeaders()) - -class DebugProtocol(http.HTTPChannel): - def headerReceived(self, line): - print "[HEADER] %s" % line - http.HTTPChannel.headerReceived(self, line) - - def allContentReceived(self): - print self.requests[-1].getAllHeaders() - self.transport.loseConnection() - self.connectionLost("Normal closure") - -class DebugHTTPServer(http.HTTPFactory): - protocol = DebugProtocol - - def buildProtocol(self, addr): - print "Got connection from %s" % addr - p = protocol.ServerFactory.buildProtocol(self, addr) - p.timeOut = self.timeOut - return p +HTTPRandomPageHelper = Application([ + # XXX add regexps here + (r"/(.*)/(.*)", HTTPRandomPage) +])

1 0