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

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 16 Mar '15

16 Mar '15

commit fe219ff6b2dcac12ab501a5eb6f2ce5708fdc7af Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 16 18:45:45 2015 +0000 Update translations for abouttor-homepage --- bg/aboutTor.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bg/aboutTor.dtd b/bg/aboutTor.dtd index cacd701..fa4b18a 100644 --- a/bg/aboutTor.dtd +++ b/bg/aboutTor.dtd @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "НО, този браузър не е актуален."> <!ENTITY aboutTor.outOfDateTorOff.label "Също така, този браузър не е актуален."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update."> +<!ENTITY aboutTor.outOfDate2.label "Кликнете върху лука(иконката) и след това изберете Проверка за обновяване на Tor браузера"> <!ENTITY aboutTor.check.label "Тествайте мрежовите настройки на Tor"> @@ -25,7 +25,7 @@ <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> +<!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> <!ENTITY aboutTor.torInfo1.label "Допълнителна информация:"> <!ENTITY aboutTor.torInfo2.label "Държава и IP адрес:">

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 16 Mar '15

16 Mar '15

commit 903c1ee062d602c0490d6f80774c10eae194a137 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 16 18:45:24 2015 +0000 Update translations for tails-persistence-setup_completed --- bg/bg.po | 53 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/bg/bg.po b/bg/bg.po index dd6ffa1..0f4f17a 100644 --- a/bg/bg.po +++ b/bg/bg.po @@ -4,6 +4,7 @@ # # Translators: # Atanas Kovachki <crashdeburn(a)gmail.com>, 2014 +# Gabriel Radev <gabosss(a)gmail.com>, 2015 # Tihomir <killera124(a)gmail.com>, 2014 # Kiril Ivailov Velinov <kirilvelinov(a)gmail.com>, 2012 # alexdimitrov <kvikmen(a)gmail.com>, 2013 @@ -13,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-10-08 21:13+0200\n" -"PO-Revision-Date: 2014-12-01 09:01+0000\n" -"Last-Translator: Petya Antonowa <gothfield(a)gmail.com>\n" +"POT-Creation-Date: 2015-02-23 13:07+0100\n" +"PO-Revision-Date: 2015-03-16 18:41+0000\n" +"Last-Translator: Gabriel Radev <gabosss(a)gmail.com>\n" "Language-Team: Bulgarian (http://www.transifex.com/projects/p/torproject/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -96,26 +97,34 @@ msgid "Printers configuration" msgstr "Конфигурация на принтери" #: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +msgid "Bitcoin client" +msgstr "Битикоинт клиент" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +msgid "Electrum's bitcoin wallet and configuration" +msgstr "Електрум биткоинт портфейл и конфигурация" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "APT Packages" msgstr "APT пакети" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 msgid "Packages downloaded by APT" msgstr "Пакети свален от APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:158 msgid "APT Lists" msgstr "APT списъци" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:160 msgid "Lists downloaded by APT" msgstr "Списъци свалени с APT" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:158 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:168 msgid "Dotfiles" msgstr "Dotfiles" -#: ../lib/Tails/Persistence/Configuration/Presets.pm:160 +#: ../lib/Tails/Persistence/Configuration/Presets.pm:170 msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "Символична връзка в $ HOME всеки файл или директория в директория \"dotfiles\"" @@ -124,67 +133,67 @@ msgstr "Символична връзка в $ HOME всеки файл или msgid "Setup Tails persistent volume" msgstr "Настройка Tails устойчиви обем" -#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:452 +#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:451 msgid "Error" msgstr "ГРЕШКА" -#: ../lib/Tails/Persistence/Setup.pm:339 +#: ../lib/Tails/Persistence/Setup.pm:338 #, perl-format msgid "Device %s already has a persistent volume." msgstr "Устройството %s вече има постоянен обем." -#: ../lib/Tails/Persistence/Setup.pm:347 +#: ../lib/Tails/Persistence/Setup.pm:346 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "Устройството %s не е достатъчно неразпределено пространство." -#: ../lib/Tails/Persistence/Setup.pm:355 ../lib/Tails/Persistence/Setup.pm:369 +#: ../lib/Tails/Persistence/Setup.pm:354 ../lib/Tails/Persistence/Setup.pm:368 #, perl-format msgid "Device %s has no persistent volume." msgstr "Устройството %s не разполага с постоянен обем." -#: ../lib/Tails/Persistence/Setup.pm:361 +#: ../lib/Tails/Persistence/Setup.pm:360 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "Не можете да изтриете упорит обем по време на използване. Трябва да рестартирате Tails без постоянство." -#: ../lib/Tails/Persistence/Setup.pm:380 +#: ../lib/Tails/Persistence/Setup.pm:379 msgid "Persistence volume is not unlocked." msgstr "Устойчивото пространство не отключено." -#: ../lib/Tails/Persistence/Setup.pm:385 +#: ../lib/Tails/Persistence/Setup.pm:384 msgid "Persistence volume is not mounted." msgstr "Устойчивото пространство не е монтирано." -#: ../lib/Tails/Persistence/Setup.pm:390 +#: ../lib/Tails/Persistence/Setup.pm:389 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "Устойчивото пространство не се чете. Проблеми с разрешения или собствеността ?" -#: ../lib/Tails/Persistence/Setup.pm:395 +#: ../lib/Tails/Persistence/Setup.pm:394 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "Устойчивото пространство не е записваем. Може би това е монтирана само за четене?" -#: ../lib/Tails/Persistence/Setup.pm:404 +#: ../lib/Tails/Persistence/Setup.pm:403 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails работи от устройство различно от USB/SDIO %s." -#: ../lib/Tails/Persistence/Setup.pm:410 +#: ../lib/Tails/Persistence/Setup.pm:409 #, perl-format msgid "Device %s is optical." msgstr "Устройството %s е оптично." -#: ../lib/Tails/Persistence/Setup.pm:417 +#: ../lib/Tails/Persistence/Setup.pm:416 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "Устройството %s не бе създадено,чрез Tails инсталатор." -#: ../lib/Tails/Persistence/Setup.pm:677 +#: ../lib/Tails/Persistence/Setup.pm:676 msgid "Persistence wizard - Finished" msgstr "Устойчивото Wizard - Завършен" -#: ../lib/Tails/Persistence/Setup.pm:680 +#: ../lib/Tails/Persistence/Setup.pm:679 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 16 Mar '15

