tor-commits January 2019

tor-commits@lists.torproject.org

15 participants
2081 discussions

[tor-browser/tor-browser-60.4.0esr-8.0-1] Bug 26540: Enabling pdfjs disableRange option prevents pdfs from loading
by gk＠torproject.org 22 Jan '19

22 Jan '19

commit 65efe12e32275e12ede3746c253d03e6a7ca34ae Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Nov 6 15:47:31 2018 -0800 Bug 26540: Enabling pdfjs disableRange option prevents pdfs from loading Large pdf files download in parts via range-based requests so that users can begin reading before the entire file has finished downloading. This is implemented using XMLHttpRequests. However, since these requests are created in the chrome, they are given the System Principal and lack the correct firstPartyDomain associated with the parent window. This patch manually sets the XMLHttpRequest's originAttributes to the one provided by the real owning window cached in the RangedChromeActions object. This is done via the chrome-only setOriginAttributes method. The method is called in the xhr_onreadystatechanged() callback rather than directly after construction in getXhr() because the setOriginAttributes implementation requires the internal nsIChannel object to have been created but not used. Fortunately, the XMLHttpRequest object fires the readStateChangedEvent precisely after the channel has been created in the XmlHttpRequest's Open() method. The nsIChannel's nsILoadInfo's OriginAttributes are now overwritten with the known OriginAttributes of the parent window before anything else has had a chance to use it. --- browser/extensions/pdfjs/content/PdfStreamConverter.jsm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm index a2ebec9450d4..a9978f7e7863 100644 --- a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm +++ b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm @@ -233,6 +233,15 @@ class ChromeActions { return PrivateBrowsingUtils.isContentWindowPrivate(this.domWindow); } + getWindowOriginAttributes() + { + try { + return this.domWindow.document.nodePrincipal.originAttributes; + } catch(err) { + return {}; + } + } + download(data, sendResponse) { var self = this; var originalUrl = data.originalUrl; @@ -591,6 +600,9 @@ class RangedChromeActions extends ChromeActions { var self = this; var xhr_onreadystatechange = function xhr_onreadystatechange() { if (this.readyState === 1) { // LOADING + // override this XMLHttpRequest's OriginAttributes with our cached parent window's + // OriginAttributes, as we are currently running under the SystemPrincipal + this.setOriginAttributes(self.getWindowOriginAttributes()); var netChannel = this.channel; if ("nsIPrivateBrowsingChannel" in Ci && netChannel instanceof Ci.nsIPrivateBrowsingChannel) {

1 0

[tor-browser/tor-browser-60.4.0esr-8.0-1] Bug 1463936 - Set default security.pki.name_matching_mode to enforce (3) for all builds. r=jcj
by gk＠torproject.org 22 Jan '19

22 Jan '19

commit acd09ddc7ea5fe3c3cc195a7a1b6e3722f8758e6 Author: Dipen Patel <bugzilla(a)pansara.org> Date: Mon Jun 11 14:52:07 2018 -0700 Bug 1463936 - Set default security.pki.name_matching_mode to enforce (3) for all builds. r=jcj MozReview-Commit-ID: CK3zoKfGfEr --HG-- extra : rebase_source : fe20f240a66d809177d30043fd9f41682073cd34 --- security/manager/ssl/security-prefs.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/security/manager/ssl/security-prefs.js b/security/manager/ssl/security-prefs.js index cf492478b279..72af0ee99938 100644 --- a/security/manager/ssl/security-prefs.js +++ b/security/manager/ssl/security-prefs.js @@ -90,11 +90,7 @@ pref("security.signed_app_signatures.policy", 2); // 2: fall back to the subject common name for certificates valid before 23 // August 2015 if necessary // 3: only use name information from the subject alternative name extension -#ifdef RELEASE_OR_BETA -pref("security.pki.name_matching_mode", 1); -#else -pref("security.pki.name_matching_mode", 2); -#endif +pref("security.pki.name_matching_mode", 3); // security.pki.netscape_step_up_policy controls how the platform handles the // id-Netscape-stepUp OID in extended key usage extensions of CA certificates.

1 0

[tor-browser/tor-browser-60.4.0esr-8.0-1] Bug 1472618 - Make navigator.platform return "Win32", even on Win64 OS. r=peterv
by gk＠torproject.org 22 Jan '19

22 Jan '19

commit a102f8b853fb04db32bcd0f924fd6391cd3d40da Author: Chris Peterson <cpeterson(a)mozilla.com> Date: Mon Jul 2 11:02:23 2018 -0700 Bug 1472618 - Make navigator.platform return "Win32", even on Win64 OS. r=peterv navigator.platform returns "Win64" in 64-bit Firefox and IE, but "Win32" in 64-bit Chrome and Edge. "Win32" appears to be the de facto platform value for Windows. This change doesn't hide the OS architecture from web content because navigator.userAgent still mentions "Win64; x64" in 64-bit Firefox, Chrome, Edge, and IE. MozReview-Commit-ID: CplYnGDQgTe --HG-- extra : rebase_source : c00a1a7462ea91d44700dd0581c88c1c4cad2346 extra : source : 1976c327f251702be255a9d0769121c6bc5303a1 This fixes our bug 28740. --- .../components/resistfingerprinting/test/browser/browser_navigator.js | 2 +- dom/base/Navigator.cpp | 4 +--- toolkit/components/resistfingerprinting/nsRFPService.h | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/browser/components/resistfingerprinting/test/browser/browser_navigator.js b/browser/components/resistfingerprinting/test/browser/browser_navigator.js index e0aaf6fb27fe..3736fcd33ce5 100644 --- a/browser/components/resistfingerprinting/test/browser/browser_navigator.js +++ b/browser/components/resistfingerprinting/test/browser/browser_navigator.js @@ -24,7 +24,7 @@ const SPOOFED_APPVERSION = { }; const SPOOFED_PLATFORM = { linux: "Linux x86_64", - win: "Win64", + win: "Win32", macosx: "MacIntel", android: "Linux armv7l", other: "Linux x86_64", diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp index 33563ad65ccb..55d1f7a0474b 100644 --- a/dom/base/Navigator.cpp +++ b/dom/base/Navigator.cpp @@ -1653,9 +1653,7 @@ Navigator::GetPlatform(nsAString& aPlatform, bool aUsePrefOverriddenValue) // Sorry for the #if platform ugliness, but Communicator is likewise // hardcoded and we are seeking backward compatibility here (bug 47080). -#if defined(_WIN64) - aPlatform.AssignLiteral("Win64"); -#elif defined(WIN32) +#if defined(WIN32) aPlatform.AssignLiteral("Win32"); #elif defined(XP_MACOSX) && defined(__ppc__) aPlatform.AssignLiteral("MacPPC"); diff --git a/toolkit/components/resistfingerprinting/nsRFPService.h b/toolkit/components/resistfingerprinting/nsRFPService.h index da79da8de948..4ed0c1d4cfaf 100644 --- a/toolkit/components/resistfingerprinting/nsRFPService.h +++ b/toolkit/components/resistfingerprinting/nsRFPService.h @@ -25,7 +25,7 @@ #define SPOOFED_UA_OS "Windows NT 6.1; Win64; x64" #define SPOOFED_APPVERSION "5.0 (Windows)" #define SPOOFED_OSCPU "Windows NT 6.1; Win64; x64" -#define SPOOFED_PLATFORM "Win64" +#define SPOOFED_PLATFORM "Win32" #elif defined(XP_MACOSX) #define SPOOFED_UA_OS "Macintosh; Intel Mac OS X 10.13" #define SPOOFED_APPVERSION "5.0 (Macintosh)"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 22 Jan '19

22 Jan '19

commit 08811d76539709eeb15e7bb5a519dc1c2b50f20f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 22 06:15:48 2019 +0000 Update translations for https_everywhere_completed --- sv/https-everywhere.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sv/https-everywhere.dtd b/sv/https-everywhere.dtd index 4e5df3b4c..2399eeaf1 100644 --- a/sv/https-everywhere.dtd +++ b/sv/https-everywhere.dtd @@ -8,7 +8,7 @@ <!ENTITY https-everywhere.menu.donate_eff_imperative "Donera till EFF"> <!ENTITY https-everywhere.menu.observatory "Inställningar för SSL Observatoriet"> <!ENTITY https-everywhere.menu.globalEnable "Aktivera HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.blockUnencryptedRequests "Blockera alla okrypterade förfrågningar"> +<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Kryptera alla webbplatser som är berättigade (EASE)"> <!ENTITY https-everywhere.menu.showCounter "Visa räknare"> <!ENTITY https-everywhere.menu.viewAllRules "Visa alla regler"> @@ -33,15 +33,15 @@ <!ENTITY https-everywhere.prefs.reset_defaults "Återställ till standardvärden"> <!ENTITY https-everywhere.prefs.reset_defaults_message "Detta återställer varje regel till dess standardvärde. Fortsätta?"> -<!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere märkte att du navigerade till en icke-HTTPS-webbplats och försökte skicka dig till HTTPS-versionen i stället. HTTPS-versionen är inte tillgänglig. Mest sannolikt stöder inte denna webbplats HTTPS, men det är också möjligt att en angripare blockerar HTTPS-versionen. Om du vill visa den okrypterade versionen av den här sidan kan du fortfarande göra det genom att inaktivera alternativet "Blockera alla okrypterade förfrågningar" i ditt HTTPS Everywhere-tillägg. Var medveten om att inaktivering av det här alternativet kan göra din webbläsare utsatt för nätverksbaserade nedgraderingsangrepp på webbplatser du besöker."> +<!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere märkte att du navigerade till en icke-HTTPS-webbplats och försökte skicka dig till HTTPS-versionen i stället. HTTPS-versionen är inte tillgänglig. Mest sannolikt stöder inte denna webbplats HTTPS, men det är också möjligt att en angripare blockerar HTTPS-versionen. Om du vill visa den okrypterade versionen av denna webbplats kan du fortfarande göra det genom att inaktivera alternativet "Blockera alla okrypterade förfrågningar" i ditt HTTPS Everywhere-tillägg. Var medveten om att inaktivering av det här alternativet kan göra din webbläsare utsatt för nätverksbaserade nedgraderingsangrepp på webbplatser du besöker."> <!ENTITY https-everywhere.cancel.he_blocking_network "nätverksbaserade nedgraderingsattacker"> <!ENTITY https-everywhere.chrome.stable_rules "Stabila regler"> <!ENTITY https-everywhere.chrome.stable_rules_description "Tvinga krypterade anslutningar till dessa websidor:"> <!ENTITY https-everywhere.chrome.experimental_rules "Experimentella regler"> <!ENTITY https-everywhere.chrome.experimental_rules_description "Kan orsaka varningar eller avbrott. Inaktiverade som standard."> -<!ENTITY https-everywhere.chrome.disable_on_this_site "Inaktivera HTTPS Everywhere på den här webbplatsen"> -<!ENTITY https-everywhere.chrome.enable_on_this_site "Aktivera HTTPS Everywhere på den här webbplatsen"> +<!ENTITY https-everywhere.chrome.disable_on_this_site "Inaktivera HTTPS Everywhere för denna webbplats"> +<!ENTITY https-everywhere.chrome.enable_on_this_site "Aktivera HTTPS Everywhere för denna webbplats"> <!ENTITY https-everywhere.chrome.add_rule "Lägg till en regel för denna sida"> <!ENTITY https-everywhere.chrome.add_new_rule "Lägg till en ny regel för denna sida"> <!ENTITY https-everywhere.chrome.always_https_for_host "Använd alltid https för denna värd">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 22 Jan '19

22 Jan '19

commit 47368530709285d89c145d657e7b5154b90804ad Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 22 06:15:42 2019 +0000 Update translations for https_everywhere --- sv/https-everywhere.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sv/https-everywhere.dtd b/sv/https-everywhere.dtd index 5fcd31540..2399eeaf1 100644 --- a/sv/https-everywhere.dtd +++ b/sv/https-everywhere.dtd @@ -8,7 +8,7 @@ <!ENTITY https-everywhere.menu.donate_eff_imperative "Donera till EFF"> <!ENTITY https-everywhere.menu.observatory "Inställningar för SSL Observatoriet"> <!ENTITY https-everywhere.menu.globalEnable "Aktivera HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Encrypt All Sites Eligible (EASE)"> +<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Kryptera alla webbplatser som är berättigade (EASE)"> <!ENTITY https-everywhere.menu.showCounter "Visa räknare"> <!ENTITY https-everywhere.menu.viewAllRules "Visa alla regler"> @@ -33,15 +33,15 @@ <!ENTITY https-everywhere.prefs.reset_defaults "Återställ till standardvärden"> <!ENTITY https-everywhere.prefs.reset_defaults_message "Detta återställer varje regel till dess standardvärde. Fortsätta?"> -<!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere märkte att du navigerade till en icke-HTTPS-webbplats och försökte skicka dig till HTTPS-versionen i stället. HTTPS-versionen är inte tillgänglig. Mest sannolikt stöder inte denna webbplats HTTPS, men det är också möjligt att en angripare blockerar HTTPS-versionen. Om du vill visa den okrypterade versionen av den här sidan kan du fortfarande göra det genom att inaktivera alternativet "Blockera alla okrypterade förfrågningar" i ditt HTTPS Everywhere-tillägg. Var medveten om att inaktivering av det här alternativet kan göra din webbläsare utsatt för nätverksbaserade nedgraderingsangrepp på webbplatser du besöker."> +<!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere märkte att du navigerade till en icke-HTTPS-webbplats och försökte skicka dig till HTTPS-versionen i stället. HTTPS-versionen är inte tillgänglig. Mest sannolikt stöder inte denna webbplats HTTPS, men det är också möjligt att en angripare blockerar HTTPS-versionen. Om du vill visa den okrypterade versionen av denna webbplats kan du fortfarande göra det genom att inaktivera alternativet "Blockera alla okrypterade förfrågningar" i ditt HTTPS Everywhere-tillägg. Var medveten om att inaktivering av det här alternativet kan göra din webbläsare utsatt för nätverksbaserade nedgraderingsangrepp på webbplatser du besöker."> <!ENTITY https-everywhere.cancel.he_blocking_network "nätverksbaserade nedgraderingsattacker"> <!ENTITY https-everywhere.chrome.stable_rules "Stabila regler"> <!ENTITY https-everywhere.chrome.stable_rules_description "Tvinga krypterade anslutningar till dessa websidor:"> <!ENTITY https-everywhere.chrome.experimental_rules "Experimentella regler"> <!ENTITY https-everywhere.chrome.experimental_rules_description "Kan orsaka varningar eller avbrott. Inaktiverade som standard."> -<!ENTITY https-everywhere.chrome.disable_on_this_site "Inaktivera HTTPS Everywhere på den här webbplatsen"> -<!ENTITY https-everywhere.chrome.enable_on_this_site "Aktivera HTTPS Everywhere på den här webbplatsen"> +<!ENTITY https-everywhere.chrome.disable_on_this_site "Inaktivera HTTPS Everywhere för denna webbplats"> +<!ENTITY https-everywhere.chrome.enable_on_this_site "Aktivera HTTPS Everywhere för denna webbplats"> <!ENTITY https-everywhere.chrome.add_rule "Lägg till en regel för denna sida"> <!ENTITY https-everywhere.chrome.add_new_rule "Lägg till en ny regel för denna sida"> <!ENTITY https-everywhere.chrome.always_https_for_host "Använd alltid https för denna värd">

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 22 Jan '19

22 Jan '19

commit 34b2505ecc33e44f572e9186828038e30bea6dd9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 22 00:15:24 2019 +0000 Update translations for donatepages-messagespot --- locale/ru/LC_MESSAGES/messages.po | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po index b556e1747..b1bce5c92 100644 --- a/locale/ru/LC_MESSAGES/messages.po +++ b/locale/ru/LC_MESSAGES/messages.po @@ -1642,6 +1642,9 @@ msgid "" " to be made in a specific way, so we may need additional information from " "you in order to process yours." msgstr "" +"Обратите внимание, что некоторые методы оплаты не поддерживают возврата, " +"либо требуют делать это особым способом, для чего нам может понадобиться " +"дополнительная информация от вас." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:474 msgid "Can I donate by mail?" @@ -1657,6 +1660,8 @@ msgid "" "Our mailing address is The Tor Project, 217 First Avenue South #4903, " "Seattle WA 98194, USA" msgstr "" +"Наш почтовый адрес: The Tor Project, 217 First Avenue South #4903, Seattle " +"WA 98194, USA" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:486 msgid "Do you accept cash donations?" @@ -1668,7 +1673,7 @@ msgstr "Да." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:496 msgid "Does Tor Project accept matching donations?" -msgstr "" +msgstr "Принимает ли Tor Projects софинансирование пожертвований?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:500 msgid "" @@ -1676,6 +1681,9 @@ msgid "" "Verizon, Red Hat, many universities, and others-- will match donations made " "by their employees." msgstr "" +"Да! Многие компании - такие как Google, Microsoft, eBay, PayPal, Apple, " +"Verizon, Red Hat, многие университеты и другие - софинансируют пожертвования" +" от своих сотрудников." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:502 msgid "" @@ -1690,12 +1698,16 @@ msgid "" "If your company isn't currently set up to match donations to the Tor " "Project, we would be happy to help with the paperwork." msgstr "" +"Если ваша компания ещё не делает софинансирование пожертвований для Tor " +"Project - мы будем рады помочь вам с этой бюрократией." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:506 msgid "" "If you want help figuring out the process, write us at <span " "class=\"email\">giving(at)torproject.org</a>." msgstr "" +"Если вы хотите помочь разобраться с процессом - напишите нам на <span " +"class=\"email\">giving(at)torproject.org</a>" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:512 msgid "Can I become a Tor Project member?" @@ -1706,6 +1718,8 @@ msgid "" "Right now, we don't have a membership program, but we may set one up in the " "future." msgstr "" +"В данный момент у нас нет членской программы, но мы можем организовать её в " +"будущем." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:518 msgid "" @@ -1714,6 +1728,10 @@ msgid "" "href=\"https://www.torproject.org/getinvolved/volunteer.html.en\">this is a " "good place to start</a>." msgstr "" +"Если вы хотите поучаствовать в Tor Project - <a class=\"hyperlinks links\" " +"target=\"_blank\" " +"href=\"https://www.torproject.org/getinvolved/volunteer.html.en\">начните с " +"этого</a>" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:524 msgid "How can I get a Tor t-shirt or stickers?" @@ -1734,6 +1752,7 @@ msgid "" "If I want to stay in touch with the Tor Project, what's the best way for me " "to do that?" msgstr "" +"Если я хочу оставаться на связи с Tor Project, что мне для этого сделать?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:538 msgid "" @@ -1763,12 +1782,16 @@ msgstr "" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:556 msgid "Can I donate my airline miles, flight vouchers, or hotel points?" msgstr "" +"Я могу пожертвовать свои воздушные мили, полётные ваучеры или бонусы на " +"отель?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:562 msgid "" "We would like to accept your miles, vouchers and hotel points, and in the " "future we may be able to." msgstr "" +"Мы бы хотели принимать от вас мили, ваучеры и отельные бонусы - мы сможем " +"это в будущем." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:568 msgid "Can I donate hardware?" @@ -1776,8 +1799,7 @@ msgstr "Могу ли я пожертвовать оборудование?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:572 msgid "Typically no, we don't encourage people to donate hardware." -msgstr "" -"Как правило нет; мы не хотим поощрять людей присылать нам оборудование. " +msgstr "Как правило нет, мы не поощряем людей присылать нам оборудование." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:574 msgid "" @@ -1836,7 +1858,7 @@ msgstr "" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:610 msgid "You don't support my preferred way to donate." -msgstr "" +msgstr "Вы не принимаете пожертвования привычным мне способом." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:612 msgid "Can I recommend a new donation method to you?" @@ -1849,6 +1871,8 @@ msgstr "Конечно" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:618 msgid "Just mail us at <span class=\"email\">giving(at)torproject.org</span></a>." msgstr "" +"Просто напишите нам на <span " +"class=\"email\">giving(at)torproject.org</span></a>." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:624 msgid ""

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 21 Jan '19

21 Jan '19

commit d6a1825c03ab5022b3d0303a5645e8da95ba188f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 21 23:45:23 2019 +0000 Update translations for donatepages-messagespot --- locale/ru/LC_MESSAGES/messages.po | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po index 214c405ed..b556e1747 100644 --- a/locale/ru/LC_MESSAGES/messages.po +++ b/locale/ru/LC_MESSAGES/messages.po @@ -9,15 +9,16 @@ # erinm, 2018 # Katrin Kutepova <blackkatelv(a)gmail.com>, 2018 # Legenden Rifk <rekytcsgo(a)gmail.com>, 2018 -# Vladislav Berg <vladislavp(a)tuta.io>, 2018 +# a9d5203bb8cb5bf4198c1266ffd3a2fd, 2018 # Lowrider <pams(a)imail.ru>, 2019 # Kristina Tyskiewicz <savannah5k(a)yahoo.com>, 2019 # diana azaryan <dianazryn(a)gmail.com>, 2019 # Evgeny Aleksandrov <5678lutya(a)gmail.com>, 2019 +# Руслан <nasretdinov.r.r(a)ya.ru>, 2019 # msgid "" msgstr "" -"Last-Translator: Evgeny Aleksandrov <5678lutya(a)gmail.com>, 2019\n" +"Last-Translator: Руслан <nasretdinov.r.r(a)ya.ru>, 2019\n" "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n" "Language: ru\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" @@ -141,6 +142,7 @@ msgid "" "But, that information is redacted from the publicly-available version of our" " Form 990." msgstr "" +"Но эта информация была изменена после последней публикации нашей Формы 990." #: tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:91 msgid "" @@ -318,7 +320,7 @@ msgstr "" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:236 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:236 msgid "sticker Pack" -msgstr "упаковка стикеров" +msgstr "набор стикеров" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:243 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:243 @@ -340,7 +342,7 @@ msgstr "$15" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:261 msgid "OFF" -msgstr "ВЫКЛЮЧИТЬ" +msgstr "ВЫКЛ" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:267 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:261 @@ -368,7 +370,7 @@ msgstr "Tor в Сердце Интернет Свободы" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:298 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:292 msgid "Powering the Digital Resistance" -msgstr "" +msgstr "Укрепление цифрового сопротивления" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:302 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:296 @@ -518,7 +520,7 @@ msgstr "Майка" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:501 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:495 msgid "Choose your size and fit for each shirt." -msgstr "Выбрать размер майки" +msgstr "Выбрать размер майки." #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:505 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:499 @@ -1461,6 +1463,8 @@ msgid "" "Is the Tor Project required to identify me as a donor to the United States " "government, or to any other authority?" msgstr "" +"Должен ли Tor Project идентифицировать меня как донора перед правительством " +"США или иной властью?" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:391 msgid "" @@ -1468,6 +1472,9 @@ msgid "" "required to report the donation amount and your name and address (if we have" " it) to the IRS, on Schedule B of the Form 990, which is filed annually." msgstr "" +"Если вы жертвуете Tor Project от $5000 в год - мы должны будем сообщить в " +"IRS сумму ваших пожертвований, а также ваше имя и адрес (если у нас " +"имеется), в соответствии со Списком Б Формы 990." #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:393 msgid "" @@ -1489,8 +1496,8 @@ msgid "" "(Also, if you wanted, you could give us $4,999 in late 2018 and $4,999 in " "early 2019.)" msgstr "" -"(А так же, если хотите, вы можете превести нам $4,999 подзно в 2018 и $4,999" -" рано в 2019 годах.)" +"(Также, если хотите, можете перевести нам $4999 в конце 2018 года и $4999 в " +"начале 2019 года.)" #: tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:403 msgid ""

1 0

[obfs4/master] transports/meeklite: Add `utls` argument to configure behavior
by yawning＠torproject.org 21 Jan '19

21 Jan '19

commit e4020b18f7aaafe9f4cb345630bfe18a5e44a8d2 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Mon Jan 21 18:47:42 2019 +0000 transports/meeklite: Add `utls` argument to configure behavior Per dcf: > As for the TODO, my plan was was to expose a "utls" SOCKS arg > to make it configurable per bridge, and just reuse the utls > Client Hello ID names: > utls=HelloChrome_Auto This adds support for all currently supported utls ClientHello IDs with the following caveats/differences: * `none` - Disables using utls entirely, forces `crypto/tls`. * `HelloGolang` - Alias of `none`, since using utls is pointless. * `HelloCustom` - Omitted as pointless. --- transports/meeklite/meek.go | 21 ++++++++++++++- transports/meeklite/transport.go | 58 ++++++++++++++++++++++++++++++---------- 2 files changed, 64 insertions(+), 15 deletions(-) diff --git a/transports/meeklite/meek.go b/transports/meeklite/meek.go index fb6aa0d..e009916 100644 --- a/transports/meeklite/meek.go +++ b/transports/meeklite/meek.go @@ -44,6 +44,8 @@ import ( "sync" "time" + utls "github.com/refraction-networking/utls" + "git.torproject.org/pluggable-transports/goptlib.git" "gitlab.com/yawning/obfs4.git/transports/base" ) @@ -51,6 +53,7 @@ import ( const ( urlArg = "url" frontArg = "front" + utlsArg = "utls" maxChanBacklog = 16 @@ -73,6 +76,8 @@ var ( type meekClientArgs struct { url *gourl.URL front string + + utls *utls.ClientHelloID } func (ca *meekClientArgs) Network() string { @@ -104,6 +109,12 @@ func newClientArgs(args *pt.Args) (ca *meekClientArgs, err error) { // Parse the (optional) front argument. ca.front, _ = args.Get(frontArg) + // Parse the (optional) utls argument. + utlsOpt, _ := args.Get(utlsArg) + if ca.utls, err = parseClientHelloID(utlsOpt); err != nil { + return nil, err + } + return ca, nil } @@ -343,10 +354,18 @@ func newMeekConn(network, addr string, dialFn base.DialFunc, ca *meekClientArgs) return nil, err } + var rt http.RoundTripper + switch ca.utls { + case nil: + rt = &http.Transport{Dial: dialFn} + default: + rt = newRoundTripper(dialFn, ca.utls) + } + conn := &meekConn{ args: ca, sessionID: id, - roundTripper: newRoundTripper(dialFn), + roundTripper: rt, workerWrChan: make(chan []byte, maxChanBacklog), workerRdChan: make(chan []byte, maxChanBacklog), workerCloseChan: make(chan struct{}), diff --git a/transports/meeklite/transport.go b/transports/meeklite/transport.go index 6ccef31..59000a3 100644 --- a/transports/meeklite/transport.go +++ b/transports/meeklite/transport.go @@ -33,13 +33,35 @@ import ( "gitlab.com/yawning/obfs4.git/transports/base" ) -var errProtocolNegotiated = errors.New("meek_lite: protocol negotiated") +var ( + errProtocolNegotiated = errors.New("meek_lite: protocol negotiated") + + // This should be kept in sync with what is available in utls. + clientHelloIDMap = map[string]*utls.ClientHelloID{ + "hellogolang": nil, // Don't bother with utls. + "hellorandomized": &utls.HelloRandomized, + "hellorandomizedalpn": &utls.HelloRandomizedALPN, + "hellorandomizednoalpn": &utls.HelloRandomizedNoALPN, + "hellofirefox_auto": &utls.HelloFirefox_Auto, + "hellofirefox_55": &utls.HelloFirefox_55, + "hellofirefox_56": &utls.HelloFirefox_56, + "hellofirefox_63": &utls.HelloFirefox_63, + "hellochrome_auto": &utls.HelloChrome_Auto, + "hellochrome_58": &utls.HelloChrome_58, + "hellochrome_62": &utls.HelloChrome_62, + "hellochrome_70": &utls.HelloChrome_70, + "helloios_auto": &utls.HelloIOS_Auto, + "helloios_11_1": &utls.HelloIOS_11_1, + } + defaultClientHello = &utls.HelloChrome_Auto +) type roundTripper struct { sync.Mutex - transport http.RoundTripper - dialFn base.DialFunc + clientHelloID *utls.ClientHelloID + dialFn base.DialFunc + transport http.RoundTripper initConn net.Conn } @@ -105,15 +127,7 @@ func (rt *roundTripper) dialTLS(network, addr string) (net.Conn, error) { host = addr } - // TODO: Make this configurable. What "works" is host dependent. - // * HelloChrome_Auto - Failures in a stand alone testcase against google.com - // * HelloFirefox_Auto - Fails with the azure bridge, incompatible group. - // * HelloIOS_Auto - Seems to work. - // - // Since HelloChrome_Auto works with azure, that's what'll be used for - // now, since that's what the overwelming vast majority of people will - // use. - conn := utls.UClient(rawConn, &utls.Config{ServerName: host}, utls.HelloChrome_Auto) + conn := utls.UClient(rawConn, &utls.Config{ServerName: host}, *rt.clientHelloID) if err = conn.Handshake(); err != nil { conn.Close() return nil, err @@ -154,10 +168,26 @@ func getDialTLSAddr(u *url.URL) string { return net.JoinHostPort(u.Host, u.Scheme) } -func newRoundTripper(dialFn base.DialFunc) http.RoundTripper { +func newRoundTripper(dialFn base.DialFunc, clientHelloID *utls.ClientHelloID) http.RoundTripper { return &roundTripper{ - dialFn: dialFn, + clientHelloID: clientHelloID, + dialFn: dialFn, + } +} + +func parseClientHelloID(s string) (*utls.ClientHelloID, error) { + s = strings.ToLower(s) + switch s { + case "none": + return nil, nil + case "": + return defaultClientHello, nil + default: + if ret := clientHelloIDMap[s]; ret != nil { + return ret, nil + } } + return nil, fmt.Errorf("invalid ClientHelloID: '%v'", s) } func init() {

1 0

[tpo/staging] Use models for reports
by hiro＠torproject.org 21 Jan '19

21 Jan '19

commit f96624e8019a3748fb59382e2c90f2b54c242ebd Author: hiro <hiro(a)torproject.org> Date: Mon Jan 21 17:37:35 2019 +0100 Use models for reports --- .../certificate-legal-existence/contents.lr | 9 ++++ content/about/reports/fiscal-year-2017/contents.lr | 11 ++++ models/report.ini | 32 +++++++++++ models/reports.ini | 28 ++++++++++ templates/macros/reports.html | 16 ++++++ templates/reports.html | 63 ++++------------------ 6 files changed, 106 insertions(+), 53 deletions(-) diff --git a/content/about/reports/certificate-legal-existence/contents.lr b/content/about/reports/certificate-legal-existence/contents.lr new file mode 100644 index 0000000..ea4ed8a --- /dev/null +++ b/content/about/reports/certificate-legal-existence/contents.lr @@ -0,0 +1,9 @@ +_model: report +--- +type: document +--- +title: Tor Certificate of Legal Existence +--- +description: Certificate of Legal Existence for Tor Project, Inc. +--- +link: https://gitweb.torproject.org/company/policies.git/plain/corpdocs/Tor-Certi… diff --git a/content/about/reports/fiscal-year-2017/contents.lr b/content/about/reports/fiscal-year-2017/contents.lr new file mode 100644 index 0000000..2dfa9db --- /dev/null +++ b/content/about/reports/fiscal-year-2017/contents.lr @@ -0,0 +1,11 @@ +_model: report +--- +type: report +--- +date: 2017 +--- +tag: Fiscal Year 2017 +--- +title: 2017 IRS Form 990 +--- +link: https://www.torproject.org/about/findoc/2017-TorProject-Form990.pdf diff --git a/models/report.ini b/models/report.ini new file mode 100644 index 0000000..d629831 --- /dev/null +++ b/models/report.ini @@ -0,0 +1,32 @@ +[model] +name = Report +label = {{ this.title }} +hidden = yes + +[fields.title] +label = Title +type = string + +[fields.description] +label = Description +type = string + +[fields.type] +label = Type +type = string + +[fields.tag] +label = Tag +type = string + +[fields.link] +label = Link +type = string + +[fields.date] +label = date +type = string + +[fields.file] +label = File +type = string diff --git a/models/reports.ini b/models/reports.ini new file mode 100644 index 0000000..eba6b0b --- /dev/null +++ b/models/reports.ini @@ -0,0 +1,28 @@ +[model] +name = Reports +label = {{ this.title }} +hidden = yes + +[fields.title] +label = Title +type = string + +[fields.section] +label = Section +type = string + +[fields.body] +label = Body +type = markdown + +[fields.color] +label = Color +type = string + +[fields.html] +label = Html +type = string + +[children] +model = report +order_by = name diff --git a/templates/macros/reports.html b/templates/macros/reports.html new file mode 100644 index 0000000..1b399a9 --- /dev/null +++ b/templates/macros/reports.html @@ -0,0 +1,16 @@ +{% macro render_document(item, alternative) %} +<tr> + <td>{{ item.title }}</td> + <td>{{ item.description }}</td> + <td><a href="{{ item.link }}">View PDF</a></td> +</tr> +{% endmacro %} + +{% macro render_report(item, alternative) %} +<tr> + <th scope="row">{{ item.date }}</th> + <td><span class="badge-pill badge-success">{{ item.tag }}</span></td> + <td>{{ item.title }}</td> + <td><a href="{{ item.link }}">View PDF</a></td> +</tr> +{% endmacro %} diff --git a/templates/reports.html b/templates/reports.html index 9270d49..80cef40 100644 --- a/templates/reports.html +++ b/templates/reports.html @@ -4,41 +4,11 @@ <div class="container py-3"> <table class="table"> <tbody> - <tr> - <td>Tor Certificate of Legal Existence</td> - <td>Certificate of Legal Existence for Tor Project, Inc.</td> - <td><a href="">View PDF</a></td> - </tr> - <tr> - <td>Tor Articles of Organization</td> - <td>Articles of Organization for Tor Project, Inc.</td> - <td><a href="">View PDF</a></td> - </tr> - <tr> - <td>Tor Articles of Organization as filed</td> - <td>Articles of Organization as they were filed by the Commonwealth of Massachusetts, including continuation pages.</td> - <td>View PDF</td> - </tr> - <tr> - <td>Tor Conflict of Interest Policy</td> - <td>Policy protecting the organization's interest from officers and directors entering arrangements that might benefit their private interests.</td> - <td><a href="">View PDF</a></td> - </tr> - <tr> - <td>Tor Conflict of Interest Policy</td> - <td>Policy protecting the organization's interest from officers and directors entering arrangements that might benefit their private interests.</td> - <td><a href="">View PDF</a></td> - </tr> - <tr> - <td>Form 1023, Exhibit A.</td> - <td>Form 1023, Exhibit A.</td> - <td><a href="">View PDF</a></td> - </tr> - <tr> - <td>Doc Name</td> - <td>Description.</td> - <td><a href="">View PDF</a></td> - </tr> + {% from "macros/reports.html" import render_document %} + {% set items = this.children %} + {% for item in items.filter(F.type == "document") %} + {{ render_document(item, this.alt) }} + {% endfor %} </tbody> </table> </div> @@ -56,24 +26,11 @@ </tr> </thead> <tbody> - <tr> - <th scope="row">2015</th> - <td><span class="badge-pill badge-primary">IRS 990</span></td> - <td>IRS Form 990</td> - <td><a href="">View PDF</a></td> - </tr> - <tr> - <th scope="row">2015</th> - <td><span class="badge-pill badge-success">AUDIT</span></td> - <td>Independent Audit Results</td> - <td><a href="">View PDF</a></td> - </tr> - <tr> - <th scope="row">2015</th> - <td><span class="badge-pill badge-secondary">BOARD MEETING</span></td> - <td>Tor Board Meeting Minutes - June</td> - <td><a href="">View PDF</a></td> - </tr> + {% from "macros/reports.html" import render_report %} + {% set items = this.children %} + {% for item in items.filter(F.type == "report") %} + {{ render_report(item, this.alt) }} + {% endfor %} </tbody> </table> </div>

1 0

[tpo/master] Use models for reports
by hiro＠torproject.org 21 Jan '19

21 Jan '19

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2019