16 Mar '15

commit 57f3aab0c0d2a47dbc2f8b5d46c6243933987ba9 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 16 18:45:20 2015 +0000 Update translations for tails-persistence-setup --- bg/bg.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bg/bg.po b/bg/bg.po index beda752..0f4f17a 100644 --- a/bg/bg.po +++ b/bg/bg.po @@ -4,6 +4,7 @@ # # Translators: # Atanas Kovachki <crashdeburn(a)gmail.com>, 2014 +# Gabriel Radev <gabosss(a)gmail.com>, 2015 # Tihomir <killera124(a)gmail.com>, 2014 # Kiril Ivailov Velinov <kirilvelinov(a)gmail.com>, 2012 # alexdimitrov <kvikmen(a)gmail.com>, 2013 @@ -14,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2015-02-23 13:07+0100\n" -"PO-Revision-Date: 2015-02-24 10:24+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-03-16 18:41+0000\n" +"Last-Translator: Gabriel Radev <gabosss(a)gmail.com>\n" "Language-Team: Bulgarian (http://www.transifex.com/projects/p/torproject/language/bg/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -97,11 +98,11 @@ msgstr "Конфигурация на принтери" #: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "Bitcoin client" -msgstr "" +msgstr "Битикоинт клиент" #: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "Electrum's bitcoin wallet and configuration" -msgstr "" +msgstr "Електрум биткоинт портфейл и конфигурация" #: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "APT Packages"

1 0

[stem/master] Extrainfo hidden service fields can be negative
by atagar＠torproject.org 16 Mar '15

16 Mar '15

commit 60ad8473f5d10e4b354f2b7f182164e1bfdca93a Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 16 11:44:48 2015 -0700 Extrainfo hidden service fields can be negative Checked with Karsten on #15276. --- stem/descriptor/extrainfo_descriptor.py | 7 ++++--- test/unit/descriptor/extrainfo_descriptor.py | 7 ++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index 228532f..e255320 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -512,10 +512,11 @@ def _parse_hs_stats(keyword, stat_attribute, extra_attribute, descriptor, entrie if not value_comp: raise ValueError("'%s' line was blank" % keyword) - elif not value_comp[0].isdigit(): - raise ValueError("'%s' stat was non-numeric (%s): %s %s" % (keyword, value_comp[0], keyword, value)) - stat = int(value_comp[0]) + try: + stat = int(value_comp[0]) + except ValueError: + raise ValueError("'%s' stat was non-numeric (%s): %s %s" % (keyword, value_comp[0], keyword, value)) for entry in value_comp[1:]: if '=' not in entry: diff --git a/test/unit/descriptor/extrainfo_descriptor.py b/test/unit/descriptor/extrainfo_descriptor.py index 6049f50..c418ff3 100644 --- a/test/unit/descriptor/extrainfo_descriptor.py +++ b/test/unit/descriptor/extrainfo_descriptor.py @@ -562,7 +562,6 @@ k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw test_entries = ( '', - '-50', 'hello', ' key=value', '40 key', @@ -577,6 +576,12 @@ k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw self.assertEqual(345, getattr(desc, stat_attr)) self.assertEqual({}, getattr(desc, extra_attr)) + # values can be negative (#15276) + + desc = get_relay_extrainfo_descriptor({keyword: '-345'}) + self.assertEqual(-345, getattr(desc, stat_attr)) + self.assertEqual({}, getattr(desc, extra_attr)) + # with extra attributes desc = get_relay_extrainfo_descriptor({keyword: '345 spiffy=true snowmen=neat'})

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 16 Mar '15

16 Mar '15

commit f7252edf5c1473e9909edaa50135dd9a2290271c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 16 04:15:51 2015 +0000 Update translations for torbutton-torbuttondtd --- lo/torbutton.dtd | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/lo/torbutton.dtd b/lo/torbutton.dtd index 3fad591..592cd66 100644 --- a/lo/torbutton.dtd +++ b/lo/torbutton.dtd @@ -1,4 +1,4 @@ -<!ENTITY torbutton.prefs.title "Torbutton Preferences"> +<!ENTITY torbutton.prefs.title "ການຕັ້ງຄ່າ Torbutton"> <!ENTITY torbutton.prefs.tor_settings "ການຕັ້ງຄ່າ Proxy"> <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy"> @@ -24,19 +24,19 @@ <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> <!ENTITY torbutton.context_menu.new_identity "New Identity"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site"> +<!ENTITY torbutton.context_menu.new_circuit "Tor ໃໝ່ສຳລັບເວັບໄຊນີ້"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> <!ENTITY torbutton.context_menu.toggle "Toggle Tor status"> <!ENTITY torbutton.context_menu.toggle.key "T"> -<!ENTITY torbutton.context_menu.preferences "Privacy and Security Settings…"> +<!ENTITY torbutton.context_menu.preferences "ການກຳນົດຄ່າຄວາມເປັນສ່ວນຕົວແລະຄວາມປອດໄພ"> <!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.about "About Torbutton..."> <!ENTITY torbutton.context_menu.about.key "A"> -<!ENTITY torbutton.context_menu.networksettings "Tor Network Settings…"> +<!ENTITY torbutton.context_menu.networksettings "ການຕັ້ງຄ່າເຄືອຂ່າຍ Tor"> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update…"> +<!ENTITY torbutton.context_menu.downloadUpdate "ກວດສອບການປັບປຸງໂຕທ່ອງເວັບ Tor"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections…"> +<!ENTITY torbutton.context_menu.cookieProtections "ການປ້ອງກັນ ກຸກກີ້"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.context_menu.copyTor "Copy Tor URL"> <!ENTITY torbutton.context_menu.copyTor.key "p"> @@ -46,7 +46,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.privacy_security_settings "ການກຳນົດຄ່າຄວາມເປັນສ່ວນຕົວແລະຄວາມປອດໄພ"> <!ENTITY torbutton.prefs.block_thread "Block history reads during Tor (crucial)"> <!ENTITY torbutton.prefs.block_thwrite "Block history writes during Tor (recommended)"> <!ENTITY torbutton.prefs.block_nthread "Block history reads during Non-Tor (optional)"> @@ -146,15 +146,15 @@ <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries"> <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)"> -<!ENTITY torbutton.prefs.priv_caption "Privacy Settings"> +<!ENTITY torbutton.prefs.priv_caption "ການກຳນົດຄ່າຄວາມເປັນສ່ວນໂຕ"> <!ENTITY torbutton.prefs.block_disk "Don't record browsing history or website data (enables Private Browsing Mode)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Disable browser plugins (such as Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> -<!ENTITY torbutton.prefs.sec_low "Low (default)"> -<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> -<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> -<!ENTITY torbutton.prefs.sec_high "High"> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> -<!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> +<!ENTITY torbutton.prefs.sec_caption "ລະດັບຄວາມປອດໄພ"> +<!ENTITY torbutton.prefs.sec_low "ຕໍ່າ (ຕາມຄ່າເດີມ)"> +<!ENTITY torbutton.prefs.sec_med_low "ກາງ-ຕໍ່າ"> +<!ENTITY torbutton.prefs.sec_med_high "ກາງ-ສູງ"> +<!ENTITY torbutton.prefs.sec_high "ສູງ"> +<!ENTITY torbutton.prefs.sec_custom "ກຳນົດຄ່າເອງ"> +<!ENTITY torbutton.circuit_display.title "ວົງຈອນ Tor ສຳລັບເວັບໄຊນີ້">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 16 Mar '15

16 Mar '15

commit b4a32285a6f879f76d5044a2c8b4ad85af08e252 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 16 04:15:13 2015 +0000 Update translations for https_everywhere --- lo/ssl-observatory.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lo/ssl-observatory.dtd b/lo/ssl-observatory.dtd index ac23be6..065bc03 100644 --- a/lo/ssl-observatory.dtd +++ b/lo/ssl-observatory.dtd @@ -3,9 +3,9 @@ <!ENTITY ssl-observatory.popup.later "ກະລຸນາຖາມຕາມພາຍຫຼັງ"> <!ENTITY ssl-observatory.popup.no "ບໍ່"> -<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere can detect attacks -against your browser by sending the certificates you receive to the -Observatory. Turn this on?"> +<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere ສາມາດກວດພົບການຕໍ່ຕ້ານ +ໂຕທ່ອງເວັບທ່ານໄດ້ໂດຍການສົ່ງໃບຢັ້ງຢືນທີ່ທ່ານໄດ້ຮັບນັ້ນໄປຍັງ +ລະບົບສັງເກດການ. ເປີດໃຊ້ງານບໍ່?">  <!ENTITY ssl-observatory.popup.title -"Should HTTPS Everywhere use the SSL Observatory?"> +"HTTPS Everywhere ຕ້ອງໄດ້ໃຊ້ ລະບົບສັງເກດການ SSL ບໍ່?"> <!ENTITY ssl-observatory.popup.yes "ແມ່ນ">

1 0

[meek/master] Factor out a sendResponse function.
by dcf＠torproject.org 16 Mar '15

16 Mar '15

commit 04c3ad102407877e73cae4e94194e19391d69a66 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Feb 22 20:03:09 2015 -0800 Factor out a sendResponse function. No reason for it to be a member function. --- firefox/components/main.js | 60 +++++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/firefox/components/main.js b/firefox/components/main.js index 2ef26ec..6df4950 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -177,6 +177,33 @@ MeekHTTPHelper.buildProxyInfo = function(spec) { return null; }; +// Transmit an HTTP response over the given nsITransport. resp is an object with +// keys perhaps including "status", "body", and "error". +MeekHTTPHelper.sendResponse = function(transport, resp) { + // dump("sendResponse " + JSON.stringify(resp) + "\n"); + let outputStream = transport.openOutputStream(Components.interfaces.nsITransport.OPEN_BLOCKING, 0, 0); + let output = Components.classes["@mozilla.org/binaryoutputstream;1"] + .createInstance(Components.interfaces.nsIBinaryOutputStream); + output.setOutputStream(outputStream); + + let converter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"] + .createInstance(Components.interfaces.nsIScriptableUnicodeConverter); + converter.charset = "UTF-8"; + let s = JSON.stringify(resp); + let data = converter.convertToByteArray(s); + + let deadline = Date.now() + MeekHTTPHelper.LOCAL_WRITE_TIMEOUT * 1000; + try { + MeekHTTPHelper.refreshDeadline(transport, deadline); + output.write32(data.length); + MeekHTTPHelper.refreshDeadline(transport, deadline); + output.writeByteArray(data, data.length); + MeekHTTPHelper.refreshDeadline(transport, null); + } finally { + output.close(); + } +}; + // LocalConnectionHandler handles each new client connection received on the // socket opened by MeekHTTPHelper. It reads a JSON request, makes the request // on the Internet, and writes the result back to the socket. Error handling @@ -196,7 +223,7 @@ MeekHTTPHelper.LocalConnectionHandler.prototype = { makeRequest: function(req) { // dump("makeRequest " + JSON.stringify(req) + "\n"); if (!this.requestOk(req)) { - this.returnResponse({"error": "request failed validation"}); + MeekHTTPHelper.sendResponse(this.transport, {"error": "request failed validation"}); return; } @@ -204,7 +231,7 @@ MeekHTTPHelper.LocalConnectionHandler.prototype = { // dump("using proxy " + JSON.stringify(req.proxy) + "\n"); let proxyInfo = MeekHTTPHelper.buildProxyInfo(req.proxy); if (proxyInfo === null) { - this.returnResponse({"error": "can't create nsIProxyInfo from " + JSON.stringify(req.proxy)}); + MeekHTTPHelper.sendResponse(this.transport, {"error": "can't create nsIProxyInfo from " + JSON.stringify(req.proxy)}); return; } @@ -241,35 +268,12 @@ MeekHTTPHelper.LocalConnectionHandler.prototype = { this.channel.requestMethod = req.method; this.channel.redirectionLimit = 0; - this.listener = new MeekHTTPHelper.HttpStreamListener(this.returnResponse.bind(this)); + this.listener = new MeekHTTPHelper.HttpStreamListener(function(resp) { + MeekHTTPHelper.sendResponse(this.transport, resp); + }.bind(this)); this.channel.asyncOpen(this.listener, this.channel); }, - returnResponse: function(resp) { - // dump("returnResponse " + JSON.stringify(resp) + "\n"); - let outputStream = this.transport.openOutputStream(Components.interfaces.nsITransport.OPEN_BLOCKING, 0, 0); - let output = Components.classes["@mozilla.org/binaryoutputstream;1"] - .createInstance(Components.interfaces.nsIBinaryOutputStream); - output.setOutputStream(outputStream); - - let converter = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"] - .createInstance(Components.interfaces.nsIScriptableUnicodeConverter); - converter.charset = "UTF-8"; - let s = JSON.stringify(resp); - let data = converter.convertToByteArray(s); - - let deadline = Date.now() + MeekHTTPHelper.LOCAL_WRITE_TIMEOUT * 1000; - try { - MeekHTTPHelper.refreshDeadline(this.transport, deadline); - output.write32(data.length); - MeekHTTPHelper.refreshDeadline(this.transport, deadline); - output.writeByteArray(data, data.length); - MeekHTTPHelper.refreshDeadline(this.transport, null); - } finally { - output.close(); - } - }, - // Enforce restrictions on what requests we are willing to make. These can // probably be loosened up. Try and rule out anything unexpected until we // know we need otherwise.

1 0

[meek/master] Factor out requestOk.
by dcf＠torproject.org 16 Mar '15

16 Mar '15

commit ef76dd14d419cdb79542f57dbdcae7a2914fd3e8 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Feb 22 20:12:23 2015 -0800 Factor out requestOk. --- firefox/components/main.js | 52 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/firefox/components/main.js b/firefox/components/main.js index 6df4950..ea5d050 100644 --- a/firefox/components/main.js +++ b/firefox/components/main.js @@ -143,6 +143,31 @@ MeekHTTPHelper.lookupStatus = function(status) { return null; }; +// Enforce restrictions on what requests we are willing to make. These can +// probably be loosened up. Try and rule out anything unexpected until we +// know we need otherwise. +MeekHTTPHelper.requestOk = function(req) { + if (req.method === undefined) { + dump("req missing \"method\".\n"); + return false; + } + if (req.url === undefined) { + dump("req missing \"url\".\n"); + return false; + } + + if (req.method !== "POST") { + dump("req.method is " + JSON.stringify(req.method) + ", not \"POST\".\n"); + return false; + } + if (!(req.url.startsWith("http://") || req.url.startsWith("https://"))) { + dump("req.url doesn't start with \"http://\" or \"https://\".\n"); + return false; + } + + return true; +}; + // Return an nsIProxyInfo according to the given specification. Returns null on // error. // https://developer.mozilla.org/en-US/docs/XPCOM_Interface_Reference/nsIProxy… @@ -222,7 +247,7 @@ MeekHTTPHelper.LocalConnectionHandler.prototype = { makeRequest: function(req) { // dump("makeRequest " + JSON.stringify(req) + "\n"); - if (!this.requestOk(req)) { + if (!MeekHTTPHelper.requestOk(req)) { MeekHTTPHelper.sendResponse(this.transport, {"error": "request failed validation"}); return; } @@ -273,31 +298,6 @@ MeekHTTPHelper.LocalConnectionHandler.prototype = { }.bind(this)); this.channel.asyncOpen(this.listener, this.channel); }, - - // Enforce restrictions on what requests we are willing to make. These can - // probably be loosened up. Try and rule out anything unexpected until we - // know we need otherwise. - requestOk: function(req) { - if (req.method === undefined) { - dump("req missing \"method\".\n"); - return false; - } - if (req.url === undefined) { - dump("req missing \"url\".\n"); - return false; - } - - if (req.method !== "POST") { - dump("req.method is " + JSON.stringify(req.method) + ", not \"POST\".\n"); - return false; - } - if (!(req.url.startsWith("http://") || req.url.startsWith("https://"))) { - dump("req.url doesn't start with \"http://\" or \"https://\".\n"); - return false; - } - - return true; - }, }; // RequestReader reads a JSON-encoded request from the given transport, and

1 0

[arm/master] Avoid UnicodeDecodeError when reading the man page
by atagar＠torproject.org 15 Mar '15

15 Mar '15

commit 5cd4898a141fcc8550b29333b93a89cbe060506b Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 15 14:59:38 2015 -0700 Avoid UnicodeDecodeError when reading the man page There's probably a better solution but that can wait for the rewrite of this util function. For now a quick fix for... Traceback (most recent call last): File "./run_seth", line 47, in <module> main() File "./run_seth", line 16, in main seth.starter.main() File "/usr/lib/python2.7/stem/util/conf.py", line 288, in wrapped return func(*args, config = config, **kwargs) File "/home/atagar/Desktop/seth/seth/starter.py", line 86, in main _load_tor_config_descriptions() File "/home/atagar/Desktop/seth/seth/starter.py", line 239, in _load_tor_config_descriptions seth.util.tor_config.load_configuration_descriptions(BASE_DIR) File "/home/atagar/Desktop/seth/seth/util/tor_config.py", line 1088, in load_configuration_descriptions load_option_descriptions() File "/home/atagar/Desktop/seth/seth/util/tor_config.py", line 241, in load_option_descriptions line = ui_tools.get_printable(line) File "/home/atagar/Desktop/seth/seth/util/ui_tools.py", line 176, in get_printable line = line.replace('\xc2', "'") UnicodeDecodeError: 'ascii' codec can't decode byte 0xc2 in position 0: ordinal not in range(128) --- seth/util/tor_config.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/seth/util/tor_config.py b/seth/util/tor_config.py index b67445a..5786d69 100644 --- a/seth/util/tor_config.py +++ b/seth/util/tor_config.py @@ -2,6 +2,7 @@ Helper functions for working with tor's configuration file. """ +import codecs import os import time import socket @@ -237,6 +238,7 @@ def load_option_descriptions(load_path = None, check_version = True): last_category, last_description = Category.GENERAL, "" for line in man_call_results: + line = codecs.latin_1_encode(line, 'replace')[0] line = ui_tools.get_printable(line) stripped_line = line.strip()

1 0

[arm/master] Close controller connection last
by atagar＠torproject.org 15 Mar '15

15 Mar '15

commit a1cceb2d230fa5c4bd8a6ff1f6f38227e0648471 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 15 15:16:51 2015 -0700 Close controller connection last Closing wthe controller while panels are still trying to do work naturally causes a lot of noise (since their controller connection is swiped out from under them), and masks other issues. Might as well do this last. --- seth/starter.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/seth/starter.py b/seth/starter.py index 2b98706..abb4eec 100644 --- a/seth/starter.py +++ b/seth/starter.py @@ -279,19 +279,16 @@ def _shutdown_daemons(controller): Stops and joins on worker threads. """ - close_controller = threading.Thread(target = controller.close) - close_controller.setDaemon(True) - close_controller.start() - halt_threads = [ seth.controller.stop_controller(), seth.util.tracker.stop_trackers(), - close_controller, ] for thread in halt_threads: thread.join() + controller.close() + if __name__ == '__main__': main()

1 0